From 9a800aca5bbf59e44f3b8b222ae5713c44407c89 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Mon, 25 Jun 2012 17:42:15 +0100 Subject: [PATCH] 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 --- heat/engine/manager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/heat/engine/manager.py b/heat/engine/manager.py index 11b98973bc..87fd1948fd 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, }