On 12/07/2015 12:07 PM, Oleg Fayans wrote:
Hi Martin,
CONFIGURED_DOMAIN_LEVEL is declared, but not used. The rest looks fine to me
On 12/07/2015 11:05 AM, Martin Babinsky wrote:
This patch should fix teardown methods in replication-related CI tests
ran at non-zero domain level.
Ah that was a leftover from previous implementation. Here's updated patch.
--
Martin^3 Babinsky
From b6cfb98e29789da2c6e3fefd2cd7f86155a17f11 Mon Sep 17 00:00:00 2001
From: Martin Babinsky <mbabi...@redhat.com>
Date: Fri, 4 Dec 2015 18:24:31 +0100
Subject: [PATCH] CI tests: ignore disconnected domain level 1 topology on IPA
master teardown
---
ipatests/test_integration/tasks.py | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py
index e75fe505f5ad9b5ffe680f7e37dec6873616ca05..69a608b6df92bc563a9ec5a97fcb7832e376a3f3 100644
--- a/ipatests/test_integration/tasks.py
+++ b/ipatests/test_integration/tasks.py
@@ -38,7 +38,7 @@ from ipatests.test_integration import util
from ipatests.test_integration.env_config import env_to_script
from ipatests.test_integration.host import Host
from ipalib.util import get_reverse_zone_default
-from ipalib.constants import DOMAIN_SUFFIX_NAME
+from ipalib.constants import DOMAIN_LEVEL_0, DOMAIN_SUFFIX_NAME
log = log_mgr.get_logger(__name__)
@@ -342,7 +342,7 @@ def install_replica(master, replica, setup_ca=True, setup_dns=False,
'--setup-dns',
'--forwarder', replica.config.dns_forwarder
])
- if domainlevel(master) == 0:
+ if domainlevel(master) == DOMAIN_LEVEL_0:
apply_common_fixes(replica)
# prepare the replica file on master and put it to replica, AKA "old way"
replica_prepare(master, replica)
@@ -364,7 +364,7 @@ def install_replica(master, replica, setup_ca=True, setup_dns=False,
"-p", replica.config.dirman_password,
"-U",
]
- if domainlevel(master) == 0:
+ if domainlevel(master) == DOMAIN_LEVEL_0:
args.append(replica_filename)
replica.run_command(args)
@@ -614,11 +614,16 @@ def kinit_admin(host):
stdin_text=host.config.admin_password)
-def uninstall_master(host):
+def uninstall_master(host, ignore_topology_disconnect=True):
host.collect_log(paths.IPASERVER_UNINSTALL_LOG)
+ uninstall_cmd = ['ipa-server-install', '--uninstall', '-U']
- host.run_command(['ipa-server-install', '--uninstall', '-U'],
- raiseonerr=False)
+ host_domain_level = domainlevel(host)
+
+ if ignore_topology_disconnect and host_domain_level != DOMAIN_LEVEL_0:
+ uninstall_cmd.append('--ignore-topology-disconnect')
+
+ host.run_command(uninstall_cmd, raiseonerr=False)
host.run_command(['pkidestroy', '-s', 'CA', '-i', 'pki-tomcat'],
raiseonerr=False)
host.run_command(['rm', '-rf',
--
2.5.0
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
