openstack/python-keystoneclient
Code Issues Proposed changes

Merge "add clear definition of service list"

Browse Source
This commit is contained in:
Jenkins
2015-01-07 23:26:31 +00:00
committed by Gerrit Code Review
parent 260f54dad7 8f878997b4
commit 5e1da553cb
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
keystoneclient/tests/v3/test_services.py
View File

@@ -30,3 +30,15 @@ class ServiceTests(utils.TestCase, utils.CrudTests):
kwargs.setdefault('type', uuid.uuid4().hex) kwargs.setdefault('type', uuid.uuid4().hex)
kwargs.setdefault('enabled', True) kwargs.setdefault('enabled', True)
return kwargs return kwargs
def test_list_filter_name(self):
filter_name = uuid.uuid4().hex
expected_query = {'name': filter_name}
super(ServiceTests, self).test_list(expected_query=expected_query,
name=filter_name)
def test_list_filter_type(self):
filter_type = uuid.uuid4().hex
expected_query = {'type': filter_type}
super(ServiceTests, self).test_list(expected_query=expected_query,
type=filter_type)

7
keystoneclient/v3/services.py
View File

@@ -50,6 +50,13 @@ class ServiceManager(base.CrudManager):
return super(ServiceManager, self).get( return super(ServiceManager, self).get(
service_id=base.getid(service)) service_id=base.getid(service))
@utils.positional(enforcement=utils.positional.WARN)
def list(self, name=None, type=None, **kwargs):
return super(ServiceManager, self).list(
name=name,
type=type,
**kwargs)
@utils.positional(enforcement=utils.positional.WARN) @utils.positional(enforcement=utils.positional.WARN)
def update(self, service, name=None, type=None, enabled=None, def update(self, service, name=None, type=None, enabled=None,
description=None, **kwargs): description=None, **kwargs):