diff options
author | 2016-05-17 21:36:56 +0200 | |
---|---|---|
committer | 2016-05-17 22:31:32 +0200 | |
commit | 68d29b6f6e71df6b4f177cd417f98d9e977f8893 (patch) | |
tree | 11d740e368eee5ef2e6e7cd020cb25201df64e4c | |
parent | d338cc665efc9a2d73d6dff1567dc6de6bc63bd8 (diff) |
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 <jose.lausuch@ericsson.com>
-rw-r--r-- | ci/config_functest.yaml | 13 | ||||
-rwxr-xr-x | ci/exec_test.sh | 36 | ||||
-rw-r--r-- | ci/tier_handler.py | 4 | ||||
-rw-r--r-- | testcases/Controllers/ODL/custom_tests/neutron/010__networks.robot (renamed from testcases/Controllers/ODL/CI/custom_tests/neutron/010__networks.robot) | 0 | ||||
-rw-r--r-- | testcases/Controllers/ODL/custom_tests/neutron/020__subnets.robot (renamed from testcases/Controllers/ODL/CI/custom_tests/neutron/020__subnets.robot) | 0 | ||||
-rw-r--r-- | testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot (renamed from testcases/Controllers/ODL/CI/custom_tests/neutron/030__ports.robot) | 0 | ||||
-rw-r--r-- | testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.txt (renamed from testcases/Controllers/ODL/CI/custom_tests/neutron/040__delete_ports.txt) | 0 | ||||
-rw-r--r-- | testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.txt (renamed from testcases/Controllers/ODL/CI/custom_tests/neutron/050__delete_subnets.txt) | 0 | ||||
-rw-r--r-- | testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.txt (renamed from testcases/Controllers/ODL/CI/custom_tests/neutron/060__delete_networks.txt) | 0 | ||||
-rw-r--r-- | testcases/Controllers/ODL/odlreport2db.py (renamed from testcases/Controllers/ODL/CI/odlreport2db.py) | 0 | ||||
-rwxr-xr-x | testcases/Controllers/ODL/start_tests.sh (renamed from testcases/Controllers/ODL/CI/start_tests.sh) | 0 | ||||
-rw-r--r-- | testcases/Controllers/ODL/test_list.txt (renamed from testcases/Controllers/ODL/CI/test_list.txt) | 0 | ||||
-rw-r--r-- | testcases/Controllers/ONOS/Teston/Readme.txt (renamed from testcases/Controllers/ONOS/Teston/CI/Readme.txt) | 0 | ||||
-rw-r--r-- | testcases/Controllers/ONOS/Teston/__init__.py (renamed from testcases/Controllers/ONOS/Teston/CI/__init__.py) | 0 | ||||
-rw-r--r-- | testcases/Controllers/ONOS/Teston/adapters/__init__.py (renamed from testcases/Controllers/ONOS/Teston/CI/adapters/__init__.py) | 0 | ||||
-rw-r--r-- | testcases/Controllers/ONOS/Teston/adapters/client.py (renamed from testcases/Controllers/ONOS/Teston/CI/adapters/client.py) | 0 | ||||
-rw-r--r-- | testcases/Controllers/ONOS/Teston/adapters/connection.py (renamed from testcases/Controllers/ONOS/Teston/CI/adapters/connection.py) | 0 | ||||
-rw-r--r-- | testcases/Controllers/ONOS/Teston/adapters/environment.py (renamed from testcases/Controllers/ONOS/Teston/CI/adapters/environment.py) | 0 | ||||
-rw-r--r-- | testcases/Controllers/ONOS/Teston/adapters/foundation.py (renamed from testcases/Controllers/ONOS/Teston/CI/adapters/foundation.py) | 0 | ||||
-rw-r--r-- | testcases/Controllers/ONOS/Teston/dependencies/onos (renamed from testcases/Controllers/ONOS/Teston/CI/dependencies/onos) | 0 | ||||
-rw-r--r-- | testcases/Controllers/ONOS/Teston/log/gitignore (renamed from testcases/Controllers/ONOS/Teston/CI/log/gitignore) | 0 | ||||
-rw-r--r-- | testcases/Controllers/ONOS/Teston/onosfunctest.py (renamed from testcases/Controllers/ONOS/Teston/CI/onosfunctest.py) | 2 | ||||
-rwxr-xr-x | testcases/OpenStack/healthcheck/healthcheck.sh (renamed from testcases/VIM/OpenStack/CI/libraries/healthcheck.sh) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/rally/macro/macro.yaml (renamed from testcases/VIM/OpenStack/CI/rally_cert/macro/macro.yaml) | 0 | ||||
-rwxr-xr-x | testcases/OpenStack/rally/run_rally-cert.py (renamed from testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py) | 12 | ||||
-rw-r--r-- | testcases/OpenStack/rally/scenario/opnfv-authenticate.yaml (renamed from testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-authenticate.yaml) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/rally/scenario/opnfv-cinder.yaml (renamed from testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-cinder.yaml) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/rally/scenario/opnfv-glance.yaml (renamed from testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-glance.yaml) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/rally/scenario/opnfv-heat.yaml (renamed from testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-heat.yaml) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/rally/scenario/opnfv-keystone.yaml (renamed from testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-keystone.yaml) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/rally/scenario/opnfv-neutron.yaml (renamed from testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-neutron.yaml) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/rally/scenario/opnfv-nova.yaml (renamed from testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-nova.yaml) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/rally/scenario/opnfv-quotas.yaml (renamed from testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-quotas.yaml) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/rally/scenario/opnfv-requests.yaml (renamed from testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-requests.yaml) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/rally/scenario/opnfv-smoke.yaml (renamed from testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-smoke.yaml) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/rally/scenario/opnfv-vm.yaml (renamed from testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-vm.yaml) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/rally/scenario/support/instance_dd_test.sh (renamed from testcases/VIM/OpenStack/CI/rally_cert/scenario/support/instance_dd_test.sh) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/rally/scenario/templates/autoscaling_policy.yaml.template (renamed from testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/autoscaling_policy.yaml.template) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/rally/scenario/templates/default.yaml.template (renamed from testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/default.yaml.template) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/rally/scenario/templates/random_strings.yaml.template (renamed from testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/random_strings.yaml.template) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/rally/scenario/templates/resource_group.yaml.template (renamed from testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/resource_group.yaml.template) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/rally/scenario/templates/server_with_ports.yaml.template (renamed from testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/server_with_ports.yaml.template) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/rally/scenario/templates/server_with_volume.yaml.template (renamed from testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/server_with_volume.yaml.template) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template (renamed from testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/updated_autoscaling_policy_inplace.yaml.template) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/rally/scenario/templates/updated_random_strings_add.yaml.template (renamed from testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/updated_random_strings_add.yaml.template) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/rally/scenario/templates/updated_random_strings_delete.yaml.template (renamed from testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/updated_random_strings_delete.yaml.template) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/rally/scenario/templates/updated_random_strings_replace.yaml.template (renamed from testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/updated_random_strings_replace.yaml.template) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/rally/scenario/templates/updated_resource_group_increase.yaml.template (renamed from testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/updated_resource_group_increase.yaml.template) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/rally/scenario/templates/updated_resource_group_reduce.yaml.template (renamed from testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/updated_resource_group_reduce.yaml.template) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/rally/task.yaml (renamed from testcases/VIM/OpenStack/CI/rally_cert/task.yaml) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/tempest/custom_tests/defcore_req.txt (renamed from testcases/VIM/OpenStack/CI/custom_tests/defcore_req.txt) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/tempest/run_tempest.py (renamed from testcases/VIM/OpenStack/CI/libraries/run_tempest.py) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/vPing/ping.sh (renamed from testcases/vPing/CI/libraries/ping.sh) | 0 | ||||
-rw-r--r-- | testcases/OpenStack/vPing/vPing_ssh.py (renamed from testcases/vPing/CI/libraries/vPing_ssh.py) | 2 | ||||
-rw-r--r-- | testcases/OpenStack/vPing/vPing_userdata.py (renamed from testcases/vPing/CI/libraries/vPing_userdata.py) | 0 | ||||
-rw-r--r-- | testcases/vIMS/clearwater.py (renamed from testcases/vIMS/CI/clearwater.py) | 0 | ||||
-rwxr-xr-x | testcases/vIMS/create_venv.sh (renamed from testcases/vIMS/CI/create_venv.sh) | 0 | ||||
-rw-r--r-- | testcases/vIMS/orchestrator.py (renamed from testcases/vIMS/CI/orchestrator.py) | 0 | ||||
-rw-r--r-- | testcases/vIMS/requirements.pip (renamed from testcases/vIMS/CI/requirements.pip) | 0 | ||||
-rw-r--r-- | testcases/vIMS/vIMS.py (renamed from testcases/vIMS/CI/vIMS.py) | 0 |
60 files changed, 32 insertions, 37 deletions
diff --git a/ci/config_functest.yaml b/ci/config_functest.yaml index 29a74afd..ab620f02 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 013b98c2..61d00c74 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 2fc7a9c4..03db4a91 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 index 583a6a15..583a6a15 100644 --- a/testcases/Controllers/ODL/CI/custom_tests/neutron/010__networks.robot +++ b/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 index 5f5b8244..5f5b8244 100644 --- a/testcases/Controllers/ODL/CI/custom_tests/neutron/020__subnets.robot +++ b/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 index 8b75733b..8b75733b 100644 --- a/testcases/Controllers/ODL/CI/custom_tests/neutron/030__ports.robot +++ b/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 index f1029883..f1029883 100644 --- a/testcases/Controllers/ODL/CI/custom_tests/neutron/040__delete_ports.txt +++ b/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 index fb619825..fb619825 100644 --- a/testcases/Controllers/ODL/CI/custom_tests/neutron/050__delete_subnets.txt +++ b/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 index 528fbfca..528fbfca 100644 --- a/testcases/Controllers/ODL/CI/custom_tests/neutron/060__delete_networks.txt +++ b/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 index 50c8b096..50c8b096 100644 --- a/testcases/Controllers/ODL/CI/odlreport2db.py +++ b/testcases/Controllers/ODL/odlreport2db.py diff --git a/testcases/Controllers/ODL/CI/start_tests.sh b/testcases/Controllers/ODL/start_tests.sh index 3800b630..3800b630 100755 --- a/testcases/Controllers/ODL/CI/start_tests.sh +++ b/testcases/Controllers/ODL/start_tests.sh diff --git a/testcases/Controllers/ODL/CI/test_list.txt b/testcases/Controllers/ODL/test_list.txt index ad791e55..ad791e55 100644 --- a/testcases/Controllers/ODL/CI/test_list.txt +++ b/testcases/Controllers/ODL/test_list.txt diff --git a/testcases/Controllers/ONOS/Teston/CI/Readme.txt b/testcases/Controllers/ONOS/Teston/Readme.txt index 7393f59a..7393f59a 100644 --- a/testcases/Controllers/ONOS/Teston/CI/Readme.txt +++ b/testcases/Controllers/ONOS/Teston/Readme.txt diff --git a/testcases/Controllers/ONOS/Teston/CI/__init__.py b/testcases/Controllers/ONOS/Teston/__init__.py index e69de29b..e69de29b 100644 --- a/testcases/Controllers/ONOS/Teston/CI/__init__.py +++ b/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 index e69de29b..e69de29b 100644 --- a/testcases/Controllers/ONOS/Teston/CI/adapters/__init__.py +++ b/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 index 77de092e..77de092e 100644 --- a/testcases/Controllers/ONOS/Teston/CI/adapters/client.py +++ b/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 index 16f2ef32..16f2ef32 100644 --- a/testcases/Controllers/ONOS/Teston/CI/adapters/connection.py +++ b/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 index 49f7f963..49f7f963 100644 --- a/testcases/Controllers/ONOS/Teston/CI/adapters/environment.py +++ b/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 index 47605eb7..47605eb7 100644 --- a/testcases/Controllers/ONOS/Teston/CI/adapters/foundation.py +++ b/testcases/Controllers/ONOS/Teston/adapters/foundation.py diff --git a/testcases/Controllers/ONOS/Teston/CI/dependencies/onos b/testcases/Controllers/ONOS/Teston/dependencies/onos index bb02fa89..bb02fa89 100644 --- a/testcases/Controllers/ONOS/Teston/CI/dependencies/onos +++ b/testcases/Controllers/ONOS/Teston/dependencies/onos diff --git a/testcases/Controllers/ONOS/Teston/CI/log/gitignore b/testcases/Controllers/ONOS/Teston/log/gitignore index e69de29b..e69de29b 100644 --- a/testcases/Controllers/ONOS/Teston/CI/log/gitignore +++ b/testcases/Controllers/ONOS/Teston/log/gitignore diff --git a/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py b/testcases/Controllers/ONOS/Teston/onosfunctest.py index 1e278e6a..07ecacc5 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 index 611c100c..611c100c 100755 --- a/testcases/VIM/OpenStack/CI/libraries/healthcheck.sh +++ b/testcases/OpenStack/healthcheck/healthcheck.sh diff --git a/testcases/VIM/OpenStack/CI/rally_cert/macro/macro.yaml b/testcases/OpenStack/rally/macro/macro.yaml index 48c0333e..48c0333e 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/macro/macro.yaml +++ b/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 index 4dc1e16d..c3dd304a 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 index a04e4c1c..a04e4c1c 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-authenticate.yaml +++ b/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 index cb28ee84..cb28ee84 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-cinder.yaml +++ b/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 index adbf8b79..adbf8b79 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-glance.yaml +++ b/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 index 534d796e..534d796e 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-heat.yaml +++ b/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 index bfc9948b..bfc9948b 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-keystone.yaml +++ b/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 index 3804d258..3804d258 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-neutron.yaml +++ b/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 index f0fed8ef..f0fed8ef 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-nova.yaml +++ b/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 index a0682acc..a0682acc 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-quotas.yaml +++ b/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 index 6affcc6c..6affcc6c 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-requests.yaml +++ b/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 index f102edb2..f102edb2 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-smoke.yaml +++ b/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 index 74f50992..74f50992 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-vm.yaml +++ b/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 index e3bf2340..e3bf2340 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/support/instance_dd_test.sh +++ b/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 index a22487e3..a22487e3 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/autoscaling_policy.yaml.template +++ b/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 index eb4f2f2d..eb4f2f2d 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/default.yaml.template +++ b/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 index 2dd676c1..2dd676c1 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/random_strings.yaml.template +++ b/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 index b3f505fa..b3f505fa 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/templates/resource_group.yaml.template +++ b/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 index 909f45d2..909f45d2 100644 --- 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 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 index 826ca9da..826ca9da 100644 --- 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 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 index cf34879c..cf34879c 100644 --- 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 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 index e06d42e0..e06d42e0 100644 --- 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 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 index d02593e3..d02593e3 100644 --- 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 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 index 46d8bff4..46d8bff4 100644 --- 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 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 index 891074eb..891074eb 100644 --- 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 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 index b4d1d173..b4d1d173 100644 --- 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 diff --git a/testcases/VIM/OpenStack/CI/rally_cert/task.yaml b/testcases/OpenStack/rally/task.yaml index b6789166..b6789166 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/task.yaml +++ b/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 index bb1d172d..bb1d172d 100644 --- a/testcases/VIM/OpenStack/CI/custom_tests/defcore_req.txt +++ b/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 index bf62ce30..bf62ce30 100644 --- a/testcases/VIM/OpenStack/CI/libraries/run_tempest.py +++ b/testcases/OpenStack/tempest/run_tempest.py diff --git a/testcases/vPing/CI/libraries/ping.sh b/testcases/OpenStack/vPing/ping.sh index 693b8682..693b8682 100644 --- a/testcases/vPing/CI/libraries/ping.sh +++ b/testcases/OpenStack/vPing/ping.sh diff --git a/testcases/vPing/CI/libraries/vPing_ssh.py b/testcases/OpenStack/vPing/vPing_ssh.py index fa9770ba..5b392e86 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 index 2b296314..2b296314 100644 --- a/testcases/vPing/CI/libraries/vPing_userdata.py +++ b/testcases/OpenStack/vPing/vPing_userdata.py diff --git a/testcases/vIMS/CI/clearwater.py b/testcases/vIMS/clearwater.py index 7236f4fb..7236f4fb 100644 --- a/testcases/vIMS/CI/clearwater.py +++ b/testcases/vIMS/clearwater.py diff --git a/testcases/vIMS/CI/create_venv.sh b/testcases/vIMS/create_venv.sh index 575fd177..575fd177 100755 --- a/testcases/vIMS/CI/create_venv.sh +++ b/testcases/vIMS/create_venv.sh diff --git a/testcases/vIMS/CI/orchestrator.py b/testcases/vIMS/orchestrator.py index c61f654c..c61f654c 100644 --- a/testcases/vIMS/CI/orchestrator.py +++ b/testcases/vIMS/orchestrator.py diff --git a/testcases/vIMS/CI/requirements.pip b/testcases/vIMS/requirements.pip index 9b9d0ba5..9b9d0ba5 100644 --- a/testcases/vIMS/CI/requirements.pip +++ b/testcases/vIMS/requirements.pip diff --git a/testcases/vIMS/CI/vIMS.py b/testcases/vIMS/vIMS.py index 2430af1a..2430af1a 100644 --- a/testcases/vIMS/CI/vIMS.py +++ b/testcases/vIMS/vIMS.py |