openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Missing defaults in the create() method in the v2 ServiceManager"

Browse Source
This commit is contained in:
Jenkins
2016-01-27 23:06:43 +00:00
committed by Gerrit Code Review
parent a02d796269 677ef6d44f
commit 5c936fabe1
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
keystoneclient/tests/unit/v2_0/test_services.py
View File

@@ -42,7 +42,7 @@ class ServiceTests(utils.ClientTestCase):
},
}
def test_create(self):
def test_create_with_description(self):
req_body = {
"OS-KSADM:service": {
"name": "swift",
@@ -68,6 +68,37 @@ class ServiceTests(utils.ClientTestCase):
self.assertIsInstance(service, services.Service)
self.assertEqual(service.id, service_id)
self.assertEqual(service.name, req_body['OS-KSADM:service']['name'])
self.assertEqual(service.description,
req_body['OS-KSADM:service']['description'])
self.assertRequestBodyIs(json=req_body)
def test_create_without_description(self):
req_body = {
"OS-KSADM:service": {
"name": "swift",
"type": "object-store",
"description": None,
}
}
service_id = uuid.uuid4().hex
resp_body = {
"OS-KSADM:service": {
"name": "swift",
"type": "object-store",
"id": service_id,
"description": None,
}
}
self.stub_url('POST', ['OS-KSADM', 'services'], json=resp_body)
service = self.client.services.create(
req_body['OS-KSADM:service']['name'],
req_body['OS-KSADM:service']['type'],
req_body['OS-KSADM:service']['description'])
self.assertIsInstance(service, services.Service)
self.assertEqual(service.id, service_id)
self.assertEqual(service.name, req_body['OS-KSADM:service']['name'])
self.assertEqual(service.description, None)
self.assertRequestBodyIs(json=req_body)
def test_delete(self):

2
keystoneclient/v2_0/services.py
View File

@@ -35,7 +35,7 @@ class ServiceManager(base.ManagerWithFind):
"""Retrieve a service by id."""
return self._get("/OS-KSADM/services/%s" % id, "OS-KSADM:service")
def create(self, name, service_type, description):
def create(self, name, service_type, description=None):
"""Create a new service."""
body = {"OS-KSADM:service": {'name': name,
'type': service_type,