diff options
| author | lin-hua-cheng <os.lcheng@gmail.com> | 2014-12-19 16:15:13 -0800 |
|---|---|---|
| committer | lin-hua-cheng <os.lcheng@gmail.com> | 2014-12-27 21:07:01 -0800 |
| commit | 1b8c3c8cb90c03881e0a648f247a186fe4b494de (patch) | |
| tree | 8fd3d67ecd3b2daab702db84842aed8fb9023d11 | |
| parent | 10860db5f155052ca0d353ce9058e1c16eec8437 (diff) | |
| download | python-keystoneclient-1b8c3c8cb90c03881e0a648f247a186fe4b494de.tar.gz | |
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
| -rw-r--r-- | keystoneclient/tests/v2_0/test_shell.py | 17 | ||||
| -rwxr-xr-x | keystoneclient/v2_0/shell.py | 4 |
2 files changed, 16 insertions, 5 deletions
diff --git a/keystoneclient/tests/v2_0/test_shell.py b/keystoneclient/tests/v2_0/test_shell.py index 57bbe9d..7cfed80 100644 --- a/keystoneclient/tests/v2_0/test_shell.py +++ b/keystoneclient/tests/v2_0/test_shell.py @@ -268,16 +268,27 @@ 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": "service1", + "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": "desc1"}} + self.assertRequestBodyIs(json=json) + def test_service_get(self): self.stub_url('GET', ['OS-KSADM', 'services', '1'], json={'OS-KSADM:service': {'id': '1'}}) diff --git a/keystoneclient/v2_0/shell.py b/keystoneclient/v2_0/shell.py index a2cb1ab..9920555 100755 --- a/keystoneclient/v2_0/shell.py +++ b/keystoneclient/v2_0/shell.py @@ -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): |