openstack/shade
Code Issues Proposed changes

create_service() should normalize return value

Browse Source 
The new service data being returned from create_service() was not
going through the normalization function.

Change-Id: I5e80e7a74f71a61d83653595b9a176d2aa9039ec
This commit is contained in:
David Shrewsbury 2016-01-29 09:45:22 -05:00
parent 661927392c
commit 9035ade760
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
releasenotes/notes/create_service_norm-319a97433d68fa6a.yaml Normal file
View File

@ -0,0 +1,3 @@
---
fixes:
- The returned data from a create_service() call was not being normalized.

2
shade/operatorcloud.py
View File

@ -779,7 +779,7 @@ class OperatorCloud(openstackcloud.OpenStackCloud):
service = self.manager.submitTask(_tasks.ServiceCreate( service = self.manager.submitTask(_tasks.ServiceCreate(
name=name, description=description, **service_kwargs)) name=name, description=description, **service_kwargs))
return service return _utils.normalize_keystone_services([service])[0]
def list_services(self): def list_services(self):
"""List all Keystone services. """List all Keystone services.

7
shade/tests/unit/test_services.py
View File

@ -21,6 +21,7 @@ Tests Keystone services commands.
from mock import patch from mock import patch
import os_client_config import os_client_config
from shade import _utils
from shade import OpenStackCloudException from shade import OpenStackCloudException
from shade import OperatorCloud from shade import OperatorCloud
from shade.tests.fakes import FakeService from shade.tests.fakes import FakeService
@ -47,8 +48,9 @@ class CloudServices(base.TestCase):
self.mock_ks_services = [FakeService(**kwa) for kwa in self.mock_ks_services = [FakeService(**kwa) for kwa in
self.mock_services] self.mock_services]
@patch.object(_utils, 'normalize_keystone_services')
@patch.object(OperatorCloud, 'keystone_client') @patch.object(OperatorCloud, 'keystone_client')
def test_create_service(self, mock_keystone_client): def test_create_service(self, mock_keystone_client, mock_norm):
kwargs = { kwargs = {
'name': 'a service', 'name': 'a service',
'type': 'network', 'type': 'network',
@ -58,15 +60,14 @@ class CloudServices(base.TestCase):
self.client.create_service(**kwargs) self.client.create_service(**kwargs)
kwargs['service_type'] = kwargs.pop('type') kwargs['service_type'] = kwargs.pop('type')
mock_keystone_client.services.create.assert_called_with(**kwargs) mock_keystone_client.services.create.assert_called_with(**kwargs)
self.assertTrue(mock_norm.called)
@patch.object(OperatorCloud, 'keystone_client') @patch.object(OperatorCloud, 'keystone_client')
def test_list_services(self, mock_keystone_client): def test_list_services(self, mock_keystone_client):
mock_keystone_client.services.list.return_value = \ mock_keystone_client.services.list.return_value = \
self.mock_ks_services self.mock_ks_services
services = self.client.list_services() services = self.client.list_services()
mock_keystone_client.services.list.assert_called_with() mock_keystone_client.services.list.assert_called_with()
self.assertItemsEqual(self.mock_services, services) self.assertItemsEqual(self.mock_services, services)
@patch.object(OperatorCloud, 'keystone_client') @patch.object(OperatorCloud, 'keystone_client')