diff options
author | Tomas Babej <tbabej@redhat.com> | 2015-07-10 15:16:31 +0200 |
---|---|---|
committer | Tomas Babej <tbabej@redhat.com> | 2015-07-10 15:26:50 +0200 |
commit | 510642196184e588b3014db1d1fdd7bc4aa2f5dd (patch) | |
tree | 8cedfe1bbecfb00763598d721b5512f314710aac | |
parent | 61f41df9493acfbfd1cda017b40cf6786afd8815 (diff) | |
download | freeipa-510642196184e588b3014db1d1fdd7bc4aa2f5dd.tar.gz freeipa-510642196184e588b3014db1d1fdd7bc4aa2f5dd.tar.xz freeipa-510642196184e588b3014db1d1fdd7bc4aa2f5dd.zip |
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.
Reviewed-By: Simo Sorce <ssorce@redhat.com>
-rw-r--r-- | install/ui/src/freeipa/app.js | 3 | ||||
-rw-r--r-- | install/ui/src/freeipa/navigation/menu_spec.js | 4 | ||||
-rw-r--r-- | ipalib/constants.py | 2 | ||||
-rw-r--r-- | ipalib/plugins/domainlevel.py | 2 | ||||
-rw-r--r-- | ipalib/plugins/topology.py | 11 | ||||
-rw-r--r-- | 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 1057120c0..daf17b7ba 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 32bbd6aaa..8140ddf25 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 1509151ba..53c3106cd 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 9012a3203..64e383006 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 574e0d7ed..de5ceb975 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 ' 'retrieving data from the other node.') - NO_CLI = True has_output = output.standard_value msg_summary = _('%(value)s') @@ -321,7 +315,6 @@ class topologysegment_reinitialize(LDAPQuery): @register() class topologysegment_show(LDAPRetrieve): __doc__ = _('Display a segment.') - NO_CLI = True @register() @@ -329,7 +322,6 @@ class topologysuffix(LDAPObject): """ Suffix managed by the topology plugin. """ - NO_CLI = True container_dn = api.env.container_topology object_name = _('suffix') object_name_plural = _('suffices') @@ -360,7 +352,6 @@ class topologysuffix(LDAPObject): class topologysuffix_find(LDAPSearch): __doc__ = _('Search for topology suffices.') - NO_CLI = True msg_summary = ngettext( '%(count)d topology suffix matched', '%(count)d topology suffices matched', 0 @@ -412,7 +403,6 @@ class topologysuffix_mod(LDAPUpdate): @register() class topologysuffix_show(LDAPRetrieve): __doc__ = _('Show managed suffix.') - NO_CLI = True @register() @@ -426,7 +416,6 @@ Checks done: 2. check if servers don't have more than the recommended number of replication agreements ''') - NO_CLI = True def execute(self, *keys, **options): diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index b2558024f..d561ca5b6 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -243,8 +243,7 @@ class DsInstance(service.Service): self.step("configuring DNS plugin", self.__config_dns_module) self.step("enabling entryUSN plugin", self.__enable_entryusn) self.step("configuring lockout plugin", self.__config_lockout_module) - # For now, do not configure topology plugin - #self.step("configuring topology plugin", self.__config_topology_module) + self.step("configuring topology plugin", self.__config_topology_module) self.step("creating indices", self.__create_indices) self.step("enabling referential integrity plugin", self.__add_referint_module) if enable_ssl: |