IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use tasks.install_master() in external_ca tests

Browse Source 
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 <cheimes@redhat.com>
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
This commit is contained in:
Christian Heimes
2018-10-26 10:11:31 +02:00
parent ec54fa7712
commit 204353e4dc
2 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ipatests/pytest_ipa/integration/tasks.py
View File

@@ -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, def install_master(host, setup_dns=True, setup_kra=False, setup_adtrust=False,
extra_args=(), domain_level=None, unattended=True, 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: if domain_level is None:
domain_level = host.config.domain_level domain_level = host.config.domain_level
check_domain_level(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') args.append('--setup-kra')
if setup_adtrust: if setup_adtrust:
args.append('--setup-adtrust') args.append('--setup-adtrust')
if external_ca:
args.append('--external-ca')
args.extend(extra_args) args.extend(extra_args)
result = host.run_command(args, raiseonerr=raiseonerr, result = host.run_command(args, raiseonerr=raiseonerr,
stdin_text=stdin_text) 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) enable_replication_debugging(host)
setup_sssd_debugging(host) setup_sssd_debugging(host)
kinit_admin(host) kinit_admin(host)

18
ipatests/test_integration/test_external_ca.py
View File

@@ -70,24 +70,12 @@ def match_in_journal(host, string, since='today', services=('certmonger',)):
def install_server_external_ca_step1(host): def install_server_external_ca_step1(host):
"""funtion for step 1 to install the ipa server with external ca""" """Step 1 to install the ipa server with external ca"""
return tasks.install_master(host, external_ca=True)
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
def install_server_external_ca_step2(host, ipa_ca_cert, root_ca_cert): 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', args = ['ipa-server-install',
'-a', host.config.admin_password, '-a', host.config.admin_password,
'-p', host.config.dirman_password, '-p', host.config.dirman_password,