test: Reorganize infix_services test

test/case/infix_services/Readme.adoc

@@ -3,16 +3,16 @@
 
 <<<
 
-include::mdns_enable_disable/Readme.adoc[]
+include::mdns/mdns_enable_disable/Readme.adoc[]
 
-include::mdns_allow_deny/Readme.adoc[]
+include::mdns/mdns_allow_deny/Readme.adoc[]
 
-include::lldp_enable_disable/Readme.adoc[]
+include::lldp/lldp_enable_disable/Readme.adoc[]
 
-include::lldp_admin_status/Readme.adoc[]
+include::lldp/lldp_admin_status/Readme.adoc[]
 
-include::lldp_ieee_group_forward/Readme.adoc[]
+include::lldp/lldp_ieee_group_forward/Readme.adoc[]
 
-include::ssh_server_config/Readme.adoc[]
+include::ssh/ssh_server_config/Readme.adoc[]
 
-include::ssh_key_authentication/Readme.adoc[]
+include::ssh/ssh_key_authentication/Readme.adoc[]

test/case/infix_services/infix_services.yaml

@@ -1,9 +1,9 @@
 ---
 - name: lldp
-  suite: lldp.yaml
+  suite: lldp/lldp.yaml
 
 - name: mdns
-  suite: mdns.yaml
+  suite: mdns/mdns.yaml
 
 - name: ssh
-  suite: ssh.yaml
+  suite: ssh/ssh.yaml

test/case/infix_services/lldp/lldp_admin_status/lldp_admin_status.adoc

@@ -4,11 +4,11 @@ Verify that LLDP admin status is set properly by lldpd
 
 ==== Topology
 ifdef::topdoc[]
-image::{topdoc}../../test/case/infix_services/lldp_admin_status/topology.svg[LLDP admin status topology]
+image::{topdoc}../../test/case/infix_services/lldp/lldp_admin_status/topology.svg[LLDP admin status topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lldp_admin_status/topology.svg[LLDP admin status topology]
+image::lldp/lldp_admin_status/topology.svg[LLDP admin status topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.svg[LLDP admin status topology]

test/case/infix_services/lldp/lldp_enable_disable/lldp_enable_disable.adoc

@@ -5,11 +5,11 @@ Operation and non-operation are confirmed using tcpdump.
 
 ==== Topology
 ifdef::topdoc[]
-image::{topdoc}../../test/case/infix_services/lldp_enable_disable/topology.svg[LLDP enable disable topology]
+image::{topdoc}../../test/case/infix_services/lldp/lldp_enable_disable/topology.svg[LLDP enable disable topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lldp_enable_disable/topology.svg[LLDP enable disable topology]
+image::lldp/lldp_enable_disable/topology.svg[LLDP enable disable topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.svg[LLDP enable disable topology]

test/case/infix_services/lldp/lldp_ieee_group_forward/lldp_ieee_group_forward.adoc

@@ -5,11 +5,11 @@ Operation and non-operation are confirmed using tcpdump.
 
 ==== Topology
 ifdef::topdoc[]
-image::{topdoc}../../test/case/infix_services/lldp_ieee_group_forward/topology.svg[LLDP IEEE Group Forward topology]
+image::{topdoc}../../test/case/infix_services/lldp/lldp_ieee_group_forward/topology.svg[LLDP IEEE Group Forward topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lldp_ieee_group_forward/topology.svg[LLDP IEEE Group Forward topology]
+image::lldp/lldp_ieee_group_forward/topology.svg[LLDP IEEE Group Forward topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.svg[LLDP IEEE Group Forward topology]
@@ -17,8 +17,7 @@ endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
 . Set up topology and attach to target DUT
-. Enable target interfaces and create bridge
-. Disable LLDP on target
+. Configure interfaces and disable LLDP daemon
 . Verify LLDP absence on host:data2
 . Enable LLDP flooding by setting group forward
 . Verify LLDP arrival on host:data2

test/case/infix_services/mdns/mdns_allow_deny/mdns_allow_deny.adoc

@@ -10,11 +10,11 @@ with three scenarios:
 
 ==== Topology
 ifdef::topdoc[]
-image::{topdoc}../../test/case/infix_services/mdns_allow_deny/topology.svg[mDNS allow/deny interfaces topology]
+image::{topdoc}../../test/case/infix_services/mdns/mdns_allow_deny/topology.svg[mDNS allow/deny interfaces topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::mdns_allow_deny/topology.svg[mDNS allow/deny interfaces topology]
+image::mdns/mdns_allow_deny/topology.svg[mDNS allow/deny interfaces topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.svg[mDNS allow/deny interfaces topology]

test/case/infix_services/mdns/mdns_enable_disable/mdns_enable_disable.adoc

@@ -5,11 +5,11 @@ Operation and non-operation are confirmed using tcpdump.
 
 ==== Topology
 ifdef::topdoc[]
-image::{topdoc}../../test/case/infix_services/mdns_enable_disable/topology.svg[mDNS enable disable topology]
+image::{topdoc}../../test/case/infix_services/mdns/mdns_enable_disable/topology.svg[mDNS enable disable topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::mdns_enable_disable/topology.svg[mDNS enable disable topology]
+image::mdns/mdns_enable_disable/topology.svg[mDNS enable disable topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.svg[mDNS enable disable topology]

test/case/infix_services/ssh/ssh_key_authentication/ssh_key_authentication.adoc

@@ -4,11 +4,11 @@ Verify that 'guest' user can fetch data using only the 'public' key
 
 ==== Topology
 ifdef::topdoc[]
-image::{topdoc}../../test/case/infix_services/ssh_key_authentication/topology.svg[Generate ssh key pair topology]
+image::{topdoc}../../test/case/infix_services/ssh/ssh_key_authentication/topology.svg[Generate ssh key pair topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::ssh_key_authentication/topology.svg[Generate ssh key pair topology]
+image::ssh/ssh_key_authentication/topology.svg[Generate ssh key pair topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.svg[Generate ssh key pair topology]

test/case/infix_services/ssh/ssh_key_authentication/topology.dot

@@ -0,0 +1 @@
+../../../../infamy/topologies/1x1.dot

test/case/infix_services/ssh/ssh_server_config/ssh_server_config.adoc

@@ -7,11 +7,11 @@ Test SSH server functionality with pre-defined key pair:
 
 ==== Topology
 ifdef::topdoc[]
-image::{topdoc}../../test/case/infix_services/ssh_server_config/topology.svg[SSH server configuration topology]
+image::{topdoc}../../test/case/infix_services/ssh/ssh_server_config/topology.svg[SSH server configuration topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::ssh_server_config/topology.svg[SSH server configuration topology]
+image::ssh/ssh_server_config/topology.svg[SSH server configuration topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.svg[SSH server configuration topology]

test/case/infix_services/ssh/ssh_server_config/topology.dot

@@ -0,0 +1 @@
+../../../../infamy/topologies/1x3.dot

test/case/infix_services/ssh_key_authentication/topology.dot

@@ -1 +0,0 @@
-../../../infamy/topologies/1x1.dot

test/case/infix_services/ssh_server_config/topology.dot

@@ -1 +0,0 @@
-../../../infamy/topologies/1x3.dot