heat manager : rename dict keys to align with AWS API

Rework to align API response format with AWS API XML key naming,
ref #125

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

diff --git a/heat/engine/manager.py b/heat/engine/manager.py
index 65fcb5ffc29877bd1a3312a165cfe7f39d9b502a..69e98dd91563db9d25c7dff59ca96aa0f6871d5b 100644 (file)
--- a/heat/engine/manager.py
+++ b/heat/engine/manager.py
@@ -126,10 +126,10 @@ class EngineManager(manager.Manager):
                               s.raw_template.parsed_template.template,
                               s.id, params)
             mem = {}
-            mem['stack_id'] = s.id
-            mem['stack_name'] = s.name
-            mem['created_at'] = str(s.created_at)
-            mem['template_description'] = ps.t.get('Description',
+            mem['StackId'] = s.id
+            mem['StackName'] = s.name
+            mem['CreationTime'] = str(s.created_at)
+            mem['TemplateDescription'] = ps.t.get('Description',
                                                    'No description')
             mem['StackStatus'] = ps.t.get('stack_status', 'unknown')
             res['stacks'].append(mem)
@@ -152,10 +152,10 @@ class EngineManager(manager.Manager):
                               s.raw_template.parsed_template.template,
                               s.id, params)
             mem = {}
-            mem['stack_id'] = s.id
-            mem['stack_name'] = s.name
-            mem['creation_at'] = str(s.created_at)
-            mem['updated_at'] = str(s.updated_at)
+            mem['StackId'] = s.id
+            mem['StackName'] = s.name
+            mem['CreationTime'] = str(s.created_at)
+            mem['LastUpdatedTimestamp'] = str(s.updated_at)
             mem['NotificationARNs'] = 'TODO'
             mem['Parameters'] = ps.t['Parameters']
             mem['TimeoutInMinutes'] = ps.t.get('Timeout', '60')
@@ -209,7 +209,7 @@ class EngineManager(manager.Manager):
                              metadata_server=metadata_server)
         rt = {}
         rt['template'] = template
-        rt['stack_name'] = stack_name
+        rt['StackName'] = stack_name
         new_rt = db_api.raw_template_create(None, rt)
 
         new_creds = db_api.user_creds_create(context.to_dict())
@@ -231,7 +231,7 @@ class EngineManager(manager.Manager):
         stack.create()
 
         return {'stack': {'id': new_s.id, 'name': new_s.name,
-                'created_at': str(new_s.created_at)}}
+                'CreationTime': str(new_s.created_at)}}
 
     def validate_template(self, context, template, params):
         """
@@ -350,11 +350,11 @@ class EngineManager(manager.Manager):
         new_event = {
             'name': event['message'],
             'resource_status_reason': event['reason'],
-            'stack_id': stack.id,
-            'logical_resource_id': resource.name,
-            'physical_resource_id': None,
-            'resource_type': event['resource_type'],
-            'resource_properties': {},
+            'StackId': stack.id,
+            'LogicalResourceId': resource.name,
+            'PhysicalResourceId': None,
+            'ResourceType': event['resource_type'],
+            'ResourceProperties': {},
         }
         try:
             result = db_api.event_create(context, new_event)

diff --git a/heat/tests/test_stacks.py b/heat/tests/test_stacks.py
index c45123893ce4d2e1902615540cc742236d18423d..0c419bbc2a504647b0d52f7e0529656b91fbf6f5 100644 (file)
--- a/heat/tests/test_stacks.py
+++ b/heat/tests/test_stacks.py
@@ -69,7 +69,7 @@ class stacksTest(unittest.TestCase):
         self.m.ReplayAll()
         rt = {}
         rt['template'] = stack.t
-        rt['stack_name'] = stack.name
+        rt['StackName'] = stack.name
         new_rt = db_api.raw_template_create(None, rt)
         ct = {'username': 'fred',
                    'password': 'mentions_fruit'}
@@ -97,7 +97,7 @@ class stacksTest(unittest.TestCase):
         self.m.ReplayAll()
         rt = {}
         rt['template'] = stack.t
-        rt['stack_name'] = stack.name
+        rt['StackName'] = stack.name
         new_rt = db_api.raw_template_create(None, rt)
         ct = {'username': 'fred',
                    'password': 'mentions_fruit'}
@@ -141,7 +141,7 @@ class stacksTest(unittest.TestCase):
         stack = self.start_wordpress_stack('test_stack_list')
         rt = {}
         rt['template'] = stack.t
-        rt['stack_name'] = stack.name
+        rt['StackName'] = stack.name
         new_rt = db_api.raw_template_create(None, rt)
         ct = {'username': 'fred',
               'password': 'mentions_fruit'}
@@ -180,8 +180,8 @@ class stacksTest(unittest.TestCase):
 
         assert(len(sl) > 0)
         for s in sl['stacks']:
-            assert(s['stack_id'] > 0)
-            assert(s['template_description'].find('WordPress') != -1)
+            assert(s['StackId'] > 0)
+            assert(s['TemplateDescription'].find('WordPress') != -1)
 
     # allows testing of the test directly
     if __name__ == '__main__':