Move object-store commands to low-level API

api.object_store.APIv1 now contains the formerly top-level functions
implementing the object-store REST client. This replaces the old-style
ObjectClientv1 that is no longer necessary.

Change-Id: I7d8fea326b214481e7d6b24119bd41777c6aa968

7 files changed, 362 insertions, 612 deletions

diff --git a/openstackclient/tests/api/test_object_store_v1.py b/openstackclient/tests/api/test_object_store_v1.py
new file mode 100644
index 00000000..5a376a45
--- /dev/null
+++ b/openstackclient/tests/api/test_object_store_v1.py
@@ -0,0 +1,326 @@
+#   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 Store v1 API Library Tests"""
+
+from requests_mock.contrib import fixture
+
+from keystoneclient import session
+from openstackclient.api import object_store_v1 as object_store
+from openstackclient.tests import utils
+
+
+FAKE_ACCOUNT = 'q12we34r'
+FAKE_AUTH = '11223344556677889900'
+FAKE_URL = 'http://gopher.com/v1/' + FAKE_ACCOUNT
+
+FAKE_CONTAINER = 'rainbarrel'
+FAKE_OBJECT = 'spigot'
+
+LIST_CONTAINER_RESP = [
+    'qaz',
+    'fred',
+]
+
+LIST_OBJECT_RESP = [
+    {'name': 'fred', 'bytes': 1234, 'content_type': 'text'},
+    {'name': 'wilma', 'bytes': 5678, 'content_type': 'text'},
+]
+
+
+class TestObjectAPIv1(utils.TestCase):
+
+    def setUp(self):
+        super(TestObjectAPIv1, self).setUp()
+        sess = session.Session()
+        self.api = object_store.APIv1(session=sess, endpoint=FAKE_URL)
+        self.requests_mock = self.useFixture(fixture.Fixture())
+
+
+class TestContainer(TestObjectAPIv1):
+
+    def setUp(self):
+        super(TestContainer, self).setUp()
+
+    def test_container_create(self):
+        headers = {
+            'x-trans-id': '1qaz2wsx',
+        }
+        self.requests_mock.register_uri(
+            'PUT',
+            FAKE_URL + '/qaz',
+            headers=headers,
+            status_code=201,
+        )
+        ret = self.api.container_create(container='qaz')
+        data = {
+            'account': FAKE_ACCOUNT,
+            'container': 'qaz',
+            'x-trans-id': '1qaz2wsx',
+        }
+        self.assertEqual(data, ret)
+
+    def test_container_delete(self):
+        self.requests_mock.register_uri(
+            'DELETE',
+            FAKE_URL + '/qaz',
+            status_code=204,
+        )
+        ret = self.api.container_delete(container='qaz')
+        self.assertIsNone(ret)
+
+    def test_container_list_no_options(self):
+        self.requests_mock.register_uri(
+            'GET',
+            FAKE_URL,
+            json=LIST_CONTAINER_RESP,
+            status_code=200,
+        )
+        ret = self.api.container_list()
+        self.assertEqual(LIST_CONTAINER_RESP, ret)
+
+    def test_container_list_prefix(self):
+        self.requests_mock.register_uri(
+            'GET',
+            FAKE_URL + '?prefix=foo%2f&format=json',
+            json=LIST_CONTAINER_RESP,
+            status_code=200,
+        )
+        ret = self.api.container_list(
+            prefix='foo/',
+        )
+        self.assertEqual(LIST_CONTAINER_RESP, ret)
+
+    def test_container_list_marker_limit_end(self):
+        self.requests_mock.register_uri(
+            'GET',
+            FAKE_URL + '?marker=next&limit=2&end_marker=stop&format=json',
+            json=LIST_CONTAINER_RESP,
+            status_code=200,
+        )
+        ret = self.api.container_list(
+            marker='next',
+            limit=2,
+            end_marker='stop',
+        )
+        self.assertEqual(LIST_CONTAINER_RESP, ret)
+
+#     def test_container_list_full_listing(self):
+#         sess = self.app.client_manager.session
+#
+#         def side_effect(*args, **kwargs):
+#             rv = sess.get().json.return_value
+#             sess.get().json.return_value = []
+#             sess.get().json.side_effect = None
+#             return rv
+#
+#         resp = [{'name': 'is-name'}]
+#         sess.get().json.return_value = resp
+#         sess.get().json.side_effect = side_effect
+#
+#         data = lib_container.list_containers(
+#             self.app.client_manager.session,
+#             fake_url,
+#             full_listing=True,
+#         )
+#
+#         # Check expected values
+#         sess.get.assert_called_with(
+#             fake_url,
+#             params={
+#                 'format': 'json',
+#                 'marker': 'is-name',
+#             }
+#         )
+#         self.assertEqual(resp, data)
+
+    def test_container_show(self):
+        headers = {
+            'X-Container-Meta-Owner': FAKE_ACCOUNT,
+            'x-container-object-count': '1',
+            'x-container-bytes-used': '577',
+        }
+        resp = {
+            'account': FAKE_ACCOUNT,
+            'container': 'qaz',
+            'object_count': '1',
+            'bytes_used': '577',
+            'read_acl': None,
+            'write_acl': None,
+            'sync_to': None,
+            'sync_key': None,
+        }
+        self.requests_mock.register_uri(
+            'HEAD',
+            FAKE_URL + '/qaz',
+            headers=headers,
+            status_code=204,
+        )
+        ret = self.api.container_show(container='qaz')
+        self.assertEqual(resp, ret)
+
+
+class TestObject(TestObjectAPIv1):
+
+    def setUp(self):
+        super(TestObject, self).setUp()
+
+    def test_object_create(self):
+        headers = {
+            'etag': 'youreit',
+            'x-trans-id': '1qaz2wsx',
+        }
+        self.requests_mock.register_uri(
+            'PUT',
+            FAKE_URL + '/qaz/requirements.txt',
+            headers=headers,
+            status_code=201,
+        )
+        ret = self.api.object_create(
+            container='qaz',
+            object='requirements.txt',
+        )
+        data = {
+            'account': FAKE_ACCOUNT,
+            'container': 'qaz',
+            'object': 'requirements.txt',
+            'etag': 'youreit',
+            'x-trans-id': '1qaz2wsx',
+        }
+        self.assertEqual(data, ret)
+
+    def test_object_delete(self):
+        self.requests_mock.register_uri(
+            'DELETE',
+            FAKE_URL + '/qaz/wsx',
+            status_code=204,
+        )
+        ret = self.api.object_delete(
+            container='qaz',
+            object='wsx',
+        )
+        self.assertIsNone(ret)
+
+    def test_object_list_no_options(self):
+        self.requests_mock.register_uri(
+            'GET',
+            FAKE_URL + '/qaz',
+            json=LIST_OBJECT_RESP,
+            status_code=200,
+        )
+        ret = self.api.object_list(container='qaz')
+        self.assertEqual(LIST_OBJECT_RESP, ret)
+
+    def test_object_list_delimiter(self):
+        self.requests_mock.register_uri(
+            'GET',
+            FAKE_URL + '/qaz?delimiter=%7C',
+            json=LIST_OBJECT_RESP,
+            status_code=200,
+        )
+        ret = self.api.object_list(
+            container='qaz',
+            delimiter='|',
+        )
+        self.assertEqual(LIST_OBJECT_RESP, ret)
+
+    def test_object_list_prefix(self):
+        self.requests_mock.register_uri(
+            'GET',
+            FAKE_URL + '/qaz?prefix=foo%2f',
+            json=LIST_OBJECT_RESP,
+            status_code=200,
+        )
+        ret = self.api.object_list(
+            container='qaz',
+            prefix='foo/',
+        )
+        self.assertEqual(LIST_OBJECT_RESP, ret)
+
+    def test_object_list_marker_limit_end(self):
+        self.requests_mock.register_uri(
+            'GET',
+            FAKE_URL + '/qaz?marker=next&limit=2&end_marker=stop',
+            json=LIST_CONTAINER_RESP,
+            status_code=200,
+        )
+        ret = self.api.object_list(
+            container='qaz',
+            marker='next',
+            limit=2,
+            end_marker='stop',
+        )
+        self.assertEqual(LIST_CONTAINER_RESP, ret)
+
+#     def test_list_objects_full_listing(self):
+#         sess = self.app.client_manager.session
+#
+#         def side_effect(*args, **kwargs):
+#             rv = sess.get().json.return_value
+#             sess.get().json.return_value = []
+#             sess.get().json.side_effect = None
+#             return rv
+#
+#         resp = [{'name': 'is-name'}]
+#         sess.get().json.return_value = resp
+#         sess.get().json.side_effect = side_effect
+#
+#         data = lib_object.list_objects(
+#             sess,
+#             fake_url,
+#             fake_container,
+#             full_listing=True,
+#         )
+#
+#         # Check expected values
+#         sess.get.assert_called_with(
+#             fake_url + '/' + fake_container,
+#             params={
+#                 'format': 'json',
+#                 'marker': 'is-name',
+#             }
+#         )
+#         self.assertEqual(resp, data)
+
+    def test_object_show(self):
+        headers = {
+            'content-type': 'text/alpha',
+            'content-length': '577',
+            'last-modified': '20130101',
+            'etag': 'qaz',
+            'x-container-meta-owner': FAKE_ACCOUNT,
+            'x-object-meta-wife': 'Wilma',
+            'x-tra-header': 'yabba-dabba-do',
+        }
+        resp = {
+            'account': FAKE_ACCOUNT,
+            'container': 'qaz',
+            'object': FAKE_OBJECT,
+            'content-type': 'text/alpha',
+            'content-length': '577',
+            'last-modified': '20130101',
+            'etag': 'qaz',
+            'wife': 'Wilma',
+            'x-tra-header': 'yabba-dabba-do',
+        }
+        self.requests_mock.register_uri(
+            'HEAD',
+            FAKE_URL + '/qaz/' + FAKE_OBJECT,
+            headers=headers,
+            status_code=204,
+        )
+        ret = self.api.object_show(
+            container='qaz',
+            object=FAKE_OBJECT,
+        )
+        self.assertEqual(resp, ret)
diff --git a/openstackclient/tests/object/v1/lib/__init__.py b/openstackclient/tests/object/v1/lib/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/openstackclient/tests/object/v1/lib/__init__.py
+++ /dev/null
diff --git a/openstackclient/tests/object/v1/lib/test_container.py b/openstackclient/tests/object/v1/lib/test_container.py
deleted file mode 100644
index ce70b835..00000000
--- a/openstackclient/tests/object/v1/lib/test_container.py
+++ /dev/null
@@ -1,207 +0,0 @@
-#   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.
-#
-
-"""Test Object API library module"""
-
-import mock
-
-from openstackclient.object.v1.lib import container as lib_container
-from openstackclient.tests import fakes
-from openstackclient.tests.object.v1 import fakes as object_fakes
-
-
-fake_account = 'q12we34r'
-fake_auth = '11223344556677889900'
-fake_url = 'http://gopher.com/v1/' + fake_account
-
-fake_container = 'rainbarrel'
-
-
-class FakeClient(object):
-    def __init__(self, endpoint=None, **kwargs):
-        self.endpoint = fake_url
-        self.token = fake_auth
-
-
-class TestContainer(object_fakes.TestObjectv1):
-
-    def setUp(self):
-        super(TestContainer, self).setUp()
-        self.app.client_manager.session = mock.MagicMock()
-
-
-class TestContainerList(TestContainer):
-
-    def test_container_list_no_options(self):
-        resp = [{'name': 'is-name'}]
-        self.app.client_manager.session.get().json.return_value = resp
-
-        data = lib_container.list_containers(
-            self.app.client_manager.session,
-            fake_url,
-        )
-
-        # Check expected values
-        self.app.client_manager.session.get.assert_called_with(
-            fake_url,
-            params={
-                'format': 'json',
-            }
-        )
-        self.assertEqual(resp, data)
-
-    def test_container_list_marker(self):
-        resp = [{'name': 'is-name'}]
-        self.app.client_manager.session.get().json.return_value = resp
-
-        data = lib_container.list_containers(
-            self.app.client_manager.session,
-            fake_url,
-            marker='next',
-        )
-
-        # Check expected values
-        self.app.client_manager.session.get.assert_called_with(
-            fake_url,
-            params={
-                'format': 'json',
-                'marker': 'next',
-            }
-        )
-        self.assertEqual(resp, data)
-
-    def test_container_list_limit(self):
-        resp = [{'name': 'is-name'}]
-        self.app.client_manager.session.get().json.return_value = resp
-
-        data = lib_container.list_containers(
-            self.app.client_manager.session,
-            fake_url,
-            limit=5,
-        )
-
-        # Check expected values
-        self.app.client_manager.session.get.assert_called_with(
-            fake_url,
-            params={
-                'format': 'json',
-                'limit': 5,
-            }
-        )
-        self.assertEqual(resp, data)
-
-    def test_container_list_end_marker(self):
-        resp = [{'name': 'is-name'}]
-        self.app.client_manager.session.get().json.return_value = resp
-
-        data = lib_container.list_containers(
-            self.app.client_manager.session,
-            fake_url,
-            end_marker='last',
-        )
-
-        # Check expected values
-        self.app.client_manager.session.get.assert_called_with(
-            fake_url,
-            params={
-                'format': 'json',
-                'end_marker': 'last',
-            }
-        )
-        self.assertEqual(resp, data)
-
-    def test_container_list_prefix(self):
-        resp = [{'name': 'is-name'}]
-        self.app.client_manager.session.get().json.return_value = resp
-
-        data = lib_container.list_containers(
-            self.app.client_manager.session,
-            fake_url,
-            prefix='foo/',
-        )
-
-        # Check expected values
-        self.app.client_manager.session.get.assert_called_with(
-            fake_url,
-            params={
-                'format': 'json',
-                'prefix': 'foo/',
-            }
-        )
-        self.assertEqual(resp, data)
-
-    def test_container_list_full_listing(self):
-        sess = self.app.client_manager.session
-
-        def side_effect(*args, **kwargs):
-            rv = sess.get().json.return_value
-            sess.get().json.return_value = []
-            sess.get().json.side_effect = None
-            return rv
-
-        resp = [{'name': 'is-name'}]
-        sess.get().json.return_value = resp
-        sess.get().json.side_effect = side_effect
-
-        data = lib_container.list_containers(
-            self.app.client_manager.session,
-            fake_url,
-            full_listing=True,
-        )
-
-        # Check expected values
-        sess.get.assert_called_with(
-            fake_url,
-            params={
-                'format': 'json',
-                'marker': 'is-name',
-            }
-        )
-        self.assertEqual(resp, data)
-
-
-class TestContainerShow(TestContainer):
-
-    def test_container_show_no_options(self):
-        resp = {
-            'X-Container-Meta-Owner': fake_account,
-            'x-container-object-count': 1,
-            'x-container-bytes-used': 577,
-        }
-        self.app.client_manager.session.head.return_value = \
-            fakes.FakeResponse(headers=resp)
-
-        data = lib_container.show_container(
-            self.app.client_manager.session,
-            fake_url,
-            'is-name',
-        )
-
-        # Check expected values
-        self.app.client_manager.session.head.assert_called_with(
-            fake_url + '/is-name',
-        )
-
-        data_expected = {
-            'account': fake_account,
-            'container': 'is-name',
-            'object_count': 1,
-            'bytes_used': 577,
-            'read_acl': None,
-            'write_acl': None,
-            'sync_to': None,
-            'sync_key': None,
-        }
-        self.assertEqual(data_expected, data)
diff --git a/openstackclient/tests/object/v1/lib/test_object.py b/openstackclient/tests/object/v1/lib/test_object.py
deleted file mode 100644
index f96732b4..00000000
--- a/openstackclient/tests/object/v1/lib/test_object.py
+++ /dev/null
@@ -1,295 +0,0 @@
-#   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.
-#
-
-"""Test Object API library module"""
-
-import mock
-
-from openstackclient.object.v1.lib import object as lib_object
-from openstackclient.tests import fakes
-from openstackclient.tests.object.v1 import fakes as object_fakes
-
-
-fake_account = 'q12we34r'
-fake_auth = '11223344556677889900'
-fake_url = 'http://gopher.com/v1/' + fake_account
-
-fake_container = 'rainbarrel'
-fake_object = 'raindrop'
-
-
-class FakeClient(object):
-    def __init__(self, endpoint=None, **kwargs):
-        self.endpoint = fake_url
-        self.token = fake_auth
-
-
-class TestObject(object_fakes.TestObjectv1):
-
-    def setUp(self):
-        super(TestObject, self).setUp()
-        self.app.client_manager.session = mock.MagicMock()
-
-
-class TestObjectListObjects(TestObject):
-
-    def test_list_objects_no_options(self):
-        resp = [{'name': 'is-name'}]
-        self.app.client_manager.session.get().json.return_value = resp
-
-        data = lib_object.list_objects(
-            self.app.client_manager.session,
-            fake_url,
-            fake_container,
-        )
-
-        # Check expected values
-        self.app.client_manager.session.get.assert_called_with(
-            fake_url + '/' + fake_container,
-            params={
-                'format': 'json',
-            }
-        )
-        self.assertEqual(resp, data)
-
-    def test_list_objects_marker(self):
-        resp = [{'name': 'is-name'}]
-        self.app.client_manager.session.get().json.return_value = resp
-
-        data = lib_object.list_objects(
-            self.app.client_manager.session,
-            fake_url,
-            fake_container,
-            marker='next',
-        )
-
-        # Check expected values
-        self.app.client_manager.session.get.assert_called_with(
-            fake_url + '/' + fake_container,
-            params={
-                'format': 'json',
-                'marker': 'next',
-            }
-        )
-        self.assertEqual(resp, data)
-
-    def test_list_objects_limit(self):
-        resp = [{'name': 'is-name'}]
-        self.app.client_manager.session.get().json.return_value = resp
-
-        data = lib_object.list_objects(
-            self.app.client_manager.session,
-            fake_url,
-            fake_container,
-            limit=5,
-        )
-
-        # Check expected values
-        self.app.client_manager.session.get.assert_called_with(
-            fake_url + '/' + fake_container,
-            params={
-                'format': 'json',
-                'limit': 5,
-            }
-        )
-        self.assertEqual(resp, data)
-
-    def test_list_objects_end_marker(self):
-        resp = [{'name': 'is-name'}]
-        self.app.client_manager.session.get().json.return_value = resp
-
-        data = lib_object.list_objects(
-            self.app.client_manager.session,
-            fake_url,
-            fake_container,
-            end_marker='last',
-        )
-
-        # Check expected values
-        self.app.client_manager.session.get.assert_called_with(
-            fake_url + '/' + fake_container,
-            params={
-                'format': 'json',
-                'end_marker': 'last',
-            }
-        )
-        self.assertEqual(resp, data)
-
-    def test_list_objects_delimiter(self):
-        resp = [{'name': 'is-name'}]
-        self.app.client_manager.session.get().json.return_value = resp
-
-        data = lib_object.list_objects(
-            self.app.client_manager.session,
-            fake_url,
-            fake_container,
-            delimiter='|',
-        )
-
-        # Check expected values
-        # NOTE(dtroyer): requests handles the URL encoding and we're
-        #                mocking that so use the otherwise-not-legal
-        #                pipe '|' char in the response.
-        self.app.client_manager.session.get.assert_called_with(
-            fake_url + '/' + fake_container,
-            params={
-                'format': 'json',
-                'delimiter': '|',
-            }
-        )
-        self.assertEqual(resp, data)
-
-    def test_list_objects_prefix(self):
-        resp = [{'name': 'is-name'}]
-        self.app.client_manager.session.get().json.return_value = resp
-
-        data = lib_object.list_objects(
-            self.app.client_manager.session,
-            fake_url,
-            fake_container,
-            prefix='foo/',
-        )
-
-        # Check expected values
-        self.app.client_manager.session.get.assert_called_with(
-            fake_url + '/' + fake_container,
-            params={
-                'format': 'json',
-                'prefix': 'foo/',
-            }
-        )
-        self.assertEqual(resp, data)
-
-    def test_list_objects_path(self):
-        resp = [{'name': 'is-name'}]
-        self.app.client_manager.session.get().json.return_value = resp
-
-        data = lib_object.list_objects(
-            self.app.client_manager.session,
-            fake_url,
-            fake_container,
-            path='next',
-        )
-
-        # Check expected values
-        self.app.client_manager.session.get.assert_called_with(
-            fake_url + '/' + fake_container,
-            params={
-                'format': 'json',
-                'path': 'next',
-            }
-        )
-        self.assertEqual(resp, data)
-
-    def test_list_objects_full_listing(self):
-        sess = self.app.client_manager.session
-
-        def side_effect(*args, **kwargs):
-            rv = sess.get().json.return_value
-            sess.get().json.return_value = []
-            sess.get().json.side_effect = None
-            return rv
-
-        resp = [{'name': 'is-name'}]
-        sess.get().json.return_value = resp
-        sess.get().json.side_effect = side_effect
-
-        data = lib_object.list_objects(
-            sess,
-            fake_url,
-            fake_container,
-            full_listing=True,
-        )
-
-        # Check expected values
-        sess.get.assert_called_with(
-            fake_url + '/' + fake_container,
-            params={
-                'format': 'json',
-                'marker': 'is-name',
-            }
-        )
-        self.assertEqual(resp, data)
-
-
-class TestObjectShowObjects(TestObject):
-
-    def test_object_show_no_options(self):
-        resp = {
-            'content-type': 'text/alpha',
-            'x-container-meta-owner': fake_account,
-        }
-        self.app.client_manager.session.head.return_value = \
-            fakes.FakeResponse(headers=resp)
-
-        data = lib_object.show_object(
-            self.app.client_manager.session,
-            fake_url,
-            fake_container,
-            fake_object,
-        )
-
-        # Check expected values
-        self.app.client_manager.session.head.assert_called_with(
-            fake_url + '/%s/%s' % (fake_container, fake_object),
-        )
-
-        data_expected = {
-            'account': fake_account,
-            'container': fake_container,
-            'object': fake_object,
-            'content-type': 'text/alpha',
-        }
-        self.assertEqual(data_expected, data)
-
-    def test_object_show_all_options(self):
-        resp = {
-            'content-type': 'text/alpha',
-            'content-length': 577,
-            'last-modified': '20130101',
-            'etag': 'qaz',
-            'x-container-meta-owner': fake_account,
-            'x-object-manifest': None,
-            'x-object-meta-wife': 'Wilma',
-            'x-tra-header': 'yabba-dabba-do',
-        }
-        self.app.client_manager.session.head.return_value = \
-            fakes.FakeResponse(headers=resp)
-
-        data = lib_object.show_object(
-            self.app.client_manager.session,
-            fake_url,
-            fake_container,
-            fake_object,
-        )
-
-        # Check expected values
-        self.app.client_manager.session.head.assert_called_with(
-            fake_url + '/%s/%s' % (fake_container, fake_object),
-        )
-
-        data_expected = {
-            'account': fake_account,
-            'container': fake_container,
-            'object': fake_object,
-            'content-type': 'text/alpha',
-            'content-length': 577,
-            'last-modified': '20130101',
-            'etag': 'qaz',
-            'x-object-manifest': None,
-            'wife': 'Wilma',
-            'x-tra-header': 'yabba-dabba-do',
-        }
-        self.assertEqual(data_expected, data)
diff --git a/openstackclient/tests/object/v1/test_container.py b/openstackclient/tests/object/v1/test_container.py
index b72c79d6..70b88fc4 100644
--- a/openstackclient/tests/object/v1/test_container.py
+++ b/openstackclient/tests/object/v1/test_container.py
@@ -16,6 +16,7 @@
 import copy
 import mock
 
+from openstackclient.api import object_store_v1 as object_store
 from openstackclient.object.v1 import container
 from openstackclient.tests.object.v1 import fakes as object_fakes
 
@@ -30,28 +31,20 @@ class FakeClient(object):
         self.token = AUTH_TOKEN
 
 
-class TestObject(object_fakes.TestObjectv1):
+class TestContainer(object_fakes.TestObjectv1):
     def setUp(self):
-        super(TestObject, self).setUp()
-
-
-class TestObjectClient(TestObject):
-
-    def test_make_client(self):
-        self.assertEqual(
-            self.app.client_manager.object_store.endpoint,
-            AUTH_URL,
-        )
-        self.assertEqual(
-            self.app.client_manager.object_store.token,
-            AUTH_TOKEN,
+        super(TestContainer, self).setUp()
+        self.app.client_manager.object_store = object_store.APIv1(
+            session=mock.Mock(),
+            service_type="object-store",
         )
+        self.api = self.app.client_manager.object_store
 
 
 @mock.patch(
-    'openstackclient.object.v1.container.lib_container.list_containers'
+    'openstackclient.api.object_store_v1.APIv1.container_list'
 )
-class TestContainerList(TestObject):
+class TestContainerList(TestContainer):
 
     def setUp(self):
         super(TestContainerList, self).setUp()
@@ -77,8 +70,6 @@ class TestContainerList(TestObject):
         kwargs = {
         }
         c_mock.assert_called_with(
-            self.app.client_manager.session,
-            AUTH_URL,
             **kwargs
         )
 
@@ -113,8 +104,6 @@ class TestContainerList(TestObject):
             'prefix': 'bit',
         }
         c_mock.assert_called_with(
-            self.app.client_manager.session,
-            AUTH_URL,
             **kwargs
         )
 
@@ -134,43 +123,10 @@ class TestContainerList(TestObject):
 
         arglist = [
             '--marker', object_fakes.container_name,
-        ]
-        verifylist = [
-            ('marker', object_fakes.container_name),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        # DisplayCommandBase.take_action() returns two tuples
-        columns, data = self.cmd.take_action(parsed_args)
-
-        # Set expected values
-        kwargs = {
-            'marker': object_fakes.container_name,
-        }
-        c_mock.assert_called_with(
-            self.app.client_manager.session,
-            AUTH_URL,
-            **kwargs
-        )
-
-        collist = ('Name',)
-        self.assertEqual(columns, collist)
-        datalist = (
-            (object_fakes.container_name, ),
-            (object_fakes.container_name_3, ),
-        )
-        self.assertEqual(tuple(data), datalist)
-
-    def test_object_list_containers_end_marker(self, c_mock):
-        c_mock.return_value = [
-            copy.deepcopy(object_fakes.CONTAINER),
-            copy.deepcopy(object_fakes.CONTAINER_3),
-        ]
-
-        arglist = [
             '--end-marker', object_fakes.container_name_3,
         ]
         verifylist = [
+            ('marker', object_fakes.container_name),
             ('end_marker', object_fakes.container_name_3),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -180,11 +136,10 @@ class TestContainerList(TestObject):
 
         # Set expected values
         kwargs = {
+            'marker': object_fakes.container_name,
             'end_marker': object_fakes.container_name_3,
         }
         c_mock.assert_called_with(
-            self.app.client_manager.session,
-            AUTH_URL,
             **kwargs
         )
 
@@ -218,8 +173,6 @@ class TestContainerList(TestObject):
             'limit': 2,
         }
         c_mock.assert_called_with(
-            self.app.client_manager.session,
-            AUTH_URL,
             **kwargs
         )
 
@@ -252,8 +205,6 @@ class TestContainerList(TestObject):
         kwargs = {
         }
         c_mock.assert_called_with(
-            self.app.client_manager.session,
-            AUTH_URL,
             **kwargs
         )
 
@@ -296,8 +247,6 @@ class TestContainerList(TestObject):
             'full_listing': True,
         }
         c_mock.assert_called_with(
-            self.app.client_manager.session,
-            AUTH_URL,
             **kwargs
         )
 
@@ -312,9 +261,9 @@ class TestContainerList(TestObject):
 
 
 @mock.patch(
-    'openstackclient.object.v1.container.lib_container.show_container'
+    'openstackclient.api.object_store_v1.APIv1.container_show'
 )
-class TestContainerShow(TestObject):
+class TestContainerShow(TestContainer):
 
     def setUp(self):
         super(TestContainerShow, self).setUp()
@@ -341,9 +290,7 @@ class TestContainerShow(TestObject):
         }
         # lib.container.show_container(api, url, container)
         c_mock.assert_called_with(
-            self.app.client_manager.session,
-            AUTH_URL,
-            object_fakes.container_name,
+            container=object_fakes.container_name,
             **kwargs
         )
 
diff --git a/openstackclient/tests/object/v1/test_container_all.py b/openstackclient/tests/object/v1/test_container_all.py
index 29d78454..53b60b9a 100644
--- a/openstackclient/tests/object/v1/test_container_all.py
+++ b/openstackclient/tests/object/v1/test_container_all.py
@@ -16,6 +16,7 @@ import copy
 from requests_mock.contrib import fixture
 
 from keystoneclient import session
+from openstackclient.api import object_store_v1 as object_store
 from openstackclient.object.v1 import container
 from openstackclient.tests.object.v1 import fakes as object_fakes
 
@@ -29,7 +30,10 @@ class TestObjectAll(object_fakes.TestObjectv1):
         self.requests_mock = self.useFixture(fixture.Fixture())
 
         # TODO(dtroyer): move this to object_fakes.TestObjectv1
-        self.app.client_manager.object_store.endpoint = object_fakes.ENDPOINT
+        self.app.client_manager.object_store = object_store.APIv1(
+            session=self.app.client_manager.session,
+            endpoint=object_fakes.ENDPOINT,
+        )
 
 
 class TestContainerCreate(TestObjectAll):
diff --git a/openstackclient/tests/object/v1/test_object.py b/openstackclient/tests/object/v1/test_object.py
index 26d07b2c..22f06999 100644
--- a/openstackclient/tests/object/v1/test_object.py
+++ b/openstackclient/tests/object/v1/test_object.py
@@ -16,6 +16,7 @@
 import copy
 import mock
 
+from openstackclient.api import object_store_v1 as object_store
 from openstackclient.object.v1 import object as obj
 from openstackclient.tests.object.v1 import fakes as object_fakes
 
@@ -27,23 +28,15 @@ AUTH_URL = "http://0.0.0.0"
 class TestObject(object_fakes.TestObjectv1):
     def setUp(self):
         super(TestObject, self).setUp()
-
-
-class TestObjectClient(TestObject):
-
-    def test_make_client(self):
-        self.assertEqual(
-            self.app.client_manager.object_store.endpoint,
-            AUTH_URL,
-        )
-        self.assertEqual(
-            self.app.client_manager.object_store.token,
-            AUTH_TOKEN,
+        self.app.client_manager.object_store = object_store.APIv1(
+            session=mock.Mock(),
+            service_type="object-store",
         )
+        self.api = self.app.client_manager.object_store
 
 
 @mock.patch(
-    'openstackclient.object.v1.object.lib_object.list_objects'
+    'openstackclient.api.object_store_v1.APIv1.object_list'
 )
 class TestObjectList(TestObject):
 
@@ -71,9 +64,7 @@ class TestObjectList(TestObject):
         columns, data = self.cmd.take_action(parsed_args)
 
         o_mock.assert_called_with(
-            self.app.client_manager.session,
-            AUTH_URL,
-            object_fakes.container_name,
+            container=object_fakes.container_name,
         )
 
         collist = ('Name',)
@@ -107,9 +98,7 @@ class TestObjectList(TestObject):
             'prefix': 'floppy',
         }
         o_mock.assert_called_with(
-            self.app.client_manager.session,
-            AUTH_URL,
-            object_fakes.container_name_2,
+            container=object_fakes.container_name_2,
             **kwargs
         )
 
@@ -143,9 +132,7 @@ class TestObjectList(TestObject):
             'delimiter': '=',
         }
         o_mock.assert_called_with(
-            self.app.client_manager.session,
-            AUTH_URL,
-            object_fakes.container_name_2,
+            container=object_fakes.container_name_2,
             **kwargs
         )
 
@@ -179,9 +166,7 @@ class TestObjectList(TestObject):
             'marker': object_fakes.object_name_2,
         }
         o_mock.assert_called_with(
-            self.app.client_manager.session,
-            AUTH_URL,
-            object_fakes.container_name_2,
+            container=object_fakes.container_name_2,
             **kwargs
         )
 
@@ -215,9 +200,7 @@ class TestObjectList(TestObject):
             'end_marker': object_fakes.object_name_2,
         }
         o_mock.assert_called_with(
-            self.app.client_manager.session,
-            AUTH_URL,
-            object_fakes.container_name_2,
+            container=object_fakes.container_name_2,
             **kwargs
         )
 
@@ -251,9 +234,7 @@ class TestObjectList(TestObject):
             'limit': 2,
         }
         o_mock.assert_called_with(
-            self.app.client_manager.session,
-            AUTH_URL,
-            object_fakes.container_name_2,
+            container=object_fakes.container_name_2,
             **kwargs
         )
 
@@ -287,9 +268,7 @@ class TestObjectList(TestObject):
         kwargs = {
         }
         o_mock.assert_called_with(
-            self.app.client_manager.session,
-            AUTH_URL,
-            object_fakes.container_name,
+            container=object_fakes.container_name,
             **kwargs
         )
 
@@ -337,9 +316,7 @@ class TestObjectList(TestObject):
             'full_listing': True,
         }
         o_mock.assert_called_with(
-            self.app.client_manager.session,
-            AUTH_URL,
-            object_fakes.container_name,
+            container=object_fakes.container_name,
             **kwargs
         )
 
@@ -353,7 +330,7 @@ class TestObjectList(TestObject):
 
 
 @mock.patch(
-    'openstackclient.object.v1.object.lib_object.show_object'
+    'openstackclient.api.object_store_v1.APIv1.object_show'
 )
 class TestObjectShow(TestObject):
 
@@ -384,10 +361,8 @@ class TestObjectShow(TestObject):
         }
         # lib.container.show_container(api, url, container)
         c_mock.assert_called_with(
-            self.app.client_manager.session,
-            AUTH_URL,
-            object_fakes.container_name,
-            object_fakes.object_name_1,
+            container=object_fakes.container_name,
+            object=object_fakes.object_name_1,
             **kwargs
         )