From 204353e4dc8e44006dfed3d0cd6dc6d12cf41aa4 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Fri, 26 Oct 2018 10:11:31 +0200 Subject: [PATCH] Use tasks.install_master() in external_ca tests The install_master() function performs additional steps besides just installing a server. It also sets up log collection and performs additional tests. Signed-off-by: Christian Heimes Reviewed-By: Rob Crittenden --- ipatests/pytest_ipa/integration/tasks.py | 7 +++++-- ipatests/test_integration/test_external_ca.py | 18 +++--------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/ipatests/pytest_ipa/integration/tasks.py b/ipatests/pytest_ipa/integration/tasks.py index 8d90e04b2..29774ca34 100644 --- a/ipatests/pytest_ipa/integration/tasks.py +++ b/ipatests/pytest_ipa/integration/tasks.py @@ -292,7 +292,7 @@ def set_default_ttl_for_ipa_dns_zone(host, raiseonerr=True): def install_master(host, setup_dns=True, setup_kra=False, setup_adtrust=False, extra_args=(), domain_level=None, unattended=True, - stdin_text=None, raiseonerr=True): + external_ca=False, stdin_text=None, raiseonerr=True): if domain_level is None: domain_level = host.config.domain_level check_domain_level(domain_level) @@ -321,11 +321,14 @@ def install_master(host, setup_dns=True, setup_kra=False, setup_adtrust=False, args.append('--setup-kra') if setup_adtrust: args.append('--setup-adtrust') + if external_ca: + args.append('--external-ca') args.extend(extra_args) result = host.run_command(args, raiseonerr=raiseonerr, stdin_text=stdin_text) - if result.returncode == 0: + if result.returncode == 0 and not external_ca: + # external CA step 1 doesn't have DS and KDC fully configured, yet enable_replication_debugging(host) setup_sssd_debugging(host) kinit_admin(host) diff --git a/ipatests/test_integration/test_external_ca.py b/ipatests/test_integration/test_external_ca.py index 33ba70f98..a8e0ea0bf 100644 --- a/ipatests/test_integration/test_external_ca.py +++ b/ipatests/test_integration/test_external_ca.py @@ -70,24 +70,12 @@ def match_in_journal(host, string, since='today', services=('certmonger',)): def install_server_external_ca_step1(host): - """funtion for step 1 to install the ipa server with external ca""" - - args = ['ipa-server-install', '-U', - '-a', host.config.admin_password, - '-p', host.config.dirman_password, - '--setup-dns', '--no-forwarders', - '-n', host.domain.name, - '-r', host.domain.realm, - '--domain-level=%i' % host.config.domain_level, - '--external-ca'] - - cmd = host.run_command(args) - return cmd + """Step 1 to install the ipa server with external ca""" + return tasks.install_master(host, external_ca=True) def install_server_external_ca_step2(host, ipa_ca_cert, root_ca_cert): - """funtion for step 2 to install the ipa server with external ca""" - + """Step 2 to install the ipa server with external ca""" args = ['ipa-server-install', '-a', host.config.admin_password, '-p', host.config.dirman_password,