Detect OpenStack ussuri

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

diff --git a/functest/tests/unit/utils/test_functest_utils.py b/functest/tests/unit/utils/test_functest_utils.py
index 4f3f16f..b22670f 100644 (file)
--- a/functest/tests/unit/utils/test_functest_utils.py
+++ b/functest/tests/unit/utils/test_functest_utils.py
@@ -316,6 +316,22 @@ class FunctestUtilsTesting(unittest.TestCase):
             cloud), "Train")
         args[0].assert_called_once_with(cloud)
 
+    @mock.patch('functest.utils.functest_utils.get_nova_version',
+                return_value=(2, 87))
+    def test_openstack_version13(self, *args):
+        cloud = mock.Mock()
+        self.assertEqual(functest_utils.get_openstack_version(
+            cloud), "Ussuri")
+        args[0].assert_called_once_with(cloud)
+
+    @mock.patch('functest.utils.functest_utils.get_nova_version',
+                return_value=(2, 88))
+    def test_openstack_version14(self, *args):
+        cloud = mock.Mock()
+        self.assertEqual(functest_utils.get_openstack_version(
+            cloud), "Wallaby")
+        args[0].assert_called_once_with(cloud)
+
     @mock.patch('functest.utils.functest_utils.get_nova_version',
                 return_value=None)
     def test_openstack_version_exc(self, *args):

diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py
index c48acd3..9a5cd41 100644 (file)
--- a/functest/utils/functest_utils.py
+++ b/functest/utils/functest_utils.py
@@ -114,8 +114,10 @@ def get_openstack_version(cloud):
     version = get_nova_version(cloud)
     try:
         assert version
-        if version > (2, 87):
+        if version > (2, 88):
             osversion = "Master"
+        elif version > (2, 87):
+            osversion = "Wallaby"
         elif version > (2, 79):
             osversion = "Ussuri"
         elif version > (2, 72):