Hi,
This reverts commit 62e8002bc43ddd890c3db35a123cb7daf35e3121.
Hiding of the topology and domainlevel features was necessary
for the 4.2 branch only.
Tomas
From 89e55240b3e3820b42e85b63cd1849816690321a Mon Sep 17 00:00:00 2001
From: Tomas Babej tba...@redhat.com
Date: Fri, 10 Jul 2015 15:16:31 +0200
Subject: [PATCH] Revert Hide topology and domainlevel features
This reverts commit 62e8002bc43ddd890c3db35a123cb7daf35e3121.
Hiding of the topology and domainlevel features was necessary
for the 4.2 branch only.
---
install/ui/src/freeipa/app.js | 3 +--
install/ui/src/freeipa/navigation/menu_spec.js | 4 ++--
ipalib/constants.py| 2 +-
ipalib/plugins/domainlevel.py | 2 --
ipalib/plugins/topology.py | 11 ---
ipaserver/install/dsinstance.py| 3 +--
6 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/install/ui/src/freeipa/app.js b/install/ui/src/freeipa/app.js
index 1057120c02c000e5c21ad62c1517ccb59115f0cc..daf17b7ba021d3db8288f2de89a8ae4814172a70 100644
--- a/install/ui/src/freeipa/app.js
+++ b/install/ui/src/freeipa/app.js
@@ -50,8 +50,7 @@ define([
'./service',
'./sudo',
'./trust',
-// Hide topology for now
-// './topology',
+'./topology',
'./user',
'./stageuser',
'dojo/domReady!'
diff --git a/install/ui/src/freeipa/navigation/menu_spec.js b/install/ui/src/freeipa/navigation/menu_spec.js
index 32bbd6aaab9e47854e74d26b7f23b89d8bfe7410..8140ddf252e87cf8c51c3f786974ba6a1f2eb390 100644
--- a/install/ui/src/freeipa/navigation/menu_spec.js
+++ b/install/ui/src/freeipa/navigation/menu_spec.js
@@ -205,7 +205,7 @@ var nav = {};
{ entity: 'trustconfig' }
]
},
-/* {
+{
entity: 'topologysuffix',
label: '@i18n:tabs.topology',
facet: 'search',
@@ -226,7 +226,7 @@ var nav = {};
hidden: true
}
]
-},*/
+},
{
name: 'apibrowser',
label: 'API browser',
diff --git a/ipalib/constants.py b/ipalib/constants.py
index 1509151bac7e0abca081cbba033701db410fc54c..53c3106cdd16fef0eba42a70518f7633b3fd95d1 100644
--- a/ipalib/constants.py
+++ b/ipalib/constants.py
@@ -238,4 +238,4 @@ IPA_ANCHOR_PREFIX = ':IPA:'
SID_ANCHOR_PREFIX = ':SID:'
MIN_DOMAIN_LEVEL = 0
-MAX_DOMAIN_LEVEL = 0
+MAX_DOMAIN_LEVEL = 1
diff --git a/ipalib/plugins/domainlevel.py b/ipalib/plugins/domainlevel.py
index 9012a3203323f381c2b927f76371d2b1df4b32a0..64e383006722fb2f32f5300d627b18b6daf051d4 100644
--- a/ipalib/plugins/domainlevel.py
+++ b/ipalib/plugins/domainlevel.py
@@ -74,7 +74,6 @@ def get_master_entries(ldap, api):
@register()
class domainlevel_get(Command):
__doc__ = _('Query current Domain Level.')
-NO_CLI = True
has_output = domainlevel_output
@@ -91,7 +90,6 @@ class domainlevel_get(Command):
@register()
class domainlevel_set(Command):
__doc__ = _('Change current Domain Level.')
-NO_CLI = True
has_output = domainlevel_output
diff --git a/ipalib/plugins/topology.py b/ipalib/plugins/topology.py
index 574e0d7ed42386f62a805272b6ec106bb946116c..de5ceb97583c9a40b4fe3783ec0fa40e6c325d0f 100644
--- a/ipalib/plugins/topology.py
+++ b/ipalib/plugins/topology.py
@@ -41,7 +41,6 @@ class topologysegment(LDAPObject):
Topology segment.
-NO_CLI = True
parent_object = 'topologysuffix'
container_dn = api.env.container_topology
object_name = _('segment')
@@ -196,7 +195,6 @@ class topologysegment(LDAPObject):
class topologysegment_find(LDAPSearch):
__doc__ = _('Search for topology segments.')
-NO_CLI = True
msg_summary = ngettext(
'%(count)d segment matched',
'%(count)d segments matched', 0
@@ -207,7 +205,6 @@ class topologysegment_find(LDAPSearch):
class topologysegment_add(LDAPCreate):
__doc__ = _('Add a new segment.')
-NO_CLI = True
msg_summary = _('Added segment %(value)s')
def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options):
@@ -221,7 +218,6 @@ class topologysegment_add(LDAPCreate):
class topologysegment_del(LDAPDelete):
__doc__ = _('Delete a segment.')
-NO_CLI = True
msg_summary = _('Deleted segment %(value)s')
def pre_callback(self, ldap, dn, *keys, **options):
@@ -234,7 +230,6 @@ class topologysegment_del(LDAPDelete):
class topologysegment_mod(LDAPUpdate):
__doc__ = _('Modify a segment.')
-NO_CLI = True
msg_summary = _('Modified segment %(value)s')
def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options):
@@ -249,7 +244,6 @@ class topologysegment_reinitialize(LDAPQuery):
__doc__ = _('Request a full re-initialization of the node '
