From: Morgan Richomme Date: Thu, 24 Nov 2016 17:25:52 +0000 (+0100) Subject: file/dir renaming for consistency X-Git-Tag: danube.1.RC1~290 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=165ff17205d99b18df36e5ac6f34ede858e3da17;p=functest.git file/dir renaming for consistency JIRA: FUNCTEST-579 Change-Id: Iaa545db70bfb76770df0a3d17871e29ce518ff2d Signed-off-by: Morgan Richomme --- diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index a19139c0f..c75afdafe 100755 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -1,13 +1,13 @@ general: directories: # Relative to the path where the repo is cloned: - dir_vping: functest/opnfv_tests/OpenStack/vPing - dir_odl: functest/opnfv_tests/Controllers/ODL - dir_rally: functest/opnfv_tests/OpenStack/rally - dir_tempest_cases: functest/opnfv_tests/OpenStack/tempest/custom_tests - dir_vIMS: functest/opnfv_tests/vnf/vIMS - dir_onos: functest/opnfv_tests/Controllers/ONOS/Teston - dir_onos_sfc: functest/opnfv_tests/Controllers/ONOS/Sfc + dir_vping: functest/opnfv_tests/openstack/vping + dir_odl: functest/opnfv_tests/sdn/odl + dir_rally: functest/opnfv_tests/openstack/rally + dir_tempest_cases: functest/opnfv_tests/openstack/tempest/custom_tests + dir_vIMS: functest/opnfv_tests/vnf/ims + dir_onos: functest/opnfv_tests/sdn/onos/teston + dir_onos_sfc: functest/opnfv_tests/sdn/onos/sfc # Absolute path dir_home: /home/opnfv diff --git a/functest/ci/exec_test.sh b/functest/ci/exec_test.sh index 576784297..16c2ed3ea 100644 --- a/functest/ci/exec_test.sh +++ b/functest/ci/exec_test.sh @@ -87,35 +87,35 @@ function run_test(){ "odl") odl_tests [[ "$report" == "-r" ]] && args=-p - ${FUNCTEST_TEST_DIR}/Controllers/ODL/OpenDaylightTesting.py \ + ${FUNCTEST_TEST_DIR}/sdn/odl/odl.py \ --keystoneip $keystone_ip --neutronip $neutron_ip \ --osusername ${OS_USERNAME} --ostenantname ${OS_TENANT_NAME} \ --ospassword ${OS_PASSWORD} \ --odlip $odl_ip --odlwebport $odl_port ${args} ;; "tempest_smoke_serial") - python ${FUNCTEST_TEST_DIR}/OpenStack/tempest/run_tempest.py \ + python ${FUNCTEST_TEST_DIR}/openstack/tempest/run_tempest.py \ $clean_flag -s -m smoke $report ;; "tempest_full_parallel") - python ${FUNCTEST_TEST_DIR}/OpenStack/tempest/run_tempest.py \ + python ${FUNCTEST_TEST_DIR}/openstack/tempest/run_tempest.py \ $serial_flag $clean_flag -m full $report ;; "vims") - python ${FUNCTEST_TEST_DIR}/vnf/vIMS/vIMS.py $clean_flag $report + python ${FUNCTEST_TEST_DIR}/vnf/ims/vims.py $clean_flag $report ;; "rally_full") - python ${FUNCTEST_TEST_DIR}/OpenStack/rally/run_rally-cert.py $clean_flag all $report + python ${FUNCTEST_TEST_DIR}/openstack/rally/run_rally-cert.py $clean_flag all $report ;; "rally_sanity") - python ${FUNCTEST_TEST_DIR}/OpenStack/rally/run_rally-cert.py \ + python ${FUNCTEST_TEST_DIR}/openstack/rally/run_rally-cert.py \ $clean_flag --sanity all $report ;; "onos") - python ${FUNCTEST_TEST_DIR}/Controllers/ONOS/Teston/onosfunctest.py + python ${FUNCTEST_TEST_DIR}/sdn/onos/teston/onos.py ;; "onos_sfc") - python ${FUNCTEST_TEST_DIR}/Controllers/ONOS/Teston/onosfunctest.py -t sfc + python ${FUNCTEST_TEST_DIR}/sdn/onos/teston/onos.py -t sfc ;; "promise") python ${FUNCTEST_TEST_DIR}/features/promise.py $report @@ -141,10 +141,10 @@ function run_test(){ python ${REPOS_DIR}/moon/tests/run_tests.py $report ;; "multisite") - python ${FUNCTEST_TEST_DIR}/OpenStack/tempest/gen_tempest_conf.py - python ${FUNCTEST_TEST_DIR}/OpenStack/tempest/run_tempest.py \ + python ${FUNCTEST_TEST_DIR}/openstack/tempest/gen_tempest_conf.py + python ${FUNCTEST_TEST_DIR}/openstack/tempest/run_tempest.py \ $clean_flag -s -m feature_multisite $report \ - -c ${FUNCTEST_TEST_DIR}/OpenStack/tempest/tempest_multisite.conf + -c ${FUNCTEST_TEST_DIR}/openstack/tempest/tempest_multisite.conf ;; "odl-sfc") ODL_SFC_DIR=${REPOS_DIR}/sfc/tests/functest/odl-sfc diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index e5424a63d..ae6e16d68 100755 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -38,7 +38,7 @@ tiers: installer: '' scenario: '^((?!bgpvpn|odl_l3).)*$' run: - module: 'functest.opnfv_tests.OpenStack.vPing.vping_ssh' + module: 'functest.opnfv_tests.openstack.vping.vping_ssh' class: 'VPingSSH' - @@ -52,7 +52,7 @@ tiers: installer: '' scenario: '^((?!lxd).)*$' run: - module: 'functest.opnfv_tests.OpenStack.vPing.vping_userdata' + module: 'functest.opnfv_tests.openstack.vping.vping_userdata' class: 'VPingUserdata' - @@ -99,8 +99,8 @@ tiers: installer: '' scenario: 'odl' run: - module: 'functest.opnfv_tests.Controllers.ODL.OpenDaylightTesting' - class: 'ODLTestCases' + module: 'functest.opnfv_tests.sdn.odl.odl' + class: 'ODLTests' - name: onos @@ -153,7 +153,7 @@ tiers: scenario: 'bgpvpn' run: module: 'functest.opnfv_tests.features.sdnvpn' - class: 'SDNVPN' + class: 'SdnVpnTests' - name: security_scan @@ -203,7 +203,7 @@ tiers: scenario: '' run: module: 'functest.opnfv_tests.features.domino' - class: 'DominoCases' + class: 'DominoTests' - name: odl-sfc criteria: 'status == "PASS"' @@ -232,7 +232,7 @@ tiers: installer: 'fuel' scenario: '^((?!bgpvpn|noha).)*$' run: - module: 'functest.opnfv_tests.vnf.vRNC.parser' + module: 'functest.opnfv_tests.vnf.rnc.parser' class: 'Parser' - name: openstack diff --git a/functest/opnfv_tests/features/domino.py b/functest/opnfv_tests/features/domino.py index 2deeb4c43..30d33a138 100755 --- a/functest/opnfv_tests/features/domino.py +++ b/functest/opnfv_tests/features/domino.py @@ -24,13 +24,13 @@ import functest.utils.functest_utils as ft_utils import functest.utils.functest_constants as ft_constants -class DominoCases(TestCasesBase.TestCasesBase): +class DominoTests(TestCasesBase.TestCasesBase): DOMINO_REPO = ft_constants.DOMINO_REPO RESULTS_DIR = ft_constants.FUNCTEST_RESULTS_DIR logger = ft_logger.Logger("domino").getLogger() def __init__(self): - super(DominoCases, self).__init__() + super(DominoTests, self).__init__() self.project_name = "domino" self.case_name = "domino-multinode" @@ -72,7 +72,7 @@ if __name__ == '__main__': help="Create json result file", action="store_true") args = vars(parser.parse_args()) - domino = DominoCases() + domino = DominoTests() try: result = domino.main(**args) if result != TestCasesBase.TestCasesBase.EX_OK: diff --git a/functest/opnfv_tests/features/sdnvpn.py b/functest/opnfv_tests/features/sdnvpn.py index efc67b099..719d4fbfd 100644 --- a/functest/opnfv_tests/features/sdnvpn.py +++ b/functest/opnfv_tests/features/sdnvpn.py @@ -20,14 +20,14 @@ import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as ft_utils -class SDNVPN(TestCasesBase.TestCasesBase): +class SdnVpnTests(TestCasesBase.TestCasesBase): SDNVPN_REPO = ft_constants.SDNVPN_REPO_DIR SDNVPN_REPO_TESTS = os.path.join(SDNVPN_REPO, "tests/functest") RESULTS_DIR = ft_constants.FUNCTEST_RESULTS_DIR logger = ft_logger.Logger("sdnvpn").getLogger() def __init__(self): - super(SDNVPN, self).__init__() + super(SdnVpnTests, self).__init__() self.project_name = "sdnvpn" self.case_name = "bgpvpn" @@ -69,7 +69,7 @@ if __name__ == '__main__': help="Create json result file", action="store_true") args = vars(parser.parse_args()) - sdnvpn = SDNVPN() + sdnvpn = SdnVpnTests() try: result = sdnvpn.main(**args) if result != TestCasesBase.TestCasesBase.EX_OK: diff --git a/functest/opnfv_tests/Controllers/ODL/__init__.py b/functest/opnfv_tests/openstack/__init__.py similarity index 100% rename from functest/opnfv_tests/Controllers/ODL/__init__.py rename to functest/opnfv_tests/openstack/__init__.py diff --git a/functest/opnfv_tests/OpenStack/examples/create_instance_and_ip.py b/functest/opnfv_tests/openstack/examples/create_instance_and_ip.py similarity index 100% rename from functest/opnfv_tests/OpenStack/examples/create_instance_and_ip.py rename to functest/opnfv_tests/openstack/examples/create_instance_and_ip.py diff --git a/functest/opnfv_tests/OpenStack/healthcheck/healthcheck.sh b/functest/opnfv_tests/openstack/healthcheck/healthcheck.sh similarity index 100% rename from functest/opnfv_tests/OpenStack/healthcheck/healthcheck.sh rename to functest/opnfv_tests/openstack/healthcheck/healthcheck.sh diff --git a/functest/opnfv_tests/OpenStack/rally/blacklist.txt b/functest/opnfv_tests/openstack/rally/blacklist.txt similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/blacklist.txt rename to functest/opnfv_tests/openstack/rally/blacklist.txt diff --git a/functest/opnfv_tests/OpenStack/rally/macro/macro.yaml b/functest/opnfv_tests/openstack/rally/macro/macro.yaml similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/macro/macro.yaml rename to functest/opnfv_tests/openstack/rally/macro/macro.yaml diff --git a/functest/opnfv_tests/OpenStack/rally/run_rally-cert.py b/functest/opnfv_tests/openstack/rally/run_rally-cert.py similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/run_rally-cert.py rename to functest/opnfv_tests/openstack/rally/run_rally-cert.py diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-cinder.yaml b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-cinder.yaml rename to functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-heat.yaml b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-heat.yaml similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-heat.yaml rename to functest/opnfv_tests/openstack/rally/scenario/full/opnfv-heat.yaml diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-neutron.yaml b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-neutron.yaml similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-neutron.yaml rename to functest/opnfv_tests/openstack/rally/scenario/full/opnfv-neutron.yaml diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-nova.yaml b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-nova.yaml rename to functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-authenticate.yaml b/functest/opnfv_tests/openstack/rally/scenario/opnfv-authenticate.yaml similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/opnfv-authenticate.yaml rename to functest/opnfv_tests/openstack/rally/scenario/opnfv-authenticate.yaml diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-glance.yaml b/functest/opnfv_tests/openstack/rally/scenario/opnfv-glance.yaml similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/opnfv-glance.yaml rename to functest/opnfv_tests/openstack/rally/scenario/opnfv-glance.yaml diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-keystone.yaml b/functest/opnfv_tests/openstack/rally/scenario/opnfv-keystone.yaml similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/opnfv-keystone.yaml rename to functest/opnfv_tests/openstack/rally/scenario/opnfv-keystone.yaml diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-quotas.yaml b/functest/opnfv_tests/openstack/rally/scenario/opnfv-quotas.yaml similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/opnfv-quotas.yaml rename to functest/opnfv_tests/openstack/rally/scenario/opnfv-quotas.yaml diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-requests.yaml b/functest/opnfv_tests/openstack/rally/scenario/opnfv-requests.yaml similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/opnfv-requests.yaml rename to functest/opnfv_tests/openstack/rally/scenario/opnfv-requests.yaml diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-vm.yaml b/functest/opnfv_tests/openstack/rally/scenario/opnfv-vm.yaml similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/opnfv-vm.yaml rename to functest/opnfv_tests/openstack/rally/scenario/opnfv-vm.yaml diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-cinder.yaml b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-cinder.yaml similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-cinder.yaml rename to functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-cinder.yaml diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-heat.yaml b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-heat.yaml similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-heat.yaml rename to functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-heat.yaml diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-neutron.yaml b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-neutron.yaml similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-neutron.yaml rename to functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-neutron.yaml diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-nova.yaml b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-nova.yaml similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-nova.yaml rename to functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-nova.yaml diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/support/instance_dd_test.sh b/functest/opnfv_tests/openstack/rally/scenario/support/instance_dd_test.sh similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/support/instance_dd_test.sh rename to functest/opnfv_tests/openstack/rally/scenario/support/instance_dd_test.sh diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/templates/autoscaling_policy.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/autoscaling_policy.yaml.template similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/templates/autoscaling_policy.yaml.template rename to functest/opnfv_tests/openstack/rally/scenario/templates/autoscaling_policy.yaml.template diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/templates/default.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/default.yaml.template similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/templates/default.yaml.template rename to functest/opnfv_tests/openstack/rally/scenario/templates/default.yaml.template diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/templates/random_strings.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/random_strings.yaml.template similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/templates/random_strings.yaml.template rename to functest/opnfv_tests/openstack/rally/scenario/templates/random_strings.yaml.template diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/templates/resource_group.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/resource_group.yaml.template similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/templates/resource_group.yaml.template rename to functest/opnfv_tests/openstack/rally/scenario/templates/resource_group.yaml.template diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/templates/server_with_ports.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_ports.yaml.template similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/templates/server_with_ports.yaml.template rename to functest/opnfv_tests/openstack/rally/scenario/templates/server_with_ports.yaml.template diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/templates/server_with_volume.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_volume.yaml.template similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/templates/server_with_volume.yaml.template rename to functest/opnfv_tests/openstack/rally/scenario/templates/server_with_volume.yaml.template diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template rename to functest/opnfv_tests/openstack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_add.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/updated_random_strings_add.yaml.template similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_add.yaml.template rename to functest/opnfv_tests/openstack/rally/scenario/templates/updated_random_strings_add.yaml.template diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_delete.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/updated_random_strings_delete.yaml.template similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_delete.yaml.template rename to functest/opnfv_tests/openstack/rally/scenario/templates/updated_random_strings_delete.yaml.template diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_replace.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/updated_random_strings_replace.yaml.template similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_replace.yaml.template rename to functest/opnfv_tests/openstack/rally/scenario/templates/updated_random_strings_replace.yaml.template diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_resource_group_increase.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/updated_resource_group_increase.yaml.template similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_resource_group_increase.yaml.template rename to functest/opnfv_tests/openstack/rally/scenario/templates/updated_resource_group_increase.yaml.template diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_resource_group_reduce.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/updated_resource_group_reduce.yaml.template similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_resource_group_reduce.yaml.template rename to functest/opnfv_tests/openstack/rally/scenario/templates/updated_resource_group_reduce.yaml.template diff --git a/functest/opnfv_tests/OpenStack/rally/task.yaml b/functest/opnfv_tests/openstack/rally/task.yaml similarity index 100% rename from functest/opnfv_tests/OpenStack/rally/task.yaml rename to functest/opnfv_tests/openstack/rally/task.yaml diff --git a/functest/opnfv_tests/OpenStack/tempest/custom_tests/blacklist.txt b/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.txt similarity index 100% rename from functest/opnfv_tests/OpenStack/tempest/custom_tests/blacklist.txt rename to functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.txt diff --git a/functest/opnfv_tests/OpenStack/tempest/custom_tests/defcore_req.txt b/functest/opnfv_tests/openstack/tempest/custom_tests/defcore_req.txt similarity index 100% rename from functest/opnfv_tests/OpenStack/tempest/custom_tests/defcore_req.txt rename to functest/opnfv_tests/openstack/tempest/custom_tests/defcore_req.txt diff --git a/functest/opnfv_tests/OpenStack/tempest/gen_tempest_conf.py b/functest/opnfv_tests/openstack/tempest/gen_tempest_conf.py similarity index 100% rename from functest/opnfv_tests/OpenStack/tempest/gen_tempest_conf.py rename to functest/opnfv_tests/openstack/tempest/gen_tempest_conf.py diff --git a/functest/opnfv_tests/OpenStack/tempest/run_tempest.py b/functest/opnfv_tests/openstack/tempest/run_tempest.py similarity index 100% rename from functest/opnfv_tests/OpenStack/tempest/run_tempest.py rename to functest/opnfv_tests/openstack/tempest/run_tempest.py diff --git a/functest/opnfv_tests/Controllers/ONOS/Teston/__init__.py b/functest/opnfv_tests/openstack/vping/__init__.py similarity index 100% rename from functest/opnfv_tests/Controllers/ONOS/Teston/__init__.py rename to functest/opnfv_tests/openstack/vping/__init__.py diff --git a/functest/opnfv_tests/OpenStack/vPing/ping.sh b/functest/opnfv_tests/openstack/vping/ping.sh similarity index 100% rename from functest/opnfv_tests/OpenStack/vPing/ping.sh rename to functest/opnfv_tests/openstack/vping/ping.sh diff --git a/functest/opnfv_tests/OpenStack/vPing/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py similarity index 100% rename from functest/opnfv_tests/OpenStack/vPing/vping_base.py rename to functest/opnfv_tests/openstack/vping/vping_base.py diff --git a/functest/opnfv_tests/OpenStack/vPing/vping_ssh.py b/functest/opnfv_tests/openstack/vping/vping_ssh.py similarity index 100% rename from functest/opnfv_tests/OpenStack/vPing/vping_ssh.py rename to functest/opnfv_tests/openstack/vping/vping_ssh.py diff --git a/functest/opnfv_tests/OpenStack/vPing/vping_userdata.py b/functest/opnfv_tests/openstack/vping/vping_userdata.py similarity index 100% rename from functest/opnfv_tests/OpenStack/vPing/vping_userdata.py rename to functest/opnfv_tests/openstack/vping/vping_userdata.py diff --git a/functest/opnfv_tests/Controllers/ONOS/Teston/adapters/__init__.py b/functest/opnfv_tests/sdn/__init__.py similarity index 100% rename from functest/opnfv_tests/Controllers/ONOS/Teston/adapters/__init__.py rename to functest/opnfv_tests/sdn/__init__.py diff --git a/functest/opnfv_tests/Controllers/__init__.py b/functest/opnfv_tests/sdn/odl/__init__.py similarity index 100% rename from functest/opnfv_tests/Controllers/__init__.py rename to functest/opnfv_tests/sdn/odl/__init__.py diff --git a/functest/opnfv_tests/Controllers/ODL/OpenDaylightTesting.py b/functest/opnfv_tests/sdn/odl/odl.py similarity index 99% rename from functest/opnfv_tests/Controllers/ODL/OpenDaylightTesting.py rename to functest/opnfv_tests/sdn/odl/odl.py index b78db8b1a..c3fcb2415 100755 --- a/functest/opnfv_tests/Controllers/ODL/OpenDaylightTesting.py +++ b/functest/opnfv_tests/sdn/odl/odl.py @@ -47,7 +47,7 @@ class ODLResultVisitor(ResultVisitor): return self._data -class ODLTestCases(TestCasesBase.TestCasesBase): +class ODLTests(TestCasesBase.TestCasesBase): repos = ft_constants.REPOS_DIR odl_test_repo = os.path.join(repos, "odl_test") @@ -230,7 +230,7 @@ if __name__ == '__main__': action='store_true') args = vars(parser.parse_args()) - odl = ODLTestCases() + odl = ODLTests() try: result = odl.main(**args) if result != TestCasesBase.TestCasesBase.EX_OK: diff --git a/functest/opnfv_tests/Controllers/ONOS/Sfc/README.md b/functest/opnfv_tests/sdn/onos/sfc/README.md similarity index 100% rename from functest/opnfv_tests/Controllers/ONOS/Sfc/README.md rename to functest/opnfv_tests/sdn/onos/sfc/README.md diff --git a/functest/opnfv_tests/Controllers/ONOS/Sfc/Sfc.py b/functest/opnfv_tests/sdn/onos/sfc/sfc.py similarity index 99% rename from functest/opnfv_tests/Controllers/ONOS/Sfc/Sfc.py rename to functest/opnfv_tests/sdn/onos/sfc/sfc.py index e3f08041a..22412270a 100755 --- a/functest/opnfv_tests/Controllers/ONOS/Sfc/Sfc.py +++ b/functest/opnfv_tests/sdn/onos/sfc/sfc.py @@ -26,10 +26,10 @@ import time import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as ft_utils -from Sfc_fun import Sfc_fun +from sfc_onos import SfcOnos logger = ft_logger.Logger("sfc").getLogger() -Sfc_obj = Sfc_fun() +Sfc_obj = SfcOnos() OK = 200 CREATED = 201 diff --git a/functest/opnfv_tests/Controllers/ONOS/Sfc/Sfc_fun.py b/functest/opnfv_tests/sdn/onos/sfc/sfc_onos.py similarity index 99% rename from functest/opnfv_tests/Controllers/ONOS/Sfc/Sfc_fun.py rename to functest/opnfv_tests/sdn/onos/sfc/sfc_onos.py index 69e076d05..78bf6f4b8 100644 --- a/functest/opnfv_tests/Controllers/ONOS/Sfc/Sfc_fun.py +++ b/functest/opnfv_tests/sdn/onos/sfc/sfc_onos.py @@ -16,7 +16,7 @@ ACCEPTED = 202 NO_CONTENT = 204 -class Sfc_fun: +class SfcOnos: """Defines all the def function of SFC.""" def __init__(self): diff --git a/functest/opnfv_tests/Controllers/ONOS/Teston/Readme.txt b/functest/opnfv_tests/sdn/onos/teston/Readme.txt similarity index 100% rename from functest/opnfv_tests/Controllers/ONOS/Teston/Readme.txt rename to functest/opnfv_tests/sdn/onos/teston/Readme.txt diff --git a/functest/opnfv_tests/OpenStack/__init__.py b/functest/opnfv_tests/sdn/onos/teston/__init__.py similarity index 100% rename from functest/opnfv_tests/OpenStack/__init__.py rename to functest/opnfv_tests/sdn/onos/teston/__init__.py diff --git a/functest/opnfv_tests/OpenStack/vPing/__init__.py b/functest/opnfv_tests/sdn/onos/teston/adapters/__init__.py similarity index 100% rename from functest/opnfv_tests/OpenStack/vPing/__init__.py rename to functest/opnfv_tests/sdn/onos/teston/adapters/__init__.py diff --git a/functest/opnfv_tests/Controllers/ONOS/Teston/adapters/client.py b/functest/opnfv_tests/sdn/onos/teston/adapters/client.py similarity index 95% rename from functest/opnfv_tests/Controllers/ONOS/Teston/adapters/client.py rename to functest/opnfv_tests/sdn/onos/teston/adapters/client.py index 6b3285e5e..81d5f7d79 100644 --- a/functest/opnfv_tests/Controllers/ONOS/Teston/adapters/client.py +++ b/functest/opnfv_tests/sdn/onos/teston/adapters/client.py @@ -15,17 +15,17 @@ import pexpect import requests import time -from environment import environment +from environment import Environment import functest.utils.functest_logger as ft_logger -class client(environment): +class Client(Environment): logger = ft_logger.Logger("client").getLogger() def __init__(self): - environment.__init__(self) - self.loginfo = environment() + Environment.__init__(self) + self.loginfo = Environment() self.testcase = '' def RunScript(self, handle, testname, timeout=300): diff --git a/functest/opnfv_tests/Controllers/ONOS/Teston/adapters/connection.py b/functest/opnfv_tests/sdn/onos/teston/adapters/connection.py similarity index 98% rename from functest/opnfv_tests/Controllers/ONOS/Teston/adapters/connection.py rename to functest/opnfv_tests/sdn/onos/teston/adapters/connection.py index b2a2e3d88..3786945d2 100644 --- a/functest/opnfv_tests/Controllers/ONOS/Teston/adapters/connection.py +++ b/functest/opnfv_tests/sdn/onos/teston/adapters/connection.py @@ -17,17 +17,17 @@ import os import pexpect import re -from foundation import foundation +from foundation import Foundation import functest.utils.functest_logger as ft_logger -class connection(foundation): +class Connection(Foundation): logger = ft_logger.Logger("connection").getLogger() def __init__(self): - foundation.__init__(self) - self.loginfo = foundation() + Foundation.__init__(self) + self.loginfo = Foundation() def AddKnownHost(self, handle, ipaddr, username, password): """ diff --git a/functest/opnfv_tests/Controllers/ONOS/Teston/adapters/environment.py b/functest/opnfv_tests/sdn/onos/teston/adapters/environment.py similarity index 98% rename from functest/opnfv_tests/Controllers/ONOS/Teston/adapters/environment.py rename to functest/opnfv_tests/sdn/onos/teston/adapters/environment.py index 01f70b857..06d25b9ed 100644 --- a/functest/opnfv_tests/Controllers/ONOS/Teston/adapters/environment.py +++ b/functest/opnfv_tests/sdn/onos/teston/adapters/environment.py @@ -22,17 +22,17 @@ import os import sys import time -from connection import connection +from connection import Connection import functest.utils.functest_logger as ft_logger -class environment(connection): +class Environment(Connection): logger = ft_logger.Logger("environment").getLogger() def __init__(self): - connection.__init__(self) - self.loginfo = connection() + Connection.__init__(self) + self.loginfo = Connection() self.masterhandle = '' self.home = '' diff --git a/functest/opnfv_tests/Controllers/ONOS/Teston/adapters/foundation.py b/functest/opnfv_tests/sdn/onos/teston/adapters/foundation.py similarity index 97% rename from functest/opnfv_tests/Controllers/ONOS/Teston/adapters/foundation.py rename to functest/opnfv_tests/sdn/onos/teston/adapters/foundation.py index 6f7a40fff..52462b60a 100644 --- a/functest/opnfv_tests/Controllers/ONOS/Teston/adapters/foundation.py +++ b/functest/opnfv_tests/sdn/onos/teston/adapters/foundation.py @@ -21,13 +21,13 @@ import functest.utils.functest_constants as ft_constants import functest.utils.functest_utils as ft_utils -class foundation: +class Foundation: def __init__(self): # currentpath = os.getcwd() currentpath = \ - ft_constants.FUNCTEST_TEST_DIR + '/Controllers/ONOS/Teston/CI' + ft_constants.FUNCTEST_TEST_DIR + '/sdn/onos/teston/ci' self.cipath = currentpath self.logdir = os.path.join(currentpath, 'log') self.workhome = currentpath[0: currentpath.rfind('opnfv_tests') - 1] diff --git a/functest/opnfv_tests/Controllers/ONOS/Teston/dependencies/onos b/functest/opnfv_tests/sdn/onos/teston/dependencies/onos similarity index 100% rename from functest/opnfv_tests/Controllers/ONOS/Teston/dependencies/onos rename to functest/opnfv_tests/sdn/onos/teston/dependencies/onos diff --git a/functest/opnfv_tests/Controllers/ONOS/Teston/log/gitignore b/functest/opnfv_tests/sdn/onos/teston/log/gitignore similarity index 100% rename from functest/opnfv_tests/Controllers/ONOS/Teston/log/gitignore rename to functest/opnfv_tests/sdn/onos/teston/log/gitignore diff --git a/functest/opnfv_tests/Controllers/ONOS/Teston/onosfunctest.py b/functest/opnfv_tests/sdn/onos/teston/onos.py similarity index 100% rename from functest/opnfv_tests/Controllers/ONOS/Teston/onosfunctest.py rename to functest/opnfv_tests/sdn/onos/teston/onos.py diff --git a/functest/opnfv_tests/vnf/vIMS/clearwater.py b/functest/opnfv_tests/vnf/ims/clearwater.py similarity index 99% rename from functest/opnfv_tests/vnf/vIMS/clearwater.py rename to functest/opnfv_tests/vnf/ims/clearwater.py index 7236f4fba..eb0abacdc 100644 --- a/functest/opnfv_tests/vnf/vIMS/clearwater.py +++ b/functest/opnfv_tests/vnf/ims/clearwater.py @@ -12,7 +12,7 @@ ######################################################################## -class clearwater: +class Clearwater: def __init__(self, inputs={}, orchestrator=None, logger=None): self.config = inputs diff --git a/functest/opnfv_tests/vnf/vIMS/create_venv.sh b/functest/opnfv_tests/vnf/ims/create_venv.sh similarity index 100% rename from functest/opnfv_tests/vnf/vIMS/create_venv.sh rename to functest/opnfv_tests/vnf/ims/create_venv.sh diff --git a/functest/opnfv_tests/vnf/vIMS/orchestrator.py b/functest/opnfv_tests/vnf/ims/orchestrator.py similarity index 99% rename from functest/opnfv_tests/vnf/vIMS/orchestrator.py rename to functest/opnfv_tests/vnf/ims/orchestrator.py index 61157a4fb..5f84df006 100644 --- a/functest/opnfv_tests/vnf/vIMS/orchestrator.py +++ b/functest/opnfv_tests/vnf/ims/orchestrator.py @@ -21,7 +21,7 @@ from git import Repo import functest.utils.functest_logger as ft_logger -class orchestrator: +class Orchestrator: def __init__(self, testcase_dir, inputs={}): self.testcase_dir = testcase_dir diff --git a/functest/opnfv_tests/vnf/vIMS/requirements.pip b/functest/opnfv_tests/vnf/ims/requirements.pip similarity index 100% rename from functest/opnfv_tests/vnf/vIMS/requirements.pip rename to functest/opnfv_tests/vnf/ims/requirements.pip diff --git a/functest/opnfv_tests/vnf/vIMS/vIMS.py b/functest/opnfv_tests/vnf/ims/vims.py similarity index 98% rename from functest/opnfv_tests/vnf/vIMS/vIMS.py rename to functest/opnfv_tests/vnf/ims/vims.py index 4cc8ce305..fe888b698 100755 --- a/functest/opnfv_tests/vnf/vIMS/vIMS.py +++ b/functest/opnfv_tests/vnf/ims/vims.py @@ -27,8 +27,8 @@ from neutronclient.v2_0 import client as ntclient import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as ft_utils import functest.utils.openstack_utils as os_utils -from clearwater import clearwater -from orchestrator import orchestrator +from clearwater import Clearwater +from orchestrator import Orchestrator import functest.utils.functest_constants as ft_constants pp = pprint.PrettyPrinter(indent=4) @@ -49,7 +49,7 @@ logger = ft_logger.Logger("vIMS").getLogger() # Cloudify parameters -VIMS_DIR = os.path.join(ft_constants.FUNCTEST_TEST_DIR, 'vnf/vIMS/') +VIMS_DIR = os.path.join(ft_constants.FUNCTEST_TEST_DIR, 'vnf/ims/') VIMS_DATA_DIR = ft_constants.VIMS_DATA_DIR VIMS_TEST_DIR = ft_constants.VIMS_TEST_DIR VIMS_TENANT_NAME = ft_constants.VIMS_TENANT_NAME @@ -328,7 +328,7 @@ def main(): public_auth_url = keystone.service_catalog.url_for( service_type='identity', endpoint_type='publicURL') - cfy = orchestrator(VIMS_DATA_DIR, CFY_INPUTS) + cfy = Orchestrator(VIMS_DATA_DIR, CFY_INPUTS) cfy.set_credentials(username=ks_creds['username'], password=ks_creds[ 'password'], tenant_name=ks_creds['tenant_name'], @@ -413,7 +413,7 @@ def main(): # ############### CLEARWATER INITIALISATION ################ - cw = clearwater(CW_INPUTS, cfy, logger) + cw = Clearwater(CW_INPUTS, cfy, logger) logger.info("Collect flavor id for all clearwater vm") nova = nvclient.Client("2", **nv_creds) diff --git a/functest/opnfv_tests/vnf/vRNC/__init__.py b/functest/opnfv_tests/vnf/rnc/__init__.py similarity index 100% rename from functest/opnfv_tests/vnf/vRNC/__init__.py rename to functest/opnfv_tests/vnf/rnc/__init__.py diff --git a/functest/opnfv_tests/vnf/vRNC/parser.py b/functest/opnfv_tests/vnf/rnc/parser.py old mode 100755 new mode 100644 similarity index 100% rename from functest/opnfv_tests/vnf/vRNC/parser.py rename to functest/opnfv_tests/vnf/rnc/parser.py diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py index fdd45763b..46707e820 100644 --- a/functest/tests/unit/odl/test_odl.py +++ b/functest/tests/unit/odl/test_odl.py @@ -16,11 +16,11 @@ import unittest from robot.errors import RobotError from functest.core import TestCasesBase -from functest.opnfv_tests.Controllers.ODL import OpenDaylightTesting +from functest.opnfv_tests.sdn.odl import odl from functest.utils import functest_constants as ft_constants -class ODLTestCasesTesting(unittest.TestCase): +class ODLTesting(unittest.TestCase): logging.disable(logging.CRITICAL) @@ -39,7 +39,7 @@ class ODLTestCasesTesting(unittest.TestCase): ft_constants.OS_USERNAME = self._os_username ft_constants.OS_PASSWORD = self._os_password ft_constants.OS_TENANT_NAME = self._os_tenantname - self.test = OpenDaylightTesting.ODLTestCases() + self.test = odl.ODLTests() @mock.patch('fileinput.input', side_effect=Exception()) def test_set_robotframework_vars_failed(self, *args): @@ -53,9 +53,9 @@ class ODLTestCasesTesting(unittest.TestCase): def _fake_url_for(cls, service_type='identity', **kwargs): if service_type == 'identity': return "http://{}:5000/v2.0".format( - ODLTestCasesTesting._keystone_ip) + ODLTesting._keystone_ip) elif service_type == 'network': - return "http://{}:9696".format(ODLTestCasesTesting._neutron_ip) + return "http://{}:9696".format(ODLTesting._neutron_ip) else: return None @@ -85,7 +85,7 @@ class ODLTestCasesTesting(unittest.TestCase): def _test_main(self, status, *args): kwargs = self._get_main_kwargs() self.assertEqual(self.test.main(**kwargs), status) - odl_res_dir = OpenDaylightTesting.ODLTestCases.res_dir + odl_res_dir = odl.ODLTests.res_dir if len(args) > 0: args[0].assert_called_once_with(odl_res_dir) if len(args) > 1: @@ -99,8 +99,8 @@ class ODLTestCasesTesting(unittest.TestCase): 'RESTCONFPORT:{}'.format(self._odl_restconfport)] output_file = os.path.join(odl_res_dir, 'output.xml') args[1].assert_called_once_with( - OpenDaylightTesting.ODLTestCases.basic_suite_dir, - OpenDaylightTesting.ODLTestCases.neutron_suite_dir, + odl.ODLTests.basic_suite_dir, + odl.ODLTests.neutron_suite_dir, log='NONE', output=output_file, report='NONE', diff --git a/run_unit_tests.sh b/run_unit_tests.sh index dc5a501a6..628369146 100755 --- a/run_unit_tests.sh +++ b/run_unit_tests.sh @@ -56,7 +56,7 @@ nosetests --with-xunit \ --with-coverage \ --cover-erase \ --cover-package=functest.core.TestCasesBase \ - --cover-package=functest.opnfv_tests.Controllers.ODL.OpenDaylightTesting \ + --cover-package=functest.opnfv_tests.sdn.odl.odl \ --cover-xml \ --cover-html \ functest/tests/unit