diff options
| -rw-r--r-- | docs/how-to-use/LibraryUsage.rst | 5 | ||||
| -rw-r--r-- | snaps/openstack/create_instance.py | 6 | ||||
| -rw-r--r-- | snaps/openstack/tests/create_image_tests.py | 81 | ||||
| -rw-r--r-- | snaps/openstack/tests/create_instance_tests.py | 91 | ||||
| -rw-r--r-- | snaps/provisioning/tests/ansible_utils_tests.py | 8 |
5 files changed, 108 insertions, 83 deletions
diff --git a/docs/how-to-use/LibraryUsage.rst b/docs/how-to-use/LibraryUsage.rst index 31d003a..36d4b9c 100644 --- a/docs/how-to-use/LibraryUsage.rst +++ b/docs/how-to-use/LibraryUsage.rst @@ -480,8 +480,9 @@ Apply Ansible Playbook Utility from snaps.provisioning import ansible_utils - ansible_utils.apply_playbook('provisioning/tests/playbooks/simple_playbook.yml', [ip], user, priv_key, - proxy_setting=self.os_creds.proxy_settings) + ansible_utils.apply_playbook(playbook_path='provisioning/tests/playbooks/simple_playbook.yml', + hosts_inv=[ip], host_user=user, ssh_priv_key_file_path=priv_key, + proxy_setting=self.os_creds.proxy_settings) OpenStack Utilities =================== diff --git a/snaps/openstack/create_instance.py b/snaps/openstack/create_instance.py index 620483b..793f4c7 100644 --- a/snaps/openstack/create_instance.py +++ b/snaps/openstack/create_instance.py @@ -146,7 +146,11 @@ class OpenStackVmInstance: # TODO - the call above should add security groups. The return object shows they exist but the association # had never been made by OpenStack. This call is here to ensure they have been added for sec_grp_name in self.instance_settings.security_group_names: - nova_utils.add_security_group(self.__nova, self.__vm, sec_grp_name) + if self.vm_active(block=True): + nova_utils.add_security_group(self.__nova, self.__vm, sec_grp_name) + else: + raise Exception('Cannot applying security group with name ' + sec_grp_name + + ' to VM that did not activate with name - ' + self.instance_settings.name) self.__apply_floating_ips() diff --git a/snaps/openstack/tests/create_image_tests.py b/snaps/openstack/tests/create_image_tests.py index c74846c..502b815 100644 --- a/snaps/openstack/tests/create_image_tests.py +++ b/snaps/openstack/tests/create_image_tests.py @@ -225,21 +225,21 @@ class CreateImageSuccessTests(OSIntegrationTestCase): # Set the default image settings, then set any custom parameters sent from the app os_image_settings = openstack_tests.cirros_url_image(name=self.image_name) 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=self.image_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=self.image_name+'_ramdisk', url=self.image_metadata['ramdisk_url']) self.image_creators.append(create_image.OpenStackImage(self.os_creds, ramdisk_image_settings)) @@ -267,22 +267,22 @@ class CreateImageSuccessTests(OSIntegrationTestCase): os_image_settings.extra_properties = {'hw_video_model' : 'vga'} 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 = dict(os_image_settings.extra_properties.items() + self.image_metadata['extra_properties'].items()) # 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.image_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=self.image_name+'_ramdisk', url=self.image_metadata['ramdisk_url']) self.image_creators.append(create_image.OpenStackImage(self.os_creds, ramdisk_image_settings)) @@ -309,7 +309,7 @@ class CreateImageSuccessTests(OSIntegrationTestCase): # Set the default image settings, then set any custom parameters sent from the app url_image_settings = openstack_tests.cirros_url_image('foo') if self.image_metadata: - if self.image_metadata['disk_url']: + if 'disk_url' in self.image_metadata and self.image_metadata['disk_url']: url_image_settings.url = self.image_metadata['disk_url'] # Download the file of the image @@ -318,12 +318,12 @@ class CreateImageSuccessTests(OSIntegrationTestCase): # Set extra properties sent from the app (if any) if self.image_metadata: - if self.image_metadata['extra_properties']: + if 'extra_properties' in self.image_metadata and self.image_metadata['extra_properties']: file_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_file = file_utils.download(self.image_metadata['kernel_url'], self.tmp_dir) kernel_image_settings = openstack_tests.file_image_test_settings( name=self.image_name+'_kernel', file_path=kernel_image_file.name) @@ -331,7 +331,7 @@ class CreateImageSuccessTests(OSIntegrationTestCase): kernel_image = self.image_creators[-1].create() file_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_file = file_utils.download(self.image_metadata['ramdisk_url'], self.tmp_dir) ramdisk_image_settings = openstack_tests.file_image_test_settings( name=self.image_name+'_ramdisk', file_path=ramdisk_image_file.name) @@ -358,21 +358,21 @@ class CreateImageSuccessTests(OSIntegrationTestCase): # Set the default image settings, then set any custom parameters sent from the app os_image_settings = openstack_tests.cirros_url_image(name=self.image_name) 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=self.image_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=self.image_name+'_ramdisk', url=self.image_metadata['ramdisk_url']) self.image_creators.append(create_image.OpenStackImage(self.os_creds, ramdisk_image_settings)) @@ -401,21 +401,21 @@ class CreateImageSuccessTests(OSIntegrationTestCase): # Set the default image settings, then set any custom parameters sent from the app os_image_settings = openstack_tests.cirros_url_image(name=self.image_name) 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=self.image_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=self.image_name+'_ramdisk', url=self.image_metadata['ramdisk_url']) self.image_creators.append(create_image.OpenStackImage(self.os_creds, ramdisk_image_settings)) @@ -573,14 +573,17 @@ class CreateMultiPartImageTests(OSIntegrationTestCase): """ # 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(create_image.OpenStackImage(self.os_creds, kernel_image_settings)) kernel_image = self.image_creators[-1].create() self.assertIsNotNone(kernel_image) @@ -588,8 +591,9 @@ class CreateMultiPartImageTests(OSIntegrationTestCase): # Create the ramdisk image 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(create_image.OpenStackImage(self.os_creds, ramdisk_image_settings)) ramdisk_image = self.image_creators[-1].create() self.assertIsNotNone(ramdisk_image) @@ -597,8 +601,9 @@ class CreateMultiPartImageTests(OSIntegrationTestCase): # Create the main image 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 @@ -622,12 +627,14 @@ class CreateMultiPartImageTests(OSIntegrationTestCase): """ # 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_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_url = self.image_metadata['kernel_url'] + if self.image_metadata: + if 'kernel_url' in self.image_metadata and self.image_metadata['kernel_url']: + kernel_url = self.image_metadata['kernel_url'] kernel_image_file = file_utils.download(kernel_url, self.tmp_dir) kernel_file_image_settings = openstack_tests.file_image_test_settings( name=self.image_name+'_kernel', file_path=kernel_image_file.name) @@ -637,8 +644,9 @@ class CreateMultiPartImageTests(OSIntegrationTestCase): # Create the ramdisk image 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_url = self.image_metadata['ramdisk_url'] + if self.image_metadata: + if 'ramdisk_url' in self.image_metadata and self.image_metadata['ramdisk_url']: + ramdisk_url = self.image_metadata['ramdisk_url'] ramdisk_image_file = file_utils.download(ramdisk_url, self.tmp_dir) ramdisk_file_image_settings = openstack_tests.file_image_test_settings( name=self.image_name+'_ramdisk', file_path=ramdisk_image_file.name) @@ -648,8 +656,9 @@ class CreateMultiPartImageTests(OSIntegrationTestCase): # Create the main image image_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']: - umage_url = self.image_metadata['disk_url'] + if self.image_metadata: + if 'disk_url' in self.image_metadata and self.image_metadata['disk_url']: + umage_url = self.image_metadata['disk_url'] image_file = file_utils.download(image_url, self.tmp_dir) file_image_settings = openstack_tests.file_image_test_settings(name=self.image_name, file_path=image_file.name) properties['kernel_id'] = kernel_image.id diff --git a/snaps/openstack/tests/create_instance_tests.py b/snaps/openstack/tests/create_instance_tests.py index 5e7fbf1..765def7 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)) @@ -312,11 +312,17 @@ class SimpleHealthCheck(OSIntegrationTestCase): if os.path.isfile(self.keypair_priv_filepath): os.remove(self.keypair_priv_filepath) + if self.network_creator: + try: + self.network_creator.clean() + except Exception as e: + logger.error('Unexpected exception cleaning network with message - ' + e.message) + if self.flavor_creator: try: self.flavor_creator.clean() except Exception as e: - logger.error('Unexpected exception cleaning network with message - ' + e.message) + logger.error('Unexpected exception cleaning flavor with message - ' + e.message) if self.image_creators: try: @@ -396,28 +402,28 @@ class CreateInstanceSimpleTests(OSIntegrationTestCase): self.image_creators = list() self.flavor_creator = None - self.net_creator = None + self.network_creator = None self.inst_creator = None try: # 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)) @@ -460,9 +466,9 @@ class CreateInstanceSimpleTests(OSIntegrationTestCase): except Exception as e: logger.error('Unexpected exception cleaning flavor with message - ' + e.message) - if self.net_creator: + if self.network_creator: try: - self.net_creator.clean() + self.network_creator.clean() except Exception as e: logger.error('Unexpected exception cleaning network with message - ' + e.message) @@ -537,21 +543,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 +836,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 +1104,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 +1242,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 +1431,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 +1721,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 +1741,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 +1754,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 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)) |