test: case: Move infix_interfaces into ietf-interfaces

This is how all other models are handled, the topmodel is naming the test directory
kernelkit · Sep 17, 2024 · a533b87 · a533b87
1 parent c8d87b9
commit a533b87
Show file tree

Hide file tree

Showing 67 changed files with 49 additions and 84 deletions.
diff --git 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/...infix_interfaces/bridge_basic/Readme.adoc → .../ietf_interfaces/bridge_basic/Readme.adoc b/...infix_interfaces/bridge_basic/Readme.adoc → .../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/...ase/infix_interfaces/bridge_basic/test.py → ...case/ietf_interfaces/bridge_basic/test.py b/...ase/infix_interfaces/bridge_basic/test.py → ...case/ietf_interfaces/bridge_basic/test.py
diff --git a/...nfix_interfaces/bridge_basic/topology.dot → ...ietf_interfaces/bridge_basic/topology.dot b/...nfix_interfaces/bridge_basic/topology.dot → ...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
diff --git a/...nterfaces/bridge_fwd_dual_dut/Readme.adoc → ...nterfaces/bridge_fwd_dual_dut/Readme.adoc b/...nterfaces/bridge_fwd_dual_dut/Readme.adoc → ...nterfaces/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/...ix_interfaces/bridge_fwd_dual_dut/test.py → ...tf_interfaces/bridge_fwd_dual_dut/test.py b/...ix_interfaces/bridge_fwd_dual_dut/test.py → ...tf_interfaces/bridge_fwd_dual_dut/test.py
diff --git a/...terfaces/bridge_fwd_dual_dut/topology.dot → ...terfaces/bridge_fwd_dual_dut/topology.dot b/...terfaces/bridge_fwd_dual_dut/topology.dot → ...terfaces/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
diff --git a/...interfaces/bridge_fwd_sgl_dut/Readme.adoc → ...interfaces/bridge_fwd_sgl_dut/Readme.adoc b/...interfaces/bridge_fwd_sgl_dut/Readme.adoc → ...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/...fix_interfaces/bridge_fwd_sgl_dut/test.py → ...etf_interfaces/bridge_fwd_sgl_dut/test.py b/...fix_interfaces/bridge_fwd_sgl_dut/test.py → ...etf_interfaces/bridge_fwd_sgl_dut/test.py
diff --git a/...nterfaces/bridge_fwd_sgl_dut/topology.dot → ...nterfaces/bridge_fwd_sgl_dut/topology.dot b/...nterfaces/bridge_fwd_sgl_dut/topology.dot → ...nterfaces/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
diff --git a/.../infix_interfaces/bridge_veth/Readme.adoc → ...e/ietf_interfaces/bridge_veth/Readme.adoc b/.../infix_interfaces/bridge_veth/Readme.adoc → ...e/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/...case/infix_interfaces/bridge_veth/test.py → .../case/ietf_interfaces/bridge_veth/test.py b/...case/infix_interfaces/bridge_veth/test.py → .../case/ietf_interfaces/bridge_veth/test.py
diff --git a/...infix_interfaces/bridge_veth/topology.dot → .../ietf_interfaces/bridge_veth/topology.dot b/...infix_interfaces/bridge_veth/topology.dot → .../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
diff --git a/.../infix_interfaces/bridge_vlan/Readme.adoc → ...e/ietf_interfaces/bridge_vlan/Readme.adoc b/.../infix_interfaces/bridge_vlan/Readme.adoc → ...e/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/...case/infix_interfaces/bridge_vlan/test.py → .../case/ietf_interfaces/bridge_vlan/test.py b/...case/infix_interfaces/bridge_vlan/test.py → .../case/ietf_interfaces/bridge_vlan/test.py
diff --git a/...infix_interfaces/bridge_vlan/topology.dot → .../ietf_interfaces/bridge_vlan/topology.dot b/...infix_interfaces/bridge_vlan/topology.dot → .../ietf_interfaces/bridge_vlan/topology.dot
diff --git a/...infix_interfaces/bridge_vlan/topology.png → .../ietf_interfaces/bridge_vlan/topology.png b/...infix_interfaces/bridge_vlan/topology.png → .../ietf_interfaces/bridge_vlan/topology.png
diff --git a/...rfaces/bridge_vlan_separation/Readme.adoc → ...rfaces/bridge_vlan_separation/Readme.adoc b/...rfaces/bridge_vlan_separation/Readme.adoc → ...rfaces/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/...interfaces/bridge_vlan_separation/test.py → ...interfaces/bridge_vlan_separation/test.py b/...interfaces/bridge_vlan_separation/test.py → ...interfaces/bridge_vlan_separation/test.py
diff --git a/...faces/bridge_vlan_separation/topology.dot → ...faces/bridge_vlan_separation/topology.dot b/...faces/bridge_vlan_separation/topology.dot → ...faces/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
diff --git a/.../infix_interfaces/dual_bridge/Readme.adoc → ...e/ietf_interfaces/dual_bridge/Readme.adoc b/.../infix_interfaces/dual_bridge/Readme.adoc → ...e/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/...case/infix_interfaces/dual_bridge/test.py → .../case/ietf_interfaces/dual_bridge/test.py b/...case/infix_interfaces/dual_bridge/test.py → .../case/ietf_interfaces/dual_bridge/test.py
diff --git a/...infix_interfaces/dual_bridge/topology.dot → .../ietf_interfaces/dual_bridge/topology.dot b/...infix_interfaces/dual_bridge/topology.dot → .../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
diff --git 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/...e/infix_interfaces/igmp_basic/Readme.adoc → ...se/ietf_interfaces/igmp_basic/Readme.adoc b/...e/infix_interfaces/igmp_basic/Readme.adoc → ...se/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/.../case/infix_interfaces/igmp_basic/test.py → test/case/ietf_interfaces/igmp_basic/test.py b/.../case/infix_interfaces/igmp_basic/test.py → test/case/ietf_interfaces/igmp_basic/test.py
diff --git a/.../infix_interfaces/igmp_basic/topology.dot → ...e/ietf_interfaces/igmp_basic/topology.dot b/.../infix_interfaces/igmp_basic/topology.dot → ...e/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
diff --git a/...se/infix_interfaces/igmp_vlan/Readme.adoc → ...ase/ietf_interfaces/igmp_vlan/Readme.adoc b/...se/infix_interfaces/igmp_vlan/Readme.adoc → ...ase/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 → test/case/ietf_interfaces/igmp_vlan/test.py b/test/case/infix_interfaces/igmp_vlan/test.py → test/case/ietf_interfaces/igmp_vlan/test.py
diff --git a/...e/infix_interfaces/igmp_vlan/topology.dot → ...se/ietf_interfaces/igmp_vlan/topology.dot b/...e/infix_interfaces/igmp_vlan/topology.dot → ...se/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
diff --git a/...nfix_interfaces/ipv4_autoconf/Readme.adoc → ...ietf_interfaces/ipv4_autoconf/Readme.adoc b/...nfix_interfaces/ipv4_autoconf/Readme.adoc → ...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/...se/infix_interfaces/ipv4_autoconf/test.py → ...ase/ietf_interfaces/ipv4_autoconf/test.py b/...se/infix_interfaces/ipv4_autoconf/test.py → ...ase/ietf_interfaces/ipv4_autoconf/test.py
diff --git a/...fix_interfaces/ipv4_autoconf/topology.dot → ...etf_interfaces/ipv4_autoconf/topology.dot b/...fix_interfaces/ipv4_autoconf/topology.dot → ...etf_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
diff --git a/test/case/ietf_interfaces/routing_basic/topology.png b/test/case/ietf_interfaces/routing_basic/topology.png
diff --git a/...aces/static_multicast_filters/Readme.adoc → ...aces/static_multicast_filters/Readme.adoc b/...aces/static_multicast_filters/Readme.adoc → ...aces/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/...terfaces/static_multicast_filters/test.py → ...terfaces/static_multicast_filters/test.py b/...terfaces/static_multicast_filters/test.py → ...terfaces/static_multicast_filters/test.py
diff --git a/...ces/static_multicast_filters/topology.dot → ...ces/static_multicast_filters/topology.dot b/...ces/static_multicast_filters/topology.dot → ...ces/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
diff --git a/test/case/ietf_interfaces/vlan_ping/topology.png b/test/case/ietf_interfaces/vlan_ping/topology.png
diff --git a/...ase/infix_interfaces/vlan_qos/Readme.adoc → ...case/ietf_interfaces/vlan_qos/Readme.adoc b/...ase/infix_interfaces/vlan_qos/Readme.adoc → ...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 → test/case/ietf_interfaces/vlan_qos/test.py b/test/case/infix_interfaces/vlan_qos/test.py → test/case/ietf_interfaces/vlan_qos/test.py
diff --git a/...se/infix_interfaces/vlan_qos/topology.dot → ...ase/ietf_interfaces/vlan_qos/topology.dot b/...se/infix_interfaces/vlan_qos/topology.dot → ...ase/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
diff --git a/test/case/infix_interfaces/Readme.adoc b/test/case/infix_interfaces/Readme.adoc
diff --git a/test/case/infix_interfaces/bridge_basic/topology.png b/test/case/infix_interfaces/bridge_basic/topology.png
diff --git a/test/case/infix_interfaces/bridge_fwd_dual_dut/topology.png b/test/case/infix_interfaces/bridge_fwd_dual_dut/topology.png
diff --git a/test/case/infix_interfaces/bridge_fwd_sgl_dut/topology.png b/test/case/infix_interfaces/bridge_fwd_sgl_dut/topology.png
diff --git a/test/case/infix_interfaces/bridge_veth/topology.png b/test/case/infix_interfaces/bridge_veth/topology.png
diff --git a/test/case/infix_interfaces/bridge_vlan_separation/topology.png b/test/case/infix_interfaces/bridge_vlan_separation/topology.png
diff --git a/test/case/infix_interfaces/dual_bridge/topology.png b/test/case/infix_interfaces/dual_bridge/topology.png
diff --git a/test/case/infix_interfaces/igmp_basic/topology.png b/test/case/infix_interfaces/igmp_basic/topology.png
diff --git a/test/case/infix_interfaces/igmp_vlan/topology.png b/test/case/infix_interfaces/igmp_vlan/topology.png
diff --git a/test/case/infix_interfaces/infix_interfaces.yaml b/test/case/infix_interfaces/infix_interfaces.yaml
diff --git a/test/case/infix_interfaces/ipv4_autoconf/topology.png b/test/case/infix_interfaces/ipv4_autoconf/topology.png
diff --git a/test/case/infix_interfaces/static_multicast_filters/topology.png b/test/case/infix_interfaces/static_multicast_filters/topology.png
diff --git a/test/case/infix_interfaces/vlan_qos/topology.png b/test/case/infix_interfaces/vlan_qos/topology.png
diff --git 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
@@ -25,9 +25,6 @@ include::../case/ietf_interfaces/Readme.adoc[]
 
 <<<
 
-include::../case/infix_interfaces/Readme.adoc[]
-<<<
-
 include::../case/ietf_routing/Readme.adoc[]
 
 <<<