Rely on instance_id been set to None

Then we can use the default FnGetRefId()

Change-Id: Ib328289b4d22cb7ab7b9985fa7c95cb19bcfd9c3
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

diff --git a/heat/engine/user.py b/heat/engine/user.py
index f7c4545640c96058aa20dfc5c83e0f7772b1525a..c77205b5240d62a0236b9be5b6d05ec44300475d 100644 (file)
--- a/heat/engine/user.py
+++ b/heat/engine/user.py
@@ -32,7 +32,6 @@ class User(Resource):
 
     def __init__(self, name, json_snippet, stack):
         super(User, self).__init__(name, json_snippet, stack)
-        self.instance_id = ''
 
     def create(self):
         self.state_set(self.CREATE_COMPLETE)

diff --git a/heat/engine/wait_condition.py b/heat/engine/wait_condition.py
index 8ba8113629a4820568a8ad45080e69bbca710f40..49b2824ebaa3e5bcb7ce0bf4dc6b370aaf3c147d 100644 (file)
--- a/heat/engine/wait_condition.py
+++ b/heat/engine/wait_condition.py
@@ -36,7 +36,6 @@ class WaitConditionHandle(Resource):
 
     def __init__(self, name, json_snippet, stack):
         super(WaitConditionHandle, self).__init__(name, json_snippet, stack)
-        self.instance_id = ''
 
     def create(self):
         if self.state is not None:
@@ -60,12 +59,6 @@ class WaitConditionHandle(Resource):
         Resource.delete(self)
         self.state_set(self.DELETE_COMPLETE)
 
-    def FnGetRefId(self):
-        '''
-        Return the Wait Condition Signal URL
-        '''
-        return unicode(self.instance_id)
-
 
 class WaitCondition(Resource):
     properties_schema = {'Handle': {'Type': 'String',
@@ -78,7 +71,6 @@ class WaitCondition(Resource):
 
     def __init__(self, name, json_snippet, stack):
         super(WaitCondition, self).__init__(name, json_snippet, stack)
-        self.instance_id = ''
         self.resource_id = None
 
         self.timeout = int(self.t['Properties']['Timeout'])
@@ -154,9 +146,6 @@ class WaitCondition(Resource):
         Resource.delete(self)
         self.state_set(self.DELETE_COMPLETE)
 
-    def FnGetRefId(self):
-        return unicode(self.name)
-
     def FnGetAtt(self, key):
         res = None
         self._get_handle_resource_id()