diff options
| author | Dean Troyer <dtroyer@gmail.com> | 2013-08-20 15:13:41 -0500 |
|---|---|---|
| committer | Dean Troyer <dtroyer@gmail.com> | 2013-08-28 22:16:34 -0500 |
| commit | 725e2543efef8913ec9e69769eb45d5bc3d56aad (patch) | |
| tree | 1f8c526a2306356eca8784b4f4add395f189257b /openstackclient/object/v1/lib | |
| parent | 17f13f7bf4cea80e8e1380fbc8295318de5be383 (diff) | |
| download | python-openstackclient-725e2543efef8913ec9e69769eb45d5bc3d56aad.tar.gz | |
Object API commands using our REST API layer
* Add object-store API to ClientManager
* Add object-store client
* Add Object API library in openstackclient.object.v1.lib
* Add Object API {container,object} list commands
* Add library tests
* Add command tests
This should complete the Object v1 container and object list commands
Change-Id: Ib1770d45efa8871959826b85faafa1e0bcef0a03
Diffstat (limited to 'openstackclient/object/v1/lib')
| -rw-r--r-- | openstackclient/object/v1/lib/__init__.py | 12 | ||||
| -rw-r--r-- | openstackclient/object/v1/lib/container.py | 77 | ||||
| -rw-r--r-- | openstackclient/object/v1/lib/object.py | 97 |
3 files changed, 186 insertions, 0 deletions
diff --git a/openstackclient/object/v1/lib/__init__.py b/openstackclient/object/v1/lib/__init__.py new file mode 100644 index 00000000..02be10cd --- /dev/null +++ b/openstackclient/object/v1/lib/__init__.py @@ -0,0 +1,12 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# diff --git a/openstackclient/object/v1/lib/container.py b/openstackclient/object/v1/lib/container.py new file mode 100644 index 00000000..f30533c8 --- /dev/null +++ b/openstackclient/object/v1/lib/container.py @@ -0,0 +1,77 @@ +# Copyright 2010-2012 OpenStack Foundation +# Copyright 2013 Nebula Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# + +"""Object v1 API library""" + + +def list_containers( + api, + url, + marker=None, + limit=None, + end_marker=None, + prefix=None, + full_listing=False, +): + """Get containers in an account + + :param api: a restapi object + :param url: endpoint + :param marker: marker query + :param limit: limit query + :param end_marker: end_marker query + :param prefix: prefix query + :param full_listing: if True, return a full listing, else returns a max + of 10000 listings + :returns: list of containers + """ + + if full_listing: + data = listing = list_containers( + api, + url, + marker, + limit, + end_marker, + prefix, + ) + while listing: + marker = listing[-1]['name'] + listing = list_containers( + api, + url, + marker, + limit, + end_marker, + prefix, + ) + if listing: + data.extend(listing) + return data + + object_url = url + query = "format=json" + if marker: + query += '&marker=%s' % marker + if limit: + query += '&limit=%d' % limit + if end_marker: + query += '&end_marker=%s' % end_marker + if prefix: + query += '&prefix=%s' % prefix + url = "%s?%s" % (object_url, query) + response = api.request('GET', url) + return response.json() diff --git a/openstackclient/object/v1/lib/object.py b/openstackclient/object/v1/lib/object.py new file mode 100644 index 00000000..d7c4a1ce --- /dev/null +++ b/openstackclient/object/v1/lib/object.py @@ -0,0 +1,97 @@ +# Copyright 2010-2012 OpenStack Foundation +# Copyright 2013 Nebula Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# + +"""Object v1 API library""" + + +def list_objects( + api, + url, + container, + marker=None, + limit=None, + end_marker=None, + delimiter=None, + prefix=None, + path=None, + full_listing=False, +): + """Get objects in a container + + :param api: a restapi object + :param url: endpoint + :param container: container name to get a listing for + :param marker: marker query + :param limit: limit query + :param end_marker: marker query + :param delimiter: string to delimit the queries on + :param prefix: prefix query + :param path: path query (equivalent: "delimiter=/" and "prefix=path/") + :param full_listing: if True, return a full listing, else returns a max + of 10000 listings + :returns: a tuple of (response headers, a list of objects) The response + headers will be a dict and all header names will be lowercase. + """ + + if full_listing: + data = listing = list_objects( + api, + url, + container, + marker, + limit, + end_marker, + delimiter, + prefix, + path, + ) + while listing: + if delimiter: + marker = listing[-1].get('name', listing[-1].get('subdir')) + else: + marker = listing[-1]['name'] + listing = list_objects( + api, + url, + container, + marker, + limit, + end_marker, + delimiter, + prefix, + path, + ) + if listing: + data.extend(listing) + return data + + object_url = url + query = "format=json" + if marker: + query += '&marker=%s' % marker + if limit: + query += '&limit=%d' % limit + if end_marker: + query += '&end_marker=%s' % end_marker + if delimiter: + query += '&delimiter=%s' % delimiter + if prefix: + query += '&prefix=%s' % prefix + if path: + query += '&path=%s' % path + url = "%s/%s?%s" % (object_url, container, query) + response = api.request('GET', url) + return response.json() |
