diff options
| author |   MatthewLi <matthew.lijun@huawei.com> | 2017-04-22 05:30:51 -0400 |
|---|---|---|
| committer |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-05-13 09:12:54 +0200 |
| commit | 2c48dfc2b32c577c4754c2f1df2e6becc9bf5af3 (patch) | |
| tree | 7f1c8d7158104c6690862cd6d4089c6154b11bb0 | |
| parent | 4af24ab61703bca05a37c062388390ac82d5c96e (diff) | |
rename tempest.conf to refstack_tempest.conf
since for tempest smoke/full, etc, will also use a file named
tempest.conf this wil cover the refstack tempest.conf,
rename it to refstack_tempest.conf, then easily for users to
debug to check if the configure file is correct or not.
Change-Id: Ic2f93fb05effb1a61276cb6ba755076a0404caad
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
(cherry picked from commit 8bbfda2df0a3a10d069a41c0f074b0de69737767)
| -rwxr-xr-x | functest/ci/config_functest.yaml | 2 | ||||
| -rwxr-xr-x | functest/opnfv_tests/openstack/refstack_client/refstack_client.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index 771817b88..7ee2961be 100755 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -124,7 +124,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 d2ac50901..ecc05a307 100755 --- a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py +++ b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py @@ -170,7 +170,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: @@ -205,7 +205,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', |