From 0571e3840b0a5a70cf18ce5136acaf2235bab907 Mon Sep 17 00:00:00 2001 From: Tibor Dudlák Date: Jul 14 2017 07:23:17 +0000 Subject: topology.py: Removes error message from dictionary. IPA will not print error message header when maximum number of agreements per replica exceeded in topology. Resolves: https://pagure.io/freeipa/issue/6533 Reviewed-By: David Kupka --- diff --git a/ipaclient/plugins/topology.py b/ipaclient/plugins/topology.py index c7fbcc3..9e70bd6 100644 --- a/ipaclient/plugins/topology.py +++ b/ipaclient/plugins/topology.py @@ -18,19 +18,18 @@ register = Registry() class topologysuffix_verify(MethodOverride): def output_for_cli(self, textui, output, *args, **options): - in_order = output['result']['in_order'] connect_errors = output['result']['connect_errors'] max_agmts_errors = output['result']['max_agmts_errors'] - if in_order: + if not connect_errors and not max_agmts_errors: header = _('Replication topology of suffix "%(suffix)s" ' 'is in order.') - else: - header = _('Replication topology of suffix "%(suffix)s" contains ' - 'errors.') - textui.print_h1(header % {'suffix': args[0]}) + textui.print_h1(header % {'suffix': args[0]}) if connect_errors: + header = _('Replication topology of suffix "%(suffix)s" contains ' + 'errors.') + textui.print_h1(header % {'suffix': args[0]}) textui.print_dashed(unicode(_('Topology is disconnected'))) for err in connect_errors: msg = _("Server %(srv)s can't contact servers: %(replicas)s")