afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

enable OSPFv2 fast convergence, and fix router-id for IPv6-only nodes

Browse source
This commit is contained in:
Jeff Ahrenholz 2018-10-10 09:58:18 -07:00
parent b844f647e3
commit 9399218123
1 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
daemon/core/services/quagga.py
View file

@ -242,7 +242,7 @@ class QuaggaService(CoreService):
if a.find(".") >= 0: if a.find(".") >= 0:
return a.split('/')[0] return a.split('/')[0]
# raise ValueError, "no IPv4 address found for router ID" # raise ValueError, "no IPv4 address found for router ID"
return "0.0.0.0" return "0.0.0.%d" % node.objid
@staticmethod @staticmethod
def rj45check(ifc): def rj45check(ifc):
@ -330,21 +330,17 @@ class Ospfv2(QuaggaService):
@classmethod @classmethod
def generatequaggaifcconfig(cls, node, ifc): def generatequaggaifcconfig(cls, node, ifc):
return cls.mtucheck(ifc) cfg = cls.mtucheck(ifc)
# cfg = cls.mtucheck(ifc)
# external RJ45 connections will use default OSPF timers # external RJ45 connections will use default OSPF timers
# if cls.rj45check(ifc): if cls.rj45check(ifc):
# return cfg return cfg
# cfg += cls.ptpcheck(ifc) cfg += cls.ptpcheck(ifc)
# return cfg + """\
# ip ospf hello-interval 2
# ip ospf dead-interval 6
# ip ospf retransmit-interval 5
# """
return cfg + """\
ip ospf hello-interval 2
ip ospf dead-interval 6
ip ospf retransmit-interval 5
"""
class Ospfv3(QuaggaService): class Ospfv3(QuaggaService):
""" """