From 68d29b6f6e71df6b4f177cd417f98d9e977f8893 Mon Sep 17 00:00:00 2001 From: "jose.lausuch" Date: Tue, 17 May 2016 21:36:56 +0200 Subject: [PATCH] Change 'testcases' directory structure JIRA: FUNCTEST-226 - Remove all 'CI' subdirs - Remove VIM dir and have OpenStack dir within /testcases/ - Split rally and tempest in 2 different dirs Change-Id: Icfc76d18a84f7a18d93ae1a5ec7dc7a560bb7ce9 Signed-off-by: jose.lausuch --- ci/config_functest.yaml | 13 ++++---- ci/exec_test.sh | 36 ++++++++++------------ ci/tier_handler.py | 4 +-- .../custom_tests/neutron/010__networks.robot | 0 .../custom_tests/neutron/020__subnets.robot | 0 .../{CI => }/custom_tests/neutron/030__ports.robot | 0 .../custom_tests/neutron/040__delete_ports.txt | 0 .../custom_tests/neutron/050__delete_subnets.txt | 0 .../custom_tests/neutron/060__delete_networks.txt | 0 testcases/Controllers/ODL/{CI => }/odlreport2db.py | 0 testcases/Controllers/ODL/{CI => }/start_tests.sh | 0 testcases/Controllers/ODL/{CI => }/test_list.txt | 0 .../Controllers/ONOS/Teston/{CI => }/Readme.txt | 0 .../Controllers/ONOS/Teston/{CI => }/__init__.py | 0 .../ONOS/Teston/{CI => }/adapters/__init__.py | 0 .../ONOS/Teston/{CI => }/adapters/client.py | 0 .../ONOS/Teston/{CI => }/adapters/connection.py | 0 .../ONOS/Teston/{CI => }/adapters/environment.py | 0 .../ONOS/Teston/{CI => }/adapters/foundation.py | 0 .../ONOS/Teston/{CI => }/dependencies/onos | 0 .../Controllers/ONOS/Teston/{CI => }/log/gitignore | 0 .../ONOS/Teston/{CI => }/onosfunctest.py | 2 +- .../healthcheck}/healthcheck.sh | 0 .../rally}/macro/macro.yaml | 0 .../rally}/run_rally-cert.py | 12 ++++---- .../rally}/scenario/opnfv-authenticate.yaml | 0 .../rally}/scenario/opnfv-cinder.yaml | 0 .../rally}/scenario/opnfv-glance.yaml | 0 .../rally}/scenario/opnfv-heat.yaml | 0 .../rally}/scenario/opnfv-keystone.yaml | 0 .../rally}/scenario/opnfv-neutron.yaml | 0 .../rally}/scenario/opnfv-nova.yaml | 0 .../rally}/scenario/opnfv-quotas.yaml | 0 .../rally}/scenario/opnfv-requests.yaml | 0 .../rally}/scenario/opnfv-smoke.yaml | 0 .../rally}/scenario/opnfv-vm.yaml | 0 .../rally}/scenario/support/instance_dd_test.sh | 0 .../templates/autoscaling_policy.yaml.template | 0 .../scenario/templates/default.yaml.template | 0 .../templates/random_strings.yaml.template | 0 .../templates/resource_group.yaml.template | 0 .../templates/server_with_ports.yaml.template | 0 .../templates/server_with_volume.yaml.template | 0 ...pdated_autoscaling_policy_inplace.yaml.template | 0 .../updated_random_strings_add.yaml.template | 0 .../updated_random_strings_delete.yaml.template | 0 .../updated_random_strings_replace.yaml.template | 0 .../updated_resource_group_increase.yaml.template | 0 .../updated_resource_group_reduce.yaml.template | 0 .../CI/rally_cert => OpenStack/rally}/task.yaml | 0 .../tempest}/custom_tests/defcore_req.txt | 0 .../libraries => OpenStack/tempest}/run_tempest.py | 0 .../CI/libraries => OpenStack/vPing}/ping.sh | 0 .../CI/libraries => OpenStack/vPing}/vPing_ssh.py | 2 +- .../vPing}/vPing_userdata.py | 0 testcases/vIMS/{CI => }/clearwater.py | 0 testcases/vIMS/{CI => }/create_venv.sh | 0 testcases/vIMS/{CI => }/orchestrator.py | 0 testcases/vIMS/{CI => }/requirements.pip | 0 testcases/vIMS/{CI => }/vIMS.py | 0 60 files changed, 32 insertions(+), 37 deletions(-) rename testcases/Controllers/ODL/{CI => }/custom_tests/neutron/010__networks.robot (100%) rename testcases/Controllers/ODL/{CI => }/custom_tests/neutron/020__subnets.robot (100%) rename testcases/Controllers/ODL/{CI => }/custom_tests/neutron/030__ports.robot (100%) rename testcases/Controllers/ODL/{CI => }/custom_tests/neutron/040__delete_ports.txt (100%) rename testcases/Controllers/ODL/{CI => }/custom_tests/neutron/050__delete_subnets.txt (100%) rename testcases/Controllers/ODL/{CI => }/custom_tests/neutron/060__delete_networks.txt (100%) rename testcases/Controllers/ODL/{CI => }/odlreport2db.py (100%) rename testcases/Controllers/ODL/{CI => }/start_tests.sh (100%) rename testcases/Controllers/ODL/{CI => }/test_list.txt (100%) rename testcases/Controllers/ONOS/Teston/{CI => }/Readme.txt (100%) rename testcases/Controllers/ONOS/Teston/{CI => }/__init__.py (100%) rename testcases/Controllers/ONOS/Teston/{CI => }/adapters/__init__.py (100%) rename testcases/Controllers/ONOS/Teston/{CI => }/adapters/client.py (100%) rename testcases/Controllers/ONOS/Teston/{CI => }/adapters/connection.py (100%) rename testcases/Controllers/ONOS/Teston/{CI => }/adapters/environment.py (100%) rename testcases/Controllers/ONOS/Teston/{CI => }/adapters/foundation.py (100%) rename testcases/Controllers/ONOS/Teston/{CI => }/dependencies/onos (100%) rename testcases/Controllers/ONOS/Teston/{CI => }/log/gitignore (100%) rename testcases/Controllers/ONOS/Teston/{CI => }/onosfunctest.py (98%) rename testcases/{VIM/OpenStack/CI/libraries => OpenStack/healthcheck}/healthcheck.sh (100%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/macro/macro.yaml (100%) rename testcases/{VIM/OpenStack/CI/libraries => OpenStack/rally}/run_rally-cert.py (98%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/scenario/opnfv-authenticate.yaml (100%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/scenario/opnfv-cinder.yaml (100%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/scenario/opnfv-glance.yaml (100%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/scenario/opnfv-heat.yaml (100%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/scenario/opnfv-keystone.yaml (100%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/scenario/opnfv-neutron.yaml (100%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/scenario/opnfv-nova.yaml (100%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/scenario/opnfv-quotas.yaml (100%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/scenario/opnfv-requests.yaml (100%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/scenario/opnfv-smoke.yaml (100%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/scenario/opnfv-vm.yaml (100%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/scenario/support/instance_dd_test.sh (100%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/scenario/templates/autoscaling_policy.yaml.template (100%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/scenario/templates/default.yaml.template (100%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/scenario/templates/random_strings.yaml.template (100%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/scenario/templates/resource_group.yaml.template (100%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/scenario/templates/server_with_ports.yaml.template (100%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/scenario/templates/server_with_volume.yaml.template (100%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/scenario/templates/updated_autoscaling_policy_inplace.yaml.template (100%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/scenario/templates/updated_random_strings_add.yaml.template (100%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/scenario/templates/updated_random_strings_delete.yaml.template (100%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/scenario/templates/updated_random_strings_replace.yaml.template (100%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/scenario/templates/updated_resource_group_increase.yaml.template (100%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/scenario/templates/updated_resource_group_reduce.yaml.template (100%) rename testcases/{VIM/OpenStack/CI/rally_cert => OpenStack/rally}/task.yaml (100%) rename testcases/{VIM/OpenStack/CI => OpenStack/tempest}/custom_tests/defcore_req.txt (100%) rename testcases/{VIM/OpenStack/CI/libraries => OpenStack/tempest}/run_tempest.py (100%) rename testcases/{vPing/CI/libraries => OpenStack/vPing}/ping.sh (100%) rename testcases/{vPing/CI/libraries => OpenStack/vPing}/vPing_ssh.py (99%) rename testcases/{vPing/CI/libraries => OpenStack/vPing}/vPing_userdata.py (100%) rename testcases/vIMS/{CI => }/clearwater.py (100%) rename testcases/vIMS/{CI => }/create_venv.sh (100%) rename testcases/vIMS/{CI => }/orchestrator.py (100%) rename testcases/vIMS/{CI => }/requirements.pip (100%) rename testcases/vIMS/{CI => }/vIMS.py (100%) diff --git a/ci/config_functest.yaml b/ci/config_functest.yaml index 29a74afd5..ab620f023 100644 --- a/ci/config_functest.yaml +++ b/ci/config_functest.yaml @@ -1,13 +1,12 @@ general: directories: # Relative to the path where the repo is cloned: - dir_vping: testcases/vPing/CI/libraries/ - dir_odl: testcases/Controllers/ODL/CI/ - dir_rally: testcases/VIM/OpenStack/CI/libraries/ - dir_rally_scn: testcases/VIM/OpenStack/CI/rally_cert/ - dir_tempest_cases: testcases/VIM/OpenStack/CI/custom_tests/ - dir_vIMS: testcases/vIMS/CI/ - dir_onos: testcases/Controllers/ONOS/Teston/CI/ + dir_vping: testcases/OpenStack/vPing/ + dir_odl: testcases/Controllers/ODL/ + dir_rally: testcases/OpenStack/rally/ + dir_tempest_cases: testcases/OpenStack/tempest/custom_tests/ + dir_vIMS: testcases/vIMS/ + dir_onos: testcases/Controllers/ONOS/Teston/ # Absolute path dir_repos: /home/opnfv/repos diff --git a/ci/exec_test.sh b/ci/exec_test.sh index 013b98c2e..61d00c744 100755 --- a/ci/exec_test.sh +++ b/ci/exec_test.sh @@ -69,61 +69,57 @@ function run_test(){ case $test_name in "healthcheck") - ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/healthcheck.sh + ${FUNCTEST_REPO_DIR}/testcases/OpenStack/healthcheck/healthcheck.sh ;; "vping_ssh") - python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing_ssh.py \ - $debug $report + python ${FUNCTEST_REPO_DIR}/testcases/vPing/vPing_ssh.py $report ;; "vping_userdata") - python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing_userdata.py \ - $debug $report + python ${FUNCTEST_REPO_DIR}/testcases/vPing/vPing_userdata.py $report ;; "odl") odl_tests ODL_PORT=$odl_port ODL_IP=$odl_ip KEYSTONE_IP=$keystone_ip NEUTRON_IP=$neutron_ip USR_NAME=${OS_USERNAME} PASS=${OS_PASSWORD} \ - ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI/start_tests.sh + ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/start_tests.sh # push results to the DB in case of CI if [[ -n "$DEPLOY_SCENARIO" && "$DEPLOY_SCENARIO" != "none" ]]; then odl_logs="/home/opnfv/functest/results/odl/logs/2" - odl_path="${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI" + odl_path="${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/" node_name=$(env | grep NODE_NAME | cut -f2 -d'=') python ${odl_path}/odlreport2db.py -x ${odl_logs}/output.xml -i ${INSTALLER_TYPE} -p ${node_name} -s ${DEPLOY_SCENARIO} fi ;; "tempest_smoke_serial") - python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_tempest.py \ - $debug $clean_flag -s -m smoke $report + python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \ + $clean_flag -s -m smoke $report ;; "tempest_full_parallel") - python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_tempest.py \ - $debug $serial_flag $clean_flag -m full $report + python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \ + $serial_flag $clean_flag -m full $report ;; "vims") - python ${FUNCTEST_REPO_DIR}/testcases/vIMS/CI/vIMS.py \ - $debug $clean_flag $report + python ${FUNCTEST_REPO_DIR}/testcases/vIMS/vIMS.py $clean_flag $report ;; "rally_full") - python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py \ - $debug $clean_flag all $report + python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/rally/run_rally-cert.py $clean_flag all $report ;; "rally_sanity") - python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py \ - $debug $clean_flag --sanity all $report + python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/rally/run_rally-cert.py \ + $clean_flag --sanity all $report ;; "bgpvpn") python ${FUNCTEST_REPO_DIR}/testcases/features/bgpvpn.py ;; "onos") if [ "$INSTALLER_TYPE" == "joid" ]; then - python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py -i joid + python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/onosfunctest.py -i joid else - python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py + python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/onosfunctest.py fi ;; "promise") - python ${FUNCTEST_REPO_DIR}/testcases/features/promise.py $debug $report + python ${FUNCTEST_REPO_DIR}/testcases/features/promise.py $report sleep 10 # to let the instances terminate ;; "doctor") diff --git a/ci/tier_handler.py b/ci/tier_handler.py index 2fc7a9c4d..03db4a91d 100644 --- a/ci/tier_handler.py +++ b/ci/tier_handler.py @@ -74,7 +74,7 @@ class Tier: return self.ci_loop def __str__(self): - lines = split_text(self.description, LINE_LENGTH-6) + lines = split_text(self.description, LINE_LENGTH - 6) out = "" out += ("+%s+\n" % ("=" * (LINE_LENGTH - 2))) @@ -120,7 +120,7 @@ class TestCase: return self.name def __str__(self): - lines = split_text(self.description, LINE_LENGTH-6) + lines = split_text(self.description, LINE_LENGTH - 6) out = "" out += ("+%s+\n" % ("=" * (LINE_LENGTH - 2))) diff --git a/testcases/Controllers/ODL/CI/custom_tests/neutron/010__networks.robot b/testcases/Controllers/ODL/custom_tests/neutron/010__networks.robot similarity index 100% rename from testcases/Controllers/ODL/CI/custom_tests/neutron/010__networks.robot rename to testcases/Controllers/ODL/custom_tests/neutron/010__networks.robot diff --git a/testcases/Controllers/ODL/CI/custom_tests/neutron/020__subnets.robot b/testcases/Controllers/ODL/custom_tests/neutron/020__subnets.robot similarity index 100% rename from testcases/Controllers/ODL/CI/custom_tests/neutron/020__subnets.robot rename to testcases/Controllers/ODL/custom_tests/neutron/020__subnets.robot diff --git a/testcases/Controllers/ODL/CI/custom_tests/neutron/030__ports.robot b/testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot similarity index 100% rename from testcases/Controllers/ODL/CI/custom_tests/neutron/030__ports.robot rename to testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot diff --git a/testcases/Controllers/ODL/CI/custom_tests/neutron/040__delete_ports.txt b/testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.txt similarity index 100% rename from testcases/Controllers/ODL/CI/custom_tests/neutron/040__delete_ports.txt rename to testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.txt diff --git a/testcases/Controllers/ODL/CI/custom_tests/neutron/050__delete_subnets.txt b/testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.txt similarity index 100% rename from testcases/Controllers/ODL/CI/custom_tests/neutron/050__delete_subnets.txt rename to testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.txt diff --git a/testcases/Controllers/ODL/CI/custom_tests/neutron/060__delete_networks.txt b/testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.txt similarity index 100% rename from testcases/Controllers/ODL/CI/custom_tests/neutron/060__delete_networks.txt rename to testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.txt diff --git a/testcases/Controllers/ODL/CI/odlreport2db.py b/testcases/Controllers/ODL/odlreport2db.py similarity index 100% rename from testcases/Controllers/ODL/CI/odlreport2db.py rename to testcases/Controllers/ODL/odlreport2db.py diff --git a/testcases/Controllers/ODL/CI/start_tests.sh b/testcases/Controllers/ODL/start_tests.sh similarity index 100% rename from testcases/Controllers/ODL/CI/start_tests.sh rename to testcases/Controllers/ODL/start_tests.sh diff --git a/testcases/Controllers/ODL/CI/test_list.txt b/testcases/Controllers/ODL/test_list.txt similarity index 100% rename from testcases/Controllers/ODL/CI/test_list.txt rename to testcases/Controllers/ODL/test_list.txt diff --git a/testcases/Controllers/ONOS/Teston/CI/Readme.txt b/testcases/Controllers/ONOS/Teston/Readme.txt similarity index 100% rename from testcases/Controllers/ONOS/Teston/CI/Readme.txt rename to testcases/Controllers/ONOS/Teston/Readme.txt diff --git a/testcases/Controllers/ONOS/Teston/CI/__init__.py b/testcases/Controllers/ONOS/Teston/__init__.py similarity index 100% rename from testcases/Controllers/ONOS/Teston/CI/__init__.py rename to testcases/Controllers/ONOS/Teston/__init__.py diff --git a/testcases/Controllers/ONOS/Teston/CI/adapters/__init__.py b/testcases/Controllers/ONOS/Teston/adapters/__init__.py similarity index 100% rename from testcases/Controllers/ONOS/Teston/CI/adapters/__init__.py rename to testcases/Controllers/ONOS/Teston/adapters/__init__.py diff --git a/testcases/Controllers/ONOS/Teston/CI/adapters/client.py b/testcases/Controllers/ONOS/Teston/adapters/client.py similarity index 100% rename from testcases/Controllers/ONOS/Teston/CI/adapters/client.py rename to testcases/Controllers/ONOS/Teston/adapters/client.py diff --git a/testcases/Controllers/ONOS/Teston/CI/adapters/connection.py b/testcases/Controllers/ONOS/Teston/adapters/connection.py similarity index 100% rename from testcases/Controllers/ONOS/Teston/CI/adapters/connection.py rename to testcases/Controllers/ONOS/Teston/adapters/connection.py diff --git a/testcases/Controllers/ONOS/Teston/CI/adapters/environment.py b/testcases/Controllers/ONOS/Teston/adapters/environment.py similarity index 100% rename from testcases/Controllers/ONOS/Teston/CI/adapters/environment.py rename to testcases/Controllers/ONOS/Teston/adapters/environment.py diff --git a/testcases/Controllers/ONOS/Teston/CI/adapters/foundation.py b/testcases/Controllers/ONOS/Teston/adapters/foundation.py similarity index 100% rename from testcases/Controllers/ONOS/Teston/CI/adapters/foundation.py rename to testcases/Controllers/ONOS/Teston/adapters/foundation.py diff --git a/testcases/Controllers/ONOS/Teston/CI/dependencies/onos b/testcases/Controllers/ONOS/Teston/dependencies/onos similarity index 100% rename from testcases/Controllers/ONOS/Teston/CI/dependencies/onos rename to testcases/Controllers/ONOS/Teston/dependencies/onos diff --git a/testcases/Controllers/ONOS/Teston/CI/log/gitignore b/testcases/Controllers/ONOS/Teston/log/gitignore similarity index 100% rename from testcases/Controllers/ONOS/Teston/CI/log/gitignore rename to testcases/Controllers/ONOS/Teston/log/gitignore diff --git a/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py b/testcases/Controllers/ONOS/Teston/onosfunctest.py similarity index 98% rename from testcases/Controllers/ONOS/Teston/CI/onosfunctest.py rename to testcases/Controllers/ONOS/Teston/onosfunctest.py index 1e278e6a1..07ecacc5d 100644 --- a/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py +++ b/testcases/Controllers/ONOS/Teston/onosfunctest.py @@ -45,7 +45,7 @@ if not os.path.exists(REPO_PATH): logger.error("Functest repository directory not found '%s'" % REPO_PATH) exit(-1) -ONOSCI_PATH = REPO_PATH + 'testcases/Controllers/ONOS/Teston/CI/' +ONOSCI_PATH = REPO_PATH + 'testcases/Controllers/ONOS/Teston/' starttime = datetime.datetime.now() HOME = os.environ['HOME'] + "/" diff --git a/testcases/VIM/OpenStack/CI/libraries/healthcheck.sh b/testcases/OpenStack/healthcheck/healthcheck.sh similarity index 100% rename from testcases/VIM/OpenStack/CI/libraries/healthcheck.sh rename to testcases/OpenStack/healthcheck/healthcheck.sh diff --git a/testcases/VIM/OpenStack/CI/rally_cert/macro/macro.yaml b/testcases/OpenStack/rally/macro/macro.yaml similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/macro/macro.yaml rename to testcases/OpenStack/rally/macro/macro.yaml diff --git a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py b/testcases/OpenStack/rally/run_rally-cert.py similarity index 98% rename from testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py rename to testcases/OpenStack/rally/run_rally-cert.py index 4dc1e16d5..c3dd304ac 100755 --- a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py +++ b/testcases/OpenStack/rally/run_rally-cert.py @@ -88,10 +88,10 @@ with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: f.close() HOME = os.environ['HOME'] + "/" -SCENARIOS_DIR = REPO_PATH + functest_yaml.get("general").get( - "directories").get("dir_rally_scn") -TEMPLATE_DIR = SCENARIOS_DIR + "scenario/templates" -SUPPORT_DIR = SCENARIOS_DIR + "scenario/support" +RALLY_DIR = REPO_PATH + functest_yaml.get("general").get( + "directories").get("dir_rally") +TEMPLATE_DIR = RALLY_DIR + "scenario/templates" +SUPPORT_DIR = RALLY_DIR + "scenario/support" FLAVOR_NAME = "m1.tiny" USERS_AMOUNT = 2 @@ -304,12 +304,12 @@ def run_task(test_name): global SUMMARY logger.info('Starting test scenario "{}" ...'.format(test_name)) - task_file = '{}task.yaml'.format(SCENARIOS_DIR) + task_file = '{}task.yaml'.format(RALLY_DIR) if not os.path.exists(task_file): logger.error("Task file '%s' does not exist." % task_file) exit(-1) - test_file_name = '{}opnfv-{}.yaml'.format(SCENARIOS_DIR + "scenario/", + test_file_name = '{}opnfv-{}.yaml'.format(RALLY_DIR + "scenario/", test_name) if not os.path.exists(test_file_name): logger.error("The scenario '%s' does not exist." % test_file_name) diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-authenticate.yaml b/testcases/OpenStack/rally/scenario/opnfv-authenticate.yaml similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-authenticate.yaml rename to testcases/OpenStack/rally/scenario/opnfv-authenticate.yaml diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-cinder.yaml b/testcases/OpenStack/rally/scenario/opnfv-cinder.yaml similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-cinder.yaml rename to testcases/OpenStack/rally/scenario/opnfv-cinder.yaml diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-glance.yaml b/testcases/OpenStack/rally/scenario/opnfv-glance.yaml similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-glance.yaml rename to testcases/OpenStack/rally/scenario/opnfv-glance.yaml diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-heat.yaml b/testcases/OpenStack/rally/scenario/opnfv-heat.yaml similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-heat.yaml rename to testcases/OpenStack/rally/scenario/opnfv-heat.yaml diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-keystone.yaml b/testcases/OpenStack/rally/scenario/opnfv-keystone.yaml similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-keystone.yaml rename to testcases/OpenStack/rally/scenario/opnfv-keystone.yaml diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-neutron.yaml b/testcases/OpenStack/rally/scenario/opnfv-neutron.yaml similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-neutron.yaml rename to testcases/OpenStack/rally/scenario/opnfv-neutron.yaml diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-nova.yaml b/testcases/OpenStack/rally/scenario/opnfv-nova.yaml similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-nova.yaml rename to testcases/OpenStack/rally/scenario/opnfv-nova.yaml diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-quotas.yaml b/testcases/OpenStack/rally/scenario/opnfv-quotas.yaml similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-quotas.yaml rename to testcases/OpenStack/rally/scenario/opnfv-quotas.yaml diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-requests.yaml b/testcases/OpenStack/rally/scenario/opnfv-requests.yaml similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-requests.yaml rename to testcases/OpenStack/rally/scenario/opnfv-requests.yaml diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-smoke.yaml b/testcases/OpenStack/rally/scenario/opnfv-smoke.yaml similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-smoke.yaml rename to testcases/OpenStack/rally/scenario/opnfv-smoke.yaml diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-vm.yaml b/testcases/OpenStack/rally/scenario/opnfv-vm.yaml similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-vm.yaml rename to testcases/OpenStack/rally/scenario/opnfv-vm.yaml diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/support/instance_dd_test.sh b/testcases/OpenStack/rally/scenario/support/instance_dd_test.sh similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/scenario/support/instance_dd_test.sh rename to testcases/OpenStack/rally/scenario/support/instance_dd_test.sh diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/autoscaling_policy.yaml.template b/testcases/OpenStack/rally/scenario/templates/autoscaling_policy.yaml.template similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/autoscaling_policy.yaml.template rename to testcases/OpenStack/rally/scenario/templates/autoscaling_policy.yaml.template diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/default.yaml.template b/testcases/OpenStack/rally/scenario/templates/default.yaml.template similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/default.yaml.template rename to testcases/OpenStack/rally/scenario/templates/default.yaml.template diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/random_strings.yaml.template b/testcases/OpenStack/rally/scenario/templates/random_strings.yaml.template similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/random_strings.yaml.template rename to testcases/OpenStack/rally/scenario/templates/random_strings.yaml.template diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/resource_group.yaml.template b/testcases/OpenStack/rally/scenario/templates/resource_group.yaml.template similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/resource_group.yaml.template rename to testcases/OpenStack/rally/scenario/templates/resource_group.yaml.template diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/server_with_ports.yaml.template b/testcases/OpenStack/rally/scenario/templates/server_with_ports.yaml.template similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/server_with_ports.yaml.template rename to testcases/OpenStack/rally/scenario/templates/server_with_ports.yaml.template diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/server_with_volume.yaml.template b/testcases/OpenStack/rally/scenario/templates/server_with_volume.yaml.template similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/server_with_volume.yaml.template rename to testcases/OpenStack/rally/scenario/templates/server_with_volume.yaml.template diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/updated_autoscaling_policy_inplace.yaml.template b/testcases/OpenStack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/updated_autoscaling_policy_inplace.yaml.template rename to testcases/OpenStack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/updated_random_strings_add.yaml.template b/testcases/OpenStack/rally/scenario/templates/updated_random_strings_add.yaml.template similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/updated_random_strings_add.yaml.template rename to testcases/OpenStack/rally/scenario/templates/updated_random_strings_add.yaml.template diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/updated_random_strings_delete.yaml.template b/testcases/OpenStack/rally/scenario/templates/updated_random_strings_delete.yaml.template similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/updated_random_strings_delete.yaml.template rename to testcases/OpenStack/rally/scenario/templates/updated_random_strings_delete.yaml.template diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/updated_random_strings_replace.yaml.template b/testcases/OpenStack/rally/scenario/templates/updated_random_strings_replace.yaml.template similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/updated_random_strings_replace.yaml.template rename to testcases/OpenStack/rally/scenario/templates/updated_random_strings_replace.yaml.template diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/updated_resource_group_increase.yaml.template b/testcases/OpenStack/rally/scenario/templates/updated_resource_group_increase.yaml.template similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/updated_resource_group_increase.yaml.template rename to testcases/OpenStack/rally/scenario/templates/updated_resource_group_increase.yaml.template diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/updated_resource_group_reduce.yaml.template b/testcases/OpenStack/rally/scenario/templates/updated_resource_group_reduce.yaml.template similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/updated_resource_group_reduce.yaml.template rename to testcases/OpenStack/rally/scenario/templates/updated_resource_group_reduce.yaml.template diff --git a/testcases/VIM/OpenStack/CI/rally_cert/task.yaml b/testcases/OpenStack/rally/task.yaml similarity index 100% rename from testcases/VIM/OpenStack/CI/rally_cert/task.yaml rename to testcases/OpenStack/rally/task.yaml diff --git a/testcases/VIM/OpenStack/CI/custom_tests/defcore_req.txt b/testcases/OpenStack/tempest/custom_tests/defcore_req.txt similarity index 100% rename from testcases/VIM/OpenStack/CI/custom_tests/defcore_req.txt rename to testcases/OpenStack/tempest/custom_tests/defcore_req.txt diff --git a/testcases/VIM/OpenStack/CI/libraries/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py similarity index 100% rename from testcases/VIM/OpenStack/CI/libraries/run_tempest.py rename to testcases/OpenStack/tempest/run_tempest.py diff --git a/testcases/vPing/CI/libraries/ping.sh b/testcases/OpenStack/vPing/ping.sh similarity index 100% rename from testcases/vPing/CI/libraries/ping.sh rename to testcases/OpenStack/vPing/ping.sh diff --git a/testcases/vPing/CI/libraries/vPing_ssh.py b/testcases/OpenStack/vPing/vPing_ssh.py similarity index 99% rename from testcases/vPing/CI/libraries/vPing_ssh.py rename to testcases/OpenStack/vPing/vPing_ssh.py index fa9770ba8..5b392e866 100644 --- a/testcases/vPing/CI/libraries/vPing_ssh.py +++ b/testcases/OpenStack/vPing/vPing_ssh.py @@ -393,7 +393,7 @@ def main(): scp = SCPClient(ssh.get_transport()) - ping_script = REPO_PATH + "testcases/vPing/CI/libraries/ping.sh" + ping_script = REPO_PATH + "testcases/vPing/ping.sh" try: scp.put(ping_script, "~/") except: diff --git a/testcases/vPing/CI/libraries/vPing_userdata.py b/testcases/OpenStack/vPing/vPing_userdata.py similarity index 100% rename from testcases/vPing/CI/libraries/vPing_userdata.py rename to testcases/OpenStack/vPing/vPing_userdata.py diff --git a/testcases/vIMS/CI/clearwater.py b/testcases/vIMS/clearwater.py similarity index 100% rename from testcases/vIMS/CI/clearwater.py rename to testcases/vIMS/clearwater.py diff --git a/testcases/vIMS/CI/create_venv.sh b/testcases/vIMS/create_venv.sh similarity index 100% rename from testcases/vIMS/CI/create_venv.sh rename to testcases/vIMS/create_venv.sh diff --git a/testcases/vIMS/CI/orchestrator.py b/testcases/vIMS/orchestrator.py similarity index 100% rename from testcases/vIMS/CI/orchestrator.py rename to testcases/vIMS/orchestrator.py diff --git a/testcases/vIMS/CI/requirements.pip b/testcases/vIMS/requirements.pip similarity index 100% rename from testcases/vIMS/CI/requirements.pip rename to testcases/vIMS/requirements.pip diff --git a/testcases/vIMS/CI/vIMS.py b/testcases/vIMS/vIMS.py similarity index 100% rename from testcases/vIMS/CI/vIMS.py rename to testcases/vIMS/vIMS.py -- 2.16.6