IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2026-08-12 05:55:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Domain levels: use constants rather than hardcoded values

Browse Source 
Added constants for domain levels
DOMAIN_LEVEL_0 = 0
DOMAIN_LEVEL_1 = 1

This allows to search for domain level easier in code.

Reviewed-By: Petr Spacek <pspacek@redhat.com>
Reviewed-By: Tomas Babej <tbabej@redhat.com>
This commit is contained in:
Martin Basti
2015-10-27 10:29:41 +01:00
parent 5ab0fcabf3
commit beb6a3236d
8 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install/tools/ipa-ca-install
+2 -1
View File
@@ -33,6 +33,7 @@ from ipaserver.install import cainstance, custodiainstance, service
from ipapython import dogtag
from ipapython import version
from ipalib import api
from ipalib.constants import DOMAIN_LEVEL_0
from ipapython.dn import DN
from ipapython.config import IPAOptionParser
from ipapython.ipa_log_manager import *
@@ -108,7 +109,7 @@ def get_dirman_password():
def install_replica(safe_options, options, filename):
domain_level = dsinstance.get_domain_level(api)
if domain_level > 0:
if domain_level > DOMAIN_LEVEL_0:
options.promote = True
else:
options.promote = False
install/tools/ipa-replica-manage
+5 -4
View File
@@ -37,7 +37,7 @@ from ipaserver.install import bindinstance, cainstance, certs
from ipaserver.install import opendnssecinstance, dnskeysyncinstance
from ipapython import version, ipaldap
from ipalib import api, errors, util
from ipalib.constants import CACERT
from ipalib.constants import CACERT, DOMAIN_LEVEL_0
from ipalib.util import create_topology_graph, get_topology_connection_errors
from ipapython.ipa_log_manager import *
from ipapython.dn import DN
@@ -804,7 +804,8 @@ def del_master_managed(realm, hostname, options):
def del_master_direct(realm, hostname, options):
"""
Removing of master for realm without managed topology (domain level < 1)
Removing of master for realm without managed topology
(domain level < DOMAIN_LEVEL_1)
"""
force_del = False
@@ -1349,8 +1350,8 @@ def set_DNA_range(hostname, range, realm, dirman_passwd, next_range=False,
sys.exit("Updating range failed: %s" % e)
def has_managed_topology():
domainlevel = api.Command['domainlevel_get']().get('result', 0)
return domainlevel > 0
domainlevel = api.Command['domainlevel_get']().get('result', DOMAIN_LEVEL_0)
return domainlevel > DOMAIN_LEVEL_0
def exit_on_managed_topology(what):
sys.exit("{0} is deprecated with managed IPA replication topology. "