diff options
| author | Zane Bitter <zbitter@redhat.com> | 2012-12-21 13:47:28 +0100 |
|---|---|---|
| committer | Zane Bitter <zbitter@redhat.com> | 2012-12-21 19:03:13 +0100 |
| commit | b8f8167ff98bb2a4fabd84c5ae6f67b589600ec4 (patch) | |
| tree | 9929c9e0fa384ea63708ef58d25fc5da15d1b233 | |
| parent | 748391ba2c4647de9a02ca485516fc6033997c98 (diff) | |
| download | heat-b8f8167ff98bb2a4fabd84c5ae6f67b589600ec4.tar.gz | |
Use the new find_physical_resource RPC call
Change-Id: I79890f897912dd75acb6561598bb34862f09a534
Signed-off-by: Zane Bitter <zbitter@redhat.com>
| -rw-r--r-- | heat/api/cfn/v1/stacks.py | 6 | ||||
| -rw-r--r-- | heat/tests/test_api_cfn_v1.py | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/heat/api/cfn/v1/stacks.py b/heat/api/cfn/v1/stacks.py index 74de24a00..5797805fc 100644 --- a/heat/api/cfn/v1/stacks.py +++ b/heat/api/cfn/v1/stacks.py @@ -534,11 +534,13 @@ class StackController(object): if stack_name is not None: identity = self._get_identity(con, stack_name) else: - identity = None + identity = self.engine_rpcapi.find_physical_resource( + con, + physical_resource_id=physical_resource_id) resources = self.engine_rpcapi.describe_stack_resources( con, stack_identity=identity, - physical_resource_id=physical_resource_id, + physical_resource_id=None, logical_resource_id=req.params.get('LogicalResourceId')) except rpc_common.RemoteError as ex: diff --git a/heat/tests/test_api_cfn_v1.py b/heat/tests/test_api_cfn_v1.py index 13b05b0be..d09023767 100644 --- a/heat/tests/test_api_cfn_v1.py +++ b/heat/tests/test_api_cfn_v1.py @@ -1065,9 +1065,14 @@ class StackControllerTest(unittest.TestCase): u'metadata': {u'ensureRunning': u'true''true'}}] self.m.StubOutWithMock(rpc, 'call') + rpc.call(dummy_req.context, self.topic, + {'method': 'find_physical_resource', + 'args': {'physical_resource_id': + 'a3455d8c-9f88-404d-a85b-5315293e67de'}, + 'version': self.api_version}, None).AndReturn(identity) args = { - 'stack_identity': None, - 'physical_resource_id': 'a3455d8c-9f88-404d-a85b-5315293e67de', + 'stack_identity': identity, + 'physical_resource_id': None, 'logical_resource_id': dummy_req.params.get('LogicalResourceId'), } rpc.call(dummy_req.context, self.topic, |