From a4b8e10a400e99d4a1ecae02c525607cc5a22979 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Thu, 4 May 2023 17:17:26 +0200
Subject: [PATCH] ansible-test: Do not use automatic field numbering
specification
Automatic field numbering specification is not allowed by ansible-test.
---
plugins/modules/ipadnsrecord.py | 5 +++--
roles/ipaclient/library/ipaclient_api.py | 3 ++-
roles/ipaclient/library/ipaclient_join.py | 6 +++---
roles/ipaclient/library/ipaclient_test.py | 10 +++++-----
roles/ipareplica/library/ipareplica_enable_ipa.py | 2 +-
roles/ipareplica/library/ipareplica_prepare.py | 4 ++--
roles/ipareplica/library/ipareplica_test.py | 2 +-
roles/ipareplica/module_utils/ansible_ipa_replica.py | 4 ++--
roles/ipaserver/library/ipaserver_test.py | 2 +-
tests/pytests/conftest.py | 2 +-
tests/utils.py | 2 +-
11 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/plugins/modules/ipadnsrecord.py b/plugins/modules/ipadnsrecord.py
index 9fba3f70..75ae4492 100644
--- a/plugins/modules/ipadnsrecord.py
+++ b/plugins/modules/ipadnsrecord.py
@@ -1394,15 +1394,16 @@ def gen_args(entry):
if record_value is not None:
record_type = entry['record_type']
- rec = "{}record".format(record_type.lower())
+ rec = "{0}record".format(record_type.lower())
args[rec] = ensure_data_is_list(record_value)
else:
for field in _RECORD_FIELDS:
record_value = entry.get(field) or entry.get("%sord" % field)
if record_value is not None:
+ # pylint: disable=use-maxsplit-arg
record_type = field.split('_')[0]
- rec = "{}record".format(record_type.lower())
+ rec = "{0}record".format(record_type.lower())
args[rec] = ensure_data_is_list(record_value)
records = {
diff --git a/roles/ipaclient/library/ipaclient_api.py b/roles/ipaclient/library/ipaclient_api.py
index 9193f603..db592975 100644
--- a/roles/ipaclient/library/ipaclient_api.py
+++ b/roles/ipaclient/library/ipaclient_api.py
@@ -236,7 +236,8 @@ def main():
except Exception as e:
logger.debug("config_show failed %s", e, exc_info=True)
module.fail_json(
- "Failed to retrieve CA certificate subject base: {}".format(e),
+ "Failed to retrieve CA certificate subject base: "
+ "{0}".format(e),
rval=CLIENT_INSTALL_ERROR)
else:
subject_base = str(DN(config['ipacertificatesubjectbase'][0]))
diff --git a/roles/ipaclient/library/ipaclient_join.py b/roles/ipaclient/library/ipaclient_join.py
index 68379ea7..afa722f6 100644
--- a/roles/ipaclient/library/ipaclient_join.py
+++ b/roles/ipaclient/library/ipaclient_join.py
@@ -241,7 +241,7 @@ def main():
config=krb_name)
except RuntimeError as e:
module.fail_json(
- msg="Kerberos authentication failed: {}".format(e))
+ msg="Kerberos authentication failed: {0}".format(e))
elif keytab:
join_args.append("-f")
@@ -254,10 +254,10 @@ def main():
attempts=kinit_attempts)
except GSSError as e:
module.fail_json(
- msg="Kerberos authentication failed: {}".format(e))
+ msg="Kerberos authentication failed: {0}".format(e))
else:
module.fail_json(
- msg="Keytab file could not be found: {}".format(keytab))
+ msg="Keytab file could not be found: {0}".format(keytab))
elif password:
join_args.append("-w")
diff --git a/roles/ipaclient/library/ipaclient_test.py b/roles/ipaclient/library/ipaclient_test.py
index 449460a7..66dbf092 100644
--- a/roles/ipaclient/library/ipaclient_test.py
+++ b/roles/ipaclient/library/ipaclient_test.py
@@ -432,7 +432,7 @@ def main():
if options.ca_cert_files is not None:
for value in options.ca_cert_files:
if not isinstance(value, list):
- raise ValueError("Expected list, got {!r}".format(value))
+ raise ValueError("Expected list, got {0!r}".format(value))
# this is what init() does
value = value[-1]
if not os.path.exists(value):
@@ -575,13 +575,13 @@ def main():
hostname_source = "Machine's FQDN"
if hostname != hostname.lower():
raise ScriptError(
- "Invalid hostname '{}', must be lower-case.".format(hostname),
+ "Invalid hostname '{0}', must be lower-case.".format(hostname),
rval=CLIENT_INSTALL_ERROR
)
if hostname in ('localhost', 'localhost.localdomain'):
raise ScriptError(
- "Invalid hostname, '{}' must not be used.".format(hostname),
+ "Invalid hostname, '{0}' must not be used.".format(hostname),
rval=CLIENT_INSTALL_ERROR)
if hasattr(constants, "MAXHOSTNAMELEN"):
@@ -589,7 +589,7 @@ def main():
validate_hostname(hostname, maxlen=constants.MAXHOSTNAMELEN)
except ValueError as e:
raise ScriptError(
- 'invalid hostname: {}'.format(e),
+ 'invalid hostname: {0}'.format(e),
rval=CLIENT_INSTALL_ERROR)
if hasattr(tasks, "is_nosssd_supported"):
@@ -695,7 +695,7 @@ def main():
rval=CLIENT_INSTALL_ERROR)
if ret == ipadiscovery.NOT_FQDN:
raise ScriptError(
- "{} is not a fully-qualified hostname".format(hostname),
+ "{0} is not a fully-qualified hostname".format(hostname),
rval=CLIENT_INSTALL_ERROR)
if ret in (ipadiscovery.NO_LDAP_SERVER, ipadiscovery.NOT_IPA_SERVER) \
or not ds.domain:
diff --git a/roles/ipareplica/library/ipareplica_enable_ipa.py b/roles/ipareplica/library/ipareplica_enable_ipa.py
index 2b4fee53..a974165e 100644
--- a/roles/ipareplica/library/ipareplica_enable_ipa.py
+++ b/roles/ipareplica/library/ipareplica_enable_ipa.py
@@ -171,7 +171,7 @@ def main():
# Print a warning if CA role is only installed on one server
if len(ca_servers) == 1:
msg = u'''
- WARNING: The CA service is only installed on one server ({}).
+ WARNING: The CA service is only installed on one server ({0}).
It is strongly recommended to install it on another server.
Run ipa-ca-install(1) on another master to accomplish this.
'''.format(ca_servers[0])
diff --git a/roles/ipareplica/library/ipareplica_prepare.py b/roles/ipareplica/library/ipareplica_prepare.py
index bd28b9e2..9ab59b22 100644
--- a/roles/ipareplica/library/ipareplica_prepare.py
+++ b/roles/ipareplica/library/ipareplica_prepare.py
@@ -469,7 +469,7 @@ def main():
env._finalize_core(**dict(constants.DEFAULT_CONFIG))
# pylint: disable=no-member
- xmlrpc_uri = 'https://{}/ipa/xml'.format(ipautil.format_netloc(env.host))
+ xmlrpc_uri = 'https://{0}/ipa/xml'.format(ipautil.format_netloc(env.host))
if hasattr(ipaldap, "realm_to_ldapi_uri"):
realm_to_ldapi_uri = ipaldap.realm_to_ldapi_uri
else:
@@ -609,7 +609,7 @@ def main():
ansible_log.debug("-- REMOTE_API --")
ldapuri = 'ldaps://%s' % ipautil.format_netloc(config.master_host_name)
- xmlrpc_uri = 'https://{}/ipa/xml'.format(
+ xmlrpc_uri = 'https://{0}/ipa/xml'.format(
ipautil.format_netloc(config.master_host_name))
remote_api = create_api(mode=None)
remote_api.bootstrap(in_server=True,
diff --git a/roles/ipareplica/library/ipareplica_test.py b/roles/ipareplica/library/ipareplica_test.py
index 690d6fa7..de491f2f 100644
--- a/roles/ipareplica/library/ipareplica_test.py
+++ b/roles/ipareplica/library/ipareplica_test.py
@@ -450,7 +450,7 @@ def main():
if installer.ca_cert_files is not None:
if not isinstance(installer.ca_cert_files, list):
ansible_module.fail_json(
- msg="Expected list, got {!r}".format(installer.ca_cert_files))
+ msg="Expected list, got {0!r}".format(installer.ca_cert_files))
for cert in installer.ca_cert_files:
if not os.path.exists(cert):
ansible_module.fail_json(msg="'%s' does not exist" % cert)
diff --git a/roles/ipareplica/module_utils/ansible_ipa_replica.py b/roles/ipareplica/module_utils/ansible_ipa_replica.py
index b56ae861..fb168010 100644
--- a/roles/ipareplica/module_utils/ansible_ipa_replica.py
+++ b/roles/ipareplica/module_utils/ansible_ipa_replica.py
@@ -334,7 +334,7 @@ def gen_env_boostrap_finalize_core(etc_ipa, default_config):
def api_bootstrap_finalize(env):
# pylint: disable=no-member
xmlrpc_uri = \
- 'https://{}/ipa/xml'.format(ipautil.format_netloc(env.host))
+ 'https://{0}/ipa/xml'.format(ipautil.format_netloc(env.host))
api.bootstrap(in_server=True,
context='installer',
confdir=paths.ETC_IPA,
@@ -479,7 +479,7 @@ def ansible_module_get_parsed_ip_addresses(ansible_module,
def gen_remote_api(master_host_name, etc_ipa):
ldapuri = 'ldaps://%s' % ipautil.format_netloc(master_host_name)
- xmlrpc_uri = 'https://{}/ipa/xml'.format(
+ xmlrpc_uri = 'https://{0}/ipa/xml'.format(
ipautil.format_netloc(master_host_name))
remote_api = create_api(mode=None)
remote_api.bootstrap(in_server=True,
diff --git a/roles/ipaserver/library/ipaserver_test.py b/roles/ipaserver/library/ipaserver_test.py
index 45f65a2b..92e703cd 100644
--- a/roles/ipaserver/library/ipaserver_test.py
+++ b/roles/ipaserver/library/ipaserver_test.py
@@ -1067,7 +1067,7 @@ def main():
try:
validate_domain_name(realm_name, entity="realm")
except ValueError as e:
- raise ScriptError("Invalid realm name: {}".format(unicode(e)))
+ raise ScriptError("Invalid realm name: {0}".format(unicode(e)))
if not options.setup_adtrust:
# If domain name and realm does not match, IPA server will not be able
diff --git a/tests/pytests/conftest.py b/tests/pytests/conftest.py
index 97e5e534..e42d5f4c 100644
--- a/tests/pytests/conftest.py
+++ b/tests/pytests/conftest.py
@@ -40,7 +40,7 @@ def pytest_configure(config):
if os.path.exists(config_dir):
inventory_path = os.path.join(config_dir, "test.inventory.yml")
inventory = get_inventory(inventory_path)
- print("Configuring execution using {}".format(inventory_path))
+ print("Configuring execution using {0}".format(inventory_path))
ipaservers = inventory["all"]["children"]["ipaserver"]["hosts"]
ipaserver = list(ipaservers.values())[0]
private_key = os.path.join(config_dir, "id_rsa")
diff --git a/tests/utils.py b/tests/utils.py
index eb64bef5..9e3d5e83 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -180,7 +180,7 @@ def run_playbook(playbook, allow_failures=False):
if allow_failures:
return result
- status_code_msg = "ansible-playbook return code: {}".format(
+ status_code_msg = "ansible-playbook return code: {0}".format(
result.returncode
)
assert_msg = "\n".join(
--
GitLab