openstack/python-openstackclient
Code Issues Proposed changes

Restore Object API name 'object-store'

Browse Source 
It's used in the service catalog, doh!

Change-Id: If8f6db49c84756fd8e58cc68910160da4cd99b5d
This commit is contained in:
Dean Troyer 2013-11-25 14:46:52 -06:00
parent 9062811d10
commit 935781fdf9
7 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstackclient/object/client.py
View File

@ -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',
}

4
openstackclient/object/v1/container.py
View File

@ -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,
)

4
openstackclient/object/v1/object.py
View File

@ -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,
)

2
openstackclient/tests/object/v1/fakes.py
View File

@ -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,
)

10
openstackclient/tests/object/v1/test_container.py
View File

@ -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(

10
openstackclient/tests/object/v1/test_object.py
View File

@ -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(

4
setup.cfg
View File

@ -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