stackforge-attic
/
murano-metadataclient
Code Issues Proposed changes

Cherry-pick following commits from master: 

* Add ability to delete file from service
  I7a8c5d09511c4d85483f9cb112550b29039eb05b
* Add metadata version and increment service version in case of modification
  Ib5853938386142edd291e3e005b381c2524c58d5

Change-Id: Ieac59f247ac1886a769dab0f221b59ecae244250
This commit is contained in:
Ekaterina Fedorova 2013-12-17 16:25:05 +04:00 committed by Timur Sufiev
parent 7d704f2d58
commit 2e96680e07
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
metadataclient/v1/metadata_admin.py
View File

@ -155,6 +155,13 @@ class Controller(object):
body=file_data)
return resp
def _update_service(self, service_files, service_id, service_info):
service_info.update(service_files)
url = quote('/admin/services/{service}'.format(service=service_id))
resp, body = self.http_client.json_request('PUT', url,
body=service_info)
return resp, body
def upload_file_to_service(self, data_type, file_data,
file_name, service_id):
self.upload_file(data_type, file_data, file_name)
@ -166,13 +173,9 @@ class Controller(object):
service_files[data_type].append(file_name)
else:
service_files[data_type] = [file_name]
service_info.update(service_files)
url = quote('/admin/services/{service}'.format(
service=service_id))
resp, body = self.http_client.json_request('PUT',
url,
body=service_info)
resp, body = self._update_service(service_files,
service_id,
service_info)
return body
def upload_file_to_dir(self, data_type, path, file_data):
@ -196,7 +199,26 @@ class Controller(object):
url = quote('/admin/{0}/{1}'.format(data_type, path))
self.http_client.raw_request('DELETE', url)
def delete_from_service(self, data_type, filename, service_id):
service_info = self.get_service_info(service_id)
resp, service_files = self.http_client.json_request(
'GET', '/admin/services/{service}'.format(service=service_id))
files = service_files.get(data_type)
if filename in files:
service_files[data_type].remove(filename)
resp, body = self._update_service(service_files,
service_id,
service_info)
if resp.status == 200:
url = quote('/admin/{0}/{1}'.format(data_type, filename))
self.http_client.raw_request('DELETE', url)
return body
def create_or_update_service(self, service, json_data):
# Increment version in case of modification
json_data['service_version'] += 1
json_data['version'] = u'0.1' # Version of metadata
url = quote('/admin/services/{service}'.format(service=service))
resp, body = self.http_client.json_request('PUT', url, body=json_data)
return body