IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06: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-26 17:56:57 +01:00
parent 5ab0fcabf3
commit beb6a3236d
8 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
install/tools/ipa-ca-install
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

9
install/tools/ipa-replica-manage
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. "

8
ipalib/constants.py
View File

@ -234,8 +234,12 @@ LDAP_GENERALIZED_TIME_FORMAT = "%Y%m%d%H%M%SZ"
IPA_ANCHOR_PREFIX = ':IPA:'
SID_ANCHOR_PREFIX = ':SID:'
MIN_DOMAIN_LEVEL = 0
MAX_DOMAIN_LEVEL = 1
# domains levels
DOMAIN_LEVEL_0 = 0 # compat
DOMAIN_LEVEL_1 = 1 # replica promotion, topology plugin
MIN_DOMAIN_LEVEL = DOMAIN_LEVEL_0
MAX_DOMAIN_LEVEL = DOMAIN_LEVEL_1
# Constants used in generation of replication agreements and as topology
# defaults

2
ipaserver/install/cainstance.py
View File

@ -1530,7 +1530,7 @@ class CAInstance(DogtagInstance):
ca_type=None):
"""Creates a replica CA, creating a local DS backend and using
the topology plugin to manage replication.
Requires domain_level >=1 and custodia on the master.
Requires domain_level >= DOMAIN_LEVEL_1 and custodia on the master.
"""
self.ds_port = DEFAULT_DSPORT
self.master_host = master_host

2
ipaserver/install/dsinstance.py
View File

@ -175,7 +175,7 @@ def get_domain_level(api=api):
try:
entry = conn.get_entry(dn, ['ipaDomainLevel'])
except errors.NotFound:
return 0
return constants.DOMAIN_LEVEL_0
return int(entry.single_value['ipaDomainLevel'])

3
ipaserver/install/ipa_kra_install.py
View File

@ -24,6 +24,7 @@ import tempfile
from textwrap import dedent
from ipalib import api
from ipalib.constants import DOMAIN_LEVEL_0
from ipaplatform import services
from ipaplatform.paths import paths
from ipapython import admintool
@ -138,7 +139,7 @@ class KRAInstaller(KRAInstall):
if self.installing_replica:
domain_level = dsinstance.get_domain_level(api)
if domain_level > 0:
if domain_level > DOMAIN_LEVEL_0:
self.options.promote = True
return

8
ipaserver/install/ipa_replica_prepare.py
View File

@ -41,12 +41,12 @@ from ipapython import version
from ipalib import api
from ipalib import errors
from ipaplatform.paths import paths
from ipalib.constants import CACERT, MIN_DOMAIN_LEVEL
from ipalib.constants import CACERT, DOMAIN_LEVEL_0
UNSUPPORTED_DOMAIN_LEVEL_TEMPLATE = """
Replica creation using '{command_name}' to generate replica file
is supported only in {min_domain_level}-level IPA domain.
is supported only in {domain_level}-level IPA domain.
The current IPA domain level is {curr_domain_level} and thus the replica must
be created by promoting an existing IPA client.
@ -692,10 +692,10 @@ class ReplicaPrepare(admintool.AdminTool):
def check_domainlevel(self, api):
domain_level = dsinstance.get_domain_level(api)
if domain_level > MIN_DOMAIN_LEVEL:
if domain_level > DOMAIN_LEVEL_0:
raise RuntimeError(
UNSUPPORTED_DOMAIN_LEVEL_TEMPLATE.format(
command_name=self.command_name,
min_domain_level=MIN_DOMAIN_LEVEL,
domain_level=DOMAIN_LEVEL_0,
curr_domain_level=domain_level)
)

8
ipaserver/install/server/replicainstall.py
View File

@ -530,9 +530,9 @@ def install_check(installer):
except errors.NotFound:
# If we're joining an older master, domain entry is not
# available
current = 0
current = constants.DOMAIN_LEVEL_0
if current != 0:
if current != constants.DOMAIN_LEVEL_0:
raise RuntimeError(
"You cannot use a replica file to join a replica when the "
"domain is above level 0. Please join the system to the "
@ -858,9 +858,9 @@ def promote_check(installer):
except errors.NotFound:
# If we're joining an older master, domain entry is not
# available
current = 0
current = constants.DOMAIN_LEVEL_0
if current == 0:
if current == constants.DOMAIN_LEVEL_0:
raise RuntimeError(
"You must provide a file generated by ipa-replica-prepare to "
"create a replica when the domain is at level 0."