Remove unused 'detail' parameter
This parameter is not used in server. This patch removes it from client side. Change-Id: Iec5479bd8f6b72f13292e9de9c9001ea495ef3ad
This commit is contained in:
parent
faa9528401
commit
1118d8052a
@ -383,11 +383,10 @@ class ContainerManagerTest(testtools.TestCase):
|
|||||||
|
|
||||||
def _test_containers_list_with_filters(self, limit=None, marker=None,
|
def _test_containers_list_with_filters(self, limit=None, marker=None,
|
||||||
sort_key=None, sort_dir=None,
|
sort_key=None, sort_dir=None,
|
||||||
detail=False, expect=[]):
|
expect=[]):
|
||||||
containers_filter = self.mgr.list(limit=limit, marker=marker,
|
containers_filter = self.mgr.list(limit=limit, marker=marker,
|
||||||
sort_key=sort_key,
|
sort_key=sort_key,
|
||||||
sort_dir=sort_dir,
|
sort_dir=sort_dir)
|
||||||
detail=detail)
|
|
||||||
self.assertEqual(expect, self.api.calls)
|
self.assertEqual(expect, self.api.calls)
|
||||||
self.assertThat(containers_filter, matchers.HasLength(2))
|
self.assertThat(containers_filter, matchers.HasLength(2))
|
||||||
|
|
||||||
|
@ -120,11 +120,10 @@ class ImageManagerTest(testtools.TestCase):
|
|||||||
def _test_image_list_with_filters(
|
def _test_image_list_with_filters(
|
||||||
self, limit=None, marker=None,
|
self, limit=None, marker=None,
|
||||||
sort_key=None, sort_dir=None,
|
sort_key=None, sort_dir=None,
|
||||||
detail=False, expect=[]):
|
expect=[]):
|
||||||
images_filter = self.mgr.list(limit=limit, marker=marker,
|
images_filter = self.mgr.list(limit=limit, marker=marker,
|
||||||
sort_key=sort_key,
|
sort_key=sort_key,
|
||||||
sort_dir=sort_dir,
|
sort_dir=sort_dir)
|
||||||
detail=detail)
|
|
||||||
self.assertEqual(expect, self.api.calls)
|
self.assertEqual(expect, self.api.calls)
|
||||||
self.assertThat(images_filter, matchers.HasLength(2))
|
self.assertThat(images_filter, matchers.HasLength(2))
|
||||||
|
|
||||||
|
@ -101,11 +101,10 @@ class ServiceManagerTest(testtools.TestCase):
|
|||||||
def _test_service_list_with_filters(
|
def _test_service_list_with_filters(
|
||||||
self, limit=None, marker=None,
|
self, limit=None, marker=None,
|
||||||
sort_key=None, sort_dir=None,
|
sort_key=None, sort_dir=None,
|
||||||
detail=False, expect=[]):
|
expect=[]):
|
||||||
services_filter = self.mgr.list(limit=limit, marker=marker,
|
services_filter = self.mgr.list(limit=limit, marker=marker,
|
||||||
sort_key=sort_key,
|
sort_key=sort_key,
|
||||||
sort_dir=sort_dir,
|
sort_dir=sort_dir)
|
||||||
detail=detail)
|
|
||||||
self.assertEqual(expect, self.api.calls)
|
self.assertEqual(expect, self.api.calls)
|
||||||
self.assertThat(services_filter, matchers.HasLength(2))
|
self.assertThat(services_filter, matchers.HasLength(2))
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@ class CapsuleManager(base.Manager):
|
|||||||
return self._create(self._path(), new)
|
return self._create(self._path(), new)
|
||||||
|
|
||||||
def list(self, marker=None, limit=None, sort_key=None,
|
def list(self, marker=None, limit=None, sort_key=None,
|
||||||
sort_dir=None, detail=False, all_projects=False):
|
sort_dir=None, all_projects=False):
|
||||||
"""Retrieve a list of capsules.
|
"""Retrieve a list of capsules.
|
||||||
|
|
||||||
:param all_projects: Optional, list containers in all projects
|
:param all_projects: Optional, list containers in all projects
|
||||||
@ -75,9 +75,6 @@ class CapsuleManager(base.Manager):
|
|||||||
:param sort_dir: Optional, direction of sorting, either 'asc' (the
|
:param sort_dir: Optional, direction of sorting, either 'asc' (the
|
||||||
default) or 'desc'.
|
default) or 'desc'.
|
||||||
|
|
||||||
:param detail: Optional, boolean whether to return detailed information
|
|
||||||
about containers.
|
|
||||||
|
|
||||||
:returns: A list of containers.
|
:returns: A list of containers.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
@ -88,8 +85,6 @@ class CapsuleManager(base.Manager):
|
|||||||
sort_dir, all_projects)
|
sort_dir, all_projects)
|
||||||
|
|
||||||
path = ''
|
path = ''
|
||||||
if detail:
|
|
||||||
path += 'detail'
|
|
||||||
if filters:
|
if filters:
|
||||||
path += '?' + '&'.join(filters)
|
path += '?' + '&'.join(filters)
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ class ContainerManager(base.Manager):
|
|||||||
return '/v1/containers'
|
return '/v1/containers'
|
||||||
|
|
||||||
def list(self, marker=None, limit=None, sort_key=None,
|
def list(self, marker=None, limit=None, sort_key=None,
|
||||||
sort_dir=None, detail=False, all_projects=False, **kwargs):
|
sort_dir=None, all_projects=False, **kwargs):
|
||||||
"""Retrieve a list of containers.
|
"""Retrieve a list of containers.
|
||||||
|
|
||||||
:param all_projects: Optional, list containers in all projects
|
:param all_projects: Optional, list containers in all projects
|
||||||
@ -66,9 +66,6 @@ class ContainerManager(base.Manager):
|
|||||||
:param sort_dir: Optional, direction of sorting, either 'asc' (the
|
:param sort_dir: Optional, direction of sorting, either 'asc' (the
|
||||||
default) or 'desc'.
|
default) or 'desc'.
|
||||||
|
|
||||||
:param detail: Optional, boolean whether to return detailed information
|
|
||||||
about containers.
|
|
||||||
|
|
||||||
:returns: A list of containers.
|
:returns: A list of containers.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
@ -78,8 +75,6 @@ class ContainerManager(base.Manager):
|
|||||||
filters = utils.common_filters(marker, limit, sort_key,
|
filters = utils.common_filters(marker, limit, sort_key,
|
||||||
sort_dir, all_projects)
|
sort_dir, all_projects)
|
||||||
path = ''
|
path = ''
|
||||||
if detail:
|
|
||||||
path += 'detail'
|
|
||||||
if filters:
|
if filters:
|
||||||
path += '?' + '&'.join(filters)
|
path += '?' + '&'.join(filters)
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@ class HostManager(base.Manager):
|
|||||||
return '/v1/hosts/'
|
return '/v1/hosts/'
|
||||||
|
|
||||||
def list(self, marker=None, limit=None, sort_key=None,
|
def list(self, marker=None, limit=None, sort_key=None,
|
||||||
sort_dir=None, detail=False):
|
sort_dir=None):
|
||||||
"""Retrieve a list of hosts.
|
"""Retrieve a list of hosts.
|
||||||
|
|
||||||
:param marker: Optional, the UUID of an host, eg the last
|
:param marker: Optional, the UUID of an host, eg the last
|
||||||
@ -50,9 +50,6 @@ class HostManager(base.Manager):
|
|||||||
:param sort_dir: Optional, direction of sorting, either 'asc' (the
|
:param sort_dir: Optional, direction of sorting, either 'asc' (the
|
||||||
default) or 'desc'.
|
default) or 'desc'.
|
||||||
|
|
||||||
:param detail: Optional, boolean whether to return detailed information
|
|
||||||
about hosts.
|
|
||||||
|
|
||||||
:returns: A list of hosts.
|
:returns: A list of hosts.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
@ -62,8 +59,6 @@ class HostManager(base.Manager):
|
|||||||
filters = utils.common_filters(marker, limit, sort_key, sort_dir)
|
filters = utils.common_filters(marker, limit, sort_key, sort_dir)
|
||||||
|
|
||||||
path = ''
|
path = ''
|
||||||
if detail:
|
|
||||||
path += 'detail'
|
|
||||||
if filters:
|
if filters:
|
||||||
path += '?' + '&'.join(filters)
|
path += '?' + '&'.join(filters)
|
||||||
|
|
||||||
|
@ -36,7 +36,7 @@ class ImageManager(base.Manager):
|
|||||||
return '/v1/images/'
|
return '/v1/images/'
|
||||||
|
|
||||||
def list(self, marker=None, limit=None, sort_key=None,
|
def list(self, marker=None, limit=None, sort_key=None,
|
||||||
sort_dir=None, detail=False):
|
sort_dir=None):
|
||||||
"""Retrieve a list of images.
|
"""Retrieve a list of images.
|
||||||
|
|
||||||
:param marker: Optional, the UUID of an image, eg the last
|
:param marker: Optional, the UUID of an image, eg the last
|
||||||
@ -55,9 +55,6 @@ class ImageManager(base.Manager):
|
|||||||
:param sort_dir: Optional, direction of sorting, either 'asc' (the
|
:param sort_dir: Optional, direction of sorting, either 'asc' (the
|
||||||
default) or 'desc'.
|
default) or 'desc'.
|
||||||
|
|
||||||
:param detail: Optional, boolean whether to return detailed information
|
|
||||||
about images.
|
|
||||||
|
|
||||||
:returns: A list of images.
|
:returns: A list of images.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
@ -67,8 +64,6 @@ class ImageManager(base.Manager):
|
|||||||
filters = utils.common_filters(marker, limit, sort_key, sort_dir)
|
filters = utils.common_filters(marker, limit, sort_key, sort_dir)
|
||||||
|
|
||||||
path = ''
|
path = ''
|
||||||
if detail:
|
|
||||||
path += 'detail'
|
|
||||||
if filters:
|
if filters:
|
||||||
path += '?' + '&'.join(filters)
|
path += '?' + '&'.join(filters)
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@ class ServiceManager(base.Manager):
|
|||||||
return '/v1/services/%s' % id if id else '/v1/services'
|
return '/v1/services/%s' % id if id else '/v1/services'
|
||||||
|
|
||||||
def list(self, marker=None, limit=None, sort_key=None,
|
def list(self, marker=None, limit=None, sort_key=None,
|
||||||
sort_dir=None, detail=False):
|
sort_dir=None):
|
||||||
"""Retrieve list of zun services.
|
"""Retrieve list of zun services.
|
||||||
|
|
||||||
:param marker: Optional, the ID of a zun service, eg the last
|
:param marker: Optional, the ID of a zun service, eg the last
|
||||||
@ -49,9 +49,6 @@ class ServiceManager(base.Manager):
|
|||||||
:param sort_dir: Optional, direction of sorting, either 'asc' (the
|
:param sort_dir: Optional, direction of sorting, either 'asc' (the
|
||||||
default) or 'desc'.
|
default) or 'desc'.
|
||||||
|
|
||||||
:param detail: Optional, boolean whether to return detailed information
|
|
||||||
about services.
|
|
||||||
|
|
||||||
:returns: A list of services.
|
:returns: A list of services.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@ -61,8 +58,6 @@ class ServiceManager(base.Manager):
|
|||||||
filters = utils.common_filters(marker, limit, sort_key, sort_dir)
|
filters = utils.common_filters(marker, limit, sort_key, sort_dir)
|
||||||
|
|
||||||
path = ''
|
path = ''
|
||||||
if detail:
|
|
||||||
path += 'detail'
|
|
||||||
if filters:
|
if filters:
|
||||||
path += '?' + '&'.join(filters)
|
path += '?' + '&'.join(filters)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user