X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Futils%2Ffunctest_utils.py;h=b49337de2a88d850410060974b8bd3b2e1350128;hb=9e4e6f049fa7d5cce8db61dfa2ebebc55f91c1d8;hp=b860828f18cdb51db052840dc04c49d3bf202905;hpb=1b0c4e1e2466dd92585ddb06ff00198ae62e2ebd;p=functest.git

diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py
index b860828f1..b49337de2 100644
--- a/functest/utils/functest_utils.py
+++ b/functest/utils/functest_utils.py
@@ -15,7 +15,7 @@ import subprocess
 import sys
 import yaml
 
-from functest.utils import env
+import six
 
 LOGGER = logging.getLogger(__name__)
 
@@ -46,7 +46,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()
@@ -76,18 +76,93 @@ def get_parameter_from_yaml(parameter, yfile):
     return value
 
 
-def get_external_network(cloud):
+def get_nova_version(cloud):
+    """ Get Nova API microversion
+
+    Returns:
+
+    - Nova API microversion
+    - None on operation error
     """
-    Returns the configured external network name or
-    the first retrieved external network name
+    # 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
+    <https://docs.openstack.org/nova/latest/reference/api-microversion-history.html>`_.
+
+    Returns:
+
+    - OpenStack release
+    - Unknown on operation error
     """
-    assert cloud
-    if env.get("EXTERNAL_NETWORK"):
-        network = cloud.get_network(
-            env.get("EXTERNAL_NETWORK"), {"router:external": True})
-        if network:
-            return network
-    networks = cloud.list_networks({"router:external": True})
-    if networks:
-        return networks[0]
-    return None
+    version = get_nova_version(cloud)
+    try:
+        assert version
+        if version > (2, 65):
+            osversion = "Master"
+        elif version > (2, 60):
+            osversion = "Rocky"
+        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"
+
+
+def convert_dict_to_ini(value):
+    "Convert dict to oslo.conf input"
+    assert isinstance(value, dict)
+    return ",".join("{}:{}".format(
+        key, val) for (key, val) in six.iteritems(value))
+
+
+def convert_list_to_ini(value):
+    "Convert list to oslo.conf input"
+    assert isinstance(value, list)
+    return ",".join("{}".format(val) for val in value)
+
+
+def convert_ini_to_dict(value):
+    "Convert oslo.conf input to dict"
+    assert isinstance(value, str)
+    try:
+        return {k: v for k, v in (x.rsplit(':', 1) for x in value.split(','))}
+    except ValueError:
+        return {}
+
+
+def convert_ini_to_list(value):
+    "Convert list to oslo.conf input"
+    assert isinstance(value, str)
+    if not value:
+        return []
+    return [x for x in value.split(',')]