diff options
author | jose.lausuch <jose.lausuch@ericsson.com> | 2017-05-31 17:17:44 +0200 |
---|---|---|
committer | jose.lausuch <jose.lausuch@ericsson.com> | 2017-06-06 15:13:11 +0200 |
commit | 81e3719bce31a74b027e5ba97b5b89d76e133e5e (patch) | |
tree | 857ac218d6d8ee487ec8adf64eb1a783fb0090ff /functest/cli | |
parent | cce3644b0b0186676de974d32e02219e2ae5dc50 (diff) |
Remove call to fetch_os_creds.sh
After [1], the openstack credentials
are provided to Functest as a volume
directly from CI. The same has to be
done manually.
Functest doesn't need the script
fetch_os_creds.sh any longer.
[1] https://gerrit.opnfv.org/gerrit/#/c/35199/
Change-Id: I0883ad7b248526cfe9df3fde984345bd41869e82
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
Diffstat (limited to 'functest/cli')
-rw-r--r-- | functest/cli/cli_base.py | 6 | ||||
-rw-r--r-- | functest/cli/commands/cli_os.py | 28 |
2 files changed, 0 insertions, 34 deletions
diff --git a/functest/cli/cli_base.py b/functest/cli/cli_base.py index 2104e125..2f085834 100644 --- a/functest/cli/cli_base.py +++ b/functest/cli/cli_base.py @@ -86,12 +86,6 @@ def os_show_credentials(): _openstack.show_credentials() -@openstack.command('fetch-rc', help="Fetch the OpenStack RC file from " - "the installer.") -def os_fetch_rc(): - _openstack.fetch_credentials() - - @env.command('prepare', help="Prepares the Functest environment. This step is " "needed run the tests.") def env_prepare(): diff --git a/functest/cli/commands/cli_os.py b/functest/cli/commands/cli_os.py index 5e6e1109..c66362fc 100644 --- a/functest/cli/commands/cli_os.py +++ b/functest/cli/commands/cli_os.py @@ -47,34 +47,6 @@ class CliOpenStack(object): if key.startswith('OS_'): click.echo("{}={}".format(key, value)) - def fetch_credentials(self): - if os.path.isfile(self.openstack_creds): - answer = raw_input("It seems the RC file is already present. " - "Do you want to overwrite it? [y|n]\n") - while True: - if answer.lower() in ["y", "yes"]: - break - elif answer.lower() in ["n", "no"]: - return - else: - answer = raw_input("Invalid answer. Please type [y|n]\n") - - installer_type = CONST.__getattribute__('INSTALLER_TYPE') - if installer_type is None: - click.echo("The environment variable 'INSTALLER_TYPE' is not" - "defined. Please export it") - installer_ip = CONST.__getattribute__('INSTALLER_IP') - if installer_ip is None: - click.echo("The environment variable 'INSTALLER_IP' is not" - "defined. Please export it") - 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.." - % (installer_type, installer_ip)) - ft_utils.execute_command(cmd, verbose=False) - def check(self): self.ping_endpoint() cmd = os.path.join(CONST.__getattribute__('dir_repo_functest'), |