Check if replication agreement exist before enable/disable it

If the replication agreement does not exist, a custom exception is
raised explaining the problem.

https://pagure.io/freeipa/issue/7201

Reviewed-By: Rob Crittenden <rcritten@redhat.com>
This commit is contained in:
Felipe Barreto authored and Christian Heimes committed 2018-02-09 08:30:21 +01:00
1 parent 1785a3e17b
commit ece17cef17
2 files changed
+16 -2

No files matched your search

+5 -2
View File
@@ -1206,8 +1206,11 @@ def re_initialize(realm, thishost, fromhost, dirman_passwd, nolookup=False):
repl = replication.ReplicationManager(realm, fromhost, dirman_passwd)
agreement = repl.get_replication_agreement(thishost)
thisrepl.enable_agreement(fromhost)
repl.enable_agreement(thishost)
try:
thisrepl.enable_agreement(fromhost)
repl.enable_agreement(thishost)
except errors.NotFound as e:
sys.exit(e)
repl.force_sync(repl.conn, thishost)
+11
View File
@@ -32,6 +32,7 @@ import ldap
from ipalib import api, errors
from ipalib.cli import textui
from ipalib.text import _
from ipapython import ipautil, ipaldap, kerberos
from ipapython.admintool import ScriptError
from ipapython.dn import DN
@@ -1547,6 +1548,11 @@ class ReplicationManager(object):
Disable the replication agreement to hostname.
"""
entry = self.get_replication_agreement(hostname)
if not entry:
raise errors.NotFound(reason=_(
"Replication agreement for %(hostname)s not found") % {
'hostname': hostname
})
entry['nsds5ReplicaEnabled'] = 'off'
try:
@@ -1561,6 +1567,11 @@ class ReplicationManager(object):
Note: for replication to work it needs to be enabled both ways.
"""
entry = self.get_replication_agreement(hostname)
if not entry:
raise errors.NotFound(reason=_(
"Replication agreement for %(hostname)s not found") % {
'hostname': hostname
})
entry['nsds5ReplicaEnabled'] = 'on'
try: