External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-26 13:25:02 -02:30
Code Issues Packages Projects Releases Wiki Activity

tower_username to controller_username, etc

Browse Source
This commit is contained in:
Seth Foster
2021-05-13 13:54:37 -04:00
parent 1a2e56c785
commit 7d06fc74dd
25 changed files with 116 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx_collection/test/awx/test_module_utils.py
View File

@@ -129,7 +129,7 @@ def test_type_warning(collection_import, silence_warning):
def test_duplicate_config(collection_import, silence_warning):
# imports done here because of PATH issues unique to this test suite
ControllerAPIModule = collection_import('plugins.module_utils.controller_api').ControllerAPIModule
data = {'name': 'zigzoom', 'zig': 'zoom', 'tower_username': 'bob', 'tower_config_file': 'my_config'}
data = {'name': 'zigzoom', 'zig': 'zoom', 'controller_username': 'bob', 'controller_config_file': 'my_config'}
with mock.patch.object(ControllerAPIModule, 'load_config') as mock_load:
argument_spec = dict(
@@ -140,8 +140,8 @@ def test_duplicate_config(collection_import, silence_warning):
assert mock_load.mock_calls[-1] == mock.call('my_config')
silence_warning.assert_called_once_with(
'The parameter(s) tower_username were provided at the same time as '
'tower_config_file. Precedence may be unstable, '
'The parameter(s) controller_username were provided at the same time as '
'controller_config_file. Precedence may be unstable, '
'we suggest either using config file or params.'
)
@@ -167,7 +167,7 @@ def test_conflicting_name_and_id(run_module, admin_user):
one item has an id that matches input
one item has a name that matches input
We should preference the id over the name.
Otherwise, the universality of the tower_api lookup plugin is compromised.
Otherwise, the universality of the controller_api lookup plugin is compromised.
"""
org_by_id = Organization.objects.create(name='foo')
slug = str(org_by_id.id)

10
awx_collection/test/awx/test_organization.py
View File

@@ -15,12 +15,12 @@ def test_create_organization(run_module, admin_user):
'description': 'barfoo',
'state': 'present',
'max_hosts': '0',
'tower_host': None,
'tower_username': None,
'tower_password': None,
'controller_host': None,
'controller_username': None,
'controller_password': None,
'validate_certs': None,
'tower_oauthtoken': None,
'tower_config_file': None,
'controller_oauthtoken': None,
'controller_config_file': None,
}
result = run_module('organization', module_args, admin_user)

10
awx_collection/test/awx/test_token.py
View File

@@ -14,12 +14,12 @@ def test_create_token(run_module, admin_user):
'description': 'barfoo',
'state': 'present',
'scope': 'read',
'tower_host': None,
'tower_username': None,
'tower_password': None,
'controller_host': None,
'controller_username': None,
'controller_password': None,
'validate_certs': None,
'tower_oauthtoken': None,
'tower_config_file': None,
'controller_oauthtoken': None,
'controller_config_file': None,
}
result = run_module('token', module_args, admin_user)