diff options
| -rw-r--r-- | openstackclient/object/client.py | 2 | ||||
| -rw-r--r-- | openstackclient/object/v1/container.py | 4 | ||||
| -rw-r--r-- | openstackclient/object/v1/object.py | 4 | ||||
| -rw-r--r-- | openstackclient/tests/object/v1/fakes.py | 2 | ||||
| -rw-r--r-- | openstackclient/tests/object/v1/test_container.py | 10 | ||||
| -rw-r--r-- | openstackclient/tests/object/v1/test_object.py | 10 | ||||
| -rw-r--r-- | setup.cfg | 4 |
7 files changed, 24 insertions, 12 deletions
diff --git a/openstackclient/object/client.py b/openstackclient/object/client.py index 1a5363b1..273bea6e 100644 --- a/openstackclient/object/client.py +++ b/openstackclient/object/client.py @@ -23,7 +23,7 @@ LOG = logging.getLogger(__name__) DEFAULT_OBJECT_API_VERSION = '1' API_VERSION_OPTION = 'os_object_api_version' -API_NAME = 'object' +API_NAME = 'object-store' API_VERSIONS = { '1': 'openstackclient.object.client.ObjectClientv1', } diff --git a/openstackclient/object/v1/container.py b/openstackclient/object/v1/container.py index 68b14fc5..fcfbd783 100644 --- a/openstackclient/object/v1/container.py +++ b/openstackclient/object/v1/container.py @@ -90,7 +90,7 @@ class ListContainer(lister.Lister): data = lib_container.list_containers( self.app.restapi, - self.app.client_manager.object.endpoint, + self.app.client_manager.object_store.endpoint, **kwargs ) @@ -120,7 +120,7 @@ class ShowContainer(show.ShowOne): data = lib_container.show_container( self.app.restapi, - self.app.client_manager.object.endpoint, + self.app.client_manager.object_store.endpoint, parsed_args.container, ) diff --git a/openstackclient/object/v1/object.py b/openstackclient/object/v1/object.py index 426a52ad..f6a77030 100644 --- a/openstackclient/object/v1/object.py +++ b/openstackclient/object/v1/object.py @@ -108,7 +108,7 @@ class ListObject(lister.Lister): data = lib_object.list_objects( self.app.restapi, - self.app.client_manager.object.endpoint, + self.app.client_manager.object_store.endpoint, parsed_args.container, **kwargs ) @@ -144,7 +144,7 @@ class ShowObject(show.ShowOne): data = lib_object.show_object( self.app.restapi, - self.app.client_manager.object.endpoint, + self.app.client_manager.object_store.endpoint, parsed_args.container, parsed_args.object, ) diff --git a/openstackclient/tests/object/v1/fakes.py b/openstackclient/tests/object/v1/fakes.py index 37c35d3b..87f6cab6 100644 --- a/openstackclient/tests/object/v1/fakes.py +++ b/openstackclient/tests/object/v1/fakes.py @@ -81,7 +81,7 @@ class TestObjectv1(utils.TestCommand): def setUp(self): super(TestObjectv1, self).setUp() - self.app.client_manager.object = FakeObjectv1Client( + self.app.client_manager.object_store = FakeObjectv1Client( endpoint=fakes.AUTH_URL, token=fakes.AUTH_TOKEN, ) diff --git a/openstackclient/tests/object/v1/test_container.py b/openstackclient/tests/object/v1/test_container.py index e4d90fd9..4afb1006 100644 --- a/openstackclient/tests/object/v1/test_container.py +++ b/openstackclient/tests/object/v1/test_container.py @@ -38,8 +38,14 @@ class TestObject(object_fakes.TestObjectv1): class TestObjectClient(TestObject): def test_make_client(self): - self.assertEqual(self.app.client_manager.object.endpoint, AUTH_URL) - self.assertEqual(self.app.client_manager.object.token, AUTH_TOKEN) + self.assertEqual( + self.app.client_manager.object_store.endpoint, + AUTH_URL, + ) + self.assertEqual( + self.app.client_manager.object_store.token, + AUTH_TOKEN, + ) @mock.patch( diff --git a/openstackclient/tests/object/v1/test_object.py b/openstackclient/tests/object/v1/test_object.py index 9987c2d4..bea0d270 100644 --- a/openstackclient/tests/object/v1/test_object.py +++ b/openstackclient/tests/object/v1/test_object.py @@ -32,8 +32,14 @@ class TestObject(object_fakes.TestObjectv1): class TestObjectClient(TestObject): def test_make_client(self): - self.assertEqual(self.app.client_manager.object.endpoint, AUTH_URL) - self.assertEqual(self.app.client_manager.object.token, AUTH_TOKEN) + self.assertEqual( + self.app.client_manager.object_store.endpoint, + AUTH_URL, + ) + self.assertEqual( + self.app.client_manager.object_store.token, + AUTH_TOKEN, + ) @mock.patch( @@ -30,7 +30,7 @@ openstack.cli = openstack.cli.extension = compute = openstackclient.compute.client image = openstackclient.image.client - object = openstackclient.object.client + object_store = openstackclient.object.client volume = openstackclient.volume.client openstack.common = @@ -246,7 +246,7 @@ openstack.image.v2 = image_save = openstackclient.image.v2.image:SaveImage image_show = openstackclient.image.v2.image:ShowImage -openstack.object.v1 = +openstack.object_store.v1 = container_list = openstackclient.object.v1.container:ListContainer container_show = openstackclient.object.v1.container:ShowContainer object_list = openstackclient.object.v1.object:ListObject |