openstack/deb-python-openstacksdk
Code Issues Proposed changes

Remove limit/marker from object_store proxy

Browse Source 
After the recent changes, object_store was still sending limit and
marker but in the wrong way. Removing them for right now.

Change-Id: Ic1a0a0d8e84aa22eca5d4d18794462ad30d33619
This commit is contained in:
Brian Curtin
2015-07-12 20:01:56 -05:00
parent f1eafddaec
commit 900ce115d1
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
openstack/object_store/v1/_proxy.py
View File

@@ -38,7 +38,7 @@ class Proxy(proxy.BaseProxy):
""" """
container.update(self.session) container.update(self.session)
def containers(self, limit=None, marker=None, **kwargs): def containers(self, **kwargs):
"""Obtain Container objects for this account. """Obtain Container objects for this account.
:param int limit: Set the limit of how many containers to retrieve :param int limit: Set the limit of how many containers to retrieve
@@ -52,8 +52,7 @@ class Proxy(proxy.BaseProxy):
:rtype: A generator of :rtype: A generator of
:class:`~openstack.object_store.v1.container.Container` objects. :class:`~openstack.object_store.v1.container.Container` objects.
""" """
return _container.Container.list(self.session, limit=limit, return _container.Container.list(self.session, **kwargs)
marker=marker, **kwargs)
def get_container_metadata(self, value): def get_container_metadata(self, value):
"""Get metatdata for a container """Get metatdata for a container
@@ -110,7 +109,7 @@ class Proxy(proxy.BaseProxy):
self._delete(_container.Container, value, self._delete(_container.Container, value,
ignore_missing=ignore_missing) ignore_missing=ignore_missing)
def objects(self, container, limit=None, marker=None, **kwargs): def objects(self, container, **kwargs):
"""Return a generator that yields the Container's objects. """Return a generator that yields the Container's objects.
:param container: A container object or the name of a container :param container: A container object or the name of a container
@@ -123,7 +122,7 @@ class Proxy(proxy.BaseProxy):
""" """
container = _container.Container.from_id(container) container = _container.Container.from_id(container)
objs = _obj.Object.list(self.session, limit=limit, marker=marker, objs = _obj.Object.list(self.session,
path_args={"container": container.name}, path_args={"container": container.name},
**kwargs) **kwargs)
# TODO(briancurtin): Objects have to know their container at this # TODO(briancurtin): Objects have to know their container at this