From: Zane Bitter <zbitter@redhat.com>
Date: Wed, 23 May 2012 17:14:39 +0000 (+0200)
Subject: Fix deletion of security groups
X-Git-Tag: 2014.1~1796
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c63965b3a09c149d2bc7bd1438a1d8b03bdc3e55;p=openstack-build%2Fheat-build.git

Fix deletion of security groups

First off, don't set the instance_id to an empty string as soon as we
retrieve the object from the database.

Also, don't fail if we try to delete a security group that no longer
exists.

Signed-off-by: Zane Bitter <zbitter@redhat.com>
---

diff --git a/heat/engine/security_group.py b/heat/engine/security_group.py
index 2b3f0f77..6f4ccd53 100644
--- a/heat/engine/security_group.py
+++ b/heat/engine/security_group.py
@@ -17,6 +17,7 @@ import eventlet
 import logging
 import os
 from novaclient.exceptions import BadRequest
+from novaclient.exceptions import NotFound
 from heat.common import exception
 from heat.engine.resources import Resource
 
@@ -27,7 +28,6 @@ class SecurityGroup(Resource):
 
     def __init__(self, name, json_snippet, stack):
         super(SecurityGroup, self).__init__(name, json_snippet, stack)
-        self.instance_id = ''
 
         if 'GroupDescription' in self.t['Properties']:
             self.description = self.t['Properties']['GroupDescription']
@@ -86,12 +86,18 @@ class SecurityGroup(Resource):
         Resource.delete(self)
 
         if self.instance_id != None:
-            sec = self.nova().security_groups.get(self.instance_id)
-
-            for rule in sec.rules:
-                self.nova().security_group_rules.delete(rule['id'])
+            try:
+                sec = self.nova().security_groups.get(self.instance_id)
+            except NotFound:
+                pass
+            else:
+                for rule in sec.rules:
+                    try:
+                        self.nova().security_group_rules.delete(rule['id'])
+                    except NotFound:
+                        pass
 
-            self.nova().security_groups.delete(sec)
+                self.nova().security_groups.delete(sec)
             self.instance_id = None
 
         self.state_set(self.DELETE_COMPLETE)