openstack/python-novaclient
Code Issues Proposed changes

Remove Diablo compatibility options

Browse Source 
According to the fixme in the code, these should have been removed
in Folsom.

Change-Id: If11c576e45931b72c227f51a0b8f63bc5f7dd4cb
This commit is contained in:
Ben Nemec 2013-06-26 13:56:57 -05:00
parent abb57b6934
commit b526c9beff
1 changed files with 7 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
novaclient/shell.py
View File

@ -144,8 +144,6 @@ class SecretsHelper(object):
def password(self): def password(self):
if self._validate_string(self.args.os_password): if self._validate_string(self.args.os_password):
return self.args.os_password return self.args.os_password
if self._validate_string(self.args.apikey):
return self.args.apikey
verify_pass = utils.bool_from_str(utils.env("OS_VERIFY_PASSWORD")) verify_pass = utils.bool_from_str(utils.env("OS_VERIFY_PASSWORD"))
return self._prompt_password(verify_pass) return self._prompt_password(verify_pass)
@ -367,32 +365,6 @@ class OpenStackComputeShell(object):
"not be verified against any certificate authorities. " "not be verified against any certificate authorities. "
"This option should be used with caution.") "This option should be used with caution.")
# 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('NOVA_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('NOVA_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('NOVA_URL'),
help=argparse.SUPPRESS)
parser.add_argument('--bypass-url', parser.add_argument('--bypass-url',
metavar='<bypass-url>', metavar='<bypass-url>',
dest='bypass_url', dest='bypass_url',
@ -563,15 +535,12 @@ class OpenStackComputeShell(object):
(os_username, os_tenant_name, os_auth_url, (os_username, os_tenant_name, os_auth_url,
os_region_name, os_auth_system, endpoint_type, insecure, os_region_name, os_auth_system, endpoint_type, insecure,
service_type, service_name, volume_service_name, service_type, service_name, volume_service_name,
username, projectid, url, region_name,
bypass_url, os_cache, cacert, timeout) = ( bypass_url, os_cache, cacert, timeout) = (
args.os_username, args.os_username,
args.os_tenant_name, args.os_auth_url, args.os_tenant_name, args.os_auth_url,
args.os_region_name, args.os_auth_system, args.os_region_name, args.os_auth_system,
args.endpoint_type, args.insecure, args.service_type, args.endpoint_type, args.insecure, args.service_type,
args.service_name, args.volume_service_name, args.service_name, args.volume_service_name,
args.username, args.projectid,
args.url, args.region_name,
args.bypass_url, args.os_cache, args.bypass_url, args.os_cache,
args.os_cacert, args.timeout) args.os_cacert, args.timeout)
@ -598,26 +567,17 @@ class OpenStackComputeShell(object):
if not auth_plugin or not auth_plugin.opts: if not auth_plugin or not auth_plugin.opts:
if not os_username: if not os_username:
if not username:
raise exc.CommandError("You must provide a username " raise exc.CommandError("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_tenant_name: if not os_tenant_name:
if not projectid:
raise exc.CommandError("You must provide a tenant name " raise exc.CommandError("You must provide a tenant name "
"via either --os-tenant-name or " "via either --os-tenant-name or "
"env[OS_TENANT_NAME]") "env[OS_TENANT_NAME]")
else:
os_tenant_name = projectid
if not os_auth_url: if not os_auth_url:
if not url:
if os_auth_system and os_auth_system != 'keystone': if os_auth_system and os_auth_system != 'keystone':
os_auth_url = auth_plugin.get_auth_url() os_auth_url = auth_plugin.get_auth_url()
else:
os_auth_url = url
if not os_auth_url: if not os_auth_url:
raise exc.CommandError("You must provide an auth url " raise exc.CommandError("You must provide an auth url "
@ -626,9 +586,6 @@ class OpenStackComputeShell(object):
"default url with --os-auth-system " "default url with --os-auth-system "
"or env[OS_AUTH_SYSTEM]") "or env[OS_AUTH_SYSTEM]")
if not os_region_name and region_name:
os_region_name = region_name
if (options.os_compute_api_version and if (options.os_compute_api_version and
options.os_compute_api_version != '1.0'): options.os_compute_api_version != '1.0'):
if not os_tenant_name: if not os_tenant_name: