Merge "Convert Resource to separate action/status"

diff --cc heat/engine/resource.py
index 3c3b1fd6f3268b3df9bdfb94eba7e6522fb88715,f4da3972bd3a2546a828a4a8782a14632868f8af..c5da6cf9153e272b6f14e473d3fb952a87582246
--- 1/heat/engine/resource.py
--- 2/heat/engine/resource.py
+++ b/heat/engine/resource.py
@@@ -395,14 -393,10 +394,14 @@@ class Resource(object)
              raise failure
          else:
              self.t = self.stack.resolve_static_data(json_snippet)
-             self.state_set(self.UPDATE_COMPLETE)
+             self.state_set(self.UPDATE, self.COMPLETE)
  
      def physical_resource_name(self):
 -        return '%s-%s' % (self.stack.name, self.name)
 +        assert self.id is not None
 +
 +        return '%s-%s-%s' % (self.stack.name,
 +                             self.name,
 +                             short_id.get_id(self.id))
  
      def validate(self):
          logger.info('Validating %s' % str(self))

diff --cc heat/tests/test_s3.py
index fbbe38dbca1f9771bc75e2d3d2cb7d1317348bfd,5fa6351cd0a3872a691d61f3bc2abf65dd7458dc..8270cc8fba9623fffb298efefeb3e5f0c1f38c2c
--- 1/heat/tests/test_s3.py
--- 2/heat/tests/test_s3.py
+++ b/heat/tests/test_s3.py
@@@ -70,13 -74,22 +70,13 @@@ class s3Test(HeatTestCase)
                             t['Resources'][resource_name],
                             stack)
          scheduler.TaskRunner(rsrc.create)()
-         self.assertEqual(s3.S3Bucket.CREATE_COMPLETE, rsrc.state)
+         self.assertEqual((rsrc.CREATE, rsrc.COMPLETE), rsrc.state)
          return rsrc
  
 -    def test_create_container_name(self):
 -        self.m.ReplayAll()
 -        t = template_format.parse(swift_template)
 -        stack = parse_stack(t)
 -        rsrc = s3.S3Bucket('test_resource',
 -                           t['Resources']['S3Bucket'],
 -                           stack)
 -        self.assertTrue(re.match(self.container_pattern,
 -                                 rsrc._create_container_name()))
 -
      def test_attributes(self):
 +        container_name = utils.PhysName('test_stack', 'test_resource')
          swiftclient.Connection.put_container(
 -            mox.Regex(self.container_pattern),
 +            container_name,
              {'X-Container-Write': 'test_tenant:test_username',
               'X-Container-Read': 'test_tenant:test_username'}
          ).AndReturn(None)
@@@ -211,7 -229,13 +211,7 @@@
          bucket['DeletionPolicy'] = 'Retain'
          stack = parse_stack(t)
          rsrc = self.create_resource(t, stack, 'S3Bucket')
 -        # if delete_container is called, mox verify will succeed
          rsrc.delete()
-         self.assertEqual(rsrc.DELETE_COMPLETE, rsrc.state)
+         self.assertEqual((rsrc.DELETE, rsrc.COMPLETE), rsrc.state)
  
 -        try:
 -            self.m.VerifyAll()
 -        except mox.ExpectedMethodCallsError:
 -            return
 -
 -        raise Exception('delete_container was called despite Retain policy')
 +        self.m.VerifyAll()

diff --cc heat/tests/test_swift.py
index 58ab2a61dec64ad2ac3a43b589cf51fa29e874fa,1df2009c273c80a7639a64d951aedc38f75f21f0..74ad7db6a340d9ca8f9f2e97cde21fd09075c288
--- 1/heat/tests/test_swift.py
--- 2/heat/tests/test_swift.py
+++ b/heat/tests/test_swift.py
@@@ -238,7 -249,13 +238,7 @@@ class swiftTest(HeatTestCase)
          container['DeletionPolicy'] = 'Retain'
          stack = parse_stack(t)
          rsrc = self.create_resource(t, stack, 'SwiftContainer')
 -        # if delete_container is called, mox verify will succeed
          rsrc.delete()
-         self.assertEqual(rsrc.DELETE_COMPLETE, rsrc.state)
+         self.assertEqual((rsrc.DELETE, rsrc.COMPLETE), rsrc.state)
  
 -        try:
 -            self.m.VerifyAll()
 -        except mox.ExpectedMethodCallsError:
 -            return
 -
 -        raise Exception('delete_container was called despite Retain policy')
 +        self.m.VerifyAll()