Remove resource_id_set(None) calls

This removes resetting resource_id in delete, as the state is storing
that information properly, and it doesn't provide any additional value.

Change-Id: I71f17ab79adbad5286389c87f1fbd5c60c4a8d7f
Closes-Bug: #1358492

contrib/heat_barbican/heat_barbican/resources/order.py

@@ -132,13 +132,10 @@ class Order(resource.Resource):
 
         try:
             self.barbican().orders.delete(self.resource_id)
-            self.resource_id_set(None)
         except client.barbican_client.HTTPClientError as exc:
             # This is the only exception the client raises
             # Inspecting the message to see if it's a 'Not Found'
-            if 'Not Found' in six.text_type(exc):
+            if 'Not Found' not in six.text_type(exc):
-                self.resource_id_set(None)
-            else:
                 raise
 
     def _resolve_attribute(self, name):

contrib/heat_barbican/heat_barbican/resources/secret.py

@@ -137,13 +137,10 @@ class Secret(resource.Resource):
 
         try:
             self.barbican().secrets.delete(self.resource_id)
-            self.resource_id_set(None)
         except client.barbican_client.HTTPClientError as exc:
             # This is the only exception the client raises
             # Inspecting the message to see if it's a 'Not Found'
-            if 'Not Found' in six.text_type(exc):
+            if 'Not Found' not in six.text_type(exc):
-                self.resource_id_set(None)
-            else:
                 raise
 
     def _resolve_attribute(self, name):

contrib/heat_barbican/heat_barbican/tests/test_order.py

@@ -143,7 +143,6 @@ class TestOrder(HeatTestCase):
         self.assertEqual('foo', res.resource_id)
 
         scheduler.TaskRunner(res.delete)()
-        self.assertIsNone(res.resource_id)
         self.barbican.orders.delete.assert_called_once_with('foo')
 
     @mock.patch.object(client, 'barbican_client', new=mock.Mock())

contrib/heat_barbican/heat_barbican/tests/test_secret.py

@@ -160,7 +160,6 @@ class TestSecret(HeatTestCase):
         mock_delete = self.barbican.secrets.delete
         scheduler.TaskRunner(self.res.delete)()
 
-        self.assertIsNone(self.res.resource_id)
         mock_delete.assert_called_once_with('foo_id')
 
     @mock.patch.object(client, 'barbican_client', new=mock.Mock())

contrib/nova_flavor/nova_flavor/resources/nova_flavor.py

@@ -118,8 +118,6 @@ class NovaFlavor(resource.Resource):
         except Exception as e:
             self.client_plugin('nova').ignore_not_found(e)
 
-        self.resource_id_set(None)
-
 
 def resource_mapping():
     return {

contrib/rackspace/rackspace/resources/cloud_dns.py

@@ -195,7 +195,6 @@ class CloudDns(resource.Resource):
                 dom.delete()
             except NotFound:
                 pass
-        self.resource_id_set(None)
 
 
 def resource_mapping():

contrib/rackspace/rackspace/resources/cloud_loadbalancer.py

@@ -574,7 +574,6 @@ class CloudLoadBalancer(resource.Resource):
         else:
             if loadbalancer.status != 'DELETED':
                 loadbalancer.delete()
-                self.resource_id_set(None)
 
     def _remove_none(self, property_dict):
         """Remove None values that would cause schema validation problems.

heat/engine/resources/glance_image.py

@@ -118,8 +118,6 @@ class GlanceImage(resource.Resource):
         except Exception as ex:
             self.client_plugin().ignore_not_found(ex)
 
-        self.resource_id_set(None)
-
 
 def resource_mapping():
     return {

heat/engine/resources/instance.py

@@ -836,7 +836,6 @@ class Instance(resource.Resource):
                     deleter.start()
                 if not deleter.step():
                     return False
-        self.resource_id_set(None)
         return True
 
     def handle_suspend(self):

heat/engine/resources/neutron/security_group.py

@@ -214,7 +214,6 @@ class SecurityGroup(neutron.NeutronResource):
             self.neutron().delete_security_group(self.resource_id)
         except Exception as ex:
             self.client_plugin().ignore_not_found(ex)
-        self.resource_id_set(None)
 
     def handle_update(self, json_snippet, tmpl_diff, prop_diff):
         props = self.prepare_update_properties(json_snippet)

heat/engine/resources/nova_servergroup.py

@@ -59,7 +59,6 @@ class ServerGroup(resource.Resource):
                 self.nova().server_groups.delete(self.resource_id)
             except Exception as e:
                 self.client_plugin('nova').ignore_not_found(e)
-            self.resource_id_set(None)
 
     def physical_resource_name(self):
         name = self.properties.get(self.NAME)

heat/engine/resources/os_database.py

@@ -309,7 +309,6 @@ class OSDBInstance(resource.Resource):
         except Exception as ex:
             self.client_plugin().ignore_not_found(ex)
             LOG.debug("Database instance %s not found." % self.resource_id)
-            self.resource_id_set(None)
         else:
             instance.delete()
             return instance
@@ -326,7 +325,6 @@ class OSDBInstance(resource.Resource):
             self._refresh_instance(instance)
         except Exception as ex:
             self.client_plugin().ignore_not_found(ex)
-            self.resource_id_set(None)
             return True
 
         return False

heat/engine/resources/security_group.py

@@ -233,7 +233,6 @@ class SecurityGroup(resource.Resource):
                         self.client_plugin('nova').ignore_not_found(e)
 
                 self.nova().security_groups.delete(self.resource_id)
-            self.resource_id_set(None)
 
     def _handle_delete_neutron(self):
         client = self.neutron()
@@ -255,7 +254,6 @@ class SecurityGroup(resource.Resource):
                     client.delete_security_group(self.resource_id)
                 except Exception as ex:
                     self.client_plugin('neutron').ignore_not_found(ex)
-            self.resource_id_set(None)
 
     def FnGetRefId(self):
         if self.properties[self.VPC_ID]:

heat/engine/resources/server.py

@@ -984,7 +984,6 @@ class Server(stack_user.StackUser):
 
     def check_delete_complete(self, deleter):
         if deleter is None or deleter.step():
-            self.resource_id_set(None)
             return True
         return False
 

heat/engine/resources/volume.py

@@ -166,7 +166,6 @@ class Volume(resource.Resource):
                     vol.get()
             except Exception as ex:
                 self.client_plugin().ignore_not_found(ex)
-                self.resource_id_set(None)
 
     def handle_snapshot_delete(self, state):
         backup = state not in ((self.CREATE, self.FAILED),

heat/tests/test_instance.py

@@ -541,7 +541,6 @@ class InstancesTest(HeatTestCase):
         self.m.ReplayAll()
 
         scheduler.TaskRunner(instance.delete)()
-        self.assertIsNone(instance.resource_id)
         self.assertEqual((instance.DELETE, instance.COMPLETE), instance.state)
         self.m.VerifyAll()
 

heat/tests/test_nova_servergroup.py

@@ -96,7 +96,6 @@ class NovaServerGroupTest(HeatTestCase):
         self.sg_mgr.delete.assert_called_once_with('test')
         self.assertEqual((self.sg.DELETE, self.sg.COMPLETE),
                          self.sg.state)
-        self.assertIsNone(self.sg.resource_id)
 
     def test_sg_delete_not_found(self):
         self._create_sg('test')
@@ -105,4 +104,3 @@ class NovaServerGroupTest(HeatTestCase):
         self.sg_mgr.delete.assert_called_once_with('test')
         self.assertEqual((self.sg.DELETE, self.sg.COMPLETE),
                          self.sg.state)
-        self.assertIsNone(self.sg.resource_id)

heat/tests/test_os_database.py

@@ -214,7 +214,6 @@ class OSDBInstanceTest(HeatTestCase):
 
         self.m.ReplayAll()
         scheduler.TaskRunner(instance.delete)()
-        self.assertIsNone(instance.resource_id)
         self.m.VerifyAll()
 
     def test_osdatabase_delete_overlimit(self):
@@ -237,7 +236,6 @@ class OSDBInstanceTest(HeatTestCase):
 
         self.m.ReplayAll()
         scheduler.TaskRunner(instance.delete)()
-        self.assertIsNone(instance.resource_id)
         self.m.VerifyAll()
 
     def test_osdatabase_delete_resource_none(self):
@@ -265,7 +263,6 @@ class OSDBInstanceTest(HeatTestCase):
 
         self.m.ReplayAll()
         scheduler.TaskRunner(instance.delete)()
-        self.assertIsNone(instance.resource_id)
         self.m.VerifyAll()
 
     def test_osdatabase_invalid_attribute(self):

heat/tests/test_server.py

@@ -929,7 +929,6 @@ class ServersTest(HeatTestCase):
         self.m.ReplayAll()
 
         scheduler.TaskRunner(server.delete)()
-        self.assertIsNone(server.resource_id)
         self.assertEqual((server.DELETE, server.COMPLETE), server.state)
         self.m.VerifyAll()
 
@@ -947,12 +946,6 @@ class ServersTest(HeatTestCase):
         get().AndRaise(fakes_v1_1.fake_exception())
         mox.Replay(get)
 
-        scheduler.TaskRunner(server.delete)()
-        self.assertIsNone(server.resource_id)
-        self.assertEqual((server.DELETE, server.COMPLETE), server.state)
-        self.m.VerifyAll()
-
-        server.state_set(server.CREATE, server.COMPLETE, 'to delete again')
         scheduler.TaskRunner(server.delete)()
         self.assertEqual((server.DELETE, server.COMPLETE), server.state)
         self.m.VerifyAll()

heat/tests/test_volume.py

@@ -217,10 +217,6 @@ class VolumeTest(HeatTestCase):
         fv.status = 'available'
         scheduler.TaskRunner(rsrc.destroy)()
 
-        # Test when volume already deleted
-        rsrc.state_set(rsrc.CREATE, rsrc.COMPLETE)
-        scheduler.TaskRunner(rsrc.destroy)()
-
         self.m.VerifyAll()
 
     def test_volume_default_az(self):