Use the new find_physical_resource RPC call

Change-Id: I79890f897912dd75acb6561598bb34862f09a534
Signed-off-by: Zane Bitter <zbitter@redhat.com>

diff --git a/heat/api/cfn/v1/stacks.py b/heat/api/cfn/v1/stacks.py
index 74de24a00e957a60d5c951b6d582d5975892d7ea..5797805fc11f718c1f8daf54ed92c6eb8a086f6f 100644 (file)
--- 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 13b05b0be1490fe5d2e29b01d26077e6f881d5b3..d09023767ca0e72ed06ce1859620eaf522cfad50 100644 (file)
--- 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,