summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ci/config_functest.yaml13
-rwxr-xr-xci/exec_test.sh36
-rw-r--r--ci/tier_handler.py4
-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-xtestcases/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-xtestcases/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-xtestcases/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-xtestcases/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 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
index 583a6a153..583a6a153 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 5f5b82440..5f5b82440 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 8b75733b7..8b75733b7 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 f10298839..f10298839 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 fb619825b..fb619825b 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 528fbfca2..528fbfca2 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 50c8b096e..50c8b096e 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 3800b6307..3800b6307 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 ad791e553..ad791e553 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 7393f59a1..7393f59a1 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 77de092e4..77de092e4 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 16f2ef32c..16f2ef32c 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 49f7f9632..49f7f9632 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 47605eb74..47605eb74 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 bb02fa899..bb02fa899 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 e69de29bb..e69de29bb 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 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
index 611c100c5..611c100c5 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 48c0333e9..48c0333e9 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 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
index a04e4c1c1..a04e4c1c1 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 cb28ee84e..cb28ee84e 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 adbf8b79a..adbf8b79a 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 534d796ea..534d796ea 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 bfc9948b3..bfc9948b3 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 3804d2589..3804d2589 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 f0fed8ef4..f0fed8ef4 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 a0682acce..a0682acce 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 6affcc6c6..6affcc6c6 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 f102edb2b..f102edb2b 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 74f509925..74f509925 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 e3bf23405..e3bf23405 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 a22487e33..a22487e33 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 eb4f2f2dd..eb4f2f2dd 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 2dd676c11..2dd676c11 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 b3f505fa6..b3f505fa6 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 909f45d21..909f45d21 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 826ca9dae..826ca9dae 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 cf34879ca..cf34879ca 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 e06d42e01..e06d42e01 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 d02593e3b..d02593e3b 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 46d8bff4c..46d8bff4c 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 891074ebc..891074ebc 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 b4d1d1730..b4d1d1730 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 b67891664..b67891664 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 bb1d172df..bb1d172df 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 bf62ce306..bf62ce306 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 693b86825..693b86825 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 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
index 2b2963144..2b2963144 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 7236f4fba..7236f4fba 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 575fd177c..575fd177c 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 c61f654ca..c61f654ca 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 9b9d0ba53..9b9d0ba53 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 2430af1a1..2430af1a1 100644
--- a/testcases/vIMS/CI/vIMS.py
+++ b/testcases/vIMS/vIMS.py