Restore Object API name 'object-store'

Dean Troyer · Dean Troyer · commit 935781fdf961 · 2013-11-25T14:46:57.000-06:00
It's used in the service catalog, doh!

Change-Id: If8f6db49c84756fd8e58cc68910160da4cd99b5d
diff --git a/openstackclient/object/client.py b/openstackclient/object/client.py
@@ -23,7 +23,7 @@
 
 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
@@ -90,7 +90,7 @@ def take_action(self, parsed_args):
 
         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 @@ def take_action(self, parsed_args):
 
         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
@@ -108,7 +108,7 @@ def take_action(self, parsed_args):
 
         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 @@ def take_action(self, parsed_args):
 
         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
@@ -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
@@ -38,8 +38,14 @@ def setUp(self):
 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
@@ -32,8 +32,14 @@ def setUp(self):
 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/setup.cfg b/setup.cfg
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`
`24`	`24`	`DEFAULT_OBJECT_API_VERSION = '1'`
`25`	`25`	`API_VERSION_OPTION = 'os_object_api_version'`
`26`		`-API_NAME = 'object'`
	`26`	`+API_NAME = 'object-store'`
`27`	`27`	`API_VERSIONS = {`
`28`	`28`	`'1': 'openstackclient.object.client.ObjectClientv1',`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ def take_action(self, parsed_args):`
`90`	`90`
`91`	`91`	`data = lib_container.list_containers(`
`92`	`92`	`self.app.restapi,`
`93`		`- self.app.client_manager.object.endpoint,`
	`93`	`+ self.app.client_manager.object_store.endpoint,`
`94`	`94`	`**kwargs`
`95`	`95`	`)`
`96`	`96`
`@@ -120,7 +120,7 @@ def take_action(self, parsed_args):`
`120`	`120`
`121`	`121`	`data = lib_container.show_container(`
`122`	`122`	`self.app.restapi,`
`123`		`- self.app.client_manager.object.endpoint,`
	`123`	`+ self.app.client_manager.object_store.endpoint,`
`124`	`124`	`parsed_args.container,`
`125`	`125`	`)`
`126`	`126`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ class TestObjectv1(utils.TestCommand):`
`81`	`81`	`def setUp(self):`
`82`	`82`	`super(TestObjectv1, self).setUp()`
`83`	`83`
`84`		`- self.app.client_manager.object = FakeObjectv1Client(`
	`84`	`+ self.app.client_manager.object_store = FakeObjectv1Client(`
`85`	`85`	`endpoint=fakes.AUTH_URL,`
`86`	`86`	`token=fakes.AUTH_TOKEN,`
`87`	`87`	`)`