update MDR service to use broadcast interfaces for links to non-WLAN nets

(Boeing r1812)
This commit is contained in:
ahrenholz 2013-12-16 18:52:41 +00:00
parent 9d897e4898
commit 9e955d22f0

View file

@ -452,9 +452,10 @@ class Ospfv3mdr(Ospfv3):
@classmethod @classmethod
def generatequaggaifcconfig(cls, node, ifc): def generatequaggaifcconfig(cls, node, ifc):
cfg = cls.mtucheck(ifc) cfg = cls.mtucheck(ifc)
cfg += " ipv6 ospf6 instance-id 65\n"
return cfg + """\ if ifc.net is not None and \
ipv6 ospf6 instance-id 65 isinstance(ifc.net, (nodes.WlanNode, nodes.EmaneNode)):
return cfg + """\
ipv6 ospf6 hello-interval 2 ipv6 ospf6 hello-interval 2
ipv6 ospf6 dead-interval 6 ipv6 ospf6 dead-interval 6
ipv6 ospf6 retransmit-interval 5 ipv6 ospf6 retransmit-interval 5
@ -463,6 +464,8 @@ class Ospfv3mdr(Ospfv3):
ipv6 ospf6 adjacencyconnectivity uniconnected ipv6 ospf6 adjacencyconnectivity uniconnected
ipv6 ospf6 lsafullness mincostlsa ipv6 ospf6 lsafullness mincostlsa
""" """
else:
return cfg
addservice(Ospfv3mdr) addservice(Ospfv3mdr)