From: Zane Bitter Date: Fri, 21 Dec 2012 12:47:28 +0000 (+0100) Subject: Use the new find_physical_resource RPC call X-Git-Tag: 2014.1~1038 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b8f8167ff98bb2a4fabd84c5ae6f67b589600ec4;p=openstack-build%2Fheat-build.git Use the new find_physical_resource RPC call Change-Id: I79890f897912dd75acb6561598bb34862f09a534 Signed-off-by: Zane Bitter --- diff --git a/heat/api/cfn/v1/stacks.py b/heat/api/cfn/v1/stacks.py index 74de24a0..5797805f 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 13b05b0b..d0902376 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,