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

Move acme client installation part to classmethod

Browse Source 
Moved the acme client installation part to classmethod
so that it can be leveraged further.

Reviewed-By: Fraser Tweedale <ftweedal@redhat.com>
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
This commit is contained in:
Mohammad Rizwan
2020-09-29 15:10:52 +05:30
committed by Rob Crittenden
parent cbbfcd9b1e
commit c4a6b0e566
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ipatests/test_integration/test_acme.py
View File

@@ -91,19 +91,23 @@ class TestACME(CALessBase):
num_clients = 1
@classmethod
def install(cls, mh):
super(TestACME, cls).install(mh)
def prepare_acme_client(cls):
# cache the acme service uri
acme_host = f'{IPA_CA_RECORD}.{cls.master.domain.name}'
cls.acme_server = f'https://{acme_host}/acme/directory'
# install packages before client install in case of IPA DNS problems
# install acme client packages
if not skip_certbot_tests:
tasks.install_packages(cls.clients[0], ['certbot'])
if not skip_mod_md_tests:
tasks.install_packages(cls.clients[0], ['mod_md'])
@classmethod
def install(cls, mh):
# install packages before client install in case of IPA DNS problems
cls.prepare_acme_client()
tasks.install_master(cls.master, setup_dns=True)
tasks.install_client(cls.master, cls.clients[0])
@@ -486,15 +490,8 @@ class TestACMEwithExternalCA(TestACME):
@classmethod
def install(cls, mh):
# cache the acme service uri
acme_host = f'{IPA_CA_RECORD}.{cls.master.domain.name}'
cls.acme_server = f'https://{acme_host}/acme/directory'
# install packages before client install in case of IPA DNS problems
if not skip_certbot_tests:
tasks.install_packages(cls.clients[0], ["certbot"])
if not skip_mod_md_tests:
tasks.install_packages(cls.clients[0], ["mod_md"])
cls.prepare_acme_client()
# install master with external-ca
result = install_server_external_ca_step1(cls.master)