proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 07:23:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgp_l3vpn_to_bgp_vrf: use tgen.hasmpls flag

Browse Source 
Signed-off-by: Lou Berger <lberger@labn.net>
This commit is contained in:
Lou Berger 2018-02-06 15:24:15 -05:00 committed by Donald Sharp
parent 9711fc7e0b
commit 1c507d27e3
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/topotests/bgp_l3vpn_to_bgp_vrf/customize.py
View File

@ -92,8 +92,6 @@ CWD = os.path.dirname(os.path.realpath(__file__))
# test name based on directory # test name based on directory
TEST = os.path.basename(CWD) TEST = os.path.basename(CWD)
MplsInit = False
class ThisTestTopo(Topo): class ThisTestTopo(Topo):
"Test topology builder" "Test topology builder"
def build(self, *_args, **_opts): def build(self, *_args, **_opts):
@ -104,13 +102,11 @@ class ThisTestTopo(Topo):
# between routers, switches and hosts. # between routers, switches and hosts.
# #
# Create P/PE routers # Create P/PE routers
#check for mpls - there may be a better way to check... #check for mpls
tgen.add_router('r1') tgen.add_router('r1')
if os.path.exists('/proc/sys/net/mpls/conf') != True: if tgen.hasmpls != True:
logger.info('MPLS not available, tests will be skipped') logger.info('MPLS not available, tests will be skipped')
return return
global MplsInit
MplsInit = True
for routern in range(2, 5): for routern in range(2, 5):
tgen.add_router('r{}'.format(routern)) tgen.add_router('r{}'.format(routern))
# Create CE routers # Create CE routers
@ -151,7 +147,7 @@ def ltemplatePreRouterStartHook():
tgen = get_topogen() tgen = get_topogen()
logger.info('pre router-start hook') logger.info('pre router-start hook')
#check for mpls #check for mpls
if MplsInit == False: if tgen.hasmpls != True:
logger.info('MPLS not available, skipping setup') logger.info('MPLS not available, skipping setup')
return return
#configure r2 mpls interfaces #configure r2 mpls interfaces
@ -198,7 +194,7 @@ def versionCheck(vstr, rname='r1', compstr='<',cli=False):
router = tgen.gears[rname] router = tgen.gears[rname]
if MplsInit == False: if tgen.hasmpls != True:
ret = 'MPLS not initialized' ret = 'MPLS not initialized'
return ret return ret