From 66cfb0ba4608ff7c82dc66d074fee2ad18a24ea0 Mon Sep 17 00:00:00 2001 From: Jay Lau Date: Tue, 23 Dec 2014 10:25:46 -0500 Subject: [PATCH] Service create only need service filename The k8s service create only has one parameter as filename, this patch is updating magnum client can have same parameter when creating service. Magnum backend also needs to be updated to reflect this. Change-Id: Iaae8486b0517aa0e66370d55bd84ae2f0fc9644d --- magnumclient/api/services.py | 5 ++--- magnumclient/api/shell.py | 4 ---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/magnumclient/api/services.py b/magnumclient/api/services.py index 97c266d9..7901185b 100644 --- a/magnumclient/api/services.py +++ b/magnumclient/api/services.py @@ -16,8 +16,7 @@ from magnumclient.common import base from magnumclient.common import utils from magnumclient import exceptions -# FIXME: Modify correct attributes. -CREATION_ATTRIBUTES = ['description'] +CREATION_ATTRIBUTES = ['service_data'] class Service(base.Resource): @@ -95,4 +94,4 @@ class ServiceManager(base.Manager): return self._delete(self._path(service_id)) def update(self, service_id, patch): - return self._update(self._path(service_id), patch) \ No newline at end of file + return self._update(self._path(service_id), patch) diff --git a/magnumclient/api/shell.py b/magnumclient/api/shell.py index ed2000f5..0af51ea0 100644 --- a/magnumclient/api/shell.py +++ b/magnumclient/api/shell.py @@ -226,16 +226,12 @@ def do_service_list(cs, args): {'versions': _print_list_field('versions')}) -@utils.arg('--name', - metavar='', - help='Name of service to create.') @utils.arg('--service-file', metavar='', help='Name of the serivce file to use for creating services.') def do_service_create(cs, args): """Create a service.""" opts = {} - opts['name'] = args.name opts['service_data'] = open(args.service_file).read() service = cs.services.create(**opts) _show_service(service)