From 8bd15e3b3420f8aeb681b2563d483e08308c478f Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Sun, 29 Sep 2019 11:59:55 +0200 Subject: [PATCH] Detect OpenStack Train MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It takes into account latest max nova microversions [1] [1] https://docs.openstack.org/nova/latest/reference/api-microversion-history.html Change-Id: Icb9838b09ad22f6e87e9d8fb3c47525bdc1e3307 Signed-off-by: Cédric Ollivier --- 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 f6a80e264..4f3f16f23 100644 --- a/functest/tests/unit/utils/test_functest_utils.py +++ b/functest/tests/unit/utils/test_functest_utils.py @@ -308,6 +308,14 @@ class FunctestUtilsTesting(unittest.TestCase): cloud), "Stein") args[0].assert_called_once_with(cloud) + @mock.patch('functest.utils.functest_utils.get_nova_version', + return_value=(2, 78)) + def test_openstack_version12(self, *args): + cloud = mock.Mock() + self.assertEqual(functest_utils.get_openstack_version( + cloud), "Train") + 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 ef5dac72a..5dad9b563 100644 --- a/functest/utils/functest_utils.py +++ b/functest/utils/functest_utils.py @@ -113,8 +113,10 @@ def get_openstack_version(cloud): version = get_nova_version(cloud) try: assert version - if version > (2, 72): + if version > (2, 79): osversion = "Master" + elif version > (2, 72): + osversion = "Train" elif version > (2, 65): osversion = "Stein" elif version > (2, 60): -- 2.16.6