moved wsbalancing test to advanced tests, added more checks for deploy

Author: marinakog

integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java

@@ -358,6 +358,7 @@ public void testDomainLifecyle(Operator operator, Domain domain) throws Exceptio
     } else {
       domain.verifyWebAppLoadBalancing(TESTWEBAPP);
     }
+    testWSLoadBalancing(domain);
     domain.verifyAdminServerExternalService(getUsername(), getPassword());
     domain.verifyHasClusterServiceChannelPort("TCP", 8011, TESTWEBAPP + "/");
     logger.info("Done - testDomainLifecyle");

integration-tests/src/test/java/oracle/kubernetes/operator/ITUsabilityOperatorHelmChart.java

@@ -721,7 +721,6 @@ private Domain createVerifyDomain(int number, Operator operator) throws Exceptio
     Domain domain = TestUtils.createDomain(TestUtils.createDomainMap(number));
     domain.verifyDomainCreated();
     testAdminT3Channel(domain);
-    testWSLoadBalancing(domain);
     TestUtils.renewK8sClusterLease(getProjectRoot(), getLeaseId());
     logger.info("verify that domain is managed by operator");
     operator.verifyDomainExists(domain.getDomainUid());

integration-tests/src/test/java/oracle/kubernetes/operator/utils/TestUtils.java

@@ -1222,15 +1222,16 @@ public static void buildDeployWebServiceAppInPod(
     String archiveExt = "war";
     String infoDirName = initInfoDirName;
     String domainNS = domain.getDomainNS();
+    String managedServerPort = (String) domain.getDomainMap().get("managedServerPort");
     String wsServiceName = (args.length == 0) ? BaseTest.TESTWSSERVICE : args[0];
     String clusterDNS =
         domain.getDomainUid()
             + "-cluster-"
             + domain.getClusterName()
             + "."
             + domainNS
-            + ".svc.cluster.local:8001";
-
+            + ".svc.cluster.local:"
+            + managedServerPort;
     logger.info(
         "Build and deploy WebService App: "
             + appName

integration-tests/src/test/resources/apps/buildDeployWSAndWSClientAppInPod.sh

@@ -52,13 +52,23 @@ cp ${APP_DIR_INPOD}/buildfiles/${WS_NAME}.war ${APP_DIR_INPOD}/.
 cp ${APP_DIR_INPOD}/buildfiles/${WS_NAME}Servlet.war ${APP_DIR_INPOD}/.
 
 echo "Deploy ${APP_NAME} using curl:"
-echo -e "curl --noproxy '*' --silent  --user ${USER}:${PASSWORD} -H X-Requested-By:MyClient -H Accept:application/json -H Content-Type:multipart/form-data -F \"model={ name: '${APP_NAME}', targets: [ { identity: [ clusters, '${DEPLOY_TARGET}' ] } ] }\" -F \"sourcePath=@${ARCHIVE_FILE_WS}\"  -H \"Prefer:respond-async\" -X POST http://${HOST}:${PORT}/management/weblogic/latest/edit/appDeployments\n"
-curl --noproxy '*' --silent  --user ${USER}:${PASSWORD} -H X-Requested-By:MyClient -H Accept:application/json -H Content-Type:multipart/form-data -F "model={ name: '${APP_NAME}', targets: [ { identity: [ clusters, '${DEPLOY_TARGET}' ] } ] }" -F "sourcePath=@${ARCHIVE_FILE_WS}" -H "Prefer:respond-async" -X POST http://${HOST}:${PORT}/management/weblogic/latest/edit/appDeployments
+echo -e "curl --noproxy '*' --silent  --user ${USER}:${PASSWORD} -H X-Requested-By:MyClient -H Accept:application/json -H Content-Type:multipart/form-data -F \"model={ name: '${APP_NAME}', targets: [ { identity: [ clusters, '${DEPLOY_TARGET}' ] } ] }\" -F \"sourcePath=@${ARCHIVE_FILE_WS}\"  -H \"Prefer:respond-async\" -X POST http://${HOST}:${PORT}/management/weblogic/latest/edit/appDeployments -o ${APP_DIR_INPOD}/deployWS.out\n"
+curl --noproxy '*' --silent  --user ${USER}:${PASSWORD} -H X-Requested-By:MyClient -H Accept:application/json -H Content-Type:multipart/form-data -F "model={ name: '${APP_NAME}', targets: [ { identity: [ clusters, '${DEPLOY_TARGET}' ] } ] }" -F "sourcePath=@${ARCHIVE_FILE_WS}" -H "Prefer:respond-async" -X POST http://${HOST}:${PORT}/management/weblogic/latest/edit/appDeployments -o ${APP_DIR_INPOD}/deployWS.out
 sleep 10
+grep -q "STATE_RUNNING" ${APP_DIR_INPOD}/deployWS.out
+ cres=$?
+ [[ $cres != 0 ]] && echo "[FAIL] Unable to deploy wsapp ..."
+ [[ $cres == 0 ]] && echo "[SUCCESS] wsapp is deployed  ..."
 
 echo "Deploy ${APP_NAME}Servlet using curl:"
-echo -e "curl --noproxy '*' --silent  --user ${USER}:${PASSWORD} -H X-Requested-By:MyClient -H Accept:application/json -H Content-Type:multipart/form-data -F \"model={ name: '${APP_NAME}servlet', targets: [ { identity: [ clusters, '${DEPLOY_TARGET}' ] } ] }\" -F \"sourcePath=@${ARCHIVE_FILE_SERVLET}\" -H \"Prefer:respond-async\" -X POST http://${HOST}:${PORT}/management/weblogic/latest/edit/appDeployments\n"
-curl --noproxy '*' --silent  --user ${USER}:${PASSWORD} -H X-Requested-By:MyClient -H Accept:application/json -H Content-Type:multipart/form-data -F "model={ name: '${APP_NAME}servlet', targets: [ { identity: [ clusters, '${DEPLOY_TARGET}' ] } ] }" -F "sourcePath=@${ARCHIVE_FILE_SERVLET}" -H "Prefer:respond-async" -X POST http://${HOST}:${PORT}/management/weblogic/latest/edit/appDeployments
+echo -e "curl --noproxy '*' --silent  --user ${USER}:${PASSWORD} -H X-Requested-By:MyClient -H Accept:application/json -H Content-Type:multipart/form-data -F \"model={ name: '${APP_NAME}servlet', targets: [ { identity: [ clusters, '${DEPLOY_TARGET}' ] } ] }\" -F \"sourcePath=@${ARCHIVE_FILE_SERVLET}\" -H \"Prefer:respond-async\" -X POST http://${HOST}:${PORT}/management/weblogic/latest/edit/appDeployments -o ${APP_DIR_INPOD}/deployWSServlet.out\n"
+curl --noproxy '*' --silent  --user ${USER}:${PASSWORD} -H X-Requested-By:MyClient -H Accept:application/json -H Content-Type:multipart/form-data -F "model={ name: '${APP_NAME}servlet', targets: [ { identity: [ clusters, '${DEPLOY_TARGET}' ] } ] }" -F "sourcePath=@${ARCHIVE_FILE_SERVLET}" -H "Prefer:respond-async" -X POST http://${HOST}:${PORT}/management/weblogic/latest/edit/appDeployments -o ${APP_DIR_INPOD}/deployWSServlet.out
+sleep 10
+grep -q "STATE_RUNNING" ${APP_DIR_INPOD}/deployWSServlet.out
+ cres=$?
+ [[ $cres != 0 ]] && echo "[FAIL] Unable to deploy wsclientapp ..."
+ [[ $cres == 0 ]] && echo "[SUCCESS] wsclientapp is deployed  ..."
+
 
 rm -rf ${APP_DIR_INPOD}/buildfiles