diff options
| author |   Linda Wang <wangwulin@huawei.com> | 2017-05-23 02:39:25 +0000 |
|---|---|---|
| committer |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-05-23 10:17:07 +0200 |
| commit | 6f3170e8e1307ad5e153de9c4d10e3e0b8b7e2ab (patch) | |
| tree | 2d0915298377448be96a41d03fe2073311d049e2 | |
| parent | 2d38d6ddfd88dd04fc3148984de6e633a545a456 (diff) | |
Call fetch_os_creds.sh from $PATH
Now it's defined as script in releng/modules' setup.py [1]
[1] https://gerrit.opnfv.org/gerrit/#/c/35183/
Co-Authored-By: Cédric Ollivier <cedric.ollivier@orange.com>
Depends-On: Ic77f4e46d6d3396f9891b73105a0eb7aa037754f
JIRA: FUNCTEST-829
Change-Id: Ief821b7326e0a6c2bbcab31bb21629455e4bc9ea
Signed-off-by: Linda Wang <wangwulin@huawei.com>
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | docs/testing/user/configguide/configguide.rst | 2 | ||||
| -rw-r--r-- | functest/cli/commands/cli_os.py | 5 | ||||
| -rw-r--r-- | functest/tests/unit/cli/commands/test_cli_os.py | 15 |
3 files changed, 9 insertions, 13 deletions
diff --git a/docs/testing/user/configguide/configguide.rst b/docs/testing/user/configguide/configguide.rst index 9a1749789..12dfd1059 100644 --- a/docs/testing/user/configguide/configguide.rst +++ b/docs/testing/user/configguide/configguide.rst @@ -74,7 +74,7 @@ executing the following sequence #. Log in to container and execute the following command. Replace the IP with installer address after the "-a" parameter:: - $REPOS_DIR/releng/utils/fetch_os_creds.sh \ + fetch_os_creds.sh \ -d /home/opnfv/functest/conf/openstack.creds \ -i fuel \ -a 10.20.0.2 \ diff --git a/functest/cli/commands/cli_os.py b/functest/cli/commands/cli_os.py index e54eb423a..5e6e1109a 100644 --- a/functest/cli/commands/cli_os.py +++ b/functest/cli/commands/cli_os.py @@ -67,9 +67,8 @@ class CliOpenStack(object): if installer_ip is None: click.echo("The environment variable 'INSTALLER_IP' is not" "defined. Please export it") - cmd = ("%s/releng/utils/fetch_os_creds.sh -d %s -i %s -a %s" - % (CONST.__getattribute__('dir_repos'), - self.openstack_creds, + cmd = ("fetch_os_creds.sh -d %s -i %s -a %s" + % (self.openstack_creds, installer_type, installer_ip)) click.echo("Fetching credentials from installer node '%s' with IP=%s.." diff --git a/functest/tests/unit/cli/commands/test_cli_os.py b/functest/tests/unit/cli/commands/test_cli_os.py index 7ab4ddc3b..b551ee4d2 100644 --- a/functest/tests/unit/cli/commands/test_cli_os.py +++ b/functest/tests/unit/cli/commands/test_cli_os.py @@ -70,9 +70,8 @@ class CliOpenStackTesting(unittest.TestCase): mock_ftutils_execute): CONST.__setattr__('INSTALLER_TYPE', self.installer_type) CONST.__setattr__('INSTALLER_IP', self.installer_ip) - cmd = ("%s/releng/utils/fetch_os_creds.sh -d %s -i %s -a %s" - % (CONST.__getattribute__('dir_repos'), - self.openstack_creds, + cmd = ("fetch_os_creds.sh -d %s -i %s -a %s" + % (self.openstack_creds, self.installer_type, self.installer_ip)) self.cli_os.openstack_creds = self.openstack_creds @@ -93,9 +92,8 @@ class CliOpenStackTesting(unittest.TestCase): mock_ftutils_execute): CONST.__setattr__('INSTALLER_TYPE', None) CONST.__setattr__('INSTALLER_IP', self.installer_ip) - cmd = ("%s/releng/utils/fetch_os_creds.sh -d %s -i %s -a %s" - % (CONST.__getattribute__('dir_repos'), - self.openstack_creds, + cmd = ("fetch_os_creds.sh -d %s -i %s -a %s" + % (self.openstack_creds, None, self.installer_ip)) self.cli_os.openstack_creds = self.openstack_creds @@ -121,9 +119,8 @@ class CliOpenStackTesting(unittest.TestCase): installer_ip = None CONST.__setattr__('INSTALLER_TYPE', installer_type) CONST.__setattr__('INSTALLER_IP', installer_ip) - cmd = ("%s/releng/utils/fetch_os_creds.sh -d %s -i %s -a %s" - % (CONST.__getattribute__('dir_repos'), - self.openstack_creds, + cmd = ("fetch_os_creds.sh -d %s -i %s -a %s" + % (self.openstack_creds, installer_type, installer_ip)) self.cli_os.openstack_creds = self.openstack_creds |