diff --git a/test/case/ietf_interfaces/Readme.adoc b/test/case/ietf_interfaces/Readme.adoc index 22ca7442..f19f093b 100644 --- a/test/case/ietf_interfaces/Readme.adoc +++ b/test/case/ietf_interfaces/Readme.adoc @@ -40,3 +40,6 @@ include::vlan_qos/Readme.adoc[] include::verify_all_interface_types/Readme.adoc[] include::iface_enable_disable/Readme.adoc[] + +include::veth_delete/Readme.adoc[] + diff --git a/test/case/ietf_interfaces/bridge_basic/topology.png b/test/case/ietf_interfaces/bridge_basic/topology.png index b1209598..50030754 100644 Binary files a/test/case/ietf_interfaces/bridge_basic/topology.png and b/test/case/ietf_interfaces/bridge_basic/topology.png differ diff --git a/test/case/ietf_interfaces/bridge_fwd_dual_dut/Readme.adoc b/test/case/ietf_interfaces/bridge_fwd_dual_dut/Readme.adoc index d3b3f5f4..1774c293 100644 --- a/test/case/ietf_interfaces/bridge_fwd_dual_dut/Readme.adoc +++ b/test/case/ietf_interfaces/bridge_fwd_dual_dut/Readme.adoc @@ -4,20 +4,21 @@ Ping through two bridges on two different DUTs. .... - ,-------------------------------------, ,-------------------------------------, - | dut1:link | | dut2:link | - | br0 ----------|---|--------- br0 | - | / | | / \ | - |dut1:mgmt dut1:data1 | | dut2:data1 dut2:data2 dut2:mgmt | - '-------------------------------------' '-------------------------------------' - | | | | | - | | | | | -,-----------------------------------------------------------------------------------, -| host:mgmt1 host:data11 host:data21 host:data22 host:mgmt2 | -| [10.0.0.2] [10.0.0.3] [10.0.0.4] | -| (ns11) (ns20) (ns21) | -| [ HOST ] | -'-----------------------------------------------------------------------------------' + .-------------------------. .-------------------------. + | [ DUT1 ] link | | link [ DUT2 ] | + | br0 -----|-------|----- br0 | + | / | | / \ | + | mgmt data1 | | data1 data2 mgmt | + '-------------------------' '-------------------------' + | | | | | + | | | | | +.---------------------------------------------------------------. +| mgmt1 data11 data21 data22 mgmt2 | +| [10.0.0.2] [10.0.0.3] [10.0.0.4] | +| (ns11) (ns20) (ns21) | +| | +| [ HOST ] | +'---------------------------------------------------------------' .... diff --git a/test/case/ietf_interfaces/bridge_fwd_dual_dut/test.py b/test/case/ietf_interfaces/bridge_fwd_dual_dut/test.py index 299dfc59..fa7e6fd8 100755 --- a/test/case/ietf_interfaces/bridge_fwd_dual_dut/test.py +++ b/test/case/ietf_interfaces/bridge_fwd_dual_dut/test.py @@ -6,20 +6,21 @@ Ping through two bridges on two different DUTs. .... - ,-------------------------------------, ,-------------------------------------, - | dut1:link | | dut2:link | - | br0 ----------|---|--------- br0 | - | / | | / \ | - |dut1:mgmt dut1:data1 | | dut2:data1 dut2:data2 dut2:mgmt | - '-------------------------------------' '-------------------------------------' - | | | | | - | | | | | -,-----------------------------------------------------------------------------------, -| host:mgmt1 host:data11 host:data21 host:data22 host:mgmt2 | -| [10.0.0.2] [10.0.0.3] [10.0.0.4] | -| (ns11) (ns20) (ns21) | -| [ HOST ] | -'-----------------------------------------------------------------------------------' + .-------------------------. .-------------------------. + | [ DUT1 ] link | | link [ DUT2 ] | + | br0 -----|-------|----- br0 | + | / | | / \ | + | mgmt data1 | | data1 data2 mgmt | + '-------------------------' '-------------------------' + | | | | | + | | | | | +.---------------------------------------------------------------. +| mgmt1 data11 data21 data22 mgmt2 | +| [10.0.0.2] [10.0.0.3] [10.0.0.4] | +| (ns11) (ns20) (ns21) | +| | +| [ HOST ] | +'---------------------------------------------------------------' .... diff --git a/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.png b/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.png index ee212c69..ef229365 100644 Binary files a/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.png and b/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.png differ diff --git a/test/case/ietf_interfaces/bridge_fwd_sgl_dut/Readme.adoc b/test/case/ietf_interfaces/bridge_fwd_sgl_dut/Readme.adoc index b54905d6..3e607c4b 100644 --- a/test/case/ietf_interfaces/bridge_fwd_sgl_dut/Readme.adoc +++ b/test/case/ietf_interfaces/bridge_fwd_sgl_dut/Readme.adoc @@ -37,7 +37,7 @@ endif::topdoc[] ==== Test sequence . Set up topology and attach to target DUT . Configure a bridge with dual physical port -. Verify ping from host:data0 to 10.0.0.1 +. Verify ping from host:data1 to 10.0.0.2 <<< diff --git a/test/case/ietf_interfaces/bridge_fwd_sgl_dut/test.py b/test/case/ietf_interfaces/bridge_fwd_sgl_dut/test.py index ada19e04..e8928522 100755 --- a/test/case/ietf_interfaces/bridge_fwd_sgl_dut/test.py +++ b/test/case/ietf_interfaces/bridge_fwd_sgl_dut/test.py @@ -62,7 +62,7 @@ with infamy.Test() as test: } }) - with test.step("Verify ping from host:data0 to 10.0.0.1"): + with test.step("Verify ping from host:data1 to 10.0.0.2"): _, hport1 = env.ltop.xlate("host", "data1") _, hport2 = env.ltop.xlate("host", "data2") diff --git a/test/case/ietf_interfaces/bridge_veth/topology.png b/test/case/ietf_interfaces/bridge_veth/topology.png index 3f01d919..44a02cfb 100644 Binary files a/test/case/ietf_interfaces/bridge_veth/topology.png and b/test/case/ietf_interfaces/bridge_veth/topology.png differ diff --git a/test/case/ietf_interfaces/bridge_vlan_separation/topology.png b/test/case/ietf_interfaces/bridge_vlan_separation/topology.png index 5650b929..5f1d027a 100644 Binary files a/test/case/ietf_interfaces/bridge_vlan_separation/topology.png and b/test/case/ietf_interfaces/bridge_vlan_separation/topology.png differ diff --git a/test/case/ietf_interfaces/iface_phys_address/Readme.adoc b/test/case/ietf_interfaces/iface_phys_address/Readme.adoc index 223bb441..5dedf837 100644 --- a/test/case/ietf_interfaces/iface_phys_address/Readme.adoc +++ b/test/case/ietf_interfaces/iface_phys_address/Readme.adoc @@ -17,16 +17,17 @@ image::topology.png[Custom MAC address on interface topology] endif::testgroup[] endif::topdoc[] ==== Test sequence -. Verify target:data MAC address is reset to default -. Initialize +. Set up topology and attach to target DUT . Set target:data static MAC address '02:01:00:c0:ff:ee' -. Verify target:mgmt has MAC address '02:01:00:c0:ff:ee' -. Reset target:mgmt MAC address to default +. Verify target:data has MAC address '02:01:00:c0:ff:ee' +. Reset target:data MAC address to default +. Verify target:data MAC address is reset to default . Set target:data to chassis MAC . Verify target:data has chassis MAC . Set target:data to chassis MAC + offset . Verify target:data has chassis MAC + offset -. Reset target:mgmt MAC address to default +. Reset target:data MAC address to default +. Verify target:data MAC address is reset to default <<< diff --git a/test/case/ietf_interfaces/iface_phys_address/test.py b/test/case/ietf_interfaces/iface_phys_address/test.py index e8dcbb8d..b20bd87b 100755 --- a/test/case/ietf_interfaces/iface_phys_address/test.py +++ b/test/case/ietf_interfaces/iface_phys_address/test.py @@ -32,14 +32,12 @@ def reset_mac(tgt, port, mac): node = "infix-interfaces:custom-phys-address" xpath = iface.get_xpath(port, node) tgt.delete_xpath(xpath) - with test.step("Verify target:data MAC address is reset to default"): - until(lambda: iface.get_phys_address(tgt, tport) == mac) with infamy.Test() as test: CMD = "jq -r '.[\"mac-address\"]' /run/system.json" - with test.step("Initialize"): + with test.step("Set up topology and attach to target DUT"): env = infamy.Env() target = env.attach("target", "mgmt") tgtssh = env.attach("target", "mgmt", "ssh") @@ -65,14 +63,17 @@ with infamy.Test() as test: } target.put_config_dict("ietf-interfaces", config) - with test.step("Verify target:mgmt has MAC address '02:01:00:c0:ff:ee'"): + with test.step("Verify target:data has MAC address '02:01:00:c0:ff:ee'"): mac = iface.get_phys_address(target, tport) print(f"Current MAC: {mac}, should be: {STATIC}") assert mac == STATIC - with test.step("Reset target:mgmt MAC address to default"): + with test.step("Reset target:data MAC address to default"): reset_mac(target, tport, pmac) + with test.step("Verify target:data MAC address is reset to default"): + until(lambda: iface.get_phys_address(tgt, tport) == mac) + with test.step("Set target:data to chassis MAC"): config = { "interfaces": { @@ -113,7 +114,11 @@ with infamy.Test() as test: print(f"Current MAC: {mac}, should be: {BMAC} (calculated)") assert mac == BMAC - with test.step("Reset target:mgmt MAC address to default"): + with test.step("Reset target:data MAC address to default"): reset_mac(target, tport, pmac) + with test.step("Verify target:data MAC address is reset to default"): + until(lambda: iface.get_phys_address(tgt, tport) == mac) + + test.succeed() diff --git a/test/case/ietf_interfaces/igmp_basic/topology.png b/test/case/ietf_interfaces/igmp_basic/topology.png index 91657527..1c448527 100644 Binary files a/test/case/ietf_interfaces/igmp_basic/topology.png and b/test/case/ietf_interfaces/igmp_basic/topology.png differ diff --git a/test/case/ietf_interfaces/igmp_vlan/Readme.adoc b/test/case/ietf_interfaces/igmp_vlan/Readme.adoc index a3b6d024..0d20d38b 100644 --- a/test/case/ietf_interfaces/igmp_vlan/Readme.adoc +++ b/test/case/ietf_interfaces/igmp_vlan/Readme.adoc @@ -3,26 +3,20 @@ Test tagged IGMP control traffic and that VLAN separation is respected for multicast .... - VLAN55 VLAN77 VLAN55 VLAN77 10.0.1.1 10.0.2.1 10.0.1.2 10.0.2.2 - \ / \ / - \ / \ / \ / \ / \--------------/ VLAN 1,2 T \---------------/ | DUT1 +---------------------------------+ DUT2 | | |dut1:link dut2:link| | +--------------+ +-----+---------+ - | | | | dut1:data1| |dut1:data2 dut2:data1| |dut2:data2 VLAN55 U | | VLAN77 U VLAN55 U | | VLAN77 U | | | | - | | | | +-------+ | +----------+ +------------+ +--------+ | msend +--+ | mreceive | | mreceive | | msend | +-------+ +----------+ +------------+ +--------+ 10.0.1.11 10.0.2.11 10.0.1.22 10.0.2.22 - .... ==== Topology diff --git a/test/case/ietf_interfaces/igmp_vlan/test.py b/test/case/ietf_interfaces/igmp_vlan/test.py index ec4eaa58..008d3cf5 100755 --- a/test/case/ietf_interfaces/igmp_vlan/test.py +++ b/test/case/ietf_interfaces/igmp_vlan/test.py @@ -5,26 +5,20 @@ IGMP VLAN Test tagged IGMP control traffic and that VLAN separation is respected for multicast .... - VLAN55 VLAN77 VLAN55 VLAN77 10.0.1.1 10.0.2.1 10.0.1.2 10.0.2.2 - \ / \ / - \ / \ / \ / \ / \--------------/ VLAN 1,2 T \---------------/ | DUT1 +---------------------------------+ DUT2 | | |dut1:link dut2:link| | +--------------+ +-----+---------+ - | | | | dut1:data1| |dut1:data2 dut2:data1| |dut2:data2 VLAN55 U | | VLAN77 U VLAN55 U | | VLAN77 U | | | | - | | | | +-------+ | +----------+ +------------+ +--------+ | msend +--+ | mreceive | | mreceive | | msend | +-------+ +----------+ +------------+ +--------+ 10.0.1.11 10.0.2.11 10.0.1.22 10.0.2.22 - .... """ diff --git a/test/case/ietf_interfaces/ipv4_autoconf/Readme.adoc b/test/case/ietf_interfaces/ipv4_autoconf/Readme.adoc index e6ced04e..b88281ed 100644 --- a/test/case/ietf_interfaces/ipv4_autoconf/Readme.adoc +++ b/test/case/ietf_interfaces/ipv4_autoconf/Readme.adoc @@ -18,12 +18,12 @@ endif::testgroup[] endif::topdoc[] ==== Test sequence . Set up topology and attach to target DUT -. Configure interface target:mgmt with IPv4 ZeroConf IP -. Verify link-local address exist on target:mgmt -. Configure target:mgmt with a specific IPv4 ZeroConf IP -. Verify target:mgmt has link-local address 169.254.42.42 -. Remove IPv4 link-local addresses from target:mgmt -. Verify link-local addresses has been removed from target:mgmt +. Configure interface target:data with IPv4 ZeroConf IP +. Verify link-local address exist on target:data +. Configure target:data with a specific IPv4 ZeroConf IP +. Verify target:data has link-local address 169.254.42.42 +. Remove IPv4 link-local addresses from target:data +. Verify link-local addresses has been removed from target:data <<< diff --git a/test/case/ietf_interfaces/ipv4_autoconf/test.py b/test/case/ietf_interfaces/ipv4_autoconf/test.py index f721e478..a1e59f70 100755 --- a/test/case/ietf_interfaces/ipv4_autoconf/test.py +++ b/test/case/ietf_interfaces/ipv4_autoconf/test.py @@ -47,7 +47,7 @@ with infamy.Test() as test: env = infamy.Env() target = env.attach("target", "mgmt") - with test.step("Configure interface target:mgmt with IPv4 ZeroConf IP"): + with test.step("Configure interface target:data with IPv4 ZeroConf IP"): _, tport = env.ltop.xlate("target", "data") target.put_config_dict("ietf-interfaces", { @@ -66,10 +66,10 @@ with infamy.Test() as test: } }) - with test.step("Verify link-local address exist on target:mgmt"): + with test.step("Verify link-local address exist on target:data"): until(lambda: has_linklocal(target, tport), attempts=30) - with test.step("Configure target:mgmt with a specific IPv4 ZeroConf IP"): + with test.step("Configure target:data with a specific IPv4 ZeroConf IP"): _, tport = env.ltop.xlate("target", "data") target.put_config_dict("ietf-interfaces", { @@ -89,16 +89,16 @@ with infamy.Test() as test: } }) - with test.step("Verify target:mgmt has link-local address 169.254.42.42"): + with test.step("Verify target:data has link-local address 169.254.42.42"): until(lambda: has_linklocal(target, tport, request="169.254.42.42"), attempts=30) - with test.step("Remove IPv4 link-local addresses from target:mgmt"): + with test.step("Remove IPv4 link-local addresses from target:data"): xpath = f"/ietf-interfaces:interfaces/interface[name='{tport}']" \ "/ietf-ip:ipv4/infix-ip:autoconf" target.delete_xpath(xpath) - with test.step("Verify link-local addresses has been removed from target:mgmt"): + with test.step("Verify link-local addresses has been removed from target:data"): until(lambda: no_linklocal(target, tport), attempts=30) test.succeed() diff --git a/test/case/ietf_interfaces/ipv4_autoconf/topology.png b/test/case/ietf_interfaces/ipv4_autoconf/topology.png index b1209598..5444e060 100644 Binary files a/test/case/ietf_interfaces/ipv4_autoconf/topology.png and b/test/case/ietf_interfaces/ipv4_autoconf/topology.png differ diff --git a/test/case/ietf_interfaces/routing_basic/topology.png b/test/case/ietf_interfaces/routing_basic/topology.png index 9e2d5555..d8a5433f 100644 Binary files a/test/case/ietf_interfaces/routing_basic/topology.png and b/test/case/ietf_interfaces/routing_basic/topology.png differ diff --git a/test/case/ietf_interfaces/static_multicast_filters/topology.png b/test/case/ietf_interfaces/static_multicast_filters/topology.png index 91657527..1c448527 100644 Binary files a/test/case/ietf_interfaces/static_multicast_filters/topology.png and b/test/case/ietf_interfaces/static_multicast_filters/topology.png differ diff --git a/test/case/ietf_interfaces/veth_delete/Readme.adoc b/test/case/ietf_interfaces/veth_delete/Readme.adoc index d31a44b7..125aef7d 100644 --- a/test/case/ietf_interfaces/veth_delete/Readme.adoc +++ b/test/case/ietf_interfaces/veth_delete/Readme.adoc @@ -1,7 +1,7 @@ === Verify that VETH pairs can be deleted ==== Description ``` - veth0b veth0a e1 e2 + veth0b veth0a data1 data2 `---------' ``` @@ -21,13 +21,13 @@ image::topology.png[Verify that VETH pairs can be deleted topology] endif::testgroup[] endif::topdoc[] ==== Test sequence -. Initialize +. Set up topology and attach to target DUT . Create VETH pair -. Verify interfaces 'veth0a' and 'veth0b' exists -. Set IP address on target:eth0 (dummy op) -. Set IP address on target:eth1 (dummy op) +. Verify interfaces 'veth0a' and 'veth0b' exist +. Set IP address on target:data1 (dummy op) +. Set IP address on target:data2 (dummy op) . Reset configuration -. Verify target:eth0 and target:eth1 still exist +. Verify target:data1 and target:data2 still exist . Verify VETH pair have been removed diff --git a/test/case/ietf_interfaces/veth_delete/test.py b/test/case/ietf_interfaces/veth_delete/test.py index 366cb344..d36918d2 100755 --- a/test/case/ietf_interfaces/veth_delete/test.py +++ b/test/case/ietf_interfaces/veth_delete/test.py @@ -2,7 +2,7 @@ """Verify that VETH pairs can be deleted ``` - veth0b veth0a e1 e2 + veth0b veth0a data1 data2 `---------' ``` @@ -16,12 +16,12 @@ import infamy.iface as iface with infamy.Test() as test: - with test.step("Initialize"): + with test.step("Set up topology and attach to target DUT"): env = infamy.Env() target = env.attach("target", "mgmt") - _, eth0 = env.ltop.xlate("target", "eth0") - _, eth1 = env.ltop.xlate("target", "eth1") + _, data1 = env.ltop.xlate("target", "data1") + _, data2 = env.ltop.xlate("target", "data2") veth0a = "veth0a" veth0b = "veth0b" @@ -50,17 +50,17 @@ with infamy.Test() as test: } }) - with test.step("Verify interfaces 'veth0a' and 'veth0b' exists"): + with test.step("Verify interfaces 'veth0a' and 'veth0b' exist"): assert iface.exist(target, veth0a), \ f"Interface <{veth0a}> does not exist." assert iface.exist(target, veth0b), \ f"Interface <{veth0b}> does not exist." - with test.step("Set IP address on target:eth0 (dummy op)"): + with test.step("Set IP address on target:data1 (dummy op)"): target.put_config_dict("ietf-interfaces", { "interfaces": { "interface": [{ - "name": f"{eth0}", + "name": f"{data1}", "ipv4": { "address": [{ "ip": "10.0.0.1", @@ -71,11 +71,11 @@ with infamy.Test() as test: } }) - with test.step("Set IP address on target:eth1 (dummy op)"): + with test.step("Set IP address on target:data2 (dummy op)"): target.put_config_dict("ietf-interfaces", { "interfaces": { "interface": [{ - "name": f"{eth1}", + "name": f"{data2}", "ipv4": { "address": [{ "ip": "20.0.0.1", @@ -96,11 +96,11 @@ with infamy.Test() as test: # Calls target.test_reset() to apply safe-config target = env.attach("target", "mgmt") - with test.step("Verify target:eth0 and target:eth1 still exist"): - assert iface.exist(target, eth0), \ - f"Interface {eth0} missing!" - assert iface.exist(target, eth1), \ - f"Interface {eth1} missing!" + with test.step("Verify target:data1 and target:data2 still exist"): + assert iface.exist(target, data1), \ + f"Interface {data1} missing!" + assert iface.exist(target, data2), \ + f"Interface {data2} missing!" with test.step("Verify VETH pair have been removed"): assert not iface.exist(target, veth0a), \ diff --git a/test/case/ietf_interfaces/veth_delete/topology.dot b/test/case/ietf_interfaces/veth_delete/topology.dot index 0029eb79..256c2739 100644 --- a/test/case/ietf_interfaces/veth_delete/topology.dot +++ b/test/case/ietf_interfaces/veth_delete/topology.dot @@ -7,19 +7,19 @@ graph "1x3" { edge [color="cornflowerblue", penwidth="2"]; host [ - label="host | { tgt | dummy0 | dummy1 }", + label="host | { mgmt | data1 | data2 }", pos="0,12!", kind="controller", ]; target [ - label="{ mgmt | eth0 | eth1 } | target", + label="{ mgmt | data1 | data2 } | target", pos="10,12!", kind="infix", ]; - host:tgt -- target:mgmt [kind=mgmt] - host:dummy0 -- target:eth0 [color=black] - host:dummy1 -- target:eth1 [color=black] + host:mgmt -- target:mgmt [kind=mgmt, color=lightgrey] + host:data1 -- target:data1 [color=black] + host:data2 -- target:data2 [color=black] } diff --git a/test/case/ietf_interfaces/veth_delete/topology.png b/test/case/ietf_interfaces/veth_delete/topology.png index 154cd3d0..d89fbd9e 100644 Binary files a/test/case/ietf_interfaces/veth_delete/topology.png and b/test/case/ietf_interfaces/veth_delete/topology.png differ diff --git a/test/case/ietf_interfaces/vlan_ping/topology.png b/test/case/ietf_interfaces/vlan_ping/topology.png index 0d8ce220..48f192d9 100644 Binary files a/test/case/ietf_interfaces/vlan_ping/topology.png and b/test/case/ietf_interfaces/vlan_ping/topology.png differ diff --git a/test/case/ietf_interfaces/vlan_qos/topology.png b/test/case/ietf_interfaces/vlan_qos/topology.png index e3a223cd..60ac74fe 100644 Binary files a/test/case/ietf_interfaces/vlan_qos/topology.png and b/test/case/ietf_interfaces/vlan_qos/topology.png differ diff --git a/test/case/ietf_routing/ospf_basic/topology.png b/test/case/ietf_routing/ospf_basic/topology.png index fe90b6a1..038674a6 100644 Binary files a/test/case/ietf_routing/ospf_basic/topology.png and b/test/case/ietf_routing/ospf_basic/topology.png differ diff --git a/test/case/ietf_routing/ospf_multiarea/topology.png b/test/case/ietf_routing/ospf_multiarea/topology.png index 166544fb..f6ed6bbb 100644 Binary files a/test/case/ietf_routing/ospf_multiarea/topology.png and b/test/case/ietf_routing/ospf_multiarea/topology.png differ diff --git a/test/case/ietf_routing/ospf_unnumbered_interface/topology.png b/test/case/ietf_routing/ospf_unnumbered_interface/topology.png index 0ac22484..29bc7806 100644 Binary files a/test/case/ietf_routing/ospf_unnumbered_interface/topology.png and b/test/case/ietf_routing/ospf_unnumbered_interface/topology.png differ diff --git a/test/case/ietf_routing/static_routing/topology.png b/test/case/ietf_routing/static_routing/topology.png index 54c5ac27..68b00742 100644 Binary files a/test/case/ietf_routing/static_routing/topology.png and b/test/case/ietf_routing/static_routing/topology.png differ diff --git a/test/case/ietf_syslog/basic/Readme.adoc b/test/case/ietf_syslog/basic/Readme.adoc index 65500c1a..b194bc1b 100644 --- a/test/case/ietf_syslog/basic/Readme.adoc +++ b/test/case/ietf_syslog/basic/Readme.adoc @@ -15,8 +15,8 @@ image::topology.png[Syslog Basic topology] endif::testgroup[] endif::topdoc[] ==== Test sequence -. Initializing -. Configure DUT +. Set up topology and attach to target DUT +. Configure syslog on DUT to log to files '/log/bar.log' (absolute path) and 'foo' (non-absolute). . Verify log files /var/log/foo and /var/log/bar.log have been created diff --git a/test/case/ietf_syslog/basic/test.py b/test/case/ietf_syslog/basic/test.py index 19f7c980..20f3361a 100755 --- a/test/case/ietf_syslog/basic/test.py +++ b/test/case/ietf_syslog/basic/test.py @@ -9,14 +9,14 @@ import infamy import infamy.ssh as ssh with infamy.Test() as test: - with test.step("Initializing"): + with test.step("Set up topology and attach to target DUT"): env = infamy.Env() target = env.attach("target", "mgmt") tgtssh = env.attach("target", "mgmt", "ssh") factory = env.get_password("target") address = target.get_mgmt_ip() - with test.step("Configure DUT"): + with test.step("Configure syslog on DUT to log to files '/log/bar.log' (absolute path) and 'foo' (non-absolute)."): target.put_config_dict("ietf-syslog", { "syslog": { "actions": { diff --git a/test/case/ietf_syslog/remote/Readme.adoc b/test/case/ietf_syslog/remote/Readme.adoc index e6a4512a..b16f57be 100644 --- a/test/case/ietf_syslog/remote/Readme.adoc +++ b/test/case/ietf_syslog/remote/Readme.adoc @@ -15,7 +15,7 @@ image::topology.png[Remote syslog topology] endif::testgroup[] endif::topdoc[] ==== Test sequence -. Initialize +. Set up topology and attach to client and server DUTs . Configure DUTs . Send security:notice log message from client . Verify reception of client log message, incl. sorting to /log/security on server diff --git a/test/case/ietf_syslog/remote/test.py b/test/case/ietf_syslog/remote/test.py index 736374ee..f01c1abb 100755 --- a/test/case/ietf_syslog/remote/test.py +++ b/test/case/ietf_syslog/remote/test.py @@ -7,7 +7,7 @@ Verify logging to remote, acting as a remote, and RFC5424 log format. import infamy with infamy.Test() as test: - with test.step("Initialize"): + with test.step("Set up topology and attach to client and server DUTs"): env = infamy.Env() client = env.attach("client", "mgmt") server = env.attach("server", "mgmt") diff --git a/test/case/ietf_syslog/remote/topology.dot b/test/case/ietf_syslog/remote/topology.dot index 93d55fb0..36df1c80 100644 --- a/test/case/ietf_syslog/remote/topology.dot +++ b/test/case/ietf_syslog/remote/topology.dot @@ -24,7 +24,7 @@ graph "2x2" { kind="infix", ]; - host:cli_mgmt -- client:mgmt [kind=mgmt] - host:ser_mgmt -- server:mgmt [kind=mgmt] + host:cli_mgmt -- client:mgmt [kind=mgmt, color=lightgrey] + host:ser_mgmt -- server:mgmt [kind=mgmt, color=lightgrey] client:link -- server:link [color=black, fontcolor=black, taillabel="10.0.0.2/24", headlabel="10.0.0.1/24"] } diff --git a/test/case/ietf_syslog/remote/topology.png b/test/case/ietf_syslog/remote/topology.png index 91f426c9..b222d636 100644 Binary files a/test/case/ietf_syslog/remote/topology.png and b/test/case/ietf_syslog/remote/topology.png differ diff --git a/test/case/ietf_system/Readme.adoc b/test/case/ietf_system/Readme.adoc index 5a36374e..0b138e8b 100644 --- a/test/case/ietf_system/Readme.adoc +++ b/test/case/ietf_system/Readme.adoc @@ -12,3 +12,7 @@ include::user_admin/Readme.adoc[] include::timezone/Readme.adoc[] include::timezone_utc_offset/Readme.adoc[] + +include::ssh_key_authentication/Readme.adoc[] + +include::upgrade/Readme.adoc[] diff --git a/test/case/ietf_system/upgrade/test.py b/test/case/ietf_system/upgrade/test.py index 7a455394..1e05d4d1 100755 --- a/test/case/ietf_system/upgrade/test.py +++ b/test/case/ietf_system/upgrade/test.py @@ -61,7 +61,7 @@ with infamy.Test() as test: target = env.attach("target", "mgmt") - _, hport = env.ltop.xlate("host", "tgt") + _, hport = env.ltop.xlate("host", "mgmt") _, tport = env.ltop.xlate("target", "mgmt") hip = netifaces.ifaddresses(hport)[netifaces.AF_INET6][0]["addr"] hip = hip.replace(f"%{hport}", f"%{tport}") diff --git a/test/case/ietf_system/upgrade/topology.dot b/test/case/ietf_system/upgrade/topology.dot index dc72e816..26307027 100644 --- a/test/case/ietf_system/upgrade/topology.dot +++ b/test/case/ietf_system/upgrade/topology.dot @@ -7,7 +7,7 @@ graph "1x1" { edge [color="cornflowerblue", penwidth="2"]; host [ - label="host | { tgt }", + label="host | { mgmt }", pos="0,12!", kind="controller", ]; @@ -19,5 +19,5 @@ graph "1x1" { kind="infix", ]; - host:tgt -- target:mgmt [kind=mgmt] + host:mgmt -- target:mgmt [kind=mgmt, color=lightgrey] } diff --git a/test/case/ietf_system/upgrade/topology.png b/test/case/ietf_system/upgrade/topology.png index 5c6b4722..8956d675 100644 Binary files a/test/case/ietf_system/upgrade/topology.png and b/test/case/ietf_system/upgrade/topology.png differ diff --git a/test/case/infix_containers/container_bridge/topology.dot b/test/case/infix_containers/container_bridge/topology.dot index a02d3d41..6964b75b 100644 --- a/test/case/infix_containers/container_bridge/topology.dot +++ b/test/case/infix_containers/container_bridge/topology.dot @@ -7,7 +7,7 @@ graph "1x2" { edge [color="cornflowerblue", penwidth="2"]; host [ - label="host | { tgt | data }", + label="host | { mgmt | data }", pos="0,12!", kind="controller", ]; @@ -19,6 +19,6 @@ graph "1x2" { kind="infix", ]; - host:tgt -- target:mgmt [kind=mgmt] + host:mgmt -- target:mgmt [kind=mgmt, color=lightgrey] host:data -- target:data [color=black, fontcolor=black, fontsize=12, taillabel="10.0.0.1/24", headlabel="10.0.0.2/24"] } \ No newline at end of file diff --git a/test/case/infix_containers/container_bridge/topology.png b/test/case/infix_containers/container_bridge/topology.png index 8b93e191..cfb1862d 100644 Binary files a/test/case/infix_containers/container_bridge/topology.png and b/test/case/infix_containers/container_bridge/topology.png differ diff --git a/test/case/infix_containers/container_phys/topology.png b/test/case/infix_containers/container_phys/topology.png index 8b93e191..cfb1862d 100644 Binary files a/test/case/infix_containers/container_phys/topology.png and b/test/case/infix_containers/container_phys/topology.png differ diff --git a/test/case/infix_containers/container_veth/topology.png b/test/case/infix_containers/container_veth/topology.png index 8b93e191..cfb1862d 100644 Binary files a/test/case/infix_containers/container_veth/topology.png and b/test/case/infix_containers/container_veth/topology.png differ diff --git a/test/case/infix_dhcp/dhcp_basic/topology.png b/test/case/infix_dhcp/dhcp_basic/topology.png index 5ac0f4f4..23cd9b41 100644 Binary files a/test/case/infix_dhcp/dhcp_basic/topology.png and b/test/case/infix_dhcp/dhcp_basic/topology.png differ diff --git a/test/case/infix_dhcp/dhcp_router/topology.png b/test/case/infix_dhcp/dhcp_router/topology.png index d001f8ee..27108b32 100644 Binary files a/test/case/infix_dhcp/dhcp_router/topology.png and b/test/case/infix_dhcp/dhcp_router/topology.png differ diff --git a/test/case/infix_dhcp/dhcp_routes/topology.png b/test/case/infix_dhcp/dhcp_routes/topology.png index 8bcfa9aa..84847fd3 100644 Binary files a/test/case/infix_dhcp/dhcp_routes/topology.png and b/test/case/infix_dhcp/dhcp_routes/topology.png differ diff --git a/test/infamy/topologies/1x1.dot b/test/infamy/topologies/1x1.dot index d841c63c..5a9bbf64 100644 --- a/test/infamy/topologies/1x1.dot +++ b/test/infamy/topologies/1x1.dot @@ -19,5 +19,5 @@ graph "1x1" { kind="infix", ]; - host:mgmt -- target:mgmt [kind=mgmt, color="lightgray"] + host:mgmt -- target:mgmt [kind=mgmt, color="lightgray"] }