openstack
/
heat
Code Issues Proposed changes

Merge "Use ClientPlugin.ignore_not_found as a context manager"

This commit is contained in:
Jenkins 2016-05-25 17:56:59 +00:00 committed by Gerrit Code Review
parent 3a202c70f2 a12a0fc201
commit e5202ef454
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/engine/resources/openstack/neutron/security_group.py
View File

@ -227,10 +227,8 @@ class SecurityGroup(neutron.NeutronResource):
else:
for rule in sec['security_group_rules']:
if to_delete is None or to_delete(rule):
try:
with self.client_plugin().ignore_not_found:
self.client().delete_security_group_rule(rule['id'])
except Exception as ex:
self.client_plugin().ignore_not_found(ex)
def handle_delete(self):
if self.resource_id is None:

4
heat/engine/resources/openstack/sahara/image.py
View File

@ -111,10 +111,8 @@ class SaharaImageRegistry(resource.Resource):
if self.resource_id is None:
return
try:
with self.client_plugin().ignore_not_found:
self.client().images.unregister_image(self.resource_id)
except Exception as ex:
self.client_plugin().ignore_not_found(ex)
def resource_mapping():