From 4d82d1412c015535a5380e14fa6eb2acffe30577 Mon Sep 17 00:00:00 2001 From: bharnden <32446120+bharnden@users.noreply.github.com> Date: Wed, 15 Jan 2020 21:40:16 -0800 Subject: [PATCH] fix check for frr babel wireless config --- daemon/core/services/frr.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/core/services/frr.py b/daemon/core/services/frr.py index a8687d34..0915b0e9 100644 --- a/daemon/core/services/frr.py +++ b/daemon/core/services/frr.py @@ -5,8 +5,8 @@ Assumes installation of FRR via https://deb.frrouting.org/ import netaddr from core import constants -from core.emulator.enumerations import LinkTypes -from core.nodes.network import PtpNet +from core.emane.nodes import EmaneNet +from core.nodes.network import PtpNet, WlanNode from core.nodes.physical import Rj45Node from core.services.coreservices import CoreService @@ -606,7 +606,7 @@ class FRRBabel(FrrService): @classmethod 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" else: return " babel wired\n babel split-horizon\n"