This patch fixes a regression caused by recently pushed topologysuffix-related patches.

--
Martin^3 Babinsky
From eace784d7bea6234083eff2658b787bb0706f575 Mon Sep 17 00:00:00 2001
From: Martin Babinsky <mbabi...@redhat.com>
Date: Tue, 1 Dec 2015 12:14:07 +0100
Subject: [PATCH] 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.
---
 install/tools/ipa-replica-manage   | 2 +-
 install/ui/src/freeipa/topology.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/install/tools/ipa-replica-manage b/install/tools/ipa-replica-manage
index 085aa29b7904958ced5281a2946a2d318ac371f6..f82417ac1323491336e21cf088c6b12d1fe9b773 100755
--- a/install/tools/ipa-replica-manage
+++ b/install/tools/ipa-replica-manage
@@ -578,7 +578,7 @@ def map_masters_to_suffixes(masters, suffixes):
     }
 
     for master in masters:
-        managed_suffixes = master['iparepltopomanagedsuffix']
+        managed_suffixes = master['iparepltopomanagedsuffix_topologysuffix']
         for suffix in managed_suffixes:
             suffix_name = suffix_name_to_root[suffix]
             try:
diff --git a/install/ui/src/freeipa/topology.js b/install/ui/src/freeipa/topology.js
index 4c77f1b1b2660cdb78ffe6c5299852d7b1d316fa..8e74918bf237dba335ce2f63441423191b2f89e8 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 }
                     ]
                 }
             ]
-- 
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

Reply via email to