diff options
| author | Sean McGinnis <sean.mcginnis@gmail.com> | 2019-04-18 11:57:24 -0500 |
|---|---|---|
| committer | Sean McGinnis <sean.mcginnis@gmail.com> | 2019-09-10 15:56:27 -0500 |
| commit | dce8a8ed106f2581df27c172a2a002ea8cbeb20e (patch) | |
| tree | 41341fbba740f11858f1c39b78ed4ea94112992e /cinderclient | |
| parent | e98585c03d2410ae2d17d8e346dea10dff90ee2e (diff) | |
| download | python-cinderclient-dce8a8ed106f2581df27c172a2a002ea8cbeb20e.tar.gz | |
Drop support for OS_TENANT_NAME and OS_TENANT_ID
These have been deprecated for a very long time now. Switch to only
support the current OS_PROJECT_NAME and OS_PROJECT_ID.
Change-Id: I2fb78768b4308a3aaf12764edadb58d4a307adaa
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
Diffstat (limited to 'cinderclient')
| -rw-r--r-- | cinderclient/shell.py | 24 | ||||
| -rw-r--r-- | cinderclient/tests/unit/test_shell.py | 4 |
2 files changed, 6 insertions, 22 deletions
diff --git a/cinderclient/shell.py b/cinderclient/shell.py index 75e42e9..7a7d19a 100644 --- a/cinderclient/shell.py +++ b/cinderclient/shell.py @@ -255,24 +255,14 @@ class OpenStackCinderShell(object): parser.add_argument('--os_password', help=argparse.SUPPRESS) - # tenant_name is deprecated by project_name in keystoneauth parser.set_defaults(os_project_name=utils.env('OS_PROJECT_NAME', - 'OS_TENANT_NAME', 'CINDER_PROJECT_ID')) - parser.add_argument('--os_tenant_name', - dest='os_project_name', - help=argparse.SUPPRESS) parser.add_argument( '--os_project_name', help=argparse.SUPPRESS) - # tenant_id is deprecated by project_id in keystoneauth parser.set_defaults(os_project_id=utils.env('OS_PROJECT_ID', - 'OS_TENANT_ID', - 'CINDER_TENANT_ID')) - parser.add_argument('--os_tenant_id', - dest='os_project_id', - help=argparse.SUPPRESS) + 'CINDER_PROJECT_ID')) parser.add_argument( '--os_project_id', help=argparse.SUPPRESS) @@ -635,11 +625,8 @@ class OpenStackCinderShell(object): if not project_info_provided: raise exc.CommandError(_( - "You must provide a tenant_name, tenant_id, " - "project_id or project_name (with " + "You must provide a project_id or project_name (with " "project_domain_name or project_domain_id) via " - " --os-tenant-name (env[OS_TENANT_NAME])," - " --os-tenant-id (env[OS_TENANT_ID])," " --os-project-id (env[OS_PROJECT_ID])" " --os-project-name (env[OS_PROJECT_NAME])," " --os-project-domain-id " @@ -655,11 +642,8 @@ class OpenStackCinderShell(object): if not project_info_provided: raise exc.CommandError(_( - "You must provide a tenant_name, tenant_id, " - "project_id or project_name (with " + "You must provide a project_id or project_name (with " "project_domain_name or project_domain_id) via " - " --os-tenant-name (env[OS_TENANT_NAME])," - " --os-tenant-id (env[OS_TENANT_ID])," " --os-project-id (env[OS_PROJECT_ID])" " --os-project-name (env[OS_PROJECT_NAME])," " --os-project-domain-id " @@ -976,7 +960,7 @@ class OpenStackHelpFormatter(argparse.HelpFormatter): def start_section(self, heading): # Title-case the headings - heading = '%s%s' % (heading[0].upper(), heading[1:]) + heading = heading.title() super(OpenStackHelpFormatter, self).start_section(heading) diff --git a/cinderclient/tests/unit/test_shell.py b/cinderclient/tests/unit/test_shell.py index 7050892..b8f120d 100644 --- a/cinderclient/tests/unit/test_shell.py +++ b/cinderclient/tests/unit/test_shell.py @@ -43,7 +43,7 @@ class ShellTest(utils.TestCase): FAKE_ENV = { 'OS_USERNAME': 'username', 'OS_PASSWORD': 'password', - 'OS_TENANT_NAME': 'tenant_name', + 'OS_PROJECT_NAME': 'tenant_name', 'OS_AUTH_URL': 'http://no.where/v2.0', } @@ -227,7 +227,7 @@ class ShellTest(utils.TestCase): self.FAKE_ENV['OS_AUTH_URL'], password=mock_getpass.return_value, tenant_id='', - tenant_name=self.FAKE_ENV['OS_TENANT_NAME'], + tenant_name=self.FAKE_ENV['OS_PROJECT_NAME'], username=self.FAKE_ENV['OS_USERNAME']) @requests_mock.Mocker() |