Rename resource_id to resource_name in metadata API

This more accurately reflects what the parameter is, which is just the name
of the resource within the specified stack.

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

diff --git a/heat/engine/manager.py b/heat/engine/manager.py
index d4e931235b75f6383c1b8978e4ca2f7b8860c17b..366f80c20c136e97416604916231f1c3990bb7e9 100644 (file)
--- a/heat/engine/manager.py
+++ b/heat/engine/manager.py
@@ -331,7 +331,7 @@ class EngineManager(manager.Manager):
         else:
             return None
 
-    def metadata_get_resource(self, context, stack_name, resource_id):
+    def metadata_get_resource(self, context, stack_name, resource_name):
         """
         Get the metadata for the given resource.
         """
@@ -340,7 +340,7 @@ class EngineManager(manager.Manager):
         if not s:
             return ['stack', None]
 
-        r = db_api.resource_get_by_name_and_stack(None, resource_id, s.id)
+        r = db_api.resource_get_by_name_and_stack(None, resource_name, s.id)
         if r is None:
             return ['resource', None]
 

diff --git a/heat/metadata/api/v1/__init__.py b/heat/metadata/api/v1/__init__.py
index 9b21015468c57f50666b6a2d91b65719cf6750ac..2a629ef415857893f274879af32ef51c082da6e5 100644 (file)
--- a/heat/metadata/api/v1/__init__.py
+++ b/heat/metadata/api/v1/__init__.py
@@ -39,7 +39,7 @@ class API(wsgi.Router):
         mapper.connect('/stacks/:stack_name/resources/',
                        controller=metadata_controller, action='list_resources',
                        conditions=dict(method=['GET']))
-        mapper.connect('/stacks/:stack_name/resources/:resource_id',
+        mapper.connect('/stacks/:stack_name/resources/:resource_name',
                        controller=metadata_controller, action='get_resource',
                        conditions=dict(method=['GET']))
         mapper.connect('/stacks/:stack_name',

diff --git a/heat/metadata/api/v1/metadata.py b/heat/metadata/api/v1/metadata.py
index 8ba4e78962d7feefa3ed9f38a82be0c047e1c05d..57ff91459dd34a93345ae4da546277f9a70ba71e 100644 (file)
--- a/heat/metadata/api/v1/metadata.py
+++ b/heat/metadata/api/v1/metadata.py
@@ -63,12 +63,13 @@ class MetadataController:
             return json_error(404,
                               'The stack "%s" does not exist.' % stack_name)
 
-    def get_resource(self, req, stack_name, resource_id):
+    def get_resource(self, req, stack_name, resource_name):
         con = context.get_admin_context()
         [error, metadata] = rpc.call(con, 'engine',
                                      {'method': 'metadata_get_resource',
                                       'args': {'stack_name': stack_name,
-                                               'resource_id': resource_id}})
+                                               'resource_name': resource_name}
+                                     })
         if error:
             if error == 'stack':
                 return json_error(404,