removed sleep calls, corrected Readme

Author: marinakog

integration-tests/README.md

@@ -77,8 +77,8 @@ Basic Use Cases described above are verified in all the domain configurations. A
 | Two Operators using same External Https Port | create chart using same https rest port as already running first operator, verify that deployment fails with expected error |
 | Two Operators using same target domains namespace | create chart using target domains namespace as already running first operator, verify that deployment fails with expected error |
 | Operator Helm Chart using not preexisted target domains namespace | create chart using not preexisted target domains namespace as already running first operator, verify that deployment fails with expected error |
-| Operator Helm Chart add/delete target domains namespace ( domain1, domain2) | create chart , use upgrade to add/remove target domains ( domain1,domain2), verify that operator is able to manage added domain (domain2, not able to access the deleted one(domain1) |
-| Operator Helm Chart delete operator helm chart, leave domain running | create operator chart and start domain, delete operator, verify domain is still functional |
+| Operator Helm Chart add/delete target domain namespaces (domain1, domain2) | create operator helm chart managing domain1, use upgrade to add domain2. Verify that operator is able to manage added domain (domain2). Use helm upgrade to remove domain1, verify that operator not able to manage anymore the deleted one(domain1) |
+| Operator Helm Chart delete operator helm chart, leave domain running | create operator helm chart and start domain1, delete operator helm chart, verify domain1 is still functional |
 
 
 # Directory Configuration and Structure

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

@@ -21,6 +21,8 @@ public class ITUsabilityOperatorHelmChart extends BaseTest {
 
   private static int number = 3;
   String oprelease = "op" + number;
+  private int waitTime = 5;
+  private int maxIterations = 60;
 
   /**
    * This method gets called only once before any of the test methods are executed. It does the
@@ -609,24 +611,16 @@ public void testAddRemoveDomainUpdateOperatorHC() throws Exception {
       ArrayList<String> targetDomainsNS =
           (ArrayList<String>) (operator.getOperatorMap().get("domainNamespaces"));
       targetDomainsNS.add("test" + (number + 1));
-      upgradeVerifyOperatorDomainNamespaces(operator, targetDomainsNS);
+      upgradeOperatorDomainNamespaces(operator, targetDomainsNS);
       domainnew = createVerifyDomain(number + 1, operator);
       logger.info("verify that old domain is managed by operator after upgrade");
-      operator.verifyDomainExists(domain.getDomainUid());
+      verifyOperatorDomainManagement(operator, domain, true);
       logger.info("Upgrade to remove first domain");
       targetDomainsNS.remove("test" + (number));
-      upgradeVerifyOperatorDomainNamespaces(operator, targetDomainsNS);
-      Thread.sleep(60 * 1000);
+      upgradeOperatorDomainNamespaces(operator, targetDomainsNS);
       logger.info("verify that old domain is not managed by operator");
-      operator.verifyDomainExists(domain.getDomainUid());
-      throw new RuntimeException(
-          "FAILURE: After Helm Upgrade for the domainNamespaces operator still able to manage old namespace ");
-    } catch (Exception ex) {
-      if (!ex.getMessage()
-          .contains("Response {\"status\":404,\"detail\":\"/operator/latest/domains/test" + number))
-        throw new RuntimeException(
-            "FAILURE: Exception does not report the expected error message " + ex.getMessage());
-
+      verifyOperatorDomainManagement(operator, domain, false);
+      verifyOperatorDomainManagement(operator, domainnew, true);
       testCompletedSuccessfully = true;
     } finally {
       if (domain != null && !SMOKETEST && (JENKINS || testCompletedSuccessfully))
@@ -639,7 +633,6 @@ public void testAddRemoveDomainUpdateOperatorHC() throws Exception {
       }
       number++;
     }
-
     logger.info("SUCCESS - " + testMethodName);
   }
   /**
@@ -666,7 +659,6 @@ public void testDeleteOperatorButNotDomain() throws Exception {
       logger.info("Deleting operator to check that domain functionality is not effected");
       operator.destroy();
       operator = null;
-      Thread.sleep(60 * 1000);
       domain.testWlsLivenessProbe();
       testCompletedSuccessfully = true;
     } finally {
@@ -682,6 +674,39 @@ public void testDeleteOperatorButNotDomain() throws Exception {
     logger.info("SUCCESS - " + testMethodName);
   }
 
+  private void verifyOperatorDomainManagement(
+      Operator operator, Domain domain, boolean isAccessible) throws Exception {
+    for (int i = 0; i < maxIterations; i++) {
+
+      try {
+        operator.verifyDomainExists(domain.getDomainUid());
+        if (!isAccessible) {
+          throw new RuntimeException("FAILURE: Operator still able to manage old namespace ");
+        } else {
+          break;
+        }
+      } catch (Exception ex) {
+        if (!isAccessible) {
+          if (!ex.getMessage()
+              .contains(
+                  "Response {\"status\":404,\"detail\":\"/operator/latest/domains/test" + number)) {
+
+          } else {
+            break;
+          }
+        }
+      }
+      if (i == maxIterations - 1) {
+        String errorMsg = "FAILURE: Operator can't access the domain " + domain.getDomainUid();
+        if (!isAccessible)
+          errorMsg = "FAILURE: Operator still can access the domain " + domain.getDomainUid();
+        throw new RuntimeException(errorMsg);
+      }
+      logger.info("iteration " + i + " of " + maxIterations);
+      Thread.sleep(waitTime * 1000);
+    }
+  }
+
   private Domain createVerifyDomain(int number, Operator operator) throws Exception {
     logger.info("create domain with UID : test" + number);
     Domain domain = TestUtils.createDomain(TestUtils.createDomainMap(number));
@@ -693,7 +718,7 @@ private Domain createVerifyDomain(int number, Operator operator) throws Exceptio
     return domain;
   }
 
-  private void upgradeVerifyOperatorDomainNamespaces(
+  private void upgradeOperatorDomainNamespaces(
       Operator operator, ArrayList<String> targetNamespaces) throws Exception {
     logger.info("update operator with new target domain");
     String upgradeSet =

src/integration-tests/apps/webservices/META-INF/application.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/javaee"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_6.xsd"
+             version="6">
+
+</application>

src/integration-tests/apps/webservices/web/WEB-INF/web.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+         version="3.1">
+</web-app>