Possible fix for 389ds conntest failures (+provisioning debug improve…

…ment)
Evolveum · Jun 13, 2016 · 91a83f8 · 91a83f8
1 parent acc2cf5
commit 91a83f8
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/...g-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java b/...g-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
@@ -436,7 +436,9 @@ public Collection<PropertyDelta<PrismPropertyValue>> modifyResourceObject(
 			throws ObjectNotFoundException, SchemaException, CommunicationException, ConfigurationException,
 			SecurityViolationException, ObjectAlreadyExistsException {
 
-		LOGGER.trace("Modifying resource object {}", repoShadow);
+		if (LOGGER.isTraceEnabled()) {
+			LOGGER.trace("Modifying resource object {}, deltas:\n", repoShadow, DebugUtil.debugDump(itemDeltas, 1));
+		}
 
 		RefinedObjectClassDefinition objectClassDefinition = ctx.getObjectClassDefinition();
 		Collection<Operation> operations = new ArrayList<Operation>();

diff --git a/testing/conntest/src/test/resources/389ds/resource-dn-bacchus.xml b/testing/conntest/src/test/resources/389ds/resource-dn-bacchus.xml
@@ -238,6 +238,9 @@
 			</attribute>
 			<attribute>
 				<ref>ri:uniqueMember</ref>
+				<!-- We need explicit matching rule here. 
+				     uniqueMember attribute does NOT have DN syntax in the LDAP schema. -->
+				<matchingRule>mr:distinguishedName</matchingRule>
 			</attribute>
 			<attribute>
 				<ref>ri:cn</ref>

diff --git a/testing/conntest/src/test/resources/389ds/resource-dn-localhost.xml b/testing/conntest/src/test/resources/389ds/resource-dn-localhost.xml
@@ -71,7 +71,6 @@
 			<attribute>
 				<ref>ri:dn</ref>
 				<displayName>Distinguished Name</displayName>
-				<matchingRule>mr:distinguishedName</matchingRule>
 				<outbound>
 				    <source>
 				    	<path>$user/name</path>
@@ -133,7 +132,6 @@
 			<attribute>
 				<ref>ri:uid</ref>
 				<displayName>Login Name</displayName>
-				<matchingRule>mr:stringIgnoreCase</matchingRule>
 				<outbound>
 					<strength>weak</strength>
 					<source>
@@ -163,7 +161,6 @@
 			</attribute>
 			<attribute>
 				<ref>ri:memberOf</ref>
-				<matchingRule>mr:stringIgnoreCase</matchingRule>
 				<fetchStrategy>explicit</fetchStrategy>
 			</attribute>
 
@@ -220,7 +217,6 @@
             <objectClass>ri:groupOfUniqueNames</objectClass>
             <attribute>
 				<ref>ri:dn</ref>
-				<matchingRule>mr:stringIgnoreCase</matchingRule>
 				<outbound>
 					<!-- Name cannot be weak. Changes in name trigger object rename. -->
 					<source>
@@ -242,11 +238,12 @@
 			</attribute>
 			<attribute>
 				<ref>ri:uniqueMember</ref>
-				<matchingRule>mr:stringIgnoreCase</matchingRule>
+				<!-- We need explicit matching rule here. 
+				     uniqueMember attribute does NOT have DN syntax in the LDAP schema. -->
+				<matchingRule>mr:distinguishedName</matchingRule>
 			</attribute>
 			<attribute>
 				<ref>ri:cn</ref>
-				<matchingRule>mr:stringIgnoreCase</matchingRule>
 				<outbound>
 					<strength>weak</strength>
 					<source>

diff --git a/testing/conntest/src/test/resources/389ds/resource-nsuniqueid-bacchus.xml b/testing/conntest/src/test/resources/389ds/resource-nsuniqueid-bacchus.xml
@@ -242,6 +242,9 @@
 			</attribute>
 			<attribute>
 				<ref>ri:uniqueMember</ref>
+				<!-- We need explicit matching rule here. 
+				     uniqueMember attribute does NOT have DN syntax in the LDAP schema. -->
+				<matchingRule>mr:distinguishedName</matchingRule>
 			</attribute>
 			<attribute>
 				<ref>ri:cn</ref>

diff --git a/testing/conntest/src/test/resources/389ds/resource-nsuniqueid-localhost.xml b/testing/conntest/src/test/resources/389ds/resource-nsuniqueid-localhost.xml
@@ -71,7 +71,6 @@
 			<attribute>
 				<ref>ri:dn</ref>
 				<displayName>Distinguished Name</displayName>
-				<matchingRule>mr:distinguishedName</matchingRule>
 				<outbound>
 				    <source>
 				    	<path>$user/name</path>
@@ -88,7 +87,6 @@
 			<attribute>
 				<ref>ri:nsUniqueId</ref>
 				<displayName>Entry ID</displayName>
-				<matchingRule>mr:stringIgnoreCase</matchingRule>
 			</attribute>
 			<attribute>
 				<ref>ri:cn</ref>
@@ -138,7 +136,6 @@
 			<attribute>
 				<ref>ri:uid</ref>
 				<displayName>Login Name</displayName>
-				<matchingRule>mr:stringIgnoreCase</matchingRule>
 				<outbound>
 					<strength>weak</strength>
 					<source>
@@ -168,7 +165,6 @@
 			</attribute>
 			<attribute>
 				<ref>ri:memberOf</ref>
-				<matchingRule>mr:stringIgnoreCase</matchingRule>
 				<fetchStrategy>explicit</fetchStrategy>
 			</attribute>
 
@@ -225,7 +221,6 @@
             <objectClass>ri:groupOfUniqueNames</objectClass>
             <attribute>
 				<ref>ri:dn</ref>
-				<matchingRule>mr:stringIgnoreCase</matchingRule>
 				<outbound>
 					<!-- Name cannot be weak. Changes in name trigger object rename. -->
 					<source>
@@ -247,11 +242,12 @@
 			</attribute>
 			<attribute>
 				<ref>ri:uniqueMember</ref>
-				<matchingRule>mr:stringIgnoreCase</matchingRule>
+				<!-- We need explicit matching rule here. 
+				     uniqueMember attribute does NOT have DN syntax in the LDAP schema. -->
+				<matchingRule>mr:distinguishedName</matchingRule>
 			</attribute>
 			<attribute>
 				<ref>ri:cn</ref>
-				<matchingRule>mr:stringIgnoreCase</matchingRule>
 				<outbound>
 					<strength>weak</strength>
 					<source>