From: Steven Hardy <shardy@redhat.com>
Date: Mon, 25 Jun 2012 16:42:15 +0000 (+0100)
Subject: heat engine : Return timestamps formatted by heat_utils.strtime
X-Git-Tag: 2014.1~1667
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=9a800aca5bbf59e44f3b8b222ae5713c44407c89;p=openstack-build%2Fheat-build.git

heat engine : Return timestamps formatted by heat_utils.strtime

Fix remaining timestamps which are not formatted via heat_utils.strtime
This allows event timestamps to be correctly parsed by boto.
ref #125

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

diff --git a/heat/engine/manager.py b/heat/engine/manager.py
index 11b98973..87fd1948 100644
--- a/heat/engine/manager.py
+++ b/heat/engine/manager.py
@@ -279,7 +279,7 @@ class EngineManager(manager.Manager):
         return {'EventId': event.id,
                 'StackId': event.stack_id,
                 'StackName': s.name,
-                'Timestamp': str(event.created_at),
+                'Timestamp': heat_utils.strtime(event.created_at),
                 'LogicalResourceId': event.logical_resource_id,
                 'PhysicalResourceId': event.physical_resource_id,
                 'ResourceType': event.resource_type,
@@ -534,7 +534,7 @@ def format_resource_attributes(stack, resource):
         'LogicalResourceId': resource.name,
         'PhysicalResourceId': resource.nova_instance or '',
         'ResourceType': resource_type,
-        'LastUpdatedTimestamp': last_updated_time.isoformat(),
+        'LastUpdatedTimestamp': heat_utils.strtime(last_updated_time),
         'ResourceStatus': resource.state,
         'ResourceStatusReason': resource.state_description,
     }