IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-01-26 16:16:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

rename topology suffixes to "domain" and "ca"

Browse Source 
https://www.redhat.com/archives/freeipa-devel/2015-November/msg00485.html

Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
Petr Vobornik 2015-11-27 17:00:23 +01:00 committed by Martin Basti
parent 03c7d63c52
commit 517aa84569
6 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install/share/ca-topology.uldif
View File

@ -4,11 +4,11 @@ add: objectclass: ipaReplTopoManagedServer
add: ipaReplTopoManagedSuffix: o=ipaca
# add IPA CA topology configuration area
dn: cn=ipaca,cn=topology,cn=ipa,cn=etc,$SUFFIX
dn: cn=ca,cn=topology,cn=ipa,cn=etc,$SUFFIX
default: objectclass: top
default: objectclass: iparepltopoconf
default: ipaReplTopoConfRoot: o=ipaca
default: cn: ipaca
default: cn: ca
# Update CA replication settings
dn: cn=o\3Dipaca,cn=mapping tree,cn=config

4
install/share/topology-entries.ldif
View File

@ -5,7 +5,7 @@ objectclass: nsContainer
cn: topology
# default topology configuration area
dn: cn=realm,cn=topology,cn=ipa,cn=etc,$SUFFIX
dn: cn=domain,cn=topology,cn=ipa,cn=etc,$SUFFIX
changetype: add
objectclass: top
objectclass: iparepltopoconf
@ -13,4 +13,4 @@ ipaReplTopoConfRoot: $SUFFIX
nsDS5ReplicatedAttributeList: $EXCLUDES
nsDS5ReplicatedAttributeListTotal: $TOTAL_EXCLUDES
nsds5ReplicaStripAttrs: $STRIP_ATTRS
cn: realm
cn: domain

4
install/updates/20-replication.update
View File

@ -22,11 +22,11 @@ default: objectclass: nsContainer
default: cn: topology
# Default topology configuration area
dn: cn=realm,cn=topology,cn=ipa,cn=etc,$SUFFIX
dn: cn=domain,cn=topology,cn=ipa,cn=etc,$SUFFIX
default: objectclass: top
default: objectclass: iparepltopoconf
default: ipaReplTopoConfRoot: $SUFFIX
default: cn: realm
default: cn: domain
add: nsDS5ReplicatedAttributeList: $EXCLUDES
add: nsDS5ReplicatedAttributeListTotal: $TOTAL_EXCLUDES
add: nsds5ReplicaStripAttrs: $STRIP_ATTRS

3
ipalib/constants.py
View File

@ -258,3 +258,6 @@ REPL_AGMT_STRIP_ATTRS = ('modifiersName',
'modifyTimestamp',
'internalModifiersName',
'internalModifyTimestamp')
DOMAIN_SUFFIX_NAME = 'domain'
CA_SUFFIX_NAME = 'ca'

5
ipatests/test_integration/tasks.py
View File

@ -38,6 +38,7 @@ from ipatests.test_integration import util
from ipatests.test_integration.env_config import env_to_script
from ipatests.test_integration.host import Host
from ipalib.util import get_reverse_zone_default
from ipalib.constants import DOMAIN_SUFFIX_NAME
log = log_mgr.get_logger(__name__)
@ -659,7 +660,7 @@ def create_segment(master, leftnode, rightnode):
lefthost = leftnode.hostname
righthost = rightnode.hostname
segment_name = "%s-to-%s" % (lefthost, righthost)
result = master.run_command(["ipa", "topologysegment-add", "realm",
result = master.run_command(["ipa", "topologysegment-add", DOMAIN_SUFFIX_NAME,
segment_name,
"--leftnode=%s" % lefthost,
"--rightnode=%s" % righthost], raiseonerr=False)
@ -681,7 +682,7 @@ def destroy_segment(master, segment_name):
kinit_admin(master)
command = ["ipa",
"topologysegment-del",
"realm",
DOMAIN_SUFFIX_NAME,
segment_name]
result = master.run_command(command, raiseonerr=False)
return result.returncode, result.stderr_text

15
ipatests/test_integration/test_topology.py
View File

@ -9,6 +9,7 @@ import pytest
from ipatests.test_integration.base import IntegrationTest
from ipatests.test_integration import tasks
from env_config import get_global_config
from ipalib.constants import DOMAIN_SUFFIX_NAME
config = get_global_config()
reasoning = "Topology plugin disabled due to domain level 0"
@ -59,7 +60,7 @@ class TestTopologyOptions(IntegrationTest):
"""
tasks.kinit_admin(self.master)
result1 = self.master.run_command(['ipa', 'topologysegment-find',
'realm'])
DOMAIN_SUFFIX_NAME])
first_segment_name = "%s-to-%s" % (self.master.hostname,
self.replicas[0].hostname)
output1 = result1.stdout_text
@ -73,11 +74,11 @@ class TestTopologyOptions(IntegrationTest):
# We need to make sure topology information is consistent across all
# replicas
result2 = self.master.run_command(['ipa', 'topologysegment-find',
'realm'])
DOMAIN_SUFFIX_NAME])
result3 = self.replicas[0].run_command(['ipa', 'topologysegment-find',
'realm'])
DOMAIN_SUFFIX_NAME])
result4 = self.replicas[1].run_command(['ipa', 'topologysegment-find',
'realm'])
DOMAIN_SUFFIX_NAME])
segments = self.tokenize_topologies(result2.stdout_text)
assert(len(segments) == 2)
assert(result2.stdout_text == result3.stdout_text)
@ -87,7 +88,7 @@ class TestTopologyOptions(IntegrationTest):
tasks.uninstall_master(self.replicas[1])
tasks.clean_replication_agreement(self.master, self.replicas[1])
result5 = self.master.run_command(['ipa', 'topologysegment-find',
'realm'])
DOMAIN_SUFFIX_NAME])
assert(self.noentries_re.search(result5.stdout_text).group(1) == "1")
def test_add_remove_segment(self):
@ -108,7 +109,7 @@ class TestTopologyOptions(IntegrationTest):
assert err == "", err
# Make sure the new segment is shown by `ipa topologysegment-find`
result1 = self.master.run_command(['ipa', 'topologysegment-find',
'realm'])
DOMAIN_SUFFIX_NAME])
assert(result1.stdout_text.find(segment['name']) > 0)
# Remove master <-> replica2 segment and make sure that the changes get
# there through replica1
@ -118,7 +119,7 @@ class TestTopologyOptions(IntegrationTest):
assert returncode == 0, error
# make sure replica1 does not have segment that was deleted on master
result3 = self.replicas[0].run_command(['ipa', 'topologysegment-find',
'realm'])
DOMAIN_SUFFIX_NAME])
assert(result3.stdout_text.find(deleteme) < 0)
# Create test data on master and make sure it gets all the way down to
# replica2 through replica1