name netvirt suites consistently

Change-Id: Iadfd417aead7bd8fae53f468931ba181e3f5832c
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/csit/suites/netvirt/Netvirt_Cluster/010_Ovsdb_Netvirt_flow.robot b/csit/suites/netvirt/clustering/ovsdb/netvirt_flow.robot
similarity index 100%
rename from csit/suites/netvirt/Netvirt_Cluster/010_Ovsdb_Netvirt_flow.robot
rename to csit/suites/netvirt/clustering/ovsdb/netvirt_flow.robot

diff --git a/csit/suites/netvirt/Netvirt_Cluster/030_Ovsdb_Southbound_NetVirt.robot b/csit/suites/netvirt/clustering/ovsdb/southbound_netvirt.robot
similarity index 100%
rename from csit/suites/netvirt/Netvirt_Cluster/030_Ovsdb_Southbound_NetVirt.robot
rename to csit/suites/netvirt/clustering/ovsdb/southbound_netvirt.robot

diff --git a/csit/suites/netvirt/ElanService/ElanService.robot b/csit/suites/netvirt/elan/elan.robot
similarity index 100%
rename from csit/suites/netvirt/ElanService/ElanService.robot
rename to csit/suites/netvirt/elan/elan.robot

diff --git a/csit/suites/netvirt/Openstack_Neutron/001__connection_manager.robot b/csit/suites/netvirt/neutron/connection_manager.robot
similarity index 100%
rename from csit/suites/netvirt/Openstack_Neutron/001__connection_manager.robot
rename to csit/suites/netvirt/neutron/connection_manager.robot

diff --git a/csit/suites/netvirt/Openstack_Neutron/010__ovsdb_flow.robot b/csit/suites/netvirt/neutron/ovsdb_flow.robot
similarity index 100%
rename from csit/suites/netvirt/Openstack_Neutron/010__ovsdb_flow.robot
rename to csit/suites/netvirt/neutron/ovsdb_flow.robot

diff --git a/csit/suites/netvirt/Netvirt_Vpnservice/ARP_Learning.robot b/csit/suites/netvirt/vpnservice/arp_learning.robot
similarity index 100%
rename from csit/suites/netvirt/Netvirt_Vpnservice/ARP_Learning.robot
rename to csit/suites/netvirt/vpnservice/arp_learning.robot

diff --git a/csit/suites/netvirt/Netvirt_Vpnservice/01_basic_vpnservice.robot b/csit/suites/netvirt/vpnservice/basic.robot
similarity index 100%
rename from csit/suites/netvirt/Netvirt_Vpnservice/01_basic_vpnservice.robot
rename to csit/suites/netvirt/vpnservice/basic.robot

diff --git a/csit/suites/netvirt/Netvirt_Vpnservice/03_basic_ipv6_vpnservice.robot b/csit/suites/netvirt/vpnservice/basic_ipv6.robot
similarity index 100%
rename from csit/suites/netvirt/Netvirt_Vpnservice/03_basic_ipv6_vpnservice.robot
rename to csit/suites/netvirt/vpnservice/basic_ipv6.robot

diff --git a/csit/suites/netvirt/Netvirt_Vpnservice/02_bgp_vpnservice.robot b/csit/suites/netvirt/vpnservice/bgp.robot
similarity index 100%
rename from csit/suites/netvirt/Netvirt_Vpnservice/02_bgp_vpnservice.robot
rename to csit/suites/netvirt/vpnservice/bgp.robot

diff --git a/csit/suites/openstack/clustering/01_l2_tests.robot b/csit/suites/openstack/clustering/l2.robot
similarity index 100%
rename from csit/suites/openstack/clustering/01_l2_tests.robot
rename to csit/suites/openstack/clustering/l2.robot

diff --git a/csit/suites/openstack/clustering/02_l3_tests.robot b/csit/suites/openstack/clustering/l3.robot
similarity index 100%
rename from csit/suites/openstack/clustering/02_l3_tests.robot
rename to csit/suites/openstack/clustering/l3.robot

diff --git a/csit/suites/openstack/connectivity/03_external_network_tests.robot b/csit/suites/openstack/connectivity/external_network.robot
similarity index 100%
rename from csit/suites/openstack/connectivity/03_external_network_tests.robot
rename to csit/suites/openstack/connectivity/external_network.robot

diff --git a/csit/suites/openstack/connectivity/01_l2_tests.robot b/csit/suites/openstack/connectivity/l2.robot
similarity index 100%
rename from csit/suites/openstack/connectivity/01_l2_tests.robot
rename to csit/suites/openstack/connectivity/l2.robot

diff --git a/csit/suites/openstack/connectivity/02_l3_tests.robot b/csit/suites/openstack/connectivity/l3.robot
similarity index 100%
rename from csit/suites/openstack/connectivity/02_l3_tests.robot
rename to csit/suites/openstack/connectivity/l3.robot

diff --git a/csit/suites/openstack/connectivity/04_security_group_tests.robot b/csit/suites/openstack/connectivity/security_group.robot
similarity index 100%
rename from csit/suites/openstack/connectivity/04_security_group_tests.robot
rename to csit/suites/openstack/connectivity/security_group.robot

diff --git a/csit/suites/openstack/NeutronSecurityGrp/Neutron_Security_Group.robot b/csit/suites/openstack/securitygroup/security_group.robot
similarity index 100%
rename from csit/suites/openstack/NeutronSecurityGrp/Neutron_Security_Group.robot
rename to csit/suites/openstack/securitygroup/security_group.robot

diff --git a/csit/testplans/coe-1node-openstack.txt b/csit/testplans/coe-1node-openstack.txt
index c78ce4eca97161c80f4f5fa9fa08896ad9a44558..9e7029a8890c1e89e1794e4b5798420911575cd4 100644 (file)
--- a/csit/testplans/coe-1node-openstack.txt
+++ b/csit/testplans/coe-1node-openstack.txt
@@ -1 +1 @@
-integration/test/csit/suites/openstack/connectivity/01_l2_tests.robot
+integration/test/csit/suites/openstack/connectivity/l2.robot

diff --git a/csit/testplans/coe-3node-openstack.txt b/csit/testplans/coe-3node-openstack.txt
index c78ce4eca97161c80f4f5fa9fa08896ad9a44558..9e7029a8890c1e89e1794e4b5798420911575cd4 100644 (file)
--- a/csit/testplans/coe-3node-openstack.txt
+++ b/csit/testplans/coe-3node-openstack.txt
@@ -1 +1 @@
-integration/test/csit/suites/openstack/connectivity/01_l2_tests.robot
+integration/test/csit/suites/openstack/connectivity/l2.robot

diff --git a/csit/testplans/netvirt-1node-openstack.txt b/csit/testplans/netvirt-1node-openstack.txt
index 99cb08ee0b93c19a55e0bb6d4af67ab7248ee495..e2f2a7f6514b248c0d86e586783e4acfb30b2c5e 100644 (file)
--- a/csit/testplans/netvirt-1node-openstack.txt
+++ b/csit/testplans/netvirt-1node-openstack.txt
@@ -1,7 +1,7 @@
 integration/test/csit/suites/openstack/connectivity/
 integration/test/csit/suites/openstack/tempest/
-integration/test/csit/suites/openstack/NeutronSecurityGrp/
-integration/test/csit/suites/netvirt/Netvirt_Vpnservice/01_basic_vpnservice.robot
-integration/test/csit/suites/netvirt/Netvirt_Vpnservice/03_basic_ipv6_vpnservice.robot
-integration/test/csit/suites/netvirt/ElanService/
-integration/test/csit/suites/netvirt/Netvirt_Vpnservice/ARP_Learning.robot
+integration/test/csit/suites/openstack/securitygroup/
+integration/test/csit/suites/netvirt/vpnservice/basic.robot
+integration/test/csit/suites/netvirt/vpnservice/basic_ipv6.robot
+integration/test/csit/suites/netvirt/elan/
+integration/test/csit/suites/netvirt/vpnservice/arp_learning.robot

diff --git a/csit/testplans/netvirt-3node-openstack.txt b/csit/testplans/netvirt-3node-openstack.txt
index 9bd0a110afabe3b900511266904208193307b9df..54df324b80561be3d1e1369e7c042a7e11231634 100644 (file)
--- a/csit/testplans/netvirt-3node-openstack.txt
+++ b/csit/testplans/netvirt-3node-openstack.txt
@@ -1,6 +1,6 @@
 integration/test/csit/suites/openstack/connectivity/
 integration/test/csit/suites/openstack/clustering/
 integration/test/csit/suites/openstack/tempest/
-integration/test/csit/suites/netvirt/Netvirt_Vpnservice/01_basic_vpnservice.robot
-integration/test/csit/suites/netvirt/ElanService/
+integration/test/csit/suites/netvirt/vpnservice/basic.robot
+integration/test/csit/suites/netvirt/elan/
 integration/test/csit/suites/integration/Create_JVM_Plots.robot

diff --git a/csit/testplans/netvirt-legacy-1node-openstack.txt b/csit/testplans/netvirt-legacy-1node-openstack.txt
index e3ffcffee431409718c1dc74ed418e529148010d..085a7e6d9d931b0f8b22c2d5cd16748b75bc7048 100644 (file)
--- a/csit/testplans/netvirt-legacy-1node-openstack.txt
+++ b/csit/testplans/netvirt-legacy-1node-openstack.txt
@@ -1,4 +1,4 @@
-integration/test/csit/suites/openstack/connectivity/01_l2_tests.robot
-integration/test/csit/suites/openstack/connectivity/02_l3_tests.robot
+integration/test/csit/suites/openstack/connectivity/l2.robot
+integration/test/csit/suites/openstack/connectivity/l3.robot
 integration/test/csit/suites/openstack/tempest/
 integration/test/csit/suites/integration/Create_JVM_Plots.robot

diff --git a/csit/testplans/netvirt-legacy-3node-openstack.txt b/csit/testplans/netvirt-legacy-3node-openstack.txt
index 56bc8f6584059ad9c25bd83d2463132b434be30b..a9920c0b0d959998c722a489752afe03bd30564f 100644 (file)
--- a/csit/testplans/netvirt-legacy-3node-openstack.txt
+++ b/csit/testplans/netvirt-legacy-3node-openstack.txt
@@ -1,5 +1,5 @@
-integration/test/csit/suites/openstack/connectivity/01_l2_tests.robot
-integration/test/csit/suites/openstack/connectivity/02_l3_tests.robot
+integration/test/csit/suites/openstack/connectivity/l2.robot
+integration/test/csit/suites/openstack/connectivity/l3.robot
 integration/test/csit/suites/openstack/clustering/
 integration/test/csit/suites/integration/Create_JVM_Plots.robot
 

diff --git a/csit/testplans/netvirt-legacy-clustering.txt b/csit/testplans/netvirt-legacy-clustering.txt
index 8c43dab40b191233ebdc522b04822ccb9e7cec64..a1f727cc4335e7c02be4272d862fe6be0f4ee8d0 100644 (file)
--- a/csit/testplans/netvirt-legacy-clustering.txt
+++ b/csit/testplans/netvirt-legacy-clustering.txt
@@ -1,4 +1,3 @@
-# Place the suites in run order:
-integration/test/csit/suites/netvirt/Netvirt_Cluster/030_Ovsdb_Southbound_NetVirt.robot
-integration/test/csit/suites/netvirt/Netvirt_Cluster/010_Ovsdb_Netvirt_flow.robot
+integration/test/csit/suites/netvirt/clustering/ovsdb/southbound_netvirt.robot
+integration/test/csit/suites/netvirt/clustering/ovsdb/netvirt_flow.robot
 integration/test/csit/suites/integration/Create_JVM_Plots.robot

diff --git a/csit/testplans/netvirt-legacy-openstack-basic.txt b/csit/testplans/netvirt-legacy-openstack-basic.txt
index 2dcbf96830438ca473706449864d04c72f16774a..820b53aa905f3cfee85c57d983121f445be65ddb 100644 (file)
--- a/csit/testplans/netvirt-legacy-openstack-basic.txt
+++ b/csit/testplans/netvirt-legacy-openstack-basic.txt
@@ -1,2 +1,2 @@
 # Place the suites in run order:
-integration/test/csit/suites/netvirt/Openstack_Neutron
\ No newline at end of file
+integration/test/csit/suites/netvirt/neutron
\ No newline at end of file

diff --git a/csit/testplans/vtn-1node-openstack.txt b/csit/testplans/vtn-1node-openstack.txt
index c78ce4eca97161c80f4f5fa9fa08896ad9a44558..9e7029a8890c1e89e1794e4b5798420911575cd4 100644 (file)
--- a/csit/testplans/vtn-1node-openstack.txt
+++ b/csit/testplans/vtn-1node-openstack.txt
@@ -1 +1 @@
-integration/test/csit/suites/openstack/connectivity/01_l2_tests.robot
+integration/test/csit/suites/openstack/connectivity/l2.robot