heat engine : move StackId formatting into API

Move AWS specific StackId formatting into the API
Ref #172

Change-Id: I02f964b63c0489800300d8db92e1c800286c4bd3
Signed-off-by: Steven Hardy <shardy@redhat.com>

diff --git a/heat/api/v1/stacks.py b/heat/api/v1/stacks.py
index 800acb4241d654537ce21df213396a005d67ab2c..b1aa1b82483be684756050a3395f150bb6f5a1f2 100644 (file)
--- a/heat/api/v1/stacks.py
+++ b/heat/api/v1/stacks.py
@@ -55,7 +55,8 @@ class StackController(object):
         if 'StackId' in resp:
             hostportprefix = ":".join([socket.gethostname(),
                 str(self.options.bind_port), "stack"])
-            resp['StackId'] = "/".join([hostportprefix, resp['StackId']])
+            resp['StackId'] = "/".join([hostportprefix, resp['StackName'],
+                                       str(resp['StackId'])])
         return resp
 
     def _format_response(self, action, response):

diff --git a/heat/engine/api.py b/heat/engine/api.py
index 982988d12be6402fd15582e9ef5dafd47c7549c3..e3bfb072313dc4a5647b8c88278c1dbf5bae8770 100644 (file)
--- a/heat/engine/api.py
+++ b/heat/engine/api.py
@@ -153,7 +153,7 @@ def format_stack(stack, keys=None):
     s = db_api.stack_get(stack.context, stack.id)
     info = {
         STACK_NAME: stack.name,
-        STACK_ID: stack.stack_id(),
+        STACK_ID: stack.id,
         STACK_CREATION_TIME: heat_utils.strtime(s.created_at),
         STACK_UPDATED_TIME: heat_utils.strtime(s.updated_at),
         STACK_NOTIFICATION_TOPICS: [],  # TODO Not implemented yet
@@ -222,7 +222,7 @@ def format_stack_resource(resource, keys=None):
         RES_STATUS: rs.state,
         RES_STATUS_DATA: rs.state_description,
         RES_TYPE: resource.t['Type'],
-        RES_STACK_ID: resource.stack.stack_id(),
+        RES_STACK_ID: resource.stack.id,
         RES_STACK_NAME: resource.stack.name,
         RES_TIMESTAMP: heat_utils.strtime(last_updated_time),
     }
@@ -251,7 +251,7 @@ def format_event(event, keys=None):
     s = event.stack
     attrs = {
         EVENT_ID: event.id,
-        EVENT_STACK_ID: event.stack_id,
+        EVENT_STACK_ID: s.id,
         EVENT_STACK_NAME: s.name,
         EVENT_TIMESTAMP: heat_utils.strtime(event.created_at),
         EVENT_RES_NAME: event.logical_resource_id,

diff --git a/heat/engine/parser.py b/heat/engine/parser.py
index 1c0cc8b529f2f97a1c23d550a4c0392bf566727a..fb46a242145ef9b89de0fddb103a5eb51fb5d1ae 100644 (file)
--- a/heat/engine/parser.py
+++ b/heat/engine/parser.py
@@ -341,13 +341,6 @@ class Stack(object):
         '''Return a human-readable string representation of the stack'''
         return 'Stack "%s"' % self.name
 
-    def stack_id(self):
-        '''
-        Return a unique ID for this stack suitable for displaying to the
-        user
-        '''
-        return '/'.join([self.name, str(self.id)])
-
     def validate(self):
         '''
         http://docs.amazonwebservices.com/AWSCloudFormation/latest/\