stackforge-attic/murano-repository
Code Issues Proposed changes

Merge "Remove service-files and service info in returned json"

Browse Source
This commit is contained in:
Jenkins 2013-12-02 11:14:48 +00:00 committed by Gerrit Code Review
commit bcbb86fd32
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
muranorepository/api/utils.py
View File

@ -216,7 +216,7 @@ def save_archive(request):
return path_to_archive return path_to_archive
def create_service(service_id, data): def create_or_update_service(service_id, data):
required = ['full_service_name', 'service_display_name'] required = ['full_service_name', 'service_display_name']
optional = {'enabled': True, optional = {'enabled': True,
'version': 0.1, 'version': 0.1,

8
muranorepository/api/v1.py
View File

@ -155,7 +155,7 @@ def get_files_for_service(service_name):
if not manifest: if not manifest:
abort(404) abort(404)
data = api.get_manifest_files(manifest) data = api.get_manifest_files(manifest)
return jsonify(service_files=data) return jsonify(data)
@v1_api.route('/admin/services/<service_name>/info') @v1_api.route('/admin/services/<service_name>/info')
@ -165,7 +165,7 @@ def get_service_info(service_name):
if not manifest: if not manifest:
abort(404) abort(404)
data = api.get_manifest_info(manifest) data = api.get_manifest_info(manifest)
return jsonify(service_info=data) return jsonify(data)
@v1_api.route('/admin/services', methods=['POST']) @v1_api.route('/admin/services', methods=['POST'])
@ -224,7 +224,7 @@ def reset_caches():
@v1_api.route('/admin/services/<service_name>', methods=['PUT']) @v1_api.route('/admin/services/<service_name>', methods=['PUT'])
def create_service(service_name): def create_or_update_service(service_name):
try: try:
service_data = json.loads(request.data) service_data = json.loads(request.data)
except: except:
@ -236,6 +236,6 @@ def create_service(service_name):
"Body attribute 'full_service_name' value is {0} which doesn't " "Body attribute 'full_service_name' value is {0} which doesn't "
"correspond to 'service_name' part of URL (equals to {1})".format( "correspond to 'service_name' part of URL (equals to {1})".format(
service_id, service_name), 400) service_id, service_name), 400)
resp = api.create_service(service_name, service_data) resp = api.create_or_update_service(service_name, service_data)
api.reset_cache() api.reset_cache()
return resp return resp