aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-04-20 13:29:16 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2019-04-20 20:37:34 +0200
commitaa1d68e2b9647825f703f280d2913801be794deb (patch)
tree9c48d94b949f400f505b7a2fae31819e68325c92
parent09698772d9aa1d5c816a64eb5470999d4cc9cf9e (diff)
Add Stein in Nova API microversions
Change-Id: I42e854122fde9495cb3472ccc78900eccb20670d Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--functest/tests/unit/utils/test_functest_utils.py8
-rw-r--r--functest/utils/functest_utils.py4
2 files changed, 11 insertions, 1 deletions
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
@@ -331,6 +331,14 @@ class FunctestUtilsTesting(unittest.TestCase):
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):
cloud = mock.Mock()
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):