diff --git a/test/case/infix_services/Readme.adoc b/test/case/infix_services/Readme.adoc index be8577d0..67c61268 100644 --- a/test/case/infix_services/Readme.adoc +++ b/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[] diff --git a/test/case/infix_services/infix_services.yaml b/test/case/infix_services/infix_services.yaml index eb5568f6..43ab99f5 100644 --- a/test/case/infix_services/infix_services.yaml +++ b/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 diff --git a/test/case/infix_services/lldp.yaml b/test/case/infix_services/lldp/lldp.yaml similarity index 100% rename from test/case/infix_services/lldp.yaml rename to test/case/infix_services/lldp/lldp.yaml diff --git a/test/case/infix_services/lldp_admin_status/Readme.adoc b/test/case/infix_services/lldp/lldp_admin_status/Readme.adoc similarity index 100% rename from test/case/infix_services/lldp_admin_status/Readme.adoc rename to test/case/infix_services/lldp/lldp_admin_status/Readme.adoc diff --git a/test/case/infix_services/lldp_admin_status/lldp_admin_status.adoc b/test/case/infix_services/lldp/lldp_admin_status/lldp_admin_status.adoc similarity index 75% rename from test/case/infix_services/lldp_admin_status/lldp_admin_status.adoc rename to test/case/infix_services/lldp/lldp_admin_status/lldp_admin_status.adoc index 9a865876..24d351fe 100644 --- a/test/case/infix_services/lldp_admin_status/lldp_admin_status.adoc +++ b/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] diff --git a/test/case/infix_services/lldp_admin_status/test.py b/test/case/infix_services/lldp/lldp_admin_status/test.py similarity index 100% rename from test/case/infix_services/lldp_admin_status/test.py rename to test/case/infix_services/lldp/lldp_admin_status/test.py diff --git a/test/case/infix_services/lldp_admin_status/topology.dot b/test/case/infix_services/lldp/lldp_admin_status/topology.dot similarity index 100% rename from test/case/infix_services/lldp_admin_status/topology.dot rename to test/case/infix_services/lldp/lldp_admin_status/topology.dot diff --git a/test/case/infix_services/lldp_admin_status/topology.svg b/test/case/infix_services/lldp/lldp_admin_status/topology.svg similarity index 100% rename from test/case/infix_services/lldp_admin_status/topology.svg rename to test/case/infix_services/lldp/lldp_admin_status/topology.svg diff --git a/test/case/infix_services/lldp_enable_disable/Readme.adoc b/test/case/infix_services/lldp/lldp_enable_disable/Readme.adoc similarity index 100% rename from test/case/infix_services/lldp_enable_disable/Readme.adoc rename to test/case/infix_services/lldp/lldp_enable_disable/Readme.adoc diff --git a/test/case/infix_services/lldp_enable_disable/lldp_enable_disable.adoc b/test/case/infix_services/lldp/lldp_enable_disable/lldp_enable_disable.adoc similarity index 75% rename from test/case/infix_services/lldp_enable_disable/lldp_enable_disable.adoc rename to test/case/infix_services/lldp/lldp_enable_disable/lldp_enable_disable.adoc index 7d333f04..1884dedc 100644 --- a/test/case/infix_services/lldp_enable_disable/lldp_enable_disable.adoc +++ b/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] diff --git a/test/case/infix_services/lldp_enable_disable/test.py b/test/case/infix_services/lldp/lldp_enable_disable/test.py similarity index 100% rename from test/case/infix_services/lldp_enable_disable/test.py rename to test/case/infix_services/lldp/lldp_enable_disable/test.py diff --git a/test/case/infix_services/lldp_enable_disable/topology.dot b/test/case/infix_services/lldp/lldp_enable_disable/topology.dot similarity index 100% rename from test/case/infix_services/lldp_enable_disable/topology.dot rename to test/case/infix_services/lldp/lldp_enable_disable/topology.dot diff --git a/test/case/infix_services/lldp_enable_disable/topology.svg b/test/case/infix_services/lldp/lldp_enable_disable/topology.svg similarity index 100% rename from test/case/infix_services/lldp_enable_disable/topology.svg rename to test/case/infix_services/lldp/lldp_enable_disable/topology.svg diff --git a/test/case/infix_services/lldp_ieee_group_forward/Readme.adoc b/test/case/infix_services/lldp/lldp_ieee_group_forward/Readme.adoc similarity index 100% rename from test/case/infix_services/lldp_ieee_group_forward/Readme.adoc rename to test/case/infix_services/lldp/lldp_ieee_group_forward/Readme.adoc diff --git a/test/case/infix_services/lldp_ieee_group_forward/lldp_ieee_group_forward.adoc b/test/case/infix_services/lldp/lldp_ieee_group_forward/lldp_ieee_group_forward.adoc similarity index 68% rename from test/case/infix_services/lldp_ieee_group_forward/lldp_ieee_group_forward.adoc rename to test/case/infix_services/lldp/lldp_ieee_group_forward/lldp_ieee_group_forward.adoc index d7d5c266..7d9df613 100644 --- a/test/case/infix_services/lldp_ieee_group_forward/lldp_ieee_group_forward.adoc +++ b/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 diff --git a/test/case/infix_services/lldp_ieee_group_forward/test.py b/test/case/infix_services/lldp/lldp_ieee_group_forward/test.py similarity index 100% rename from test/case/infix_services/lldp_ieee_group_forward/test.py rename to test/case/infix_services/lldp/lldp_ieee_group_forward/test.py diff --git a/test/case/infix_services/lldp_ieee_group_forward/topology.dot b/test/case/infix_services/lldp/lldp_ieee_group_forward/topology.dot similarity index 100% rename from test/case/infix_services/lldp_ieee_group_forward/topology.dot rename to test/case/infix_services/lldp/lldp_ieee_group_forward/topology.dot diff --git a/test/case/infix_services/lldp_ieee_group_forward/topology.svg b/test/case/infix_services/lldp/lldp_ieee_group_forward/topology.svg similarity index 100% rename from test/case/infix_services/lldp_ieee_group_forward/topology.svg rename to test/case/infix_services/lldp/lldp_ieee_group_forward/topology.svg diff --git a/test/case/infix_services/mdns.yaml b/test/case/infix_services/mdns/mdns.yaml similarity index 100% rename from test/case/infix_services/mdns.yaml rename to test/case/infix_services/mdns/mdns.yaml diff --git a/test/case/infix_services/mdns_allow_deny/Readme.adoc b/test/case/infix_services/mdns/mdns_allow_deny/Readme.adoc similarity index 100% rename from test/case/infix_services/mdns_allow_deny/Readme.adoc rename to test/case/infix_services/mdns/mdns_allow_deny/Readme.adoc diff --git a/test/case/infix_services/mdns_allow_deny/mdns_allow_deny.adoc b/test/case/infix_services/mdns/mdns_allow_deny/mdns_allow_deny.adoc similarity index 80% rename from test/case/infix_services/mdns_allow_deny/mdns_allow_deny.adoc rename to test/case/infix_services/mdns/mdns_allow_deny/mdns_allow_deny.adoc index ee1cadb9..6fcb2732 100644 --- a/test/case/infix_services/mdns_allow_deny/mdns_allow_deny.adoc +++ b/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] diff --git a/test/case/infix_services/mdns_allow_deny/test.py b/test/case/infix_services/mdns/mdns_allow_deny/test.py similarity index 100% rename from test/case/infix_services/mdns_allow_deny/test.py rename to test/case/infix_services/mdns/mdns_allow_deny/test.py diff --git a/test/case/infix_services/mdns_allow_deny/topology.dot b/test/case/infix_services/mdns/mdns_allow_deny/topology.dot similarity index 100% rename from test/case/infix_services/mdns_allow_deny/topology.dot rename to test/case/infix_services/mdns/mdns_allow_deny/topology.dot diff --git a/test/case/infix_services/mdns_allow_deny/topology.svg b/test/case/infix_services/mdns/mdns_allow_deny/topology.svg similarity index 100% rename from test/case/infix_services/mdns_allow_deny/topology.svg rename to test/case/infix_services/mdns/mdns_allow_deny/topology.svg diff --git a/test/case/infix_services/mdns_enable_disable/Readme.adoc b/test/case/infix_services/mdns/mdns_enable_disable/Readme.adoc similarity index 100% rename from test/case/infix_services/mdns_enable_disable/Readme.adoc rename to test/case/infix_services/mdns/mdns_enable_disable/Readme.adoc diff --git a/test/case/infix_services/mdns_enable_disable/mdns_enable_disable.adoc b/test/case/infix_services/mdns/mdns_enable_disable/mdns_enable_disable.adoc similarity index 77% rename from test/case/infix_services/mdns_enable_disable/mdns_enable_disable.adoc rename to test/case/infix_services/mdns/mdns_enable_disable/mdns_enable_disable.adoc index 5816200f..9a7b7ae0 100644 --- a/test/case/infix_services/mdns_enable_disable/mdns_enable_disable.adoc +++ b/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] diff --git a/test/case/infix_services/mdns_enable_disable/test.py b/test/case/infix_services/mdns/mdns_enable_disable/test.py similarity index 100% rename from test/case/infix_services/mdns_enable_disable/test.py rename to test/case/infix_services/mdns/mdns_enable_disable/test.py diff --git a/test/case/infix_services/mdns_enable_disable/topology.dot b/test/case/infix_services/mdns/mdns_enable_disable/topology.dot similarity index 100% rename from test/case/infix_services/mdns_enable_disable/topology.dot rename to test/case/infix_services/mdns/mdns_enable_disable/topology.dot diff --git a/test/case/infix_services/mdns_enable_disable/topology.svg b/test/case/infix_services/mdns/mdns_enable_disable/topology.svg similarity index 100% rename from test/case/infix_services/mdns_enable_disable/topology.svg rename to test/case/infix_services/mdns/mdns_enable_disable/topology.svg diff --git a/test/case/infix_services/ssh.yaml b/test/case/infix_services/ssh/ssh.yaml similarity index 100% rename from test/case/infix_services/ssh.yaml rename to test/case/infix_services/ssh/ssh.yaml diff --git a/test/case/infix_services/ssh_key_authentication/Readme.adoc b/test/case/infix_services/ssh/ssh_key_authentication/Readme.adoc similarity index 100% rename from test/case/infix_services/ssh_key_authentication/Readme.adoc rename to test/case/infix_services/ssh/ssh_key_authentication/Readme.adoc diff --git a/test/case/infix_services/ssh_key_authentication/ssh_key_authentication.adoc b/test/case/infix_services/ssh/ssh_key_authentication/ssh_key_authentication.adoc similarity index 74% rename from test/case/infix_services/ssh_key_authentication/ssh_key_authentication.adoc rename to test/case/infix_services/ssh/ssh_key_authentication/ssh_key_authentication.adoc index b5c664b1..188121fb 100644 --- a/test/case/infix_services/ssh_key_authentication/ssh_key_authentication.adoc +++ b/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] diff --git a/test/case/infix_services/ssh_key_authentication/test.py b/test/case/infix_services/ssh/ssh_key_authentication/test.py similarity index 100% rename from test/case/infix_services/ssh_key_authentication/test.py rename to test/case/infix_services/ssh/ssh_key_authentication/test.py diff --git a/test/case/infix_services/ssh/ssh_key_authentication/topology.dot b/test/case/infix_services/ssh/ssh_key_authentication/topology.dot new file mode 120000 index 00000000..54a4185e --- /dev/null +++ b/test/case/infix_services/ssh/ssh_key_authentication/topology.dot @@ -0,0 +1 @@ +../../../../infamy/topologies/1x1.dot \ No newline at end of file diff --git a/test/case/infix_services/ssh_key_authentication/topology.svg b/test/case/infix_services/ssh/ssh_key_authentication/topology.svg similarity index 100% rename from test/case/infix_services/ssh_key_authentication/topology.svg rename to test/case/infix_services/ssh/ssh_key_authentication/topology.svg diff --git a/test/case/infix_services/ssh_server_config/Readme.adoc b/test/case/infix_services/ssh/ssh_server_config/Readme.adoc similarity index 100% rename from test/case/infix_services/ssh_server_config/Readme.adoc rename to test/case/infix_services/ssh/ssh_server_config/Readme.adoc diff --git a/test/case/infix_services/ssh_server_config/ssh_server_config.adoc b/test/case/infix_services/ssh/ssh_server_config/ssh_server_config.adoc similarity index 78% rename from test/case/infix_services/ssh_server_config/ssh_server_config.adoc rename to test/case/infix_services/ssh/ssh_server_config/ssh_server_config.adoc index ed0f3b7f..e5890611 100644 --- a/test/case/infix_services/ssh_server_config/ssh_server_config.adoc +++ b/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] diff --git a/test/case/infix_services/ssh_server_config/test.py b/test/case/infix_services/ssh/ssh_server_config/test.py similarity index 100% rename from test/case/infix_services/ssh_server_config/test.py rename to test/case/infix_services/ssh/ssh_server_config/test.py diff --git a/test/case/infix_services/ssh/ssh_server_config/topology.dot b/test/case/infix_services/ssh/ssh_server_config/topology.dot new file mode 120000 index 00000000..bcb3e9b6 --- /dev/null +++ b/test/case/infix_services/ssh/ssh_server_config/topology.dot @@ -0,0 +1 @@ +../../../../infamy/topologies/1x3.dot \ No newline at end of file diff --git a/test/case/infix_services/ssh_server_config/topology.svg b/test/case/infix_services/ssh/ssh_server_config/topology.svg similarity index 100% rename from test/case/infix_services/ssh_server_config/topology.svg rename to test/case/infix_services/ssh/ssh_server_config/topology.svg diff --git a/test/case/infix_services/ssh_key_authentication/topology.dot b/test/case/infix_services/ssh_key_authentication/topology.dot deleted file mode 120000 index 02b78869..00000000 --- a/test/case/infix_services/ssh_key_authentication/topology.dot +++ /dev/null @@ -1 +0,0 @@ -../../../infamy/topologies/1x1.dot \ No newline at end of file diff --git a/test/case/infix_services/ssh_server_config/topology.dot b/test/case/infix_services/ssh_server_config/topology.dot deleted file mode 120000 index 7689a677..00000000 --- a/test/case/infix_services/ssh_server_config/topology.dot +++ /dev/null @@ -1 +0,0 @@ -../../../infamy/topologies/1x3.dot \ No newline at end of file