openstack/heat
Code Issues Proposed changes

Merge "heat : Remove cloudwatch functionalty from metadata server"

Browse Source
This commit is contained in:
Jenkins 2012-10-15 08:57:10 +00:00 committed by Gerrit Code Review
commit b53436bf40
2 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
heat/metadata/api/v1/__init__.py
View File

@ -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

19
heat/metadata/api/v1/metadata.py
View File

@ -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):
"""