diff --git a/heat/metadata/api/v1/__init__.py b/heat/metadata/api/v1/__init__.py index 7489929171..7f7efb6e64 100644 --- a/heat/metadata/api/v1/__init__.py +++ b/heat/metadata/api/v1/__init__.py @@ -53,14 +53,6 @@ class API(wsgi.Router): mapper.connect('/events/', controller=metadata_controller, action='create_event', conditions=dict(method=['POST'])) - mapper.connect('/stats/:watch_name/data/', - controller=metadata_controller, - action='create_watch_data', - conditions=dict(method=['PUT'])) -# mapper.connect('/stats/:watch_name/data/', -# controller=metadata_controller, -# action='list_watch_data', -# conditions=dict(method=['GET'])) # TODO(shadower): make sure all responses are JSON-encoded # currently, calling an unknown route uses the default handler which diff --git a/heat/metadata/api/v1/metadata.py b/heat/metadata/api/v1/metadata.py index 68c0effb1c..13c2ad105a 100644 --- a/heat/metadata/api/v1/metadata.py +++ b/heat/metadata/api/v1/metadata.py @@ -102,25 +102,6 @@ class MetadataController: return json_error(400, error) return json_response(201, event) - def create_watch_data(self, req, body, watch_name): - con = context.get_admin_context() - [error, watch_data] = self.engine_rpcapi.create_watch_data(con, - watch_name=watch_name, - stats_data=body) - if error: - return json_error(400, error) - return json_response(201, watch_data) - - def list_watch_data(self, req, watch_name): - con = context.get_admin_context() - data = self.engine_rpcapi.list_watch_data(con, - watch_name=watch_name) - if data: - return data - else: - return json_error(404, - 'The watch "%s" does not exist.' % watch_name) - def create_resource(options): """