X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=vimconn_openstack.py;fp=vimconn_openstack.py;h=96d89e361ac3756e6a722f1b7daea212cd913047;hb=59f45266ae0e573d0d4e6dcfec04f4a715faeaf2;hp=83ad940d8a3f1eaef36e81d9d5f45be625c471c9;hpb=cf22714dc4fc0905a8b0998e43bb580c1899b7ac;p=osm%2FRO.git diff --git a/vimconn_openstack.py b/vimconn_openstack.py index 83ad940d..96d89e36 100644 --- a/vimconn_openstack.py +++ b/vimconn_openstack.py @@ -565,7 +565,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": @@ -656,8 +656,8 @@ class vimconnector(vimconn.vimconnector): filtered_list = [] for image in image_list: image_dict=self.glance.images.get(image.id) - if 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)