aboutsummaryrefslogtreecommitdiffstats
path: root/functest/cli
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2017-06-06 13:36:06 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-06-06 13:36:06 +0000
commit6c6b03b310cf60b251a52127901431f7d059e45f (patch)
treea0af3097253a14de0052266e45adaa73b0c752d6 /functest/cli
parent5e9320777016b10685b7edeecfd2b6d0f1ffabbe (diff)
parent81e3719bce31a74b027e5ba97b5b89d76e133e5e (diff)
Merge "Remove call to fetch_os_creds.sh"
Diffstat (limited to 'functest/cli')
-rw-r--r--functest/cli/cli_base.py6
-rw-r--r--functest/cli/commands/cli_os.py28
2 files changed, 0 insertions, 34 deletions
diff --git a/functest/cli/cli_base.py b/functest/cli/cli_base.py
index 2104e125c..2f085834c 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 5e6e1109a..c66362fce 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'),