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

ospf6-test1: Look for test config in directories relative to main script location

Browse Source
This commit is contained in:
Martin Winter 2016-11-18 23:42:49 -08:00 committed by Donald Sharp
parent 8ab9a37669
commit d14615d865
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/topotests/ospf6-test1/ospf6-test1.py
View File

@ -202,7 +202,6 @@ class NetworkTopo(Topo):
for i in range(1, 7): for i in range(1, 7):
switch[i] = self.addSwitch('SW%s' % i, dpid=int2dpid(i), switch[i] = self.addSwitch('SW%s' % i, dpid=int2dpid(i),
cls=LegacySwitch) cls=LegacySwitch)
# #
# Define Quagga Routers # Define Quagga Routers
# #
@ -210,7 +209,6 @@ class NetworkTopo(Topo):
for i in range(1, 5): for i in range(1, 5):
router[i] = self.addNode('r%s' % i, cls=QuaggaRouter, router[i] = self.addNode('r%s' % i, cls=QuaggaRouter,
privateDirs=quaggaPrivateDirs) privateDirs=quaggaPrivateDirs)
# #
# Wire up the switches and routers # Wire up the switches and routers
# #
@ -237,8 +235,8 @@ def run():
# Starting Routers # Starting Routers
for i in range(1, 5): for i in range(1, 5):
net['r%s' % i].loadConf('zebra', 'r%s/zebra.conf' % i) net['r%s' % i].loadConf('zebra', '%s/r%s/zebra.conf' % (thisDir, i))
net['r%s' % i].loadConf('ospf6d', 'r%s/ospf6d.conf' % i) net['r%s' % i].loadConf('ospf6d', '%s/r%s/ospf6d.conf' % (thisDir, i))
net['r%s' % i].startQuagga() net['r%s' % i].startQuagga()
print('') print('')
@ -279,13 +277,13 @@ def run():
print("OSPFv3 converged.") print("OSPFv3 converged.")
print("\nwaiting 15s for routes to populate") print("\nwaiting 15s for routes to populate")
sleep(10) sleep(15)
# Verify OSPFv3 Routing Table # Verify OSPFv3 Routing Table
print("\nVerifing OSPFv3 Routing Table") print("\nVerifing OSPFv3 Routing Table")
failures = 0 failures = 0
for i in range(1, 5): for i in range(1, 5):
refTableFile = 'r%s/show_ipv6_route.ref' % i refTableFile = '%s/r%s/show_ipv6_route.ref' % (thisDir, i)
if os.path.isfile(refTableFile): if os.path.isfile(refTableFile):
# Read expected result from file # Read expected result from file
expected = open(refTableFile).read().rstrip() expected = open(refTableFile).read().rstrip()