Merge "rename tempest.conf to refstack_tempest.conf"

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index a9ad15c..f291cf1 100644 (file)
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -125,7 +125,7 @@ rally:
     router_name: rally-router
 
 refstack:
-    tempest_conf_path: openstack/refstack_client/tempest.conf
+    tempest_conf_path: openstack/refstack_client/refstack_tempest.conf
     defcore_list: openstack/refstack_client/defcore.txt
 
 vnf:

diff --git a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
index 7aff251..2f2fc00 100755 (executable)
--- a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
+++ b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
@@ -171,7 +171,7 @@ class RefstackClient(testcase.TestCase):
         '''used for manually running,
            python refstack_client.py -c <tempest_conf_path>
            --testlist <testlist_path>
-           can generate a reference tempest.conf by
+           can generate a reference refstack_tempest.conf by
            python tempest_conf.py
         '''
         try:
@@ -206,7 +206,7 @@ class RefstackClientParser(object):
         self.parser = argparse.ArgumentParser()
         self.parser.add_argument(
             '-c', '--config',
-            help='the file path of tempest.conf',
+            help='the file path of refstack_tempest.conf',
             default=self.confpath)
         self.parser.add_argument(
             '-t', '--testlist',