~ubuntu-branches/ubuntu/trusty/heat/trusty-security

« back to all changes in this revision

Viewing changes to heat/api/openstack/v1/resources.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2013-09-08 21:51:19 UTC
  • mto: This revision was merged to the branch mainline in revision 14.
  • Revision ID: package-import@ubuntu.com-20130908215119-7tcek6gn73275x5k
Tags: upstream-2013.2~b3
ImportĀ upstreamĀ versionĀ 2013.2~b3

Show diffs side-by-side

added added

removed removed

Lines of Context:
44
44
            # and RES_STATUS, so the API format doesn't expose the
45
45
            # internal split of state into action/status
46
46
            yield (key, '_'.join((res[engine_api.RES_ACTION], value)))
 
47
        elif (key == engine_api.RES_NAME):
 
48
            yield ('logical_resource_id', value)
 
49
            yield (key, value)
 
50
 
47
51
        else:
48
52
            yield (key, value)
49
53