From: Chris Alfonso Date: Tue, 10 Apr 2012 11:57:09 +0000 (-0400) Subject: Made datetime objects JSON compatible by calling their to string functions X-Git-Tag: 2014.1~2057 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c8868921facf42de1d73a844c4118039c3576ac9;p=openstack-build%2Fheat-build.git Made datetime objects JSON compatible by calling their to string functions --- diff --git a/heat/client.py b/heat/client.py index f305292f..d9147923 100644 --- a/heat/client.py +++ b/heat/client.py @@ -22,7 +22,7 @@ import logging import os from heat.common import client as base_client from heat.common import exception - +import pdb from heat.cloudformations import * logger = logging.getLogger(__name__) @@ -60,7 +60,7 @@ class V1Client(base_client.BaseClient): params = self._extract_params(kwargs, SUPPORTED_PARAMS) self._insert_common_parameters(params) res = self.do_request("POST", "/CreateStack", params=params) - + pdb.set_trace() data = json.loads(res.read()) return data diff --git a/heat/engine/manager.py b/heat/engine/manager.py index 60a0790d..dd252c11 100644 --- a/heat/engine/manager.py +++ b/heat/engine/manager.py @@ -64,8 +64,8 @@ class EngineManager(manager.Manager): mem = {} mem['stack_id'] = s.id mem['stack_name'] = s.name - mem['creation_at'] = s.created_at - mem['updated_at'] = s.updated_at + mem['creation_at'] = str(s.created_at) + mem['updated_at'] = str(s.updated_at) mem['NotificationARNs'] = 'TODO' mem['Outputs'] = ps.get_outputs() mem['Parameters'] = ps.t['Parameters'] @@ -98,7 +98,7 @@ class EngineManager(manager.Manager): stack.start() return {'stack': {'id': new_s.id, 'name': new_s.name,\ - 'created_at': new_s.created_at}} + 'created_at': str(new_s.created_at)}} def validate_template(self, req, body=None):