diff options
| author |   Catalina Focsa <catalina.focsa@enea.com> | 2017-03-22 17:07:30 +0100 |
|---|---|---|
| committer | Catalina Focsa <catalina.focsa@enea.com> | 2017-03-23 17:28:55 +0100 |
| commit | c859ba4e97b0edbf307cc9947fce2b5edcda1f12 (patch) | |
| tree | 72dd85a70bdbc5e6bbe401116fe4f9831d30c423 /snaps/provisioning | |
| parent | b13ca832ffc24920a7c8ca637f7c468c1306a374 (diff) | |
Check for kernel_url and ramdisk_url keys in dict
Need to check if the above keys exist in image_metadata
before checking for their assigned values in case
they are not declared (e.g. obsolete when creating a
one part image)
Change-Id: I22fa259b320a425d6ad030eeb9bf68b4c06b667f
Signed-off-by: Catalina Focsa <catalina.focsa@enea.com>
Diffstat (limited to 'snaps/provisioning')
| -rw-r--r-- | snaps/provisioning/tests/ansible_utils_tests.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/snaps/provisioning/tests/ansible_utils_tests.py b/snaps/provisioning/tests/ansible_utils_tests.py index 92a56dc..a26c497 100644 --- a/snaps/provisioning/tests/ansible_utils_tests.py +++ b/snaps/provisioning/tests/ansible_utils_tests.py @@ -68,21 +68,21 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): # Create Image os_image_settings = openstack_tests.ubuntu_url_image(name=guid + '-' + '-image') if self.image_metadata: - if self.image_metadata['disk_url']: + if 'disk_url' in self.image_metadata and self.image_metadata['disk_url']: os_image_settings.url = self.image_metadata['disk_url'] - if self.image_metadata['extra_properties']: + if 'extra_properties' in self.image_metadata and self.image_metadata['extra_properties']: os_image_settings.extra_properties = self.image_metadata['extra_properties'] # If this is a 3-part image create the kernel and ramdisk images first if self.image_metadata: - if self.image_metadata['kernel_url']: + if 'kernel_url' in self.image_metadata and self.image_metadata['kernel_url']: kernel_image_settings = openstack_tests.cirros_url_image( name=os_image_settings.name+'_kernel', url=self.image_metadata['kernel_url']) self.image_creators.append(create_image.OpenStackImage(self.os_creds, kernel_image_settings)) kernel_image = self.image_creators[-1].create() os_image_settings.extra_properties['kernel_id'] = kernel_image.id - if self.image_metadata['ramdisk_url']: + if 'ramdisk_url' in self.image_metadata and self.image_metadata['ramdisk_url']: ramdisk_image_settings = openstack_tests.cirros_url_image( name=os_image_settings.name+'_ramdisk', url=self.image_metadata['ramdisk_url']) self.image_creators.append(create_image.OpenStackImage(self.os_creds, ramdisk_image_settings)) |