From 34cb22996594faf2c196142e3f4fbca8ad93165e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= Date: Mon, 14 Oct 2024 15:32:40 +0200 Subject: [PATCH] test: Update topologies and test texts All mgmt links should be lightgrey, all mgmt ports should be named mgmt links between duts should be named link. --- test/case/ietf_hardware/usb/Readme.adoc | 2 +- test/case/ietf_hardware/usb/test.py | 2 +- test/case/ietf_hardware/usb/topology.png | Bin 3111 -> 3293 bytes .../ietf_hardware/usb_two_ports/Readme.adoc | 4 +- test/case/ietf_hardware/usb_two_ports/test.py | 4 +- .../ietf_hardware/usb_two_ports/topology.png | Bin 3111 -> 3293 bytes .../ietf_interfaces/bridge_basic/topology.dot | 4 +- .../ietf_interfaces/bridge_basic/topology.png | Bin 6863 -> 9945 bytes .../bridge_fwd_dual_dut/Readme.adoc | 29 +++---- .../bridge_fwd_dual_dut/test.py | 29 +++---- .../bridge_fwd_dual_dut/topology.png | Bin 21174 -> 20899 bytes .../ietf_interfaces/bridge_veth/Readme.adoc | 11 ++- test/case/ietf_interfaces/bridge_veth/test.py | 18 ++-- .../ietf_interfaces/bridge_veth/topology.dot | 4 +- .../ietf_interfaces/bridge_veth/topology.png | Bin 9405 -> 9566 bytes .../ietf_interfaces/bridge_vlan/Readme.adoc | 14 ++- test/case/ietf_interfaces/bridge_vlan/test.py | 32 ++++--- .../ietf_interfaces/bridge_vlan/topology.dot | 14 +-- .../ietf_interfaces/bridge_vlan/topology.png | Bin 20266 -> 17975 bytes .../bridge_vlan_separation/Readme.adoc | 21 ++++- .../bridge_vlan_separation/test.py | 50 ++++++----- .../bridge_vlan_separation/topology.dot | 18 ++-- .../bridge_vlan_separation/topology.png | Bin 30946 -> 29391 bytes .../ietf_interfaces/dual_bridge/Readme.adoc | 18 ++-- test/case/ietf_interfaces/dual_bridge/test.py | 17 ++-- .../ietf_interfaces/dual_bridge/topology.dot | 2 +- .../ietf_interfaces/dual_bridge/topology.png | Bin 6863 -> 5640 bytes .../ietf_interfaces/igmp_basic/Readme.adoc | 25 ++++-- test/case/ietf_interfaces/igmp_basic/test.py | 49 ++++++----- .../ietf_interfaces/igmp_basic/topology.dot | 12 +-- .../ietf_interfaces/igmp_basic/topology.png | Bin 14439 -> 14402 bytes .../ietf_interfaces/ipv4_address/topology.png | Bin 3111 -> 3293 bytes .../ipv4_autoconf/topology.png | Bin 5640 -> 9945 bytes .../ietf_interfaces/routing_basic/Readme.adoc | 12 +-- .../ietf_interfaces/routing_basic/test.py | 20 ++--- .../routing_basic/topology.dot | 10 +-- .../routing_basic/topology.png | Bin 10115 -> 9154 bytes .../static_multicast_filters/Readme.adoc | 27 ++++-- .../static_multicast_filters/test.py | 51 +++++------ .../static_multicast_filters/topology.png | Bin 14439 -> 14402 bytes .../ietf_interfaces/vlan_ping/Readme.adoc | 1 + test/case/ietf_interfaces/vlan_ping/test.py | 81 +++++++++--------- .../ietf_interfaces/vlan_ping/topology.dot | 4 +- .../ietf_interfaces/vlan_ping/topology.png | Bin 9889 -> 10004 bytes test/case/ietf_routing/ospf_basic/Readme.adoc | 1 + test/case/ietf_routing/ospf_basic/test.py | 3 +- .../case/ietf_routing/ospf_basic/topology.dot | 8 +- .../case/ietf_routing/ospf_basic/topology.png | Bin 34361 -> 32927 bytes .../ietf_routing/ospf_multiarea/Readme.adoc | 16 ++++ test/case/ietf_routing/ospf_multiarea/test.py | 39 ++++++--- .../ietf_routing/ospf_multiarea/topology.dot | 4 +- .../ietf_routing/ospf_multiarea/topology.png | Bin 78590 -> 78280 bytes .../ospf_unnumbered_interface/Readme.adoc | 3 +- .../ospf_unnumbered_interface/test.py | 6 +- .../ospf_unnumbered_interface/topology.dot | 4 +- .../ospf_unnumbered_interface/topology.png | Bin 32200 -> 30802 bytes .../ietf_routing/static_routing/Readme.adoc | 1 + test/case/ietf_routing/static_routing/test.py | 3 +- .../ietf_routing/static_routing/topology.dot | 6 +- .../ietf_routing/static_routing/topology.png | Bin 29531 -> 28104 bytes test/case/ietf_syslog/basic/topology.png | Bin 3111 -> 3293 bytes .../ietf_system/add_delete_user/topology.png | Bin 3111 -> 3293 bytes test/case/ietf_system/hostname/topology.png | Bin 3111 -> 3293 bytes .../ssh_key_authentication/topology.png | Bin 3111 -> 3293 bytes test/case/ietf_system/timezone/topology.png | Bin 3111 -> 3293 bytes .../timezone_utc_offset/topology.png | Bin 3111 -> 3293 bytes test/case/ietf_system/user_admin/topology.png | Bin 3111 -> 3293 bytes .../container_basic/topology.png | Bin 5549 -> 5640 bytes test/case/misc/operational_all/Readme.adoc | 13 +-- test/case/misc/operational_all/test.py | 9 +- test/case/misc/operational_all/topology.png | Bin 3111 -> 3293 bytes test/case/misc/start_from_startup/Readme.adoc | 3 +- test/case/misc/start_from_startup/test.py | 19 ++-- .../case/misc/start_from_startup/topology.png | Bin 3111 -> 3293 bytes test/infamy/topologies/1x1.dot | 4 +- 75 files changed, 433 insertions(+), 294 deletions(-) diff --git a/test/case/ietf_hardware/usb/Readme.adoc b/test/case/ietf_hardware/usb/Readme.adoc index 431205e3..fb2fd906 100644 --- a/test/case/ietf_hardware/usb/Readme.adoc +++ b/test/case/ietf_hardware/usb/Readme.adoc @@ -23,7 +23,7 @@ image::topology.png[USB configuration topology] endif::testgroup[] endif::topdoc[] ==== Test sequence -. Initialize +. Set up topology and attach to target DUT . Unlock all USB ports . Verify that all USB ports are unlocked . Lock all USB ports diff --git a/test/case/ietf_hardware/usb/test.py b/test/case/ietf_hardware/usb/test.py index 638c350c..ff88e3a8 100755 --- a/test/case/ietf_hardware/usb/test.py +++ b/test/case/ietf_hardware/usb/test.py @@ -20,7 +20,7 @@ import infamy.netconf as netconf from infamy.util import until, wait_boot 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") available = usb.get_usb_ports(target) diff --git a/test/case/ietf_hardware/usb/topology.png b/test/case/ietf_hardware/usb/topology.png index 21661c1820991c72b55ff3a883c46a8868eb56a3..a9abc1911a2cbd580bfab3046175240c459c961e 100644 GIT binary patch literal 3293 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