X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=vimconn_openstack.py;h=999aceedad8835abe797b235b60e5ffa9a0c5237;hb=0e571a975bccfbd218e291f44b34400d5aa9577b;hp=addee3a967554978abd994d65ec30e00ad3c9306;hpb=3fa2c05cbd54df361cb85ffde330243663679fe1;p=osm%2FRO.git diff --git a/vimconn_openstack.py b/vimconn_openstack.py index addee3a9..999aceed 100644 --- a/vimconn_openstack.py +++ b/vimconn_openstack.py @@ -561,7 +561,7 @@ class vimconnector(vimconn.vimconnector): #determine format http://docs.openstack.org/developer/glance/formats.html if "disk_format" in image_dict: disk_format=image_dict["disk_format"] - else: #autodiscover base on extention + else: #autodiscover based on extension if image_dict['location'][-6:]==".qcow2": disk_format="qcow2" elif image_dict['location'][-4:]==".vhd": @@ -652,8 +652,8 @@ class vimconnector(vimconn.vimconnector): filtered_list = [] for image in image_list: image_dict=self.glance.images.get(image.id) - if filter_dict.get('checksum') == None or image_dict['checksum']==filter_dict.get('checksum'): - filtered_list.append(image) + if 'checksum' not in filter_dict or image_dict['checksum']==filter_dict.get('checksum'): + filtered_list.append(image_dict) return filtered_list except (ksExceptions.ClientException, nvExceptions.ClientException, gl1Exceptions.CommunicationError, ConnectionError) as e: self._format_exception(e)