Remove service-info from returned json

Rename create_servcie to create_or_update
Update metadata-client version

Change-Id: Id7995d44967594a3fd7dee472b70f7be310af50a
This commit is contained in:
Ekaterina Fedorova 2013-12-02 11:02:02 +04:00
parent b1e38556f9
commit 6baef757a9
3 changed files with 5 additions and 4 deletions

View File

@ -209,7 +209,7 @@ class ManageServiceView(tables.MultiTableView):
exceptions.handle(self.request, _('There is a problem with Murano '
'Repository Service'))
else:
return result['service_info']
return result
return result
def get_context_data(self, **kwargs):

View File

@ -88,8 +88,9 @@ class ComposeService(workflows.Workflow):
def handle(self, request, context):
try:
return metadataclient(request).metadata_admin.create_service(
context.get('full_service_name'), context)
return metadataclient(request).metadata_admin.\
create_or_update_service(context.get('full_service_name'),
context)
except Exception:
name = self.context.get('service_display_name', 'noname')
log.error("Unable to create/modify service {0}".format(name))

View File

@ -9,4 +9,4 @@ django-floppyforms==1.1
ordereddict
yaql==0.2
python-muranoclient>=0.3
murano-metadataclient==0.4.dev29.gb604344
murano-metadataclient==0.4.dev33.g89019e5