aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2017-05-02 11:50:20 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-02 11:50:20 +0000
commit35473374d1eba4814b8344d094e62210ef17d9b1 (patch)
tree5a452023a22fbf48c5fc6c4f5c86e5caeb9d4595
parent90238c6c2c6b8c63062f3fe1c1611d594d72604b (diff)
parent8bbfda2df0a3a10d069a41c0f074b0de69737767 (diff)
Merge "rename tempest.conf to refstack_tempest.conf"
-rw-r--r--functest/ci/config_functest.yaml2
-rwxr-xr-xfunctest/opnfv_tests/openstack/refstack_client/refstack_client.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index a9ad15ca..f291cf1f 100644
--- 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 7aff251b..2f2fc00f 100755
--- 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',