test: Whitespace cleanup

This commit is contained in:
Tobias Waldekranz
2024-05-20 16:21:06 +02:00
parent b9907fa7ae
commit fb2bd2c2b7
5 changed files with 31 additions and 31 deletions
+12 -12
View File
@@ -1,13 +1,13 @@
#!/usr/bin/env python3
# ,------------------------------------------------,
# | [TARGET] |
# | br0 |
# | / \ |
# | target:mgmt target:data0 targetgt:data1 |
# ,------------------------------------------------,
# | [TARGET] |
# | br0 |
# | / \ |
# | target:mgmt target:data0 targetgt:data1 |
# | [192.168.0.1] [10.0.0.1] |
# '------------------------------------------------'
# | | |
# | | |
# | | |
# | | |
# ,----------------------------------------------,
# | host:mgmt host:data0 host:data1 |
# | [192.168.0.10] [10.0.0.10] |
@@ -65,13 +65,13 @@ with infamy.Test() as test:
with infamy.IsolatedMacVlan(hport0) as ns0, \
infamy.IsolatedMacVlan(hport1) as ns1 :
ns0.addip("192.168.0.10")
ns0.addroute("default", "192.168.0.1")
ns1.addip("10.0.0.10")
ns1.addroute("default", "10.0.0.1")
ns0.must_reach("10.0.0.10")
ns1.must_reach("192.168.0.10")
@@ -83,10 +83,10 @@ with infamy.Test() as test:
with infamy.IsolatedMacVlan(hport0) as ns0, \
infamy.IsolatedMacVlan(hport1) as ns1 :
ns0.addip("192.168.0.10")
ns0.addroute("default", "192.168.0.1")
ns1.addip("10.0.0.10")
ns1.addroute("default", "10.0.0.1")
+1 -1
View File
@@ -188,7 +188,7 @@ def config_remove_routes(target):
new = copy.deepcopy(running)
new["routing"]["control-plane-protocols"].clear()
target.put_diff_dicts("ietf-routing",running,new)
with infamy.Test() as test:
with test.step("Initialize"):
env = infamy.Env(infamy.std_topology("2x2"))
@@ -1,11 +1,11 @@
#!/usr/bin/env python3
# ,-------------------------------------, ,-------------------------------------,
# | dut1:data2 | | dut2:data2 |
# | br0 ----------|-------|--------- br0 |
# | / \ | | / \ |
# |dut1:mgmt dut1:data0 dut1:data1 | | dut2:data0 dut2:data1 dut2:mgmt |
# ,-------------------------------------, ,-------------------------------------,
# | dut1:data2 | | dut2:data2 |
# | br0 ----------|-------|--------- br0 |
# | / \ | | / \ |
# |dut1:mgmt dut1:data0 dut1:data1 | | dut2:data0 dut2:data1 dut2:mgmt |
# '-------------------------------------' '-------------------------------------'
# | | | | | |
# | | | | | |
# | | | | | |
# ,-----------------------------------------------------------------------------------------,
# | host:mgmt0 host:data0 host:data1 host:data2 host:data3 host:mgmt1 |
@@ -125,7 +125,7 @@ with infamy.Test() as test:
with test.step("Ping host:data20 [10.0.0.3] and host:data21 [10.0.0.4]"\
"from host:data11 [10.0.0.2]"):
_, hport11 = env.ltop.xlate("host", "data11")
_, hport20 = env.ltop.xlate("host", "data20")
_, hport21 = env.ltop.xlate("host", "data21")
@@ -140,5 +140,5 @@ with infamy.Test() as test:
ns11.must_reach("10.0.0.3")
ns11.must_reach("10.0.0.4")
test.succeed()
@@ -1,11 +1,11 @@
#!/usr/bin/env python3
# ,-------------------------------------, ,-------------------------------------,
# | dut1:data2 | | dut2:data2 |
# | br0 ----------|-------|--------- br0 |
# | / \ | | / \ |
# |dut1:mgmt dut1:data0 dut1:data1 | | dut2:data0 dut2:data1 dut2:mgmt |
# ,-------------------------------------, ,-------------------------------------,
# | dut1:data2 | | dut2:data2 |
# | br0 ----------|-------|--------- br0 |
# | / \ | | / \ |
# |dut1:mgmt dut1:data0 dut1:data1 | | dut2:data0 dut2:data1 dut2:mgmt |
# '-------------------------------------' '-------------------------------------'
# | | | | | |
# | | | | | |
# | | | | | |
# ,-----------------------------------------------------------------------------------------,
# | host:mgmt0 host:data0 host:data1 host:data2 host:data3 host:mgmt1 |
@@ -13,7 +13,7 @@
# | (ns10) (ns11) (ns20) (ns21) |
# | |
# | [ HOST ] |
# '-----------------------------------------------------------------------------------------'
# '-----------------------------------------------------------------------------------------'
import infamy
@@ -135,7 +135,7 @@ with infamy.Test() as test:
with test.step("Ping host:data20 [10.0.0.3] from host:data10 [10.0.0.1] through <bridge-vlan-10>" \
" and host:data21 [10.0.0.4] from host:data11 [10.0.0.2] through <bridge-vlan-20>"):
_, hport10 = env.ltop.xlate("host", "data10")
_, hport11 = env.ltop.xlate("host", "data11")
_, hport20 = env.ltop.xlate("host", "data20")
@@ -158,5 +158,5 @@ with infamy.Test() as test:
ns11.must_not_reach("10.0.0.3")
ns10.must_not_reach("10.0.0.2")
ns11.must_not_reach("10.0.0.1")
test.succeed()
+1 -1
View File
@@ -119,7 +119,7 @@ class IsolatedMacVlan:
p=proto[3]
self.runsh(f"""
set -ex
set -ex
ip link set iface up
ip -{p} addr add {addr}/{prefix_length} dev iface
""", check=True)