diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItServerStartPolicy.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItServerStartPolicy.java index 7632b17e1ed..81ba859ea4d 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItServerStartPolicy.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItServerStartPolicy.java @@ -20,11 +20,8 @@ import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; -import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_RELEASE_NAME; -import static oracle.weblogic.kubernetes.actions.TestActions.getOperatorPodName; import static oracle.weblogic.kubernetes.assertions.TestAssertions.isPodRestarted; import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists; -import static oracle.weblogic.kubernetes.utils.LoggingUtil.checkPodLogContainsString; import static oracle.weblogic.kubernetes.utils.OKDUtils.createRouteForOKD; import static oracle.weblogic.kubernetes.utils.PatchDomainUtils.patchServerStartPolicy; import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodDeleted; @@ -491,22 +488,6 @@ void testRestartNonExistingComponent() { assertTrue(verifyExecuteResult(result, regex),"The script shouldn't start a domain that doesn't exist"); } - /** - * Verify Operator infrastructure log warning message, when the sample script - * tries to start a server that exceeds the max cluster size. - */ - @Order(7) - @Test - @DisplayName("verify the operator logs warning message when starting a server that exceeds max cluster size") - void testOperatorLogWarningMsg() { - String operatorPodName = - assertDoesNotThrow(() -> getOperatorPodName(OPERATOR_RELEASE_NAME, opNamespace)); - logger.info("operator pod name: {0}", operatorPodName); - checkPodLogContainsString(opNamespace, operatorPodName, "WARNING"); - checkPodLogContainsString(opNamespace, operatorPodName, - "management/weblogic/latest/serverRuntime/search failed with exception java.net.ConnectException"); - } - /** * Once the admin server is stopped, operator can not start a new managed * server from scratch if it has never been started earlier with diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItServerStartPolicyDynamicCluster.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItServerStartPolicyDynamicCluster.java index 6049ac069f1..6216ea13451 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItServerStartPolicyDynamicCluster.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItServerStartPolicyDynamicCluster.java @@ -36,6 +36,7 @@ import static oracle.weblogic.kubernetes.utils.ServerStartPolicyUtils.CONFIG_CLUSTER; import static oracle.weblogic.kubernetes.utils.ServerStartPolicyUtils.DYNAMIC_CLUSTER; import static oracle.weblogic.kubernetes.utils.ServerStartPolicyUtils.ROLLING_CLUSTER_SCRIPT; +import static oracle.weblogic.kubernetes.utils.ServerStartPolicyUtils.SCALE_CLUSTER_SCRIPT; import static oracle.weblogic.kubernetes.utils.ServerStartPolicyUtils.SERVER_LIFECYCLE; import static oracle.weblogic.kubernetes.utils.ServerStartPolicyUtils.START_CLUSTER_SCRIPT; import static oracle.weblogic.kubernetes.utils.ServerStartPolicyUtils.START_SERVER_SCRIPT; @@ -556,4 +557,25 @@ void testDynamicClusterScale() { scalingClusters(domainUid, domainNamespace,DYNAMIC_CLUSTER, dynamicServerPodName, replicaCount, regex, false, samplePath); } + + /** + * Verify the sample script reports proper error when a cluster is scaled beyond max cluster size. + */ + @Order(10) + @Test + @DisplayName("verify the sample script fails when a cluster is scaled beyond max cluster size") + void testScaleBeyondMaxClusterSize() { + int newReplicaCount = 7; + String expectedResult = "Replicas value is not in the allowed range"; + // use scaleCluster.sh to scale a given cluster + logger.info("Scale cluster {0} using the script scaleCluster.sh", DYNAMIC_CLUSTER); + String result = assertDoesNotThrow(() -> + executeLifecycleScript(domainUid, domainNamespace, samplePath, + SCALE_CLUSTER_SCRIPT, CLUSTER_LIFECYCLE, DYNAMIC_CLUSTER, " -r " + newReplicaCount, false), + String.format("Failed to run %s", SCALE_CLUSTER_SCRIPT)); + assertTrue(result.contains(expectedResult), "Expected result " + expectedResult + "not returned"); + // verify the replica did not change + assertDoesNotThrow(() -> assertTrue(checkClusterReplicaCountMatches(DYNAMIC_CLUSTER, + domainUid, domainNamespace, replicaCount))); + } }