From 76f0c8e3e697ee130d73ab73aba1717fc57553b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= Date: Tue, 22 Oct 2024 10:14:28 +0200 Subject: [PATCH 1/2] test:spec: Add version of Infix/OEM build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Show the version of the infix build, for traceability This fix #744 Signed-off-by: Mattias Walström --- test/spec/Readme.adoc | 44 ---------------------------------------- test/spec/Readme.adoc.in | 2 +- test/test.mk | 12 ++++++++--- 3 files changed, 10 insertions(+), 48 deletions(-) delete mode 100644 test/spec/Readme.adoc diff --git a/test/spec/Readme.adoc b/test/spec/Readme.adoc deleted file mode 100644 index 17a747449..000000000 --- a/test/spec/Readme.adoc +++ /dev/null @@ -1,44 +0,0 @@ -:topdoc: - -= Test specification -This is the test specification for Infix. -:title-page: -:toc: -:toclevels: 2 -:sectnums: -:sectnumlevels: 2 - -<<< -include::../case/misc/Readme.adoc[] - -<<< - -include::../case/ietf_system/Readme.adoc[] - -<<< - -include::../case/ietf_syslog/Readme.adoc[] - -<<< - -include::../case/ietf_interfaces/Readme.adoc[] - -<<< - -include::../case/ietf_routing/Readme.adoc[] - -<<< - -include::../case/infix_containers/Readme.adoc[] - -<<< - -include::../case/infix_dhcp/Readme.adoc[] - -<<< - -include::../case/ietf_hardware/Readme.adoc[] - -<<< - -include::../case/infix_services/Readme.adoc[] diff --git a/test/spec/Readme.adoc.in b/test/spec/Readme.adoc.in index 1c0e62cce..0b26bd01a 100644 --- a/test/spec/Readme.adoc.in +++ b/test/spec/Readme.adoc.in @@ -1,7 +1,7 @@ :topdoc: = Test specification -This is the test specification for {REPLACE}. +{REPLACE} :title-page: :toc: :toclevels: 2 diff --git a/test/test.mk b/test/test.mk index 9f9b8a400..4631c46e5 100644 --- a/test/test.mk +++ b/test/test.mk @@ -4,8 +4,14 @@ ninepm := $(BR2_EXTERNAL_INFIX_PATH)/test/9pm/9pm.py spec-dir := $(test-dir)/spec test-specification := $(O)/images/test-specification.pdf -UNIT_TESTS ?= $(test-dir)/case/all-repo.yaml $(test-dir)/case/all-unit.yaml -TESTS ?= $(test-dir)/case/all.yaml +UNIT_TESTS ?= $(test-dir)/case/all-repo.yaml $(test-dir)/case/all-unit.yaml +TESTS ?= $(test-dir)/case/all.yaml +ifeq ($INFIX_OEM_PATH), "") +GIT_PATH = $(INFIX_OEM_PATH) +else +GIT_PATH = $(BR2_EXTERNAL_INFIX_PATH) +endif +GIT_VERSION = $(shell git -C $(GIT_PATH) describe --dirty --always --tags) IMAGE ?= infix TOPOLOGY-DIR ?= $(test-dir)/virt/quad @@ -34,7 +40,7 @@ test-sh: $(test-dir)/env $(base) $(mode) $(binaries) -i /bin/sh test-spec: - @sed 's/{REPLACE}/$(subst ",,$(INFIX_NAME))/' $(spec-dir)/Readme.adoc.in > $(spec-dir)/Readme.adoc + @sed 's/{REPLACE}/$(subst ",,$(INFIX_NAME)) $(GIT_VERSION)/' $(spec-dir)/Readme.adoc.in > $(spec-dir)/Readme.adoc @$(spec-dir)/generate_spec.py -d $(test-dir)/case -r $(BR2_EXTERNAL_INFIX_PATH) @asciidoctor-pdf --failure-level INFO --theme $(spec-dir)/theme.yml -a pdf-fontsdir=$(spec-dir)/fonts -o $(test-specification) $(spec-dir)/Readme.adoc From 3b3656c8f53a8b28bed50e420dea0b2cad241767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= Date: Tue, 22 Oct 2024 10:20:43 +0200 Subject: [PATCH 2/2] test: spec: change image format from PNG to SVG MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SVG is a plain text file, better to see why it changed than binary PNG. Also fix #744 by adding infix/OEM hash to test specification Signed-off-by: Mattias Walström --- test/case/ietf_hardware/usb/Readme.adoc | 6 +- test/case/ietf_hardware/usb/topology.png | Bin 3293 -> 0 bytes test/case/ietf_hardware/usb/topology.svg | 33 ++++ .../ietf_hardware/usb_two_ports/Readme.adoc | 6 +- .../ietf_hardware/usb_two_ports/topology.png | Bin 3293 -> 0 bytes .../ietf_hardware/usb_two_ports/topology.svg | 33 ++++ .../ietf_interfaces/bridge_basic/Readme.adoc | 6 +- .../ietf_interfaces/bridge_basic/topology.dot | 4 +- .../ietf_interfaces/bridge_basic/topology.png | Bin 10199 -> 0 bytes .../ietf_interfaces/bridge_basic/topology.svg | 44 +++++ .../bridge_fwd_dual_dut/Readme.adoc | 6 +- .../bridge_fwd_dual_dut/topology.dot | 4 +- .../bridge_fwd_dual_dut/topology.png | Bin 21174 -> 0 bytes .../bridge_fwd_dual_dut/topology.svg | 88 +++++++++ .../bridge_fwd_sgl_dut/Readme.adoc | 6 +- .../bridge_fwd_sgl_dut/topology.dot | 4 +- .../bridge_fwd_sgl_dut/topology.png | Bin 7668 -> 0 bytes .../bridge_fwd_sgl_dut/topology.svg | 53 +++++ .../ietf_interfaces/bridge_veth/Readme.adoc | 6 +- .../ietf_interfaces/bridge_veth/topology.dot | 4 +- .../ietf_interfaces/bridge_veth/topology.png | Bin 9763 -> 0 bytes .../ietf_interfaces/bridge_veth/topology.svg | 44 +++++ .../ietf_interfaces/bridge_vlan/Readme.adoc | 6 +- .../ietf_interfaces/bridge_vlan/topology.dot | 4 +- .../ietf_interfaces/bridge_vlan/topology.png | Bin 17975 -> 0 bytes .../ietf_interfaces/bridge_vlan/topology.svg | 68 +++++++ .../bridge_vlan_separation/Readme.adoc | 6 +- .../bridge_vlan_separation/topology.dot | 4 +- .../bridge_vlan_separation/topology.png | Bin 29913 -> 0 bytes .../bridge_vlan_separation/topology.svg | 103 ++++++++++ .../ietf_interfaces/dual_bridge/Readme.adoc | 6 +- .../ietf_interfaces/dual_bridge/topology.png | Bin 5640 -> 0 bytes .../ietf_interfaces/dual_bridge/topology.svg | 42 ++++ .../iface_enable_disable/Readme.adoc | 6 +- .../iface_enable_disable/topology.dot | 6 +- .../iface_enable_disable/topology.png | Bin 20743 -> 0 bytes .../iface_enable_disable/topology.svg | 68 +++++++ .../iface_phys_address/Readme.adoc | 6 +- .../iface_phys_address/topology.png | Bin 5640 -> 0 bytes .../iface_phys_address/topology.svg | 42 ++++ .../ietf_interfaces/igmp_basic/Readme.adoc | 6 +- .../ietf_interfaces/igmp_basic/topology.dot | 4 +- .../ietf_interfaces/igmp_basic/topology.png | Bin 15432 -> 0 bytes .../ietf_interfaces/igmp_basic/topology.svg | 65 +++++++ .../ietf_interfaces/igmp_vlan/Readme.adoc | 6 +- .../ietf_interfaces/igmp_vlan/topology.dot | 4 +- .../ietf_interfaces/igmp_vlan/topology.png | Bin 39616 -> 0 bytes .../ietf_interfaces/igmp_vlan/topology.svg | 107 ++++++++++ .../ietf_interfaces/ipv4_address/Readme.adoc | 6 +- .../ietf_interfaces/ipv4_address/topology.png | Bin 3293 -> 0 bytes .../ietf_interfaces/ipv4_address/topology.svg | 33 ++++ .../ietf_interfaces/ipv4_autoconf/Readme.adoc | 6 +- .../ipv4_autoconf/topology.png | Bin 5640 -> 0 bytes .../ipv4_autoconf/topology.svg | 42 ++++ .../ietf_interfaces/ipv6_address/Readme.adoc | 6 +- .../ietf_interfaces/ipv6_address/topology.png | Bin 5640 -> 0 bytes .../ietf_interfaces/ipv6_address/topology.svg | 42 ++++ .../ietf_interfaces/routing_basic/Readme.adoc | 6 +- .../routing_basic/topology.dot | 11 +- .../routing_basic/topology.png | Bin 10551 -> 0 bytes .../routing_basic/topology.svg | 57 ++++++ .../static_multicast_filters/Readme.adoc | 6 +- .../static_multicast_filters/topology.png | Bin 15432 -> 0 bytes .../static_multicast_filters/topology.svg | 65 +++++++ .../verify_all_interface_types/Readme.adoc | 6 +- .../verify_all_interface_types/topology.dot | 4 +- .../verify_all_interface_types/topology.png | Bin 7903 -> 0 bytes .../verify_all_interface_types/topology.svg | 51 +++++ .../ietf_interfaces/veth_delete/Readme.adoc | 6 +- .../ietf_interfaces/veth_delete/topology.dot | 4 +- .../ietf_interfaces/veth_delete/topology.png | Bin 6302 -> 0 bytes .../ietf_interfaces/veth_delete/topology.svg | 51 +++++ .../ietf_interfaces/vlan_ping/Readme.adoc | 6 +- .../ietf_interfaces/vlan_ping/topology.dot | 4 +- .../ietf_interfaces/vlan_ping/topology.png | Bin 10538 -> 0 bytes .../ietf_interfaces/vlan_ping/topology.svg | 46 +++++ .../case/ietf_interfaces/vlan_qos/Readme.adoc | 6 +- .../ietf_interfaces/vlan_qos/topology.dot | 4 +- .../ietf_interfaces/vlan_qos/topology.png | Bin 18763 -> 0 bytes .../ietf_interfaces/vlan_qos/topology.svg | 55 ++++++ test/case/ietf_routing/ospf_basic/Readme.adoc | 6 +- .../case/ietf_routing/ospf_basic/topology.dot | 4 +- .../case/ietf_routing/ospf_basic/topology.png | Bin 35113 -> 0 bytes .../case/ietf_routing/ospf_basic/topology.svg | 76 ++++++++ .../ietf_routing/ospf_multiarea/Readme.adoc | 6 +- .../ietf_routing/ospf_multiarea/topology.dot | 4 +- .../ietf_routing/ospf_multiarea/topology.png | Bin 82768 -> 0 bytes .../ietf_routing/ospf_multiarea/topology.svg | 182 ++++++++++++++++++ .../ospf_unnumbered_interface/Readme.adoc | 6 +- .../ospf_unnumbered_interface/topology.dot | 4 +- .../ospf_unnumbered_interface/topology.png | Bin 32329 -> 0 bytes .../ospf_unnumbered_interface/topology.svg | 76 ++++++++ .../ietf_routing/static_routing/Readme.adoc | 6 +- .../ietf_routing/static_routing/topology.dot | 4 +- .../ietf_routing/static_routing/topology.png | Bin 29244 -> 0 bytes .../ietf_routing/static_routing/topology.svg | 76 ++++++++ test/case/ietf_syslog/basic/Readme.adoc | 6 +- test/case/ietf_syslog/basic/topology.png | Bin 3293 -> 0 bytes test/case/ietf_syslog/basic/topology.svg | 33 ++++ test/case/ietf_syslog/remote/Readme.adoc | 6 +- test/case/ietf_syslog/remote/topology.dot | 4 +- test/case/ietf_syslog/remote/topology.png | Bin 19159 -> 0 bytes test/case/ietf_syslog/remote/topology.svg | 59 ++++++ .../ietf_system/add_delete_user/Readme.adoc | 6 +- .../ietf_system/add_delete_user/topology.png | Bin 3293 -> 0 bytes .../ietf_system/add_delete_user/topology.svg | 33 ++++ test/case/ietf_system/hostname/Readme.adoc | 6 +- test/case/ietf_system/hostname/topology.png | Bin 3293 -> 0 bytes test/case/ietf_system/hostname/topology.svg | 33 ++++ .../ssh_key_authentication/Readme.adoc | 6 +- .../ssh_key_authentication/topology.png | Bin 3293 -> 0 bytes .../ssh_key_authentication/topology.svg | 33 ++++ test/case/ietf_system/timezone/Readme.adoc | 6 +- test/case/ietf_system/timezone/topology.png | Bin 3293 -> 0 bytes test/case/ietf_system/timezone/topology.svg | 33 ++++ .../timezone_utc_offset/Readme.adoc | 6 +- .../timezone_utc_offset/topology.png | Bin 3293 -> 0 bytes .../timezone_utc_offset/topology.svg | 33 ++++ test/case/ietf_system/upgrade/Readme.adoc | 6 +- test/case/ietf_system/upgrade/topology.dot | 4 +- test/case/ietf_system/upgrade/topology.png | Bin 3181 -> 0 bytes test/case/ietf_system/upgrade/topology.svg | 33 ++++ test/case/ietf_system/user_admin/Readme.adoc | 6 +- test/case/ietf_system/user_admin/topology.png | Bin 3293 -> 0 bytes test/case/ietf_system/user_admin/topology.svg | 33 ++++ .../container_basic/Readme.adoc | 6 +- .../container_basic/topology.png | Bin 5640 -> 0 bytes .../container_basic/topology.svg | 42 ++++ .../container_bridge/Readme.adoc | 6 +- .../container_bridge/topology.dot | 6 +- .../container_bridge/topology.png | Bin 6870 -> 0 bytes .../container_bridge/topology.svg | 44 +++++ .../container_firewall_basic/Readme.adoc | 6 +- .../container_firewall_basic/topology.png | Bin 8613 -> 0 bytes .../container_firewall_basic/topology.svg | 45 +++++ .../container_phys/Readme.adoc | 6 +- .../container_phys/topology.png | Bin 6870 -> 0 bytes .../container_phys/topology.svg | 44 +++++ .../container_veth/Readme.adoc | 6 +- .../container_veth/network_diagram.svg | 1 + .../container_veth/topology.png | Bin 6870 -> 0 bytes .../container_veth/topology.svg | 44 +++++ test/case/infix_dhcp/dhcp_basic/Readme.adoc | 6 +- test/case/infix_dhcp/dhcp_basic/topology.dot | 4 +- test/case/infix_dhcp/dhcp_basic/topology.png | Bin 8832 -> 0 bytes test/case/infix_dhcp/dhcp_basic/topology.svg | 44 +++++ test/case/infix_dhcp/dhcp_router/Readme.adoc | 6 +- test/case/infix_dhcp/dhcp_router/topology.dot | 4 +- test/case/infix_dhcp/dhcp_router/topology.png | Bin 10599 -> 0 bytes test/case/infix_dhcp/dhcp_router/topology.svg | 44 +++++ test/case/infix_dhcp/dhcp_routes/Readme.adoc | 6 +- test/case/infix_dhcp/dhcp_routes/topology.dot | 4 +- test/case/infix_dhcp/dhcp_routes/topology.png | Bin 11045 -> 0 bytes test/case/infix_dhcp/dhcp_routes/topology.svg | 44 +++++ .../infix_services/services_basic/Readme.adoc | 6 +- .../services_basic/topology.dot | 5 +- .../services_basic/topology.png | Bin 7569 -> 0 bytes .../services_basic/topology.svg | 44 +++++ test/case/misc/operational_all/Readme.adoc | 6 +- test/case/misc/operational_all/topology.png | Bin 3293 -> 0 bytes test/case/misc/operational_all/topology.svg | 33 ++++ test/case/misc/start_from_startup/Readme.adoc | 6 +- .../case/misc/start_from_startup/topology.png | Bin 3293 -> 0 bytes .../case/misc/start_from_startup/topology.svg | 33 ++++ test/infamy/topologies/1x1.dot | 4 +- test/infamy/topologies/1x2.dot | 4 +- test/spec/generate_spec.py | 16 +- 167 files changed, 2636 insertions(+), 203 deletions(-) delete mode 100644 test/case/ietf_hardware/usb/topology.png create mode 100644 test/case/ietf_hardware/usb/topology.svg delete mode 100644 test/case/ietf_hardware/usb_two_ports/topology.png create mode 100644 test/case/ietf_hardware/usb_two_ports/topology.svg delete mode 100644 test/case/ietf_interfaces/bridge_basic/topology.png create mode 100644 test/case/ietf_interfaces/bridge_basic/topology.svg delete mode 100644 test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.png create mode 100644 test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.svg delete mode 100644 test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.png create mode 100644 test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.svg delete mode 100644 test/case/ietf_interfaces/bridge_veth/topology.png create mode 100644 test/case/ietf_interfaces/bridge_veth/topology.svg delete mode 100644 test/case/ietf_interfaces/bridge_vlan/topology.png create mode 100644 test/case/ietf_interfaces/bridge_vlan/topology.svg delete mode 100644 test/case/ietf_interfaces/bridge_vlan_separation/topology.png create mode 100644 test/case/ietf_interfaces/bridge_vlan_separation/topology.svg delete mode 100644 test/case/ietf_interfaces/dual_bridge/topology.png create mode 100644 test/case/ietf_interfaces/dual_bridge/topology.svg delete mode 100644 test/case/ietf_interfaces/iface_enable_disable/topology.png create mode 100644 test/case/ietf_interfaces/iface_enable_disable/topology.svg delete mode 100644 test/case/ietf_interfaces/iface_phys_address/topology.png create mode 100644 test/case/ietf_interfaces/iface_phys_address/topology.svg delete mode 100644 test/case/ietf_interfaces/igmp_basic/topology.png create mode 100644 test/case/ietf_interfaces/igmp_basic/topology.svg delete mode 100644 test/case/ietf_interfaces/igmp_vlan/topology.png create mode 100644 test/case/ietf_interfaces/igmp_vlan/topology.svg delete mode 100644 test/case/ietf_interfaces/ipv4_address/topology.png create mode 100644 test/case/ietf_interfaces/ipv4_address/topology.svg delete mode 100644 test/case/ietf_interfaces/ipv4_autoconf/topology.png create mode 100644 test/case/ietf_interfaces/ipv4_autoconf/topology.svg delete mode 100644 test/case/ietf_interfaces/ipv6_address/topology.png create mode 100644 test/case/ietf_interfaces/ipv6_address/topology.svg delete mode 100644 test/case/ietf_interfaces/routing_basic/topology.png create mode 100644 test/case/ietf_interfaces/routing_basic/topology.svg delete mode 100644 test/case/ietf_interfaces/static_multicast_filters/topology.png create mode 100644 test/case/ietf_interfaces/static_multicast_filters/topology.svg delete mode 100644 test/case/ietf_interfaces/verify_all_interface_types/topology.png create mode 100644 test/case/ietf_interfaces/verify_all_interface_types/topology.svg delete mode 100644 test/case/ietf_interfaces/veth_delete/topology.png create mode 100644 test/case/ietf_interfaces/veth_delete/topology.svg delete mode 100644 test/case/ietf_interfaces/vlan_ping/topology.png create mode 100644 test/case/ietf_interfaces/vlan_ping/topology.svg delete mode 100644 test/case/ietf_interfaces/vlan_qos/topology.png create mode 100644 test/case/ietf_interfaces/vlan_qos/topology.svg delete mode 100644 test/case/ietf_routing/ospf_basic/topology.png create mode 100644 test/case/ietf_routing/ospf_basic/topology.svg delete mode 100644 test/case/ietf_routing/ospf_multiarea/topology.png create mode 100644 test/case/ietf_routing/ospf_multiarea/topology.svg delete mode 100644 test/case/ietf_routing/ospf_unnumbered_interface/topology.png create mode 100644 test/case/ietf_routing/ospf_unnumbered_interface/topology.svg delete mode 100644 test/case/ietf_routing/static_routing/topology.png create mode 100644 test/case/ietf_routing/static_routing/topology.svg delete mode 100644 test/case/ietf_syslog/basic/topology.png create mode 100644 test/case/ietf_syslog/basic/topology.svg delete mode 100644 test/case/ietf_syslog/remote/topology.png create mode 100644 test/case/ietf_syslog/remote/topology.svg delete mode 100644 test/case/ietf_system/add_delete_user/topology.png create mode 100644 test/case/ietf_system/add_delete_user/topology.svg delete mode 100644 test/case/ietf_system/hostname/topology.png create mode 100644 test/case/ietf_system/hostname/topology.svg delete mode 100644 test/case/ietf_system/ssh_key_authentication/topology.png create mode 100644 test/case/ietf_system/ssh_key_authentication/topology.svg delete mode 100644 test/case/ietf_system/timezone/topology.png create mode 100644 test/case/ietf_system/timezone/topology.svg delete mode 100644 test/case/ietf_system/timezone_utc_offset/topology.png create mode 100644 test/case/ietf_system/timezone_utc_offset/topology.svg delete mode 100644 test/case/ietf_system/upgrade/topology.png create mode 100644 test/case/ietf_system/upgrade/topology.svg delete mode 100644 test/case/ietf_system/user_admin/topology.png create mode 100644 test/case/ietf_system/user_admin/topology.svg delete mode 100644 test/case/infix_containers/container_basic/topology.png create mode 100644 test/case/infix_containers/container_basic/topology.svg delete mode 100644 test/case/infix_containers/container_bridge/topology.png create mode 100644 test/case/infix_containers/container_bridge/topology.svg delete mode 100644 test/case/infix_containers/container_firewall_basic/topology.png create mode 100644 test/case/infix_containers/container_firewall_basic/topology.svg delete mode 100644 test/case/infix_containers/container_phys/topology.png create mode 100644 test/case/infix_containers/container_phys/topology.svg create mode 100644 test/case/infix_containers/container_veth/network_diagram.svg delete mode 100644 test/case/infix_containers/container_veth/topology.png create mode 100644 test/case/infix_containers/container_veth/topology.svg delete mode 100644 test/case/infix_dhcp/dhcp_basic/topology.png create mode 100644 test/case/infix_dhcp/dhcp_basic/topology.svg delete mode 100644 test/case/infix_dhcp/dhcp_router/topology.png create mode 100644 test/case/infix_dhcp/dhcp_router/topology.svg delete mode 100644 test/case/infix_dhcp/dhcp_routes/topology.png create mode 100644 test/case/infix_dhcp/dhcp_routes/topology.svg delete mode 100644 test/case/infix_services/services_basic/topology.png create mode 100644 test/case/infix_services/services_basic/topology.svg delete mode 100644 test/case/misc/operational_all/topology.png create mode 100644 test/case/misc/operational_all/topology.svg delete mode 100644 test/case/misc/start_from_startup/topology.png create mode 100644 test/case/misc/start_from_startup/topology.svg diff --git a/test/case/ietf_hardware/usb/Readme.adoc b/test/case/ietf_hardware/usb/Readme.adoc index fb2fd906d..2c8645b7f 100644 --- a/test/case/ietf_hardware/usb/Readme.adoc +++ b/test/case/ietf_hardware/usb/Readme.adoc @@ -12,14 +12,14 @@ port is handled correctly. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_hardware/usb/topology.png[USB configuration topology] +image::../../test/case/ietf_hardware/usb/topology.svg[USB configuration topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::usb/topology.png[USB configuration topology] +image::usb/topology.svg[USB configuration topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[USB configuration topology] +image::topology.svg[USB configuration topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_hardware/usb/topology.png b/test/case/ietf_hardware/usb/topology.png deleted file mode 100644 index a9abc1911a2cbd580bfab3046175240c459c961e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3293 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 OK`xu4&8koyasLKk_b + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/case/ietf_hardware/usb_two_ports/Readme.adoc b/test/case/ietf_hardware/usb_two_ports/Readme.adoc index 4e4748315..c99280185 100644 --- a/test/case/ietf_hardware/usb_two_ports/Readme.adoc +++ b/test/case/ietf_hardware/usb_two_ports/Readme.adoc @@ -5,14 +5,14 @@ when having two USB ports. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_hardware/usb_two_ports/topology.png[USB configuration with two USB ports topology] +image::../../test/case/ietf_hardware/usb_two_ports/topology.svg[USB configuration with two USB ports topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::usb_two_ports/topology.png[USB configuration with two USB ports topology] +image::usb_two_ports/topology.svg[USB configuration with two USB ports topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[USB configuration with two USB ports topology] +image::topology.svg[USB configuration with two USB ports topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_hardware/usb_two_ports/topology.png b/test/case/ietf_hardware/usb_two_ports/topology.png deleted file mode 100644 index a9abc1911a2cbd580bfab3046175240c459c961e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3293 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 OK`xu4&8koyasLKk_b + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/case/ietf_interfaces/bridge_basic/Readme.adoc b/test/case/ietf_interfaces/bridge_basic/Readme.adoc index e0f2c420f..b43fcef56 100644 --- a/test/case/ietf_interfaces/bridge_basic/Readme.adoc +++ b/test/case/ietf_interfaces/bridge_basic/Readme.adoc @@ -12,14 +12,14 @@ Test basic connectivity to a bridge ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/bridge_basic/topology.png[Bridge basic topology] +image::../../test/case/ietf_interfaces/bridge_basic/topology.svg[Bridge basic topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::bridge_basic/topology.png[Bridge basic topology] +image::bridge_basic/topology.svg[Bridge basic topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Bridge basic topology] +image::topology.svg[Bridge basic topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/bridge_basic/topology.dot b/test/case/ietf_interfaces/bridge_basic/topology.dot index 448f1b451..c2b75ac29 100644 --- a/test/case/ietf_interfaces/bridge_basic/topology.dot +++ b/test/case/ietf_interfaces/bridge_basic/topology.dot @@ -3,8 +3,8 @@ graph "1x2" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt | data }", diff --git a/test/case/ietf_interfaces/bridge_basic/topology.png b/test/case/ietf_interfaces/bridge_basic/topology.png deleted file mode 100644 index 500307542e938c999698e0bb4e61905a5a844038..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10199 zcma)icRZDE`2T}KA~Qs?WpAluWTzCuvB@lZgear3w-BKeDf`&-7|F_3Rvdd~@11_v z`TWM8-`B5RtuU4WF!nE2!fE^QB~AJ5PUTJ{SGl9{7ya7!v}v5 zn%`AXME>D^eysf(hafD-9mU()&r(;%y!5D1`$QW~_^c7`&Z~woSf^;NPrJvK<4d(SJnW{=lI*s3|tf^V9W(|gi)ye_h6 z#s9dEkDS4OSx_TK+(%u1dc@b+)#W}$_MYUzg_gg^`+wGnSQ)~iql2TPqZ@t17ZUz^ z-bFGslXJL73>p78`#-*9YC$Jx_;|%#{d25}XCp*7I5}CRrH%j3|D*m}!*oe*uYvTPou|*9J)1n(oH>|{ zdq6=!;h&eskF9-97ssXENW}cYe|ZSKZL+=d=V6{+5x$I!Owx51wl{HcE_*Bb@Ie+X zF6GrqArlPlo^IW`CG2J*><;oRRH8t-tCsNh`ZjomjW&y#$7JrX+H+FZM zr@jYknwUgAko`+z(Gqc6ULGG^tIgY7?l3BB-ANz8AVD%(;iU592@hP7g(_4$Ov-Kk z9(K6}dDi?pXRj> z$vn1Z@9^svpYihYs$L5ltnFU-!Y96EKqN0OKe@adK0R%odefcc*BABIXtYpRSeWxt zKhNy!Y(sbV1u4(9fTALi`>EIQh=_=ghPGICR@(3?9)jei-Hi#@ z^BGrGSO3fl$%kmYefyT7wtIAx(V{g<>EG$!qDS8eNttCXL_lne1hV%g1o%EXFZIPj-&`T56|t}xAE4-YKTxMl%Pw(=H{km5+;YLqF{J< zxZ&qds=&ZNcMnqe5MR6D!cWTRhr1(ODdrNcv#R6EJ}+L-aG|R))>QIK7dX-Ga@;R& zFn(`nkehM~ReV)kEQ*Aw@WP^tN8Kf6JyIU9Gt}3=6cG_I`^K``dg&|l+sbee0kUzt zUQdAdo*vpXH8;CB$o$=Tn3SCC+QUh84l2d z<}0Mh_z1r^aJICunc0~7E-WhgDmt3n-oc@&d~R+oBs}~(G)r%Ru~ftrX@;v0J}A1n ziduK4hSCZcY?x1Ayr{3w4tO5zi7$!%` z?93u=vrsr6qm666xM15YMKZOr=imSJQ;ELPoWO?y=+Ic!3y2wd_~ONj_e}}Lqj~xH zvG3l6uB_OX+6_gGnlhu`eYV!u*Vn6l%HuRT-<9IkW7Cz~%=wIn{7Tc#pI>wHQOPMO z7En#Zq@=SBbm7gocgia$Xc`$sK&xS%ZQ?g{yvzVpJ?}75`t5r#`Q}>9`t;AtyI8wm z(o3%jjBD7SM^8^rjkXLlHD8`RPiqE%la-YA{Ji-@olnv=2L?=St=Gk?mRF>`1AfF^{odSswxFQk z+1BhiDk`d&w6y4J4kKnQ5tk~T{-J`c6|wE-M&zD86-Q;K7jxcyI~mOE>mL|+_T=Qm z%*H0zu)>j*i;M8vw{MGm8APe6sr@pN=~vWD+!w=z>KfMT|3xW<(?0qhME1BZ{p{)K zvD41l7$aasuKP*%d#Uf8out5ykAHn3yL|aF3k7lE(?41{*MZTb#H>3Tj&_%e{Qmh4 z|Ni~SxW=Qcz5S;x4OEK8JURp&f}cx8bl)%PSJ3K$g>+vld#DL ziy6_qxhSE)Rh6jAq41bMxLjeKDizr{}s-B#Dq0r-uv9uCCL~JiNS(O9Q!&UTu zOLtRUUA@Rr2p?R{ivmZ~?NdqqR z)jr<`*ugW~T^iWf-v0hx%5$TY*$?@66TPbhTn6j*wRASVm~jJEb>p{9+GhC=$C10L zs{TNI0q3YIn=T>-6^@axFOQ%ou;sGC4~t2l_y4e<4-Q>q6*rk*Vdu{ zs4OilKc=VS8&^O52Bd`N@A)vY+QrIyXYnO;xuv!B^yW-!j9RAA<#Z{49%5o*ITMpB zMn*=xXj55nM=ZVkCkoInaz;j}KdagW1qHEP-a0>c7rA*K=^O?LBF|0^M36}!Z;X-v zFCQ^Y zzK5CJaj0zVFsqKYpMc)5#(ulMq5L;@hfFg7GK57$Zd+S(eUSBwnw&HX{6|d8I;&30 z$QT|ib3_b+)X_rhBQc_Z3uPsaa;lkUk((C~-M>a=0e=5DUxeAP` zUSY9Dh>(hr=gRP>gd1o@$<+7n@h}*k_5SRKMq|4A0@_!vUKO|PCkC=rgo?P##1sp1 zDJhA*)M?^M^cCr!iteT)&K$68=?6^RztdyPkN#W~S{aO%(~Ww# zAe*qT###X;l=`aqXt~4V-j8?{tDWz}z!)fj2t%*>;}JLmchWP|-3kl|As!#|gY}-w zccf%sFmQ^)xtCdW8+f?B3>DPq7x(4Cq?_)%PATEx=V6UzM-24!Hwla4fAsXIJbJ{6 zyKBc3J^mJW_ag@f0hBv}K-~yG`T3c_q9e=IQPJH%-NeG&d}FbX{a%_36O>*3-#td? z*Z@<%zZaQ(b}0Q5J%2q&62{}?!xQe^uEcM5s}PfSdVl<6i7)6J(E$4R>a7e0<3BM4j)6y40c6ntuO_D3Ap zod6APMUa6ak9%26y1p&h|1LfYE;dQjDy;FRESSppjvqf>LgRzp2>^wg0XKHMzupS+ z$?K3fTSf08Y@RjAH58wKKqQ_SXz3Mr7j|!^HChbe7Z#2g-CM1g5Jl`81J2#!O>iBJ zi;H_F$6{7qUXB@7PZoa!j1ng`|4z&%Ns%pf)WpQ38xdw^W-jZ#P3h<7H^07ax_li? zfY^h+z-|LQi9CP)oY0@_%B{+gq50X_!iovslpEKt7andelmNUI!hIH^>yFg&W%?_w zM`Z8Iw4EU&6jf1CX`#0OUtDdzK%CiDHllLoIqvHoT-D32f`>StvJ#Ec?bu^gafWNIBa!bU z^xl`kLJClog=J*}?XHah6kA-y6%{JV%7j$Z)GmixRtT^jBX(@e9V?cuJ@B;r8aq0i zR^ZJjG)*V0Zj)|NS&&R8jI3CWqjP-x zgO0X#|AGGh-9S(%qR0yLc!Wp`fMQ2+Ny*&E4`uCK#;U`~*W^iQY0N3m!;zRb-nXx5 z$wwzfdrtVEhM3Q>dM_tLVt5UG^F@K25g}9wsG)_`n&qEnEP6Z%V1wy0GT0FEuCY@swnh5~7Mn;#nwzeiG zC;chem7V=;>=e?b-$Ek;PlAq?2g-nooSd7>bRC;WPiM>1FCm16X@(*xrIG||11=OW zWL~$UKPW4U`CuDuCO0)T&EJ3hP~v@l zSKD%;sV`3jdZ{hfzT3{sjKxXD6i}I(_)KR@OVB7+tm-iMlezi7Ot+rJ;F+1e*bHnu zrDtH^O}&~cn7n-?3EA@5F+4tVZ4guR0 z^E~|0KMX|fPKty_M8uC?r484Iz4`s`bYHfGJ|h;T<v>MDng zo12(VH?JXzNy>Sqg=}Yif|;CIMp0XvhTZ}r{~a_eEVpvXHHY2`C(}~f0TRHl?{z-M z2!@|HFQlYIOwhEB6tHe*v5z1qC}_93dwCg$p2Fhdvyopq+U8T*m9e`#QCvTN{fd46 zJ`!$Advp!b6}<{aCP0dd1yuW+t;`vaOkw(*<=d8T?^X0d_5mobhKhpFAfUcpw#i%s zCwu{Oa4{ZW&U)?sl>*cH3l{MB(P$@^2SC7ETdvQ%yr4KQP!ONNd46z4py6IaeCIag zq14{dQRJ~|00v-7nM5M;81lT%G+E}c8qZcBxy-#oZJW*M=EBm_yn$DwOFw7bQY4+O z0A&&J8bkjOxS5@Ck|#0Ni>B*!vY2Bl<=t#ny| zr6xHpu^STPq9O4@pCcpFSx$vrA8P+N)t0NlZTaQP7m|GkKsG!xfb@dRgI$69Ryk3a z0==SF?~;-V-@Kv9bl~OX9R^>NR8msX=#*bnRFvnnJ&*Ab-%?vT&*1ep@e4Z|M_teq z04p~=*Ycjux_2c@kRpr{wlw?8pB332tz)(?5HyrKO%!O>?+UDe{P_*h=(ABUOD)wN ztL;dkfML1z@ey>e7_zdE<~OK@z2P=540d+yMVZ8w_xiZB_2b8F^WE=ro&Ag>F}6ol zU_?cLo7etXsrMhY<$^v{WTS)~;;wLlHFR||#5r47KQ_>Ao@>~b@7`Sk#lV8H9PaI< z2qtH4fvtf}_rr-#0fSOG5KOtov9>1%n>e!`#Vi{I*rC9ip!FWbBqAX(r%Ro^1nX(U z=o6k1Iy|h0IbN$#n-OafwrZzYD;UagH)%E(fygxovY~7vg0~durrP;Nt_K^BkcP&< z^HtBKaoQb%SwLYnR@U43Y)3~7o{*%vjzYVE1B`|cxaw?F&e7@dI!L6*j~_o8wAKPe zT?3g53KC4TL6=ze_*(%(mRMB^dU`#JQMg5RUS1NMBATeL|9PVV0{GhyD2PB%OLOre zE`5M?0$`neTQ#ubmI5Y}jh!75@(Z1*Hy-}_rK@K5Bez(GKmOuDS#hz}9|go85)NFv zWxM;Mua7b+D$2Gt=yBTn_e>D$1c89BN?Wp$4gUT6_aEcS?$DX65)v0d46BX4*!yjx zdgsnJT&w|^R@*9Fs3Mq9)dvq$yuEK$80-430qlK)y?^xNNhp-ilfRdVS$A8(FtX5) z^woGejqgEE<0BA+tV^;Lh!!tb<>u!8yas!v3|G+2)BChV7Suj1+9C{3cki9(S?T9{ z{oY&N8C#!r6Sn)M{$F^ELArX-UV4bUEDH;Ggl2J0~>({H0WLFLmpTSpD zQo_Z~Gd&K#{(uurAP1H?yarZuRnyBWE3d;_AShq1=0nHZi~j|Rbv?Emr4d+0P0VC1 zH@qZ(_NEsx4`}=gkQ)*f)(A^l*;JO5g~PGQ5mI_#xwQ)qo6D_w(^i92a;_xB>FxD$t~(PW5vRiE5dkGEC;GbN&Mk3^|mZ1z2dE zN`O+IJTTZeb%I$1A>27UT-h@7D;1?>`q-^|`PbJ6mym1Lok<4Geb%c^?vE`31+3gm zGPQUJ8Vt&8o9Qj=n?fi_k@F-Z<`K0tC3&`1e~84!;rLBn@+b?J<(f$Aqk zjt^#{?U+#fv?Z_zpcjGy1D`l_FN0FMgwS5ToL3rY-F$oY z#K>5pnW4OS%A5BmK-0C48Ni>+LbVN4_9GOc)UaA4LN#f0%u zQc_}Iil*4|29$wpB zg%ARKgGf7b*<0NOP%EHf-23hy+mN!|jVT30=&Ru%2M0$0DtHjc%VD&<8PXD#1hqL^ z^2CG$oI$`mp$1a!@a_I01tuw#-=VjkU0$4 zCx>{34R8d8PR=eax8>vz&`yOmJy-ZmFnW$WgJ6=)|NP7ZeU1rN18nR*b_UFghcE2U z(sW&)12w*Ra_F`)RzvrEe=T9u)c8-*#)k7P?;Tag?&TO(h2DBUzf3fHz+yeX28)mo zIn1%-z(!Z5B&FT*dIcK~@x*Cl2;V~kgD}{vsg>U)*F9F~$9<0-G994MA^`^)CMN1z zj-S|ur9cD>$o{>jCt6Z2_RSmo$+_M7j~|hjFJCgGW!UE+7I`h@z&7!t)^>K`ke9{3 zecRaC8Bx(QGQx1-!UeUNfqA#MUDRl}3SK;BFf^P_Xu70FMgh`#egT0Zvv2r;lF=Zm zSp)?y7?#`LHZWkga_bplXJ&~-nl(;kx+%vqqI9!xrGz#iLo`Z_#BuIZ^x~+dlrm3YR9bzhy zf6Opan#;M&oo=u5zFisEEtXwna5yUFXbG_6VCUBZN|=hl%*(7ZN#p<`d75%aPn&^~ zoR4;%VC#GsLA^PL5hHl{X|0 zJt=-(Fk?jIz+z8?R5o;s4A<4wUH4qO41u_mQtnzz zUzZf|aROI;9%F533Avb96+<};5?tL(td_BS-r`Sw2Fxuih_%pzOV$~=zc*ZB6FuTG zfOpo-bWWBoOQ}B(7zxgF9{(5k(-`Mb4i;4_3hT zrcz)|%C=fo|2Y)|A@awa1^8hnA%4dM!l^E#5V)=cC%0d{!Y_AU)*UQ-q);`x3%0ux zI-t3=Rjf#_6J+Oan0mic<o`DGQWH&hRNbvuy7EE=L>tSj@3xQx-jBgAD@tr4G0VVYuDah0%L;VxjVpE-XCd5 ztsXa&Z&=}aP6IIb(uOM@D3zufkML&mK^T=m+;I7Nj1SBSU>qM=^G*5po8scnORvdg zG%8IeroEp(7enm9u9L*Ifr8!~K^s-Q!HXF+8LiZLvK=JQLht70W&z2F5x#x`zgJmN z(IZH@9zkYq1!F@Xm?S(ikRq;VO-?TmJA8tI)`WzFWk>ihLksFxH-RWS2~?onNGT5_ znwOkRA3x4&v?U0>z+?__Ngm9WU2|V`y%SSeqtDT0)R1&k2UrZ~SB#t0dCPHfxR8cf zh0no2^7QZig#C0=D9&NS<8Ku>fPzm9N84`YIAW6@Cu1%!h^zkLhG0Mfy$bnSWmCFq zO3u2Kl?3POBif<9KFvAGJ(x%W0(Ia7v-r7wjsmuk`zEM7y>Cb%#K3%5p}QvRY;2W6 z(#0yy&V`NJI-Fis_ey#MWMn@4=ks#XEH7$1OkSi6Z^n&HA@-P?&w{$bjgv4AP`LvI z+*&3k1)8!;ypG^O!D&l)3$V`aqIRplhCx^jhO&JCr7K>)0ok{+yStK$OHrd{+L5zt3}m1z<{6#zv6>{vp1-`C0# z>#k|q3mTudmXhHHD&gox-Qj!+gA<$9)dDsM0C33HU9U3$KD)^B2i3{ms1vA{MC>W( zK7hPOAchZM{7QN8Vj%FnEowMf(&>X*xY*;Zs#R=48aVt{;AUM`?gNGGE)K>-26h&>GXR$z#QF|A~fbj)+6xswo!QlB1F zWOOqL-BZofnqOJzgbARRyT)rx{=aI&ZF%j+O!PQ(YaAJfG`i?AA zu`%IAoTf*YxUg_Twfk~!_QR`=pZ5X7)rJZa2g>sPBxgGsrJDi?`GW|BslzK2kxm-! zn8<@P865gQ9ZRsyH>qWSUN|^fMlY|>L+i(Ca5wdSQUI^R9uN>P35&qZ&))=*0gYhS zJOm@SAu0Snw}3!1AP0=#T5J;&;}Xh->-}UMC+hMG*HXA#bc&wuI|{cf-X{0%RhY5> z6<}+M0^d)F;6|yig&JB~ui!L>2~R`&Pjb z9cI?nK@+~mWPm=(aEyWyG+*I`1vrAB0a^@Vo`(K@8pujF2q)xZv=JA`~O!0XW4Ee7j9c5#!?N*$M&y=db|&z6}o2 z!sg;evD&L5FjEbNFJT71{_t5w)E6kbYF4v|O<&I_Fg2AfGa6Rgj8EWT1Y%NPvik)T z>u~LJNyt&3j$M>jmA=RfK@BtWEuSOpKZ(ndO3u#0xKmjH0cVUo11V~?yLLHVD*u0; zsrvspd8J?_m7bn%VkNtjiJNupn82j;Cd{GD?CtZG9T)py^EEUyBXKYt?ypKNj>C_(tX7Od9zpl3t1}sod5s; diff --git a/test/case/ietf_interfaces/bridge_basic/topology.svg b/test/case/ietf_interfaces/bridge_basic/topology.svg new file mode 100644 index 000000000..8a9679604 --- /dev/null +++ b/test/case/ietf_interfaces/bridge_basic/topology.svg @@ -0,0 +1,44 @@ + + + + + + +1x2 + + + +host + +host + +mgmt + +data + + + +target + +mgmt + +data + +target +10.0.0.2/24 (br0) + + + +host:mgmt--target:mgmt + + + + +host:data--target:data + +10.0.0.1/24 + + + 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 1774c2936..cc5c0a5a2 100644 --- a/test/case/ietf_interfaces/bridge_fwd_dual_dut/Readme.adoc +++ b/test/case/ietf_interfaces/bridge_fwd_dual_dut/Readme.adoc @@ -24,14 +24,14 @@ Ping through two bridges on two different DUTs. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.png[Bridge forwarding dual DUTs topology] +image::../../test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.svg[Bridge forwarding dual DUTs topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::bridge_fwd_dual_dut/topology.png[Bridge forwarding dual DUTs topology] +image::bridge_fwd_dual_dut/topology.svg[Bridge forwarding dual DUTs topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Bridge forwarding dual DUTs topology] +image::topology.svg[Bridge forwarding dual DUTs topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.dot b/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.dot index b0789134a..ce90105e7 100644 --- a/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.dot +++ b/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.dot @@ -3,8 +3,8 @@ graph "2x4" { overlap="false"; esep="+26"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt1 | data11 | <> \n\n\n| mgmt2 | data21 | data22 }", diff --git a/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.png b/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.png deleted file mode 100644 index ef229365868eb5edf71633db0f024499331cd4dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21174 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 TNR7mUD5*U=wKa0ptb+ar*!Y$J diff --git a/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.svg b/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.svg new file mode 100644 index 000000000..11455bb4f --- /dev/null +++ b/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.svg @@ -0,0 +1,88 @@ + + + + + + +2x4 + + + +host + +host + +mgmt1 + +data11 + + +mgmt2 + +data21 + +data22 + + + +dut1 + +mgmt + +data1 + +dut1 + +link + + + +host:mgmt1--dut1:mgmt + + + + +host:data11--dut1:data1 + +10.0.0.2 + + + +dut2 + +mgmt + +data1 + +data2 + +link + + dut2 + + + +host:mgmt2--dut2:mgmt + + + + +host:data21--dut2:data1 + +10.0.0.3 + + + +host:data22--dut2:data2 + +10.0.0.4 + + + +dut1:link--dut2:link + + + + 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 3e607c4b2..fc530c397 100644 --- a/test/case/ietf_interfaces/bridge_fwd_sgl_dut/Readme.adoc +++ b/test/case/ietf_interfaces/bridge_fwd_sgl_dut/Readme.adoc @@ -24,14 +24,14 @@ Tests forwarding through a DUT with two bridged interfaces on one DUT. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.png[Bridge forwarding single DUTs topology] +image::../../test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.svg[Bridge forwarding single DUTs topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::bridge_fwd_sgl_dut/topology.png[Bridge forwarding single DUTs topology] +image::bridge_fwd_sgl_dut/topology.svg[Bridge forwarding single DUTs topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Bridge forwarding single DUTs topology] +image::topology.svg[Bridge forwarding single DUTs topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.dot b/test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.dot index 2daa01c95..893adc730 100644 --- a/test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.dot +++ b/test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.dot @@ -3,8 +3,8 @@ graph "1x3" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt | data1 | data2 }", diff --git a/test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.png b/test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.png deleted file mode 100644 index aa3517c8cecc1531fde1b4c7b231edd752bfcc60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7668 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 + + + + + +1x3 + + + +host + +host + +mgmt + +data1 + +data2 + + + +target + +mgmt + +data1 + +data2 + +target + + + +host:mgmt--target:mgmt + + + + +host:data1--target:data1 + +10.0.0.1 + + + +host:data2--target:data2 + +10.0.0.2 + + + diff --git a/test/case/ietf_interfaces/bridge_veth/Readme.adoc b/test/case/ietf_interfaces/bridge_veth/Readme.adoc index 9df98675d..b801d6491 100644 --- a/test/case/ietf_interfaces/bridge_veth/Readme.adoc +++ b/test/case/ietf_interfaces/bridge_veth/Readme.adoc @@ -14,14 +14,14 @@ PING --> br0 ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/bridge_veth/topology.png[Bridge with a physical port and a veth topology] +image::../../test/case/ietf_interfaces/bridge_veth/topology.svg[Bridge with a physical port and a veth topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::bridge_veth/topology.png[Bridge with a physical port and a veth topology] +image::bridge_veth/topology.svg[Bridge with a physical port and a veth topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Bridge with a physical port and a veth topology] +image::topology.svg[Bridge with a physical port and a veth topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/bridge_veth/topology.dot b/test/case/ietf_interfaces/bridge_veth/topology.dot index 393a1078b..1597ff1c4 100644 --- a/test/case/ietf_interfaces/bridge_veth/topology.dot +++ b/test/case/ietf_interfaces/bridge_veth/topology.dot @@ -3,8 +3,8 @@ graph "1x2" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt | data }", diff --git a/test/case/ietf_interfaces/bridge_veth/topology.png b/test/case/ietf_interfaces/bridge_veth/topology.png deleted file mode 100644 index 44a02cfb2001dd7c56dab98b6d13dd611264ca52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9763 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 + + + + + +1x2 + + + +host + +host + +mgmt + +data + + + +target + +mgmt + +data + +target(br0:veth) +10.0.0.2/24 + + + +host:mgmt--target:mgmt + + + + +host:data--target:data + +10.0.0.1/24 + + + diff --git a/test/case/ietf_interfaces/bridge_vlan/Readme.adoc b/test/case/ietf_interfaces/bridge_vlan/Readme.adoc index 8a97a5565..f6b0694ab 100644 --- a/test/case/ietf_interfaces/bridge_vlan/Readme.adoc +++ b/test/case/ietf_interfaces/bridge_vlan/Readme.adoc @@ -13,14 +13,14 @@ Basic test of VLAN functionality in a bridge, tagged/untagged traffic and a VLAN ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/bridge_vlan/topology.png[Bridge VLAN topology] +image::../../test/case/ietf_interfaces/bridge_vlan/topology.svg[Bridge VLAN topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::bridge_vlan/topology.png[Bridge VLAN topology] +image::bridge_vlan/topology.svg[Bridge VLAN topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Bridge VLAN topology] +image::topology.svg[Bridge VLAN topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/bridge_vlan/topology.dot b/test/case/ietf_interfaces/bridge_vlan/topology.dot index c64c6e859..3301cbda0 100644 --- a/test/case/ietf_interfaces/bridge_vlan/topology.dot +++ b/test/case/ietf_interfaces/bridge_vlan/topology.dot @@ -3,8 +3,8 @@ graph "2x2" { overlap="false"; esep="+40"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt1 | data | mgmt2 }", diff --git a/test/case/ietf_interfaces/bridge_vlan/topology.png b/test/case/ietf_interfaces/bridge_vlan/topology.png deleted file mode 100644 index 12d93da8f2ffc07f97a63ba7a343045c567fd652..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17975 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 diff --git a/test/case/ietf_interfaces/bridge_vlan/topology.svg b/test/case/ietf_interfaces/bridge_vlan/topology.svg new file mode 100644 index 000000000..39d06ca01 --- /dev/null +++ b/test/case/ietf_interfaces/bridge_vlan/topology.svg @@ -0,0 +1,68 @@ + + + + + + +2x2 + + + +host + +host + +mgmt1 + +data + +mgmt2 + + + +dut1 + +mgmt + +data + +link + +dut1 +(10.0.0.2) + + + +host:mgmt1--dut1:mgmt + + + + +host:data--dut1:data + + + + +dut2 + +link + +mgmt + +dut2 +(10.0.0.3) + + + +host:mgmt2--dut2:mgmt + + + + +dut1:link--dut2:link + + + + diff --git a/test/case/ietf_interfaces/bridge_vlan_separation/Readme.adoc b/test/case/ietf_interfaces/bridge_vlan_separation/Readme.adoc index 1d8e6ea56..459f8ebe0 100644 --- a/test/case/ietf_interfaces/bridge_vlan_separation/Readme.adoc +++ b/test/case/ietf_interfaces/bridge_vlan_separation/Readme.adoc @@ -23,14 +23,14 @@ Test that two VLANs are correctly separated in the bridge ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/bridge_vlan_separation/topology.png[Bridge VLAN separation topology] +image::../../test/case/ietf_interfaces/bridge_vlan_separation/topology.svg[Bridge VLAN separation topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::bridge_vlan_separation/topology.png[Bridge VLAN separation topology] +image::bridge_vlan_separation/topology.svg[Bridge VLAN separation topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Bridge VLAN separation topology] +image::topology.svg[Bridge VLAN separation topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/bridge_vlan_separation/topology.dot b/test/case/ietf_interfaces/bridge_vlan_separation/topology.dot index 78fe1c7c6..852ba0ee5 100644 --- a/test/case/ietf_interfaces/bridge_vlan_separation/topology.dot +++ b/test/case/ietf_interfaces/bridge_vlan_separation/topology.dot @@ -3,8 +3,8 @@ graph "2x4" { overlap="false"; esep="+22"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt1 | data10 | data11 | <> \n\n\n | mgmt2 | data20 | data21 }", diff --git a/test/case/ietf_interfaces/bridge_vlan_separation/topology.png b/test/case/ietf_interfaces/bridge_vlan_separation/topology.png deleted file mode 100644 index 5f1d027a7be03a9b79be5fa20a1b1b55f066c958..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29913 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 diff --git a/test/case/ietf_interfaces/bridge_vlan_separation/topology.svg b/test/case/ietf_interfaces/bridge_vlan_separation/topology.svg new file mode 100644 index 000000000..e490c4587 --- /dev/null +++ b/test/case/ietf_interfaces/bridge_vlan_separation/topology.svg @@ -0,0 +1,103 @@ + + + + + + +2x4 + + + +host + +host + +mgmt1 + +data10 + +data11 + + +mgmt2 + +data20 + +data21 + + + +dut1 + +mgmt + +data1 + +data2 + + dut1 + +link + + + +host:mgmt1--dut1:mgmt + + + + +host:data10--dut1:data1 + +VLAN10 U +10.0.0.1 + + + +host:data11--dut1:data2 + +VLAN20 U +10.0.0.2 + + + +dut2 + +mgmt + +data1 + +data2 + +link + + dut2 + + + +host:mgmt2--dut2:mgmt + + + + +host:data20--dut2:data1 + +VLAN10 U +10.0.0.3 + + + +host:data21--dut2:data2 + +VLAN20 U +10.0.0.4 + + + +dut1:link--dut2:link + +VLAN 10,20 T + + + diff --git a/test/case/ietf_interfaces/dual_bridge/Readme.adoc b/test/case/ietf_interfaces/dual_bridge/Readme.adoc index 0b30402fd..37a64b53d 100644 --- a/test/case/ietf_interfaces/dual_bridge/Readme.adoc +++ b/test/case/ietf_interfaces/dual_bridge/Readme.adoc @@ -10,14 +10,14 @@ PC - target:data veth0a - veth0b ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/dual_bridge/topology.png[Dual bridges on one device topology] +image::../../test/case/ietf_interfaces/dual_bridge/topology.svg[Dual bridges on one device topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::dual_bridge/topology.png[Dual bridges on one device topology] +image::dual_bridge/topology.svg[Dual bridges on one device topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Dual bridges on one device topology] +image::topology.svg[Dual bridges on one device topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/dual_bridge/topology.png b/test/case/ietf_interfaces/dual_bridge/topology.png deleted file mode 100644 index 5444e060bae54b3f163f8b593610b6b4c1b4f833..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5640 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 S^96tvQNOOG@>$v9*?$2*xFRV4 diff --git a/test/case/ietf_interfaces/dual_bridge/topology.svg b/test/case/ietf_interfaces/dual_bridge/topology.svg new file mode 100644 index 000000000..ff3d246be --- /dev/null +++ b/test/case/ietf_interfaces/dual_bridge/topology.svg @@ -0,0 +1,42 @@ + + + + + + +1x2 + + + +host + +host + +mgmt + +data + + + +target + +mgmt + +data + +target + + + +host:mgmt--target:mgmt + + + + +host:data--target:data + + + + diff --git a/test/case/ietf_interfaces/iface_enable_disable/Readme.adoc b/test/case/ietf_interfaces/iface_enable_disable/Readme.adoc index f6a641429..d1b29c6b6 100644 --- a/test/case/ietf_interfaces/iface_enable_disable/Readme.adoc +++ b/test/case/ietf_interfaces/iface_enable_disable/Readme.adoc @@ -7,14 +7,14 @@ Both admin-status and oper-status are verified. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/iface_enable_disable/topology.png[Interface status topology] +image::../../test/case/ietf_interfaces/iface_enable_disable/topology.svg[Interface status topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::iface_enable_disable/topology.png[Interface status topology] +image::iface_enable_disable/topology.svg[Interface status topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Interface status topology] +image::topology.svg[Interface status topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/iface_enable_disable/topology.dot b/test/case/ietf_interfaces/iface_enable_disable/topology.dot index 06dba9916..27b10ed70 100644 --- a/test/case/ietf_interfaces/iface_enable_disable/topology.dot +++ b/test/case/ietf_interfaces/iface_enable_disable/topology.dot @@ -3,8 +3,8 @@ graph "2x4" { overlap="false"; esep="+40"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt1 | data | mgmt2 }", @@ -30,6 +30,6 @@ graph "2x4" { host:data -- target1:data [color=black, fontcolor=black, taillabel="10.10.10.1/24"] host:mgmt2 -- target2:mgmt [kind=mgmt, color="lightgrey"] - + target1:link -- target2:link [color=black, fontcolor=black, headlabel="10.10.10.2/24"] } \ No newline at end of file diff --git a/test/case/ietf_interfaces/iface_enable_disable/topology.png b/test/case/ietf_interfaces/iface_enable_disable/topology.png deleted file mode 100644 index f2c67ca9327f02303354f1e96970290233588bf1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20743 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 Q*^r{SS4TZ%kBRU92donY`v3p{ diff --git a/test/case/ietf_interfaces/iface_enable_disable/topology.svg b/test/case/ietf_interfaces/iface_enable_disable/topology.svg new file mode 100644 index 000000000..a2b788718 --- /dev/null +++ b/test/case/ietf_interfaces/iface_enable_disable/topology.svg @@ -0,0 +1,68 @@ + + + + + + +2x4 + + + +host + +host + +mgmt1 + +data + +mgmt2 + + + +target1 + +mgmt + +data + +link + + dut1 + + + +host:mgmt1--target1:mgmt + + + + +host:data--target1:data + +10.10.10.1/24 + + + +target2 + +link + +mgmt + + dut2 + + + +host:mgmt2--target2:mgmt + + + + +target1:link--target2:link + +10.10.10.2/24 + + + diff --git a/test/case/ietf_interfaces/iface_phys_address/Readme.adoc b/test/case/ietf_interfaces/iface_phys_address/Readme.adoc index 5dedf837a..be0a44e9b 100644 --- a/test/case/ietf_interfaces/iface_phys_address/Readme.adoc +++ b/test/case/ietf_interfaces/iface_phys_address/Readme.adoc @@ -6,14 +6,14 @@ an offset applied. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/iface_phys_address/topology.png[Custom MAC address on interface topology] +image::../../test/case/ietf_interfaces/iface_phys_address/topology.svg[Custom MAC address on interface topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::iface_phys_address/topology.png[Custom MAC address on interface topology] +image::iface_phys_address/topology.svg[Custom MAC address on interface topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Custom MAC address on interface topology] +image::topology.svg[Custom MAC address on interface topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/iface_phys_address/topology.png b/test/case/ietf_interfaces/iface_phys_address/topology.png deleted file mode 100644 index 5444e060bae54b3f163f8b593610b6b4c1b4f833..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5640 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 S^96tvQNOOG@>$v9*?$2*xFRV4 diff --git a/test/case/ietf_interfaces/iface_phys_address/topology.svg b/test/case/ietf_interfaces/iface_phys_address/topology.svg new file mode 100644 index 000000000..ff3d246be --- /dev/null +++ b/test/case/ietf_interfaces/iface_phys_address/topology.svg @@ -0,0 +1,42 @@ + + + + + + +1x2 + + + +host + +host + +mgmt + +data + + + +target + +mgmt + +data + +target + + + +host:mgmt--target:mgmt + + + + +host:data--target:data + + + + diff --git a/test/case/ietf_interfaces/igmp_basic/Readme.adoc b/test/case/ietf_interfaces/igmp_basic/Readme.adoc index 49a7b2bce..db7b60cc8 100644 --- a/test/case/ietf_interfaces/igmp_basic/Readme.adoc +++ b/test/case/ietf_interfaces/igmp_basic/Readme.adoc @@ -18,14 +18,14 @@ the flooding stops as soon a join arrives ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/igmp_basic/topology.png[IGMP basic topology] +image::../../test/case/ietf_interfaces/igmp_basic/topology.svg[IGMP basic topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::igmp_basic/topology.png[IGMP basic topology] +image::igmp_basic/topology.svg[IGMP basic topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[IGMP basic topology] +image::topology.svg[IGMP basic topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/igmp_basic/topology.dot b/test/case/ietf_interfaces/igmp_basic/topology.dot index 673f9e2ce..55a858864 100644 --- a/test/case/ietf_interfaces/igmp_basic/topology.dot +++ b/test/case/ietf_interfaces/igmp_basic/topology.dot @@ -3,8 +3,8 @@ graph "1x4" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt | data1 | data2 | data3 }", diff --git a/test/case/ietf_interfaces/igmp_basic/topology.png b/test/case/ietf_interfaces/igmp_basic/topology.png deleted file mode 100644 index 1c44852744f8bbbca7ebe42c6e58dfddd0683a2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15432 zcmb8WcR1H={5Sly_nsj$5fPP5?Ph(BqSq+ z#Pj-e{qEy=?mwRUIPT**j_azce7~R1dA`s0`?bz+!=ne7==tbLBodRpp7t>ki97(m z4yC2WzwP1zqwpW&0MxV>sx0C%vw7A$~-#hV( ze;y504mtiFoEmg=bE-_e+3c%&RsHMYdP>K0?-Xx!+Yz}YURseLRxQ2Ahuz&&!uS=f zNc2sM{v@bSQ>uq!baXV|_s_2jbM<1wu=++SqYLWN% z_it!u*zG1yYbU?@`v;4GfkD9T^anL3^DIZYvy7upNP2P$3Ef;?UVb7QqNRW2$m41u zExqTC1Em2uC-W5DndzxhMt`LO^7G}C_wF5Qi4}X-+v_+r%1X7YNLj&P|i^rg?77$%iTT3?9e3Qn8F*Y{VwA5KdKtLe>Qje6X?<(h& ziMD_{cQ`csb#$nhh18>lhpq3%#hs}OqDxfu+?kS+Vr^?1>Nef0FL15)234v5hB~he zNvedVu%zUx)s?m7`Q?dwPJBO(;M+E(t;XH*vhJazq?BWOEpt0ElHrPrOV%}k^XJcB zaCCf2k|P~9HohZs>P67T%j9G}@1-d&jScL;O0&lfCnqQB>qk#y z%}sy&ITy9=M=RnsHaq(k4>Ps-sd!IbdU`q|skNgcL0`4YHSAAC=h(3B!msbADXFQ? zj?@K9N=em?)Q7UMvR>DTakcC))3^v9pu!*s)`6p>@Yn zMC+$#YAPyxBx@U+z{Et}^~kEn>{^^$J$XTTp@K9@x7oyWt-CVxd3T&(L+C#OJgOs z9k1$n^X84H|AcSg_HEk&u+ZH-JydV|IyDZ{E;%JW#7gImIR=g-1lt`w3{#8f_s~UhNX4 zBKe>)XPWD)^ zXIq`mdH9grzAyL7j)u=EyT5vmrR$~%tgcSyb>^Jhk@4ioXj3#lRw(58bD6sO`tv(4 z1fxw#{m;)$_dd6eXL>y0Bi;vWkw{&H=h78}Zz|-XSbCRt$*P>NJ-Fa9uN?^~i;gqi(sbi~4(;oAq zR9CNFC5{pq1$9`I|LRY>fl6;4=@ZYcmzS&D2n?Jbf6ZZPW_Gqe{|vcjs;cJ=l*XfH z&lvF_T2GJO&vzNq{W;acfSurOIc;VZF*$j0i-bg=e8^3Wb>39}^*#RSPIf)m%1g3Z95)#HI9Tw zMV)hZcb|Fnqv}rPTF`FFYuBz#jE{GBHyTR*uYTk-^-vC_OszR%k2XZUf<};Z`}S?a zst%2fl=HT>42`LZm-#4aEGs-}saXWKJI92E(r66f+$Ex%HWG1E_gd-TCcCI$SEo|Vc|!{#sZo6 z6^GxY?{{`{{WbGJ@5qth2zuWcI+3Mawr>TZc;(5l zsB;SoTEAyM%ezgPtj`Bf(9n;wFfj#ZWo^TJv9`7*I+%HxE0w&we1D-Ghu`{&ZEWAE zSMD;iL)AC2-lLChs@LHhFHg&^|NT8=THzu8rnOc6Yy+*Ssj0BMJe#1Ppq9&Em2c#Z zs%7#YgO&9)0TgHK?IW>R=B3VLn0Tgz7ujM2_K5aWZY!L6t~EusCNxEN*Sx1XHIRno zg`k>OKH9~6b&o}vtIkZBy1F_e2`e0>SsoZj@xHV3%(rjf+@u0k8~3=5)9#X!V_lti zkevLcu&5}hxLC2Zy&dbpqOn%<^XJe0P!^#nu2A`=3+>5`)XV}cBsm(IP_xz}dix(e z(0u*c*g)98&Tbn;P0IcI_H8_Td~XEReOj0Wlxr#~D?cPF*!LS~{B1BXF-eS$jyCig z+}Nb%{p(y-Ru*|P@fUe*957xPNvB_4h^}$5^y+y~b3ErncpG;0Z3q*86K3*)Xw-U#Y36YG1#m%g)YTis0bp4#DtW{`05L%u*;4b|78~FR()F0ld+9fO zum0S2`_7$tJY28z(W6J1C*Iy?(9qB*_{z~`A}S`9<#(Cv*X-v=EC0V-<>lqhuC7Ff zNlQ;BOLM)aHb}{6q`orFQPAvqwkte4*FOgJH}2*L!D_ge=KogIdbF(x|OuKfQzfE z>#bY2uAiw7Nk3iUsMQ>J<3?I`Hob(zQ?JJPxw)FOeSyOh6CvH*CRweA^!Dc$7B>7I z@*hG+;SCQD@2~K@V$8E&(}HjQ%$YO8&dSTvdDUoPZw+=xN!=(ZxfcDk*uL-RjJ%qf z8U~KAwDh4gk>!bY{`88~)m6h2Cz`U4=QPA8_0_k$XRk^#6wBw<)z#H9Zqskiu%o`mv-azg6DQ$YR5Fg`->(4qaGiZ4H|nmuXd8;s{7iaqS+%>$|GzQkbxRyL8$L%+sgpixp% zT3%hP10vw#d}7rwNzZQ4YKQ4#Bj2Qjp?v>apKUDS9A-E3xNW_WZ|)M$lPMElr-2M-c4G3x5- zSh=~W(_G0n=cN~(d(93UG>TCRG)r^+P5G`ZTPRVfcUH^eDz7VNp?X z9BpN{DNgi#={fPL{h`cZQBe(dw;4MxO&vF{^osL8eEc|<@sq=`Q-hqF70AQQhodVG z9XiCJa^l2^keL~W#Kgp~?@4$1l#lCZYg^BcHqtUNaeX3DN;Ombn(ku(Y&zEHxwb4H zBcu`I_jk2+aPUDY4g`6cYZt=~-<5?gSoz#VHPARWOyB$$FSM>+-Mw?yE+Zo&k^J}v zAtBVc=4ChL=9~wr{e^Hsd6gUm7#SJoK3^N!XJKI>IT1w1@$UI)rHhv?^?G~{X5gvo z>|_JdIN<5I2c0%O!=!9ZAE1V6;n$BLAq@5AFRckK*sr_s@pawZoTfzgPnsz{_@A&;1CP8JQUY&-edt#Tw#cf z$JyGslO5+fPUUEG%w{$Y4za6_y1LX`4IVHW8yl}LCrweL(}`&FUAS;Tp;zMI!GpYe zTr&(=K3*I0mDss~7mx#;GRxx!#{?px-OhoQLPf$_u)oQB_ACnEKme%5^Lc^irB_Ni zy3sYd>=?kEj}Fv>3`BCvT$&oC^#I;FnyMcC{;9zj*b7NY=vu_8d#@o{qQK_OE+chR z1f%qk-g|9UfK>DOv&G0LDelkt7(q2Y?_V>uJXSs;&fCSsb*!y_Vi5r}g$otax40A* z7E*eVJUw0pek!yRTTm8>h?we&Z~gR%A03ES<*KBL`%D;`wWzA9fR~pSc@xiIfYc0Wa`EFKs(?F%2*@gEBI<98TV?KkmpgGBVQA(sKRL zBeABNLOT*%{Qi7bQuSG8C9(4JpC0?u$h+U!IltwA@a=}I+0n*G(`vuUcZr(lnA*C! z2RS2IMUz6Zt@OpAF|;MhQvmu9&?z>SjaUNiTU#HZxzReriM2M$_jGqt_Bv)C9GKrzflsuAIyPWy5{lqtH@JgF@T_ENZy8=0X4f^3c5EcQ?-}Uq~zBu2i z%`7FeW5)qKJz8c#)v$&JZIn-7>lXr(n-*Q-DtG@*pXQo$d&<63#;Qu7HDSls4WET^ z{dHGix9CsrFvTD9c{hzX2XTMrY(%S`9Rr`O@9!_|y%O-|KrKo|bZD3UsEMt$wXpjH zzeq#~IL^6HzJQ(aDJfAM>VKlDMcj>y*uWpRx>goTpUkx$D0LyX%d@PkOWz+#kVGuH zVfID^zm%+|LJl+Uy3TqmoOtR;FY@!5pj^;SE`BPO@%y`Ua$PLs)XNJaz&!m$_6eHn zBKt#xckE!<>poKxwQ1L_`}dgN?T}e|J55K0PDJ5#YwMjU)od%e*v*$H-`uLIQU@oy z1zrla9^jNSKR>Uvk_yg`C#QYx+`*q9O7E2Skwr*7tX=Gg`6&iQMu$RsHZ9JMXQy7? zdho#V>l(pxy?4uNhX8C0Pfmti`!RTCcA(5-WkDS1Y5tQ_^~i8-pw`Nf!-omfgTo9^ zAqFV7zP^sC3hcL^>&@Kj{cAhe4_Q;<;Zb(2Fjde@)(?+#)1sbRRSTM#nJojzy~{F| zD0KYHXXUpd-W0V-?C!O}3QtK%$(l@~M`>AE;mn&=tU<5l=H^)WtARS?57 zKlM;D>OW~vOhd!UK`f5dsKIyeTo=bO*m3`-Pmux%`~K;l<2MiU1yE5@LBnd)*jN*b zbY40Js^{(P?cwF6=w|faUpn#fv}lNYNPoZSloVtWR2$h5MnVCEaCmNzBN2rLrX>ne zwRx|5L)YU&gjkU7!y{{66V4$qxA5iAMSFXjmRll;d#~lT2v$H}7y*Mcd_9$KO$G+nk$Q`jhld8wu|7XP);tDM9lP}XpB5{*B}tJSpyv#vLrmKF z_it171dflNyE^$UAhp5_-1CtV7#yWPy^S3Dm-N% ze6mfOHW?ZlQ;-I#eEI$VF7ap>oH)S^U1voD4ZLMy>puZFnGE0Mzw!6l&+ngjB#x$B zzkQos(P=R1Q;E|UdcpEYs1V6Su@@wa0I2})!!JA3>+z=q@x6PO^OO^LnEWwj;}v{+^ncjg(hT!O3p7RsC{ze-f}Y&6VrLm9Bp!O zaq<3gH)$Z);pu6DUWc`}^44Qb*aQTkK+hAClFp!nCqKM=s@-?@sdAJ&!HRKW>p@b} zfB*oD>)YFz@Vngk3VE9*>+VdWL?tJ|ojZ53^74j(IzgDBFqh?-n3%x+$O6z@k~v^v z!l~%cf1MCT&|tYAHM8$V0N>TMM*)5QR1Bu#fcW+2eDhT5JzNo3X>5=Y0M`fmLF z4Wfy`r5ObwTTVts=E>v7jgX|4znRM>_^!=2YxT9Yw%UNY>2J?VWTcnAdbJDu ziqP@tusbAEKR-W=3`t&>RHdX}lqxDJTE~yaZCrtnN0b9*f!{~K0y2}B&YUU85jTp8 z6l5(c!qB?&o>9*~gn zFFl;U4OKl}Jx-2_IATHBHDKbz)%#S!xhMO$R@;At=cUV@izS--y=0Sb^aYhDh1~%*7Uo>S0RAf}^mz^NDKwvL)ztK@@?$~A- zCI4%(Q|uQ=P7|*UC`e9$M1Dm@ito?P18vyD$=_Z$^5v&kSAagZAc?jyN20fv^ zeqY7y;J7D<7OVlsDEX$YuCD$e{|%X)Ls;ldByN6w=>?CA7bWd6b6>elb1zY{myN&$ zz|6c?k$bFx2meDqe45VTr}$Y9n*>2s58Kh(3iXa2Z9LwG`)>~E*|=Q2>ad`4DAp2s;gP@6V(o_?DUoaZ{b@{!+Z8la>D_Gbdugc= z~6B9(gfkYCbx@XU+kb z`1mxq^ZBlRdkWH!+14szz~|e1Yn$;C>#?TjQkOAmm20z%SFT(+ckbMrw~oiluz)u* z!$h0L;3jl#DF48-OawF_<-dH%;YnBmgp}Fe&x@vqE}ZU0{>2=ui=>GjJ?;W-nDO{= zIvO>)0X@glY#?}ILUp8Sgg$w)_3Z<-NSutwHt*SiJ#Z?*E7d!o!KFQU5`u#n8O6rN zCgNrj2U)ugX3i~;TnZZI-BWJ1Z&NT1kIwn~fzzINW*U&N!>X>Y@1*1g+!^A~Qqs^w zKF{H@c=Vg{lAWChh#^D}$?e;n}Y5szDwf~0YxXa+9 zzaM`E#g`}_heA6qB-56%hXYKwjsPyjmrtY3FD?cL1*Jh>8h^z80DWUKzWV^=PZ0dz zm>p(?v=HmT8M3ZGNXbao(bXOO@X|JVFn{#<(Gk#Z8X6kX^_MSqsj8_JzzG%D>(0op zc9hir%9Lo9y2u!13;eX zFQ7PG?641vQd`aZMa`d2`v1H1(!KgBp+s4MKwKni^kVXFpvRMac|!h48B?O7qWK>4 zXNih@b{Az61&dcqT$~DAdaW-*{|?FIsMpBjPR%P_0)~IHm0|8OGKU&Z-(e;J#87}Y z0N4>?`?~4(si>$Z>oaG_ns|xgLcOLPxu=NL8|fPXQy|q?%|_b75hhV4DCI3_BGxX(Y_dxn5oz0ZRCg9<9@ohv$mFEym?MW} zqsiXq{Alx3ThmVT6xp9FbQ-cecmJcn?$t!iV;aQk;{BcfuDT^Pyn@+?4nE(=V`bg> zPzQuXGeOpZ@Y!r_Z38w9Fom~%A>=G9v7Uhek1`O`9ulj^xok-n1R3OPniyl7p#+gk zPV7_#P>07F(BkwO9j+NIx4^bT&<7t)-VD`X`A*LNC^;3z2PAp-;Es-6p!j}F|_b##=)u#wp5Z)qt=Xyph{jG$dX1*yU8 zShgw#bX(^5PS}@#iZcUc98ywJ@4C9QEG-}Ozkrc9S{q2y(%v37n)`)cf&8>G8gzx{ zA~lqhIm|NvmsoIqz+&OOd+!Ym+cCn10j>{(mg;}D2><|*4R=H&7-SN5UYR(IQ#00< zw9A!W0!{J2O+jLU!WLTjwr$%s!Xg6wBv6^37tGSA=;&bT!w`W97ehx!XKrzkA0lB%d5H}()W%r*x%?~A!CusxyZ5d97{Iywg zqJ+MGEUJe@I`<{PYGHA%*9UJ+WpmitE^%tQ_C(`7^WP|wk50#G-;E7ZyMF(u(9qaO zh`qVFxe61NzJC-^pRo@fFv})HLfSL8_Bju~1pI@{#Lt*Yil&d7lXGtI@B`IT7duBj zj*<_v+=eLS@8ChLqeo-TDOu{kFRo5+I88f%$A+51tL~$G;<=glts$7wSlC20 zZ$%ZiDN68yE#l&5kWE0B=ZO#!6pV?AVpLX9p?BCXY2ZSb8{1D8Gs1VT!$CN6=~Bdv z8|129KWX6&X=4GQN|Bl5-sch!XcKyLtjDSPZ_|*gyrN?9gi=*9hSk}>t4ko&WOLQ> z0hcaaf_Qval3Qfq`qatBhF3%74u3A$*oe(t0XR5w;X+7I5M_n`h9EEjdGqO_OXB(E zdT!vyYt!DIp0)6RG{5|)&d+DXxj)zB1J%mX}53R0ROr=-FsxFq$x8~@|>-0q)(yn4#G(SWXV6@$_?FX4ErxBExjLF zV31%VCMJi|U5j>)&}(;p@3kgO_W2*x8}v~Okjv;$w>n21zKp0*=Ux_gB>E6S$9J3`f~JB3nOj(N zmb=-fX!r|);_ZD=+$Bzg9TH>XMw9x3HvH){id%JzRt({$#oC|&jNE&^* z1ggS50!?{eaByI>u^BUK6^;O*d3PczNK!Q0ii`h8R)2hV{WfHysP@H+7k7W!Hox!&lo^M{@c8k|Qx9216EgjdJ76Ow-=$L!w!gh4d_Z)k1&MdS zzMOd1V|l(fGbS^iN?4G02q`PugLnoZojVLxYyvYdetMM4dltL+4$83EHRog6$gQM9 zpCb+otQGPh(Vm{3`P7Xy8XOJomb~oj2pCS`7N4^7^9{3I_4t1SToMij9NjP&2A$-e zqMxCd!Me1@xqI^311l@lj;1IFfOi(!z1MZ90{Em?XoI~x_ufE5-^~KH7&^lyY=V}J z0?&3+;o@~))DZwxvz2X883GxM^G$og%-r{zB%^;KqDF?W2r&nsTcJ4i!M0pmTWfH< zWWjGoDBw207-5l-`!P_T-_)}=et%e6i?*Psi0k8#?5!r%iY&168z5B>a#ldns~#EC zd=gr62%0Xj+~-|7Ij`^R^|oFPjv| z&+DB$$s@oVs=-txWn>2?GYN?R`@sOl;^(EUO^L_TwtOTTEv-Ms&Bb*F@)}`mI)nJ~ zHS5ABGEQ49@?0K`++mGw1u-+cOquA$Rw27&!KiD|12zn}@>R~9U5n3PcZB#2^```mNf1S2Ck%FPcta73Eiuc`Hqi{i6u2Cyw9n>}(AF zVqf{xKI4d(7~;_1Tk?uQwG`x4t)>Q zZ{52W3GolGJ2DzhGc^<>LJ9Nq^n{oR$&$^q`QYtRc;HP)84_YE>TMKm19>wIvp^V% z=HQw-jH-h^%pw_I5*6&@-#MxlrDNR^7F3pM*>jfOKc5=E2Hl*Zc z#K)Yo6^u7r&oS2A+&mE)o%UCN8TpeZPf}msfZlW#=lKFDF)we2h7)vCSd5P}2Zg6#^IfC5L^I*RU@jkx{*@_jv}{^xxaZ6JD{dPu0rqjF8AJwXV) zl$Mu2G;@t?;P1nezTPSuKAJ}4IxXe|X+nd872J$Cb&-g{1VmPXmgh$n# z3Y|D1oOVUw7%AfBt9IWg-Oaj%40N#3tFvsLzrQbpyp6E?@J6Ww_%uq{^>uNWJ(kk!$%K>3XYpAkk7m;o_ z1AGf^53r_#83zph4%+aREnC9OBc94~%E%i2#@7*P5PS=9nztTKtTE{8?G1VLYA;C0 z9L5$WCnw=HBVXb%H%vz4A|j#^P#FdW9eg}R@!bE?y08xTsn`f@P6uHPlwkhF zPEp7eaJb1a5NJpOYF;MU)6!<|V)jfAf--zLyM*g5L(ho&#k` zd;FLRQrz0wVh8Cu#!7fp36LRjw+bz*uYM{gLj4v2>!u;4%iBU+rA}yVgb0pk1T`1e z>tyB#?vkov$IlT6&YXoaqRFsYkEkC56) zz~3~6Wf$GuKq_D>JzwO$93fDmPN;_H2{uIV>l1x%kkZIGP)YJ{SYK1nx2ly1{+}}+ zj3>@hWwPn<0Wq`4`7Ap-D+_?S7d2IYP%cm9KYw0* zW?5M-5I;ZHygQlA(L9Oz8a-xrJv| z!^lKmwz{B7`+Mug8OV=6J0FxZ>0 zpL|!3=<#uwMq+qTZ;JY0e*C+a2H*weXefjtpT%}1J$?PG`2px#Yz7ZhYl)%%)If+- z0}(nF5+D+B1cA)Y&(ADkT;L9U3UA=$h4wnoYUky-5wk@aB&VQFAteC`Fa!xG|C(K- z#C!L~kU1r2Cn&-^inXq#C3CP(JfmO@_Nz(tK}4IL?;D#2Kqes_G(0o2{as|!>1zfD z4m|zP92bw!0q6}8e&|X54fYuTykJ)17>%4BgPMwE`PFUDo;^cmsMoNON>dG+;=9yy zav2{DQRI`^BIfA`B3F~|pR#NRXNhTt0}aWi|JAj;y2h+aKgGsfi3|SoeNMB+@qUgsB;M2_@GZz$`ejesQ>#0(OxIG65L; zMHAH!69Lf!iIPcH0!0KFg*TV?+l|idFhCj>`FhD^^Zf`1)`EHxxaRPEmAF)dQ`{!C9f3wMwC==H^jQItbD7`rOR%2cW8f^&@lM6P#+f84C*w`A$RXfbnM`Go4)&myoD` z`<59FDPqg}LYX&fPrUE#rM5Xd+4xER959}B)S1PJ_9fZ9|7CcFz|Yw|&B1VSj^Ldd zW-5~iwu9=@+bu69DM?F^2}FPH5tU8o)F4yng;IC$q{*p>ZY>CHoBdeCKtimd!C=hy zThIIV^>DpvcsWdcR`AA%uZ$|?Zh3ssC7`_8mP9-)vZB2o83<5Q;xsf0z#+GLH>XE; z>xlCfJ{wtSgrexvr?$)KMBITMfSBnhAX;9*zLPx|dyoj)gjggGB9C*S<3Thecx@dW zIwq<3353sg`mg(7FmPgfFTzS9@?O*Q)A&zkK7AExMmm#-{a3O83-lPyFJshfzNKpH(6Dj63~e_ z-S?aDr3fJu8WUA<7{__&K?+S3*M3+=fBlWPRFr&*ns;%N&+Rl_Yq9XiNP-Vw3cv5x zVIvem)Hy-r5g*z@1nUuJ(3PS1K_Pz0?Kcten3#A7IkD(h#cSgfIG32v)=N`8GrSkAW7uF^^HHkt;8bA!8Cdz8(~6R zK0qXk4L1_td-X{lg_aG$6Za>C@3>wbC}qQ>Gp+PeAa1~*6WPFRBs54O2$5v|NET3r zu;oGi(`_nt;~WJ?ynl7gDR$_W2ZQZiW#zf|h%-=-THd^=1JQ0&r&sq`mP1M>5V`Jv zeT{gC5f*l0pCxw^54ZB?NA)}|b7bb^0I+6gMQc*sL7)P*tjhNqBOd6%h{Wt5oKIM7 z93URG=-Ea{t5Gp#Nd!%Of=FxtmqNG>Fh9M5J+*m@PMM+#r-=X#KPq z5>RZAURp-^|8wC_od?XkyP6zyD@4QqNsou`&UP{pc@iK=aJRsi7-m&f)rN^91_sTj z@L0GNn9a^*=8XJ`j4;pE8hsIwBmoJL;)YDf2>$^PaHRPZq<)Z%EfEZwGme6YGg26q z^`;aO9$fJZksc;9VIIez&a5fG_z;zqW!6}mqd;~WAtZ`jyLJ&o8BCbl`~K8Rt1mLl z9k52^&cESY@2Dv7gk4q##0HK32AsZs*F**YGuAJByPf?Vd&y4ZD@0Bl(bOby#14oe zo-YSmGyLuAwzhMqCq~l7<0ns=Air-SO-xU>c6dVzz>;mfmGGNS&YI-Cv94wlRRE$E z>zQ4JyIk8`%v~O+`@Si^`mGLRwjVu1yxf2FPpl=p4vHGbp{mc_IwBdhW&a#tiSV~} z-1zp7s4ALvM9J^!pgxxfjb@xh=$B9^;s>J*iuMIQ0VcMWFu8E4Aqh-a&!n7d;vgs z2p|>)3~oDS@t;(=@@GH07NybOgJBLvVunpXL&zY-;1m#|qvjXx9Wdl*>FL>9_FC7F z*6{hn1YKVqV}VBU2)1f91C`SzGH}K9U&!?%0*xsW@%h-ZT$da#*j4|M5wFV2&q4v| zs%FzZi)L|oN|aT!kGSwtj5{>@3C9mb1jT)si?aiH8sv?zi8g>VEv>B_oAOZI&@niE zBg_#11rGP!h>QnHA1(utJJhI+=_`IFO|X;5kKo|02UyO{m}m-LBYjg1u++{#(DL$Yl7 z+tXCi_3EC)3~~yJ$0|2jyLRIKTN)3#dScY62r55=_L+2PGvQkjy67rUVU+oyR^h0e_^ZxY5Jn4G0gXQx=G+Q8{tD z;WM(8&@qX-7C;}5;D*A0A(|a-d=gdBvpp-eb7e;_(OmvG+PD` z&b8Wx9)R2tEFgdm$%YZ1F`_fXW|7Ea}6zsXX-oIz# z=H5DACR60c#J~^;n!m8Pn2wCzamKEl;s0(GQa{8&Hc(#)+PH$D*OSMh?NUAR zK(#C@Qj<2;hPbMVLHWMBQ8=TK&_>k}IKcJS|DJ``ZvEon|KF#&MSuOy5er&8JoJ## bb(VecqdS+h_J`wYFiBtMsCKTF^^N}reTvjP diff --git a/test/case/ietf_interfaces/igmp_basic/topology.svg b/test/case/ietf_interfaces/igmp_basic/topology.svg new file mode 100644 index 000000000..ca4fff80c --- /dev/null +++ b/test/case/ietf_interfaces/igmp_basic/topology.svg @@ -0,0 +1,65 @@ + + + + + + +1x4 + + + +host + +host + +mgmt + +data1 + +data2 + +data3 + + + +target + +mgmt + +data1 + +data2 + +data3 + +target +(br0) +10.0.0.1/24 + + + +host:mgmt--target:mgmt + + + + +host:data1--target:data1 + +10.0.0.2/24 + + + +host:data2--target:data2 + +10.0.0.3/24 + + + +host:data3--target:data3 + +10.0.0.4/24 + + + diff --git a/test/case/ietf_interfaces/igmp_vlan/Readme.adoc b/test/case/ietf_interfaces/igmp_vlan/Readme.adoc index 0d20d38b8..703e13fb1 100644 --- a/test/case/ietf_interfaces/igmp_vlan/Readme.adoc +++ b/test/case/ietf_interfaces/igmp_vlan/Readme.adoc @@ -21,14 +21,14 @@ Test tagged IGMP control traffic and that VLAN separation is respected for multi ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/igmp_vlan/topology.png[IGMP VLAN topology] +image::../../test/case/ietf_interfaces/igmp_vlan/topology.svg[IGMP VLAN topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::igmp_vlan/topology.png[IGMP VLAN topology] +image::igmp_vlan/topology.svg[IGMP VLAN topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[IGMP VLAN topology] +image::topology.svg[IGMP VLAN topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/igmp_vlan/topology.dot b/test/case/ietf_interfaces/igmp_vlan/topology.dot index dc97ed5f2..8f5db7916 100644 --- a/test/case/ietf_interfaces/igmp_vlan/topology.dot +++ b/test/case/ietf_interfaces/igmp_vlan/topology.dot @@ -3,8 +3,8 @@ graph "2x4" { overlap="false"; esep="+23"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt1 | data11 | data12 | <> \n\n\n | mgmt2 | data21 | data22 }", diff --git a/test/case/ietf_interfaces/igmp_vlan/topology.png b/test/case/ietf_interfaces/igmp_vlan/topology.png deleted file mode 100644 index d37f0967203ec132e5f1d04090228f5fc9c0292c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 39616 zcmbTebyQYs*FFjcDvBtANC*~P(hZ7)BGMr(-QA5!he&rwcej*ucPS~|-FfEPdw*wq zf1KYLXPoyPV{bP+u4k=#&3n#kUe`5mZ*fr}40L>S6ciMUcW?P6QBbbRprD{)-b90+ zWLj-F!@tnf-wW}hTq6HZs7?z;L3x7mj{mi^ZOqz)oukO&Vcm9*W}){BzP0y;uh&j% zUJM2e<`xtWKWxGkprIK;&m783`J>>Qs4Efj@%U`fm65Za#&7M5qVKs06(F=g&8vUUVd3qjytjy#AHg*WE#{Ik>g<2i`+44nIL>_QO)VershmS?t zA5<{k+zb@Mp^$W&?+9Nt9HGb*jpY!Ss&TT=66ZTQIf1_w_TOK5WoyfJadBa}+)t9{ z8AK<*&u=>4j>FD7Q-Xc}{%cFiVl@F7kK*ED!pDOyuj6@~P)4ilEQkW;hF&!NyvOHt zmTvmD-uxHc1K)=Dee1tZ;K2gOqu;%|&_P$**wYh`C6~9bZ~D&%FD$NHy}G@#Gt(W*$!;Ih z*vQXf^oRd&V*>fvWVHjkJ=b=g2!V{3T(EG8`f#?qbdEx(&7>XKK)HbL!-7x0t{6{L zru>FqFpf`5SZG8bck)t#kMByFSbVDW`k(U3O8Bm8TT6YDacO%{*;|IY}}jg583YfYrE@!5G$gywb{7 z&>vqSO*B>sKNflTPOHW4$A3zV-hcY^Nd;5jV=ufJc83GQ)YID!saxScei!RKz#w4h zYzn*u?^{#7-tE?Sm0j@k^e2Tfx0R}EY(?z$KSSmdu*k$I6t3qtb(#MTJT&&MdfU}g;=S={5l;S zU01wLPn_ONc216&nOR!}D@oytflKpW5Q4h>$+uvk=a>4D_BJL6SXo&Q)_ymX7>q1U zR&yE~8!O~h*zZ$19Bz;>Gl$YDSBlp-+SMG*+}0mV{~;eT8d1f2arC^*WJ)ka5_OrX z`Skc$@7qZ7y9bkwyC1qnVmYkZ{}w%iNT`ZJUW)evGIFKzmuhNimP@^#TU+1G%*>EW zCg1$^>(@ucG?#0fPA5#<4hQ@>vQp{dPknIdx*I$(^?DOfc`wh3B#uR6*nauoP%%k$ z!Xvj{oS&j@?eA-KM$p??@ToA$m&&k{;YONZCWN=jr*rfQTi(x>cK zX@Ykk%%zKzr{epPgmgGA;GbEj`w;J4Jh*g)gU2`!7SvjQ>)lr*Q-mW!lUyz@RuoF~ zGh`@3Phb;CUtRhB{oa1H!{MMS$IF-EIkH(p85tS+Ha0d^;k3$w6ciNtB?>ul^co)c z;t*9+OOANYo;@3MwI9h<)~?2MqBe6@vATNWu5>t^s!D8BROau6_4ORI!Ta~`M;WO) zAE*53?iO7wX$c@6Ikm}@O>-e;G92wqpr=+U7sp7?Q>``r6MfHKYx}%bJoR!u2;Kst z<&wBUvF|_Do5F{)rGb<26pvZ#?g!Zo%4Z|GGi^Ju1qltc*37^h2W6>agEq z&f)B;1`iC4W{U)(i0;BAlYF2&=JU%KwbDb+1;b zzrsSt`RMPBT;-o0KYwyQ=CJ(K7DVFa=_!??zzjb`tApTq`~E$0HwtAo5Dr~IB=1GK zISof&qDV?fMRGf^$YjY5wa3drc>fwm6Wg_a^e{9mENtYBtyXJAag1L^Z9NyPe0Pfb z+=zvIn&{*9Fd75vIKTS0Q!b2gU(s*hzM7!j6%{qY&dx58DuNfh<6V^|nc?N*lgRIl zr7-qBj5<>2IaY;$Po`4P_SH&Q5Bu6~a%w(4K9r;Bub9OuyykOns|7+KlCvOO3`&e} zAyjrGw`ZCtq|?Q}5j{_e@bmS(n(*rL6@}BsgoMb7#D#|9eEasTv8Bbp$mQ4o#hvd* z5e*3mNlP=Sd6>v$2Shy!%IKdz`cARiQ+_V|V(~mp-QC}w3Haz%^CZ1xV9rBw-A=gq zd^_qAb+7&9g;UYa%4t5Wx!6#qOi3l{6{SkccVyj7P43CbFLF5jNAgsAnDTORavXCz zTINJ$cz(!cp^{6d-+TA&9hdXj$E^HHhr?WXJI1*(;$p>8!@mufyq&9R5duHNKWUMS zkWs(xPML=VC1ei|+f`)?hceWEipoY-Y&7=Jz`)?_{2Y&7{n~dPjrm_+Z)neV9i43* zZEF;@ko&Q!H{OI4E%5g3O@Dmmnc*D8v%LW^4l{_h>z_^!)~n7B#u}TNw$BfzbfU^& zbHPp(SY%9WB~DIn*THAjZ;WKr`B-IJFw7|SKAg7Xt#gW`cS(s=O{6(4K7Q2f05v2l zsE>T^=ywQM{Mv%af`fwi3e=k-AUJY!bG7GbAc4WRXXow*7Cv|jf#L6*q#1$6{-`)t6Jyt{Iaq%$TEKT%#@3h z#orStYwa%259Mnd*%@`ZUyze~{V6f9xHz->&~WR0xe{Yphi! z!^7Lx*en+Apg=}teEs@0iXR@M2kc}8LlFpp#;ip9{go&|PIyvVdwYFtpJM$X;Vivh zHd9WXo}M=x4%UA4^#yL$oPOJ$Z82~XXCYPfh~=~?H2upboBi>%qhnRJRH$!=Fp0rP zt`=01@d}F@n3$N-lsK?y2le<0t=ARK&d$8PeM4$@a&q$Y?CcwOk(N7Q)bc@41R;yT zFQJ+&XG`t>^&}1o2}$1ll%X(^G>c(ibmY8jrIz`xD%#+git1F-!Z+g&|L3+yUUKCUIeOQ zc}0a@&B4x2KY?6fsqUs|^he9WIg_9v?Tj1%QFi=R6;+k*U6PD znIP6a0f@q;l=gzCUEJUL=PFOp-M;{y^F%ORp64^SmtV1Ej>S8|XpUzCc#n=3gZ{Nt*_)O51dfN5rJO-fDe2gS=Bwva@IWQw81 zRE33SD3#pI%1ZlafrizA%WfAdm&1Wy;Bz5;=G~*S-5xzy`p2Bs*QU>och^P>-Yo9t zD3l~RogPHxVfc4Y0CLfWd*O0A2|)sy8*3*KAeH&bAVo|}%+hcULCX7ZmeumGZk?sm z)-1==_9jCWTby7{kXi+S8y)b<};n3grxL&b)WFm&w}7IkluKqY9_`8=Icd`)@Ku z8OGVeECx5OXKequUBw!uE!Oqd8tpOXfrrn!(JZ-w*t^B`%AU;^+!DL*zq$m-Cwm03 zma!)mcW~UTD=7`4k$`p#6Xk$#c;_yf;?@hv06vyPd~jM08BQ5}b|`Mc#- z#eI%W#?H@hYetN@CuS1{I_Mr~>kp)2T)+MB#giwmR_{aC!u0JiXS1S7wU)WDi;D~3 z=q^aZzhO6jy@5IGT>!BTRY@eChkMLD4dAE7*A4SW_&O92Xt0z61sXyR=~S}iCl|EH zL}NZdnl>CO^@n_Lr8i5CZqn&cIajGd-SURs`$fh*r#TrOi?&$Gz}obuJBQd83fVuK zzwltvCEu^)@P1Df>~;4Y^KpJyyT;lPO<0R$3l860<}>DyJ2fg^lukyd>5R>yX$e>I ztz=&w**|SBDf{ua~bsOw_dGn46O_h#6y6G;;AiiG9^s0L?I;HE$gMl6m@6_Sq z2t`-8nnZe`BXuE@qM{;Xd!bjaT!#+;Evjp1Y;SMVQ*&~ZV`H3SiKdWXkd(18@zbCb<1t4FB<=f;9_j9x(Zu%j9tO%C zcaqp-^4Dx{@!_ZGyx7`u#78F?Jb$u_c_UMrZCj12>~4x=#!n1c7Sq3{FMOEAXG$7T zSFfOd{ic_})%zXM;MMWhK73Q#9`Xt$XetL-1?6FcK$Sy8N&;QMAH z@LARVu;M>^j9b(Ry2>}uNzS*2Cc&dePWm%2(Qc4;?&nJb{0dGQqn>x)&(m9DGn8ez3uBflSkK0TGn{zwm?LjY3v$NW#I&_&MrvrhJUI{~WDo2ucKkdTOEktbIyrG`eL`Olvy zpdjeg>aRIpp4%vt8tO?x*^>e2k*wC>Q6VWkQDGreq|_b2d+`=pKV4|tzE5^O&D*VB z0fylCi9+-m~3K{54H)UYiTcp%L<3F`B2=sLqZM<{=%cL_?31X;MSz< zJmPeIzfdq}=6=tvXJRCbxAxr}#7DKj&=5`A;OWcNMejRSRu&AQPDZ9VIm!8+L1b!r z<2*5Z6$g=1pD8Drqc~vS8kk`TUEqo>KCbMMtEPm8a|v>#3g+`EhSCRSO+GjovN`w= zK6f6ybOmrL8pqWJxIn#sTZR$`Fhx^G$8C4M*U>CS`K6`JQ&XxY67$Q;?;vF4tL>Sg zMHu-#l_^674Su#ff#Jq@1rw}%jngR>9-cSgV+k`nq>BZR)wvO-lMeKUp^?!o3=FNK zt-nmVy{?e66UE8jzU_^zj2=5yv67V5dQMLM);WLSdqTpKC}sn+S53JdVk8w-FR#l` zhUll9t}AAyFpt=zZuLxJ>tE8XP96N4og)9uPSx!uzfFx_KV!vA{!W3^1E_qxT6swlsyVFYe5-n2f+|NHhw7~co z?P8?Jkj5kY{J;a;JtzZ zzFeLPL>5&Pg#jHtgXYb6#~p83s{QN`I#nXq)5A^07qqM)6jC1W$0Tv`N6;d+>`;Z$r8nC(j7*lxMTk)FBw-c3;+3r%88Qk&-%(H@#fN_)89RZrP4$I9kCB5 zOZgv*&BJc`AQ2jtzR;YDT~&r%+)AHo{4Vvx;d1hG8C7<|8Uf4rczk_{QQL3pd&N}Q zb-Ooi9PHZ(PLnP7$Y~8R_vrXqlhyHsVizk+*A2AlD5*q?q!5*2=cF;QtDLby2Qf1} zUH7-a^VZFqP;v;|>x&n!o}Zs1TMiP*kRfE<$H4tWInh~IS)~9+#bF?;wE#^Wih?g% z^n-8$q+vT)ACt(Cj#|K4?1>*)>sWQntCTyWklJn+KD`w3%r>+-ls~_`KEQM}^+bU( z;2z&cA4MSo!&n@ys_%j#wkNSWE(a+y(!YG_hdSwA#JQ#1cTg6vGg&vt+^8OKSyG;e zQWuX?-w$OvNk+-o*8g@!7gx+bt3wpx!gwB0b{EfDL}QjQ$~e6!(lkNzjY*k+nmjNR z@N9(!BedNy>>4|Rwa|c={jI-_c9+mAK0bb-2ihL!2z!c4IFebjM@tNFDJcF-y#YAV zd&0rP69@g%U0~X}G|-zHwV>T;h8Umb>sI=ThA{)Hb#`&O8D#|BK_WEd&@j|5ZOe1S z7nq-(MZVvV_P!*XzvNBJ5gwjMJGqPx7QU+O`SIW9?x#JMZ=)gz@*WN1n-vQI#32$o zX`g!$@kHGMouX&RF#Ud(jf;paKIWxxlJ3OX?edj3hTc5U?HHHXqCIbug?VS2m&CcM zgWfsnetfNMSmpobMEQG&j(iJQOJ;!?Q*BaWYg|A8=4`Y7n;+u6(CCWH!plmNs$=8e zV9@J-@u6=HXeQQ6AUVCgz5B*w@{Ptyr8A|yx3)}k)}h}<$U4Z7gwO#&clgH9k*oId z;-~EHtv9m_9}7>XzFfcUH7KiEREwo2t3ZoEY|coC0h?Q#*B~OTN(0& zX6^6Fig4gF0m}miTichwH&I)JP|ElK1E8niP^$~c9~)SHKxsf9)F;0SPFE<&lT9cIv0s>l9@k&04MA8!lZ@%mWT`)D6(qEdMSd z1I9WL_(N)F!v0&} zonmv}GB-hyZDKU`i_?87rA&njopWe^5r+FiG)tFUY(I39El^YShO_Yw4#M>MOwt*& z+BJV;^fWX)A2YV&w%<#D#kD^i%2kdA>}yaH$D|h|DgsZxG?)?Gec*vX(4Vi?KpkKt zLin-tbjp+1S=ZDMcG4Y%h>_lHd4_oU&4&JC^C+dLHj>YuKZ7h#0KH%pkxjk#7ODx^Z+ z6LH%&0t3Chzt2q713?wZX7&uKapCBRd?=;N4A314V+@Kk6A_~^k_i!40-jncsl@VI zzQu1MNV)vtWKQBw;2@bk-XS}H_4o<%>#h{y;MdoQz8V!+NPJ`pD4-4%y1BiQIX(ag zO|HxUE&*c>#oulzoYpU*Z0-|Hz9C^azFp+Np{YHagerym?GqJ{)@PJ;;-=!T;$yQ zMPEa|@W*lWRg*D`c9Tw;UmCNCvCRuh8LX!kSns@Kf5?8V&cbOTAlJK;`X#bCK7Yev zq4O!w2hb=L?YwyL;@*P?4V$%>-M~~tzEu0-E=cay`b1#Jr4!nJHv2u`Gb{@}c0-{Z z05JnNu_j1qNIOA|W#BiuO8Lx1tadgOD@`!x%dT(#*lwtSNfIMQ-d~}E#wn@omgz<5 zl|bhf3UeX!6oroihNTCV9_7)L-E?nzWC|;Sus&qd#I;0hD^dnfZ1Z_tdR%G3zEi0{ z-Vp(PBaJmzOQGzYnz;S#!U02T)TplE8jX}<_Z=RVkVE?HM+_{J_i{@@idA$k81+2L z?RH6RHpYL!2I(j-FK4T-uSYmSph!6|&xtv$?}Q3BK||#2>pKeyQj`<0AN7C!{7HB0 z?(Xi4<-~ObjUj6LuKT^nz(irw^*_wQp_JF_0GZG{G|0qnD2!iG*TRUKV&B@zV@iA@ zDUp>h5pXv|H~W-keNJ1T8guSulpqQKrQ`eqmJU(X zpoXtD3J3_$+wEvxxpF1_W5F|<&B=LSMyTZr`3*=rU};6o%^9G}Am!mvS*^f=&Y$q{ zWB>N>`1B!tAOr+~%HPi=vsxRa2Nqv&e`N^u=B-<=GocxfCM8jTj=aZgtmm(g4P;Vrrm{) zNMFE*AjDRg@kFB8Y%_-$M8FTgAla(5Dn$`1#d-sexNKjp|0x-;Y~(bZ1{EFc&J${C zkyX)9isPLJ?tH(18%BgUGO@V9Ke*7Uq@|GoljWYega=GC5YHSm!;AwtimcC`KaT{F zNi_H?6d(ruLGtnO@p9+$%7qxC@$$e7sWdEHT+gJW=TDzLrT&=zip&ObD74RmTxe># zN}@OK-qi;Fg^=4m*s99FB(*HZg2wS2#I2fsBSCGUNm7?h6J6$=!W;?S9=< zZue&P6GYuZ7MtmMPZNu=nR-kkW1dTVPzaKzc$`5CpV?OQ$ke$)V=$R(Z)l!MM{4tNw6hYy4!M5ErU+P%BKI+6y3 zR*-lk=os<@f=eO6jX35(*$oG_Q8H7SV$yaNBdJAa$*%2|q_liQd^|BCtHLgJ-0Ks9 z7nkpJYWkc=zb#`p=#0fp5fI610 z?C9tyAFKnQ7yl^nGI{k1B}F(i5qd__`TfJgmdVLD3aQkWAhc~vR%h9Gz?v9+1Rg(C zAe0AG7@-tNdfnb9zKxL`-_JlV&sP2!rZDOKAS`$BQMl2`n zK%w?$1GO8zS{**lWw+x7#3!(nXvsad(eeum>w$Q98()SY4x!Lh8jcsmnnxktJN@S- z>`qp4o-8U~G>JFnF?MqDGGXPC(IFR4+p`I8>GzwL1y_UI&Vv1DGE^o-@;(s8U%y&2 z`i0k`J>qrdf*yZ@c84VY8uuZt_VcyhhJZ=L$B6LnR%C(#}9~R zbay>vGw9g#`Vz03)EtvSgAEVB2!d&B`QemH{L?oc_i%8uw(6@8`3l4Yh1E}ySmE29 zauADVR#wbQqp2M5n2-TEd}mk;hW(JjU{?c8?y6x?VIg0Jv_4PKMfh6@t=IJQ^!!3X z1E8J6x+FvW?W4%#d-Gfe zko~mTT=@HK)gz#--3MT%DX5+~>nFpX(Qn>N0F5o`%FW)W_RGRGpW7O{^SIX5)_|*I z87DCNef<%1#kIc)X*h<%3Z0ji7YKG=ketDiWA95TCME`6mH+sm9+pGMbGL5a9^hPU z9W4h>afYdM0E60D@1VHggdgxke$>Rk3>BGPB z3lo)?%J;7J2*h1BS zm5*GY0Xs(k=r@+N1yE{;iHV!PJ$?@voR*gM+O=y5(v`ea zNAo`e`&Qi(h)K*71GEpL(Vt>Ni#)}$yHKwu?G_&w&FT+lw}BDC;*1t2p<+xb;T5VN zDEMN$=Z&BhG1*AOb315D-`8Arq;t49V~4$%4DJ_u-@j*~K9sj9;kG~p=jZ27kj*N| zed+G*zT9}@#tj7Cl^RcEmN-GmjwE{iTu1iyMpO`M-kLE}3?g~$zeE(BU?*_Xz^icw zYL5Zx*xkn*jZpn8XFTpcZcmGM76uJ7T{;5`tVDA_r$;V8-%I0*OQ#JKbFtxXEa1sY zL__J10WrK27M@ud%6et*SqYyO&sAct9>_P33J3^Dy)OsGDA<1qkZ!PPl}3{tA)v6S zKZ*}n6~H1Pv^8VOmKM}2?LWnOQKG()??gox0A~Ff8&ljR3}iP0Dwb*MaU|XBDSwJ& zANV2Sc$|=XW9sVhGg3B&wISfJBxg051hK^xn(e4iD!SGZ{@aBG1wY_Rm1>=1iJgyL z7jbiO#XucjY6MX)g41S0*J|S@v}sV6yY?R8*;D~1&gf51@{eyoM5;tz2Apc{!NCu} z-|!34D`eEaz>tl&N4){kFfCg(A7?3hK-G$C1-*|!p_Bn`L zcb%P`6)?#C+R7kzgGzjKx>*Y_NfY$-qvK;OMd`T^fPRwjZ2%#ennE+AF8llYM{8Yp zH#Rn6xa@*JW7f25xmPzd6sl5fU*LGWLv3+-db)eGJ!?qt?YIi2l0y9DR^Sd}a&OJZ9bg>hf+Yr}df_I5-4+u+`wENSn|B>gD-De_Ld~ub*RdQrUq)#1#SL zhk;Rt;bTfy*nAA8({&<;1W|On-RPkD{O$emCWh1I8{oMJCFxjL3V19juxjP7tU&3j zpPGt?W=Can711<6C2@_8R!pq`uaGbNPjuB%YSvszu*fez|K*3DmwtH$!`T@WT)UL2 z&`-0xv{(?SIa#3!9!YD*oD&Uow_5IZ2f#hEwA2cSg5BkU3!FB+4&l0!Rd$x^e?o!y z1X}D3I1~YPegc{&a>2&b6tUs}OJok23DA71{B$QMm_6}}U_3+c;nC5as3Y7o^4}Z- zxPIPGUv1?6Jh z`%nPw1GFIDnP(#+GQW0JRTVUIi@;*kjf}7k7<+vo@mUNbwETY9tqx^{YY|ClKzDfa zDT9WINsrh4=WI3`gn-Nk2nN89kgHOi$(%#i0MGgs^mL?ug0^+!_vXgNx4b+$c(7{; z;C4k!DH9(MZXBw&V274LG)+;a$m>8sb5}f(SLRR*2CsxLK#o5%i3~45=HvM$>@JFsjdQ781n&SR^4M zAEetKfzW0IqNq#GsBBkwbF%vL89U~&%#%eqcumelz*W{JrE$_5WlBe)5m~1hLLWyvCRDa-5$WaBw_0)lqUV^?&mKQwxtE{839`QU{ye{tLZK zrYKqc_RFdZp};Sdx5*bQ_k?W+7dK` z_=UvxgEN_OMne+xUUQrh^EkXMxYfj@IzlBEP?zy}bZk@y??!LF;~TzI&-}F|2ElVK z$__Kzksa;L@@f>pmQ{<>Hly|r6lq0Hr0_aW0Bt;%&1G)!B zq7jc^*`*rA3+{_$SzHX;oiJ@Q+%R!;RlLtiY8>Zv%4EZr#D_r?P_X!G)b=U=g=C%* z_aN2K9V2FJS1}HkL@9C9a<=jWm5fxy31i3oVYzgqnJ#yuXg7zWzqRpV-jbBs)9$u1r>#P}4rFXfVmwvUz3z-|X(|>K&ShIV{qH;5kw|ZgV zHG99sf~IFqGuUN{(VQfw z{euunY2i(04Z?Cu6oV9IDzsdbPfpYJk}{Dl;-zH;It}?4A1SgQ6*yn}d)R=%@y)@^ zMnO(5$7agLvnEOCoG64^x_=JXlvX-0F0ugj^9cZc}tBu(*`?rM7Wt5ab#Dr6+z_*f{^{_-aE(!n%6<=M-huB_{+R#$f)lsB>sqvdLiL?~-FEn)-gmw!Y50B?2g z=F{SL5~2Q}pE5XCZ4jEP)qoBgxmW3HLwjYZnp5hB?sb%lnq8aR`L@o#`3=b#{g38D z_uq`bxWUWx<0m{5+Z3GLn@>o2&~R_ycGV1wh&^~r@L{Ag8b80k@#v=>HPwwACcQfbqPf3vya;p@26;U(QGC)7ZWh=}XA{6oTS5KjbIp}_6&zd>jo+Ku$ zfF5sn>6VHU%}_C*8Ek&@sS2Ie?eG*Q{{wi}t{-$*^pwBL!zR5Ng;6J{r*UA$5;ysF zx4nxQHw2A|pe`gwYSc-Mwa=^%+lDf3*&qj7*6>m3XS5=Mt=Vnj?aT#%%hYp!jv9rW z1W^T>#cakbbKbutsVC7wiwg-EmB4W{O@}kqnw}-C#cwk; zLRu?E4@vwcuq>H&d#uMu2LhJVIwoR%)tBR;)~;7q@o^=_^WlI5wPO!KtFE!rLzNAl z>W;dFs}?U*=D5J=1D5sRk%oKEMu0>$o32BxKAls0x*b2Oxq0oCx^QB5joaL{oQUz( z-NL`C9u^x5>~L=}^Ej$c-E8Fp?72nIuhX4dN3zjpl=5R@PIgundK_~@uh|1}D;zOS2JXois- zXBoG%e^5`pIVGciPethg-%Sk|eYvn;NX=d{Aa>?GsF4*hp0n#q7_5^9#l*&l}_;&)I%xh?_(;Q zn-i3XtF}>{2oC2rIb9gFXCHl4dEm?&bM?oKqxg|a^A{Ha-wu`qJ{s~FhMCddqG!W3 zW#Om=0_3d^<#v2+iiv?rg&k~${GB6V*iiG+jbB4dX@C5lyllA;q(Px} zv#r(|XFg$H(#aK6CD~F)kXYr@A|;`5$4Fx}-I)!Bl3{hBDRPTx&lsmJ;HyirLYsaz zPeIiF=hY&ARahIN%;Fz{%lK&XtSlD-GVi6Y_l|E5kWnyuXZ6WJ7W3&lE_y&j^bHye z=#EQmjivYn1PTD9f&H`v8U#Bq?W$nD^OExc+h*g`6fuyr2*EP)rtdxxQ8$P?2;mE3 zIbcRnPuvJ8hoiWrmqyX`S;SMyKnjnAx4wp-kIO{r#5OExX%^wb{|)ksph-NTELHstf~XZHH$ zn|c{=zO0hR>HZi!I;O|ojalumeiZV8568nHC2{-Ty|QmmM=iC3e+?WHt`i;`4Voa| z67*c2mDcNnmzMH0hhW)bBXMJmSykDJk6KUxA$RceTe?j~bp48^SdgX`3QGf;UI$!{ z+Bh=M`e=Y1M>{|Zx(5WpgBAb&4@P2IOb6yKQ&_~{J?gIZz zCx|_J27MT#pK$6jezP}_Bv8+RCcS1FUGwql9(?#cK{Z8Jf-nKFx!ka$YHM_ z?a*^8X&+2{*F?(o!M44Ww+t_)OnW(snz)>6tbB+}ZdP~kZ4VkZM!SJw70>Nc+D2hD z_nv3OrRNp?Ej`4+slv}GNqtC!!d_|*JbJh%?;85d#hI{BS^|fVuoId^@S5HO2><-$ z%kMC$vUMFi&O znzenBV2%&{KK|eQNuN-oxc(H|)aNGC^5!Z!*V*M-W*-U8C6Ioh#Z08p^R?g~rR;MT z8iUaolW;{yq7%kMlPM};3)>DCg%kS7=Aw%bJ=d<)*Gw0M$0(P#FV3tFSihuR*ITdM zUP8m+y*SkAb0xm<(sut-zw{-Go%kKO|M2Y6+~!mZuXQ*PDO+;MSn&{_ylEr38o26I%macQ@pH3f=;>68ZytZVD*{_ThB zWmA&SvUiQh%F0@9j7K8s3Sk}M%ic*zW*7?m zlZbW)e1F%aPD#WR#DZ0+|0DV@pmjQ*Z41F{i3n|GW>~t9Dl2dGX=Z44s?F)!p1>-A zhya`=GGwIbWFFs8yb)Wzl9FiwIC4;*`2!V8iESJ^_u`hCCuWhO3$yU~Dc396S^5L6 z2=hs|d&jD6d?fGWc`nL-T+c2*l z;j3k6*~C%jyDAH|XGiovti6DBfJT{7qxsIv?5x!cty1|bXsp0#iOk^41BvDcl-t>+ z%cTZ1U!Ym^I?_Fq#*5>!yW$!f8{5}{!@dYIL)7wTV2yytku(_xKT5jzk1HU`%!8Ez zXwccee?Ln`I+1k%ISosH*_-hCYD{d(JKq$TCAfNVwkyVSvh*CGu8N8nk(nh0<_XMl zJv}`b1}Fkv2kuYE(vpcpI3xj@KgXRmGU;3;JXhdmp~X$u{{!tKquoxeZ@cmD!t1K4 zs!2Nv!c9KQa;z}VqHlgzPDrjQ(+=;PgVTT$fOZdqAed$v;P6>`&BSR znI8kpk}1-nt5gg3B?99#}zo!d)6G|Pp>rl&K zHV=mB6l^j@+71id+^(@0j=lmphPk#u;KCG`4n%K*lz9X*o=Ce5s_B6DDvSrh3k-Yde+(L!Z^-s+b1py0IsUMq*j>Gwk z4HT!|Kh~?mG{A8-0H*`q_9R=g*)j7)>B&wo8)Jf_uhM#5zaR#h{zjK3NEu7x6-5g( zi8(nm(A+P=0Kl+M7BFMr6*8QviT!sTu-s;o2xJCifJEV%R`Z}EDDtF~ls?P`cQ*IP z&0D@deS_$1FcbL$NLKk~V{msvq-RQJ@bU9sV>TGpgeoEu$sl0j2x27IP}R4le^IMc zv5|RPDg-CC*CYB(9IuNgjMD(M3A{8d^5wAJ%Z&<(iUUbPm}8;4GvbR3=&o~s+WyEm?1_}Ze z!(MMHpzvHS&&w88VMtorPOVV0EeJMb04R*r$`g0G4x#uU1GUTyl`$8>?2JV*usC!U4PnC#UvP3UrIe1KAZUG`bTx=;-ME-T^?s zLCOY?v!KB#vCCQDGChNHIw_eB5AH-rmB*hNCr-$oDX^gp{}i_+49Cjr9aP~(3oWUR z@FN_rk&Wp1-&Z@RNh*v$i%fMg(GpqN&dW>vX$&5jTwD#V6Telql#|z;2#^cUkD4r0b3TalSuBcZ{ZERRq z&d~=#f&B+!aDIiJk=7X)#8?=`V}R)|M@Pq{arxoG;ujQ|)UEC9K9JjXK(nJqJj*cp z4Co5+r0!4Z+gMo4uKg}ro2-t8X}0aXWhrnXG{>-8FmMYB>imGYquyErU+;POZxYHVw1@dSfp zG-S(Qm?(mJN1i^kPb(7o9Na6+*mT&rZrcEiT{s4C_|Y= zG%&CX3l11QqoD8xZ#K$@25)3qL|q*P$?Eb&Ur|7z^M!dskkg64pHQsJx-=5&NLiW> zcEtjdDITaP30AAMz&#sIW;+RK1KvYQGqAA&2B%Pkj$zDde<2U14Pk>{yK%#SJK<=C zL#BCQA4dEEUxT-7qcD_Qg3m&r2~glW7RQpJoD7F& zN~ZWMys?xu!vjLS5ll;r6DDtKvQ_BJM|9$yJbZm`gSbLUOZyGPa^!WPz~D>C#ReBQ z_c1a}rb^6a`fB$$3nVCHN^d?_u`IXyP9hkIb-Q9D$+3}fQDh7g3dL5R5V8CTO-(7{ zCxH(j1rq@TU%q^SC|B=Keuqr+Vap&RRxtX2LnUhpZVV{Cb+Dqkkaxi_Aeo^F^1nzF zlQ&3jTR`Z?K9br&1ROrEm=tMB@RnVHJkk4G4hAh?q#vxtS8rIRrGxmRsxt=9lUkGm z3kkKPH(~Z>15i3w5z8|OnwF)tfr^V+QL{K z7)4Bp0+#lrLAR|QOG$4Rgz60Dvu>!2g^o^6yY@Gc8x(}^fT|^ooQ3fiDEX+wOi()@ z%E$tQUZ}hPkNYHy*Z(`-VoTD7dG(*i-lqHx?tkcxsi>A010QJel>W0cwm5G~p8T^c zZukE8aUB2qS$!z~UATV+6aQPH|CeJf{=YBc|IZ75T--TKFcbpt3QLW-X`D)2nYzEK)L~>0=-EShCrpWWc|U2f%uZZ{-oAhPzD(l z5&|-w4W7G{e+I{AXJ?PWmg4Q>qYeWHh-2VrOAQRfDXbfi+6=+l1!C2ILr~|2E%%_s zgaJ!-aB>Kz1i=pe+8n0_+Wi@^gAEbU>=2LX8E4yzLSOEnKi=XcI2hg&0sJ>Vd>xeu z4bzt}TCN|hT;ik1fdfN~?vaFq@EgAKP9e{rDIE>J_M4HhmUl;6U!=56By9M+f_7w# ztLJ=tv9qeJbKIiaq8l{e0C)H60P@+`+0EcC!IEaToD%*KR2(=gqlZ-pss)(s)4&K< zsR3XZk>Wrrm8x}in%D-+hBw43QC}>EjGC5I5IR$WgI53Q)vND+5?spfoFQ8^#RM1> zg;%SKi{Uzcf=PW)krjVxwA`I20C%!Jsu3)npYcFTi%^y{Wr?db;A^{PkUZbs)H1<`G?8SV%2_vU@^bwbM@ZXEDw}G&&~6@H;{8 zT|9>5IzqVCfQOsg(qjTfZNG=T7tpoaw}9Wqs;9~A)&swdJaXAx&69W}nj57Ip??XX zlKTe6LJJVilr(^Phhu3hSBJai4q)cS3&xcJLZMJYjhH$D3<~GX@WXr?SZ)NehN8wj zp}KFw2roTY>7FgZEY2dd12KS5c&zF@mvGO{O_u`>Y2xIEjJ3c2%N zMu}6042V!ufKS175n|8@Ux7fkhYwR-ER{gp2S*zSrbIBR19w(#xhz>T0*-WS7yvId znd(Nys?3Rz z!fLQR0l5Z+g$V-W7bnL~nRqP0_urX4w(a{%eOKk=cdy?=VajJsv-^1yf_wVCDxn@ct)N;x(X; zkzKqUQdC^536R?LukH{$!y|U{Wcfex1?txUmi%gOM|Xu5LcGja83Cc1nwpT}= z46hOzOJvMFR2XSDz;r`;*naw=A>sAca;w!a`IC>> zAmD4lSOxfqUYqRBBJDKvx{|BmW{C0FSA{U)DccG zNz^=F+{ozHWrB&Aui&8S-|+com)8nI4!7HG!tK*9sXE>GNlKT*0}c!@{5ODUZW+QY z_d3q2PoJIuHvlM%7+!j2?=cK3LcmfT-2VZ%2TlsulO?QjI%RINgfJZ`J$)dwHd590RzzI3bzqKx!<_h%`Vjj#7;?ZE24BhmJVmtu4K+2GfK!2z zscd3Kp9SA@CEYYJm#r(LS#C5iFu)LL25v2IErx%#Pi9 z?GdcnGZvPIu0vUJ4TUHPp(zDb=tyt;@sct1~n9E|pZ<5#+zRuF& z**}2FYupMPEif`61qak*%H_rB!~g(=P1eIY0?*yn+WL~*!yNLgrfDa*j-Y7HIUq3U z2qq$bgZ=8W(VRAf{q<(Vo&+JaM3eY;aZw0**`4ZKa;Zzm$O6#k`_+hs&=%p!Kzt2H z+aH2+9(G+)86{MIMP%b)5^?qZw1)JbtyCddW`n9}f;IBf#sogJuMQC*2E>Q3*1;R3 zCc2z$dv2T|LmuGU-dKdH_+KiLK)HSUHV>Ss;HZJ{8$~6HYilu!Z{^fV41f23vZO#v zRPM$WkO*S99fqfeu`H&3A_rN(Orh~`OyXQbNjf?P2GXKb9sDu)`0-;tn9&gq4V)(_ zrykFqKK%^6ND%n7Vf}Prb{N4UP^O?GKnxzp)==(-WX_W*3CNR9@qpCC?-@`%%#8tg&91%1p*2aJjZdqoTEE%rw1 zQ?;rl{8T#5#xflOdnA@~nZ$4Nt!10XQSFO0t@#<05L;&igt2MRv`fV%qnFNo3W z+hca~YppdEbZ``aF8KcFs+s!_c%e;`NllF|x;Qs?ErE3<1U&iwS9$OK&UO38534RJlm-b!OT&l= zkx>eTGD238kxf>zQi;k)64^65DO#|aG`1|6O%{E z$piSk>_3hF^Xn7}w)OmRz@}0kDHew3miUwki;D8GDUm5yGcBl9$N2(dSV+ht7z%+= z5!+RBl9D^1+HBBb6xd$F%vgw85b8b1{{V~9z`!y7UrEj39qc+P`T6-<(V9a2W*>J+ znB=|yXJ7puu6!N{5U8a?@RB%a$0!o(0cu!~84I`|L*RiV5&~st%_{{G1%n$Adn*_- zNxM=3nkA}XvRK_Ixgf#EyE6haMK(pWH63|YR+%PY82Ye+5w}D#Xb5Ht0M!ImRuoLf zxkE_d!IPe8JA4uHa&PH4|Nqp}`&%mBn@g$cI7^BZ4>$KCH3qBs40T`$0BF4Jsw8m% z^R_2=o6PpUf8Uhk&eU?ol>hws;p(>kjduV1FMMy~|I!Dy|1W*;;Q!JG<^PXy=hXkE zlDqV(|5-ZM*8czI7e{kVY<^}Bp&ji0(K!WEQS{rlyC)_ZnK+#J`@jdBQ&Oc!Q^SU& zX5!E)!2{=)LMeI2+hVDlWB1Vj7x_z(OEUTcx}`WUW2qeb7i~=pE5gb;mYqZm!GBUotzc1W01f{Fqr?c z>w|%pWwRcT^MF`9m}xfaE)>SFP4%w5JzudEsa_;RCO|s*Y|Ycy zlz)h(mGP>}R;&tWTG8o}un_Vx;mGCzZO}V5mg?PVeEg+mt``uuCxL-daGU_LBM~gv zGWkGp#m(RkLD+o0C(L3}{EYazD`7mv3;T#}p8^d-?JsNO2d&cu`7}3tj;zHYYX~*} z6BG3!>G$(|=&u3K{c|c_xwo(HsaYqwvLvu&jiNKOKuS*~tMv8uDkU``5P&CK>oz~!U=?BY~16mO5W{a+Z*fs%)V6d%I7h0 zqU`sh=z(V^`ChQP%=WFKQy_La=vm{R>-1p^CAKoD1XP@_k_z7;^{0Ka`hHxEVj^zKb3 zZ~fc@dTI~0VqEtf!)F{vtHo5=2Ozc}z$CnT{lBzwl z(uIMyl$Z!4+-~2^f=9pre?d?U$lGu9m2V`7ylB5ZSiO?fB?)3cK(CwX5cYsK!bc@= z3%GmCW)CoWVPlB}7y*KU4H=+B4?!fr(JV2VZ|#min@#a*(#XcfrZ)HI5%X@mowZoH zlm-e@&Mv>N-bN$8VZ(+!`}ey;N*%3In?Y)le-x=~x2E)v*7n{kqo@*>8-#Qz!URz_ zKgG*2l7ZmlWMSDrO~4|O&nV#0j6t}iRP8W0ZoDV#Tlzp-2m%Z4Byjc&Bl`g;7N|Bc zQxJAGRL~+Nul8I2=3OW5pfAA6=}XNh=BTk07Z~_#y|E_bH3?iRin8@I4hRUiJ08!o z21WW;`uxmHU2YPGd3UU=oLn5B>Rl&q`oJ)TF2YQ?_>h2QXE5v~*+X0pC1akj_kK7P zDKq20ME~Io{`+M3lPLHds#B=qYmyK!f|0eYz1zk$E7Sj zW#?$4aTDa`kDd~%Ee;rZoMuN(%gRz?Oy-Q~7IVepwpW-<+_w8=S#8-af0$oaG{hxVlsh$pbmjOJ0sL#c##O9eG^EaZanr)OY^R`Ed!#$*&=8PX>T`F zS5v%Vq@_rL>!8~nO(B*^)_+mD*@4=oigsPALflr@4k)8-N21BwdsU{u%hxqNzPpTio=Uo&yL_q7^%isWIaMaIUqbyHEb7PyAr4sOX~gkD zQ*Igb2i-2Yn9~F2k+5mIoInCDP=5k2vc19^CLLAKYuoMHwvikJFK)MMNiCzw7ON$g zC#zWsnCNFc9vt4aSRm+^I5qhjb&Fk)Tg*sy84sjMTjt&;Vr2uUB?kvTgrrU9EW6EH z5fBDlqioKHa1D6~{QIDI8BELThUT78LZW2bM3q|vy{ch7psxlb`Vns=E@*S=Wj~Y^ z2Gg3E_fEYYjDXT!z(WoEAC9G8bIDkj%xL+_K78PA)k{ai1~1NgE>~guQF?%oLUKoO z$=<7geEWuRguN*Ul68EYDEDQurz>Dx`#l z1&}6!5em#eqfn2_8SIN$uU`x1`(odD3gp3NaoP|WiF6~AmjXjWsZU{R-neliRV#Ay zss_Z#zO8T)n$n?$h&pmTUwr9h@iQQTc)G3M`E7p8_Vv0{NE(VMM zWG5AMSx}smn*jO}t(pM6b%Oi)P|&*hOw`Zu_{i6v!)t6?Sy_8p$)j%^_=uC{sd@ z_ks_gaOyd{GfYSZo7|fly=&pq>@0F-^p%ctxHOKHw1Jwsc4i7FAmguO(m=1wU^uk9 z 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 Mb@6Pvr0%`{2LPryUjP6A diff --git a/test/case/ietf_interfaces/igmp_vlan/topology.svg b/test/case/ietf_interfaces/igmp_vlan/topology.svg new file mode 100644 index 000000000..fcedc81ab --- /dev/null +++ b/test/case/ietf_interfaces/igmp_vlan/topology.svg @@ -0,0 +1,107 @@ + + + + + + +2x4 + + + +host + +host + +mgmt1 + +data11 + +data12 + + +mgmt2 + +data21 + +data22 + + + +dut1 + +mgmt + +data1 + +data2 + +dut1 +VLAN55: 10.0.1.1 +VLAN77: 10.0.2.1 + +link + + + +host:mgmt1--dut1:mgmt + + + + +host:data11--dut1:data1 + +VLAN55 U +10.0.1.11 + + + +host:data12--dut1:data2 + +VLAN77 U +10.0.2.11 + + + +dut2 + +mgmt + +data1 + +data2 + +link + +dut2 +VLAN55: 10.0.1.2 +VLAN77: 10.0.2.2 + + + +host:mgmt2--dut2:mgmt + + + + +host:data21--dut2:data1 + +VLAN55 U +10.0.1.22 + + + +host:data22--dut2:data2 + +VLAN77 U +10.0.2.22 + + + +dut1:link--dut2:link + +VLAN 1,2 T + + + diff --git a/test/case/ietf_interfaces/ipv4_address/Readme.adoc b/test/case/ietf_interfaces/ipv4_address/Readme.adoc index a67b1f431..7a411d5f6 100644 --- a/test/case/ietf_interfaces/ipv4_address/Readme.adoc +++ b/test/case/ietf_interfaces/ipv4_address/Readme.adoc @@ -4,14 +4,14 @@ Test that it is possible to set and remove the IPv4 address on an interface ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/ipv4_address/topology.png[Interface with IPv4 topology] +image::../../test/case/ietf_interfaces/ipv4_address/topology.svg[Interface with IPv4 topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::ipv4_address/topology.png[Interface with IPv4 topology] +image::ipv4_address/topology.svg[Interface with IPv4 topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Interface with IPv4 topology] +image::topology.svg[Interface with IPv4 topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/ipv4_address/topology.png b/test/case/ietf_interfaces/ipv4_address/topology.png deleted file mode 100644 index a9abc1911a2cbd580bfab3046175240c459c961e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3293 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 OK`xu4&8koyasLKk_b + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/case/ietf_interfaces/ipv4_autoconf/Readme.adoc b/test/case/ietf_interfaces/ipv4_autoconf/Readme.adoc index b88281ed4..2f6e8d0cf 100644 --- a/test/case/ietf_interfaces/ipv4_autoconf/Readme.adoc +++ b/test/case/ietf_interfaces/ipv4_autoconf/Readme.adoc @@ -6,14 +6,14 @@ address removal on autoconf disable. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/ipv4_autoconf/topology.png[IPv4 link-local topology] +image::../../test/case/ietf_interfaces/ipv4_autoconf/topology.svg[IPv4 link-local topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::ipv4_autoconf/topology.png[IPv4 link-local topology] +image::ipv4_autoconf/topology.svg[IPv4 link-local topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[IPv4 link-local topology] +image::topology.svg[IPv4 link-local topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/ipv4_autoconf/topology.png b/test/case/ietf_interfaces/ipv4_autoconf/topology.png deleted file mode 100644 index 5444e060bae54b3f163f8b593610b6b4c1b4f833..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5640 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 S^96tvQNOOG@>$v9*?$2*xFRV4 diff --git a/test/case/ietf_interfaces/ipv4_autoconf/topology.svg b/test/case/ietf_interfaces/ipv4_autoconf/topology.svg new file mode 100644 index 000000000..ff3d246be --- /dev/null +++ b/test/case/ietf_interfaces/ipv4_autoconf/topology.svg @@ -0,0 +1,42 @@ + + + + + + +1x2 + + + +host + +host + +mgmt + +data + + + +target + +mgmt + +data + +target + + + +host:mgmt--target:mgmt + + + + +host:data--target:data + + + + diff --git a/test/case/ietf_interfaces/ipv6_address/Readme.adoc b/test/case/ietf_interfaces/ipv6_address/Readme.adoc index 6c1345133..93f5da934 100644 --- a/test/case/ietf_interfaces/ipv6_address/Readme.adoc +++ b/test/case/ietf_interfaces/ipv6_address/Readme.adoc @@ -5,14 +5,14 @@ See issue #473 for details. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/ipv6_address/topology.png[Interface IPv6 autoconf for bridges topology] +image::../../test/case/ietf_interfaces/ipv6_address/topology.svg[Interface IPv6 autoconf for bridges topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::ipv6_address/topology.png[Interface IPv6 autoconf for bridges topology] +image::ipv6_address/topology.svg[Interface IPv6 autoconf for bridges topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Interface IPv6 autoconf for bridges topology] +image::topology.svg[Interface IPv6 autoconf for bridges topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/ipv6_address/topology.png b/test/case/ietf_interfaces/ipv6_address/topology.png deleted file mode 100644 index 5444e060bae54b3f163f8b593610b6b4c1b4f833..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5640 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 S^96tvQNOOG@>$v9*?$2*xFRV4 diff --git a/test/case/ietf_interfaces/ipv6_address/topology.svg b/test/case/ietf_interfaces/ipv6_address/topology.svg new file mode 100644 index 000000000..ff3d246be --- /dev/null +++ b/test/case/ietf_interfaces/ipv6_address/topology.svg @@ -0,0 +1,42 @@ + + + + + + +1x2 + + + +host + +host + +mgmt + +data + + + +target + +mgmt + +data + +target + + + +host:mgmt--target:mgmt + + + + +host:data--target:data + + + + diff --git a/test/case/ietf_interfaces/routing_basic/Readme.adoc b/test/case/ietf_interfaces/routing_basic/Readme.adoc index 5699d9c99..5c5b681e4 100644 --- a/test/case/ietf_interfaces/routing_basic/Readme.adoc +++ b/test/case/ietf_interfaces/routing_basic/Readme.adoc @@ -5,14 +5,14 @@ in configuration has the expected result. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/routing_basic/topology.png[Routing basic topology] +image::../../test/case/ietf_interfaces/routing_basic/topology.svg[Routing basic topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::routing_basic/topology.png[Routing basic topology] +image::routing_basic/topology.svg[Routing basic topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Routing basic topology] +image::topology.svg[Routing basic topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/routing_basic/topology.dot b/test/case/ietf_interfaces/routing_basic/topology.dot index a4ba84da5..cfe40656c 100644 --- a/test/case/ietf_interfaces/routing_basic/topology.dot +++ b/test/case/ietf_interfaces/routing_basic/topology.dot @@ -1,10 +1,9 @@ -graph "1x3" { +graph "routing_basic" { layout="neato"; overlap="false"; esep="+80"; - - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt | data1 | data2 }", @@ -20,6 +19,6 @@ graph "1x3" { ]; host:mgmt -- target:mgmt [kind=mgmt, color="lightgray"] - host:data1 -- target:data1 [color=black, fontcolor=black, fontsize=12, taillabel=".10", label="192.168.0.0/24" headlabel=".1"] - host:data2 -- target:data2 [color=black, fontcolor=black, fontsize=12, taillabel=".10", label="10.0.0.0/24" headlabel=".1"] + host:data1 -- target:data1 [color=black, fontcolor=black, fontsize=12, taillabel=".10", label="192.168.0.0/24", headlabel=".1"] + host:data2 -- target:data2 [color=black, fontcolor=black, fontsize=12, taillabel=".10", label="10.0.0.0/24", headlabel=".1"] } \ No newline at end of file diff --git a/test/case/ietf_interfaces/routing_basic/topology.png b/test/case/ietf_interfaces/routing_basic/topology.png deleted file mode 100644 index d8a5433fc3bfa20a9cbb45119ea287f532fa1ea5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10551 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 diff --git a/test/case/ietf_interfaces/routing_basic/topology.svg b/test/case/ietf_interfaces/routing_basic/topology.svg new file mode 100644 index 000000000..3c706e87a --- /dev/null +++ b/test/case/ietf_interfaces/routing_basic/topology.svg @@ -0,0 +1,57 @@ + + + + + + +routing_basic + + + +host + +host + +mgmt + +data1 + +data2 + + + +target + +mgmt + +data1 + +data2 + +target + + + +host:mgmt--target:mgmt + + + + +host:data1--target:data1 + +192.168.0.0/24 +.1 +.10 + + + +host:data2--target:data2 + +10.0.0.0/24 +.1 +.10 + + + diff --git a/test/case/ietf_interfaces/static_multicast_filters/Readme.adoc b/test/case/ietf_interfaces/static_multicast_filters/Readme.adoc index 8a9f0085e..33bcccf98 100644 --- a/test/case/ietf_interfaces/static_multicast_filters/Readme.adoc +++ b/test/case/ietf_interfaces/static_multicast_filters/Readme.adoc @@ -20,14 +20,14 @@ enabled when using static multicast filters) ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/static_multicast_filters/topology.png[Static multicast filters topology] +image::../../test/case/ietf_interfaces/static_multicast_filters/topology.svg[Static multicast filters topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::static_multicast_filters/topology.png[Static multicast filters topology] +image::static_multicast_filters/topology.svg[Static multicast filters topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Static multicast filters topology] +image::topology.svg[Static multicast filters topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/static_multicast_filters/topology.png b/test/case/ietf_interfaces/static_multicast_filters/topology.png deleted file mode 100644 index 1c44852744f8bbbca7ebe42c6e58dfddd0683a2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15432 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 bb(VecqdS+h_J`wYFiBtMsCKTF^^N}reTvjP diff --git a/test/case/ietf_interfaces/static_multicast_filters/topology.svg b/test/case/ietf_interfaces/static_multicast_filters/topology.svg new file mode 100644 index 000000000..ca4fff80c --- /dev/null +++ b/test/case/ietf_interfaces/static_multicast_filters/topology.svg @@ -0,0 +1,65 @@ + + + + + + +1x4 + + + +host + +host + +mgmt + +data1 + +data2 + +data3 + + + +target + +mgmt + +data1 + +data2 + +data3 + +target +(br0) +10.0.0.1/24 + + + +host:mgmt--target:mgmt + + + + +host:data1--target:data1 + +10.0.0.2/24 + + + +host:data2--target:data2 + +10.0.0.3/24 + + + +host:data3--target:data3 + +10.0.0.4/24 + + + diff --git a/test/case/ietf_interfaces/verify_all_interface_types/Readme.adoc b/test/case/ietf_interfaces/verify_all_interface_types/Readme.adoc index 20d268318..902571263 100644 --- a/test/case/ietf_interfaces/verify_all_interface_types/Readme.adoc +++ b/test/case/ietf_interfaces/verify_all_interface_types/Readme.adoc @@ -16,14 +16,14 @@ slightly longer than sending the entire configuration at once. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/verify_all_interface_types/topology.png[Verify that all interface types can be created topology] +image::../../test/case/ietf_interfaces/verify_all_interface_types/topology.svg[Verify that all interface types can be created topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::verify_all_interface_types/topology.png[Verify that all interface types can be created topology] +image::verify_all_interface_types/topology.svg[Verify that all interface types can be created topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Verify that all interface types can be created topology] +image::topology.svg[Verify that all interface types can be created topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/verify_all_interface_types/topology.dot b/test/case/ietf_interfaces/verify_all_interface_types/topology.dot index fd14ce151..80f837497 100644 --- a/test/case/ietf_interfaces/verify_all_interface_types/topology.dot +++ b/test/case/ietf_interfaces/verify_all_interface_types/topology.dot @@ -3,8 +3,8 @@ graph "1x3" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt | data1 | data2 }", diff --git a/test/case/ietf_interfaces/verify_all_interface_types/topology.png b/test/case/ietf_interfaces/verify_all_interface_types/topology.png deleted file mode 100644 index 2756442978b06aaadb6c9102b09d0d8a7219380f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7903 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 DBfBsa diff --git a/test/case/ietf_interfaces/verify_all_interface_types/topology.svg b/test/case/ietf_interfaces/verify_all_interface_types/topology.svg new file mode 100644 index 000000000..3ed2c845d --- /dev/null +++ b/test/case/ietf_interfaces/verify_all_interface_types/topology.svg @@ -0,0 +1,51 @@ + + + + + + +1x3 + + + +host + +host + +mgmt + +data1 + +data2 + + + +target + +mgmt + +ethX + +ethQ + +target + + + +host:mgmt--target:mgmt + + + + +host:data1--target:ethX + + + + +host:data2--target:ethQ + + + + diff --git a/test/case/ietf_interfaces/veth_delete/Readme.adoc b/test/case/ietf_interfaces/veth_delete/Readme.adoc index 125aef7dd..18fb860ff 100644 --- a/test/case/ietf_interfaces/veth_delete/Readme.adoc +++ b/test/case/ietf_interfaces/veth_delete/Readme.adoc @@ -10,14 +10,14 @@ from any other step. This to trigger a new configuration "generation". ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/veth_delete/topology.png[Verify that VETH pairs can be deleted topology] +image::../../test/case/ietf_interfaces/veth_delete/topology.svg[Verify that VETH pairs can be deleted topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::veth_delete/topology.png[Verify that VETH pairs can be deleted topology] +image::veth_delete/topology.svg[Verify that VETH pairs can be deleted topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Verify that VETH pairs can be deleted topology] +image::topology.svg[Verify that VETH pairs can be deleted topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/veth_delete/topology.dot b/test/case/ietf_interfaces/veth_delete/topology.dot index 256c27391..5ba58dbff 100644 --- a/test/case/ietf_interfaces/veth_delete/topology.dot +++ b/test/case/ietf_interfaces/veth_delete/topology.dot @@ -3,8 +3,8 @@ graph "1x3" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt | data1 | data2 }", diff --git a/test/case/ietf_interfaces/veth_delete/topology.png b/test/case/ietf_interfaces/veth_delete/topology.png deleted file mode 100644 index d89fbd9e5f7170c61e19ea9212285c8cc66ec030..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6302 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 diff --git a/test/case/ietf_interfaces/veth_delete/topology.svg b/test/case/ietf_interfaces/veth_delete/topology.svg new file mode 100644 index 000000000..e7d561fad --- /dev/null +++ b/test/case/ietf_interfaces/veth_delete/topology.svg @@ -0,0 +1,51 @@ + + + + + + +1x3 + + + +host + +host + +mgmt + +data1 + +data2 + + + +target + +mgmt + +data1 + +data2 + +target + + + +host:mgmt--target:mgmt + + + + +host:data1--target:data1 + + + + +host:data2--target:data2 + + + + diff --git a/test/case/ietf_interfaces/vlan_ping/Readme.adoc b/test/case/ietf_interfaces/vlan_ping/Readme.adoc index 0e610f7f6..75cdde9df 100644 --- a/test/case/ietf_interfaces/vlan_ping/Readme.adoc +++ b/test/case/ietf_interfaces/vlan_ping/Readme.adoc @@ -4,14 +4,14 @@ Very basic test if the VLAN interface configuration works. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/vlan_ping/topology.png[VLAN ping connectivity topology] +image::../../test/case/ietf_interfaces/vlan_ping/topology.svg[VLAN ping connectivity topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::vlan_ping/topology.png[VLAN ping connectivity topology] +image::vlan_ping/topology.svg[VLAN ping connectivity topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[VLAN ping connectivity topology] +image::topology.svg[VLAN ping connectivity topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/vlan_ping/topology.dot b/test/case/ietf_interfaces/vlan_ping/topology.dot index a8f87f8b9..f5b0fae3f 100644 --- a/test/case/ietf_interfaces/vlan_ping/topology.dot +++ b/test/case/ietf_interfaces/vlan_ping/topology.dot @@ -3,8 +3,8 @@ graph "1x2" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt | data\n(vlan10) }", diff --git a/test/case/ietf_interfaces/vlan_ping/topology.png b/test/case/ietf_interfaces/vlan_ping/topology.png deleted file mode 100644 index 48f192d93507aa7b1af152a6ecc39ce88947f6ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10538 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 diff --git a/test/case/ietf_interfaces/vlan_ping/topology.svg b/test/case/ietf_interfaces/vlan_ping/topology.svg new file mode 100644 index 000000000..0aaa9e2be --- /dev/null +++ b/test/case/ietf_interfaces/vlan_ping/topology.svg @@ -0,0 +1,46 @@ + + + + + + +1x2 + + + +host + +host + +mgmt + +data +(vlan10) + + + +target + +mgmt + +data +(vlan10) + +target + + + +host:mgmt--target:mgmt + + + + +host:data--target:data + +10.0.0.2/24 +10.0.0.1/24 + + + diff --git a/test/case/ietf_interfaces/vlan_qos/Readme.adoc b/test/case/ietf_interfaces/vlan_qos/Readme.adoc index 483368972..d54f5de19 100644 --- a/test/case/ietf_interfaces/vlan_qos/Readme.adoc +++ b/test/case/ietf_interfaces/vlan_qos/Readme.adoc @@ -16,14 +16,14 @@ correctly to PCP on egress ('from internal priority' or static '0..7'). ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/vlan_qos/topology.png[VLAN Interface Ingress/Egress QoS topology] +image::../../test/case/ietf_interfaces/vlan_qos/topology.svg[VLAN Interface Ingress/Egress QoS topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::vlan_qos/topology.png[VLAN Interface Ingress/Egress QoS topology] +image::vlan_qos/topology.svg[VLAN Interface Ingress/Egress QoS topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[VLAN Interface Ingress/Egress QoS topology] +image::topology.svg[VLAN Interface Ingress/Egress QoS topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/vlan_qos/topology.dot b/test/case/ietf_interfaces/vlan_qos/topology.dot index 5874d3421..7d923d098 100644 --- a/test/case/ietf_interfaces/vlan_qos/topology.dot +++ b/test/case/ietf_interfaces/vlan_qos/topology.dot @@ -3,8 +3,8 @@ graph "1x3" { overlap="false"; esep="+150"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt | data0 | data1 }", diff --git a/test/case/ietf_interfaces/vlan_qos/topology.png b/test/case/ietf_interfaces/vlan_qos/topology.png deleted file mode 100644 index cab51133f81515834849ca8eda592597fa92a572..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18763 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 + + + + + +1x3 + + + +host + +host + +mgmt + +data0 + +data1 + + + +target + +mgmt + +data0 + +data1 + +target + + + +host:mgmt--target:mgmt + + + + +host:data0--target:data0 + +192.168.10.1/24 (vlan10) +(vlan10) 192.168.10.2/24 + + + +host:data1--target:data1 + +192.168.11.1/24 (vlan11) +(vlan11) 192.168.11.2/24 + + + diff --git a/test/case/ietf_routing/ospf_basic/Readme.adoc b/test/case/ietf_routing/ospf_basic/Readme.adoc index 732fce2d2..eb85294ef 100644 --- a/test/case/ietf_routing/ospf_basic/Readme.adoc +++ b/test/case/ietf_routing/ospf_basic/Readme.adoc @@ -5,14 +5,14 @@ and that they exchange routes, ending with a simple connectivity check. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_routing/ospf_basic/topology.png[OSPF Basic topology] +image::../../test/case/ietf_routing/ospf_basic/topology.svg[OSPF Basic topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::ospf_basic/topology.png[OSPF Basic topology] +image::ospf_basic/topology.svg[OSPF Basic topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[OSPF Basic topology] +image::topology.svg[OSPF Basic topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_routing/ospf_basic/topology.dot b/test/case/ietf_routing/ospf_basic/topology.dot index 1f27fd5c7..e8838240e 100644 --- a/test/case/ietf_routing/ospf_basic/topology.dot +++ b/test/case/ietf_routing/ospf_basic/topology.dot @@ -4,8 +4,8 @@ graph "2x2" { esep="+20"; size=10 - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; PC [ label="PC | { mgmt1 | data | mgmt2 }", diff --git a/test/case/ietf_routing/ospf_basic/topology.png b/test/case/ietf_routing/ospf_basic/topology.png deleted file mode 100644 index 038674a6a5695393c803b65addfc201e1236e8de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35113 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.{tX+j!@4~w1ald-h2GF$vL zbDKG+mD8)f(s%w~{U_d$Y(PdUhz zTd9welZU6Lr=zZ4R|MkXj>bQyxDKku1SQy8_I4Ux7|LEvwKK6f!0`O(5P?=RD=Mn_~ge)j-JMqfm3 zv9z~8GCMmP6%&&bv*-Bn<0-D=Z67BlG$JD-qwd^M$A&&iOgsR5a5(YRi5qo45v#QR znI;tmgTv!fy=9ix)(5F%zdygDL*vDgypSN@F+%TCb%b(rauOb@UTr}^8~yohIRA9>25||AEkZ&T$}-?o&MpNr&&Wcz>=?#oLllTS}dV829emcOx+|(Wo;nZoQL}6R(nzQWpxbm6g>S z)ClXQn_{&7x>+U}g?rjF3{@%X)>NIS`1r%_pZoaq^z_KrK6|EI5U-b{dUb=O&kqOQ z)SusG27)%O@)xga#45gc|GuhaZd8YZon4s{kdo4Qn;>~GCMISpXBbD}@W+qW0t1(w z(AU>=b1Q7I*ylEJkP?uWH|;eO=h!~H$k|kXcIk|{Q<>YO!RFLds%i=HBlF8#q8klETwGo2YigA2y@8ahKlfEI&ZHZc#ZV~SZ{Mvtee4)pNpbOOl=ma}P^WnS zp@-Lc?0ZY2DIER0kA=fSLy;*d+i%^zt##~JWW%7w!GoK8eSNvb%maF6=~*^hD=gd< z!7Y`lHJm=?X|+NAyasP%F!+m_vXplvj^KVQ_Q%oD`uelW_LQ`y=UzADeGs@}4Ws<7 z`tOt7dOzNL8oER^Be)aT$`i`UWi^`Ps(~HX(=a(#9 zx}1tww>wj-xwrr6rR5ZGj83YL&WEjn6#~{Mfr(=~wr?j3mRnGu)8Rhydh-$miPNvN zJ>yDBN-QlcmE)ydwL08qCprb=i-d<{UumU8;p_^!UJ1RMg*+UIReWAs>*UmU^K!jh zkl+n=q=m?XTOS})1AQyJW_T$VvVP5;1J%oL1}lFi8GMlO_;SC;UGD&=sEGz;4baIr zFO7PZsQgIK@z>9v+ZS{EgJ0CtTteO5zIX45q2cJCL$Rg@)z#CgowdLF$ol<`vpakC z3_e%Vsv!z7tD&JGd0zH-tUVa7if8@g+s8-ipFHtT&&UXzW8YRZV~F1gNf>@bLXzZB ztPnrd#5M5e^5x6Xaz}Q_Jw`%hoX1U3_ggHSfK%>2e0a%ivg_|UmHYjX1CQE?1gaL@ z-qLar_lu1V9B#h%5GANuuCrz7jvYG$uYRizT=4=B8t9f|w!RQ7U$0cos=+&sP{^%( zd}cqs3`nJJla}TNL{QS#=gL}a(&y3aY~CEAd=az17%{1was5Sdw`qO)qPSfN|xS!Pk~z;IP{ zU7j$9>?`E2z+1Q0g080;ABEC^mxtq89~u_fx8B|vD3-ML*RNmDdQ?z#wyp|MyeKqp z#)@+st=}LRDe*@36H?<89xnEBouoBu z@If=WfsY?82ZE}5dU~A3LE@gHI8Nh5)o{%J77!LKuwSZ zawgYq`#2*{ptcI{IrHBOKW|FA3X(!7F<1z z!r8{_ani1gt3qfII72Z)pMRkVBTqx;Zrl#|qt&M0sBRp9y0gdm6H|D2I1>E+{WMfR0;!|u+(xhO zBQzEk7Uk2m>#%L~U%!4OjH1K>>6#JMlz=>lNG}>1s;39*9FahaOG|AY9nhLxs;Fal zR_NQFy4u@pb5q>j)wp3rH@98(edQrY zEl-=8m=u2YT4WiOT#VeJYChRjfHP9w^+8xbKmiqqZY6hsXw|~1!?z{(Bh<*JGI8ys zpzEwIrCpks@yhqt_osNlMXWBbgv4r=4KfN<=NJ121}@w?|Lf4%oS4MYd!x}DtgO_w zZQDRGqE93}7#_cIRPO1zbLAIs1u1+gVEo&T*q?|#3#o41Zu@88mDp}tRaI45IyzoS zNp|xbE+9lF;~JCi({&pMzYaA*R6IT|TAjPK4CR4w@EPKQFmVtd6YGfJkdUW@nr9mC zv+FJ85HTzafaXNUygry`pIiU0nem%@os${{C3o+p*K|ueXm7v6#l@w;u2V$aYQr$N z>d4sG2k^8^UD@Z)pWl=`v+C2U_%JYUz3pY&HWoHjS-A$E|gVM7yt|wP;b%^qhAA?sNfl}Dn**9TFaJm4^I6x0xXBh5Itn9ur@h>1O{0t{L)b|f&)US z`Dtnv`2AU20}y95Tbt7KtpK=J#(S2D#L>NRr0!)Dc7dKZ^5Ccp8`S$X$y-YzLPM|5 zv$BUM?-UnT#5u{ftY4KlDEjT&H$wA@i;ES6Icp#cKnth=l-6OpuIBo=&v>%FBW;t6 z%zEVjY>D7RcZu`1U1z%jAZD7)9;QgXf!vw$Ro}?iI3XiLB)q~GH{E<6e>K{wBYBre z!1tx#JYQv!Blp_1+t12gJ3Icq$}e#|ZDKI)?%gZS!>^(}*|cwYNxMxj@M;zF@$)k} zHWnU^mo8|TyCA0P9=Fe(8BBhpGw*TFER^x`#o2C zuxNBo+=|h^h4yyvyImTmkyBYilp!%{sV~kL+t>(_9Ch^QQLsiOY_|M|a^daUmjfYR zz#S6#@Z7np5Vw@g%H46&3hg>Co?rZh;>C%mBBg>HuJrVDgRnIePaXXK#u;m~GQ4h#hzW5(z#9`Q9>-U*Wh_IT5T&UB~IbP9)EEvCGNHRT~LP zZBNVeFpar$X9fOzA8S?b&^0m&hu%sGFOgDAScty&qg;E~_Aw;-^~uuXJz$x6JyKQZ z=p4qeSNsX^b-c*FH!4QNHX=3mU2SPO3h3?X4_{gbK7G<1nt!}Qz#`*GL;A*UP_o1o z)huhp13-O;+C2Gqf8n&$x3$ICzpu=2Xo}i?e5CAiWt!7MbcplE7mcKiH(%h254VO)AmTQFMa55xslYOF2e&cCFC9f48g+m(L?WHB+jLRiN$&V8a| zKP9kvbArl@z>S+XUyS#N>#Ay>@_mOLyLRKojp|uwGuHu;58v5Ue^yjj_)$@xR~Y&e z99Ir$Xlw;fD0t>MSi2JNk5^PwG|+b`9n&U?osDg?oi{WH28u_{M?b*_xg39$_0k@4 zl=JxF|9xg=wAcN8bobqB*A%3sr6q0NB@4#q^y1uMbdVZpNmLgMNfU24;eOl-1?G`M?|Lq-WX&D2vhfD_)(PLG z%MkQY_wI>C85i1}xYho7vb*SUcsNr*ow_o_J}L0m(CAgb2P_RliFG zmCS8&Pd;4|5EKN^vT4^YPK5n_505>}>-TKhJ^cc3jr5jCR^yR&(X<|jb#?VRh8&2l zosCRq9XJ#%IvU|T`#9Oy*g#I7LZ}Fk!HEwO2P@MQ+0wUd%ulH)jv?~ zhZ@p8ltYSEHZqE9nJ(1vt<>*@2oZQy?iT~ZPSGOOcWBh0S}b)LZ(A8FYN~?I0N1Aj zZh|nXWWQDz$V%h3-!m!W!}7bqhIEh(KQ&YmPm>@B5PoDG~~sL zg9o>+0tMLE*VpIttr#VdTr~JHDT9%B?t}#d(3b!CJ&)3r{!Uz9Dq^>g&+_Nx6zM0wm)+oPejw{MS|y~p8MP9dLb8w4DjFL7uprhmCH?Z7?@5#llTD_X10feNq zN7t8P6uAH)iPpa@%T%^c+( z>Bh3Qym|9iJ3@$#fCexQ>8u?_akCzKmtuML>|tc_j~_lLA|!PTbUQuMzV2DW&VDT? zM+|+G?eC1^ht)p;I%^tKN@wgjekBu3^dB!kc+Ty}0{`u0P|{2@)0KG>puoff;{kGn z1H9Mw_Qr!dC+6Gd=o?L)e%AQe^Tbg$tM?CeLcTr!RqFov2xvESq!frz`Od>f60Lwt z4zK3d*aY1em%Mq)mMvpl1wt7H1)*SU27}mYd6e>afb|zGE!QEMKmJ~($}wz=md9Fd zZY_KJOhq019MbSPfTh=O!u0fzkbDZYHhRaEJuU&ujs-`IXOG0W&Z}CSxs?E zyCioFu4HEBG!RE6YRniOzURkJF}Ck)z9+wp`qo_zjE$+k3La{BiWJ!#wT~4(p-5SygQBdQe}2(x$^Cq94cBDx z5)nZ`UU_+WCkKa3=&x~ylBk~0m* z%RRp}ENYG7j24V#Y*+9svYZ{;=lFq^CbYKzDtYTsaH{(tQ??&_S`XX*`7y}i^DV8~2Iu@g+9Q=;|7) z*@M1nPy({D#%A{r30PiTkHg#5D+vpq^{7G*Ysr0=7u}7_8)Obr*7euNR9z_St&wP6+b4Dk}cw1;z0}(jzSz zz(kx9$I%wPe4AEATu)xM<~-6zpyLaBdwbTf=S~u=l`>mST8&$!m!4mo(UbA{q50Mf z?w#W_sFw#5waiooOGyU>vfffE-K2th`}XY~Uq3Dfz;Q(TB=9R*(_dz0o`XuFW^Zen z*=%S=cq7(8KE~Kk#Hg5+a=`bO*k-QLt4y}5n2EI8Wp8R~imn9@k`uIKy4ou|D-h7R=GtTGi=PbaDm34z$TDT zc%+5bZ;o}RX!Gve$x7|?`|V@q8HH?VhC~DGt10jYC1?P6^b$-5t5&T-KXX%&ypT|u z!40M4G!rXC+P1k1PyZSjjsW^RM?T+a`GOTb4%LpzQ!lxpoDG1{ISt9rPe{OxVezTy zR`8W8x(6GeF$;fZPG@v&HCzLu%ZH-(=WB3ohP=*nc6FJft`XHJKR>GI-1E9Ri;iqF z2S>-00;w@8^~H&&>r z%9ZuY(M~C-6|%KPe+z;j9ou$cJtXr~qrzRv2M!FpOF0fX=0bF|PU2M|0Rh$+FX1qL zlYI@zl7k>6&%hEJMYfC!M#jaZHym%jIkDW^Q$!xRU`Ka%W5xj;O-+BSut0f^i8lTW zalO+ycY>5@5GEC?8Pa%6H#_q#`B-#AtZN0|s*u-tr;i4HY(rNS5YGG7jLux?L1VZv zkPr6&+ynRqLoeR4Z5usUFXwg7e!q;%qM=u>61P#)%a?3$Ihn=k=!ii^gv2QKXTdo^ zC=IG3amv6pLi*kzAt7jm?FIk3#3J{Dg1hAz&ME!r)2AV!_s5!^f0}F62>*?+q<%`6 zu;(iXT2Qu(8qc-|%FnyCG${RRPQ=3@3daEHwNn6_B>J^z`s^RH}>4b9J&L`L%uw#jF@S2~uVj($lF8g7J;dwO~@Ff*%! zaf;wu4!}Mlw6zFQ7x{e1WKcM^N~*NdonWbtjg_PI2OnG_5Z_4epY3u54SOP+f%$cG zbetS*NhF?~l;e-DMMXVo^RODUu(Aj=bwSS>dQSDLSD6h~t&`Yx$RqOoLqmb!=-Ojk zIr`x!CcK+AQT+V;h{#KdYY$htMWxJCR^PpQm$EgGy0X7 z5yOX2*ww2?qZ_I`DrR_jwK_OAZe;l@69C5Y7k$P#v%0HPxWmTGETLtwHKVAqJO9jT z^bnUFds1Kn{(>l2*HX6DQ6Jn)?VlE!g9#e~+~p^7Q}HV%JsD zF=k9oP7c1k>#Q1Ojj9=S`?eas6lh)8tbRkMmcsJo%d2xkcH8&dNB1W*BxEzP_CV&;Q(%(RwQW=g!(cQW~+N_&Y8zm!xowB|=HE5(6& z6P?qX;=4f=g`N$5{HToXkW>967)X6>txAF&+M**BbA3V*%X{H=C>ih3E$SQV{}@B^ zmXuDst3CR>nGP8bv$BrjJnQKXyMaG3TCH5UGEmAfnlAy+1yX~~lyp&RN|8)KWDgo< z(PdZ8xwzzO>K3+5HWmRq)VJ=1UgZ;GFI%!ccZ(3R&Y*D?!Fa+Od zeRcJNCh1raLtUZiU-R=qB5w<9^#lb3uB8|9OvrD~cu8ID`nUud~71%^zRCXvB#jUB^!Ht|_|s2lcKG?LpM+ zdx|fRmco%EN2+gjBV-1E&VT$G&$8v~TPtzuBrap5r$hp3%$rAtR(p7RZxIkUI3T4L zojazftsMZ5K?33#;M1eT3f=t>m=ZWa*e*s#b0DV@T^#QjM7zLAY4^AwTjWA@%KY5t zx|?DaV=ui@XGHo+6}PT3L*tf9)+;|ri6kw3S*tT=LQu>tYQxvwW+Qf!{*D6MHT*~7f=&GvIl!B5Gpq77cvb~kKN|WQcleN-UW;F9SgczfEywGU zM>TB@WHiS#{cEk!Sj257jI!Er6#XCn@n6p&_C@!zqf_I*uTAe8{3n>nuUXklyeFj+ z)qBu_A_`>DT%Y&R#NjCbVQ}%sEz&1m{?9wp+<}AwVf;8_x!8w;y9M0^*nZPyobz)3 z_eFZZSi}p4l~2HH8Rwhh_tEnzorzuzcvs_C_h05`|__2JOc zt);{1h7j-$PEKe$ct(sPQSL|Mdm3fjtQ#dD8|^HJApJnlfD*^{WJ1Bn&dpV{wziJ2 zIGOs?;y*6=86xsTMn%!W;1>O^$Z1GT=KKN|Vz0V2O%L`e;uxz2q(B7MU~?K}3L*6Y zJfe4+q-Jg=Ra5_uQOqK}@1UC65(@N3pKoRv9UTI407pUr)*JXb-vDi)y|$Wi`0y-5 z{A#r82^zIvs5$X8i=@~5?BZ={acY;0?fkVL|}v?GGiM4tKAXGmo2{g>!c z()ZDkq;a$KP@t*PO1?78XnIyYME5LO-v0^5j0;;_&;CF9A01@9*DacQrg*8IqPXlE$Z;l#~>T zvb7y=xZM0M_=e%i8@?}!&USM`+txAQ2jGVQ&S=aFw`>laF*xPzD#-+LSV-|ktL31d zQF4|THC&v^@OK#3(e*G!QbogaZ%IZF$(|M#mtMSh!Ppq8%uC4GpM`HMib_hPnQnci z-ra<>kJxy4BH&acaRkQ#G3oF0{pDijcY>%^$a*zRP3foHLsMwo)!TM<1}#8SZ4`DM zYTzK2SV%HAk#)ftF5&m+{BHy`uFCMP2h^~-OlR7`vss8JM7x3|95dmR`l6j1a5q+fJ5 zYoMr+5Cb;g#kHXY4YO|SK7dp@XhPsSgeeh|JBN@iF+3tuyF`!o;`)g_GDVw_Dt7<8 z0hcEnmxZnmgbfDjK6E&>&vgOIS7*bkb~iqP1V+{)03-Asb?psLSlDB`kCG@wc2k6x z5SIIJ*uR+8@5$~FyCGWYJHHFLjs=}r=&6S|+%Kfm6DJ}(gM`09Trn%LDkvz(!MRU2 zD#>jUhfrCEh)83v!L7YcR9}O>weIMiB$e;i;na(~{?b*~^#k0uNytLiP-WqC*?7h%u7yI5%t*H~K#XW0S3EvDwC*FWcLTs^>{le2GG1 ztY}ut;x^tT3XpWtzB>MmeQ{1s&X1ozn`T%*6;#nWvhWJ|S%ngGhBDHjsGH;D>vQDS|W?Q=DlA3XU_}h^_?Gm`#++ zP(!qV{2a9Izul7jw&vc~(cjLmuqPuC#FT-?{~+=m0}D$KeA4J?UO=OpG!0?tBceO0 z_=rz-IK8-JJa)##$2+3YLAVF!c9b6jK_SB*bBQLJw>OY!Sr64s-WqSW`cMLkc*T#G*@C{_WL1 z5b>wrMsLtVkM3hh+5oNe3EFCe79zE@j+I#5xU+KIu5{hz#)kHjHw=NMh@}QZ&APW# zs?Td&1VX?d4m3)LqMe;EbrQ;q!1nDI?%lg*RAdH-j(^uHGwJl`{P4kC*szcZ03|xD zikDbd(UJ&w@n?uVMvYC>R(R#=o ziJHH02)OpS3ICe=d=;idSV<3BO-sx`5g@v|%Bw{Hf18ix={_sn6t^Rss6U3=#)qn` zY|WtTuBF&d9r`vsopP)~D#!W_FQG{!0pM;jY}&WL4jdD68GFrL_v~*1SmU!WUFYQ2 zcq;cWij9Cb0uJj=ci_MQvJ2Y^!&{wK?kZ_*ZCyse&0D`HGG7FRO5u!nYF1X(YiU7s z-892ewQEo6caX1r zr>Oea#l;9?BWmNVEvXAb8K6AC79mo$ZJWf!S5;P43PuEq>6XFwt$>0~LlGsfXBH6T z0N;$Qt*w%(Dm@6`P|O`ETTasCA?hn!BwF<)gC9Piwvkpd7dLmq8=MQuMi3g&2`VvfKtI`)!Tcq})MMa-n?c zG5zq!jl4@)jbgMzgDH^_yi38-aw`UR-hg|IjEuaG+{JhSm&}byMq{=t(ldg4Bpv2XqTgT3XVgnSi+hB}2oq z+N;aR!f{^)w5~yi8}m7;VDZZ4_K0k9==`GUFWAd-b5Ri!E045NdZdepHx5n8 z#&UV=Udoixu^lMU307?l4UEbG5C_n#VaO=Xbre^o4N>OZEqCJRQ5Nh1+#MJ7g*o|K z%}I4w>QA6dXXjed9R$pxUhqZ1o62rr9}P(q`Pvi=zyTHxY5YMiNM4P!T&ranGISj2wAt(Mj zhLbR=DJclU9XhEBFk!%kB*nvQk(KY%cW(2_+@ZqM7*W$JSg{1ts`HrgIDjL72FNlb zhj4BwwYLLjFq3r=O0(;>$at+VXIKI_PphjH zcXayZtos(WB2`G;jc641O>qkrLlNsh8Z!7;;oiCf4 z*EFalY9Wv|LAk}LeFa_LY0zzN=RYhX-R#51nAYv&t^b`g0;fxfKMLn$-p;T5y*k3}`|q+GYuN`a1sHe8lbVxC-Xw zz){CItm^Ie@4wJfY>dC)Fd%jyXa(%}pGBD+6Obs$5FIa)^ZL%9uox1X5@UCLJJJ+} zur34>yn$l0B)7Rzc3nQ&$@_%N=<>`L5>&#sSjkPIRn;Q-UVc!IQU>&)65?z!Cz2UQe_2_JVAX_kP@VLE*sQe?_CqS z@j72w11X5E7N0}~aNFs28-2gCLC})ZI6HvzPKqD%j}dVHaxpb=dL`34> z#v1#7V)2-^_SUHXipD7ZGK7L+VwQ+4E=5UgMG)%OORD;fvvfzlEDTBp7WY z?Ss8?)rT7SGJanyW)%*h!u8}{-6+qGg45F4%7^llTU4|yM_&U2ED_anhn1CSBi2e> zMoOv2*bT(_{b<8ko<6M#+oPr}MoloLM@B)!ckh0TaJv5R;TH6wUqg8SI5W(gK&WX16zEH1>Uw#L ztl*ROC06N6{yP!0bz@k>?4n?2X{o|!i!zWB>^C%;(s%N}!f*oZNg|-5V6r6LM$DL> zL~5-rdH=rcsEqfUa7{DA(2!4u+UODMOa8-&j&!47*4_a$-4@XE^a zkhN^UP*rj9p5l@cvnT#EWRi}czmt%|Z%UkImRtCuv}fNwSSo+KdHZ%Xr0^#Yg2k*~ zZ=w=c$3f4$6AZ}!ZL7p>9usXD>oB;$UMOT+(2LfrkB<*Ispe=~QvRR>=Afo%Rn#Jv z3%b5am6H?Q&<;9>kGBBrkn*Yo9}7T#MJ+xyNAGshTie>Pvg_AZHN1M2go3FB5CQxf z-I==%3O5k!_wS>}!Py=FLaVg9At#0u$f9eA$E$MT0mxH4Q;!3mT;B?pI{q*Du{FAY_>@Krr=2C6j~T|RN*#HI&o zGyJJ)ac~$a!p((MO5RziYiLLe>DRmY=jCt-+R5sLB0v-^!&&J>2LNz{Zl~F?+x!^= z0gjmQ2|y<)&{bz>Ix-|USOKuKyu6&!{__(O`xAh`9G{;~W>c)S+~OFHJ}&l8;n=xf z2lfH5N$RKNZV{1{DB2*_PQ5o>U4EQx;Idd5Z&w_ayQ2uRLrW;55~sv!uj|*ZUjqYRCPanJ$2g> zPoA)WFGc|=3cA{BFo6JkuzIQmSmFRmbxg{0A*j^VqTA=N}KdXJ;O7%j641mKY=moHC+;|m- z7lTJ|RMnW>0SqYhmYsQboFaCaed~+#g$ZS$dS>4TV9Iz9n!}UpeCn?;A;p*?fm}y@ z`PwKtm>6rK2wxr;#AO83O$~k`SKuhQdK|$dGm%e?iX8}XtVRkUGfL&NUA7({BURNF zx{z8ReMw?*$s<*aD!e$O@QTsKW;s#EIDOC0~$ z?rytXC~1w}KetD#;i)0@6*bQ%-47}&x4uPQy#g{pT7e!=Zp2XOZoWK4G($Wy0}R`3 zujL6Rs0L&p_@2+#d z&dbE@g#ri*L9P3H-yp1MthL-I0&U7=0?x{3z)oKvN#D17g395kz*X7RVR0HX=a(o5-&BG`G9hd z-^BgSiLRc)5q8Ab*t6%)fe2|JL^F58FMMoc{wF5&X@uPZLg7Ad#-t0i8<4+IVWiwZ&_npV5+@LYb-X}60j zLIppM9zA;Dd_HkmYQBNU@F!L_o#R+))jz)%d9EzJ|FgJ}DmL;Mg`P*uR%Esf7LA6w zIpliyV)ivDiLhX)m-TxUXMHySWcZo`$g+g$Dm**>&g8bCPydq(`%(`v_5|t~+rzX= z^#dUsnM}0Ep~%?(Hy97c?$%%s{)~QZuYFLxB~f&D7!{MOO$J!- zP59;YqV2rA4^o97#G{evQnM+md7G7oxdg*SS8XW9)?RKX&F@EGI_zxhBr@WJpQjsixg1*Cml&+YV=Smo?X_ zGrxDAx$}}P?D<7VL&y+8W{0#oq6?!n1=wF(OFA`YK7PE7o$+^HSa7mnJ)CK16A?i; z=y@P{coEPRa&(Ou*Cg`y^t=`Ra)X-)AP=7JPM-Q zL%%=2(d~2o!I$;M`WX_@ifFYVheas255UBU!$c__^&hrl5p?rEX5ZBD?7fF@8Gyp! zUM#9GDlf|G6fqDpvg47qAX)`0;l-xK^BU}n8pDp?dU*=UMM<5mbS!#lu$?hnq#{(d zoRh~K?`Zx-2{yLg5|9tl`&QWB{7@j&DfvuS{&o!L4i!q-yz@WuxCV7g3{OfzXbhr@ zK}3kV-cx(a=cme;+s_lB6*s+<`u*+RpPs@PkcXg>l)yPtk;Cy9Hxc|f0z65ahY+-D zP#@rO{+o&POno`f`HStox_<8}v>Be0nJ`Q|4URs(cNrEZeDZE$pd+0?p{#N(%lK7^ zS|R9@-bcD7dJ+&_5Uh_2pZ)$Q0Xv`nF+l%#Z$0FE;vIR7=bw-(L{EecNQnU}nt$5P zv*#Xyf!NlaSZvJ_7t0yjVto?Z4OEof!!_Ti) z){@*9GO&R1Y2A^X(AX};9q|LDGY99XW73U0ECvfM4)-HZS9IMX$%-5N790@=EobD; zosrL~{yqQxk2%D$BXww41j9R@++n+_*NS(oeF(z?0p8ua+s)<^s^@9?Aa~TumZ9Hd zwc+joWo4Ibcn-ryhcYz6++&ZYL!PmK01u1P#WMBHrG^Kb^u^isv(j1@7>tu+)B6UH=3fT65~^;G;3Ju~m6tJv6d^iJhB74%~&QvUeJp<`xd zCQu+W+aTjB>nT06cAJ8RG-JVNHBYWQ7!=>x6qNNbqRd1S=X^;S?SrxnH6m=iF`F1P z(^~PflZ%OBTyl26tO<&VllPsMpo=~eOE3(&9CVyNWbJ>R^YiJ8{FwtF7 z>JX6$@5C3KH4Ze+&=q2_IMu-i@bX~aa|d+0wg_TLvN=XNF!@oGDj z_taXl+FFtqh>$T*(Il<`PoXl%;Jmo0csv7-2V*-X^$hRkP)yNQ%xYK4YXA2N0(UYm(rO9MaDrXb_dfuW)2+3Mt?o|_l*Jy3JB?I`G;{OV(z*U1$2ocD8qw`~UpEe&@> z?cXigfJI|t6YE(OX(+(XIN~CWAL`F#<59C+cZRZsLV2Oj^>hmb_EvYZczSpgPganN ziJZqfjz#wiPJH_GNxG@qmBS61#%6{k7%-AK9cvbgC)thk)!>44v<5tj;NE6Ez=rej zbykT~ER!+>1>_2Nm;MTY*-vz^!bl+w!`+x#Mgeyt9X^2KZH zZWk_Qgy6w3>#ObYay)-QNJ+drxA4%J41!z1JC%;V9I9XU5OvbzXxWgB>R;lH#s6wwa$? z-PnbJnBXY`%rnwm+Rt3pVp7(!MO5^tJytgQ(}J38nL$R3_as?Z9Wz9sOLMVnmhtup zwQp{T8JDTy3bz%a4t#+omyOAXrCuT*b|SMn^SOECn&eXBj#g_)J)?mO}0;jK43s3%+0Eq6@8giVk#rS!a=?$Ilw5e7wop=^lk`}NNN5S9fvWNj1@}J z#`*c@iocRD)>a8zbL;EeT#!I0OrFt28yhfRg!)Ir9?*;0Obp9#F)KW^dDXJ>6cinp zS!?3Y1>u&G4J?ZJcm=mz+=OG?;Qdj}OpmdY|HdKaGKHsd#N6i85k1=#y}_oS>!1Bi zmPR1+rf&LYe+isQNwt9?ZTA#DoZY_vydPNCGoBuApp$p?Og+#FC?FAoZ1iCf46zr1A!&}K0B}{z{RZO z@T&BkfARM1jlWU$#+ZaqGWT(yl~EV`Q0tdwuzMx`*XcFhJ~HMaecAYd%}Gq&5*$tD z=Vj)4oDUQ>V&mYBXXD@q#4{Y;Wf-m@oe!YV_%0l7lGVw~II(i)ojNRO*TLE>J4gDX zIti|71sL)nI9M4)6+R9k5@EQrJ0;`gsTzDHDIhTOFQpt{&p=2-d#orR4qrUbOW^AQ zK+DG}y%pVgr&)*(86!$)&6qz6W+QYy#AJ1G-nfjAI!kAljIK~o@`AhUWc62PijTC0H69Pu+vvY36DVI{q7}8Ola@2OgDo5 zKkq(QW&EJM{KkA7nrY}sJ~_EFs&SalcNdJ6e5vutU92I&BX`Y;x}O8Vz*usaNOTtF z=FcGWaQ+OwdUef>>(`$F$%%=IHuny#?#+WXdjP$sX{<9l?3DaVSTUb!YB`S~lu+s! z_=WU(KNuU8ssC5lnSkY-umArk83`?>FhpdK5E?@W(ZXaVN()+uG1fw>3X>%*L&zk< zRLV3hCSg>PggDv8I!P*u5=zLD-T!qzncx5Xuj`!uud8#eIi2b0dA{Gz_x{}Xd;8o$ zgIO~d#jK%XIZH&-%WL?q70eDlDNgbDX{2BK-ZYY_UYp*==;othmdP z`nyc$MX6i7qpz^G*R_VT*9pBrf{;$A8JKFvlGo66kw_vt?nzE|8w*p|{iXq~N?o<_ zEAdV^9*3Gz3dov2+{P$Z>Pb>kNEfu3K(XO}rRgd2}{S$O|D8Fz!{XJ%yAxNyk z=Mwh!nF252U)3uxi0NO9J9M2^GH<0(Z1h*nW8d8G9g!SCn#)N2MDQOg8wE0`Ie2hZ`SoudE0!+{xe1EHP^p4 zJ?k6LPHRd|*%EQp&~b*YZN2Ze*c~8JNhOOao5n^o2JmtFc!w~5D=ff3f4xYzbAmF& zm|_VBM3V+u@$^jZ&4-U}A7(xRJhY--EmW9#-VnB%#A|s-JyJ_EU9x&8dX5=WS$+6< zvm>bgRUQ8Nyl;k`6zVf;7^hFnUPiO0>eP2zTObqfdgF#g^o47TDQoBYt-AfiCYw~> zmNr}w`s&q+SFc~|g=BJPcsyn^8P$5EURhv8dW#GgWNOWYvo>4#Y6#c(WKq#jBo8Am z*b1sHnXc$dinzSS28E;u($@VxCDG$fY3|I-SNC=;-H+)Hg=8-yBXx;XVCLy=b3kTZ z-Wi~pUr;+82)ccSW$Y5HG3tmEA?VoRJNgOmI@HUs#AtuEeulcTO7 zS)h&AAGf-~bMO*{SwO>%iu3*7J7gHajvPliu?|_hCU zfFg1c1%-Tot{&aM2T^98EG_NKEE;#ah^<{9u+-{vrz1CRJe6b_E)kkoje3lV*CbWO z0;pMk_0TOlcWNk_R^QEyY5WeQ-NIYP8UmVw*hAQsF!N6QB?~k0JW;=i5dJ{Hd8?A{ zA>80J$DeKcJP$5-w=RKCTDD|+NMO5&S%>zs;mpODFZqf+LK+Teq)*e> zLU|U8ti-*&c7sk7p|d$8kC>{cMubqpxc_b!uLPJu#gAiSoIR|o=di9%**oW+j?%L$ zDA*^tDX97b?{Df397ZnMdWe#{40)#*SX)=!?sdu9E4FWC@yR_iZ8N@X#t^^hKF-Yp z<@%M4qXr*)Wtb3j?~8YJ<39HH-(*$NR<6VS=t-U|+e96IjHu3=s0rr7)q5IQDsRe(}54&xUe;L77!$he8*u%-zJrBWPV{a$Ru(k)1Ll zGlV}r6zULUtbZM=(}QLEJc~APcVv^_zx4Ll*RP1C6A_=7Y$RcV2SBk~Boqcm z4jD4_!$)?B)Mr=MPM1r_e`NBd^W8n;&mZgtvp<}op%weSv<*&#BSU*9QO<=IN`Dz0Xu=qD?Q6*>0l_$D znHTcnVHl|J_E%%HovfJ%tQ?b+O?kZerO7id|7*$c^I9&RBS5U_i5U%<{FspG%Ts>4 zvH&ZbsIg;_{#ef!|SgYxtpeRbz2)UHu0-%+YgB8+!Re&lVthqs^RnyZXR zk%lgPT5+xGTUB=No^PFcjZG>gZ-v$K zEWvA864=uG%#OjhO8*B66KIwIM+Ew-51Qt8({(t5GM3S_Eu)A6S}2{8a&>BUH#T4( zHe2zeClB(P@E*bH3Pg#YaeGJ(?LA^dXPRg4!BK{G3Fd7Tm<7&y&1yc|FY(l;NT2Y# zyr>irG`)}Z8(s6gG$vf+m8ipy^Is+gw|NE-n>@Ylx-@pd`_QWubs!Hk{jCi)E? zP3igY_~QpH8uV@9=dr_g5zxhBW8JSb?SaPxI2gDH~#qX?JRPq z+wySwYq+EkBHjKE*IdoVN1tiJP)7hFw=(KtD;v86xA<&MJ~3PJzn)U0-%7lCs}AKhs#=tHYsmd)4s{PT74 z*h77>|BXkVBpbj{m}yNfQj()s5N#FvaRA0;ty(-Ce~kexwfhIt^kM!WcVgcZPH0=- z?+9zH*|%x-KUx4^xBP$(U=mWG;unc>ohlc`UFay%Lvz28M61g^fwXo^9z|%ts+E}F zrMF~*V@E}6Au&;+YN1W{U+@^;H0px8VVylJ$N-nx1ic~7XnN&kU57V3^q(9e#Up}I z$Z+7m3rXM27(4hILQN^Ms>g#aJ_5RTzgR>Qq_%aJCJ)rtbF*jGdR_qIs$FRs2_SZ> z(zWi3j!vEFDg$o(=#)&CMy~3Sm3F)c+(esryKurckNoYHk{r`8aYGLu%)+--pGui0~Z30)Qm1@Ltb6_@dL{JNvQ#+ znQjHsd1Ia86y>k>E-m2t*BH+{HYxf}uhG=FhdyVy0(0i&MoU z@ftIQM%kquX&tRirAB1W&z{-cdG5vY=La0jbVy(Cyf?NEsN`Zq+MB1(o{{aZ1T1Oe z4(I>s^Nb;(ny9nW&~Ne18~P?2Dj`B0rx3sxP(2Up5`Z-7=^B@tizbblKdftQLdwZ@ zZr`jCOsXQCQh$R0C1Rng8XY1s^khjMsb}oI|00-gX_x05IMdEiPcxrRl6H=7i}C*# zkx4Tp6ftf=#4w$af=MLjC-9CzWk|)V#`wLtajO*&ig(^K-Hn2zG2t@Nr zK_2Y&1je&!)(@MY5^u--X>)w&W!oe`jAWye{Oy7QCD^4cD1{Pbqocp%bOYObY)AmA zJ-{CovkjFDZ-Dc$wtcibmEfX}*1qlEf<6@mM5HJ!2{5 zXLrdWU0?ch&9v170-Rx^_@$z4z-~-}Z$jQfw*mt`5pq0%*}P zrbJX6ce;_y%^z~FJj@;Hq`3j@!-S-%hig{>n>y*ei`&Ab(3q-(^K3|Z0IQI)fcxn< z`y}+d=9p}53Lq&B$7vDNlQoF(vNyY(&7K1{Vs}MWJfQYLl+OCCU<;6^z7D+E;N z1HDJr%O;4legie|L3Eb2l~WsODMIV&40-L=~aHX5m9XU6a_myh8^2J#L~!C!iKEe*_&xl) zEo$k^w5Eu(odORUW^B+HY}#5^?Iv(!_@i(QttnIpOPU7oUzrBn4$pTA}cf_;=Z?FZ&rStfy~&FTc7}dXr{+o!S}E4Uz|PDlX}`K z0an6ew*c;7j_ymtCW$Dny}{Uu>Kl+G4-YoKl+!{GUvLlCNI|D4hC+BIj$I`RgSZ6? zK5!2XEGaV;tOrnOP;T>ht5`whBJP`fsjm9>qObXG|5+=*%f+U@)chAVVP@ua5YI+0 zfO0!uzn^ychG4~$i;e$7ypk(dV%x)dpaDxYy*!v?z ziSg6mW9o|gB=8Bpy83;v=#d0wuylpeMX|AxEVA! z)+d$LtGw$LkYb&o(R>3GibqwR)@b&DB=&)dBuG@vAB7xev23PCPR+r$J(Pi1bG){8 zj~*T~`gF8!?J3L9FwQN^9kBdTnLO4W`M~rxdzRl=Jt?VbiBZN1kU`BKx91cXAKksP zhCy1?)3+FGH^NgAf>IlG!K$Q-@~y>2{LfCIqN_GD-Ni-YD1f$~zR~n5+dWszmW*?Z zDOvoWvCkj}=L)wQQNuw#iNEd2ASj~^=KT${e!d0^k{3l4PT-v-o7yY!-Zc08;e@P6 z?mP--i5eIcf6;ULK{&7J15w@z_DN&1j5uAvK1Yu(pO@9OvQj2Xg=jv?$Nsp4>o03mU_2rb!h2I@o-{S7Dv+ha^XX_lffrC%^FZ4!}PMX2G#dc zvYUoPg;|{Vb=JaquJm9~z`z1M<9-yaV%ojs?_MoOGo;uO;-xa1qSAEK%LN@~?~fm4 z>*cvh&8rYB2bJJu@TAu_utjaeXUr)OBM)^@S3iygYb$YpCCBy-Wr&pXdL)tF^=Y=D^+15y<%R0atF^b54RI4 zXW!qJ-QXpf8%5Go@{Y)@pOT4@`VQ)6mmPFaXihP7}F;jtWr}j z{G9Ph{8MnsKW2PR%;6vRo6=NeiiI3baY*0okY3YzJr#`RTYtqMNYVeHY*m-JRUwU} z4G8Q)72%x8>vJ z0HM){iUE{70brq^WBbaMY&bn-lY4 zUjI)nv-93CLS!hkp@Mc3$%UvJ!q9HaC^%_q;9(Lu7;=S`a>Fmkmq^~WzGVUxzlo?I zng3K2zV|MyfluQ}`z+SB^>}Ul9*nL&z9oMB)a-Yzm_X^Wvg2*nJPNO~PSz8}m4f7BxO$^t+2{NcMg zFfGC}d`5$=V?8X<4M!K>w*=+1m-RMwZY-qT)dV89NvQ!!#X~nz| zT+oB>%EdE{zF4t6VL+aIoS)^nXTAjSlmG{qnq>o;}pib=wa|C_%?iPR| zrs7X>(9XUe5gB0{A)Q@BnyP3t|07>}^-aRnJjgflD<%N_4C{)jA}=s5#D~8iR4)i% zgejKfpAh+@5Z`#j3*?)ax^7bv}p7i z6A_NnwTl0jaMyOg6lsToRjSx;ML}xMX2tGuXh~T|fRHf_0r{5s@cxobC!Sr@1`kWK zHupsFgeVlH-4HI@WJT4-2C_ZOK#+j`6(S{wPF2wv+UMAa~58+IW&EsPdRbS z`AgbZ5CfC9gUGMy7g5PZxL+Lqu76=tZx;MKt>U70?oV8^z%o08XCUr@zbqQ`Xq8yc z+;TXkseq#qT<_(i*zbH>e~y{LSXCQ+N%XWKrQ>QE9Sp9X+}mjbbtNL4^BgaAhmfoOPRoKFlHOk>TVly{*YwLUhLGcTb$$I5Ywe|XO|_H zyq7HbW5k#jDjy9LPJVBZV9!#}+SVl%-VbN3C*+_*5dvCvdLrPvJ zl?YrSX-|TC8yeOmTqxf(OtQGtEf`61ik>n&Kx30q;FIoh=iyjMI#BC5_I1rRO)q4{ z15~xi^gCgiUGVwo%2_VI9XSSK-!c0mD-9|g#o4OzoZ9! z4~NQB{F+l7^Kye``}PA%Z@N{6Gv%o$L_Zjwqc!HaHno2l;)xqeavX9qzm+)*o#9j7 zXxzgfHuR%jyUxA4xjal+aqpY#aY(Padv_g=0LQZ_kHy0V!(fe&&(akM@183WuwpXX zis9YwK}Uya(+Gy~E$`{rNm2(u1_V78q2alo`%4a^1jtd}CVMw?SMH>zCd7ni{Oi=I z*^trb5Kne@Z}$FSNEd}d90O(qQ}=xQCy~Z88@~Q6EE4|im#F>+x4V&~kqR9!WLDf}4lZr@aNJ1ur)s zW7x#M{9MN`zKE1L1r+tk^XCI|GRv0OFqn%DM1Ael_ty4wFN~_)8OIW z?yqwQJc;(?Y>X8g;X=sHC5@h>j3s8Imn{i{$p05hc|L5A>0Kb zqQZtF#g?6gf4ob|WYM3O#=3g@>-if1D<~|oO7Dum+#{=a+LSS^6+|?uD1x%9t{%!9 zh?;h-&7Kp#eX}iU$uo2=h;-SMIoPK=cpLcsSI7b!8nOqxU0ke$g$GrGi~LgiRz6a_hR#PY59qj(TBi+K#l)p7S8 zf8g-jp6`7oYO5hIib%eH$bIXuZ;uS~8X(bz`N6{PYGqXhlA@Ap%fyS z^nxbUVbZz({2i-f`|BftqhW#sDTeYJNH>leyCtTj4xBqdMqSnI zypv(4i;JP6y0XkX(#xF>f#_7hsh*mTTT@Vm@`1CqXS>((vF6rR>CaP>d; z-|Do3kuGm$ePLmt<&6UWhSHYCOI zg}2a7ecVJr7nsR5<>23518#C~?*>^)Jwg_iJqkz-sc+2c?$RV$fQ zEkZ)@xPlW=&9MF~~U)IK1Rfw|z78q&a%UQ9mN|1=<#eK#?oQA~I%m z>NslEn_)O)G(b{d4P#dfh=%~Bq0gJ&WG7HBh%#m6BzU{boKRr1-#mX{=KoMv+BANu zDoM_o3UMG1&ZnRr3Qtaoy{HW6twH~7-Ip$Gw3Lvk(t45KRRMj5o}P1p8Hq!S{8weaDfOjfD{JBZmA)-}nnya2z57FlM}oZi1jwGRnX|y=FEG4Gkuv} zPQEB!bt+5Hrc+F=cFav2_v0~j3&MeQk>YXWMt@c9O*Z&BlFhhAI-v^=Ot-SvJ8WBL2Bi!QdATHYR6Buf zYjYrimzVv36;`dAy>SkN(8DVqo&|wqbTyj`3Fe-jnUC2&&CXx za(ZQ<_5L~;&>}K^)9Gz9oBAQA7jV5LSDTEKGXn~4EquHjpm{$rW;i)+F8p}=VFRfC zao|GFAzi9~P$u>WQlrQhBUq_)-#K|{!HZ5}8#%PNRFm7zyeNn%kJyId9wFa)cP532 zz3wh&ya^dxJ2ICIs+dvjDGAn&wgu9AFm(wS$kZgYg01j0&-AayqHV9`7$RoA%T{K| zWZ&W)L_E?_p!Xgts#G9Ti*RD&k0}BTTTY;}dDEHRdLEDCJ6au34Y;QirROKmb$1## zJ+$rTeH|ax)8^|TZ4F~8znNOvoe@$pgeBLH=Ag1x`>Z79(8}Lo?f;8ct#r4`GrIS7 zPz?Sx8BhCgEQhWreR-iimrlQfRTf5_<&$Eo=9-+*K(}PWL@Fmx1jae^H=ZA4B76Ipf44-_#L)D8$O&p`eJj`j!+OW zxifkh#{6>^zod>b9L$BkZZrvt$WUpSj+g_pizhEO7DJXryp&v~Bk!`pK*|q)@FcftK!?Q*ixmp>ecxD(cYL3n zzCa1oaV;{z(k{f0?#wNnhy~)>YZNFJpsoYAYXrS#4wMdR$JdLU!`u?jZD?mJ51aij z$T(#zfw1-u?C+_Fn$nB+0ZRb5~98rG&tv|{WnPmj0KI-IHbriI1OiH!vA zAvRz?j8b6SgytOtRZ(@!U*4Eo>r=p_e_`j>?Rdb29H)gCLQtmEd|VbLiC=NzuqYvf zk}2}iQxafSR`VPXX$_olPz`L>m$w7_6bY6q2+TPqohuyY3|CX}G@Cjp0)jh;x0?>2 zy||0cc>>`sv?OY115)dVtvCTwNiQ4d)+$!(VxEvB$);$}AvK$y!ygt^8WfG`gH(bo z#u~!vd~GlpXQ%iKPxzQs99xQ2MLJArV#va&VoDj@lt;A~kKZ2}_k2pHBVYY zQBD^orEgg*Oed?~J)MX|TaIZ*7I2EUs-h?aMBjQTcEiBb-+udf@*uzYEjvO)+D$M9 zRYja-*m*n}H+l{Y`o|(D9W>5bByCqCWqIv)F z%P-CJ$8p@jg&)3RtDjZldrb~R1iR_eKi;^78PdtCB%FuP){4=ZxeU-!(&<>vr<-Oh zlJa=%C*jDF?dvBt(u)fYaTyP%DvIE5*+~=NGIWN$IDP1~j40USbC7-S48Kuk; z7)TDmI^@oErPt5`%Fg#YhaEdFH2ukq8%P4)Cf?fT>|GDThzu?#rEBjNlr~&0U zQu}~qYhpJob;=L$YADauq6L}2oC;tq36@B2!L25G414IzxiWj*+BtQw4eX4W9-YK? z_IeT2kTfM$H|Br)?-}$qpvDHEJ-KA~9?>qA?ClI_-6wY>Z;0B{K_O|e${Zvj*M6$F zCx<4drp`~_H`&RBVxU8{mJ)z4$0#S0&nq1yTYIOnzGNPaBLE|Pk)-eAsr?B~l%36S z`KK1+s%V5TxEY}z>u*pGHHQ_V_U`~LHQW5rYua-`QA9E%J#FaPWtbz}!iP)hMp0tF z?{m{Ne@iS!=)|W^>VF-yCr?SEBlc8N-B6L0D>! zaau|M)Lb!tU@gIxqqD~#VCI>X0L=kni{xfr#-8MTldT%Xo5WY_9R^`VD9=u+Z*GtCTr$#AB>RoWCyDhh z;r$bml#mk$SzO5WTXxp&D1zdAJDWF@OL3nox#CdE_CQ z{juI{M^E+B*QZ{u?`U6AtkkD~I#HM`wbkUba0*Y%=2=MVU~K#u866RFFEj7eONEnn zytZZ~U4eiF#xl7S_u>fD0v>B=S&XgmK+pp8lonj_Pr;V9VDkXDD8e#`^LSf17EgVU zY+560+zZ0*Q>jG^B2OmIquVhFyjLjX!K1p@<`rBWn>(+-M8|1WOIdYXc#MNk1SO%* zK1pVRLYeo!s<|>;Vobg35Uxr4j(I~B4y7lk%+um4sZ$Kld*7;k@%BZ1IM=b7QZ887 zO1GPJIe(P)NzVA^>T!IWe@)mf@l|lU+J9lHMqQI(%{@P-B7kjt#gh|l;DR)PA0(!d z{qz*Qh^)W7xSS!`GdEGsyK&vD0XCUKRm>WFUAN11?iZ14bR=J0I*p9g07VBlAM4v4 zLry>|I59j0zif!4i|2HRBl-Ht`7?*!Ub@w7D(7v6K)`Aze2$n(VP#e_qsserD y{g3qlYHudYp5mzwDEb=?x{_#oyeB_Wd}D2AwQs`gwf_ea*{~P@ diff --git a/test/case/ietf_routing/ospf_basic/topology.svg b/test/case/ietf_routing/ospf_basic/topology.svg new file mode 100644 index 000000000..955a43623 --- /dev/null +++ b/test/case/ietf_routing/ospf_basic/topology.svg @@ -0,0 +1,76 @@ + + + + + + +2x2 + + + +PC + +PC + +mgmt1 + +data + +mgmt2 + + + +R1 + +mgmt + +data + +link + +R1 + 192.168.100.1/32 +(lo) + + + +PC:mgmt1--R1:mgmt + + + + +PC:data--R1:data + +192.168.10.1/24 +192.168.10.2/24 + + + +R2 + +link + +mgmt + +data + +R2 + 192.168.200.1/32 +(lo) + + + +PC:mgmt2--R2:mgmt + + + + +R1:link--R2:link + +192.168.50.2/24 +192.168.50.1/24 + + + diff --git a/test/case/ietf_routing/ospf_multiarea/Readme.adoc b/test/case/ietf_routing/ospf_multiarea/Readme.adoc index 08fdb64a7..33698a4fb 100644 --- a/test/case/ietf_routing/ospf_multiarea/Readme.adoc +++ b/test/case/ietf_routing/ospf_multiarea/Readme.adoc @@ -24,14 +24,14 @@ explicit router-id. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_routing/ospf_multiarea/topology.png[OSPF with multiple areas topology] +image::../../test/case/ietf_routing/ospf_multiarea/topology.svg[OSPF with multiple areas topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::ospf_multiarea/topology.png[OSPF with multiple areas topology] +image::ospf_multiarea/topology.svg[OSPF with multiple areas topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[OSPF with multiple areas topology] +image::topology.svg[OSPF with multiple areas topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_routing/ospf_multiarea/topology.dot b/test/case/ietf_routing/ospf_multiarea/topology.dot index 46aae2d2b..b2a3edaf8 100644 --- a/test/case/ietf_routing/ospf_multiarea/topology.dot +++ b/test/case/ietf_routing/ospf_multiarea/topology.dot @@ -5,8 +5,8 @@ graph "ring-4-duts" { splines=true; size=10; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; PC [ label=" { PC | { mgmt4 | data4 | mgmt1 |                                                                       | mgmt2 | data3 | mgmt3 } }", diff --git a/test/case/ietf_routing/ospf_multiarea/topology.png b/test/case/ietf_routing/ospf_multiarea/topology.png deleted file mode 100644 index f6ed6bbb4357d4cb66657420b4dabef24545ee7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 82768 zcmZ_$1z1&U)HMumLZm@Zx=}$Sr6r|BKtxKqrBgy$0Rd?V2`LGsLAsF?X%XoX6cLc_ z`sd<2&-?!0b$#DCoFm}gd)@1fImZ}t%oVDtB2R!zg^NO=2<|J$sG(38EhrRP8a5XE zMz_zBAO65Hc_1%?I!FG^X#5b1LNTE3%iL48?S90$C zf5*oQZzgkdo@K5nf7^bZCLW!VlHwAp`mg)AX-R>?6hDwy3Y!uB7ZMQrnihq8hy3`B zjuq|Z|9;P?imr6=8f?aF>FCj>&0lW~O}gLQFzNX3t?+jh$?>3)QvGU)J?r1WZI!%_5fXPA|PqjJJwsXvuM z$dN%$U;hd=ZzS*nDTQE39Av!kIf2oHFG!FN zy!eS0{l@>@HG!UX(f#QXQG&DHkHfY9=M{m`noegY&!4UQ=(E;s#2mBadtX>sIQ^33 z0W1dG{dY!BuHV0Y8K0k>Ci2@PjAd5TzJ87Cy*r}ivDMAeK^TNww7uA8Z~SSZn3urR z^mGSdPM_UO17((6gp{LWDe{iB$?B}918IN0<%GeH!dXMw4k>{=o$P|*M}L^F-?(Ai zm(0ILl}OQae&%(u-+bNy>wMjf)$ZTH=7M&G4?{Ges(P6{_owG@x_!9OUXQgixe6(>a21r@Q!(-H#{An^FG}j zjrdn>+C_N%`t^*`($YRtYb*4V!=?0vKSNp7rzhl`dXiF7=qjmqT_?Lp9;m62z+N1h zI}PVK+3Mj^P*7-r-7>**=f7JC%g@h`j*j-9nwm3g)ylBkp` z5S5pM<7hhC8o`sKG*;`vGV^?i)^@t?nudl3hj;=`&oO%v zIBecx*5v3gqZJnxwy%ztmw6vL2P^w?88n2@iFwYo5lOUvGVl4{fc7yzzZHJ8Pe##; zxZ%6cJZGu0o5YHc3-CK#G5iBltN7r7Y)FMubu8*bc6P?Ybn&qYD^grMyv_Mw`u8@Y z#b5gS?SHXOK9qj0ru)vOQ9waC25#v1Up-N1Xefn*uPD6M>1R8RQo1Xhq!S zdXsn+l$2y1J-R|dLV`jCTqf!qD>DsR;-Z@SF=E9-27@rD`Rt@6V@8;NrK_lEgXoht;bYXuLeSFMMus3{{0F$ATWW^ z3fGH#(=JYKwkwUO2eD2O8KexgysM-vD(zZ^K0y%6r`%_KT755Fx`ad(<2y+k@Uf<_ z*2oo)c9w_#@LN84LOJ7i?qj^@ur^USR%t_ynv2&mco7zcr_Odw<(<$Ae}5F}gx|`{ z?7C)&K}61jw^e_I*Qe{rpZ34IH;^Xg;MuJ5q3z#veM~~at3Q7%mEH+mQBhGr4QAUI zqhOUgOPbGci!{StU|ePr7dNPRn5X{pt)cHdZEXrvi>&~1D+i0Q4@<2_@->CKau;n- zvlf3KTFR=Z5Xwc-MeOW6Q^-+MO6JSEpB~YE}*+tLeFe7T5?stAXn<)DH4#epVSS({W*R4DLuu~egzTVbu_7xL9*^u7(H%%>Z ze!>g+HFSU0ulY$C`;$+Y%<_@#(TvhM&TJ81dwQf{E0x(z3S{Tx7(*;>r8eE1av7M1 z3@vSM&xypxv(w{+6o)3OEtf>4oA`916!d;4JP_YEh962~>Q>t;C@OxsNTfo3XQBok z^Ff-z)pY{)Qz0zr-Xt)CpFcjz;)X%L6L!Jc+}wl>iLyU!LRUVv<-5tohO1xiX16xX ze6h+!t8mzD#AIXcGkkn2l4@beQ7Aqt0$9@k4&5pS4h{m?tew;j4UFu! zY`^kbnwprJ1}&1$T~@#A`ZutmqC!(_7M9ZF@Atef-QAy$*PElFB+kbEp54|eX5i!` zL}uo7SXi0$2pc}-o$T%a0oVN%UjCM&S}>9*;?7CNWe^TK7Q=GlX%>&2b8%q;k;F-~*x_PqArDI1#DuBd`4=um zOR;`^XC%Eue?wy30~Cui{tzmNXm;bCt_N08lYQ!3mAOvvf+esvvLe{Zi@ZEbDq+Sjj&xoUZ12^_kG zk*)3uCLi)0^X zptW>$U7nelLEzw}P6|au#TJUTP*RqR(G?z8bCf^8D-0r0f7g{CI8pmsTQ6mpUO)tf z@P%rboTTpP=uq}Nd;gwEbn6TA!S57@40SeLPpXK!&WqTc5!9FS;^^6%A&Fe6MgHzmJ3e~ExilO$ zF}i!1h^`$5&wxbg{gL{#rV)Nimn5Z|y(xl3(!qosg-^DJFcWZtD+c5wGdK3|ILc+rQw*~)9*9&s$)%e3PCWR@6Y>nRK^rg2~ z20+$G6HV7=K)#u(6-TaariT-s11|FzwV(oDy+TKwoSZn0>bpOo%_FH^UVU`c9%r9bu6c2Zy*Jc~{rUXm+d02{PJ(%vIm9QsdUJ zu>^phkJQz#PyH4mym8}3>soue%<612J#x0{0st78KwjRB92u;&9Vwxgo+8_N_DS>l8bcEUWSQRy=Os3+u3YQuz1czTbg*GeBko;e z;OthBAU`mCITsC&c76G0ecgPA26WAxjeS} z1gXOxu*I9Shg<=4B=7QYxe6}9BrH5`ouXL~R8U}39yRiPDuchjQu)po$mddd>bQ6r zl%`TSRlm13H}Anejcbs18+Mn|5@Ebl*=CAK<#ku3m%l#>mTCK2t_jMaN^$ zOn>>)0iE4e^YHnN`L;C!83A!|I+llNG5}CefaQt1B57@g%Ba4^PW;rHG{e+}n*wg% zd2+bz^k-~Ff05h7xL=qAb4Ljc+AgJ16AT1({oa@JfMS8DQ9(J7yY>32jLWJ^> zH20L0lp0O>pK+}I{P|MY<@X$*v<`ry03kIUDoy|~wtmlh%=7Gz>cQb5LMMU73DR2G zKY**!zapT1g+RX6K%4^r16L?1$KOw7WQyi-^lKy-JyFM<118AI&fX4xQ2Q8pdyB>? z-nfc;2_};9ZBM2;+ZB3xqEMNa2L~QI>$CKCQwae*$;ilH78^9a23&J{O9Sa$ za32n}>A}I50U=>TF3hd1MQ9XgejXhqmwttRPgRu|#`3#A6)#5(r<3CMKzbAD?dt?$bdK_@q7ze>S_5sa0aIvArG8+$>?ymwYMUGm40a2w{*8vrQqdUrPZz zr4F})-SG#eD{Cn^Ha1|o-W{*xv)5vbxpU+WNQX-tOjR?XTU6j)_Ve9^aD#Ir+%-+9kU7j*iTR z2AbHL%B>JUuF%kgL%zaWa)S5_>H~gEOpFJ7JGZhDR#PKXurj8rkM|IA3!I+8hiZ6n3pe`_9pV6sLpM*`Qlin|JDA3x%c(;rQoxSE>&*TRwm7f5V<%>&r(LMV#oFd5AdC}U-oLrm|) zeU7T4%vaWJAgTZ$%^0$5|6jf25*F4^IA_>6IJHF!5ITX4;B?!AMBur%8X6aOwcxsf z(&^D|TQa{*A;}GSey5)@@N#)=Q*RMYVDBRTYA{ge;_~wH2ulJ?{?CrSo*y}n({-+G zyaS@lwl?K&8X%&zS6B^mTYqQG{_ugBhv$ml$)>!n7_Ak{P7?`&TcUp(g&PCY4T*@5 zRZzgLvY&npL8IT|jo~+EdY_#uAjb`r7)l^ql#!7ULdL5x<7u^&8!dnoWt)9ZOC4s# z;Utlt9}f80PuvL}Blk4Ch~Ww@fLa*giV|lB%v)PqrRF_k_|yVQtECFJ4?zAXgEzht zaVIQkI?C5*eyTf?I|P^muMyyG&j$vkjQ#kF7{(V2&^uQ-<)#}&Ho=tFdSlK0j8_L? zR`*0x4CntSUc@FC|0`jDRLJ-}1>NpWQpWIddq|ExB|cVS-)};vVmKBwU7^m!a#>e! zgWgZ4l|X_BFC*OiZyG9YbW#ANnB1+)Z!DqZ5Q+>iC|M^SjRtsx6_6?YuAtj2zq&7< z;2W&R2GGSy8`Xqe6oTb|ETBa$O#FIIX=)UXv*taqBFwSG65Bno`+V|P53Q+r6t+mI z`?^7)b{RT^nYFD3i}G51L&FQyDE~ceR2`W00Wh4_3gU|uAvT|~giM$h7f|LF6BP;BX%=~=Zyu3Wx zpAG-*n&G&(I0k|&kh#JQHsMti97h5Y@yOD%`{#2vW8G7Kwh#BebJ~D z{4b~kR1r+_-`(KO(NGZ9uL-}|V~*{HnS2H7a*ruS+h-UNr-`NRk_CMB zuc+X&tkhAsPJ$pXQPBqJ5yx9~y(}$FVl?~jBIKAWbU089tgIjPN3~{OD_?Ixlp!p4 zcXvmcrNI?bke~@sHQtAxzQj~CPdt84fQ12vGsy4if5>rjgbv%u*;xuA^~vdJ2VueV zwX}L3bng!fH(Nl}0(vk!O#1KNKa*hQ(j-g@)XRVX#ux=4Gx)&w+=T4j15ifYwLr(; zc>Lbf!~`-NK_>;ATgTHQ*Tg=HGU@*W3%kGtAv1GxoX2TmVq!3>)5f`?qn$O$SB#ox zB9l;Bnwsw`D%2_Ft8WOzqeMhR@H8?;tSi3^RYXLlp)kDX%K>@=DUkww9s>QXTekrA zUA+*(;pl$d@e~6b6Bx)UBt(%4K~42>n$2xxp0+d$ZQ`kYZr9)^kASqs5y!RQhJ@_~MRR$^-vj&b1p- zc_Y>#Q@J%Gwe|JP?Ckgu8%B%uNkwReM$TlvP)Pgwir=|&$LLN{J7L6s_$zwcR?foW zCd^_BMLE^MpFg-FM+UAMmjPr1v6ntOkGlRSC-b z_)*f@n(f)$)UnKqGEua}x0PMk&$7>-KX1%&h%BxP&zviy{FOwbjiE15DJbWEO5=z* z_HF3H-ZxEM)7bRZiLjjQ?QPm(Ni_hWXsYOXT5BfQ5dDCBd>I&UuX%#H*f^2-dvQw> z9S>>sT`Aj!v~~`BwS^}|tr@1S8F>}EnK<7VuA4@O#9dHbO6i4(sztQ7f>Ne=OWGx_Dq7h>2W_I~46;&Pp9 znnpu#yr!Ja3EhJLL6;Z2Q+GF)<9jJXo`1oC>CCU-FQ>$# zeRkxcp>Yjl3ENM|08&x)b#;J_NW*!Ic`C(#N?opVUyp=DzW@rQyrUyG=zy2z&p=hj zj?W;#3J8gr5CB})-rn9aGIH%^YbJd%hUK4;!2rP{E+Jt;Iem=Z=7-VG z_E3cf589G=pO*R@yCK1Utl>E?%D2b{gjk6C#d@_&&J|V4nW{()3sfgm;pl&9mDuUK zopGL8-retUOSxah>|{#1QW=XhR%J#waO&R_jO(eoh|E^*b#k z)uz{5Dxdy6IzFB>o6M@S6^BUx<@$@+9d%933E6MkAb{hoyyd{h!g&Awec+_e@!lmA zfQn*$)AFYPfU)0x&Kf=HW;PSJ~Hu;LHr0mXCvXm^D>rLVOzDL6QI zEOR_=Csi){+^k(Jy(p>^R&JD8VQ|!ZI>}8yu$h@8c+kUX+ckOhF5QRSVE8 zxMr~gP#ZX{;F-~7b^WgyDtwuBy?40|S6nbY5mE412T(5-lc<|HamQ^OFQ)(eAaQxe zJ$$s#t(vaqlZKZOISzMA$!*|nQm(H26*@&@^L$T0`A_rwdkZvx@qEgP8))JnQAZe6 zNv^rxgp{gq|9+m9UCKptnriy==}vZTt`x*M*dRIWD4$e~cY z7+nS<%=<*7bxN*MpD9Vdhu(bW)2#UMRwTGnkuTM_Ajc@vY`0xQnkTmUm z$`GSK4Al(~v$8TWP@o72NOU!1XJbCjRr>tq#sf#d_Bzw#baaG8;67M{#0^;` zr5VeCC@n?}lkiO&^E*F|3i3Wy<%P?Y{Y6#(wtlX1pgl#e@S9ffUsyfg<)y#}B!blv zbv8j-f8QUi$@5c63N<8=t?liVqVj7!Q09j0IQZcqy|J#G92P=*p=wIn7EE;66d(4u zte)PxQYe7=IL@`8y%Y0FAeke3({1(#lsm}cAl^ab04ehd8JWfQjj;=8V;le3NK#Xi z49a{kKXdErT+e)`vMp55U^!XI8KiT*jZ%we`JeAow27khjY?wb) zP;i2W+1>X4>b{u))iY%|Q^ajm8}zs*H9imp0g;L!)mNd&HXu??Feab^U;a8J1Sb7J zn{E0(XkpDd|6==x6hSfV9wZnT%-_oF>l}~E&qmMW{d#(O9zA-5mZxq_ZWs0UQ^6G@ zl%tc=i|T4YK`;0a(4#)sDP@V z+Y?M+g+a1` z3n(Zk7&E@emt)sK&ILJIT}unE(tS0jC_-%PZYll|`YW8~nzj!qr@om0Okx2121&gD zo;zkfO?wyv6gu`2hcCwI3b}r%Ly5ls|k2!4F2&4q9EJOURSMo&@QTBh4%($PQ z&sJ~e2XJw)K#L320&2NTWalP=MW99m!Yah4r6p!wUQ&zlC#!=OC{pIBK#CLKvCND| zYiO9?JlR+LP8ZCg#~jXXSBN>gx(2;{`*v);B60d=i&~z#c6iB<GLbW8>n} zt8@0^o|2Q3Bgqhf(4{n*XUo*rGLFaBH%g$wX@N85rB7S0;?IG%gNBH2fF>40lB4AO zC!=CxA2;3_0?gueSo_}=;*9MMgtA}3t$_rAH`#XTZ|?xCi2ed>crOXH^6YNh+qaW; zkS$grWugE**VNYsEC|&XW_vHCx=V4sWrk>Tk&YHNu9Jk0#95}Q1OwrQw}sJOAO?k$ zGQDkxJ(4$L8QIyxb49BIPKGVG2{+al1Ew^X+=Ti%DM(-M9vvRu%Tx`a8Cr7*dFTxY z0LlYUjL95b0T}uOZ@0;eoy%&H<5lMBylQiS$bM@UWw1@>FL?p*QX4JAYS@LOXUNXrKKgfwJ@4T z!!W2!`i<^b7TL&GfEYlFl+08GPQeV&2f~&~uxyC_ypT~R{@n717u3x&g|=fTc3mv* zP1)lvH(sq`l$a+<;slkQgO(+aaen6Bck1iw?JVkZS5^JG!8^cF(f_4y9p&eQ*w`7j z2AI_7%dfZW?Ou{GH^1@q>(@e^{<|c>ia?JcZe2ih9AK=FM$8hd1}g~11iq(nwmZ>$ zDld;gkkJCdTIwA)7^2^xi|(kN9#dd69TR$N+%uZKoAJ**9tY=SfZh*SF8X?dshE!5 z6CCf|Yo*RNN?mUo@%@lED``ewZ^E-3N2kD#=&HB8!fi`Y`jlwnaOq_8E$1ap!{YG| z56Cmz9mJtrR(35xfFD*Uc-*#1=Z9>&X@14*ZgWDFJX`!%M!Z~MJ#>7@gWUI}rGxgl zC2EZ9lMp2fapnH6GyqsKr0@8jh|wU!oCOBaWx|c_-#uIy5fBfo^Z1xpwc39Jy>l1vDNRi>^=iBc3vpxBkl;j}$;KcP`)zzp)B@v133>)()H`K9il?>Y6qCu zdp*^`Xx9$R=p_^t9chrfS6a$_A$O3~-ZKqe@w2HG!^Ot-SF(^O6AYHV*@BY5)iW@N z{Ps-+bX(U~`c7;Q*+#mv5g-$JY*Dv>Yr+~wHKx5!>fs?WE$7|MhEI2+PLXy?cD(MdS! zTH9I8qs9C*1vxHhYF3TYeMP^;@!Z|T&%UX(^c2jSl1M4&&I=Jj7?JWJffQ6nS9VY8 z+)za4TvuBgJ8K9V1T7HqLuge}oW_jh0K6X@9ih(^B#sB5VPK(9Bze6bmES1l0CteJ zv}Daz%hM>skqY7Ov=={pe(KpInP8skphn{7wKj2d?CGg9E0A)CsgqecBW_3Kcz${^ zJ7S%oD+oTSqS#U0qE}_lu!g{0pryHm!^Idl_Ijd2_y!3MC@n*^E>9JG?ZO{*sd~IH zJg4USB2HqIHN^V;q4SRK(B5Wbg(|Qmz*vEb7HO^}xwgF^@0WV*+tY}7UXA);5H4r? zI%iPlKlB)#mKF&BC|IB6p27pz57(~!m=q#B_)Xn(5FZqVCn0+%aXw!lHJktAl@b;v z)|QQ@O%!T$ulanFxk)|})!%oa(dzd#`siD5XGyI2(F}v{^ zU~(=lqHrDrjeybt;u^#&d#O}QbY6@mF>}YgvM3p~tRepeArC-+-e~;6D*r=h_bVb%l3e`Q!A@U zgFILz^}x3SYM|lQ*C#sm&wLJySA5DpS(8Adu_6MM2DS%yUoW-zU75{$%#u%T+O~DJ zcuxA4@4L7f2dH1YY>w?!@~*-s%`^`V|A8O`r@XAKHV0gUpMmy*$RmC4-ixvMXgSE2 zP&B}M{2qWZASkKF?{UzY3HJ}2#L+JKr~CcJ)7DV`ZW!gYN+FSd^gG3yzRv=|St173hDJ91^T3D6BJRJ}(|H2YJ;fkYdhl?&u{Rs+x8uyMlu$>y_fgFa zGR`#}`?I8DTJ$e2tc?$QHfPCGKm3Nnm|gj2*AtiUz0M|GD4RieJFm zb+oDqv8~aJ9%PZmE` zn4%oIx4$nhDd`WI6I1emN7LX)l^uVhe^-=)$9YFskpoEief!({m-|x}qObs#hNM{{}CYS%vd_9I-aeeE|dxN=_fi>6c5lwhquW=zXzwmYLo7s=Myc zdUoI%Z5WkhF$N0V0r&_SaNO+2Mft~RYY+ZL$(?L^-+1}z3(xPBlnUum#&8}e?`GB2 zQ2}74&Fy#^eE8NZX}~~T9W&rFgEJpNc_GFb)Ockh1NpS3t;3<#h{%{9b#X$X37Lc_ zz%!9-qP|y{k2_Wu|He>CVe*rn2%yW+74dtk0p>^LVuj}%?CdgtW8S5v2K^JJy%$Ug z!UhmtNN_EnF{N_gb=ro@Wg&G%@JFbssiB)scgD3NC3Zx6U3sAa6Y}z0`=NI zQ@{pAgXL|ZfSQyHh(GV_HK@|Zve#e5WvTTUpSZan>{d}Dtofb0?+oWo*t zc`&m{1s5Ox>QVK?-;a7=Wil}_K~xOj-J!IER*aA(zI;(I<_OX(kk!$l%6AwEj{|Ti z-Tf7vg!J&eeIQ@^{{j3);rDXX7}?lfzcCb1Pj1ar>-*gO7+r&FQrY)KauvWads?=` zOLw)=3sqSIYuBtRbrvnDz~#b?;v<-tx&Qybor{)FhNVNqYCK{LdnSp?DTQ3HY8*3j zf4V%5d%Lai9_%~hM5Zn2e(0V)ZTp6`=PIwHfzlEK!D$RQtw?*Z@! zLnkahpJ}hkFP(ge*&D&_ueN7_vSqHtaE!`X->#AnZj49D$u%|F9t(|)jU9w}X;7Ls z0XGj}DoRU3V|+(v^#>URMF^DX0iK#!ShRL^b}^C z7@F5r(TW`WP#78UuNF+l=F-7z*f&^MIzHKk27v7@B^9i*U9Pzit(En+(JflZ|HerV zR(YFP6H2&d{e+k?w5#x;6qcCVkx}{MFfHA<5od{Ik8w^c$f&tK*VJ49#ol=a{cwALNzV+n<=`s{GPrJ3JPo zAuV%A71=IoWH%R;l74|hdN7X1F;wsF@NwiXArG77og@%i@3z;z3JNlYx-yiq=}Rs8 zsDjVlw1L$fs@U3}%tFC9PuY+8k<{UOOPj4=$0znnm5Va8BrEQ_30w zs3S(xRR-J+%Rg1jOLNt6q8;%=Y8L6-aHDt+6wM@MyoqkXX|$;O$~jY_@x{A8si(W-!8D2r1#sH>`%2h7z-okC8M=#T$??&P|7js zwY5KRva$-#8wsZsZk3RCc0Tnn@C+@R(p$0P;RzQzG;2frgZBa`QY2*?xH%^3(8fQ4T_I&{w%Kr%dqP>h_9jx$AAf!Ab~|B~@-JH6PZ3vc*iKHH zn*@Jjh+G&ODbO142qS-Tk;6keH(!yZNHWDRY;=xpBPF~fB_??@Wu_P-ut=f&!AAa? z8sEzGP7(nZE+eLYENQdbrlv~j&ktv>Uj49LnS6V`z1XcQQT&h9K3&{j6E8c5|D@*2 zm*htyuNqDTWa1zs zKpCH$b7Q#7hJLa;l-|5)#72hZq3k7uG=05oA}?i2pie3k`7Xd){EBDPTI3moOAxc# zy1Vn*c1{|T2$P_41cnr_WqiI6LdWL6OG6V#dxBM^|J%2_0$N&^P1J4R)N{cT)OTSy@s3gtN)zZ9oqK*}UMe4^C=Z^?UuRy^L}MXB3nQ zV<62EgXO_HCVhfpVHABf-=(XM?rH6GGOfhduLs$t+ZIhiqeVaSXrp2F;b?!bxUtL{gSAS7eS)~BFoirp)0Mm~1t(VH$U@*5IJ@Q5?nCRAb6G+FL zwf^d)ezn=q?#Yvr^azb8`}{W~Mq6e^-6Ty4qeZOolB$D!rujZ}5CF5}N7eI-KhEh= zj|kXNNhlwuI2=qSbP2lInw)&;X9$8zp;|IqH~z}9^p#`ZEZdOkFK zY?|xAdRAV{1y}+1J_^lTnWP&T$s{%McX-GguL!jj+k6R|HP;p}!PS2mA}-VRtVsQY ze=7$3ALGM}4-UfYdMSJ>+|SRF?dsjPam?2qeJg)@NG3_P(7Ac)7xuc4UhtV^pSoq_ zLTqSw`0uXxn9mO%`<}YaWd~2IWj+W5#3mi`vs>7r`n(bX(7;_))kxEUZgB@nn&@Tcp9m4V3{@n+B*}gyR7uOgi zMzO)K^Wx!=Df%m)s}G*G6kyMKCXkhl+a;3px6)U$QMT$7>#l zq~)K46zR*iKO}#sP3IXhdp6~Al78))x0Hd1m8!5zGx{V-Ss_1=^BOyN@RI&vgw9I4i_(Z3~mlF3-<3ze?#G7$Cw8YPI(C=g4qv zsk+6;h=y^Q5D^bSP(++fOsuTf5T>gB9@d$3;DVX%GYC9j9+w3M3tb3f*`{D{fF8J( zrOuJ>{%9CbZGbOTHLpLfk>)e-xmm}WopQ& z?K&{KG&fM>V7SuM2rpoDl)*gL@!2Lg*U_(Oi8|6zdiN!YGhKqncIpeu(yZU?V1df& z2p-o)IY6|7Nj&l&;YUAC%Yt@ifuw?!3Hm3Bd{@Cc@E*E(CadfM~@z(biqB?8BU1-ezkB~5i+FX1PtD#U~M%{2mfmCJ7H4LXb`D<#%Et2Fo@Yy;!ma+ z1@7ltW*{caAwJOdP||tuuz))q4JF_(gAdlj=JV5aaHq9aNB->TGZcP6T?j=otZe%34ABKTNOuNRD5U!X*5@>pyf8aUcfr5B)EvEb8^cni`D z0F5H%pjj4zWAWm@nwmt{^_f)YtxMwR90Pl7l3Jb_xMT5#tt)N&-w7)*#gr0I3-BFM zgm0!lK&>uz$C|veF0fIdH)=E(K$RkGT!m1y0;fJVYPE-2*~;(y)E&zo&8WY>f0ynY zD%s`Gv+)T!zk)AeVsghTb|i4>TUUbHX><%cj2!^XDU8{?O(b=>t8c_$b&Q)RWM|78V*>=2;AFJ~5ybRPNuZqLTlI;ccChW*5$C99p9F znpROvrzkH*^^(wOKpq8#(X|2(?ycve`l) z3IRN?46V6J3z2dKXzPfR3qnV*c~8PTAidU8a5KsST?6^H3@mfrhriz1`HHunscWM9 zo!5^&BL4O)MZm5VytGIajJvZi!GXJzYR!9dchqnJY`{XUf3FhK-VKBoi%jaNP|J}k4{S@_F9zO*pEN?-rP4iLykdL~ z4qlHDE3Anz9_;lIEyE5lFOR1+(b9PuHYhOqXn z5MZG(Loin*bs~RwN9do5_r87sZDhzIq|UrP_2~4F4x>NQg{RQs;tyu>x{iVU37Zl| z7%rIMDZuj3KlSnY)BAsr);YL!bQCfNVEEsKc9tc`b-dCx=jONT?i%SFWSXlgZO`^UkX_j%dh!lY!4LBh+!xZIENXK3-%VZUdq zu31EP%WHe@af<4s^8hT^~%x$mSXmJHMB4X%p-&prA8>U9H}2O$uUTAIeg;tPDxAQaU=x z8|w`@(*1^-$ElXwCg{r%qI8-{XzDg=dfOd z6VJ7MHD~^4nOX&?>%uIKLt8k*l!~IF33&L8!Gwz>S=-H@9hyZfkd~c?m$aL_pJ#1W zTTo|@6j0V5+jnNGb=p6B!4&w6q0cVh`{4RV$YHZP?i1jPrZDBViw37(V3+9b_s6zi z&1zi(MG0Dp_~7vkPnP;qk?Xafu}|NEUD&!3KIOPmB|?@!b2vTJ3H+yFEBP?o0^OPE|N%5xfIMs6lfN;=4%vC zH8g|kb=P+Z>Fv|3o}QXQ!Z&s`5uGS@kQC$9iRXY6M0P5c>h{)Wqo50hx%A?j&06}I-5yRCj?Ai(SC%PJ!hk|LL=)8axGUtb=2SZ~jb5@50elf4 z@XAHfgd#W#>NRapRVzcc*r2YHpm2}4M_8GgZw7Y#RaWh_HAhla_w! zs;a2iZcH#QSbKfPKC*MgOG`_0ba4p)XQ!`k)5kK1`&g(_cpAWve73?cSoAMLw*XWd zI-uX9a6*oFk{fzCZD*Tkp(KK|FOzZVg00uj67pX9Fbamw48g^~sabV$#i z{S-EsqQHb*eaq%NVraIx8;$ypuNfazP?bDnpJ)YJ23BedYSTRdb_jCdas^w)OGuxV z%pTC%84N9w@F_^syg{R9D9L5U$mzyvn(<&Ymmibh*x|BCN4MtLqCDVT-ZPYLza#lPX0Lj5p(`x zn<12wvlgS6^InHn`TE%?nHy3a&r!<+zZjf+aD%;XH-2*28+zZM)&W(|}bsiz61jdTjiUh$gc`X!vonV(H{;d*wGt%h6K=2+00{$CxbaZ$Y z4PJ!Y_BlN4##?Fh{9tpm*KC%&{f&a{E$ayVHId2!{sCXsbLq2XH9{Jp7U&z2 zO?1ip&cn;gJ1+3@XIxT})n88Rmm9CZJPO73gwPw2CPZ1PZ-VH%_0K>$spv@`vF3+s zNZQNc@z8njo1ji`x84^71qYKtFBCvY3yY3pX4~;kH=uJIyjHJ~wqSbtbQ3#6VuQD- zskETL^12F!bKbfY3jLXhb<{5z8qj+C`Y0jmf~t}G@Ac5yczM@%ed0iL^BW57`j43( z`^#$$6Z&s|qXXg*S|KmX@LsZ+$;-8d1=(C|Op`h5eEN`7&2- zkD<9vpl)scDn4x4LT~%$73kn*(=4?7nbJ-+uwB54O$E;3B?#yTHV*83-H< zJ_s}cc*a13iJdO%Sl;6gLSB39C{0aG^%8?rn7+lZ@2Tr}iGm-q4{~7lh+hD%NZ7P22Y%NZH{&+zD#FUixp|jls+VaADWHUGZwkm$v zT7ri_Fu2=TI7Qu?xr&Soo)Lo>Pv2ah<}!BrJCt=fAt6Dp**CQ-ik{r-Sjrcms0sA* zNZKnL$%c_VD$wL$Vq$t`?zTFHxCtR38K0dTLb)Y5|Nn1L@T;jhSG@agu<`M;p}!7c zHFb9YExw0R?CL~i*w~nM)5+F@WIn4_;6KV^F7xJb-6Ul%YJ1WP+ytjlLU0S<4Ffkl z6q|0Y$Xl^swa6~Q^ELE1S(upv0B)MtP4@Rkx~)wx-X{qrq-Fb26}05yLnuRTBe4LwMB6O?L2e;o#%9&(5X; zF++OF!2b87(mFoWi=#o|!0)YumaXxt_yVg0i3e{G2`4%wO(R>3?Jf_BlL>Y-K-0^M z_A+m;=V?!_4}TzH*h71(PDVz?XFC=R{T_cK`5k6xK;eE`$)CC>%zjd+LQk#tGS}J^nDS{5~Rarki z%94Ar#LUE0<8xf~#Y^wyt=JnToCPu6pR-b|_N)s=tl`kVn9`PES{quqBJ$4=;9OT< zUj%FfQgZU(tSr+q4ta3DWkdfd)XrVD7Vl5{YjdY&XJ3cDbk#g{=#ooTjA!HVJM(_* zUZDQq;lrnZWJG;W5}}cQxY9uy^;0gk0 zwoaurK8+AD9v)t!0Dv9fdlj6mb>K;!IfO1jNc|7N?h4O{$N>b}c|HfXD4RWEE$p^R zA?PrZ4G${WSs5jwrly`gJl;TDx7T?(cjF6?y&AuBad3>nlV(Bycc@ibk9hxr^laK0 zJ`azbFkbu;bMsH0D#ev9=eH8|mE3KeeS9v#0G2KJsBG=*WKkLz#JnvfP~5?>v9W0k z{N5qU9>AFd)o{pdyjBwxw`RS!3E;sbARP|nDpNZ1JJ)0qRmfaN5jZh2A`R&#g|L`KA3si2cd=vM z_vTyA#)HMe*;ePX&niguoT|k7>{86slY;I-5~^~fwxQv4&0@Yp1c3r`-!b8rki6(b zvIf(UQVhaXB^pj9JSHud8=B}^QQN=r@!1cv9*J|!&g#p5Bs3zSHzg#);J5bAVom23 z#%}^e$jr?(LVQHL$+DePBb;Uk)UN@IN!#+P&=xG5Od;HJkT5Mx{YVjdG}+1N=Bg%6 zMJhq$-usV>Lf=aYv1at(w1SL(sHn3bpuP?vm%lxih|ht5&*Xc?34i9+Tyrg`hntbh zKB;g%Z-Ki8W==ty8*4je@MU_AyzF~+?PEv^Z(UqmG(^J+O0tP5LlTsvgAme!h^|I= zQ<}{Im*Pb_>ku)=M|_PLXP|A8@kfAd3empFMt^aK83`^8oS;)O)F@S}IxSuw;+&b8 zVPa){fyN-6R$)bb@y1dwbkUx`?B2JU$p45?J}o2^{_Cp`H_SPT$zD8LQbZbdeqfM} z_}+!FRtdXoa6e<FFDU4H2YnU@y^4a2J_kHKoBp z@6EI9Vho4Z4oK$M+~i1hX_l_rhh?}4m~;$w_U#RSRV8MIy7H8W$ep~u$`|%tB;oZf zq8tak1Fh#na^YNIZ*b~K^5q2F{SDEl0jV0%LqC(eegw zO*7A;5u|YP#Uni37y2!BBvu_RXydRhE9C>z_Ci)A=xBER%LU1GJDew_Qx zw^vAuoYwz6j49zeNG|nsM_YxH<)IPBhbVUq3=CS}4a2UQOh|&~ICIXOWmo^$03>^5 zA|;(L41z8ckB*G%D+IUrL6yzTH~1>g1#;|P9^LF$o7P!Bdw4T!sir}mqwf+e7KaKd zp*u4#jV)=bdF^NJlEAo$(}-Rn37cC!j7w@-1GPr?C)1lHw70aiwc&npgY=^PQ`}k* zXgVMe_)Vgef+|^QS_AG9{hLQnX90DRgN9N4 zG1Tww_jGjklqc(7)BK#vAD(@ayVZcsvVcdNO8(dQ#+ps{r#)-iw;wMauEy_&;MI+-IGLSJW84@#)K*E+#&Y6qYbJmL(B6{FeqQgweic9 zhE2%6L+~<)SMy`9CC(h)vHQJ3#8~*dMF5|j=t}otmVtko4~&8)>Wcn2UOau;1BFm) zoD2v8_A3Q#3Mv)<+3ES3kL{Y*(Bj8=FpvFhU~q1$QkiEf<9ESmnP%DU$^b1)+r{ z(XiKt<<1M-JuO*=a>NEl2m(slcC@UdCQc>*Fu)D~!wI;(7(|^y@$KV(9f{rmVf+OL zwNnBDN6;-Q{!0op1=d;5@kw{h%^UHvfMe91{qZt+@#5E}J5A$0TrW#M4&5EF5lqV~ z&nelhd3yJ=l7*UUP4bZq-^lh~$jgae%raCl9XM99S)kbE3b!lb8>PMI36(vX7Y_es zV)~Eu(-C1B$#@*z7V(8xO(ZpVPPdN@^(AyHGI{`*AW3e?(3L=x5JyW3RulG%$6qpq zw#4qpZ;eV>JiFOFQ1t04FE8(7$JL#cROvK(8&E|cLsDT^Eisg=_Rrh<7<4ebBcEof zlT=d^@PMvDb}fehZ%G&e|>JFH!b2tbMJCgFI%nko)bvz?Ky-6R^U0mUnHq+NUZZEOa6 zf4B|m3xDRJ-@l)Gc`0P(-cfsb^XIc zX2;!AA5=b2&y?=As1DBC+k+sNrgnc}N!A}gP8*I-0YdShnJ&21Fgi(em>(ekY&*N< zE7KlzH1za!T9(C92-D-8X-Cmqbs9Dqz{Q$~T8hYO+tYQTa0H6m{B3hI8=vi@AkGn9 zoB>E%=ZoP>R-y|((t?&16b;e1?{MpT!=z3zUiM&d{C!;Q@3E@Hhv2{s4G&kLWn14j z9jH_r-7hKE<7(^{mh&b&hL!{{N!t*_S8;j}& z?O4ukV89ygA-(qO!)6NXgcC%yn#0<t;>ka#gB z67>=HDpCqqwa6jI_;9C?7Zxcl@y)9VFZ1JAxusuwg)`)hR4q>{`7`6Op7t&1H(PX5 z@0Hv8#Oq5>4?U7%W|_xR;k**}z9mqiN@7J8ibf)Raj`$Mu<$zswBK?PfyOXM?kjN) z2Voo@E%h%CoPv)L%jv`!#|vM*j$Va*>>dgV6sg;hk)UwX9GkqUtZa`S?+SXZpRGst zfy@ameIVMMbOrn3l|41nM$kjzF>U)DKb)PFMRYQwTsQNlG~gKobo(cq->{!EUAJ7| z_#=V4#8-%07)2m#TnPU-T$}nh>gx;NZn#e+D)MU=H;m`kAL^~M^1s5vaLiY{f-}=Y zhf4O;ide4TkK4s>|5}zRGz`~2XB4hk${QHzU;0}xZ#p!@Fu%w$GH1xaz&MVNvM;?` z=;5n_BnNkA2j$%6I2?8W;)fFTF9SmZOzgr?J0J+TTU1in7EN(qLs5&KBg?sS-Z&%3 zP>{$tO>yrp!y%uYnIYWI0P}nVgib?4LulsFMjXb65>~c$3P{B9S*XhA2g`Q|KKfIG zHp#1^pJ_bxTAR1i(gm{g-l&Hm!@!?2GBQG3`1p_h+-v4?6BYI#T59T(JITo8OifLt zEiLDM*HSYngmG1knHPTq*FsJ%nB$^J1ahSSBL2PLdx*VavxYVnX+mt-^` z9PZ_r!}3_I@9J>oUAt%!L&Pp+IHyK?}7L3pVBPujQd22#3$}QUb65O35pB? zBj=0$Fm0p+@hJ97+Acl$ggUTTpN3W57a=a*E)@~HtuNo2;!gUB3Hu+$zR#RCS4RC4 z6OEsaqP}Lv;X<+N@>rJK;XGG#&-JFlwf;otJpbPokU#y8= zEgz{&TY5|H8BH*@GB@S*|96^Wx8=LF%}rAIcQ4sFy=140B$fwUDr0=}8{I+oTrw|S z<1JcsUbdaQ@P+%DIBKUzN1aWCZYB00L~5>qe7MIFvINn!KimKf|G^$m`}+$wH;J&< zR~Q_)$W-4xzsV_Z&i1wCDj!@;b2Pnzf)1j6heGxi3-8;*x8R6mD@TtQ@n%)-2P$f! z2sywt$nYQh6>`A7o5urJ%%TU|_IcT{z>=Z7mzA5_=@X~Dkrq@dti+$Kka zgbKG$qJ-WDJ_5Ab-O(E~3uicD{*oVkH=u0ge2X`)>x>LVSKG+Z`weE2FHOYR{?0wS z^P@L&$CI~iWZ(YOpZ7Z=ASZb%*ls}eg9?$}w5O==$AcadbGdD1d-&&(-%%(SE8*M) zD_W<7O;;ZU?1YIfzuR#8-Y&aEBbrjogBo$Jev{8*X`_jkfdWx zi&iVVIpKQa>l4g}Lk^Q14MRs3;G(3I6yXu?=H_C`ipv`^&#htQOD?!>@6VK zelO=OLgqYrk8q7X)PB!4#*IQ)>nrZnhYudK3`aT#2?Ff`d_}m0!~1D3UR79FSUFiK z3Gq4W|7Husm$OsT()R4$O+xrN!-U)mMesND9*eCA->9Q}7R*dcWzjO6OO44pOI5L+5T{~qM{>KHFRAz~HHy!^MK>0}ZiyosmTUy|m zGw-(kaO>^Z;TInM?N3U2((FJ3r8|oZHPE(Z=UXeR4nhAI&imU96oY4j@MDA$E!}3C zPm=M4{Vs=2ggt`yG2pr-!UR=nK)3(4ohz$yYlLtg@$ zy?D_ND|j?54epg0@aqOvT?N;vI;YJG2$p~T{`GwI>L+5bF7_ORr7*vSIR3l}qr)(8 zH29QJk^p;e6H*Tq#6JV|F+zSsLc9U@l1)`2$pg9#Gp^u}VDL6YkRuo%yLr6hE(#oi zhD1PSK)=M-P>WxMh5KGjV;LaMa^J2QRLQ+tVGf8Bq8Bds?ZW7|#Pc=g?Yo=5xMWtf zDq~8*9g`0A5sWA(l4V7=GSQKe4O~xsVj!GpVHqtIdmG-b)oJ$H!p25M{%_yDl4m_@UEio6 zBdm1Ltw?7ACfWe4AEM(6=WW=jC3{)j0 z&@^;%cBSXV$-o=BzJAi((84)H;oDaB&(*DO%@pIewZx})JbD)yDq|M?_SY$Hlbr8w z>36)glnG|qoql?C-Jz*DRQ$Ro{q_F-Pg>c#3Qv|Se9FlghQF=h$zu}e`|nk2#->w( zX@G_X#u!{tR8)MbG!SBnO z9jE(6_8k|!J=p)#wSR3Jl97cT-06fLBd#nI;`Q3($MziigFfBu`zEu_ODIl3wA9de z>FD(Ez~sa$&*EZ{M~@yseTOXTO;0CU4F%VGD8vr?q?N-GxDI0A_$8s#O9BKv$O=%`+!w z2W>{=j>K#Nu$F#KPdCHDy8`B&D_y0VLFwM;)Z;U*A`h95AlN71$;8FQQ86+q;8~Df zv`4tE|GS8txn>>0Ny#V}h#ixKNDLrM0o*s(b`V7Z2~pADF}YmU?a?=bingZf#a({R z5v`ja#ml(`gPXVtEOO$jnJ9SJ`L`SnJ)O^%e83^jwsXqjhiuu`;{gG|(!;st;{}Ft zeq^Or%8?q`F0(zs*M=iV!_^U4wL7`{GZZ43U?RYGR76-r^7p)qH`k)b45c#LsE)_ z`}&u?4=yHaWS#^!gb8p8ZkO1dhX^lJ!o?1R&|lzlsC-baV*49Ni|=pal=+BK3Jo_1 z>0yq(r%Y(Nh~RwOLZ(h+-$>kHG9lV0qulS%}JsC>x2Z73J{cN5@>sn15^>(T#ka zpG!DLCo0S~`{Pb>-j*xu;0^8d9MpKG*k+>2zJ0WLbg0Ccr09|rvuL)_32x;-K3N=K zdjo@IvJ+}XQ2+d3XglEu-kzj{_+Sk=1NgXg@N~b1bPQaqqiDLWOx*iX0K4yVE8cXu z`_RDZ$+OfMY#Zxx-bI+`f_0vzmaq6B}`yzk#)}or`=Lswd0|h*Sa=noOybA?Tki_V5sLP zA#*Z-oF-oCLMZGeec!!%la|KW@g{UN8r&cT0juYTHRHuYXU`DP1%PN74xs#xAUy;+zjZXSv7b-n|JqXnw+;+BzIDR~L0{-V7kQWSnU5UN+!? zi=233lzE0V-Tsbeipp#O0RnvH^bf_wYdASfrbe$Wx@_!KwnH3Dh=rIfp-8Xo%ZvW4#l}(am$`hwI=4fS?W<=!?2YGc{neq52upa z%HKp5nq|)W1~{o#mY0lwx$W}Mms6bT)z!LUM+RIKpQD*LA|i;gZ`aXv@``#u9<-l1 z<=EbNtXZ|Nm8a$3%G~P$GbA|jl34wE|FYb2mS)GG9tyDpt$u1o#yd$oXQT*^Z|qvw zhz_A!Ds3vkb_)WMT7=Fw!A2=@1!zDb-1FG-y>bu8d)B}9H|cxZUc;;}v&-Bz0u(#N zFL)(!8}p0aqdjsXa`5+G1)l-e#0u-&m_S;vaKyw))$2UZ20{xs6&Gbcq-@}@-1?K; zjEctsP;@2FJ##Sx7xnu%z2>^-T0J(JNq-wX$l$nT@+Vl{h6oC zzL$mF5Iu2Pgwf~Yo$*{}pxfNpcu2=w~(w%QDA!WjOCF9_!6(SImKORRd~mL zaUe1nm*|OrS}>jvyAx_`EpfPXl1asNunofCET%NEgw7jMSNssGl{rH&C%#}Bj6CK+{fXs{nd$VLA_(3Z0E(AqPhH(B-~}mh1uDS>0$AE%3Zh&hzD_|DIt^XWR!&r$>jgMbl+j z10X`7D8u%k)Gj3fY^7KBWE&#I(Ri2q+fCRAxALvxl_t*D&IOOzjSt<1&6{-HU&1P4A zUMGIf@^TIJq{|_kTC(kfbXH_#s4oa!IN0v$V& z=9M+l`ji1M@Ht!B&z*c0^e1KfC3|A2CHFp2sOjuH1g2K8EA0zjY+V5F08F?wj~WI+ zIs{^msFc$`L_5QlXz}me-9uwzH9#L1jxo()*i1MsSE>UCW()3|3nEBK=yTjEusMUQ z1wtW`!Qo-|sHg!7<8BzL5@ZMB;c&2E0pyObzAfK@hVHy}0~#3r(AFlXC}88A|5HCy z>G46kSP)Fp7i&*;4Gyv-j#>z@7wf;^V&UWObj^K<6yol+1FoC34|R07-p4-tcqiPV zH}98bdgO;fRVEpKqUIQIS>wcW6m;vfFo$& zfrS1+)AVJ6%SvC0xSs_mDzT+L+{$J}e$kE($7&zc_y`mX^08mG1?_MErON-inhU=u=Gq zGi+UtUumt{X?m?Ft-L~9+UsdGr3<1Lax*gQK>zo@MXG`>Vx0^4#2t?QqBKWdOOmRU zx6eyjKajWXeNnu=RCg&Ow9haXfDC+(YO+cUz(#O)P~3QL4_Ph9&lj;f(;NN~oi3@8 zr6}$KqzDCnccCK#j>jbDH^+XhZY;_Lbm*Z)46}4qmpRGpHsX?Bp84Ad|8w2N_vyq3 zqCq1Sqr{%ie?QnIBW1Y$Vs;jnZI||#Z3&bXR(5>f;E8Ce#Qd(TE`h`iMpnDIIh8cU@EAGgfHL z!6-dOdBgI<1E@<%tblcbeBy>;@DRU*4z93$PUMu!KeM%B)>)X z_m#R1P~D*+_dR&}z(XD~gPGv;haqC%W=ysnQ)Mqtk*=c$k#8Fj{Z#koy7R-K)lJeK|MaG_6lZ-4>D`bVjDaA+vz_0oEBqhdNA`8R5u&Yg{Al;+QFZe3bcQo>lJs%Z5bp$`7y``S3kVjEA}Bal4pQ=tZhv~8pG_PJ*DE<6yN ziyP_uKBul>I-Ubc=H=;ut7&SJ%8oYUZSH6>6)ijl&C#goT`gh}hDYqhiv{bu*n`ka zy;n;?41D}Sg1|%ouG|~*F?g^PY1RM3_-pr>Fk#X7k@n|%os2Y;EZ^6Nu*c7&C#g>NPPOliJ|(dDcvGoHfRi7P|dX5GG~^Gl$&g{m_ZhbJV`k34Z3s4P?|${zgAYd{U1Qa z5Gm|Xfnx~XojwQx{DOiLK|fH{;RUci^z-m)Y-o6c^0e3{8qCMW?Wf)ns>}iZVU&@f zU`9=B3ge%Nk!x_u1#xE>GwRyqOot~Y@3((CR8`)mCY`vL+a7M>8Ta(QTy{Q>7U@^& z=T6L?gVUv>6{VZ*tU^bdwTs8r>(9qq%m{(3hyAcz!R0WJzQu4&HA(R)zFgPXI8mq* zgfYargf##$5i1DfGqbZX$nFY)40p!w_|p=z1OBiM5k5EB2__8MD#Kb*3mnIf9|sTI z_x#}a^F1{D4s*=J%s@1qQtuQ7qg_3&HYIW&04C<1^bKyDm#f$}?0fM15MrkC(O-=_ zHo5;odKqfXp~M^`>41Yxv{0a*IZ`x*EJ5yx3KTwPgoJtr7fWCLuWe;|eD4sjK7YWo z&;qCou7KrV+tsC>m6H=hVhV7fz#0`Z;l9YCrKN?gk~Y1dO;TWJXp$Yq6!~G=84Iw~ zSQqb~R`VkYAHc>*n0j#?6V>8cO>A6`;m`6w6YJI<5gN+Y4e55=If?wdn`g{F1f4XW zll9wI3h6J)J%t}E;%o=3xVYlDqg>d{Q?%53mX>mlGHe;d#@7BHIg#|0=Mie zfQTvMmSwTFwyuRa=PD*X&D}YE=n!jnPme4HaY&DsW;TL_rHQ$4_%_BrA*{qxPMImw z=R|;6dxoE1gLsm-j#rN6GN-h!23{cWN?d9MhAl7TnFj#oV@dMurjH@7(jRMy*_Be5 z`WR{c5%d#~91yc_SDLgmH7AB|IH_UtFDxk?G(f8j^2b?VSx4eZpOrx1!v)Yu&~B;$ zzu_~OPB;d9ws~(7Iu$7x?z8cWTy*=)bjgD(;hSkO<@J8@n|2CR@~qsv!P!wxSK1bAGOmvBXf&CVm9v)uoTdPMZ zQG@^ft5~Ju&?qyGa%K${D}C|hF6AD+OQF5=e2addB*lx=$=R_7a_H@`*@K(iD>n9& zKl4F>=!$u$Oo$n$B%rn3Zz-tHLWy&T|KFwOV2eBii!rvHvkbwlyTn-t=^l}H6IaNR zap?zk9@UonK8*M&0M!_dg^K_7WVmT3Mp zUCpW^C>>(}LM;o#Cr666-S;k3VsPXUn&`^qFnM&zXutq+OB<E#}LY6=1x`*v$XJ{LCd-=!(rYC zj4VpcJf_|8FZa?bWWWEB$IHesG_=X!y^;_Rbocx1-vFR~8yGyWm{0*$@kBl*x^-dv zlST#!_U_US@@IE7=~>o|t*3f_2m1wfACVfYhp{ik_lf*uX&O*z-~Q2kTVGyfJ$ z8_dm#=w|!X`;u)QsrZGgwbGOtSzqJ~iLzwB{%kt&KDq&_&jq^k9kM+5edX^WA~HXH zg1?yu8scu98{NiH+c2e*-O5Umgh8BbvTluS%(-k|*D5*MRSb-8#lKvf{lQdpa6%!D$tv>~2>G4GO@cQzENOmZ|1 z3E9;@`XJ^8p8V{v2|anqbd}(e#!tKlhZnw^*5{Akl3Wiv%8)WdD@U)8v)!*soGpH8 zx<{&|!rjE$if#IrM4@GARa;e6`;W(l;B^{iN(Wy0rtwtmg>;Oh|51yBJ@o{I7r!66 z6eTlr@@l%nhifu)D_<4=xJqVqjiO6WOXhlxXmwanhY1gORNM2PnhjfBEY)bMWtO21 zFP8lbRXn-_Knr8Q2-=lm2PA-CKZ3_;g@Jf(9a@JWU-^lAqN*oBk+(KVw8~{tjaf@e zS?pi5MsIFL#$7Yh+j?ipy)3iy^ELNSt4!)Q32imgy9XWKNfGY>!qj}PWq!8q4&>7N z6EGRD=Jl*pXpC8JZrXSKM;aS#6b{d5>Xg2=sK~NG%ffdPELITE9?o83D}O3F&g^bt zGG(lQ3P{?NVAec;PKti(2c_5-Nmu^p`SVDSNFL!4fAEPVyWX(Yr$Nh)cV)r8H#hm zaf#NtBfwwYi673hZi3F zFy#>}ePsR0)Sq-_86-`w$}P`;P8u)SANj0^YVrjagu5IZ98heL;KJk8D258`$nAc$ zmiy_P!}Py*eHG;5kMLNNdcYB5@G9TlPt0Q<%i@s4pA@zD-le}PW*v3yKd4D#LaVe@ zY3Smr8>FkXN~&+IzVq`VeAl_cjynAYjOB}FbXjqsMA)x+r;;_$Ql8}=it3~Vrrnmunj=RR`pjRO8w$wS@i5T)UawF%z#zw_ZK|tFFtwKI z4*ti~ns2uEIjlQjfuDY5+)ooZC)3Tc-s89EE}aE5FB0z4jwi=1iM;WjJHhi!7FaL2ntI+U50*QNDL zcQ@`l7Pv^y>;Pza@xLt`mU^~kY&M+n(k{(trSg?#?BDW#Hsv4N+LGE6C`BGk(UyNC z6=&MW3?_3_VRBmy@Zw%ON<)Kb6;ZnK0i1CAqHXA0*%?x z|84*?ThWZTZ_T-(y|wmEvW5o_ijMSNTh%B5(vJoa<4g3s!NMcXj z-Fqe`hGDFOLg5jw<;v<$<-Bw1BaOd${8!=59OI*PGMZwvUIDcYP_=6TN8 z;I-a2c(by3lc=$-qza!|ByKZn*i}?iY!8x^QdagCpIAVN2f-=;KnUMWdC14xH={}5PtPV5U^g~D^yC_st=#nQ{8Rsb&G4b1z8?ia z+{azzuRj(H>dlD-g!x_VgWiNi@qwSu+T*0|nHIKHx8FJNylbh;ip8IoZ#rGywsOBY z07^((T6NidG31>ytv2;3T6!N~!+P!8n^YW^4yaltxKx6@AP$ijGVP;Op; zR|cffX`%Hh^jnAHoC$)*4D5*R-oG!0a7hgQytlX&yfFOx_XWTRXu3lvmH-w@dXdd% zbe7%s#YX!3R{*~RPC{q~QF9*#iH8LIh8B~}kk{Ezk`np|WD!J_fbEu%ogIrh9qPF) zcXM<~P6pI||NQV2XqxE@4x}-k`8$)uU+<(?@D@->fwm>Osewl+owSD1d$B2NYu8uh zvVm}wcMRcA*%df$&}qx3C_i*)V))2;>segKTqh=nZEZR>NPSUt`_R(9H|mHQ+ZSGG zY|GCvCw|)RBbPJbX`CsABcvwZM=DdFeg@W~BxIzdEv2rmch04``ZIe%#EJM^2b>$b z?Q3nVC#(hl`|P?5hAhUGZUe$_5(FktqTH}n7!W(tWpR8Em=5R_T$pH02>IZ*1Yr7| zn5(wB5!^P2rU|%+0q@>5o!$eWQ>p z5gI9^2Z$X=y)IAP{Rc?R=5J3BCP-uK>vcR0N_1Fq2B5`l1**dKUc!6}AuhnP6q^^r%9zN@Dt+i?u{ivV|c6>l%6b+Ub>%)jZVS!PDaEc4|?zh$m#KD0N> zuapPY*1n?`i}YAqK9!dd-SJ*3zx?BGz4EtAyI1aP2vRU7ZIrO&22pN__=POtlGx{X z;Nhm1ZkCWNdSRfBw4?J~HV+qv+n*mi#S;D+AD01F@mBHUOFqZNj8GmISV2HJTD;s} z+1VM4q>&pIE!W@ii_6N^-Ot&70Sib_q+rN|{S=K7e=j}Hwe$u^1f`Is*<-#1GPs}6 zf5roJfcWljyqFuBb5?-u2o_pfmhT$(3VL0)u(BvO+tai{2<8Jg)?-F4xMcw46KV}Y z-E#jvMHzaE5bk~fybH)19l~lP=yN%lV7{WDH-&&6Eb_{pp0{9Mj8m@ejESqeF8dRd z2A+fG&1D1G|2Ep&l``(@_#M~x?E$dZiy;K7MQ83uAp;}VbF{xx>q8PJM;cWoyPE&Y zm7c#6j+D6VyNiPC$l~cEE=zon9AYvDBpCxpcq+6A3;S)oy}gluK<~V%`4@vEXfR_G%{PFPmC$Msff#xlL7TDY zvwZ0D5l(FQ>v(4)sKx>NM!B5NHy!=`dj32BI67kqK{GKW3(wC>| zNhEf5Q>tFLBBnCAH9oG53 zIy=|Cd{wcMmN%BGPxi67ZxX`rNEXw+)=|AI4pDhI_s%ZzufDCkrC8Fwrk5BC3O(|{xZyE`ZrZLjX9t&xxGjrj_7TT z)!~|Zg||=Wuu(V=kPR$jXzmo)IOuMG8KjTVq3H|KXJDg%`e*#F7`%fpie%<@Ee%1H zs5QXF`2c!EG#c;R6#<;|+{0tOob33RH(YzLC!5e%jpk#D0zC^1UP5z%t0T6>`QY=P zff1oKVKM*OB=t+s2A%+9KE**3$TqI_yv+0W{Rn}U>pZMDYXqD?d&FsBbR4%`LhgNqai zs(NH);Cv-QwG2K;IM{)R8X!Wm15j^vrm#jKhh(u51Ua3;4U|hHIGI<`*##$f6l2h0 z(WxMW00mYAaTJm%bgiF(DNQuEF&B5eLZl2dMsb*GKx3vp5x^|7)1stV$U;~5Ddr17 z=t!7+L2$CY{(2afJNO9n5U~|EU(~H2g+Mb^y&r)C47=@52r;g*=aHl3HhSlDM!tkz z{34QF#e|}x>3Z0+=G0q+tn3L{pFbU8`NiW%l5!P! zK$di@iq%61DpNI{GRw3x3I*FibtK>L>2M&|t)I;Yj;t5o>MM2Uleqrki_TfAsBcFV zvL$s5ze7&e5xDNU)FddMoMlfjMARSZ+QNbnOU$&Ec09-)B(Y>Vr1mWRi^&4Xw-JPj{$DQ`OEs zDlG1shcI0Z1^aggA!+gyiVv5KSR+{ z&wcTZG`VI|2vT|OcfJ8gKLhjTIqU}YehCXF+ zEcW+Qk9()dZ`fufD(zH~V>k8?Qa_;|am{|ie>(VNxqmO?zw2s-I*XratlzzG(MdA* zQ)zO2UV@*dR?mj5{4C?~V zh<`;s|B6n>$qyaaUBi2$D4~JGSR1r|hNAzXR{Ztq>_?Jy^H518j;^zlAL7VNAMUfh zNU)>r`W{{l639izr+Vl?2K4@5qwOz4E=5K9^lW+&H3?!bR0f1Hr?#Pi8G;=zX}7M) zVc@*+pqXy-vABr2cu~!CpUiO!5xhfO{UkGpS=^wEXuEFMT9j@)qVAaC39`Oi86)9o z(i0e}mPT?x`s%mISf4r(-U5~9Zgnd%5!#zSHR`|evk7x#n|zKCJ+5`_kAwCW&xdy` zD~`)qbADGJ7#ZC4_DNj6dR!?*A>3Ld?RD@=R{C9ACM>Ce+c`|?a^JL$wJ)7x9~H}` z4J+1Ji^_c6`^TMHiMF<>X;*vhRXXm`oDapHcltCM=?|1R_qnY7?R!v3xy|xy8Nn6- zga|5w%jFg4@%RvpBKwDfp@d1Ym$U@hvpHXLHPeLGXDa0*1cSg((9Q1t2X_LnnvbKY zyK`N8;{M0{7nnW$68!8zt9%%d2@JrDRPjJ6_mSg-hkT5g##1%=&Lmm(|8%7g?Z=60KYR*W}MDBjNe06DgV9 zW<@w>iMEXF>@gKo2gI+0oO|jLU7f^64KBm7A%FLAt>Jan_kN}PYI-*qBe%PYO<83u zAHAe9ug79ItG9Vrgx*+sS8JN)MUxSE)s-||QcC9AF%%XDPF?4MYweWNhzi}?0!}TH31COc0FU7K@*dV zksC-1LAt~yJR)p=LH+haDMgFF*i(cJ9)c7IDdgf*RHQNTCKvxnILOi2B{%)UXz`y2 zXCn#W7DPfyREuE05QN~ei$oOe(stxT)9f^q8sOQ_lz%UU9&gyF&FmX>806Gm z>)#Qkr7L{AYATr*{zBr#gT>_meI+dnO-@n?SjahfM$Xy9t7Y81rHg#VUKnq8N0PbE zIV)1Bzvk9T#IzZ0$G?|8=8w?(2LxpH{zZBcc*epu0l1krD9SLsU%vb==T+Ux8<9&v z17!QFVYcmcT4GhTNoQZf!d!E`%P?QeYwwaM%?njYlMU`~#;h`@Rz_tu=5J7u_K2=u zFvl)kT>e!wvRwXXZdva3{Qbk3j4IO^b@@_$cl$30t*kNki0J*En~hO_@;WL!HZ~S1 zkwwjL$~&=lT_;-D6Tjk;Cbm2BT{78JbvT?pP3|JBC;M^5;C05+p6 z-*#<>`qtel+Ec#yN(Ms;kI47ejy~38H-3pWme_Q`>vpj%jK=$Rf6k!C`)DG2DMq~} zR+Wrv&n>U?9?Nn5uCcf$(X-L0(jqUm)dc*h-T6*I^AxJvN?yXMVBe!ckrviE11=bx zc)e#!jBveu0Ne@r&^vBRr!hm{&HefO^A_*{Oy$Li9t)hnlr zdwCD}92W1N`k_HheHg~j?Z+<+-o7Cx#j^Xx(+Y1N5qt8w{Vx{|u``5C>W`j2rX2iF zF)r)tcc1z{TmAJ@=Y``q>6ETl8mV{uBl*bT?v}kiXPq0uy^Tpfq9!t3_|HbQ*3iYo zlMX}QPaYRae9X_^`}%C+WAT`*{r;m-PB(&A*^B!Ba8iFgwDvlcof;q3z2fQNmRjTh}YI@IQ9_pRH(fi>E>3aFrk9xYV_T>6h2d9c}hRvzO5cz)#17=j{{2v$Vns zEfRzXr=dY!+iAASw?+kJ)ENbP2}%i9%2*dy5mAqdIWmSntDk;Otg?^NeLZx}pxb$Q zsHyfut_0bx<}eBQ$xhlsuHTB!OKyoFA0bAw z$K3qMmQ@<3&sGa$Cf3p(^Vi_2E3ftpy1Hp-?*A`7&ua&FvAsF@RhRkM`5-9+^W?to zY=Q?5d1Yj8oZA0UKFo`zkE5_l>7(x5uF+$C-Q?ahT-NEinTsNPkxuUIVp1-Djepfx zmSmmY=4}%e+`E<*xpQqJ5@7jqWaz-zYAf3t)GfcIt{56Z|o*lVYLv|-`ck+w< zHjcb`CzFUsah;l62L{;@Hx~v>ul&hwuKQ%Gj8)vT^KnXTAEn2>_$_rEUFGBKs!iN;%Q9w<>lJ!44|;t2=-4XdM8~+J zG^cHtg+{`4&ndgSFa4HsJcA8hC)JB|6GnTD3W^N$YMRyX*ZxE)Ib2$scw;GcE_>t% z-A3srt6|4O1?yd3f~G@jyOrLXA7Vt9uDP1N%wgkPC7-uv)8S9V$On}@=Y=^A^lI0a zO{dyCZu$~^MD1j_slbfH@O=MgHDmZ-Dy&!CMa8m z8dNSnx$i;|i#@imR&ga;Yj5gSddiz+4L{wD*XR7DF)hW&f>wa5%R_qqkJF(izI4<0 zGy4Sv?fiF>tp2PTXF1h?N+*;P=@T7lBd4BfUJ%vp*b@AQN7kBUOd6iQY+SwC* zTT^ORZ5mZ)v{lDo&F%A)9uut|D~4M4?k9DrfAt%1;|w@5DS49KG=ueC1}nME*@$ysG0fwI#G>S-c{=U2(NYV==*1nY%|gEOw>Gv3F|-%U-str>%d1f<$|f7^ zX+oPS`kb#b@RrZbtp%mhQk`Ep?VXCHt`EktxNou+J>6w(R-1!&mcdfbbJSwDS^dCy z-L%-4J1miN+{kJDG0K&QftOTv{-Ztt%cJb>H*BwfNP9>cLDLN($T1Q)hq}rrC{TLd z{%>twPNy1vFS?+oc|SA0hU0Uq_{8yh!VCGVj+1JK2COKMCsM1WA9FKmiqkH2`R`UU zcJF7W>bPAwTPl09ugINTpf_Ij+Xe5Y`2%V?5&@Hx2al^L^yQN~I5MwZ&uLjSq;VF_ zdeH4G&0F-7oZND$TXs{;pmc63M^#K#I(8>*&A_RlhNSN@Cj}2Gu4|9BjWuq6f6Bh- zli|rlvf!xnvulHcKH7p?UuiFFe|gUR?{WLF)mJ*7h0-OpyVS4f{3DlD-T@cP3=NJG zA?a3|@7c>js4!mu{xeP`Ey6tBhc7+@4MRV>+kPy@dEA82%USu?aqC{+Zi7rx; zr$SuCf7i{lxuDEvZd^iQvn_VXJ5P|N1zdW(^_DJ3}$EMEzY{5aB z_@Y59p@B?{TKL?+bISDmBr(MsZsIKDb0b^%tz#SR*|`djvgc`BBW)#VDBZ~<2FRO- z9^B3DMp_=ih8ua0ZjL4Z%B#V{zBy9c|KS$Kz$;@gn+b-;iGUO$t2ie3`f_PA$0ygm z-Q;FlWtGWaBd%FoI{$CriXU?>cFR`LI#*Wn)o(+U<6Dbep?Z2vi|r~ZS6+<0*fyYP z$}j07aD6cO2Iq6W7HT_(TUF=mLca8jzFUaUJCUkwaxA^_s7YPg$GxP&iMO;Q_i3)FN{#cT{%Dn$F^WqJ^ z)r|$iD@6zQbZ&LIi{6g@#a(XkJBgW7NoMnY&A{njO|w2q)5$G)%*wRxpp!+%UH7hw zcTXnK(F14qs5lj7wUiB8xl0hRWDkir(ZmwJbd!kKl0;YM2h^ zkp3jipZopl>(=s>B-45+g!GZ*<}^v(Z_zcRs#1sUkoSr$JkVPlKe*SNU&99{*wW7P zWO(kCFNZm)Y_phD?42p6oLH`%Y3%=b{B&wbLdC34)4X316F>b0Yq#g3@@0pIyKYnL zuSNQjFlOTUr@Ctb0n20BpeCF9=Ey&Czv`}Fr!8C+L3>;eMUbDZ7W6bti~nYg%+)#V za807c!@{TgZiJfHhFnZKcrzrV;S(cW&-wsHmG@cLDJIee$x-Bdn`e2^YQl^fpr}X~ zn2-q?=huFNWmrkzK!nTVcYU9WaJliVQAG&<@CFaDCna$xos7}I(l69CEy5*AE2)E* zbk>92Fe5P`%c_r`eE)H2%bd1fkTLWoHs?nMzp68ht;yJs;Pa+&k+PWXI)>QMBdqb> ztm<}xVdZ^`Kc-wYE>#~ZX{3J&g`}P*GkV<3U#?IuwD-@}rhy~#5%2V+vrQyRJnrVx zg{HiHmm{2bXItz|I++J^@85?e2b zWbOBESX4@nI;U7(P&E5X$h4ckRbf@o4`>5&G6Qqk@r$+8Gkr#>G{|;5W>)D>(yyh* zH@ZoCr&HllckB6)gU|LXye&81yS{ek*5=HgFUMG>{e*4|H5W3BacpneE8v^!pQ-l# zFaN0_O1briN44#Snp7`HlG{@p#5tw;p)6Nf9&<6HHjBZ;G0@jHI#;AX@<5;>&kNQ3 zXeuc`XkbsuP(ve&nZqZUt@bnUUxu~dgZ$fs>1?0PH-!^^DetX#zu&yM;yiP=;o-x+ z&w5q)k>0YDLk+&SHlGCaMNs1`r!O~%uNbl$-{>4^Om+FWN7%vPIiJbps53WTnza2! zLLUF(pL0gU`UZ8^I=!@+$Lr>3mDDG}(#D6L(JDTvIK_2Z&2u+>(l;&jgza-r!?fRp z8Ct8PdA@zJouh#Ek?RyoNp|p;$a3-rs=s!`r5~vMaYpyefuwJ89+zfm;}vF?`#Aa8 zPM9zi1O@l}kafB}?6rT>mRrBLbS6mPI@7EyWAJn8Zg&p@@22Ip1!)OifA+QY$On$e z@&-347sCl{4%Q21J7Gjy3nhnZWh}T_Vn~5oKp{9Ixau_ z|Izf70adO`+ZKv6N~eT?q|zavw16NDk`mJ0EdtVA(%s!4B_$ypQXm}0@oP!f+>!t>i|H~~9j z0a{VCdWsV#K?y;cx0Uk=V`o>>TF1{n?Q3g_+Ckh0-#JmdP78b&wsBIO0sC$4m4ja zW)~00lm%8q?D8G{uw~axj(<_n7R3`yn6*K@%6Y30qYa&m&6~A?!m=wl189lKO~_)h zvbXAn7+U_GT+;^%iHP_VTxu;K+M>WG$X*pYKtGU>AJ5(|>~o94|35AOWYOz^6)r?n zA&AD{TPRGag18gkBM+@mP{CE5#)e8gcv8NG_aO9esCKw+at{x8Z{jZIy+BQSmwBXb z&FAz)$?pZg7a`ki`lV3^j;+fFF8F?q2X`rr(xC&dGMp2tN0Z5o0&nVjuaT>el!Aum z`BoJ-n*m-}ne7sn_BgH9LRP8f&q#I4?6ozyHe$}D4MMiO+2Wc13K~+-KW}@MZxWiy z4p&fn^euUAf^A`BY7;h~G7O9~xON!|VBljPv`_qFr^mO#k~4l?p779}+2Sf6CZ(XD z!iX1&%#4UetxLBY{DuQE=qQfHOxTH zID|@1E<4Nb-F9%__^?c6VqG*s7uk{X@bTwB&7-SB1+@A3RTmR_dVF@I2h zD?Zc;_z7)WJQV)={hIu9=5C`X3gM#v~Gf527}`t>oO=&f$qr8g_j47G^i*=9V0 zI)!7d4-l`9EKcyrFfP}g7I}2i3(X4f>dWPqRm<7$PT~G~xrym+;ocH4dCZadb!BPk z@4?w~q7ZOmo#=*_l+5HQDlXdny9issDlrq-}H7zK!nr=Ipt>zBFxcIBh~S7LDAf{lEIhI;6EQ98QNzS zu0CkCsd;1O+|>_LXZaZO#i!U7*@f@YEKuG0%J0BrlrQ*-oGuji&%5?H*#>U7-kH>L z=Hl>*?Ac+efSTJHOaFLEQEJ97`0L_NJR6?NAbiIXq0NgB2{P`>%D6=aQ5?bybrU1! zTx?s7U1xY?0ADRI$>+KIhAN*BnPzqWj9++0_jiXjmD;xb%d7IjtO%;Xqbfy3W)wu% zKJg}KK*NEbXTLCPrIv{9CAIY_EemNXCsJeDF*}SgF5T1ABYSF({XF+5oxiK6J+~3} zX*oH&lKJh7@`LX7%!_!7$G}Z&ZMpBdkNd0nZ^mx8&ma1CP9ix6s5FscO3kMoj=zS_ zJ*cF_RkpG6N2Oo@bYpK?@58I~)N(*75O8$L_$ZX>E?f*^bY8df1n6~GhER)~Sl-3939SI|b5HttJG=xa09+1gAVt|YS8U%PAo zZRTUknq7tAG`o%Cc86ji-kVG@1jJ3hJUu!x$!AVAbvEA-QRL|m?`*!iP zKnd-1CDG<&b$hb)7*jB7rXxUAMj59x5X@jBB#9#^X=`R!y|}}1Te@<-{b!Pj<`n%nm0@B>!m0)iNp#+5!)0pVTg!T$ z{lqw#!Fa6XvK1bDs2IOaR7kpVBu>eT?ium_kQm?$5N+Q=yM7T|7aGIR`oPe6>b!(l zrRMX}vxXbMzY0^WMy{?{8L+JD4_Lz0!j#* z(mTyX>1%-i%~a>Lqvq`CAMqQ#$~?9ewUU5M%q6TAP>Zok*@gpkVE}VDHKlwhln0%|~A}k2@7A5hfuZK=2T3WgqB>tthld$~li-e}_ zr&8+qM8c)}ql3~)1YfkOeJzJ9a}o7Wj%UKQSg$ZmvUO%gBo9X2`nAV^w6o*)B6>IHoEFVe@pGTWh~ zj14;i^0CaFN-|F^L?cxNKB5tB{u+j3`C`1FlRQ&As?uCN+lG`@rflh#dc<#wgb)HR z{-?g#nPT%yj77g1D>yAb?o4P$Ra@)TUtr!`vN4dmM+e()hQC}kqFlCe>qNOGV*8Sp zMNOpbNGk4e6*Dd?pw@h;?a}(afpefwdIf{TpN&5muXavmYkPL;tcTVNVs6-Ci{&{Y z)jteQkd>rZi01uOY4gzdILMC4Pork!Qt5@~NU(O<7+}8RN{?R6$2%zgM=SnX8!_O? z=Hg4U6XY3=svFq$OGZ_{>4>Et-Mk9K6}OBKI+#JLA~nsjASc}-=ZYLs>IxWdrSKkR zszyu17ZXw;1tb?2lkbHOs>WGO{1@+|!>f)!#@3Y5&pYO_UP1$*kGww(mROA&DifiN zj2h*oFtfy$kw%qgM;E0M&so_{HHl4!azNZ~%fB%Lfsu)OgXxp}bSwC3Oe$YXT#Y?K5c#NXiNMD@U}-6{6IS90Rtx-Guu-YmbaE8 zqf27^T`K;J-#W>nE1h{OlmOsOxC<-lfK zabe`LO&(X1=i3c2y?>6@bA853WorW-=L_oGYNC-9i=aM+9bL@9{*>9j%QdR$mzP%c z7nQYUttqi$VQ-=en!DxA;@Jc69RIx8yx7SFBaXxKzjs4RRbK;r?{$|mDr(Pcbx;SS z#l0j$v|NE)f6`=j{;)SJ<3);vQeWXvN!l9}Dq(6jZTI_ro?}dk!=j|ndJ-Y4uOIb> zhT1Q0^I$vz?pevvM0C2yxyLp0_V|Hl@9&On6;qiz@7j}SQ#_h`6GZV_@T5?n^4?Ly z%e`6&5i0Z#N0)P}Ff-NYvD%l?6ABj8f7!jCz*=!*ehj3Jz;eC4DYLQl@gT3!+{enL ze|VA=?5Fn169-rl==%v@K5lQ1C$fhgho2_i7~aA2yN4P_`ADM2u8~sY3Z#qD@upYZ z!cKSJ#{3}sG-jZi)-7)z%$7@~zT6k_TeAL3#}!+n2*5KUq;VW# z#x%OA8y>Q=*{+(Nlr|-iR(7YGox%F6cTu?j$ zF$%pzLJ8o%k|X30wVugbFjU8l8OcK_ll(NITmftkkr!2%MmvoM7ziU^Q0_sB)AOtf z7Lh8N$NY014I^bsi-pQ^h34wP*+L_m$6HdzzlxpAYXS$=>mzxaTv~hF@IzW(=?
    ved`vPe?Rqwr?w9zz3lMVzf=(Zz!Z=mIhUCr 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 J`7Uer{tm5ig)9I7 diff --git a/test/case/ietf_routing/ospf_multiarea/topology.svg b/test/case/ietf_routing/ospf_multiarea/topology.svg new file mode 100644 index 000000000..a90ee388a --- /dev/null +++ b/test/case/ietf_routing/ospf_multiarea/topology.svg @@ -0,0 +1,182 @@ + + + + + + +ring-4-duts + + + +PC + +PC + +mgmt4 + +data4 + +mgmt1 + +                                                                      + +mgmt2 + +data3 + +mgmt3 + + + +R1 + +mgmt + +R1 + 10.0.0.1/32 +(lo) + +ring1 + +cross + +ring2 + + + +PC:mgmt1--R1:mgmt + + + + +R4 + +mgmt + +data + +R4 + 10.0.0.4/32 +(lo) + +ring1 + +cross + +ring2 + + + +PC:mgmt4--R4:mgmt + + + + +PC:data4--R4:data + +192.168.4.0/24  +.1 +.2 + + + +R2 + +ring2 + +cross + +ring1 + +mgmt + +R2 +10.0.0.2/32 +(lo) + + + +PC:mgmt2--R2:mgmt + + + + +R3 + +ring2 + +cross + +ring1 + +data + +mgmt + +R3 +10.0.0.3/32 +(lo) + + + +PC:mgmt3--R3:mgmt + + + + +PC:data3--R3:data + +192.168.3.0/24 +(Area 1) +.1 +.2 + + + +R1:ring1--R2:ring2 + +(Area 0) +10.0.12.0/30 +.2 +.1 + + + +R1:cross--R3:cross + +10.0.13.0/30 +(Area 1) +.2 +.1 + + + +R4:ring1--R1:ring2 + +10.0.41.0/30 +(Area 2) +.2 +.1 + + + +R2:cross--R4:cross + +10.0.24.0/30 +(Area 2) +.2 +.1 + + + +R2:ring1--R3:ring2 + +10.0.23.0/30 +(Area 1) +.2 +.1 + + + diff --git a/test/case/ietf_routing/ospf_unnumbered_interface/Readme.adoc b/test/case/ietf_routing/ospf_unnumbered_interface/Readme.adoc index 75b744fae..1067706e9 100644 --- a/test/case/ietf_routing/ospf_unnumbered_interface/Readme.adoc +++ b/test/case/ietf_routing/ospf_unnumbered_interface/Readme.adoc @@ -9,14 +9,14 @@ configuration and passive to function ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_routing/ospf_unnumbered_interface/topology.png[OSPF unnumbered interfaces topology] +image::../../test/case/ietf_routing/ospf_unnumbered_interface/topology.svg[OSPF unnumbered interfaces topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::ospf_unnumbered_interface/topology.png[OSPF unnumbered interfaces topology] +image::ospf_unnumbered_interface/topology.svg[OSPF unnumbered interfaces topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[OSPF unnumbered interfaces topology] +image::topology.svg[OSPF unnumbered interfaces topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_routing/ospf_unnumbered_interface/topology.dot b/test/case/ietf_routing/ospf_unnumbered_interface/topology.dot index 8d4be9bf7..edf7d4538 100644 --- a/test/case/ietf_routing/ospf_unnumbered_interface/topology.dot +++ b/test/case/ietf_routing/ospf_unnumbered_interface/topology.dot @@ -4,8 +4,8 @@ graph "2x2" { esep="+20"; size=10 - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; PC [ label="PC | { mgmt1 | data | mgmt2 }", diff --git a/test/case/ietf_routing/ospf_unnumbered_interface/topology.png b/test/case/ietf_routing/ospf_unnumbered_interface/topology.png deleted file mode 100644 index 29bc7806ed8864d7e79e385e8fdc83d0903294b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32329 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�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%0AfdqC23 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 diff --git a/test/case/ietf_routing/ospf_unnumbered_interface/topology.svg b/test/case/ietf_routing/ospf_unnumbered_interface/topology.svg new file mode 100644 index 000000000..ab1e33779 --- /dev/null +++ b/test/case/ietf_routing/ospf_unnumbered_interface/topology.svg @@ -0,0 +1,76 @@ + + + + + + +2x2 + + + +PC + +PC + +mgmt1 + +data + +mgmt2 + + + +R1 + +mgmt + +data + +link + +R1 + 192.168.100.1/32 +(lo) + + + +PC:mgmt1--R1:mgmt + + + + +PC:data--R1:data + +192.168.10.1/24 +192.168.10.2/24 + + + +R2 + +link + +mgmt + +data + +R2 + 192.168.200.1/32 +(lo) + + + +PC:mgmt2--R2:mgmt + + + + +R1:link--R2:link + +10.0.0.2/32 +10.0.0.1/32 + + + diff --git a/test/case/ietf_routing/static_routing/Readme.adoc b/test/case/ietf_routing/static_routing/Readme.adoc index 9f61574c1..05d5ad68e 100644 --- a/test/case/ietf_routing/static_routing/Readme.adoc +++ b/test/case/ietf_routing/static_routing/Readme.adoc @@ -5,14 +5,14 @@ that data forwarding works as expected via an intermediate device. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_routing/static_routing/topology.png[Static routing topology] +image::../../test/case/ietf_routing/static_routing/topology.svg[Static routing topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::static_routing/topology.png[Static routing topology] +image::static_routing/topology.svg[Static routing topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Static routing topology] +image::topology.svg[Static routing topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_routing/static_routing/topology.dot b/test/case/ietf_routing/static_routing/topology.dot index 0da689824..b226c02c3 100644 --- a/test/case/ietf_routing/static_routing/topology.dot +++ b/test/case/ietf_routing/static_routing/topology.dot @@ -4,8 +4,8 @@ graph "2x2" { esep="+20"; size=10 - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; PC [ label="PC | { mgmt1 | data | mgmt2 }", diff --git a/test/case/ietf_routing/static_routing/topology.png b/test/case/ietf_routing/static_routing/topology.png deleted file mode 100644 index 68b00742db212a2cc45462fa8552b103a832ed7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29244 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 LxEvfYd&R#2GHoTF diff --git a/test/case/ietf_routing/static_routing/topology.svg b/test/case/ietf_routing/static_routing/topology.svg new file mode 100644 index 000000000..6201cc4db --- /dev/null +++ b/test/case/ietf_routing/static_routing/topology.svg @@ -0,0 +1,76 @@ + + + + + + +2x2 + + + +PC + +PC + +mgmt1 + +data + +mgmt2 + + + +R1 + +mgmt + +data + +link + +R1 + 192.168.100.1/32 +(lo) + + + +PC:mgmt1--R1:mgmt + + + + +PC:data--R1:data + +192.168.10.0/24 +.1 +.2 + + + +R2 + +link + +mgmt + +R2 + 192.168.200.1/32 +(lo) + + + +PC:mgmt2--R2:mgmt + + + + +R1:link--R2:link + +192.168.50.0/24 +.2 +.1 + + + diff --git a/test/case/ietf_syslog/basic/Readme.adoc b/test/case/ietf_syslog/basic/Readme.adoc index b194bc1bd..b1f569537 100644 --- a/test/case/ietf_syslog/basic/Readme.adoc +++ b/test/case/ietf_syslog/basic/Readme.adoc @@ -4,14 +4,14 @@ Add syslog actions to log to local files, then verify new log files have been cr ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_syslog/basic/topology.png[Syslog Basic topology] +image::../../test/case/ietf_syslog/basic/topology.svg[Syslog Basic topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::basic/topology.png[Syslog Basic topology] +image::basic/topology.svg[Syslog Basic topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Syslog Basic topology] +image::topology.svg[Syslog Basic topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_syslog/basic/topology.png b/test/case/ietf_syslog/basic/topology.png deleted file mode 100644 index a9abc1911a2cbd580bfab3046175240c459c961e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3293 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 OK`xu4&8koyasLKk_b + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/case/ietf_syslog/remote/Readme.adoc b/test/case/ietf_syslog/remote/Readme.adoc index 59fb03b59..2cb6b80d7 100644 --- a/test/case/ietf_syslog/remote/Readme.adoc +++ b/test/case/ietf_syslog/remote/Readme.adoc @@ -4,14 +4,14 @@ Verify logging to remote, acting as a remote, and RFC5424 log format. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_syslog/remote/topology.png[Remote syslog topology] +image::../../test/case/ietf_syslog/remote/topology.svg[Remote syslog topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::remote/topology.png[Remote syslog topology] +image::remote/topology.svg[Remote syslog topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Remote syslog topology] +image::topology.svg[Remote syslog topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_syslog/remote/topology.dot b/test/case/ietf_syslog/remote/topology.dot index 0e61e7312..c879ac081 100644 --- a/test/case/ietf_syslog/remote/topology.dot +++ b/test/case/ietf_syslog/remote/topology.dot @@ -3,8 +3,8 @@ graph "2x2" { overlap="false"; esep="+60"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt1 | mgmt2 }", diff --git a/test/case/ietf_syslog/remote/topology.png b/test/case/ietf_syslog/remote/topology.png deleted file mode 100644 index 7ec808acb8641061a4e8410998e33fbb97144a57..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19159 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 diff --git a/test/case/ietf_syslog/remote/topology.svg b/test/case/ietf_syslog/remote/topology.svg new file mode 100644 index 000000000..b07f7f68e --- /dev/null +++ b/test/case/ietf_syslog/remote/topology.svg @@ -0,0 +1,59 @@ + + + + + + +2x2 + + + +host + +host + +mgmt1 + +mgmt2 + + + +client + +mgmt + +link + +client + + + +host:mgmt1--client:mgmt + + + + +server + +link + +mgmt + +server + + + +host:mgmt2--server:mgmt + + + + +client:link--server:link + +10.0.0.1/24 +10.0.0.2/24 + + + diff --git a/test/case/ietf_system/add_delete_user/Readme.adoc b/test/case/ietf_system/add_delete_user/Readme.adoc index 74795fd0e..40b2e37f6 100644 --- a/test/case/ietf_system/add_delete_user/Readme.adoc +++ b/test/case/ietf_system/add_delete_user/Readme.adoc @@ -5,14 +5,14 @@ with yescrypt. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_system/add_delete_user/topology.png[Add/delete user topology] +image::../../test/case/ietf_system/add_delete_user/topology.svg[Add/delete user topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::add_delete_user/topology.png[Add/delete user topology] +image::add_delete_user/topology.svg[Add/delete user topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Add/delete user topology] +image::topology.svg[Add/delete user topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_system/add_delete_user/topology.png b/test/case/ietf_system/add_delete_user/topology.png deleted file mode 100644 index a9abc1911a2cbd580bfab3046175240c459c961e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3293 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 OK`xu4&8koyasLKk_b + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/case/ietf_system/hostname/Readme.adoc b/test/case/ietf_system/hostname/Readme.adoc index 606367c39..ec9e8452d 100644 --- a/test/case/ietf_system/hostname/Readme.adoc +++ b/test/case/ietf_system/hostname/Readme.adoc @@ -10,14 +10,14 @@ e.g. ix-01-01-01. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_system/hostname/topology.png[Set hostname topology] +image::../../test/case/ietf_system/hostname/topology.svg[Set hostname topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::hostname/topology.png[Set hostname topology] +image::hostname/topology.svg[Set hostname topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Set hostname topology] +image::topology.svg[Set hostname topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_system/hostname/topology.png b/test/case/ietf_system/hostname/topology.png deleted file mode 100644 index a9abc1911a2cbd580bfab3046175240c459c961e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3293 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 OK`xu4&8koyasLKk_b + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/case/ietf_system/ssh_key_authentication/Readme.adoc b/test/case/ietf_system/ssh_key_authentication/Readme.adoc index 5139ed737..2e9f7f8e9 100644 --- a/test/case/ietf_system/ssh_key_authentication/Readme.adoc +++ b/test/case/ietf_system/ssh_key_authentication/Readme.adoc @@ -4,14 +4,14 @@ Verify that 'guest' user can fetch data using only the 'public' key ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_system/ssh_key_authentication/topology.png[Generate ssh key pair topology] +image::../../test/case/ietf_system/ssh_key_authentication/topology.svg[Generate ssh key pair topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::ssh_key_authentication/topology.png[Generate ssh key pair topology] +image::ssh_key_authentication/topology.svg[Generate ssh key pair topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Generate ssh key pair topology] +image::topology.svg[Generate ssh key pair topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_system/ssh_key_authentication/topology.png b/test/case/ietf_system/ssh_key_authentication/topology.png deleted file mode 100644 index a9abc1911a2cbd580bfab3046175240c459c961e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3293 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 OK`xu4&8koyasLKk_b + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/case/ietf_system/timezone/Readme.adoc b/test/case/ietf_system/timezone/Readme.adoc index fa81106f6..59d1d27c5 100644 --- a/test/case/ietf_system/timezone/Readme.adoc +++ b/test/case/ietf_system/timezone/Readme.adoc @@ -4,14 +4,14 @@ Verify that it is possible to set timezone using timezone names. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_system/timezone/topology.png[Set timezone using timezone name topology] +image::../../test/case/ietf_system/timezone/topology.svg[Set timezone using timezone name topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::timezone/topology.png[Set timezone using timezone name topology] +image::timezone/topology.svg[Set timezone using timezone name topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Set timezone using timezone name topology] +image::topology.svg[Set timezone using timezone name topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_system/timezone/topology.png b/test/case/ietf_system/timezone/topology.png deleted file mode 100644 index a9abc1911a2cbd580bfab3046175240c459c961e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3293 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 OK`xu4&8koyasLKk_b + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/case/ietf_system/timezone_utc_offset/Readme.adoc b/test/case/ietf_system/timezone_utc_offset/Readme.adoc index 16bc8eef8..937bdcb68 100644 --- a/test/case/ietf_system/timezone_utc_offset/Readme.adoc +++ b/test/case/ietf_system/timezone_utc_offset/Readme.adoc @@ -4,14 +4,14 @@ Verify that it is possible to set timezone using UTC offset ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_system/timezone_utc_offset/topology.png[Set timezone with UTC offset topology] +image::../../test/case/ietf_system/timezone_utc_offset/topology.svg[Set timezone with UTC offset topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::timezone_utc_offset/topology.png[Set timezone with UTC offset topology] +image::timezone_utc_offset/topology.svg[Set timezone with UTC offset topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Set timezone with UTC offset topology] +image::topology.svg[Set timezone with UTC offset topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_system/timezone_utc_offset/topology.png b/test/case/ietf_system/timezone_utc_offset/topology.png deleted file mode 100644 index a9abc1911a2cbd580bfab3046175240c459c961e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3293 zcmb_eX*io%8xGZ0)mCj$6*`nCiV@2QqB6D?(b`&)SZXU;TDwSUYAtFni6ZGT7*)(9 zO0CuALzPmsgvQ<>wjvY6?mP2+f4)E8zd7%9J@0az>pjo8pL5^OopKdzDIz2z1c5+A zE?b$|Lm>RR;Mqu!AH);vQ4MfAa?{$<407=I^|ZMx7XlH^xol?Y7*+IrEYQZmPx|O8 zujUfwso>+no_xONX37q-f)5`+;;`-AzXcsvAgRNTuxUPBvt(MUum$;;*Uff4wm{u) z!hP3t5Wad^j*a&?@dd{ktesSBj+NMpPc1PDb)mN|lzfKo9w5p6p>A>%hY(8HO1)!} zj|)hv^+zKN45YOxIA;gm%>Oq=v}?LzFk-Slc~m$~W{=|+D?fa&!uavE8r->aM@dPk zwuk@K1s$C*W)&`pbWmVYKDhAp>sJH2&h5unO6<#P!X=%rVlWlX6?cjcL!`nZBbh@( z8R_XGi0lIUa>t7oFV^s#IVwuO4x(SIlkGlmg|A?S*# zs)&#fTDT-UCpWjB#WECI7!>Z~y^9j5GU0kThqf8;Oh)A6D?r}XJ_9B(GN}coj0uYFu`WgUo^7)x{ zSl*S>r%x+Mr110eXFv^ooBX4qqIk<=4<0<=e{e}5yJ_|P@#5m*_Cs<;QNKs7j89H_ z`1$$C%Tpgeek>om+xNS!fLKcx$Np=tj*Noyw_lZ%BzlrlQ&Y3D#5Fam z+uPe`XMGE7W)~M@w%7a_zh`7*BqRvHU}ffMlEht3hlq%XFoUo?Up8wdEhks%U+w;u zBK}v8;fi#`ueG&9u7>;&<>8T$88+L`+xubL^z-Km=@uvD4}UK^pcb0iIXpZ(-(S|>-w$ei>0DN)cXV{Le$XgcJb*LZ z)@#HS?xOARR(M=)XlQ6|*Nm~Taacu4s^xrGgK^A;z~RHk5>Y8;v}o>ZRh0%ew@7a2 z1Ls=@>{axy8ygWQtDvCexWmVV??oB8#l#pwwU9^(nf%j~lmP-!`}*~nxZ4vg#1L(K zGbIQ|_x+?u|J2({)i%!enF*-}IT|PJTk@8dmvv~4sRoPc@8i@Z z&%#zes#S}lR8>{GQ=T#x<$1MKqv$V1&>s?HP415tWkc+qBqbd|Jw%tmjUV;0&x+ck ztO$fA&w4sN*JosEYAP!$t1~&;!Xl~Qgzt@N8u*->Yn%CF85!FYb?+}{eSQ6O3oqG) z@-m8$sHldjss3XoYUd?7SKb~3`R4TF<<+Ssg98Ig!+-qz zqHk?u!`H_rJu~xc=~Ylfb}yC3;apQW6(1ju!{G|`gXLso@Vv1|5tIF~$cg%f20dNf zvA3}Y;AhClWh@HC&(I31urK#^i3kgOES~e^Nq`meO**D+dwub>>-WIw=2GX1>(y?y zq?PezYm>00@#dJjcURk_+?N&>WTd5ktE$qYxZ0jERXO#gMicwylHi4l7j>5&PQ5q- z>DG&keb$m3kM}|U z_y?WNdUFrp|E)QOXJKg>gU1UUKfbfGgtNa?XiO2 z_L2O0DM|@TtU664r9|=RrKR0Voa0%bhC%0|K<+@Of**Wf^&SeH=JXmF4A}jSXbz?4$VjLqC|EmpCmc2~LEro?cJ8 zoXa@%QCSTrn5d{IqBx^vcd`1d;17Y!DqUf5p+tacdU|@~^5`)^!E*_YK-qkKj~qVS z*4_?cVq#(?t}(x(aB)X>&UFwgt@`bM1RNl-B``1$0P5&CFgf|OZR;Vyv-jdR!5uysK=cXxMFQ`5-ENCLsAc~eJQTjK25#yhOqxw%{Aj$g;d zY=faoD=YdLjBlLLv9W4w{d4mh z1~*Mr#KgoEpp+Rxlf+FysF|xTp!eYyBpG$ zdKwCaHb#7>o$DDLP&?U{5Fwg~Iw2*cucdYM`t`cV6*sP;oeM`gsk6IVT~o8StBX}1 z%Fa=;mO~Pv_O{m>8W6?k$kj>H(43-tm-_MC{QP_}c^K?q1-i=P9c-|I%@z7uh&ywT ze4o54K0!f29v)Axs;qIjh7n8Tt15)~5|VPl*WW!Et*w`$qTVz&H-}SUT9((YW#3Ro zhA#|&wXj$$AT+A_37Yrat%Xo;qwG-bXlJsgli9)G+CfIMNu;`)ZK;4b<`xzRLqkh2 z%+0gszlHdZD~rjREBotj+c?SvTvOs3SSQvw14!z@-~Ljw{B7H~+t#ynZ*xl=+I z3??)r1o#O7{s)e#L?DRZ3+M;1gzZ0b?SLQ{8yTrDx5EFpJwl`2-@c%sfj%#>wYm8? zFRxFNDIt{DpUPl!7Z(@5O;0OhYYssQPYMdy+S+33g2F+2zIU&)r$<9WL%H9iyR+!; zBK`TjZbCy%4bu=-epN+SNC-jLyc-d*Q4*UO__yR|-2^0Qr#l+S)Lu*BaM``R7OS0tl-|Qp!f1qRzu$%)!C+wYAUO`k9%To}QjJo_rq2k@`?SAD@}@v-)fJy_qi3MASDC z)Q3Mc-$hH@eL4MU9(we^^3$hJ?4Dw{Tj*pfUs35HvR%-4lfhJd``X$XnJkT&@%p*w zWfa-OcItiN@w56tpv9JEO3NFB{A*J*3PL_ADrfYDxDyc@8+-KV(b(97xVX5JF!V6u z0&CK-jj`)51h`s;E(R_XqLl{pKut{zm|7TE-t%wohfVm0;@ZO%&50WS{!z9k?n+5c zcN&xr(odt&HVG}2bn=P3E4td+ad=?3@-^Lqnr2P*F01B!ocXKX*5BF8%nbPD#jLIw z`|^Py7s%Z{uvNBYGiamqaG@e`Nl8f=nSiDwPnRL*5#Vl(ME{?E-aFI^#W{4HsJ#ZJ OK`xu4&8koyasLKk_b + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/case/ietf_system/upgrade/Readme.adoc b/test/case/ietf_system/upgrade/Readme.adoc index 4d7605121..032efc36e 100644 --- a/test/case/ietf_system/upgrade/Readme.adoc +++ b/test/case/ietf_system/upgrade/Readme.adoc @@ -4,14 +4,14 @@ Verify it is possible to upgrade. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_system/upgrade/topology.png[Upgrade topology] +image::../../test/case/ietf_system/upgrade/topology.svg[Upgrade topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::upgrade/topology.png[Upgrade topology] +image::upgrade/topology.svg[Upgrade topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Upgrade topology] +image::topology.svg[Upgrade topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_system/upgrade/topology.dot b/test/case/ietf_system/upgrade/topology.dot index 26307027d..583b76b23 100644 --- a/test/case/ietf_system/upgrade/topology.dot +++ b/test/case/ietf_system/upgrade/topology.dot @@ -3,8 +3,8 @@ graph "1x1" { overlap="false"; esep="+20"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt }", diff --git a/test/case/ietf_system/upgrade/topology.png b/test/case/ietf_system/upgrade/topology.png deleted file mode 100644 index 8956d675f04de234577b240e500b8dd4f6a26d4e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3181 zcmb_fXIK;47L5%;3tcflFd9Yah8{6UQL1#LOBJMvfB_RJmv$q9AjAShK>7s)44_^h zBzWl}HPV}*DlK$E3vYb?-uv}_yqWKta?X5n_MW}=T5ICXO!Rm-p`0KPh{r%**8&7O z<_}zJfR6*m^DSWn;Kb%;q^Aoy`n|uaF9Jrm&l~7!Sv`KcJnnC7IVcKR4R&}Z`{~A& zDrO(@rx{WV<@_~4MnsFx!BDxf@t zQU;{tBNXJ0Ip5)z61?Sb`RVduq?+B4Q^(hW&((i)Gh%A$ufwvQbT`syG$VPfR0I$h zRHPgN0x8h7#E*e`PGL@hZk+kf4+1$onB#>)p-Hgo3ngX^AJ9h!8*Od+HhNkK7RBE> zI)X7m4Jr8+zq&H7-R3<~mM|~25*8LV;cZ`=3950F3&jXQ%*@SmEQ%e)PdP0wF9VZ= z9|Wy9?ZCwWSsOh%jx#QoLYW9lCSvk}=eyLUvq+V=Egz*Tkl1rz8~hIiudcUitE&$& zLe=jbK9^IekpeTqx0xDgjHs>O(V6LiK#%@A0)c+!TI;+{(FU!bqb8!(-7#|D<g_VS8lp=ox+Ok0Z48#(@yYn`f-X1`orTtN7GzhPu-&+p2x zBh@L?KGN9OSY>6Ug{37{8m9B_Kw3Er?hK3vH zYe{unDix$4?bjoAh!~iI!?kMoc$7SoN-+w!dYGmt42JfrwzIRl@TXpC zzVRhOyT_-|@BRJo*s$>M!0z)Y_XpnFJ$5+9C&JB^ia26U^TLw7U=1T5efhQH;^M4u zJ&RjMn33+xYkIRc__V#cvkLlxH0mDGk89t5_^>BL@e;usl@87s8nUH@7#VRHq@Fl& z!qwGvpfM#Q!;r+Df&Cb=JOWg6YkaPO%l&X_dC2|_W6nKD^^ui5s5@W0fCjV8X(uBrQs@h z>cM(*!WpLf9lY0^!sLc=Z}cfH%HD!BIWs%k+1`Hd$Cnca9|{ZE;E$NA^!$88EZ>`s zLpomK!Pwt{%OlG5cf08i`Lxk!wDG0j_SB2qYyinA!hdgHR$P`|zkJy=y(S|u+WbYcEHu^vmpM~e+smT>aD<+KA&|neS!S0v*Vh-8 zmkWlIeFJO8ylI8z-n$b|81-u{qSANX-vBo^H5q53FhHAw;UDdv^Ocm8XoE8~umYyi zxp{dT8yl9Emc=^?Cc1ihzDgPHtw{w%MLV0DBF}G;srB{axdny=Qqs~!Mn;XiYx#}$ zl}5UZQxP3szs73Qf$tJcbs#p|fQ$(ZVBU!tW z+V|I{nhV+dRGzR7cKiGLyR)tn^bz2k+}zyi>gpFSUR*SK9UB`fV_*IILGC}R2E*58 zUUbab`z>zmt*ksKyCW(n7=!2J;^qDP*98^aJBf+0nqYv2)q4Z3(-{oSNLHAXtbg{m z)?^9A^lvv4PN$DJP)*O$=nr4^_4VRusp}~% z%p7L1BFK|bOGow1jqcifu~*EK0m)I0vA9@TQ88KNl`MX!CRyRfjbiasl$7)>Ze?a>-n@B}ofnorvGFwB zfKS)n-rn8a-P6-EIJnBBXn&tU73OR%cd7$)=Q10RnuT5}fiOKieGP?Lg?gBo^(1Su z+UO4<66i$H7lGb6qi@uIX)Udl|7yC%5at#KxubT__4>o@8Ri5+332q z!+lHW6ckihR5V}hO#^~O@6Hg+F=#i>xtW=7 zL{$cmNaW6VC{_cO-JSgOXJ&2>Ipnwf*Pbgf{ne{iz|2QmtK)gVdjKI&^&4uK->4^(RUV9` z5s3-6G{xGkVDGv2gf0!4o0%#24#=nw#RUX{7QPoh7gbFv+2B{Cb##;hpjA~>m61to zq%)aJ{enInJVabG;;q|@JokvJ9L44zH3HujL;*% zGPnoL^hb`vm>5AAOzxFo=gz^=oHYpKB4I1>pC + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/case/ietf_system/user_admin/Readme.adoc b/test/case/ietf_system/user_admin/Readme.adoc index 6f5b1e5f2..8fb28b238 100644 --- a/test/case/ietf_system/user_admin/Readme.adoc +++ b/test/case/ietf_system/user_admin/Readme.adoc @@ -5,14 +5,14 @@ check that it when added as admin it is also the case in Linux. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_system/user_admin/topology.png[Add admin user topology] +image::../../test/case/ietf_system/user_admin/topology.svg[Add admin user topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::user_admin/topology.png[Add admin user topology] +image::user_admin/topology.svg[Add admin user topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Add admin user topology] +image::topology.svg[Add admin user topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_system/user_admin/topology.png b/test/case/ietf_system/user_admin/topology.png deleted file mode 100644 index a9abc1911a2cbd580bfab3046175240c459c961e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3293 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 OK`xu4&8koyasLKk_b + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/case/infix_containers/container_basic/Readme.adoc b/test/case/infix_containers/container_basic/Readme.adoc index f8d56c73e..1967c887a 100644 --- a/test/case/infix_containers/container_basic/Readme.adoc +++ b/test/case/infix_containers/container_basic/Readme.adoc @@ -8,14 +8,14 @@ The RPC actions: stop + start, and restart are also verified. ==== Topology ifdef::topdoc[] -image::../../test/case/infix_containers/container_basic/topology.png[Container basic topology] +image::../../test/case/infix_containers/container_basic/topology.svg[Container basic topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::container_basic/topology.png[Container basic topology] +image::container_basic/topology.svg[Container basic topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Container basic topology] +image::topology.svg[Container basic topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/infix_containers/container_basic/topology.png b/test/case/infix_containers/container_basic/topology.png deleted file mode 100644 index 5444e060bae54b3f163f8b593610b6b4c1b4f833..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5640 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 S^96tvQNOOG@>$v9*?$2*xFRV4 diff --git a/test/case/infix_containers/container_basic/topology.svg b/test/case/infix_containers/container_basic/topology.svg new file mode 100644 index 000000000..ff3d246be --- /dev/null +++ b/test/case/infix_containers/container_basic/topology.svg @@ -0,0 +1,42 @@ + + + + + + +1x2 + + + +host + +host + +mgmt + +data + + + +target + +mgmt + +data + +target + + + +host:mgmt--target:mgmt + + + + +host:data--target:data + + + + diff --git a/test/case/infix_containers/container_bridge/Readme.adoc b/test/case/infix_containers/container_bridge/Readme.adoc index d521040d9..1c3e6f695 100644 --- a/test/case/infix_containers/container_bridge/Readme.adoc +++ b/test/case/infix_containers/container_bridge/Readme.adoc @@ -9,14 +9,14 @@ port accessed from the host. ==== Topology ifdef::topdoc[] -image::../../test/case/infix_containers/container_bridge/topology.png[Container with bridge network topology] +image::../../test/case/infix_containers/container_bridge/topology.svg[Container with bridge network topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::container_bridge/topology.png[Container with bridge network topology] +image::container_bridge/topology.svg[Container with bridge network topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Container with bridge network topology] +image::topology.svg[Container with bridge network topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/infix_containers/container_bridge/topology.dot b/test/case/infix_containers/container_bridge/topology.dot index 6964b75bc..3b5d8be7f 100644 --- a/test/case/infix_containers/container_bridge/topology.dot +++ b/test/case/infix_containers/container_bridge/topology.dot @@ -3,8 +3,8 @@ graph "1x2" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt | data }", @@ -21,4 +21,4 @@ graph "1x2" { 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 +} \ 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 deleted file mode 100644 index cfb1862d63cba7e06e20a1321197edbf8f9b0a1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6870 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 + + + + + +1x2 + + + +host + +host + +mgmt + +data + + + +target + +mgmt + +data + +target + + + +host:mgmt--target:mgmt + + + + +host:data--target:data + +10.0.0.2/24 +10.0.0.1/24 + + + diff --git a/test/case/infix_containers/container_firewall_basic/Readme.adoc b/test/case/infix_containers/container_firewall_basic/Readme.adoc index 296d03096..a26af1150 100644 --- a/test/case/infix_containers/container_firewall_basic/Readme.adoc +++ b/test/case/infix_containers/container_firewall_basic/Readme.adoc @@ -27,14 +27,14 @@ phrase, is only reachable from the public interface `ext0`, on ==== Topology ifdef::topdoc[] -image::../../test/case/infix_containers/container_firewall_basic/topology.png[Basic Firewall Container topology] +image::../../test/case/infix_containers/container_firewall_basic/topology.svg[Basic Firewall Container topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::container_firewall_basic/topology.png[Basic Firewall Container topology] +image::container_firewall_basic/topology.svg[Basic Firewall Container topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Basic Firewall Container topology] +image::topology.svg[Basic Firewall Container topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/infix_containers/container_firewall_basic/topology.png b/test/case/infix_containers/container_firewall_basic/topology.png deleted file mode 100644 index 31229f672f539855c24d7308091da7778dd22d53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8613 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 diff --git a/test/case/infix_containers/container_firewall_basic/topology.svg b/test/case/infix_containers/container_firewall_basic/topology.svg new file mode 100644 index 000000000..61e485fc4 --- /dev/null +++ b/test/case/infix_containers/container_firewall_basic/topology.svg @@ -0,0 +1,45 @@ + + + + + + +1x2 + + + +host + +host + +mgmt + +data + + + +target + +mgmt + +ext0 + +target + + + +host:mgmt--target:mgmt + + + + +host:data--target:ext0 + +     192.168.0.1/24      +.1 + .2 + + + diff --git a/test/case/infix_containers/container_phys/Readme.adoc b/test/case/infix_containers/container_phys/Readme.adoc index 107dabee7..d05489dd8 100644 --- a/test/case/infix_containers/container_phys/Readme.adoc +++ b/test/case/infix_containers/container_phys/Readme.adoc @@ -5,14 +5,14 @@ given a physical interface instead of an end of a VETH pair. ==== Topology ifdef::topdoc[] -image::../../test/case/infix_containers/container_phys/topology.png[Container with physical interface topology] +image::../../test/case/infix_containers/container_phys/topology.svg[Container with physical interface topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::container_phys/topology.png[Container with physical interface topology] +image::container_phys/topology.svg[Container with physical interface topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Container with physical interface topology] +image::topology.svg[Container with physical interface topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/infix_containers/container_phys/topology.png b/test/case/infix_containers/container_phys/topology.png deleted file mode 100644 index cfb1862d63cba7e06e20a1321197edbf8f9b0a1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6870 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 + + + + + +1x2 + + + +host + +host + +mgmt + +data + + + +target + +mgmt + +data + +target + + + +host:mgmt--target:mgmt + + + + +host:data--target:data + +10.0.0.2/24 +10.0.0.1/24 + + + diff --git a/test/case/infix_containers/container_veth/Readme.adoc b/test/case/infix_containers/container_veth/Readme.adoc index 57aea0e54..d50ac7f7f 100644 --- a/test/case/infix_containers/container_veth/Readme.adoc +++ b/test/case/infix_containers/container_veth/Readme.adoc @@ -15,14 +15,14 @@ regular bridge, a VETH pair connects the container to the bridge. ==== Topology ifdef::topdoc[] -image::../../test/case/infix_containers/container_veth/topology.png[Container with VETH pair topology] +image::../../test/case/infix_containers/container_veth/topology.svg[Container with VETH pair topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::container_veth/topology.png[Container with VETH pair topology] +image::container_veth/topology.svg[Container with VETH pair topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Container with VETH pair topology] +image::topology.svg[Container with VETH pair topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/infix_containers/container_veth/network_diagram.svg b/test/case/infix_containers/container_veth/network_diagram.svg new file mode 100644 index 000000000..ffe912d09 --- /dev/null +++ b/test/case/infix_containers/container_veth/network_diagram.svg @@ -0,0 +1 @@ +. . . . . . tgtdatamgmtdatawebserverhosttarget' ' ' ' ' ' / br0` / veth0' \ No newline at end of file diff --git a/test/case/infix_containers/container_veth/topology.png b/test/case/infix_containers/container_veth/topology.png deleted file mode 100644 index cfb1862d63cba7e06e20a1321197edbf8f9b0a1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6870 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 + + + + + +1x2 + + + +host + +host + +mgmt + +data + + + +target + +mgmt + +data + +target + + + +host:mgmt--target:mgmt + + + + +host:data--target:data + +10.0.0.2/24 +10.0.0.1/24 + + + diff --git a/test/case/infix_dhcp/dhcp_basic/Readme.adoc b/test/case/infix_dhcp/dhcp_basic/Readme.adoc index 49f0a4f1f..5c9023032 100644 --- a/test/case/infix_dhcp/dhcp_basic/Readme.adoc +++ b/test/case/infix_dhcp/dhcp_basic/Readme.adoc @@ -6,14 +6,14 @@ from a DHCP server and checks that the lease is set on the ==== Topology ifdef::topdoc[] -image::../../test/case/infix_dhcp/dhcp_basic/topology.png[DHCP Basic topology] +image::../../test/case/infix_dhcp/dhcp_basic/topology.svg[DHCP Basic topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::dhcp_basic/topology.png[DHCP Basic topology] +image::dhcp_basic/topology.svg[DHCP Basic topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[DHCP Basic topology] +image::topology.svg[DHCP Basic topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/infix_dhcp/dhcp_basic/topology.dot b/test/case/infix_dhcp/dhcp_basic/topology.dot index 5b31e5991..605206a3e 100644 --- a/test/case/infix_dhcp/dhcp_basic/topology.dot +++ b/test/case/infix_dhcp/dhcp_basic/topology.dot @@ -3,8 +3,8 @@ graph "1x2" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host \n(10.0.0.1) | { tgt | data }", diff --git a/test/case/infix_dhcp/dhcp_basic/topology.png b/test/case/infix_dhcp/dhcp_basic/topology.png deleted file mode 100644 index 23cd9b41351809dd83dc568ddefe86ae6c1ff8a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8832 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 + + + + + +1x2 + + + +host + +host +(10.0.0.1) + +tgt + +data + + + +client + +mgmt + +data + +client + + + +host:tgt--client:mgmt + +10.0.0.42/24 + + + +host:data--client:data + + + + diff --git a/test/case/infix_dhcp/dhcp_router/Readme.adoc b/test/case/infix_dhcp/dhcp_router/Readme.adoc index 8beebd7ff..c6f59f9dc 100644 --- a/test/case/infix_dhcp/dhcp_router/Readme.adoc +++ b/test/case/infix_dhcp/dhcp_router/Readme.adoc @@ -5,14 +5,14 @@ and that route exists in operational datastore. ==== Topology ifdef::topdoc[] -image::../../test/case/infix_dhcp/dhcp_router/topology.png[DHCP router topology] +image::../../test/case/infix_dhcp/dhcp_router/topology.svg[DHCP router topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::dhcp_router/topology.png[DHCP router topology] +image::dhcp_router/topology.svg[DHCP router topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[DHCP router topology] +image::topology.svg[DHCP router topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/infix_dhcp/dhcp_router/topology.dot b/test/case/infix_dhcp/dhcp_router/topology.dot index 97c610cff..16ff458df 100644 --- a/test/case/infix_dhcp/dhcp_router/topology.dot +++ b/test/case/infix_dhcp/dhcp_router/topology.dot @@ -3,8 +3,8 @@ graph "1x2" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host \n(192.168.0.1) | { tgt | data }", diff --git a/test/case/infix_dhcp/dhcp_router/topology.png b/test/case/infix_dhcp/dhcp_router/topology.png deleted file mode 100644 index 27108b3242d566b8ce69c6caef25cd2821b51a4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10599 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 z + + + + + +1x2 + + + +host + +host +(192.168.0.1) + +tgt + +data + + + +client + +mgmt + +data + +client + + + +host:tgt--client:mgmt + +192.168.0.254/24 + + + +host:data--client:data + + + + diff --git a/test/case/infix_dhcp/dhcp_routes/Readme.adoc b/test/case/infix_dhcp/dhcp_routes/Readme.adoc index 4d4f8088b..41d35d39f 100644 --- a/test/case/infix_dhcp/dhcp_routes/Readme.adoc +++ b/test/case/infix_dhcp/dhcp_routes/Readme.adoc @@ -10,14 +10,14 @@ before a DHCP lease has been acquired. ==== Topology ifdef::topdoc[] -image::../../test/case/infix_dhcp/dhcp_routes/topology.png[DHCP option 121 vs option 3 topology] +image::../../test/case/infix_dhcp/dhcp_routes/topology.svg[DHCP option 121 vs option 3 topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::dhcp_routes/topology.png[DHCP option 121 vs option 3 topology] +image::dhcp_routes/topology.svg[DHCP option 121 vs option 3 topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[DHCP option 121 vs option 3 topology] +image::topology.svg[DHCP option 121 vs option 3 topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/infix_dhcp/dhcp_routes/topology.dot b/test/case/infix_dhcp/dhcp_routes/topology.dot index 5090ad163..78c2737d2 100644 --- a/test/case/infix_dhcp/dhcp_routes/topology.dot +++ b/test/case/infix_dhcp/dhcp_routes/topology.dot @@ -3,8 +3,8 @@ graph "1x2" { overlap="false"; esep="+100"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host \n(10.0.0.0/24) | { tgt | data }", diff --git a/test/case/infix_dhcp/dhcp_routes/topology.png b/test/case/infix_dhcp/dhcp_routes/topology.png deleted file mode 100644 index 84847fd3fd1cfbdbe8572ac56ac493178d1434c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11045 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 a1)37G{Q5!J4j!C)MPwxvB#Oig1O5loL5+<7 diff --git a/test/case/infix_dhcp/dhcp_routes/topology.svg b/test/case/infix_dhcp/dhcp_routes/topology.svg new file mode 100644 index 000000000..eb6dc218c --- /dev/null +++ b/test/case/infix_dhcp/dhcp_routes/topology.svg @@ -0,0 +1,44 @@ + + + + + + +1x2 + + + +host + +host +(10.0.0.0/24) + +tgt + +data + + + +client + +mgmt + +data + +client + + + +host:tgt--client:mgmt + +192.168.0.254/24 + + + +host:data--client:data + + + + diff --git a/test/case/infix_services/services_basic/Readme.adoc b/test/case/infix_services/services_basic/Readme.adoc index 16673042a..4c6063a9d 100644 --- a/test/case/infix_services/services_basic/Readme.adoc +++ b/test/case/infix_services/services_basic/Readme.adoc @@ -5,14 +5,14 @@ disabled. Operation and non-operation are confirmed using tcpdump. ==== Topology ifdef::topdoc[] -image::../../test/case/infix_services/services_basic/topology.png[Services basic topology] +image::../../test/case/infix_services/services_basic/topology.svg[Services basic topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::services_basic/topology.png[Services basic topology] +image::services_basic/topology.svg[Services basic topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Services basic topology] +image::topology.svg[Services basic topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/infix_services/services_basic/topology.dot b/test/case/infix_services/services_basic/topology.dot index 2884294da..eba5b3821 100644 --- a/test/case/infix_services/services_basic/topology.dot +++ b/test/case/infix_services/services_basic/topology.dot @@ -3,8 +3,8 @@ graph "1x2" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt | data }", @@ -22,4 +22,3 @@ graph "1x2" { 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.10/24"] } - diff --git a/test/case/infix_services/services_basic/topology.png b/test/case/infix_services/services_basic/topology.png deleted file mode 100644 index cf77bcb07207a7ca48ec4d122833e87abb702066..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7569 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 + + + + + +1x2 + + + +host + +host + +mgmt + +data + + + +target + +mgmt + +data + +target + + + +host:mgmt--target:mgmt + + + + +host:data--target:data + +10.0.0.10/24 +10.0.0.1/24 + + + diff --git a/test/case/misc/operational_all/Readme.adoc b/test/case/misc/operational_all/Readme.adoc index efb5cd54d..8f1b05e0b 100644 --- a/test/case/misc/operational_all/Readme.adoc +++ b/test/case/misc/operational_all/Readme.adoc @@ -4,14 +4,14 @@ Basic test just to get operational from test-config without errors. ==== Topology ifdef::topdoc[] -image::../../test/case/misc/operational_all/topology.png[Get operational topology] +image::../../test/case/misc/operational_all/topology.svg[Get operational topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::operational_all/topology.png[Get operational topology] +image::operational_all/topology.svg[Get operational topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Get operational topology] +image::topology.svg[Get operational topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/misc/operational_all/topology.png b/test/case/misc/operational_all/topology.png deleted file mode 100644 index a9abc1911a2cbd580bfab3046175240c459c961e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3293 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 OK`xu4&8koyasLKk_b + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/case/misc/start_from_startup/Readme.adoc b/test/case/misc/start_from_startup/Readme.adoc index fc8d52940..5669c6812 100644 --- a/test/case/misc/start_from_startup/Readme.adoc +++ b/test/case/misc/start_from_startup/Readme.adoc @@ -4,14 +4,14 @@ Undefined ==== Topology ifdef::topdoc[] -image::../../test/case/misc/start_from_startup/topology.png[Undefined topology] +image::../../test/case/misc/start_from_startup/topology.svg[Undefined topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::start_from_startup/topology.png[Undefined topology] +image::start_from_startup/topology.svg[Undefined topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Undefined topology] +image::topology.svg[Undefined topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/misc/start_from_startup/topology.png b/test/case/misc/start_from_startup/topology.png deleted file mode 100644 index a9abc1911a2cbd580bfab3046175240c459c961e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3293 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 OK`xu4&8koyasLKk_b + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/infamy/topologies/1x1.dot b/test/infamy/topologies/1x1.dot index 5a9bbf640..27381d875 100644 --- a/test/infamy/topologies/1x1.dot +++ b/test/infamy/topologies/1x1.dot @@ -3,8 +3,8 @@ graph "1x1" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt }", diff --git a/test/infamy/topologies/1x2.dot b/test/infamy/topologies/1x2.dot index 8891e6a29..73cae852c 100644 --- a/test/infamy/topologies/1x2.dot +++ b/test/infamy/topologies/1x2.dot @@ -3,8 +3,8 @@ graph "1x2" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt | data }", diff --git a/test/spec/generate_spec.py b/test/spec/generate_spec.py index 2b0b4d9b7..b1ed0173d 100755 --- a/test/spec/generate_spec.py +++ b/test/spec/generate_spec.py @@ -5,6 +5,7 @@ import argparse import io import sys +import re from pathlib import Path @@ -65,7 +66,14 @@ def generate_topology(self): with open(self.topology_dot, 'r') as dot_file: dot_graph = dot_file.read() graph = graphviz.Source(dot_graph) - graph.render(self.topology_image, format='png', cleanup=True) + graph.render(self.topology_image, format='svg', cleanup=True) + pattern = r'' + content="" + with open(f"{self.topology_image}.svg", "r") as f: + content = f.read() + mod_content = re.sub(pattern, '',content, flags=re.DOTALL) + with open(f"{self.topology_image}.svg", 'w') as f: + f.write(mod_content) def generate_specification(self): self.generate_topology() @@ -75,14 +83,14 @@ def generate_specification(self): spec.write(self.description + "\n\n") spec.write("==== Topology\n") spec.write("ifdef::topdoc[]\n") - spec.write(f"image::../../{self.test_dir}/topology.png[{self.name} topology]\n") + spec.write(f"image::../../{self.test_dir}/topology.svg[{self.name} topology]\n") spec.write("endif::topdoc[]\n") spec.write("ifndef::topdoc[]\n") spec.write("ifdef::testgroup[]\n") - spec.write(f"image::{Path(*self.test_dir.parts[3:])}/topology.png[{self.name} topology]\n") + spec.write(f"image::{Path(*self.test_dir.parts[3:])}/topology.svg[{self.name} topology]\n") spec.write("endif::testgroup[]\n") spec.write("ifndef::testgroup[]\n") - spec.write(f"image::topology.png[{self.name} topology]\n") + spec.write(f"image::topology.svg[{self.name} topology]\n") spec.write("endif::testgroup[]\n") spec.write("endif::topdoc[]\n") spec.write("==== Test sequence\n")