summaryrefslogtreecommitdiff
path: root/openstackclient/shell.py
diff options
context:
space:
mode:
authorDean Troyer <dtroyer@gmail.com>2013-08-20 15:13:41 -0500
committerDean Troyer <dtroyer@gmail.com>2013-08-28 22:16:34 -0500
commit725e2543efef8913ec9e69769eb45d5bc3d56aad (patch)
tree1f8c526a2306356eca8784b4f4add395f189257b /openstackclient/shell.py
parent17f13f7bf4cea80e8e1380fbc8295318de5be383 (diff)
downloadpython-openstackclient-725e2543efef8913ec9e69769eb45d5bc3d56aad.tar.gz
Object API commands using our REST API layer
* Add object-store API to ClientManager * Add object-store client * Add Object API library in openstackclient.object.v1.lib * Add Object API {container,object} list commands * Add library tests * Add command tests This should complete the Object v1 container and object list commands Change-Id: Ib1770d45efa8871959826b85faafa1e0bcef0a03
Diffstat (limited to 'openstackclient/shell.py')
-rw-r--r--openstackclient/shell.py15
1 files changed, 13 insertions, 2 deletions
diff --git a/openstackclient/shell.py b/openstackclient/shell.py
index 91b02a2b..6cb7c1ee 100644
--- a/openstackclient/shell.py
+++ b/openstackclient/shell.py
@@ -38,6 +38,7 @@ KEYRING_SERVICE = 'openstack'
DEFAULT_COMPUTE_API_VERSION = '2'
DEFAULT_IDENTITY_API_VERSION = '2.0'
DEFAULT_IMAGE_API_VERSION = '1'
+DEFAULT_OBJECT_API_VERSION = '1'
DEFAULT_VOLUME_API_VERSION = '1'
DEFAULT_DOMAIN = 'default'
@@ -188,6 +189,15 @@ class OpenStackShell(app.App):
DEFAULT_IMAGE_API_VERSION +
' (Env: OS_IMAGE_API_VERSION)')
parser.add_argument(
+ '--os-object-api-version',
+ metavar='<object-api-version>',
+ default=env(
+ 'OS_OBJECT_API_VERSION',
+ default=DEFAULT_OBJECT_API_VERSION),
+ help='Object API version, default=' +
+ DEFAULT_OBJECT_API_VERSION +
+ ' (Env: OS_OBJECT_API_VERSION)')
+ parser.add_argument(
'--os-volume-api-version',
metavar='<volume-api-version>',
default=env(
@@ -339,14 +349,15 @@ class OpenStackShell(app.App):
'compute': self.options.os_compute_api_version,
'identity': self.options.os_identity_api_version,
'image': self.options.os_image_api_version,
+ 'object-store': self.options.os_object_api_version,
'volume': self.options.os_volume_api_version,
}
# Add the API version-specific commands
for api in self.api_version.keys():
version = '.v' + self.api_version[api].replace('.', '_')
- self.command_manager.add_command_group(
- 'openstack.' + api + version)
+ cmd_group = 'openstack.' + api.replace('-', '_') + version
+ self.command_manager.add_command_group(cmd_group)
# Commands that span multiple APIs
self.command_manager.add_command_group(