aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDelia Popescu <delia.popescu@enea.com>2018-05-09 15:31:22 +0300
committerCédric Ollivier <cedric.ollivier@orange.com>2018-05-20 23:37:44 +0200
commit83b8b63a65cf7e078494ffdf2014b0819f4ed28d (patch)
treefaad99e3e4f79d8b6d8adda3491ba25ef584d64b
parentc0cdaa5bbf3294cd3d9fb3c3b0dd6acd38684daa (diff)
Add image extra properties back in vping_base
Image extra properties are missing for ARM Set image_url for ARM JIRA: ARMBAND-383 Change-Id: I0e2730c3f22214ad61d72424ea76173f1783d0ca Signed-off-by: Delia Popescu <delia.popescu@enea.com> (cherry picked from commit 1aaeab75130345ae9198de23d013f9840044c8b5)
-rw-r--r--functest/ci/config_aarch64_patch.yaml2
-rw-r--r--functest/opnfv_tests/openstack/vping/vping_base.py5
2 files changed, 6 insertions, 1 deletions
diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml
index b8caf7da6..281d5cf08 100644
--- a/functest/ci/config_aarch64_patch.yaml
+++ b/functest/ci/config_aarch64_patch.yaml
@@ -5,6 +5,8 @@ os:
image_name: TestVM
image_file_name: cirros-0.4.0-aarch64-disk.img
image_password: gocubsgo
+ image_url:
+ /home/opnfv/functest/images/cirros-d161201-aarch64-disk.img
extra_properties:
hw_firmware_type: 'uefi'
hw_video_model: 'vga'
diff --git a/functest/opnfv_tests/openstack/vping/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py
index fc07f6173..d588b9ca3 100644
--- a/functest/opnfv_tests/openstack/vping/vping_base.py
+++ b/functest/opnfv_tests/openstack/vping/vping_base.py
@@ -66,9 +66,12 @@ class VPingBase(testcase.TestCase):
image_base_name = '{}-{}'.format(
getattr(config.CONF, 'vping_image_name'), self.guid)
self.logger.info("Creating image with name: '%s'", image_base_name)
+ meta = getattr(config.CONF, 'openstack_extra_properties', None)
+ self.logger.info("Image metadata: %s", meta)
self.image = self.cloud.create_image(
image_base_name,
- filename=getattr(config.CONF, 'openstack_image_url'))
+ filename=getattr(config.CONF, 'openstack_image_url'),
+ meta=meta)
self.logger.debug("image: %s", self.image)
private_net_name = getattr(