← Back to branch summary

~ubuntu-branches/ubuntu/wily/heat/wily-proposed

« back to all changes in this revision

Viewing changes to heat/api/cfn/v1/stacks.py

  • Committer: Package Import Robot
  • Author(s): James Page, Corey Bryant, James Page
  • Date: 2015-03-30 11:11:18 UTC
  • mfrom: (1.1.23)
  • Revision ID: package-import@ubuntu.com-20150330111118-2qpycylx6swu4yhj
Tags: 2015.1~b3-0ubuntu1
[ Corey Bryant ]
* New upstream milestone release for OpenStack kilo:
  - d/control: Align with upstream dependencies.
  - d/p/sudoers_patch.patch: Rebased.
  - d/p/fix-requirements.patch: Rebased.

[ James Page ]
* d/p/fixup-assert-regex.patch: Tweak test to use assertRegexpMatches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/api/cfn/v1/stacks.py
15
15
Stack endpoint for Heat CloudFormation v1 API.
16
16
"""
17
17
 
18
 
import json
19
18
import socket
20
19
 
 
20
from oslo_log import log as logging
 
21
from oslo_serialization import jsonutils
 
22
 
21
23
from heat.api.aws import exception
22
24
from heat.api.aws import utils as api_utils
23
25
from heat.common import exception as heat_exception
28
30
from heat.common import template_format
29
31
from heat.common import urlfetch
30
32
from heat.common import wsgi
31
 
from heat.openstack.common import log as logging
32
33
from heat.rpc import api as rpc_api
33
34
from heat.rpc import client as rpc_client
34
35
 
509
510
            action = e[rpc_api.EVENT_RES_ACTION]
510
511
            status = e[rpc_api.EVENT_RES_STATUS]
511
512
            result['ResourceStatus'] = '_'.join((action, status))
512
 
            result['ResourceProperties'] = json.dumps(result[
513
 
                                                      'ResourceProperties'])
 
513
            result['ResourceProperties'] = jsonutils.dumps(result[
 
514
                'ResourceProperties'])
514
515
 
515
516
            return self._id_format(result)
516
517