Merge pull request #965 from kernelkit/split-test-to-suites

Split test to suites

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

test/case/ietf_interfaces/bridge.yaml

@@ -0,0 +1,22 @@
+---
+
+- 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_stp_basic
+  case: bridge_stp_basic/test.py
+
+- name: bridge_vlan_separation
+  case: bridge_vlan_separation/test.py
+
+- name: bridge_basic
+  case: bridge_basic/test.py
+
+- name: bridge_veth
+  case: bridge_veth/test.py
+
+- name: bridge_vlan
+  case: bridge_vlan/test.py

test/case/ietf_interfaces/bridge_vlan/bridge_vlan.adoc

@@ -5,7 +5,7 @@ which in turn untags one VLAN outisde a non-VLAN filtering bridge.
 
 .Logical network setup
 ifdef::topdoc[]
-image::{topdoc}../../test/case/ietf_interfaces/bridge_vlan/bridge-vlan.svg[]
+image::../../test/case/ietf_interfaces/bridge_vlan/bridge-vlan.svg[]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]

test/case/ietf_interfaces/ietf_interfaces.yaml

@@ -17,51 +17,6 @@
 - 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: veth_delete
-  case: veth_delete/test.py
-
-- name: ipv4_autoconf
-  case: ipv4_autoconf/test.py
-
-- name: lag_basic
-  case: lag_basic/test.py
-
-- name: lag_failure
-  case: lag_failure/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_stp_basic
-  case: bridge_stp_basic/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
 
@@ -74,8 +29,20 @@
 - name: vlan_iface_termination
   case: vlan_iface_termination/test.py
 
-- name: tunnel_basic
-  suite: tunnel_basic/test.yaml
+- name: veth_delete
+  case: veth_delete/test.py
 
-- name: tunnel_bridged
-  suite: tunnel_bridged/test.yaml
+- name: ipv4_autoconf
+  case: ipv4_autoconf/test.py
+
+- name: bridge
+  suite: bridge.yaml
+
+- name: link_aggregation
+  suite: lag.yaml
+
+- name: igmp
+  suite: igmp.yaml
+
+- name: tunnels
+  suite: tunnels.yaml

test/case/ietf_interfaces/igmp.yaml

@@ -0,0 +1,9 @@
+---
+- 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

test/case/ietf_interfaces/lag.yaml

@@ -0,0 +1,5 @@
+---
+- name: lag_basic
+  case: lag_basic/test.py
+- name: lag_failure
+  case: lag_failure/test.py

test/case/ietf_interfaces/lag_basic/lag_basic.adoc

@@ -5,7 +5,7 @@ modes during basic failure scenarios.
 
 .Internal network setup, PC verifies connectivity with dut2 via dut1
 ifdef::topdoc[]
-image::{topdoc}../../test/case/ietf_interfaces/lag_basic/lag-basic.svg[Internal networks]
+image::../../test/case/ietf_interfaces/lag_basic/lag-basic.svg[Internal networks]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]

test/case/ietf_interfaces/lag_failure/lag_failure.adoc

@@ -5,7 +5,7 @@ links stop forwarding traffic, without carrier loss.
 
 .Logical network setup, link breakers (lb1 & lb2) here managed by host PC
 ifdef::topdoc[]
-image::{topdoc}../../test/case/ietf_interfaces/lag_failure/lag-failure.svg[]
+image::../../test/case/ietf_interfaces/lag_failure/lag-failure.svg[]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]

test/case/ietf_interfaces/tunnels.yaml

@@ -0,0 +1,6 @@
+---
+- name: tunnel_basic
+  suite: tunnel_basic/test.yaml
+
+- name: tunnel_bridged
+  suite: tunnel_bridged/test.yaml

test/case/infix_dhcp/dhcp_client.yaml

@@ -0,0 +1,9 @@
+---
+- name: client_basic
+  case: client_basic/test.py
+
+- name: client_default_gw
+  case: client_default_gw/test.py
+
+- name: client_routes
+  case: client_routes/test.py

test/case/infix_dhcp/dhcp_server.yaml

@@ -0,0 +1,9 @@
+---
+- name: server_basic
+  case: server_basic/test.py
+
+- name: server_host
+  case: server_host/test.py
+
+- name: server_subnets
+  case: server_subnets/test.py

test/case/infix_dhcp/infix_dhcp.yaml

@@ -1,18 +1,6 @@
 ---
-- name: client_basic
-  case: client_basic/test.py
+- name: dhcp_client
+  suite: dhcp_client.yaml
 
-- name: client_default_gw
-  case: client_default_gw/test.py
-
-- name: client_routes
-  case: client_routes/test.py
-
-- name: server_basic
-  case: server_basic/test.py
-
-- name: server_host
-  case: server_host/test.py
-
-- name: server_subnets
-  case: server_subnets/test.py
+- name: dhcp_server
+  suite: dhcp_server.yaml

test/case/infix_dhcp/server_subnets/server_subnets.adoc

@@ -7,7 +7,7 @@ subnets.
 
 .Internal network setup, client2 and client3 are on the same LAN
 ifdef::topdoc[]
-image::{topdoc}../../test/case/infix_dhcp/server_subnets/dhcp-subnets.svg[Internal networks]
+image::../../test/case/infix_dhcp/server_subnets/dhcp-subnets.svg[Internal networks]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]

test/case/infix_services/infix_services.yaml

@@ -1,18 +1,9 @@
 ---
-- name: lldp_enable_disable
-  case: lldp_enable_disable/test.py
+- name: lldp
+  suite: lldp.yaml
 
-- name: lldp_admin_status
-  case: lldp_admin_status/test.py
+- name: mdns
+  suite: mdns.yaml
 
-- name: mdns_enable_disable
-  case: mdns_enable_disable/test.py
-
-- name: mdns_allow_deny
-  case: mdns_allow_deny/test.py
-
-- name: ssh_server_config
-  case: ssh_server_config/test.py
-
-- name: ssh_key_authentication
-  case: ssh_key_authentication/test.py
+- name: ssh
+  suite: ssh.yaml

test/case/infix_services/lldp.yaml

@@ -0,0 +1,6 @@
+---
+- name: lldp_enable_disable
+  case: lldp_enable_disable/test.py
+
+- name: lldp_admin_status
+  case: lldp_admin_status/test.py

test/case/infix_services/mdns.yaml

@@ -0,0 +1,6 @@
+---
+- name: mdns_enable_disable
+  case: mdns_enable_disable/test.py
+
+- name: mdns_allow_deny
+  case: mdns_allow_deny/test.py

test/case/infix_services/ssh.yaml

@@ -0,0 +1,6 @@
+---
+- name: ssh_server_config
+  case: ssh_server_config/test.py
+
+- name: ssh_key_authentication
+  case: ssh_key_authentication/test.py

test/case/use_case/ospf_container/ospf_container.adoc

@@ -10,7 +10,7 @@ PC, which can act as a link breaker.
 .Use-case overview.
 [#img-overview]
 ifdef::topdoc[]
-image::{topdoc}../../test/case/use_case/ospf_container/overview.svg[]
+image::../../test/case/use_case/ospf_container/overview.svg[]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
@@ -51,7 +51,7 @@ second bridge, `br1`, only use IPv6 link-local addresses.
 .Internal network setup, here router R1 on subnet 10.1.1.1/24.
 [#img-setup]
 ifdef::topdoc[]
-image::{topdoc}../../test/case/use_case/ospf_container/internal-network.svg[Internal networks]
+image::../../test/case/use_case/ospf_container/internal-network.svg[Internal networks]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]