Skip to content

Commit

Permalink
AD2022 tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@katkav
katkav committed Jul 18, 2022
1 parent 1729409 commit eea3188
Show file tree
Hide file tree
Showing 6 changed files with 140 additions and 91 deletions.
2 changes: 0 additions & 2 deletions .../com/evolveum/midpoint/testing/conntest/ad/multidomain/AbstractAdLdapMultidomainTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -538,8 +538,6 @@ public void test150SearchAllAccounts() throws Exception {
SearchResultList<PrismObject<ShadowType>> searchResultList = doSearch(query,
getNumberOfAllAccounts(), task, result);

searchResultList.forEach(shadow -> logger.info("shadow: \n {}", shadow.getName()));

if (isVagueTest()) {
rememberCounter(InternalCounters.CONNECTOR_OPERATION_COUNT);
} else {
Expand Down
2 changes: 2 additions & 0 deletions ...src/test/java/com/evolveum/midpoint/testing/conntest/ad/multidomain/TestAdLdapAd2022.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ protected String getAccountJackSid() {

@Override
protected int getNumberOfAllAccounts() {
//Namely: Administrator, Guest, cloudbase-init, AD07, krbtgt
// Jack Sparrow, MidPoint, SSH Test, sub2022$
return 9;
}

Expand Down
107 changes: 70 additions & 37 deletions testing/conntest/src/test/resources/ad-ldap-multidomain/resource-ad2022-strange.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,28 +57,23 @@
</connectorConfiguration>

<additionalConnector>
<name>powershell</name>
<name>ssh</name>
<connectorRef>
<filter>
<q:equal>
<q:path>c:connectorType</q:path>
<q:value>com.evolveum.polygon.connector.powershell.PowerShellConnector</q:value>
<q:value>com.evolveum.polygon.connector.ssh.SshConnector</q:value>
</q:equal>
</filter>
</connectorRef>
<connectorConfiguration xmlns:icfc="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/connector-schema-3">
<icfc:configurationProperties xmlns:icfcps="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/bundle/com.evolveum.polygon.connector-powershell/com.evolveum.polygon.connector.powershell.PowerShellConnector">
<icfcps:winRmHost>ad01.ad2012.lab.evolveum.com</icfcps:winRmHost>
<icfcps:winRmUsername>midpoint</icfcps:winRmUsername>
<icfcps:winRmPassword>
<icfc:configurationProperties xmlns:icfssh="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/bundle/com.evolveum.polygon.connector-ssh/com.evolveum.polygon.connector.ssh.SshConnector">
<icfssh:host>ad07.ad2022.lab.evolveum.com</icfssh:host>
<icfssh:username>midpoint</icfssh:username>
<icfssh:password>
<t:clearValue>qwe.123</t:clearValue>
</icfcps:winRmPassword>
<icfcps:winRmDomain>midpoint</icfcps:winRmDomain>
<icfcps:winRmAuthenticationScheme>credssp</icfcps:winRmAuthenticationScheme>
<icfcps:winRmPort>5986</icfcps:winRmPort>
<icfcps:winRmUseHttps>true</icfcps:winRmUseHttps>
<icfcps:powershellArgumentStyle>variables</icfcps:powershellArgumentStyle>
<icfcps:disableCertificateChecks>true</icfcps:disableCertificateChecks>
</icfssh:password>
<icfssh:argumentStyle>variables-bash</icfssh:argumentStyle>
</icfc:configurationProperties>
<icfc:resultsHandlerConfiguration>
<icfc:enableNormalizingResultsHandler>false</icfc:enableNormalizingResultsHandler>
Expand Down Expand Up @@ -113,7 +108,7 @@
<filter>
<q:equal>
<q:path>attributes/dn</q:path>
<expression><const>ad2012UsersDn</const></expression>
<expression><const>ad2022UsersDn</const></expression>
</q:equal>
</filter>
</baseContext>
Expand All @@ -128,7 +123,7 @@
<expression>
<script>
<code>
basic.composeDnWithSuffix('CN', fullName + iterationToken, midpoint.getConst('ad2012UsersDn'))
basic.composeDnWithSuffix('CN', fullName + iterationToken, midpoint.getConst('ad2022UsersDn'))
</code>
</script>
</expression>
Expand Down Expand Up @@ -217,7 +212,7 @@
<expression>
<script>
<code>
name + iterationToken + '@ad2012.lab.evolveum.com'
name + iterationToken + '@ad2022.lab.evolveum.com'
</code>
</script>
</expression>
Expand All @@ -242,7 +237,7 @@
<ref>ri:objectCategory</ref>
<outbound>
<expression>
<value>CN=Person,CN=Schema,CN=Configuration,DC=ad2012,DC=lab,DC=evolveum,DC=com</value>
<value>CN=Person,CN=Schema,CN=Configuration,DC=ad2022,DC=lab,DC=evolveum,DC=com</value>
</expression>
</outbound>
</attribute>
Expand All @@ -256,7 +251,7 @@
</outbound>
</attribute>

<!-- No Exchange on ad2012
<!-- No Exchange on ad2022
<attribute>
<ref>ri:msExchHideFromAddressLists</ref>
<description>MID-4041</description>
Expand Down Expand Up @@ -309,15 +304,39 @@
<filter>
<q:equal>
<q:path>attributes/dn</q:path>
<q:value>cn=midpoint,cn=users,dc=ad2012,dc=lab,dc=evolveum,dc=com</q:value>
<q:value>CN=Administrator,CN=Users,DC=ad2022,DC=lab,DC=evolveum,DC=com</q:value>
<!-- Explicit matching rule needs to be specified in the query. See MID-6935 -->
<q:matching>http://prism.evolveum.com/xml/ns/public/matching-rule-3#distinguishedName</q:matching>
</q:equal>
</filter>
</protected>
<protected>
<filter>
<q:equal>
<q:path>attributes/dn</q:path>
<q:value>CN=SUB$,CN=Users,DC=ad2012,DC=lab,DC=evolveum,DC=com</q:value>
<q:value>cn=midpoint,cn=users,dc=ad2022,dc=lab,dc=evolveum,dc=com</q:value>
<!-- Explicit matching rule needs to be specified in the query. See MID-6935 -->
<q:matching>http://prism.evolveum.com/xml/ns/public/matching-rule-3#distinguishedName</q:matching>
</q:equal>
</filter>
</protected>
<protected>
<filter>
<q:equal>
<q:path>attributes/dn</q:path>
<q:value>CN=krbtgt,CN=Users,DC=ad2022,DC=lab,DC=evolveum,DC=com</q:value>
<!-- Explicit matching rule needs to be specified in the query. See MID-6935 -->
<q:matching>http://prism.evolveum.com/xml/ns/public/matching-rule-3#distinguishedName</q:matching>
</q:equal>
</filter>
</protected>
<protected>
<filter>
<q:equal>
<q:path>attributes/dn</q:path>
<q:value>CN=SUB2022$,CN=Users,DC=ad2022,DC=lab,DC=evolveum,DC=com</q:value>
<!-- Explicit matching rule needs to be specified in the query. See MID-6935 -->
<q:matching>http://prism.evolveum.com/xml/ns/public/matching-rule-3#distinguishedName</q:matching>
</q:equal>
</filter>
</protected>
Expand All @@ -327,6 +346,8 @@
<q:path>attributes/dn</q:path>
<q:value>CN=DiscoverySearchMailbox</q:value>
<q:anchorStart>true</q:anchorStart>
<!-- Explicit matching rule needs to be specified in the query. See MID-6935 -->
<q:matching>http://prism.evolveum.com/xml/ns/public/matching-rule-3#distinguishedName</q:matching>
</q:substring>
</filter>
</protected>
Expand All @@ -336,10 +357,22 @@
<q:path>attributes/dn</q:path>
<q:value>CN=SystemMailbox</q:value>
<q:anchorStart>true</q:anchorStart>
<!-- Explicit matching rule needs to be specified in the query. See MID-6935 -->
<q:matching>http://prism.evolveum.com/xml/ns/public/matching-rule-3#distinguishedName</q:matching>
</q:substring>
</filter>
</protected>
<protected>
<filter>
<q:substring>
<q:path>attributes/dn</q:path>
<q:value>CN=AD07</q:value>
<q:anchorStart>true</q:anchorStart>
<!-- Explicit matching rule needs to be specified in the query. See MID-6935 -->
<q:matching>http://prism.evolveum.com/xml/ns/public/matching-rule-3#distinguishedName</q:matching>
</q:substring>
</filter>
</protected>

<activation>
<administrativeStatus>
<outbound/>
Expand All @@ -365,7 +398,7 @@
<filter>
<q:equal>
<q:path>attributes/dn</q:path>
<q:value>OU=Org,DC=ad2012,DC=lab,DC=evolveum,DC=com</q:value>
<q:value>OU=Org,DC=ad2022,DC=lab,DC=evolveum,DC=com</q:value>
</q:equal>
</filter>
</baseContext>
Expand All @@ -380,7 +413,7 @@
<expression>
<script>
<code>
basic.composeDnWithSuffix('OU', name, 'OU=Org,DC=ad2012,DC=lab,DC=evolveum,DC=com')
basic.composeDnWithSuffix('OU', name, 'OU=Org,DC=ad2022,DC=lab,DC=evolveum,DC=com')
</code>
</script>
</expression>
Expand All @@ -404,7 +437,7 @@
<ref>ri:objectCategory</ref>
<outbound>
<expression>
<value>CN=Organizational-Unit,CN=Schema,CN=Configuration,DC=ad2012,DC=lab,DC=evolveum,DC=com</value>
<value>CN=Organizational-Unit,CN=Schema,CN=Configuration,DC=ad2022,DC=lab,DC=evolveum,DC=com</value>
</expression>
</outbound>
</attribute>
Expand All @@ -423,7 +456,7 @@
<filter>
<q:equal>
<q:path>attributes/dn</q:path>
<q:value>CN=Users,DC=sub,DC=ad2012,DC=lab,DC=evolveum,DC=com</q:value>
<q:value>CN=Users,DC=sub2022,DC=ad2022,DC=lab,DC=evolveum,DC=com</q:value>
</q:equal>
</filter>
</baseContext>
Expand All @@ -438,7 +471,7 @@
<expression>
<script>
<code>
basic.composeDnWithSuffix('CN', fullName, 'CN=Users,DC=sub,DC=ad2012,DC=lab,DC=evolveum,DC=com')
basic.composeDnWithSuffix('CN', fullName, 'CN=Users,DC=sub2022,DC=ad2022,DC=lab,DC=evolveum,DC=com')
</code>
</script>
</expression>
Expand Down Expand Up @@ -526,7 +559,7 @@
<expression>
<script>
<code>
name + iterationToken + '@sub.ad2012.lab.evolveum.com'
name + iterationToken + '@sub.ad2022.lab.evolveum.com'
</code>
</script>
</expression>
Expand Down Expand Up @@ -574,7 +607,7 @@
</limitations>
<outbound>
<expression>
<value>CN=Person,CN=Schema,CN=Configuration,DC=ad2012,DC=lab,DC=evolveum,DC=com</value>
<value>CN=Person,CN=Schema,CN=Configuration,DC=ad2022,DC=lab,DC=evolveum,DC=com</value>
</expression>
</outbound>
</attribute>
Expand Down Expand Up @@ -617,7 +650,7 @@
<filter>
<q:equal>
<q:path>attributes/dn</q:path>
<q:value>DC=sub,DC=ad2012,DC=lab,DC=evolveum,DC=com</q:value>
<q:value>DC=sub2022,DC=ad2022,DC=lab,DC=evolveum,DC=com</q:value>
</q:equal>
</filter>
</baseContext>
Expand All @@ -632,7 +665,7 @@
<expression>
<script>
<code>
basic.composeDnWithSuffix('OU', name, 'DC=sub,DC=ad2012,DC=lab,DC=evolveum,DC=com')
basic.composeDnWithSuffix('OU', name, 'DC=sub2022,DC=ad2022,DC=lab,DC=evolveum,DC=com')
</code>
</script>
</expression>
Expand All @@ -656,7 +689,7 @@
<ref>ri:objectCategory</ref>
<outbound>
<expression>
<value>CN=Organizational-Unit,CN=Schema,CN=Configuration,DC=ad2012,DC=lab,DC=evolveum,DC=com</value>
<value>CN=Organizational-Unit,CN=Schema,CN=Configuration,DC=ad2022,DC=lab,DC=evolveum,DC=com</value>
</expression>
</outbound>
</attribute>
Expand All @@ -676,7 +709,7 @@
<filter>
<q:equal>
<q:path>attributes/dn</q:path>
<q:value>CN=Users,DC=ad2012,DC=lab,DC=evolveum,DC=com</q:value>
<q:value>CN=Users,DC=ad2022,DC=lab,DC=evolveum,DC=com</q:value>
</q:equal>
</filter>
</baseContext>
Expand All @@ -690,7 +723,7 @@
<expression>
<script>
<code>
basic.composeDnWithSuffix('CN', name, 'CN=Users,DC=ad2012,DC=lab,DC=evolveum,DC=com')
basic.composeDnWithSuffix('CN', name, 'CN=Users,DC=ad2022,DC=lab,DC=evolveum,DC=com')
</code>
</script>
</expression>
Expand Down Expand Up @@ -738,7 +771,7 @@
<filter>
<q:equal>
<q:path>attributes/dn</q:path>
<q:value>OU=Org,DC=ad2012,DC=lab,DC=evolveum,DC=com</q:value>
<q:value>OU=Org,DC=ad2022,DC=lab,DC=evolveum,DC=com</q:value>
</q:equal>
</filter>
</baseContext>
Expand All @@ -753,7 +786,7 @@
<script>
<code>
def parent = midpoint.getParentOrgByOrgType(focus,null)
basic.composeDnWithSuffix('CN', name, 'OU', parent.getName(), 'OU=Org,DC=ad2012,DC=lab,DC=evolveum,DC=com')
basic.composeDnWithSuffix('CN', name, 'OU', parent.getName(), 'OU=Org,DC=ad2022,DC=lab,DC=evolveum,DC=com')
</code>
</script>
</expression>
Expand Down Expand Up @@ -802,7 +835,7 @@
</argument>
<!-- Single-line command, but parameters in variable. This may make it multi-line. -->
<code>Hostname</code>
<!-- <code>$T = Get-Date -format u; $M = $T + " (CredSSP) ADD " + $username +"`n"; write-host $M; $block = $ExecutionContext.InvokeCommand.NewScriptBlock("Add-Content c:\conn.txt `""+$M+"`""); Invoke-Command -ComputerName ad02.sub.ad2012.lab.evolveum.com -ScriptBlock $block</code> -->
<!-- <code>$T = Get-Date -format u; $M = $T + " (CredSSP) ADD " + $username +"`n"; write-host $M; $block = $ExecutionContext.InvokeCommand.NewScriptBlock("Add-Content c:\conn.txt `""+$M+"`""); Invoke-Command -ComputerName ad02.sub.ad2022.lab.evolveum.com -ScriptBlock $block</code> -->
<operation>add</operation>
<order>before</order>
</script>
Expand All @@ -813,7 +846,7 @@
<!-- Make sure that this is a multi-line command. -->
<!-- <code>
write-host "before"
Invoke-Command -ComputerName ad02.sub.ad2012.lab.evolveum.com -ScriptBlock { $T = Get-Date; Add-Content c:\conn.txt $T; Add-Content c:\conn.txt "(CredSSP) MOD`n" }
Invoke-Command -ComputerName ad02.sub.ad2022.lab.evolveum.com -ScriptBlock { $T = Get-Date; Add-Content c:\conn.txt $T; Add-Content c:\conn.txt "(CredSSP) MOD`n" }
write-host "after"
</code> -->
<operation>modify</operation>
Expand Down

0 comments on commit eea3188

Please sign in to comment.