Re: [Freeipa-devel] [PATCH] 938 rename topology suffixes to "domain" and "ca"
On 01.12.2015 19:01, Petr Vobornik wrote: On 12/01/2015 09:04 AM, Jan Cholasta wrote: On 30.11.2015 12:41, Petr Vobornik wrote: see https://www.redhat.com/archives/freeipa-devel/2015-November/msg00485.html LGTM, but I would s/_SUFFIX/_SUFFIX_NAME/. Updated patch attached. ACK Pushed to master: 517aa84569ae144a8b781ef7ad67e356d9021757 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
Re: [Freeipa-devel] [PATCH] 938 rename topology suffixes to "domain" and "ca"
On 12/01/2015 09:04 AM, Jan Cholasta wrote: On 30.11.2015 12:41, Petr Vobornik wrote: see https://www.redhat.com/archives/freeipa-devel/2015-November/msg00485.html LGTM, but I would s/_SUFFIX/_SUFFIX_NAME/. Updated patch attached. -- Petr Vobornik From a43c65f8af3c77c45d0bee7ff1714f10808890ba Mon Sep 17 00:00:00 2001 From: Petr Vobornik Date: Fri, 27 Nov 2015 17:00:23 +0100 Subject: [PATCH] rename topology suffixes to "domain" and "ca" https://www.redhat.com/archives/freeipa-devel/2015-November/msg00485.html --- install/share/ca-topology.uldif| 4 ++-- install/share/topology-entries.ldif| 4 ++-- install/updates/20-replication.update | 4 ++-- ipalib/constants.py| 3 +++ ipatests/test_integration/tasks.py | 5 +++-- ipatests/test_integration/test_topology.py | 15 --- 6 files changed, 20 insertions(+), 15 deletions(-) diff --git a/install/share/ca-topology.uldif b/install/share/ca-topology.uldif index 8c9998cbcd151664a3bee881df346e6636b5167b..7ce3cb18bab94a2d5f6e7bef09f0964c2971759f 100644 --- a/install/share/ca-topology.uldif +++ b/install/share/ca-topology.uldif @@ -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 diff --git a/install/share/topology-entries.ldif b/install/share/topology-entries.ldif index 0f92a882601336bd7037dd9f10b12a0f41610795..d6c952b94c735cd9a9aa35342b197e57b2f60d11 100644 --- a/install/share/topology-entries.ldif +++ b/install/share/topology-entries.ldif @@ -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 diff --git a/install/updates/20-replication.update b/install/updates/20-replication.update index 34b47e4ac5e0bbd74a917ca60d0e339c6f1c6650..a471742532cf5954be1b76dbe4a6d908e4cefa2c 100644 --- a/install/updates/20-replication.update +++ b/install/updates/20-replication.update @@ -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 diff --git a/ipalib/constants.py b/ipalib/constants.py index fc0560ba4fe746f11e8ff3175508ace2e50c3187..1ff9ccc7efe0c3be0fc3cf2f21352e89ef94ad6e 100644 --- a/ipalib/constants.py +++ b/ipalib/constants.py @@ -258,3 +258,6 @@ REPL_AGMT_STRIP_ATTRS = ('modifiersName', 'modifyTimestamp', 'internalModifiersName', 'internalModifyTimestamp') + +DOMAIN_SUFFIX_NAME = 'domain' +CA_SUFFIX_NAME = 'ca' diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py index 0ee50a8e289b0648103ed86d5739d0cce08aa070..a295d522d69c28da3c58156c8850e68b83342c53 100644 --- a/ipatests/test_integration/tasks.py +++ b/ipatests/test_integration/tasks.py @@ -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
Re: [Freeipa-devel] [PATCH] 938 rename topology suffixes to "domain" and "ca"
On 30.11.2015 12:41, Petr Vobornik wrote: see https://www.redhat.com/archives/freeipa-devel/2015-November/msg00485.html LGTM, but I would s/_SUFFIX/_SUFFIX_NAME/. -- Jan Cholasta -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [PATCH] 938 rename topology suffixes to "domain" and "ca"
see https://www.redhat.com/archives/freeipa-devel/2015-November/msg00485.html -- Petr Vobornik From ae546045ff286b7787e90e6eed945c70463404a8 Mon Sep 17 00:00:00 2001 From: Petr Vobornik Date: Fri, 27 Nov 2015 17:00:23 +0100 Subject: [PATCH] rename topology suffixes to "domain" and "ca" https://www.redhat.com/archives/freeipa-devel/2015-November/msg00485.html --- install/share/ca-topology.uldif| 4 ++-- install/share/topology-entries.ldif| 4 ++-- install/updates/20-replication.update | 4 ++-- ipalib/constants.py| 3 +++ ipatests/test_integration/tasks.py | 5 +++-- ipatests/test_integration/test_topology.py | 15 --- 6 files changed, 20 insertions(+), 15 deletions(-) diff --git a/install/share/ca-topology.uldif b/install/share/ca-topology.uldif index 8c9998cbcd151664a3bee881df346e6636b5167b..7ce3cb18bab94a2d5f6e7bef09f0964c2971759f 100644 --- a/install/share/ca-topology.uldif +++ b/install/share/ca-topology.uldif @@ -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 diff --git a/install/share/topology-entries.ldif b/install/share/topology-entries.ldif index 0f92a882601336bd7037dd9f10b12a0f41610795..d6c952b94c735cd9a9aa35342b197e57b2f60d11 100644 --- a/install/share/topology-entries.ldif +++ b/install/share/topology-entries.ldif @@ -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 diff --git a/install/updates/20-replication.update b/install/updates/20-replication.update index 34b47e4ac5e0bbd74a917ca60d0e339c6f1c6650..a471742532cf5954be1b76dbe4a6d908e4cefa2c 100644 --- a/install/updates/20-replication.update +++ b/install/updates/20-replication.update @@ -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 diff --git a/ipalib/constants.py b/ipalib/constants.py index fc0560ba4fe746f11e8ff3175508ace2e50c3187..68c7eb172da138b49270af5c49fc8441db2c1653 100644 --- a/ipalib/constants.py +++ b/ipalib/constants.py @@ -258,3 +258,6 @@ REPL_AGMT_STRIP_ATTRS = ('modifiersName', 'modifyTimestamp', 'internalModifiersName', 'internalModifyTimestamp') + +DOMAIN_SUFFIX = 'domain' +CA_SUFFIX = 'ca' diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py index 0ee50a8e289b0648103ed86d5739d0cce08aa070..8392c87467529f51730169880af50667e91bcdab 100644 --- a/ipatests/test_integration/tasks.py +++ b/ipatests/test_integration/tasks.py @@ -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 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, 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, segment_name] result = master.run_command(command, raiseonerr=False) return result.returncode, result.stderr_text diff --git a/ipatests/test_integration/test_topology.py b/ipatests/test_integration/test_topology.py index