diff options
| -rw-r--r-- | functional/tests/test_object.py | 91 | ||||
| -rw-r--r-- | openstackclient/api/object_store_v1.py | 5 | ||||
| -rw-r--r-- | openstackclient/object/client.py | 6 |
3 files changed, 94 insertions, 8 deletions
diff --git a/functional/tests/test_object.py b/functional/tests/test_object.py new file mode 100644 index 00000000..396f0cb7 --- /dev/null +++ b/functional/tests/test_object.py @@ -0,0 +1,91 @@ +# 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. + +import uuid + +from functional.common import test + +BASIC_LIST_HEADERS = ['Name'] +CONTAINER_FIELDS = ['account', 'container', 'x-trans-id'] +OBJECT_FIELDS = ['object', 'container', 'etag'] + + +class ObjectV1Tests(test.TestCase): + """Functional tests for Object V1 commands. """ + + CONTAINER_NAME = uuid.uuid4().hex + OBJECT_NAME = uuid.uuid4().hex + + # NOTE(stevemar): Not using setUp since we only want this to run once + with open(OBJECT_NAME, 'w') as f: + f.write('test content') + + def test_container_create(self): + raw_output = self.openstack('container create ' + self.CONTAINER_NAME) + items = self.parse_listing(raw_output) + self.assert_show_fields(items, CONTAINER_FIELDS) + + def test_container_delete(self): + container_tmp = uuid.uuid4().hex + self.openstack('container create ' + container_tmp) + raw_output = self.openstack('container delete ' + container_tmp) + self.assertEqual(0, len(raw_output)) + + def test_container_list(self): + raw_output = self.openstack('container list') + items = self.parse_listing(raw_output) + self.assert_table_structure(items, BASIC_LIST_HEADERS) + + def test_container_show(self): + self.openstack('container show ' + self.CONTAINER_NAME) + # TODO(stevemar): Assert returned fields + + def test_container_save(self): + self.openstack('container save ' + self.CONTAINER_NAME) + # TODO(stevemar): Assert returned fields + + def test_object_create(self): + raw_output = self.openstack('object create ' + self.CONTAINER_NAME + + ' ' + self.OBJECT_NAME) + items = self.parse_listing(raw_output) + self.assert_show_fields(items, OBJECT_FIELDS) + + def test_object_delete(self): + raw_output = self.openstack('object delete ' + self.CONTAINER_NAME + + ' ' + self.OBJECT_NAME) + self.assertEqual(0, len(raw_output)) + + def test_object_list(self): + raw_output = self.openstack('object list ' + self.CONTAINER_NAME) + items = self.parse_listing(raw_output) + self.assert_table_structure(items, BASIC_LIST_HEADERS) + + def test_object_save(self): + self.openstack('object create ' + self.CONTAINER_NAME + + ' ' + self.OBJECT_NAME) + self.openstack('object save ' + self.CONTAINER_NAME + + ' ' + self.OBJECT_NAME) + # TODO(stevemar): Assert returned fields + + def test_object_save_with_filename(self): + self.openstack('object create ' + self.CONTAINER_NAME + + ' ' + self.OBJECT_NAME) + self.openstack('object save ' + self.CONTAINER_NAME + + ' ' + self.OBJECT_NAME + ' --file tmp.txt') + # TODO(stevemar): Assert returned fields + + def test_object_show(self): + self.openstack('object create ' + self.CONTAINER_NAME + + ' ' + self.OBJECT_NAME) + self.openstack('object show ' + self.CONTAINER_NAME + + ' ' + self.OBJECT_NAME) + # TODO(stevemar): Assert returned fields diff --git a/openstackclient/api/object_store_v1.py b/openstackclient/api/object_store_v1.py index f938b55e..57db9063 100644 --- a/openstackclient/api/object_store_v1.py +++ b/openstackclient/api/object_store_v1.py @@ -252,6 +252,7 @@ class APIv1(api.BaseAPI): if container is None or object is None: return None + params['format'] = 'json' if all_data: data = listing = self.object_list( container=container, @@ -280,7 +281,6 @@ class APIv1(api.BaseAPI): data.extend(listing) return data - params = {} if limit: params['limit'] = limit if marker: @@ -320,7 +320,8 @@ class APIv1(api.BaseAPI): ) if response.status_code == 200: if not os.path.exists(os.path.dirname(file)): - os.makedirs(os.path.dirname(file)) + if len(os.path.dirname(file)) > 0: + os.makedirs(os.path.dirname(file)) with open(file, 'wb') as f: for chunk in response.iter_content(): f.write(chunk) diff --git a/openstackclient/object/client.py b/openstackclient/object/client.py index 887aa85b..1ac905c3 100644 --- a/openstackclient/object/client.py +++ b/openstackclient/object/client.py @@ -33,12 +33,6 @@ API_VERSIONS = { def make_client(instance): """Returns an object-store API client.""" - object_client = utils.get_client_class( - API_NAME, - instance._api_version[API_NAME], - API_VERSIONS) - LOG.debug('Instantiating object client: %s', object_client) - if instance._url: endpoint = instance._url else: |