57 files changed, 8 insertions, 8 deletions
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