Hi,
* Hide topology and domainlevel commands in the CLI
* Hide topology and domainlevel in the WebUI
* Set maximum allowed domain level to 0
* Do not configure and enable the topology plugin
https://fedorahosted.org/freeipa/ticket/5097
From 8cdc723d334540258fdc408933b3f47ccebf5b53 Mon Sep 17 00:00:00 2001
From: Tomas Babej tba...@redhat.com
Date: Tue, 7 Jul 2015 09:36:32 +0200
Subject: [PATCH] Hide topology and domainlevel features
* Hide topology and domainlevel commands in the CLI
* Hide topology and domainlevel in the WebUI
* Set maximum allowed domain level to 0
* Do not configure and enable the topology plugin
https://fedorahosted.org/freeipa/ticket/5097
---
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, 20 insertions(+), 5 deletions(-)
diff --git a/install/ui/src/freeipa/app.js b/install/ui/src/freeipa/app.js
index f05e8213c0b17e21515fdfce5ab496516a02692e..92613b4a4cec1487a6bde1bdc0049b16d3321418 100644
--- a/install/ui/src/freeipa/app.js
+++ b/install/ui/src/freeipa/app.js
@@ -48,7 +48,8 @@ define([
'./service',
'./sudo',
'./trust',
-'./topology',
+// Hide topology for now
+// './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 120cba37dca7aa355bdb94b1ef16615b95afeb28..4265e98710cdaff0d2ea77ab1e62be1071b19c33 100644
--- a/install/ui/src/freeipa/navigation/menu_spec.js
+++ b/install/ui/src/freeipa/navigation/menu_spec.js
@@ -184,7 +184,7 @@ var nav = {};
{ entity: 'trustconfig' }
]
},
-{
+/* {
entity: 'topologysuffix',
label: '@i18n:tabs.topology',
facet: 'search',
@@ -205,7 +205,7 @@ var nav = {};
hidden: true
}
]
-},
+},*/
{
name: 'apibrowser',
label: 'API browser',
diff --git a/ipalib/constants.py b/ipalib/constants.py
index a062505c349436332d430af4fd29c76d20c85343..fac937b5dc4900b5988c1b1d937c0061430c5e1d 100644
--- a/ipalib/constants.py
+++ b/ipalib/constants.py
@@ -234,4 +234,4 @@ IPA_ANCHOR_PREFIX = ':IPA:'
SID_ANCHOR_PREFIX = ':SID:'
MIN_DOMAIN_LEVEL = 0
-MAX_DOMAIN_LEVEL = 1
+MAX_DOMAIN_LEVEL = 0
diff --git a/ipalib/plugins/domainlevel.py b/ipalib/plugins/domainlevel.py
index 64e383006722fb2f32f5300d627b18b6daf051d4..9012a3203323f381c2b927f76371d2b1df4b32a0 100644
--- a/ipalib/plugins/domainlevel.py
+++ b/ipalib/plugins/domainlevel.py
@@ -74,6 +74,7 @@ def get_master_entries(ldap, api):
@register()
class domainlevel_get(Command):
__doc__ = _('Query current Domain Level.')
+NO_CLI = True
has_output = domainlevel_output
@@ -90,6 +91,7 @@ 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 de5ceb97583c9a40b4fe3783ec0fa40e6c325d0f..574e0d7ed42386f62a805272b6ec106bb946116c 100644
--- a/ipalib/plugins/topology.py
+++ b/ipalib/plugins/topology.py
@@ -41,6 +41,7 @@ class topologysegment(LDAPObject):
Topology segment.
+NO_CLI = True
parent_object = 'topologysuffix'
container_dn = api.env.container_topology
object_name = _('segment')
@@ -195,6 +196,7 @@ 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
@@ -205,6 +207,7 @@ 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):
@@ -218,6 +221,7 @@ 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):
@@ -230,6 +234,7 @@ 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):
@@
