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/openstack/tests/create_instance_tests.py | |
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/openstack/tests/create_instance_tests.py')
-rw-r--r-- | snaps/openstack/tests/create_instance_tests.py | 77 |
1 files changed, 41 insertions, 36 deletions
diff --git a/snaps/openstack/tests/create_instance_tests.py b/snaps/openstack/tests/create_instance_tests.py index 5e7fbf1..2cb1cdc 100644 --- a/snaps/openstack/tests/create_instance_tests.py +++ b/snaps/openstack/tests/create_instance_tests.py @@ -258,22 +258,22 @@ class SimpleHealthCheck(OSIntegrationTestCase): self.os_image_settings = openstack_tests.cirros_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']: self.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']: self.os_image_settings.extra_properties = self.image_metadata['extra_properties'] try: # 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=self.os_image_settings.name+'_kernel', url=self.image_metadata['kernel_url']) self.image_creators.append(OpenStackImage(self.os_creds, kernel_image_settings)) kernel_image = self.image_creators[-1].create() self.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=self.os_image_settings.name+'_ramdisk', url=self.image_metadata['ramdisk_url']) self.image_creators.append(OpenStackImage(self.os_creds, ramdisk_image_settings)) @@ -403,21 +403,21 @@ class CreateInstanceSimpleTests(OSIntegrationTestCase): # Create Image # Set any custom parameters sent from the app if self.image_metadata: - if self.image_metadata['disk_url']: + if 'disk_url' in self.image_metadata and self.image_metadata['disk_url']: self.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']: self.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=self.os_image_settings.name+'_kernel', url=self.image_metadata['kernel_url']) self.image_creators.append(OpenStackImage(self.os_creds, kernel_image_settings)) kernel_image = self.image_creators[-1].create() self.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=self.os_image_settings.name+'_ramdisk', url=self.image_metadata['ramdisk_url']) self.image_creators.append(OpenStackImage(self.os_creds, ramdisk_image_settings)) @@ -537,21 +537,21 @@ class CreateInstanceSingleNetworkTests(OSIntegrationTestCase): # Create Image # Set any custom parameters sent from the app if self.image_metadata: - if self.image_metadata['disk_url']: + if 'disk_url' in self.image_metadata and self.image_metadata['disk_url']: self.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']: self.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=self.os_image_settings.name+'_kernel', url=self.image_metadata['kernel_url']) self.image_creators.append(OpenStackImage(self.os_creds, kernel_image_settings)) kernel_image = self.image_creators[-1].create() self.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=self.os_image_settings.name+'_ramdisk', url=self.image_metadata['ramdisk_url']) self.image_creators.append(OpenStackImage(self.os_creds, ramdisk_image_settings)) @@ -830,21 +830,21 @@ class CreateInstancePortManipulationTests(OSIntegrationTestCase): # Create Image # Set any custom parameters sent from the app if self.image_metadata: - if self.image_metadata['disk_url']: + if 'disk_url' in self.image_metadata and self.image_metadata['disk_url']: self.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']: self.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=self.os_image_settings.name+'_kernel', url=self.image_metadata['kernel_url']) self.image_creators.append(OpenStackImage(self.os_creds, kernel_image_settings)) kernel_image = self.image_creators[-1].create() self.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=self.os_image_settings.name+'_ramdisk', url=self.image_metadata['ramdisk_url']) self.image_creators.append(OpenStackImage(self.os_creds, ramdisk_image_settings)) @@ -1098,21 +1098,21 @@ class CreateInstanceOnComputeHost(OSIntegrationTestCase): # Create Image # Set any custom parameters sent from the app if self.image_metadata: - if self.image_metadata['disk_url']: + if 'disk_url' in self.image_metadata and self.image_metadata['disk_url']: self.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']: self.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=self.os_image_settings.name+'_kernel', url=self.image_metadata['kernel_url']) self.image_creators.append(OpenStackImage(self.os_creds, kernel_image_settings)) kernel_image = self.image_creators[-1].create() self.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=self.os_image_settings.name+'_ramdisk', url=self.image_metadata['ramdisk_url']) self.image_creators.append(OpenStackImage(self.os_creds, ramdisk_image_settings)) @@ -1236,21 +1236,21 @@ class CreateInstancePubPrivNetTests(OSIntegrationTestCase): # Create Image # Set any custom parameters sent from the app if self.image_metadata: - if self.image_metadata['disk_url']: + if 'disk_url' in self.image_metadata and self.image_metadata['disk_url']: self.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']: self.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=self.os_image_settings.name+'_kernel', url=self.image_metadata['kernel_url']) self.image_creators.append(OpenStackImage(self.os_creds, kernel_image_settings)) kernel_image = self.image_creators[-1].create() self.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=self.os_image_settings.name+'_ramdisk', url=self.image_metadata['ramdisk_url']) self.image_creators.append(OpenStackImage(self.os_creds, ramdisk_image_settings)) @@ -1425,21 +1425,21 @@ class InstanceSecurityGroupTests(OSIntegrationTestCase): # Create Image # Set any custom parameters sent from the app if self.image_metadata: - if self.image_metadata['disk_url']: + if 'disk_url' in self.image_metadata and self.image_metadata['disk_url']: self.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']: self.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=self.os_image_settings.name+'_kernel', url=self.image_metadata['kernel_url']) self.image_creators.append(OpenStackImage(self.os_creds, kernel_image_settings)) kernel_image = self.image_creators[-1].create() self.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=self.os_image_settings.name+'_ramdisk', url=self.image_metadata['ramdisk_url']) self.image_creators.append(OpenStackImage(self.os_creds, ramdisk_image_settings)) @@ -1715,16 +1715,18 @@ class CreateInstanceFromThreePartImage(OSIntegrationTestCase): # Create Images # Set properties properties = {} - if self.image_metadata and self.image_metadata['extra_properties']: - properties = self.image_metadata['extra_properties'] + if self.image_metadata: + if 'extra_properties' in self.image_metadata and self.image_metadata['extra_properties']: + properties = self.image_metadata['extra_properties'] # Create the kernel image kernel_image_settings = openstack_tests.cirros_url_image( name=self.image_name+'_kernel', url='http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-kernel') - if self.image_metadata and self.image_metadata['kernel_url']: - kernel_image_settings.url = self.image_metadata['kernel_url'] + if self.image_metadata: + if 'kernel_url' in self.image_metadata and self.image_metadata['kernel_url']: + kernel_image_settings.url = self.image_metadata['kernel_url'] self.image_creators.append(OpenStackImage(self.os_creds, kernel_image_settings)) kernel_image = self.image_creators[-1].create() @@ -1733,8 +1735,10 @@ class CreateInstanceFromThreePartImage(OSIntegrationTestCase): ramdisk_image_settings = openstack_tests.cirros_url_image( name=self.image_name+'_ramdisk', url='http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-initramfs') - if self.image_metadata and self.image_metadata['ramdisk_url']: - ramdisk_image_settings.url = self.image_metadata['ramdisk_url'] + + if self.image_metadata: + if 'ramdisk_url' in self.image_metadata and self.image_metadata['ramdisk_url']: + ramdisk_image_settings.url = self.image_metadata['ramdisk_url'] self.image_creators.append(OpenStackImage(self.os_creds, ramdisk_image_settings)) ramdisk_image = self.image_creators[-1].create() @@ -1744,8 +1748,9 @@ class CreateInstanceFromThreePartImage(OSIntegrationTestCase): os_image_settings = openstack_tests.cirros_url_image( name=self.image_name, url='http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img') - if self.image_metadata and self.image_metadata['disk_url']: - os_image_settings.url = self.image_metadata['disk_url'] + if self.image_metadata: + if 'disk_url' in self.image_metadata and self.image_metadata['disk_url']: + os_image_settings.url = self.image_metadata['disk_url'] properties['kernel_id'] = kernel_image.id properties['ramdisk_id'] = ramdisk_image.id |