openstack/python-troveclient
Code Issues Proposed changes

Remove arguments deprecated after Diablo

Browse Source 
Change-Id: Ia65ee002ad2aa2b6d2401586d1e06b8ffdb633dd
Closes-Bug: #1279483
This commit is contained in:
Greg Lucas
2014-03-13 08:05:45 -07:00
parent d140ff2811
commit 9f0a8cade7
1 changed files with 14 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
troveclient/shell.py
View File

@@ -222,32 +222,6 @@ class OpenStackTroveShell(object):
help='Output json instead of prettyprint. ' help='Output json instead of prettyprint. '
'Defaults to OS_JSON_OUTPUT') 'Defaults to OS_JSON_OUTPUT')
# FIXME(dtroyer): The args below are here for diablo compatibility,
# remove them in folsum cycle
# alias for --os-username, left in for backwards compatibility
parser.add_argument('--username',
help=argparse.SUPPRESS)
# alias for --os-region_name, left in for backwards compatibility
parser.add_argument('--region_name',
help=argparse.SUPPRESS)
# alias for --os-password, left in for backwards compatibility
parser.add_argument('--apikey', '--password', dest='apikey',
default=utils.env('TROVE_API_KEY'),
help=argparse.SUPPRESS)
# alias for --os-tenant-name, left in for backward compatibility
parser.add_argument('--projectid', '--tenant_name', dest='projectid',
default=utils.env('TROVE_PROJECT_ID'),
help=argparse.SUPPRESS)
# alias for --os-auth-url, left in for backward compatibility
parser.add_argument('--url', '--auth_url', dest='url',
default=utils.env('TROVE_URL'),
help=argparse.SUPPRESS)
return parser return parser
def get_subcommand_parser(self, version): def get_subcommand_parser(self, version):
@@ -398,16 +372,14 @@ class OpenStackTroveShell(object):
(os_username, os_password, os_tenant_name, os_auth_url, (os_username, os_password, os_tenant_name, os_auth_url,
os_region_name, os_tenant_id, endpoint_type, insecure, os_region_name, os_tenant_id, endpoint_type, insecure,
service_type, service_name, database_service_name, service_type, service_name, database_service_name,
username, apikey, projectid, url, region_name,
cacert, bypass_url) = ( cacert, bypass_url) = (
args.os_username, args.os_password, args.os_username, args.os_password,
args.os_tenant_name, args.os_auth_url, args.os_tenant_name, args.os_auth_url,
args.os_region_name, args.os_tenant_id, args.os_region_name, args.os_tenant_id,
args.endpoint_type, args.insecure, args.endpoint_type, args.insecure,
args.service_type, args.service_name, args.service_type, args.service_name,
args.database_service_name, args.username, args.database_service_name,
args.apikey, args.projectid, args.os_cacert, args.bypass_url)
args.url, args.region_name, args.os_cacert, args.bypass_url)
if not endpoint_type: if not endpoint_type:
endpoint_type = DEFAULT_TROVE_ENDPOINT_TYPE endpoint_type = DEFAULT_TROVE_ENDPOINT_TYPE
@@ -421,39 +393,24 @@ class OpenStackTroveShell(object):
if not utils.isunauthenticated(args.func): if not utils.isunauthenticated(args.func):
if not os_username: if not os_username:
if not username: raise exc.CommandError(
raise exc.CommandError( "You must provide a username "
"You must provide a username " "via either --os-username or env[OS_USERNAME]")
"via either --os-username or env[OS_USERNAME]")
else:
os_username = username
if not os_password: if not os_password:
if not apikey: raise exc.CommandError("You must provide a password "
raise exc.CommandError("You must provide a password " "via either --os-password or via "
"via either --os-password or via " "env[OS_PASSWORD]")
"env[OS_PASSWORD]")
else:
os_password = apikey
if not (os_tenant_name or os_tenant_id): if not (os_tenant_name or os_tenant_id):
if not projectid: raise exc.CommandError("You must provide a tenant_id "
raise exc.CommandError("You must provide a tenant_id " "via either --os-tenant-id or "
"via either --os-tenant-id or " "env[OS_TENANT_ID]")
"env[OS_TENANT_ID]")
else:
os_tenant_name = projectid
if not os_auth_url: if not os_auth_url:
if not url: raise exc.CommandError(
raise exc.CommandError( "You must provide an auth url "
"You must provide an auth url " "via either --os-auth-url or env[OS_AUTH_URL]")
"via either --os-auth-url or env[OS_AUTH_URL]")
else:
os_auth_url = url
if not os_region_name and region_name:
os_region_name = region_name
if not (os_tenant_name or os_tenant_id): if not (os_tenant_name or os_tenant_id):
raise exc.CommandError( raise exc.CommandError(