Set image metadata in tempest

It applied the same operations as [1].
Only one config is used between rally, tempest and vping.

[1] https://gerrit.opnfv.org/gerrit/#/c/57613/

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

diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py
index 322496f..bffed75 100644 (file)
--- a/functest/opnfv_tests/openstack/rally/rally.py
+++ b/functest/opnfv_tests/openstack/rally/rally.py
@@ -48,7 +48,7 @@ class RallyBase(testcase.TestCase):
         config.CONF, 'dir_functest_images'), GLANCE_IMAGE_FILENAME)
     GLANCE_IMAGE_FORMAT = getattr(config.CONF, 'openstack_image_disk_format')
     GLANCE_IMAGE_EXTRA_PROPERTIES = getattr(
-        config.CONF, 'image_properties', {})
+        config.CONF, 'openstack_extra_properties', {})
     FLAVOR_NAME = getattr(config.CONF, 'rally_flavor_name')
     FLAVOR_ALT_NAME = getattr(config.CONF, 'rally_flavor_alt_name')
     FLAVOR_RAM = 512

diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index ff2b297..d9ff981 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -432,9 +432,10 @@ class TempestResourcesManager(object):
     def _create_image(self, name):
         """Create image for tests"""
         LOGGER.info("Creating image with name: '%s'", name)
+        meta = getattr(config.CONF, 'openstack_extra_properties', None)
         image = self.cloud.create_image(
             name, filename=getattr(config.CONF, 'openstack_image_url'),
-            is_public=True)
+            is_public=True, meta=meta)
         LOGGER.debug("image: %s", image)
         return image