From 935781fdf961d0501b7400acbe4c86bdd9f284f2 Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Mon, 25 Nov 2013 14:46:52 -0600 Subject: Restore Object API name 'object-store' It's used in the service catalog, doh! Change-Id: If8f6db49c84756fd8e58cc68910160da4cd99b5d --- openstackclient/object/client.py | 2 +- openstackclient/object/v1/container.py | 4 ++-- openstackclient/object/v1/object.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'openstackclient/object') 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, ) -- cgit v1.2.1