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

fix check for frr babel wireless config

Browse source
This commit is contained in:
bharnden 2020-01-15 21:40:16 -08:00
parent 55d537ae53
commit 4d82d1412c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
daemon/core/services/frr.py
View file

@ -5,8 +5,8 @@ Assumes installation of FRR via https://deb.frrouting.org/
import netaddr import netaddr
from core import constants from core import constants
from core.emulator.enumerations import LinkTypes from core.emane.nodes import EmaneNet
from core.nodes.network import PtpNet from core.nodes.network import PtpNet, WlanNode
from core.nodes.physical import Rj45Node from core.nodes.physical import Rj45Node
from core.services.coreservices import CoreService from core.services.coreservices import CoreService
@ -606,7 +606,7 @@ class FRRBabel(FrrService):
@classmethod @classmethod
def generatefrrifcconfig(cls, node, ifc): def generatefrrifcconfig(cls, node, ifc):
if ifc.net and ifc.net.linktype == LinkTypes.WIRELESS.value: if ifc.net and isinstance(ifc.net, (EmaneNet, WlanNode)):
return " babel wireless\n no babel split-horizon\n" return " babel wireless\n no babel split-horizon\n"
else: else:
return " babel wired\n babel split-horizon\n" return " babel wired\n babel split-horizon\n"