openstack/python-manilaclient
Code Issues Proposed changes

Added detail parameter to list methods

Browse Source 
Added detail parameter to list methods for security_services
and share_networks in v1.
Closes-bug #1297824

Change-Id: Iac2384bbf69c18f75291cc58509e8e99d0ac93ff
This commit is contained in:
Yulia Portnova
2014-03-26 14:37:25 +02:00
parent 630985649f
commit 00ccdd3831
7 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manilaclient/service_catalog.py
View File

@@ -47,7 +47,7 @@ class ServiceCatalog(object):
raise manilaclient.exceptions.EndpointNotFound()
# We don't always get a service catalog back ...
if not 'serviceCatalog' in self.catalog['access']:
if 'serviceCatalog' not in self.catalog['access']:
return None
# Full catalog ...

7
manilaclient/v1/security_services.py
View File

@@ -125,7 +125,7 @@ class SecurityServiceManager(base.Manager):
"""
self._delete(RESOURCE_PATH % security_service)
def list(self, search_opts=None):
def list(self, detailed=False, search_opts=None):
"""Get a list of all security services.
:rtype: list of :class:`SecurityService`
@@ -140,6 +140,9 @@ class SecurityServiceManager(base.Manager):
else:
query_string = ''
path = RESOURCES_PATH + "%s" % query_string
if detailed:
path = RESOURCES_PATH + "/detail" + query_string
else:
path = RESOURCES_PATH + query_string
return self._list(path, RESOURCES_NAME)

7
manilaclient/v1/share_networks.py
View File

@@ -151,7 +151,7 @@ class ShareNetworkManager(base.Manager):
"""
self._delete(RESOURCE_PATH % share_network)
def list(self, search_opts=None):
def list(self, detailed=False, search_opts=None):
"""Get a list of all share network.
:rtype: list of :class:`NetworkInfo`
@@ -166,6 +166,9 @@ class ShareNetworkManager(base.Manager):
else:
query_string = ''
path = RESOURCES_PATH + "%s" % query_string
if detailed:
path = RESOURCES_PATH + "/detail" + query_string
else:
path = RESOURCES_PATH + query_string
return self._list(path, RESOURCES_NAME)

8
tests/v1/test_security_services.py
View File

@@ -91,6 +91,14 @@ class SecurityServiceTest(unittest.TestCase):
security_services.RESOURCES_PATH,
security_services.RESOURCES_NAME)
def test_list_detailed(self):
with mock.patch.object(self.manager, '_list',
mock.Mock(return_value=None)):
self.manager.list(detailed=True)
self.manager._list.assert_called_once_with(
security_services.RESOURCES_PATH + '/detail',
security_services.RESOURCES_NAME)
def test_list_with_filters(self):
filters = OrderedDict([('all_tenants', 1),
('status', 'ERROR'),

8
tests/v1/test_share_networks.py
View File

@@ -70,6 +70,14 @@ class ShareNetworkTest(unittest.TestCase):
share_networks.RESOURCES_PATH,
share_networks.RESOURCES_NAME)
def test_list_detailed(self):
with mock.patch.object(self.manager, '_list',
mock.Mock(return_value=None)):
self.manager.list(detailed=True)
self.manager._list.assert_called_once_with(
share_networks.RESOURCES_PATH + '/detail',
share_networks.RESOURCES_NAME)
def test_list_with_filters(self):
filters = OrderedDict([('all_tenants', 1), ('status', 'ERROR')])
expected_path = \