openstack
/
tacker
Code Issues Proposed changes

Merge "Use more reasonable default domain name"

This commit is contained in:
Zuul 2022-05-20 10:10:43 +00:00 committed by Gerrit Code Review
parent 9fc843c0ab 5aec10898b
commit f10ac5fd56
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tacker/alarm_receiver.py
View File

@ -34,9 +34,9 @@ OPTS = [
help=_('Password for alarm monitoring')),
cfg.StrOpt('project_name', default='admin',
help=_('Project name for alarm monitoring')),
cfg.StrOpt('user_domain_name', default='default',
cfg.StrOpt('user_domain_name', default='Default',
help=_('User domain name for alarm monitoring')),
cfg.StrOpt('project_domain_name', default='default',
cfg.StrOpt('project_domain_name', default='Default',
help=_('Project domain name for alarm monitoring')),
]

4
tacker/conductor/conductor_server.py
View File

@ -92,13 +92,13 @@ OPTS = [cfg.StrOpt('user_domain_id',
default='default',
help='User Name'),
cfg.StrOpt('user_domain_name',
default='default',
default='Default',
help='Use Domain Name'),
cfg.StrOpt('project_name',
default='default',
help='Project Name'),
cfg.StrOpt('project_domain_name',
default='default',
default='Default',
help='Project Domain Name'),
cfg.StrOpt('auth_url',
default='http://localhost/identity/v3',

4
tacker/tests/unit/db/utils.py
View File

@ -328,8 +328,8 @@ def get_vim_auth_obj():
'project_name': 'test_project',
'cert_verify': 'True',
'auth_url': 'http://localhost/identity/v3',
'user_domain_name': 'default',
'project_domain_name': 'default'}
'user_domain_name': 'Default',
'project_domain_name': 'Default'}
def get_dummy_vnffgd_obj():

4
tacker/tests/unit/nfvo/drivers/vim/test_kubernetes_driver.py
View File

@ -35,13 +35,13 @@ OPTS = [cfg.StrOpt('user_domain_id',
default='default',
help='User Name'),
cfg.StrOpt('user_domain_name',
default='default',
default='Default',
help='Use Domain Name'),
cfg.StrOpt('project_name',
default='default',
help='Project Name'),
cfg.StrOpt('project_domain_name',
default='default',
default='Default',
help='Project Domain Name'),
cfg.StrOpt('auth_url',
default='http://localhost/identity/v3',

12
tacker/tests/unit/nfvo/drivers/vim/test_openstack_driver.py
View File

@ -38,13 +38,13 @@ OPTS = [cfg.StrOpt('user_domain_id',
default='default',
help='User Name'),
cfg.StrOpt('user_domain_name',
default='default',
default='Default',
help='Use Domain Name'),
cfg.StrOpt('project_name',
default='default',
help='Project Name'),
cfg.StrOpt('project_domain_name',
default='default',
default='Default',
help='Project Domain Name'),
cfg.StrOpt('auth_url',
default='http://localhost/identity/v3',
@ -107,26 +107,26 @@ class TestOpenstack_Driver(base.TestCase):
'openstack', 'auth_url': 'http://localhost/identity',
'auth_cred': {'username': 'test_user',
'password': 'test_password',
'user_domain_name': 'default',
'user_domain_name': 'Default',
'cert_verify': 'True',
'auth_url': 'http://localhost/identity'},
'name': 'VIM0',
'vim_project': {'name': 'test_project',
'project_domain_name': 'default'}}
'project_domain_name': 'Default'}}
def get_vim_obj_barbican(self):
return {'id': '6261579e-d6f3-49ad-8bc3-a9cb974778ff', 'type':
'openstack', 'auth_url': 'http://localhost/identity',
'auth_cred': {'username': 'test_user',
'password': 'test_password',
'user_domain_name': 'default',
'user_domain_name': 'Default',
'key_type': 'barbican_key',
'secret_uuid': 'fake-secret-uuid',
'cert_verify': 'True',
'auth_url': 'http://localhost/identity'},
'name': 'VIM0',
'vim_project': {'name': 'test_project',
'project_domain_name': 'default'}}
'project_domain_name': 'Default'}}
def test_register_keystone_v3(self):
regions = [mock_dict({'id': 'RegionOne'})]