From 897ccca9ed1039df2b60b0607997cccb06fd913c Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Mon, 9 Jul 2012 14:23:31 -0400 Subject: [PATCH] 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 --- heat/engine/manager.py | 4 ++-- heat/metadata/api/v1/__init__.py | 2 +- heat/metadata/api/v1/metadata.py | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/heat/engine/manager.py b/heat/engine/manager.py index d4e931235b..366f80c20c 100644 --- 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 9b21015468..2a629ef415 100644 --- 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 8ba4e78962..57ff91459d 100644 --- 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,