From d7b7c20493d2f213c5934d8fe9e7c8b55183d91c Mon Sep 17 00:00:00 2001 From: Sam Hague Date: Fri, 17 Nov 2017 09:30:09 -0500 Subject: [PATCH] name netvirt suites consistently Change-Id: Iadfd417aead7bd8fae53f468931ba181e3f5832c Signed-off-by: Sam Hague --- .../ovsdb/netvirt_flow.robot} | 0 .../ovsdb/southbound_netvirt.robot} | 0 .../{ElanService/ElanService.robot => elan/elan.robot} | 0 .../connection_manager.robot} | 0 .../010__ovsdb_flow.robot => neutron/ovsdb_flow.robot} | 0 .../arp_learning.robot} | 0 .../basic.robot} | 0 .../basic_ipv6.robot} | 0 .../02_bgp_vpnservice.robot => vpnservice/bgp.robot} | 0 .../clustering/{01_l2_tests.robot => l2.robot} | 0 .../clustering/{02_l3_tests.robot => l3.robot} | 0 ...rnal_network_tests.robot => external_network.robot} | 0 .../connectivity/{01_l2_tests.robot => l2.robot} | 0 .../connectivity/{02_l3_tests.robot => l3.robot} | 0 ...security_group_tests.robot => security_group.robot} | 0 .../security_group.robot} | 0 csit/testplans/coe-1node-openstack.txt | 2 +- csit/testplans/coe-3node-openstack.txt | 2 +- csit/testplans/netvirt-1node-openstack.txt | 10 +++++----- csit/testplans/netvirt-3node-openstack.txt | 4 ++-- csit/testplans/netvirt-legacy-1node-openstack.txt | 4 ++-- csit/testplans/netvirt-legacy-3node-openstack.txt | 4 ++-- csit/testplans/netvirt-legacy-clustering.txt | 5 ++--- csit/testplans/netvirt-legacy-openstack-basic.txt | 2 +- csit/testplans/vtn-1node-openstack.txt | 2 +- 25 files changed, 17 insertions(+), 18 deletions(-) rename csit/suites/netvirt/{Netvirt_Cluster/010_Ovsdb_Netvirt_flow.robot => clustering/ovsdb/netvirt_flow.robot} (100%) rename csit/suites/netvirt/{Netvirt_Cluster/030_Ovsdb_Southbound_NetVirt.robot => clustering/ovsdb/southbound_netvirt.robot} (100%) rename csit/suites/netvirt/{ElanService/ElanService.robot => elan/elan.robot} (100%) rename csit/suites/netvirt/{Openstack_Neutron/001__connection_manager.robot => neutron/connection_manager.robot} (100%) rename csit/suites/netvirt/{Openstack_Neutron/010__ovsdb_flow.robot => neutron/ovsdb_flow.robot} (100%) rename csit/suites/netvirt/{Netvirt_Vpnservice/ARP_Learning.robot => vpnservice/arp_learning.robot} (100%) rename csit/suites/netvirt/{Netvirt_Vpnservice/01_basic_vpnservice.robot => vpnservice/basic.robot} (100%) rename csit/suites/netvirt/{Netvirt_Vpnservice/03_basic_ipv6_vpnservice.robot => vpnservice/basic_ipv6.robot} (100%) rename csit/suites/netvirt/{Netvirt_Vpnservice/02_bgp_vpnservice.robot => vpnservice/bgp.robot} (100%) rename csit/suites/openstack/clustering/{01_l2_tests.robot => l2.robot} (100%) rename csit/suites/openstack/clustering/{02_l3_tests.robot => l3.robot} (100%) rename csit/suites/openstack/connectivity/{03_external_network_tests.robot => external_network.robot} (100%) rename csit/suites/openstack/connectivity/{01_l2_tests.robot => l2.robot} (100%) rename csit/suites/openstack/connectivity/{02_l3_tests.robot => l3.robot} (100%) rename csit/suites/openstack/connectivity/{04_security_group_tests.robot => security_group.robot} (100%) rename csit/suites/openstack/{NeutronSecurityGrp/Neutron_Security_Group.robot => securitygroup/security_group.robot} (100%) 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 c78ce4eca9..9e7029a889 100644 --- 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 c78ce4eca9..9e7029a889 100644 --- 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 99cb08ee0b..e2f2a7f651 100644 --- 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 9bd0a110af..54df324b80 100644 --- 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 e3ffcffee4..085a7e6d9d 100644 --- 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 56bc8f6584..a9920c0b0d 100644 --- 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 8c43dab40b..a1f727cc43 100644 --- 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 2dcbf96830..820b53aa90 100644 --- 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 c78ce4eca9..9e7029a889 100644 --- 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 -- 2.36.6