diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-07-31 22:29:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-07-31 22:29:03 +0000 |
| commit | cd0f34b2d69a253212f3f73f991b552ec2c078c2 (patch) | |
| tree | 8947bb869119b620efab87d321290a3c826bce3b /openstackclient/shell.py | |
| parent | ce17a0b58877525cf39f0427f4874877fcf804ca (diff) | |
| parent | 0aa3c206a38b681e106ca8bfd82cab27cd7e1861 (diff) | |
| download | python-openstackclient-cd0f34b2d69a253212f3f73f991b552ec2c078c2.tar.gz | |
Merge "Remove tenant round 1 - global options"
Diffstat (limited to 'openstackclient/shell.py')
| -rw-r--r-- | openstackclient/shell.py | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/openstackclient/shell.py b/openstackclient/shell.py index dad4a693..7bc0a44a 100644 --- a/openstackclient/shell.py +++ b/openstackclient/shell.py @@ -15,6 +15,7 @@ """Command-line interface to the OpenStack APIs""" +import argparse import getpass import logging import os @@ -111,15 +112,29 @@ class OpenStackShell(app.App): default=env('OS_AUTH_URL'), help='Authentication URL (Env: OS_AUTH_URL)') parser.add_argument( + '--os-project-name', + metavar='<auth-project-name>', + default=env('OS_PROJECT_NAME', default=env('OS_TENANT_NAME')), + help='Authentication project name (Env: OS_PROJECT_NAME)', + ) + parser.add_argument( '--os-tenant-name', metavar='<auth-tenant-name>', - default=env('OS_TENANT_NAME'), - help='Authentication tenant name (Env: OS_TENANT_NAME)') + dest='os_project_name', + help=argparse.SUPPRESS, + ) + parser.add_argument( + '--os-project-id', + metavar='<auth-project-id>', + default=env('OS_PROJECT_ID', default=env('OS_TENANT_ID')), + help='Authentication project ID (Env: OS_PROJECT_ID)', + ) parser.add_argument( '--os-tenant-id', metavar='<auth-tenant-id>', - default=env('OS_TENANT_ID'), - help='Authentication tenant ID (Env: OS_TENANT_ID)') + dest='os_project_id', + help=argparse.SUPPRESS, + ) parser.add_argument( '--os-username', metavar='<auth-username>', @@ -247,10 +262,11 @@ class OpenStackShell(app.App): " either --os-password, or env[OS_PASSWORD], " " or prompted response") - if not (self.options.os_tenant_id or self.options.os_tenant_name): + if not (self.options.os_project_id + or self.options.os_project_name): raise exc.CommandError( - "You must provide a tenant_id via" - " either --os-tenant-id or via env[OS_TENANT_ID]") + "You must provide a project id via" + " either --os-project-id or via env[OS_PROJECT_ID]") if not self.options.os_auth_url: raise exc.CommandError( @@ -261,8 +277,8 @@ class OpenStackShell(app.App): token=self.options.os_token, url=self.options.os_url, auth_url=self.options.os_auth_url, - tenant_name=self.options.os_tenant_name, - tenant_id=self.options.os_tenant_id, + project_name=self.options.os_project_name, + project_id=self.options.os_project_id, username=self.options.os_username, password=self.options.os_password, region_name=self.options.os_region_name, |