Merge remote-tracking branch 'origin/master'

Evolveum · Nov 15, 2021 · 7139cbd · 7139cbd
2 parents 04575e4 + 0d8ebca
commit 7139cbd
Show file tree

Hide file tree

Showing 8 changed files with 1,030 additions and 2 deletions.
diff --git a/repo/repo-test-util/src/main/resources/test-config-new-repo.xml b/repo/repo-test-util/src/main/resources/test-config-new-repo.xml
@@ -79,6 +79,8 @@
             <ad2012UsersDn>CN=Users,DC=ad2012,DC=lab,DC=evolveum,DC=com</ad2012UsersDn>
             <ad2019BaseDn>DC=ad2019,DC=evolveum,DC=com</ad2019BaseDn>
             <ad2019UsersDn>CN=Users,DC=ad2019,DC=lab,DC=evolveum,DC=com</ad2019UsersDn>
+            <ad2016BaseDn>DC=ad2016,DC=evolveum,DC=com</ad2016BaseDn>
+            <ad2016UsersDn>CN=Users,DC=ad2016,DC=lab,DC=evolveum,DC=com</ad2016UsersDn>
         </constants>
     </midpoint>
 </configuration>
diff --git a/repo/repo-test-util/src/main/resources/test-config.xml b/repo/repo-test-util/src/main/resources/test-config.xml
@@ -72,6 +72,8 @@
             <ad2012UsersDn>CN=Users,DC=ad2012,DC=lab,DC=evolveum,DC=com</ad2012UsersDn>
             <ad2019BaseDn>DC=ad2019,DC=evolveum,DC=com</ad2019BaseDn>
             <ad2019UsersDn>CN=Users,DC=ad2019,DC=lab,DC=evolveum,DC=com</ad2019UsersDn>
+            <ad2016BaseDn>DC=ad2016,DC=evolveum,DC=com</ad2016BaseDn>
+            <ad2016UsersDn>CN=Users,DC=ad2016,DC=lab,DC=evolveum,DC=com</ad2016UsersDn>
         </constants>
     </midpoint>
 </configuration>
diff --git a/...rc/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapMultidomainTest.java b/...rc/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapMultidomainTest.java
@@ -619,8 +619,8 @@ public void test150SearchAllAccounts() throws Exception {
         if (isVagueTest()) {
             rememberCounter(InternalCounters.CONNECTOR_OPERATION_COUNT);
         } else {
-            // TODO: Why 14? Why not 1?
-            assertCounterIncrement(InternalCounters.CONNECTOR_OPERATION_COUNT, 9);  // 14?
+            // This seems to vary quite wildly from system to system. Maybe TODO investigate the reasons later?
+            assertCounterIncrement(InternalCounters.CONNECTOR_OPERATION_COUNT, 9,10);
         }
         assertCounterIncrement(InternalCounters.CONNECTOR_SIMULATED_PAGING_SEARCH_COUNT, 0);
 

diff --git a/...ng/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/TestAdLdapAd2016.java b/...ng/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/TestAdLdapAd2016.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2015-2019 Evolveum and contributors
+ *
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
+ */
+package com.evolveum.midpoint.testing.conntest.ad;
+
+import java.io.File;
+
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
+import org.springframework.test.context.ContextConfiguration;
+import org.testng.annotations.Listeners;
+
+import com.evolveum.midpoint.prism.PrismObject;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationStatusType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
+
+/**
+ * AD multi-domain test for AD 2109 hosted in Evolveum private cloud.
+ *
+ * This test is running on ad03/ad04 servers in ad2016.lab.evolveum.com domain.
+ *
+ * These servers do not have Exchange installed, therefore exchange-specific aspects are skipped.
+ *
+ * TODO: SSH
+ * There is also a problem with CredSSP configuration on those servers.
+ * Therefore "second-hop" CredSSP tests are skipped here.
+ * There is still CreddSSP configured in ad01 server (top-level domain), therefore CredSSP is still tested in a way.
+ * In case of need the old Chimera/Hydra environment is archived, therefore it can be restored and used for full CredSSP tests.
+ *
+ * @see AbstractAdLdapMultidomainTest
+ *
+ * @author Radovan Semancik
+ */
+@ContextConfiguration(locations = {"classpath:ctx-conntest-test-main.xml"})
+@Listeners({ com.evolveum.midpoint.tools.testng.AlphabeticalMethodInterceptor.class })
+@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
+public class TestAdLdapAd2016 extends AbstractAdLdapMultidomainTest {
+
+    @Override
+    protected File getResourceFile() {
+        return new File(getBaseDir(), "resource-ad2016.xml");
+    }
+
+    @Override
+    protected String getLdapServerHost() {
+        return "ad05.ad2016.lab.evolveum.com";
+    }
+
+    @Override
+    protected String getLdapSuffix() {
+        return "DC=ad2016,DC=lab,DC=evolveum,DC=com";
+    }
+
+    @Override
+    protected String getLdapSubServerHost() {
+        return "ad06.ad2016.lab.evolveum.com";
+    }
+
+    @Override
+    protected String getLdapSubSuffix() {
+        return "DC=sub2016,DC=ad2016,DC=lab,DC=evolveum,DC=com";
+    }
+
+    @Override
+    protected File getReconciliationTaskFile() {
+        return new File(getBaseDir(), "task-reconcile-ad2016-users.xml");
+    }
+
+    @Override
+    protected String getReconciliationTaskOid() {
+        return "6dabfa58-d635-11ea-ae7a-5b48b3057a69";
+    }
+
+    @Override
+    protected void assertAccountDisabled(PrismObject<ShadowType> shadow) {
+        assertAdministrativeStatus(shadow, ActivationStatusType.DISABLED);
+    }
+
+    @Override
+    protected void assertAccountEnabled(PrismObject<ShadowType> shadow) {
+        assertAdministrativeStatus(shadow, ActivationStatusType.ENABLED);
+    }
+
+    @Override
+    protected String getAccountJackSid() {
+        return "S-1-5-21-910020289-1878391065-1784003141-1116";
+    }
+
+    @Override
+    protected int getNumberOfAllAccounts() {
+        return 11;
+    }
+
+    @Override
+    protected boolean hasExchange() {
+        return false;
+    }
+}