diff --git a/zunclient/tests/unit/v1/test_containers.py b/zunclient/tests/unit/v1/test_containers.py index e7ea8fcf..70ebe1ee 100644 --- a/zunclient/tests/unit/v1/test_containers.py +++ b/zunclient/tests/unit/v1/test_containers.py @@ -383,11 +383,10 @@ class ContainerManagerTest(testtools.TestCase): def _test_containers_list_with_filters(self, limit=None, marker=None, sort_key=None, sort_dir=None, - detail=False, expect=[]): + expect=[]): containers_filter = self.mgr.list(limit=limit, marker=marker, sort_key=sort_key, - sort_dir=sort_dir, - detail=detail) + sort_dir=sort_dir) self.assertEqual(expect, self.api.calls) self.assertThat(containers_filter, matchers.HasLength(2)) diff --git a/zunclient/tests/unit/v1/test_images.py b/zunclient/tests/unit/v1/test_images.py index 286c7f15..6b6ab206 100644 --- a/zunclient/tests/unit/v1/test_images.py +++ b/zunclient/tests/unit/v1/test_images.py @@ -120,11 +120,10 @@ class ImageManagerTest(testtools.TestCase): def _test_image_list_with_filters( self, limit=None, marker=None, sort_key=None, sort_dir=None, - detail=False, expect=[]): + expect=[]): images_filter = self.mgr.list(limit=limit, marker=marker, sort_key=sort_key, - sort_dir=sort_dir, - detail=detail) + sort_dir=sort_dir) self.assertEqual(expect, self.api.calls) self.assertThat(images_filter, matchers.HasLength(2)) diff --git a/zunclient/tests/unit/v1/test_services.py b/zunclient/tests/unit/v1/test_services.py index 62b8f4dd..aad01e2a 100644 --- a/zunclient/tests/unit/v1/test_services.py +++ b/zunclient/tests/unit/v1/test_services.py @@ -101,11 +101,10 @@ class ServiceManagerTest(testtools.TestCase): def _test_service_list_with_filters( self, limit=None, marker=None, sort_key=None, sort_dir=None, - detail=False, expect=[]): + expect=[]): services_filter = self.mgr.list(limit=limit, marker=marker, sort_key=sort_key, - sort_dir=sort_dir, - detail=detail) + sort_dir=sort_dir) self.assertEqual(expect, self.api.calls) self.assertThat(services_filter, matchers.HasLength(2)) diff --git a/zunclient/v1/capsules.py b/zunclient/v1/capsules.py index 0138eb55..ad58559e 100644 --- a/zunclient/v1/capsules.py +++ b/zunclient/v1/capsules.py @@ -53,7 +53,7 @@ class CapsuleManager(base.Manager): return self._create(self._path(), new) 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. :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 default) or 'desc'. - :param detail: Optional, boolean whether to return detailed information - about containers. - :returns: A list of containers. """ @@ -88,8 +85,6 @@ class CapsuleManager(base.Manager): sort_dir, all_projects) path = '' - if detail: - path += 'detail' if filters: path += '?' + '&'.join(filters) diff --git a/zunclient/v1/containers.py b/zunclient/v1/containers.py index 0b605d83..ceed3b09 100644 --- a/zunclient/v1/containers.py +++ b/zunclient/v1/containers.py @@ -44,7 +44,7 @@ class ContainerManager(base.Manager): return '/v1/containers' 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. :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 default) or 'desc'. - :param detail: Optional, boolean whether to return detailed information - about containers. - :returns: A list of containers. """ @@ -78,8 +75,6 @@ class ContainerManager(base.Manager): filters = utils.common_filters(marker, limit, sort_key, sort_dir, all_projects) path = '' - if detail: - path += 'detail' if filters: path += '?' + '&'.join(filters) diff --git a/zunclient/v1/hosts.py b/zunclient/v1/hosts.py index a351ec06..b5c3cbda 100644 --- a/zunclient/v1/hosts.py +++ b/zunclient/v1/hosts.py @@ -31,7 +31,7 @@ class HostManager(base.Manager): return '/v1/hosts/' def list(self, marker=None, limit=None, sort_key=None, - sort_dir=None, detail=False): + sort_dir=None): """Retrieve a list of hosts. :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 default) or 'desc'. - :param detail: Optional, boolean whether to return detailed information - about hosts. - :returns: A list of hosts. """ @@ -62,8 +59,6 @@ class HostManager(base.Manager): filters = utils.common_filters(marker, limit, sort_key, sort_dir) path = '' - if detail: - path += 'detail' if filters: path += '?' + '&'.join(filters) diff --git a/zunclient/v1/images.py b/zunclient/v1/images.py index 3504ea49..d41758dd 100644 --- a/zunclient/v1/images.py +++ b/zunclient/v1/images.py @@ -36,7 +36,7 @@ class ImageManager(base.Manager): return '/v1/images/' def list(self, marker=None, limit=None, sort_key=None, - sort_dir=None, detail=False): + sort_dir=None): """Retrieve a list of images. :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 default) or 'desc'. - :param detail: Optional, boolean whether to return detailed information - about images. - :returns: A list of images. """ @@ -67,8 +64,6 @@ class ImageManager(base.Manager): filters = utils.common_filters(marker, limit, sort_key, sort_dir) path = '' - if detail: - path += 'detail' if filters: path += '?' + '&'.join(filters) diff --git a/zunclient/v1/services.py b/zunclient/v1/services.py index 85ced3e3..d2aec0d0 100644 --- a/zunclient/v1/services.py +++ b/zunclient/v1/services.py @@ -29,7 +29,7 @@ class ServiceManager(base.Manager): return '/v1/services/%s' % id if id else '/v1/services' def list(self, marker=None, limit=None, sort_key=None, - sort_dir=None, detail=False): + sort_dir=None): """Retrieve list of zun services. :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 default) or 'desc'. - :param detail: Optional, boolean whether to return detailed information - about services. - :returns: A list of services. """ @@ -61,8 +58,6 @@ class ServiceManager(base.Manager): filters = utils.common_filters(marker, limit, sort_key, sort_dir) path = '' - if detail: - path += 'detail' if filters: path += '?' + '&'.join(filters)