Update get_openstack_version()

It takes Rocky maximum version into account.

Change-Id: I55469de4a63f1f824222660130a20d7fd8fa42c3
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 2098c49184b1c97b89b4d88dffa2e2a9b3571f04)

diff --git a/functest/tests/unit/utils/test_functest_utils.py b/functest/tests/unit/utils/test_functest_utils.py
index 2b98267..ab90de5 100644 (file)
--- a/functest/tests/unit/utils/test_functest_utils.py
+++ b/functest/tests/unit/utils/test_functest_utils.py
@@ -261,7 +261,7 @@ class FunctestUtilsTesting(unittest.TestCase):
     def test_openstack_version1(self, *args):
         cloud = mock.Mock()
         self.assertEqual(functest_utils.get_openstack_version(
-            cloud), "Rocky or newer")
+            cloud), "Rocky")
         args[0].assert_called_once_with(cloud)
 
     @mock.patch('functest.utils.functest_utils.get_nova_version',
@@ -327,7 +327,7 @@ class FunctestUtilsTesting(unittest.TestCase):
     def test_openstack_version10(self, *args):
         cloud = mock.Mock()
         self.assertEqual(
-            functest_utils.get_openstack_version(cloud), "Rocky or newer")
+            functest_utils.get_openstack_version(cloud), "Master")
         args[0].assert_called_once_with(cloud)
 
     @mock.patch('functest.utils.functest_utils.get_nova_version',

diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py
index 1993f1e..dd2bf19 100644 (file)
--- a/functest/utils/functest_utils.py
+++ b/functest/utils/functest_utils.py
@@ -109,8 +109,10 @@ def get_openstack_version(cloud):
     version = get_nova_version(cloud)
     try:
         assert version
-        if version > (2, 60):
-            osversion = "Rocky or newer"
+        if version > (2, 65):
+            osversion = "Master"
+        elif version > (2, 60):
+            osversion = "Rocky"
         elif version > (2, 53):
             osversion = "Queens"
         elif version > (2, 42):