diff options
Diffstat (limited to 'functest')
| -rw-r--r-- | functest/cli/commands/cli_os.py | 5 | ||||
| -rw-r--r-- | functest/tests/unit/cli/commands/test_cli_os.py | 15 |
2 files changed, 8 insertions, 12 deletions
diff --git a/functest/cli/commands/cli_os.py b/functest/cli/commands/cli_os.py index e54eb423..5e6e1109 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 7ab4ddc3..b551ee4d 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 |