diff --git a/test/case/all.yaml b/test/case/all.yaml index ab25fb0e2..9bef30d45 100644 --- a/test/case/all.yaml +++ b/test/case/all.yaml @@ -14,9 +14,6 @@ - name: ietf-interfaces suite: ietf_interfaces/ietf_interfaces.yaml -- name: infix-interfaces - suite: infix_interfaces/infix_interfaces.yaml - - name: ietf-routing suite: ietf_routing/ietf_routing.yaml @@ -28,6 +25,6 @@ - name: ietf-hardware suite: ietf_hardware/ietf_hardware.yaml - + - name: infix-services suite: infix_services/infix_services.yaml diff --git a/test/case/infix_interfaces/bridge_basic/Readme.adoc b/test/case/ietf_interfaces/bridge_basic/Readme.adoc similarity index 84% rename from test/case/infix_interfaces/bridge_basic/Readme.adoc rename to test/case/ietf_interfaces/bridge_basic/Readme.adoc index aec7a8271..4029123d6 100644 --- a/test/case/infix_interfaces/bridge_basic/Readme.adoc +++ b/test/case/ietf_interfaces/bridge_basic/Readme.adoc @@ -4,7 +4,7 @@ Test basic connectivity to a bridge ==== Topology ifdef::topdoc[] -image::../../test/case/infix_interfaces/bridge_basic/topology.png[Bridge basic topology] +image::../../test/case/ietf_interfaces/bridge_basic/topology.png[Bridge basic topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] diff --git a/test/case/infix_interfaces/bridge_basic/test.py b/test/case/ietf_interfaces/bridge_basic/test.py similarity index 100% rename from test/case/infix_interfaces/bridge_basic/test.py rename to test/case/ietf_interfaces/bridge_basic/test.py diff --git a/test/case/infix_interfaces/bridge_basic/topology.dot b/test/case/ietf_interfaces/bridge_basic/topology.dot similarity index 100% rename from test/case/infix_interfaces/bridge_basic/topology.dot rename to test/case/ietf_interfaces/bridge_basic/topology.dot diff --git a/test/case/ietf_interfaces/bridge_basic/topology.png b/test/case/ietf_interfaces/bridge_basic/topology.png new file mode 100644 index 000000000..0ad37e5cf Binary files /dev/null and b/test/case/ietf_interfaces/bridge_basic/topology.png differ diff --git a/test/case/infix_interfaces/bridge_fwd_dual_dut/Readme.adoc b/test/case/ietf_interfaces/bridge_fwd_dual_dut/Readme.adoc similarity index 83% rename from test/case/infix_interfaces/bridge_fwd_dual_dut/Readme.adoc rename to test/case/ietf_interfaces/bridge_fwd_dual_dut/Readme.adoc index e3beed7c5..723dcf96a 100644 --- a/test/case/infix_interfaces/bridge_fwd_dual_dut/Readme.adoc +++ b/test/case/ietf_interfaces/bridge_fwd_dual_dut/Readme.adoc @@ -4,7 +4,7 @@ Ping through both DUTs using bridged ports. ==== Topology ifdef::topdoc[] -image::../../test/case/infix_interfaces/bridge_fwd_dual_dut/topology.png[Bridge forwarding dual DUTs topology] +image::../../test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.png[Bridge forwarding dual DUTs topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] diff --git a/test/case/infix_interfaces/bridge_fwd_dual_dut/test.py b/test/case/ietf_interfaces/bridge_fwd_dual_dut/test.py similarity index 100% rename from test/case/infix_interfaces/bridge_fwd_dual_dut/test.py rename to test/case/ietf_interfaces/bridge_fwd_dual_dut/test.py diff --git a/test/case/infix_interfaces/bridge_fwd_dual_dut/topology.dot b/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.dot similarity index 100% rename from test/case/infix_interfaces/bridge_fwd_dual_dut/topology.dot rename to test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.dot diff --git a/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.png b/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.png new file mode 100644 index 000000000..ccb035e02 Binary files /dev/null and b/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.png differ diff --git a/test/case/infix_interfaces/bridge_fwd_sgl_dut/Readme.adoc b/test/case/ietf_interfaces/bridge_fwd_sgl_dut/Readme.adoc similarity index 82% rename from test/case/infix_interfaces/bridge_fwd_sgl_dut/Readme.adoc rename to test/case/ietf_interfaces/bridge_fwd_sgl_dut/Readme.adoc index ca90ba3ba..1058d7857 100644 --- a/test/case/infix_interfaces/bridge_fwd_sgl_dut/Readme.adoc +++ b/test/case/ietf_interfaces/bridge_fwd_sgl_dut/Readme.adoc @@ -4,7 +4,7 @@ Tests forwarding through a DUT with two bridged interfaces ==== Topology ifdef::topdoc[] -image::../../test/case/infix_interfaces/bridge_fwd_sgl_dut/topology.png[Bridge forwarding single DUTs topology] +image::../../test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.png[Bridge forwarding single DUTs topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] diff --git a/test/case/infix_interfaces/bridge_fwd_sgl_dut/test.py b/test/case/ietf_interfaces/bridge_fwd_sgl_dut/test.py similarity index 100% rename from test/case/infix_interfaces/bridge_fwd_sgl_dut/test.py rename to test/case/ietf_interfaces/bridge_fwd_sgl_dut/test.py diff --git a/test/case/infix_interfaces/bridge_fwd_sgl_dut/topology.dot b/test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.dot similarity index 100% rename from test/case/infix_interfaces/bridge_fwd_sgl_dut/topology.dot rename to test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.dot diff --git a/test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.png b/test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.png new file mode 100644 index 000000000..9b66fc1b4 Binary files /dev/null and b/test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.png differ diff --git a/test/case/infix_interfaces/bridge_veth/Readme.adoc b/test/case/ietf_interfaces/bridge_veth/Readme.adoc similarity index 85% rename from test/case/infix_interfaces/bridge_veth/Readme.adoc rename to test/case/ietf_interfaces/bridge_veth/Readme.adoc index 08e151dfb..da145196e 100644 --- a/test/case/infix_interfaces/bridge_veth/Readme.adoc +++ b/test/case/ietf_interfaces/bridge_veth/Readme.adoc @@ -5,7 +5,7 @@ veth and bridge it with a physical port ==== Topology ifdef::topdoc[] -image::../../test/case/infix_interfaces/bridge_veth/topology.png[Bridge with a physical port and a veth topology] +image::../../test/case/ietf_interfaces/bridge_veth/topology.png[Bridge with a physical port and a veth topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] diff --git a/test/case/infix_interfaces/bridge_veth/test.py b/test/case/ietf_interfaces/bridge_veth/test.py similarity index 100% rename from test/case/infix_interfaces/bridge_veth/test.py rename to test/case/ietf_interfaces/bridge_veth/test.py diff --git a/test/case/infix_interfaces/bridge_veth/topology.dot b/test/case/ietf_interfaces/bridge_veth/topology.dot similarity index 100% rename from test/case/infix_interfaces/bridge_veth/topology.dot rename to test/case/ietf_interfaces/bridge_veth/topology.dot diff --git a/test/case/ietf_interfaces/bridge_veth/topology.png b/test/case/ietf_interfaces/bridge_veth/topology.png new file mode 100644 index 000000000..34c1de014 Binary files /dev/null and b/test/case/ietf_interfaces/bridge_veth/topology.png differ diff --git a/test/case/infix_interfaces/bridge_vlan/Readme.adoc b/test/case/ietf_interfaces/bridge_vlan/Readme.adoc similarity index 82% rename from test/case/infix_interfaces/bridge_vlan/Readme.adoc rename to test/case/ietf_interfaces/bridge_vlan/Readme.adoc index 2d7a34a79..3ec503ec6 100644 --- a/test/case/infix_interfaces/bridge_vlan/Readme.adoc +++ b/test/case/ietf_interfaces/bridge_vlan/Readme.adoc @@ -4,7 +4,7 @@ Basic test of VLAN functionality in a bridge ==== Topology ifdef::topdoc[] -image::../../test/case/infix_interfaces/bridge_vlan/topology.png[Bridge VLAN topology] +image::../../test/case/ietf_interfaces/bridge_vlan/topology.png[Bridge VLAN topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] diff --git a/test/case/infix_interfaces/bridge_vlan/test.py b/test/case/ietf_interfaces/bridge_vlan/test.py similarity index 100% rename from test/case/infix_interfaces/bridge_vlan/test.py rename to test/case/ietf_interfaces/bridge_vlan/test.py diff --git a/test/case/infix_interfaces/bridge_vlan/topology.dot b/test/case/ietf_interfaces/bridge_vlan/topology.dot similarity index 100% rename from test/case/infix_interfaces/bridge_vlan/topology.dot rename to test/case/ietf_interfaces/bridge_vlan/topology.dot diff --git a/test/case/infix_interfaces/bridge_vlan/topology.png b/test/case/ietf_interfaces/bridge_vlan/topology.png similarity index 100% rename from test/case/infix_interfaces/bridge_vlan/topology.png rename to test/case/ietf_interfaces/bridge_vlan/topology.png diff --git a/test/case/infix_interfaces/bridge_vlan_separation/Readme.adoc b/test/case/ietf_interfaces/bridge_vlan_separation/Readme.adoc similarity index 85% rename from test/case/infix_interfaces/bridge_vlan_separation/Readme.adoc rename to test/case/ietf_interfaces/bridge_vlan_separation/Readme.adoc index 8de54e854..262bc08d2 100644 --- a/test/case/infix_interfaces/bridge_vlan_separation/Readme.adoc +++ b/test/case/ietf_interfaces/bridge_vlan_separation/Readme.adoc @@ -4,7 +4,7 @@ Test that two VLAN is correctly separaretade in the bridge ==== Topology ifdef::topdoc[] -image::../../test/case/infix_interfaces/bridge_vlan_separation/topology.png[Bridge VLAN separation topology] +image::../../test/case/ietf_interfaces/bridge_vlan_separation/topology.png[Bridge VLAN separation topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] diff --git a/test/case/infix_interfaces/bridge_vlan_separation/test.py b/test/case/ietf_interfaces/bridge_vlan_separation/test.py similarity index 100% rename from test/case/infix_interfaces/bridge_vlan_separation/test.py rename to test/case/ietf_interfaces/bridge_vlan_separation/test.py diff --git a/test/case/infix_interfaces/bridge_vlan_separation/topology.dot b/test/case/ietf_interfaces/bridge_vlan_separation/topology.dot similarity index 100% rename from test/case/infix_interfaces/bridge_vlan_separation/topology.dot rename to test/case/ietf_interfaces/bridge_vlan_separation/topology.dot diff --git a/test/case/ietf_interfaces/bridge_vlan_separation/topology.png b/test/case/ietf_interfaces/bridge_vlan_separation/topology.png new file mode 100644 index 000000000..ba3d32a28 Binary files /dev/null and b/test/case/ietf_interfaces/bridge_vlan_separation/topology.png differ diff --git a/test/case/infix_interfaces/dual_bridge/Readme.adoc b/test/case/ietf_interfaces/dual_bridge/Readme.adoc similarity index 86% rename from test/case/infix_interfaces/dual_bridge/Readme.adoc rename to test/case/ietf_interfaces/dual_bridge/Readme.adoc index 2103ec8f2..c981c3e62 100644 --- a/test/case/infix_interfaces/dual_bridge/Readme.adoc +++ b/test/case/ietf_interfaces/dual_bridge/Readme.adoc @@ -4,7 +4,7 @@ Test that it is possible to ping a bridge through a bridge to another bridge ==== Topology ifdef::topdoc[] -image::../../test/case/infix_interfaces/dual_bridge/topology.png[Dual bridges topology] +image::../../test/case/ietf_interfaces/dual_bridge/topology.png[Dual bridges topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] diff --git a/test/case/infix_interfaces/dual_bridge/test.py b/test/case/ietf_interfaces/dual_bridge/test.py similarity index 100% rename from test/case/infix_interfaces/dual_bridge/test.py rename to test/case/ietf_interfaces/dual_bridge/test.py diff --git a/test/case/infix_interfaces/dual_bridge/topology.dot b/test/case/ietf_interfaces/dual_bridge/topology.dot similarity index 100% rename from test/case/infix_interfaces/dual_bridge/topology.dot rename to test/case/ietf_interfaces/dual_bridge/topology.dot diff --git a/test/case/ietf_interfaces/dual_bridge/topology.png b/test/case/ietf_interfaces/dual_bridge/topology.png new file mode 100644 index 000000000..0ad37e5cf Binary files /dev/null and b/test/case/ietf_interfaces/dual_bridge/topology.png differ diff --git a/test/case/ietf_interfaces/ietf_interfaces.yaml b/test/case/ietf_interfaces/ietf_interfaces.yaml index 995ff85ed..533c445a3 100644 --- a/test/case/ietf_interfaces/ietf_interfaces.yaml +++ b/test/case/ietf_interfaces/ietf_interfaces.yaml @@ -16,3 +16,39 @@ - name: routing_basic case: routing_basic/test.py + +- name: bridge_basic + case: bridge_basic/test.py + +- name: bridge_veth + case: bridge_veth/test.py + +- name: dual_bridge + case: dual_bridge/test.py + +- name: bridge_vlan + case: bridge_vlan/test.py + +- name: ipv4_autoconf + case: ipv4_autoconf/test.py + +- name: bridge_fwd_sgl_dut + case: bridge_fwd_sgl_dut/test.py + +- name: bridge_fwd_dual_dut + case: bridge_fwd_dual_dut/test.py + +- name: bridge_vlan_separation + case: bridge_vlan_separation/test.py + +- name: igmp_basic + case: igmp_basic/test.py + +- name: igmp_vlan + case: igmp_vlan/test.py + +- name: static_multicast_filters + case: static_multicast_filters/test.py + +- name: vlan_qos + case: vlan_qos/test.py diff --git a/test/case/infix_interfaces/igmp_basic/Readme.adoc b/test/case/ietf_interfaces/igmp_basic/Readme.adoc similarity index 88% rename from test/case/infix_interfaces/igmp_basic/Readme.adoc rename to test/case/ietf_interfaces/igmp_basic/Readme.adoc index abcda86ed..dbf3de1eb 100644 --- a/test/case/infix_interfaces/igmp_basic/Readme.adoc +++ b/test/case/ietf_interfaces/igmp_basic/Readme.adoc @@ -5,7 +5,7 @@ the flooding stops as soon a join arrives ==== Topology ifdef::topdoc[] -image::../../test/case/infix_interfaces/igmp_basic/topology.png[IGMP basic topology] +image::../../test/case/ietf_interfaces/igmp_basic/topology.png[IGMP basic topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] diff --git a/test/case/infix_interfaces/igmp_basic/test.py b/test/case/ietf_interfaces/igmp_basic/test.py similarity index 100% rename from test/case/infix_interfaces/igmp_basic/test.py rename to test/case/ietf_interfaces/igmp_basic/test.py diff --git a/test/case/infix_interfaces/igmp_basic/topology.dot b/test/case/ietf_interfaces/igmp_basic/topology.dot similarity index 100% rename from test/case/infix_interfaces/igmp_basic/topology.dot rename to test/case/ietf_interfaces/igmp_basic/topology.dot diff --git a/test/case/ietf_interfaces/igmp_basic/topology.png b/test/case/ietf_interfaces/igmp_basic/topology.png new file mode 100644 index 000000000..f5d949672 Binary files /dev/null and b/test/case/ietf_interfaces/igmp_basic/topology.png differ diff --git a/test/case/infix_interfaces/igmp_vlan/Readme.adoc b/test/case/ietf_interfaces/igmp_vlan/Readme.adoc similarity index 87% rename from test/case/infix_interfaces/igmp_vlan/Readme.adoc rename to test/case/ietf_interfaces/igmp_vlan/Readme.adoc index 9bd2c5fc2..3548e8a69 100644 --- a/test/case/infix_interfaces/igmp_vlan/Readme.adoc +++ b/test/case/ietf_interfaces/igmp_vlan/Readme.adoc @@ -4,7 +4,7 @@ Test tagged IGMP control traffic and that VLAN separation is respected for multi ==== Topology ifdef::topdoc[] -image::../../test/case/infix_interfaces/igmp_vlan/topology.png[IGMP VLAN topology] +image::../../test/case/ietf_interfaces/igmp_vlan/topology.png[IGMP VLAN topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] diff --git a/test/case/infix_interfaces/igmp_vlan/test.py b/test/case/ietf_interfaces/igmp_vlan/test.py similarity index 100% rename from test/case/infix_interfaces/igmp_vlan/test.py rename to test/case/ietf_interfaces/igmp_vlan/test.py diff --git a/test/case/infix_interfaces/igmp_vlan/topology.dot b/test/case/ietf_interfaces/igmp_vlan/topology.dot similarity index 100% rename from test/case/infix_interfaces/igmp_vlan/topology.dot rename to test/case/ietf_interfaces/igmp_vlan/topology.dot diff --git a/test/case/ietf_interfaces/igmp_vlan/topology.png b/test/case/ietf_interfaces/igmp_vlan/topology.png new file mode 100644 index 000000000..ae902bc78 Binary files /dev/null and b/test/case/ietf_interfaces/igmp_vlan/topology.png differ diff --git a/test/case/infix_interfaces/ipv4_autoconf/Readme.adoc b/test/case/ietf_interfaces/ipv4_autoconf/Readme.adoc similarity index 83% rename from test/case/infix_interfaces/ipv4_autoconf/Readme.adoc rename to test/case/ietf_interfaces/ipv4_autoconf/Readme.adoc index d5e669bf5..208b8b859 100644 --- a/test/case/infix_interfaces/ipv4_autoconf/Readme.adoc +++ b/test/case/ietf_interfaces/ipv4_autoconf/Readme.adoc @@ -4,7 +4,7 @@ Verifies that linklocal (ZeroConf) work as expected ==== Topology ifdef::topdoc[] -image::../../test/case/infix_interfaces/ipv4_autoconf/topology.png[IPv4 linklocal topology] +image::../../test/case/ietf_interfaces/ipv4_autoconf/topology.png[IPv4 linklocal topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] diff --git a/test/case/infix_interfaces/ipv4_autoconf/test.py b/test/case/ietf_interfaces/ipv4_autoconf/test.py similarity index 100% rename from test/case/infix_interfaces/ipv4_autoconf/test.py rename to test/case/ietf_interfaces/ipv4_autoconf/test.py diff --git a/test/case/infix_interfaces/ipv4_autoconf/topology.dot b/test/case/ietf_interfaces/ipv4_autoconf/topology.dot similarity index 100% rename from test/case/infix_interfaces/ipv4_autoconf/topology.dot rename to test/case/ietf_interfaces/ipv4_autoconf/topology.dot diff --git a/test/case/ietf_interfaces/ipv4_autoconf/topology.png b/test/case/ietf_interfaces/ipv4_autoconf/topology.png new file mode 100644 index 000000000..0ad37e5cf Binary files /dev/null and b/test/case/ietf_interfaces/ipv4_autoconf/topology.png differ diff --git a/test/case/ietf_interfaces/routing_basic/topology.png b/test/case/ietf_interfaces/routing_basic/topology.png index 105a12cde..0d9fdb757 100644 Binary files a/test/case/ietf_interfaces/routing_basic/topology.png and b/test/case/ietf_interfaces/routing_basic/topology.png differ diff --git a/test/case/infix_interfaces/static_multicast_filters/Readme.adoc b/test/case/ietf_interfaces/static_multicast_filters/Readme.adoc similarity index 87% rename from test/case/infix_interfaces/static_multicast_filters/Readme.adoc rename to test/case/ietf_interfaces/static_multicast_filters/Readme.adoc index dfde902bb..5657bb54b 100644 --- a/test/case/infix_interfaces/static_multicast_filters/Readme.adoc +++ b/test/case/ietf_interfaces/static_multicast_filters/Readme.adoc @@ -5,7 +5,7 @@ enabled when using static multicast filters) ==== Topology ifdef::topdoc[] -image::../../test/case/infix_interfaces/static_multicast_filters/topology.png[Static multicast filters topology] +image::../../test/case/ietf_interfaces/static_multicast_filters/topology.png[Static multicast filters topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] diff --git a/test/case/infix_interfaces/static_multicast_filters/test.py b/test/case/ietf_interfaces/static_multicast_filters/test.py similarity index 100% rename from test/case/infix_interfaces/static_multicast_filters/test.py rename to test/case/ietf_interfaces/static_multicast_filters/test.py diff --git a/test/case/infix_interfaces/static_multicast_filters/topology.dot b/test/case/ietf_interfaces/static_multicast_filters/topology.dot similarity index 100% rename from test/case/infix_interfaces/static_multicast_filters/topology.dot rename to test/case/ietf_interfaces/static_multicast_filters/topology.dot diff --git a/test/case/ietf_interfaces/static_multicast_filters/topology.png b/test/case/ietf_interfaces/static_multicast_filters/topology.png new file mode 100644 index 000000000..f5d949672 Binary files /dev/null and b/test/case/ietf_interfaces/static_multicast_filters/topology.png differ diff --git a/test/case/ietf_interfaces/vlan_ping/topology.png b/test/case/ietf_interfaces/vlan_ping/topology.png index 19ebc1bc1..3ba8882d0 100644 Binary files a/test/case/ietf_interfaces/vlan_ping/topology.png and b/test/case/ietf_interfaces/vlan_ping/topology.png differ diff --git a/test/case/infix_interfaces/vlan_qos/Readme.adoc b/test/case/ietf_interfaces/vlan_qos/Readme.adoc similarity index 85% rename from test/case/infix_interfaces/vlan_qos/Readme.adoc rename to test/case/ietf_interfaces/vlan_qos/Readme.adoc index 9ccb4cb0d..9a287cab0 100644 --- a/test/case/infix_interfaces/vlan_qos/Readme.adoc +++ b/test/case/ietf_interfaces/vlan_qos/Readme.adoc @@ -5,7 +5,7 @@ is handled correctly ==== Topology ifdef::topdoc[] -image::../../test/case/infix_interfaces/vlan_qos/topology.png[VLAN QoS topology] +image::../../test/case/ietf_interfaces/vlan_qos/topology.png[VLAN QoS topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] diff --git a/test/case/infix_interfaces/vlan_qos/test.py b/test/case/ietf_interfaces/vlan_qos/test.py similarity index 100% rename from test/case/infix_interfaces/vlan_qos/test.py rename to test/case/ietf_interfaces/vlan_qos/test.py diff --git a/test/case/infix_interfaces/vlan_qos/topology.dot b/test/case/ietf_interfaces/vlan_qos/topology.dot similarity index 100% rename from test/case/infix_interfaces/vlan_qos/topology.dot rename to test/case/ietf_interfaces/vlan_qos/topology.dot diff --git a/test/case/ietf_interfaces/vlan_qos/topology.png b/test/case/ietf_interfaces/vlan_qos/topology.png new file mode 100644 index 000000000..e3a223cdd Binary files /dev/null and b/test/case/ietf_interfaces/vlan_qos/topology.png differ diff --git a/test/case/infix_interfaces/Readme.adoc b/test/case/infix_interfaces/Readme.adoc deleted file mode 100644 index c56620fc7..000000000 --- a/test/case/infix_interfaces/Readme.adoc +++ /dev/null @@ -1,26 +0,0 @@ -:testgroup: -== Infix-interfaces - merge with ietf-interfaces - -<<< - -include::bridge_basic/Readme.adoc[] - -include::bridge_veth/Readme.adoc[] - -include::dual_bridge/Readme.adoc[] - -include::bridge_vlan/Readme.adoc[] - -include::ipv4_autoconf/Readme.adoc[] - -include::bridge_fwd_dual_dut/Readme.adoc[] - -include::bridge_vlan_separation/Readme.adoc[] - -include::igmp_basic/Readme.adoc[] - -include::igmp_vlan/Readme.adoc[] - -include::static_multicast_filters/Readme.adoc[] - -include::vlan_qos/Readme.adoc[] diff --git a/test/case/infix_interfaces/bridge_basic/topology.png b/test/case/infix_interfaces/bridge_basic/topology.png deleted file mode 100644 index 46d8d123d..000000000 Binary files a/test/case/infix_interfaces/bridge_basic/topology.png and /dev/null differ diff --git a/test/case/infix_interfaces/bridge_fwd_dual_dut/topology.png b/test/case/infix_interfaces/bridge_fwd_dual_dut/topology.png deleted file mode 100644 index 4c74bbb08..000000000 Binary files a/test/case/infix_interfaces/bridge_fwd_dual_dut/topology.png and /dev/null differ diff --git a/test/case/infix_interfaces/bridge_fwd_sgl_dut/topology.png b/test/case/infix_interfaces/bridge_fwd_sgl_dut/topology.png deleted file mode 100644 index 93093c119..000000000 Binary files a/test/case/infix_interfaces/bridge_fwd_sgl_dut/topology.png and /dev/null differ diff --git a/test/case/infix_interfaces/bridge_veth/topology.png b/test/case/infix_interfaces/bridge_veth/topology.png deleted file mode 100644 index 938ffe0c7..000000000 Binary files a/test/case/infix_interfaces/bridge_veth/topology.png and /dev/null differ diff --git a/test/case/infix_interfaces/bridge_vlan_separation/topology.png b/test/case/infix_interfaces/bridge_vlan_separation/topology.png deleted file mode 100644 index e587d0975..000000000 Binary files a/test/case/infix_interfaces/bridge_vlan_separation/topology.png and /dev/null differ diff --git a/test/case/infix_interfaces/dual_bridge/topology.png b/test/case/infix_interfaces/dual_bridge/topology.png deleted file mode 100644 index 46d8d123d..000000000 Binary files a/test/case/infix_interfaces/dual_bridge/topology.png and /dev/null differ diff --git a/test/case/infix_interfaces/igmp_basic/topology.png b/test/case/infix_interfaces/igmp_basic/topology.png deleted file mode 100644 index 4bd67689a..000000000 Binary files a/test/case/infix_interfaces/igmp_basic/topology.png and /dev/null differ diff --git a/test/case/infix_interfaces/igmp_vlan/topology.png b/test/case/infix_interfaces/igmp_vlan/topology.png deleted file mode 100644 index ad7082ecc..000000000 Binary files a/test/case/infix_interfaces/igmp_vlan/topology.png and /dev/null differ diff --git a/test/case/infix_interfaces/infix_interfaces.yaml b/test/case/infix_interfaces/infix_interfaces.yaml deleted file mode 100644 index 5b77915e1..000000000 --- a/test/case/infix_interfaces/infix_interfaces.yaml +++ /dev/null @@ -1,36 +0,0 @@ ---- -- name: bridge_basic - case: bridge_basic/test.py - -- name: bridge_veth - case: bridge_veth/test.py - -- name: dual_bridge - case: dual_bridge/test.py - -- name: bridge_vlan - case: bridge_vlan/test.py - -- name: ipv4_autoconf - case: ipv4_autoconf/test.py - -- name: bridge_fwd_sgl_dut - case: bridge_fwd_sgl_dut/test.py - -- name: bridge_fwd_dual_dut - case: bridge_fwd_dual_dut/test.py - -- name: bridge_vlan_separation - case: bridge_vlan_separation/test.py - -- name: igmp_basic - case: igmp_basic/test.py - -- name: igmp_vlan - case: igmp_vlan/test.py - -- name: static_multicast_filters - case: static_multicast_filters/test.py - -- name: vlan_qos - case: vlan_qos/test.py diff --git a/test/case/infix_interfaces/ipv4_autoconf/topology.png b/test/case/infix_interfaces/ipv4_autoconf/topology.png deleted file mode 100644 index 46d8d123d..000000000 Binary files a/test/case/infix_interfaces/ipv4_autoconf/topology.png and /dev/null differ diff --git a/test/case/infix_interfaces/static_multicast_filters/topology.png b/test/case/infix_interfaces/static_multicast_filters/topology.png deleted file mode 100644 index 4bd67689a..000000000 Binary files a/test/case/infix_interfaces/static_multicast_filters/topology.png and /dev/null differ diff --git a/test/case/infix_interfaces/vlan_qos/topology.png b/test/case/infix_interfaces/vlan_qos/topology.png deleted file mode 100644 index 60ac74fef..000000000 Binary files a/test/case/infix_interfaces/vlan_qos/topology.png and /dev/null differ diff --git a/test/spec/Readme.adoc b/test/spec/Readme.adoc index ec32fdc7c..17a747449 100644 --- a/test/spec/Readme.adoc +++ b/test/spec/Readme.adoc @@ -25,9 +25,6 @@ include::../case/ietf_interfaces/Readme.adoc[] <<< -include::../case/infix_interfaces/Readme.adoc[] -<<< - include::../case/ietf_routing/Readme.adoc[] <<< diff --git a/test/spec/Readme.adoc.in b/test/spec/Readme.adoc.in index bc1c3a394..1c0e62cce 100644 --- a/test/spec/Readme.adoc.in +++ b/test/spec/Readme.adoc.in @@ -25,9 +25,6 @@ include::../case/ietf_interfaces/Readme.adoc[] <<< -include::../case/infix_interfaces/Readme.adoc[] -<<< - include::../case/ietf_routing/Readme.adoc[] <<<