openstack
/
python-keystoneclient
Code Issues Proposed changes

Updated service name to be optional in CLI 

Service name is optional in the API, updating the CLI
for consistency.

Change-Id: I94f0eb248a39d2f59edd00a5f90125a5c42525ed
Closes-Bug: #1393977
Closes-Bug: #1404073
This commit is contained in:
lin-hua-cheng 2014-12-19 16:15:13 -08:00
parent 10860db5f1
commit 1b8c3c8cb9
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
keystoneclient/tests/v2_0/test_shell.py
View File

@ -268,14 +268,25 @@ class ShellTests(utils.TestCase):
self.run_command('tenant-delete 2')
self.assert_called('DELETE', '/tenants/2')
def test_service_create(self):
def test_service_create_with_required_arguments_only(self):
self.stub_url('POST', ['OS-KSADM', 'services'],
json={'OS-KSADM:service': {}})
self.run_command('service-create --name service1 --type compute')
self.run_command('service-create --type compute')
self.assert_called('POST', '/OS-KSADM/services')
json = {"OS-KSADM:service": {"type": "compute",
"name": None,
"description": None}}
self.assertRequestBodyIs(json=json)
def test_service_create_with_all_arguments(self):
self.stub_url('POST', ['OS-KSADM', 'services'],
json={'OS-KSADM:service': {}})
self.run_command('service-create --type compute '
'--name service1 --description desc1')
self.assert_called('POST', '/OS-KSADM/services')
json = {"OS-KSADM:service": {"type": "compute",
"name": "service1",
"description": None}}
"description": "desc1"}}
self.assertRequestBodyIs(json=json)
def test_service_get(self):

4
keystoneclient/v2_0/shell.py
View File

@ -248,11 +248,11 @@ def do_tenant_delete(kc, args):
kc.tenants.delete(tenant)
@utils.arg('--name', metavar='<name>', required=True,
help='Name of new service (must be unique).')
@utils.arg('--type', metavar='<type>', required=True,
help='Service type (one of: identity, compute, network, '
'image, object-store, or other service identifier string).')
@utils.arg('--name', metavar='<name>',
help='Name of new service (must be unique).')
@utils.arg('--description', metavar='<service-description>',
help='Description of service.')
def do_service_create(kc, args):