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

Merge pull request #337 from coreemu/enhancement/zerba-service-deprecation

Browse source 
updates to zebra service to remove deprecated configurations
This commit is contained in:
bharnden 2020-01-09 15:52:54 -08:00 committed by GitHub
commit 0a37a583ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -406,6 +406,7 @@ class Ospfv3(QuaggaService):
def generatequaggaconfig(cls, node): def generatequaggaconfig(cls, node):
cfg = "router ospf6\n" cfg = "router ospf6\n"
rtrid = cls.routerid(node) rtrid = cls.routerid(node)
cfg += " instance-id 65\n"
cfg += " router-id %s\n" % rtrid cfg += " router-id %s\n" % rtrid
for ifc in node.netifs(): for ifc in node.netifs():
if hasattr(ifc, "control") and ifc.control is True: if hasattr(ifc, "control") and ifc.control is True:
@ -417,19 +418,6 @@ class Ospfv3(QuaggaService):
@classmethod @classmethod
def generatequaggaifcconfig(cls, node, ifc): def generatequaggaifcconfig(cls, node, ifc):
return cls.mtucheck(ifc) return cls.mtucheck(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 + """\
# ipv6 ospf6 hello-interval 2
# ipv6 ospf6 dead-interval 6
# ipv6 ospf6 retransmit-interval 5
# """
class Ospfv3mdr(Ospfv3): class Ospfv3mdr(Ospfv3):
@ -446,8 +434,6 @@ class Ospfv3mdr(Ospfv3):
@classmethod @classmethod
def generatequaggaifcconfig(cls, node, ifc): def generatequaggaifcconfig(cls, node, ifc):
cfg = cls.mtucheck(ifc) cfg = cls.mtucheck(ifc)
# Uncomment the following line to use Address Family Translation for IPv4
cfg += " ipv6 ospf6 instance-id 65\n"
if ifc.net is not None and isinstance(ifc.net, (WlanNode, EmaneNet)): if ifc.net is not None and isinstance(ifc.net, (WlanNode, EmaneNet)):
return ( return (
cfg cfg
@ -456,7 +442,7 @@ class Ospfv3mdr(Ospfv3):
ipv6 ospf6 dead-interval 6 ipv6 ospf6 dead-interval 6
ipv6 ospf6 retransmit-interval 5 ipv6 ospf6 retransmit-interval 5
ipv6 ospf6 network manet-designated-router ipv6 ospf6 network manet-designated-router
ipv6 ospf6 diffhellos ipv6 ospf6 twohoprefresh 3
ipv6 ospf6 adjacencyconnectivity uniconnected ipv6 ospf6 adjacencyconnectivity uniconnected
ipv6 ospf6 lsafullness mincostlsa ipv6 ospf6 lsafullness mincostlsa
""" """