X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Futils%2Ffunctest_utils.py;h=c5950c9654fd79d66ba69c15196c5f66b0bbbdfc;hb=84d8296c5f28ad20f0e32cbfe5af36013da0a213;hp=38a60d4953557f94b2a609516998fb54bb3c2194;hpb=58dd7174657c66254ae4c511850ac7d49b1dd98f;p=functest.git

diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py
index 38a60d495..c5950c965 100644
--- a/functest/utils/functest_utils.py
+++ b/functest/utils/functest_utils.py
@@ -11,90 +11,13 @@
 
 from __future__ import print_function
 import logging
-import re
-import shutil
 import subprocess
 import sys
-
-import dns.resolver
-from six.moves import urllib
 import yaml
 
-from functest.utils import constants
-from functest.utils import env
-
 LOGGER = logging.getLogger(__name__)
 
 
-# ----------------------------------------------------------
-#
-#               INTERNET UTILS
-#
-# -----------------------------------------------------------
-def check_internet_connectivity(url='http://www.opnfv.org/'):
-    """
-    Check if there is access to the internet
-    """
-    try:
-        urllib.request.urlopen(url, timeout=5)
-        return True
-    except urllib.error.URLError:
-        return False
-
-
-def download_url(url, dest_path):
-    """
-    Download a file to a destination path given a URL
-    """
-    name = url.rsplit('/')[-1]
-    dest = dest_path + "/" + name
-    try:
-        response = urllib.request.urlopen(url)
-    except (urllib.error.HTTPError, urllib.error.URLError):
-        return False
-
-    with open(dest, 'wb') as lfile:
-        shutil.copyfileobj(response, lfile)
-    return True
-
-
-# ----------------------------------------------------------
-#
-#               CI UTILS
-#
-# -----------------------------------------------------------
-def get_resolvconf_ns():
-    """
-    Get nameservers from current resolv.conf
-    """
-    nameservers = []
-    rconf = open("/etc/resolv.conf", "r")
-    line = rconf.readline()
-    resolver = dns.resolver.Resolver()
-    while line:
-        addr_ip = re.search(r"\b(?:[0-9]{1,3}\.){3}[0-9]{1,3}\b", line)
-        if addr_ip:
-            resolver.nameservers = [addr_ip.group(0)]
-            try:
-                result = resolver.query('opnfv.org')[0]
-                if result != "":
-                    nameservers.append(addr_ip.group())
-            except dns.exception.Timeout:
-                pass
-        line = rconf.readline()
-    return nameservers
-
-
-def get_ci_envvars():
-    """
-    Get the CI env variables
-    """
-    ci_env_var = {
-        "installer": env.get('INSTALLER_TYPE'),
-        "scenario": env.get('DEPLOY_SCENARIO')}
-    return ci_env_var
-
-
 def execute_command_raise(cmd, info=False, error_msg="",
                           verbose=True, output_file=None):
     ret = execute_command(cmd, info, error_msg, verbose, output_file)
@@ -121,7 +44,7 @@ def execute_command(cmd, info=False, error_msg="",
             ofd.write(line)
         else:
             line = line.replace('\n', '')
-            print (line)
+            print(line)
             sys.stdout.flush()
     if output_file:
         ofd.close()
@@ -134,11 +57,6 @@ def execute_command(cmd, info=False, error_msg="",
     return returncode
 
 
-# ----------------------------------------------------------
-#
-#               YAML UTILS
-#
-# -----------------------------------------------------------
 def get_parameter_from_yaml(parameter, yfile):
     """
     Returns the value of a given parameter in file.yaml
@@ -156,17 +74,63 @@ def get_parameter_from_yaml(parameter, yfile):
     return value
 
 
-def get_functest_config(parameter):
-    yaml_ = constants.CONFIG_FUNCTEST_YAML
-    return get_parameter_from_yaml(parameter, yaml_)
+def get_nova_version(cloud):
+    """ Get Nova API microversion
 
+    Returns:
 
-def get_functest_yaml():
-    # pylint: disable=bad-continuation
-    with open(constants.CONFIG_FUNCTEST_YAML) as yaml_fd:
-        functest_yaml = yaml.safe_load(yaml_fd)
-    return functest_yaml
+    - Nova API microversion
+    - None on operation error
+    """
+    # pylint: disable=protected-access
+    try:
+        request = cloud._compute_client.request("/", "GET")
+        LOGGER.debug('cloud._compute_client.request: %s', request)
+        version = request["version"]["version"]
+        major, minor = version.split('.')
+        LOGGER.debug('nova version: %s', (int(major), int(minor)))
+        return (int(major), int(minor))
+    except Exception:  # pylint: disable=broad-except
+        LOGGER.exception("Cannot detect Nova version")
+        return None
+
+
+def get_openstack_version(cloud):
+    """ Detect OpenStack version via Nova API microversion
+
+    It follows MicroversionHistory_.
 
+    Returns:
 
-def print_separator():
-    LOGGER.info("==============================================")
+    - OpenStack release
+    - Unknown on operation error
+
+    .. _MicroversionHistory:
+    https://docs.openstack.org/nova/latest/reference/api-microversion-history.html
+    """
+    version = get_nova_version(cloud)
+    try:
+        assert version
+        if version > (2, 60):
+            osversion = "Rocky or newer"
+        elif version > (2, 53):
+            osversion = "Queens"
+        elif version > (2, 42):
+            osversion = "Pike"
+        elif version > (2, 38):
+            osversion = "Ocata"
+        elif version > (2, 25):
+            osversion = "Newton"
+        elif version > (2, 12):
+            osversion = "Mitaka"
+        elif version > (2, 3):
+            osversion = "Liberty"
+        elif version >= (2, 1):
+            osversion = "Kilo"
+        else:
+            osversion = "Unknown"
+        LOGGER.info('Detect OpenStack version: %s', osversion)
+        return osversion
+    except AssertionError:
+        LOGGER.exception("Cannot detect OpenStack version")
+        return "Unknown"