fix 'iparepltopomanagedsuffix' attribute consumers

Commit 46ae52569a179f73b1445922f7bac993d598c953 reimplemented reporting of
managed topology suffixes in server-find/show commands using membership
attributes. This patch fixes consumers of this attribute in ipa-replica-manage
command and webui to reflect this change.

Reviewed-By: Martin Basti <mbasti@redhat.com>

2 files changed, 4 insertions, 8 deletions

diff --git a/install/tools/ipa-replica-manage b/install/tools/ipa-replica-manage
index 085aa29b7..7bbef3593 100755
--- a/install/tools/ipa-replica-manage
+++ b/install/tools/ipa-replica-manage
@@ -573,14 +573,10 @@ def check_last_link(delrepl, realm, dirman_passwd, force):
 
 def map_masters_to_suffixes(masters, suffixes):
     masters_to_suffix = {}
-    suffix_name_to_root = {
-        s['iparepltopoconfroot'][0]: s['cn'][0] for s in suffixes
-    }
 
     for master in masters:
-        managed_suffixes = master['iparepltopomanagedsuffix']
-        for suffix in managed_suffixes:
-            suffix_name = suffix_name_to_root[suffix]
+        managed_suffixes = master['iparepltopomanagedsuffix_topologysuffix']
+        for suffix_name in managed_suffixes:
             try:
                 masters_to_suffix[suffix_name].append(master)
             except KeyError:
diff --git a/install/ui/src/freeipa/topology.js b/install/ui/src/freeipa/topology.js
index 4c77f1b1b..8e74918bf 100644
--- a/install/ui/src/freeipa/topology.js
+++ b/install/ui/src/freeipa/topology.js
@@ -206,7 +206,7 @@ return {
                 'cn',
                 'ipamindomainlevel',
                 'ipamaxdomainlevel',
-                'iparepltopomanagedsuffix'
+                'iparepltopomanagedsuffix_topologysuffix'
             ]
         },
         {
@@ -220,7 +220,7 @@ return {
                         { name: 'cn', read_only: true },
                         { name: 'ipamindomainlevel', read_only: true },
                         { name: 'ipamaxdomainlevel', read_only: true },
-                        { $type: 'multivalued', name: 'iparepltopomanagedsuffix', read_only: true }
+                        { $type: 'multivalued', name: 'iparepltopomanagedsuffix_topologysuffix', read_only: true }
                     ]
                 }
             ]