summaryrefslogtreecommitdiff
path: root/openstackclient/api
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-06-09 00:21:52 +0000
committerGerrit Code Review <review@openstack.org>2020-06-09 00:21:52 +0000
commit831dd3fe12ca99a1afd8dcdaeefdb4247bd7fabe (patch)
tree7815c9f896d38f31f66a9b5b3aa1a78f77930ef4 /openstackclient/api
parent730a8505f6b8cadd79132e234a590c0fbacf4405 (diff)
parent41a2e82939e3fa60922923263e8d96d9c1da2635 (diff)
downloadpython-openstackclient-831dd3fe12ca99a1afd8dcdaeefdb4247bd7fabe.tar.gz
Merge "Make container list --all work"
Diffstat (limited to 'openstackclient/api')
-rw-r--r--openstackclient/api/object_store_v1.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/openstackclient/api/object_store_v1.py b/openstackclient/api/object_store_v1.py
index dcb32878..8092abd0 100644
--- a/openstackclient/api/object_store_v1.py
+++ b/openstackclient/api/object_store_v1.py
@@ -87,7 +87,7 @@ class APIv1(api.BaseAPI):
def container_list(
self,
- all_data=False,
+ full_listing=False,
limit=None,
marker=None,
end_marker=None,
@@ -96,7 +96,7 @@ class APIv1(api.BaseAPI):
):
"""Get containers in an account
- :param boolean all_data:
+ :param boolean full_listing:
if True, return a full listing, else returns a max of
10000 listings
:param integer limit:
@@ -113,7 +113,7 @@ class APIv1(api.BaseAPI):
params['format'] = 'json'
- if all_data:
+ if full_listing:
data = listing = self.container_list(
limit=limit,
marker=marker,
@@ -299,7 +299,7 @@ class APIv1(api.BaseAPI):
def object_list(
self,
container=None,
- all_data=False,
+ full_listing=False,
limit=None,
marker=None,
end_marker=None,
@@ -311,7 +311,7 @@ class APIv1(api.BaseAPI):
:param string container:
container name to get a listing for
- :param boolean all_data:
+ :param boolean full_listing:
if True, return a full listing, else returns a max of
10000 listings
:param integer limit:
@@ -332,7 +332,7 @@ class APIv1(api.BaseAPI):
return None
params['format'] = 'json'
- if all_data:
+ if full_listing:
data = listing = self.object_list(
container=container,
limit=limit,