IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2026-07-29 15:55:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

ipa-csreplica-manage, ipa-replica-manage: refactor

Browse Source 
Related: https://pagure.io/freeipa/issue/8605
Signed-off-by: François Cami <fcami@redhat.com>
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
This commit is contained in:
François Cami
2021-03-02 11:48:59 +01:00
committed by Florence Blanc-Renaud
parent 82e32433ed
commit 216720af83
2 changed files with 8 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install/tools/ipa-csreplica-manage.in
+2 -14
View File
@@ -31,7 +31,7 @@ from ipaserver.install import (replication, installutils, bindinstance,
cainstance) cainstance)
from ipalib import api, errors from ipalib import api, errors
from ipalib.constants import FQDN from ipalib.constants import FQDN
from ipalib.util import has_managed_topology from ipalib.util import has_managed_topology, print_replication_status
from ipapython import ipautil, ipaldap, version from ipapython import ipautil, ipaldap, version
from ipapython.admintool import ScriptError from ipapython.admintool import ScriptError
from ipapython.dn import DN from ipapython.dn import DN
@@ -133,19 +133,7 @@ def list_replicas(realm, host, replica, dirman_passwd, verbose):
for entry in entries: for entry in entries:
print('%s' % entry.single_value.get('nsds5replicahost')) print('%s' % entry.single_value.get('nsds5replicahost'))
print_replication_status(entry, verbose)
if verbose:
initstatus = entry.single_value.get('nsds5replicalastinitstatus')
if initstatus is not None:
print(" last init status: %s" % initstatus)
print(" last init ended: %s" % str(
ipautil.parse_generalized_time(
entry.single_value['nsds5replicalastinitend'])))
print(" last update status: %s" % entry.single_value.get(
'nsds5replicalastupdatestatus'))
print(" last update ended: %s" % str(
ipautil.parse_generalized_time(
entry.single_value['nsds5replicalastupdateend'])))
def del_link(realm, replica1, replica2, dirman_passwd, force=False): def del_link(realm, replica1, replica2, dirman_passwd, force=False):
install/tools/ipa-replica-manage.in
+6 -20
View File
@@ -39,7 +39,11 @@ from ipaserver.install import opendnssecinstance, dnskeysyncinstance
from ipapython import version, ipaldap from ipapython import version, ipaldap
from ipalib import api, errors from ipalib import api, errors
from ipalib.constants import FQDN from ipalib.constants import FQDN
from ipalib.util import has_managed_topology, verify_host_resolvable from ipalib.util import (
has_managed_topology,
print_replication_status,
verify_host_resolvable,
)
from ipapython.ipa_log_manager import standard_logging_setup from ipapython.ipa_log_manager import standard_logging_setup
from ipapython.dn import DN from ipapython.dn import DN
from ipapython.config import IPAOptionParser from ipapython.config import IPAOptionParser
@@ -235,25 +239,7 @@ def list_replicas(realm, host, replica, dirman_passwd, verbose, nolookup=False):
for entry in entries: for entry in entries:
print('%s: %s' % (entry.single_value.get('nsds5replicahost'), ent_type)) print('%s: %s' % (entry.single_value.get('nsds5replicahost'), ent_type))
print_replication_status(entry, verbose)
if verbose:
initstatus = entry.single_value.get('nsds5replicalastinitstatus')
print(" last init status: %s" % initstatus)
if initstatus is not None:
print(" last init ended: %s" % str(
ipautil.parse_generalized_time(
entry.single_value['nsds5replicalastinitend']))
)
updatestatus = entry.single_value.get(
'nsds5replicalastupdatestatus'
)
print(" last update status: %s" % updatestatus)
if updatestatus is not None:
print(" last update ended: %s" % str(
ipautil.parse_generalized_time(
entry.single_value['nsds5replicalastupdateend']
))
)
def del_link(realm, replica1, replica2, dirman_passwd, force=False): def del_link(realm, replica1, replica2, dirman_passwd, force=False):