Merge "Get auth token when checking deployment"

[functest-xtesting.git] / functest / cli / commands / cli_os.py

diff --git a/functest/cli/commands/cli_os.py b/functest/cli/commands/cli_os.py
index f85f404..9057da8 100644 (file)
--- a/functest/cli/commands/cli_os.py
+++ b/functest/cli/commands/cli_os.py
@@ -11,24 +11,22 @@
 import os
 
 import click
+from six.moves.urllib.parse import urlparse
 
+from functest.ci import check_deployment
 from functest.utils.constants import CONST
-import functest.utils.functest_utils as ft_utils
-import functest.utils.openstack_clean as os_clean
-import functest.utils.openstack_snapshot as os_snapshot
 
 
-class CliOpenStack(object):
+class OpenStack(object):
 
     def __init__(self):
-        self.os_auth_url = CONST.OS_AUTH_URL
+        self.os_auth_url = CONST.__getattribute__('OS_AUTH_URL')
         self.endpoint_ip = None
         self.endpoint_port = None
-        self.openstack_creds = CONST.openstack_creds
-        self.snapshot_file = CONST.openstack_snapshot_file
+        self.openstack_creds = CONST.__getattribute__('openstack_creds')
         if self.os_auth_url:
-            self.endpoint_ip = self.os_auth_url.rsplit("/")[2].rsplit(":")[0]
-            self.endpoint_port = self.os_auth_url.rsplit("/")[2].rsplit(":")[1]
+            self.endpoint_ip = urlparse(self.os_auth_url).hostname
+            self.endpoint_port = urlparse(self.os_auth_url).port
 
     def ping_endpoint(self):
         if self.os_auth_url is None:
@@ -43,77 +41,26 @@ class CliOpenStack(object):
 
     @staticmethod
     def show_credentials():
+        dic_credentials = {}
         for key, value in os.environ.items():
             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.INSTALLER_TYPE
-        if installer_type is None:
-            click.echo("The environment variable 'INSTALLER_TYPE' is not"
-                       "defined. Please export it")
-        installer_ip = CONST.INSTALLER_IP
-        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.dir_repos,
-                  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)
+                dic_credentials.update({key: value})
+        return dic_credentials
 
     def check(self):
         self.ping_endpoint()
-        cmd = CONST.dir_repo_functest + "/functest/ci/check_os.sh"
-        ft_utils.execute_command(cmd, verbose=False)
+        deployment = check_deployment.CheckDeployment()
+        deployment.check_all()
 
-    def snapshot_create(self):
-        self.ping_endpoint()
-        if os.path.isfile(self.snapshot_file):
-            answer = raw_input("It seems there is already an OpenStack "
-                               "snapshot. Do you want to overwrite it with "
-                               "the current OpenStack status? [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")
 
-        click.echo("Generating Openstack snapshot...")
-        os_snapshot.main()
+class CliOpenStack(OpenStack):
 
-    def snapshot_show(self):
-        if not os.path.isfile(self.snapshot_file):
-            click.echo("There is no OpenStack snapshot created. To create "
-                       "one run the command "
-                       "'functest openstack snapshot-create'")
-            return
-        with open(self.snapshot_file, 'r') as yaml_file:
-            click.echo("\n%s"
-                       % yaml_file.read())
+    def __init__(self):
+        super(CliOpenStack, self).__init__()
 
-    def clean(self):
-        self.ping_endpoint()
-        if not os.path.isfile(self.snapshot_file):
-            click.echo("Not possible to clean OpenStack without a snapshot. "
-                       "This could cause problems. "
-                       "Run first the command "
-                       "'functest openstack snapshot-create'")
-            return
-        os_clean.main()
+    @staticmethod
+    def show_credentials():
+        dic_credentials = OpenStack.show_credentials()
+        for key, value in dic_credentials.items():
+                if key.startswith('OS_'):
+                    click.echo("{}={}".format(key, value))