test: case: Move infix_interfaces into ietf-interfaces

This is how all other models are handled, the topmodel is naming the
test directory

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

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[]

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[]

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[]

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[]

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[]

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[]

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[]

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

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[]

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[]

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[]

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[]

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[]

test/case/infix_interfaces/Readme.adoc

@@ -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[]

test/case/infix_interfaces/infix_interfaces.yaml

@@ -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

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[]
 
 <<<

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[]
 
 <<<