From a15b050521848ccb3ed7ceec7a679b66d540e6d4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Sat, 20 Apr 2019 13:29:16 +0200 Subject: [PATCH] Add Stein in Nova API microversions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I42e854122fde9495cb3472ccc78900eccb20670d Signed-off-by: Cédric Ollivier (cherry picked from commit aa1d68e2b9647825f703f280d2913801be794deb) --- functest/tests/unit/utils/test_functest_utils.py | 8 ++++++++ functest/utils/functest_utils.py | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/functest/tests/unit/utils/test_functest_utils.py b/functest/tests/unit/utils/test_functest_utils.py index dcbbd79e5..da3b03c80 100644 --- a/functest/tests/unit/utils/test_functest_utils.py +++ b/functest/tests/unit/utils/test_functest_utils.py @@ -330,6 +330,14 @@ class FunctestUtilsTesting(unittest.TestCase): functest_utils.get_openstack_version(cloud), "Master") args[0].assert_called_once_with(cloud) + @mock.patch('functest.utils.functest_utils.get_nova_version', + return_value=(2, 66)) + def test_openstack_version11(self, *args): + cloud = mock.Mock() + self.assertEqual(functest_utils.get_openstack_version( + cloud), "Stein") + 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 b49337de2..19d5baf92 100644 --- a/functest/utils/functest_utils.py +++ b/functest/utils/functest_utils.py @@ -111,8 +111,10 @@ def get_openstack_version(cloud): version = get_nova_version(cloud) try: assert version - if version > (2, 65): + if version > (2, 72): osversion = "Master" + elif version > (2, 65): + osversion = "Stein" elif version > (2, 60): osversion = "Rocky" elif version > (2, 53): -- 2.16.6