openstack
/
tempest
Code Issues Proposed changes

Removal of deprecated argument[os-tenant-name] 

Use of os-tenant-name or OS_TENANT_NAME is deprecated.
Instead of it, os-project-name is expected to be used.

This patch depends on below mentioned patch, since
devstack still uses the deprecated argument.

Depends-on: I624e1dc57a3d3533322fb298c01f70241d0400ed
Signed-off by: Soniya Vyas<svyas@redhat.com>
Change-Id: I3b926f8abb6fce3d2eab93310ce3959c68aa9a6d
This commit is contained in:
Soniya Vyas 2019-12-24 19:20:43 +05:30
parent e459e0d448
commit 195767a062
3 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
releasenotes/notes/os_tenant_name-3ee175763bff455b.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
Remove the deprecated argument ``os-tenant-name`` or ``OS_TENANT_NAME`` in favour of
``os-project-name`` argument.

14
tempest/cmd/account_generator.py
View File

@ -46,7 +46,6 @@ Param CLI Environment Variable
Username ``--os-username`` OS_USERNAME
Password ``--os-password`` OS_PASSWORD
Project ``--os-project-name`` OS_PROJECT_NAME
Tenant ``--os-tenant-name`` (depr.) OS_TENANT_NAME
Domain ``--os-domain-name`` OS_DOMAIN_NAME
======== ============================ ====================
@ -75,9 +74,6 @@ Optional Arguments
* ``--os-project-name <auth-project-name>`` (Optional) Project to request
authorization on. Defaults to env[OS_PROJECT_NAME].
* ``--os-tenant-name <auth-tenant-name>`` (Optional, deprecated) Tenant to
request authorization on. Defaults to env[OS_TENANT_NAME].
* ``--os-domain-name <auth-domain-name>`` (Optional) Domain the user and
project belong to. Defaults to env[OS_DOMAIN_NAME].
@ -139,7 +135,7 @@ def get_credential_provider(opts):
'dhcp': True}
admin_creds_dict = {'username': opts.os_username,
'password': opts.os_password}
_project_name = opts.os_project_name or opts.os_tenant_name
_project_name = opts.os_project_name
if opts.identity_version == 3:
admin_creds_dict['project_name'] = _project_name
admin_creds_dict['domain_name'] = opts.os_domain_name or 'Default'
@ -221,10 +217,6 @@ def _parser_add_args(parser):
metavar='<auth-project-name>',
default=os.environ.get('OS_PROJECT_NAME'),
help='Defaults to env[OS_PROJECT_NAME].')
parser.add_argument('--os-tenant-name',
metavar='<auth-tenant-name>',
default=os.environ.get('OS_TENANT_NAME'),
help='Defaults to env[OS_TENANT_NAME].')
parser.add_argument('--os-domain-name',
metavar='<auth-domain-name>',
default=os.environ.get('OS_DOMAIN_NAME'),
@ -301,10 +293,6 @@ def main(opts=None):
if log_warning:
LOG.warning("Use of: 'tempest-account-generator' is deprecated, "
"please use: 'tempest account-generator'")
if opts.os_tenant_name:
LOG.warning("'os-tenant-name' and 'OS_TENANT_NAME' are both "
"deprecated, please use 'os-project-name' or "
"'OS_PROJECT_NAME' instead")
resources = []
for count in range(opts.concurrency):
# Use N different cred_providers to obtain different sets of creds

10
tempest/tests/cmd/test_account_generator.py
View File

@ -28,7 +28,6 @@ class FakeOpts(object):
self.os_username = 'fake_user'
self.os_password = 'fake_password'
self.os_project_name = 'fake_project_name'
self.os_tenant_name = None
self.os_domain_name = 'fake_domain'
self.tag = 'fake'
self.concurrency = 2
@ -100,15 +99,6 @@ class TestAccountGeneratorV2(base.TestCase, MockHelpersMixin):
self.assertEqual(self.opts.os_password, admin_creds.password)
self.assertFalse(hasattr(admin_creds, 'domain_name'))
def test_get_credential_provider_with_tenant(self):
self.opts.os_project_name = None
self.opts.os_tenant_name = 'fake_tenant'
cp = account_generator.get_credential_provider(self.opts)
admin_creds = cp.default_admin_creds
self.assertEqual(self.opts.os_tenant_name, admin_creds.tenant_name)
self.assertEqual(self.opts.os_username, admin_creds.username)
self.assertEqual(self.opts.os_password, admin_creds.password)
class TestAccountGeneratorV3(TestAccountGeneratorV2):