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

This commit is contained in:
Jeff Ahrenholz 2018-10-10 09:58:18 -07:00
parent b844f647e3
commit 9399218123

View file

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