Upgrade Neutron tempest plugin

Change-Id: I6a9d4a0f08e2543a381cb59574fb19fc896abbf6
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 4c60f29..cc37193 100644 (file)
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,7 +1,7 @@
 FROM opnfv/functest-core:yoga
 
 ARG PATROLE_TAG=0.14.0
-ARG NEUTRON_TEMPEST_TAG=1.8.0
+ARG NEUTRON_TEMPEST_TAG=1.9.0
 ARG CINDER_TEMPEST_TAG=1.6.0
 ARG KEYSTONE_TEMPEST_TAG=0.9.0
 ARG NEUTRON_TAG=unmaintained/yoga

diff --git a/functest/tests/unit/utils/test_functest_utils.py b/functest/tests/unit/utils/test_functest_utils.py
index 6c73c90..43837c5 100644 (file)
--- a/functest/tests/unit/utils/test_functest_utils.py
+++ b/functest/tests/unit/utils/test_functest_utils.py
@@ -340,7 +340,7 @@ class FunctestUtilsTesting(unittest.TestCase):
     def test_openstack_version15(self, *args):
         cloud = mock.Mock()
         self.assertEqual(functest_utils.get_openstack_version(
-            cloud), "Xena")
+            cloud), "Xena or Yoga")
         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 dab128c..8dea6d7 100644 (file)
--- a/functest/utils/functest_utils.py
+++ b/functest/utils/functest_utils.py
@@ -115,7 +115,7 @@ def get_openstack_version(cloud):
         if version > (2, 90):
             osversion = "Master"
         elif version > (2, 88):
-            osversion = "Xena"
+            osversion = "Xena or Yoga"
         elif version > (2, 87):
             osversion = "Wallaby"
         elif version > (2, 79):