revise the code to supply only fragment of domain yaml file with added property

Author: maggiehe00

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

@@ -194,161 +194,108 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
   /**
    * Modify/Add the containerSecurityContext section at ServerPod Level using kubectl apply -f
    * cont.security.context.domain.yaml. Verify all the pods re-started. The property tested is:
-   * serverPod: containerSecurityContext: runAsUser: 1000 fsGroup: 2000
+   * serverPod: containerSecurityContext: runAsUser: 1000 fsGroup: 1000.
    *
-   * @throws Exception
+   * @throws Exception - assertion fails due to unmatched value or errors occurred if tested servers
+   *     are not restarted or after restart the server yaml file doesn't include the new added
+   *     property
    */
   @Test
   public void testServerPodsRestartByChangingContSecurityContext() throws Exception {
     Assume.assumeFalse(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
 
+    // firstly ensure that original domain.yaml doesn't include the property-to-be-added
+    String domainFileName =
+        BaseTest.getUserProjectsDir() + "/weblogic-domains/" + domainUid + "/domain.yaml";
+    boolean result = TestUtils.checkFileIncludeProperty("fsGroup: 1000", domainFileName);
+    Assert.assertFalse(result);
+
     // domainYaml: the yaml file name with changed property under resources dir
     String domainYaml = "cont.security.context.domain.yaml";
-    try {
-      logger.info(
-          "About to testDomainServerPodRestart for Domain: "
-              + domain.getDomainUid()
-              + " change container securityContext:\n"
-              + "   runAsUser: 1000\n"
-              + "   fsGroup: 2000 ");
-      domain.testDomainServerPodRestart(domainYaml);
-      domain.findServerPropertyChange("runAsUser: 1000", "admin-server");
-      domain.findServerPropertyChange("runAsUser: 1000", "managed-server1");
-    } finally {
-      // bring back the domain into previous state
-      restoreDomain();
-    }
+    logger.info(
+        "About to testDomainServerPodRestart for Domain: "
+            + domain.getDomainUid()
+            + " change container securityContext:\n"
+            + " runAsUser: 1000\n"
+            + " fsGroup: 1000 ");
+    domain.testDomainServerPodRestart(domainYaml);
+    domain.findServerPropertyChange("securityContext", "admin-server");
+    domain.findServerPropertyChange("securityContext", "managed-server1");
 
     logger.info("SUCCESS - " + testMethodName);
   }
 
   /**
    * Modify/Add the podSecurityContext section at ServerPod level using kubectl apply -f
    * pod.security.context.domain.yaml. Verify all the pods re-started. The property tested is:
-   * podSecurityContext: runAsUser: 1000 fsGroup: 2000
+   * podSecurityContext: runAsUser: 1000 fsGroup: 2000.
    *
-   * @throws Exception
+   * @throws Exception - assertion fails due to unmatched value or errors occurred if tested servers
+   *     are not restarted or after restart the server yaml file doesn't include the new added
+   *     property
    */
   @Test
   public void testServerPodsRestartByChangingPodSecurityContext() throws Exception {
     Assume.assumeFalse(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
 
+    // firstly ensure that original domain.yaml doesn't include the property-to-be-added
+    String domainFileName =
+        BaseTest.getUserProjectsDir() + "/weblogic-domains/" + domainUid + "/domain.yaml";
+    boolean result = TestUtils.checkFileIncludeProperty("fsGroup: 2000", domainFileName);
+    Assert.assertFalse(result);
+
     // domainYaml: the yaml file name with changed property under resources dir
     String domainYaml = "pod.security.context.domain.yaml";
-    try {
-      logger.info(
-          "About to testDomainServerPodRestart for Domain: "
-              + domain.getDomainUid()
-              + " change securityContext:\n"
-              + "   runAsUser: 1000\n"
-              + "   fsGroup: 2000 ");
-      domain.testDomainServerPodRestart(domainYaml);
-      domain.findServerPropertyChange("fsGroup: 2000", "admin-server");
-      domain.findServerPropertyChange("fsGroup: 2000", "managed-server1");
-    } finally {
-      // bring back the domain into previous State
-      restoreDomain();
-    }
 
-    logger.info("SUCCESS - " + testMethodName);
-  }
-
-  /**
-   * Modify/Add imagePullSecrets section at Domain Level using kubectl apply -f secret.domain.yaml.
-   * Verify all pods re-started. The property tested is: imagePullSecrets:- name: imagePullSecr
-   * value: myImagePullSecret
-   *
-   * @throws Exception
-   */
-  @Test
-  public void testServerPodsRestartByChangingImagePullSecrets() throws Exception {
-    Assume.assumeFalse(QUICKTEST);
-    String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
-    logTestBegin(testMethodName);
-
-    // domainYaml: the yaml file name with changed property under resources dir
-    String domainYaml = "secret.domain.yaml";
-    try {
-      logger.info(
-          "About to testDomainServerPodRestart for Domain: "
-              + domain.getDomainUid()
-              + " change imagePullSecrets:\n"
-              + "   name: imagePullSecret\n"
-              + "   value: myImagePullSecret ");
-      domain.testDomainServerPodRestart(domainYaml);
-      domain.findServerPropertyChange("myImagePullSecret", "admin-server");
-      domain.findServerPropertyChange("myImagePullSecret", "managed-server1");
-    } finally {
-      // bring back the domain into previous state
-      restoreDomain();
-    }
+    logger.info(
+        "About to testDomainServerPodRestart for Domain: "
+            + domain.getDomainUid()
+            + " change securityContext:\n"
+            + "   runAsUser: 1000\n"
+            + "   fsGroup: 2000 ");
+    domain.testDomainServerPodRestart(domainYaml);
+    domain.findServerPropertyChange("fsGroup: 2000", "admin-server");
+    domain.findServerPropertyChange("fsGroup: 2000", "managed-server1");
 
     logger.info("SUCCESS - " + testMethodName);
   }
 
   /**
-   * Modify/Add resources at ServerPod level using kubectl apply -f resource.domain.yaml. Verify all
-   * pods re-started. The property tested is: resources: limits: cpu: "1" requests: cpu: "0.5" args:
-   * - -cpus - "2"
+   * Modify/Add resources at ServerPod level using kubectl apply -f domain.yaml. Verify all pods
+   * re-started. The property tested is: resources: limits: cpu: "1" requests: cpu: "0.5" args: -
+   * -cpus - "2".
    *
-   * @throws Exception
+   * @throws Exception - assertion fails due to unmatched value or errors occurred if tested servers
+   *     are not restarted or after restart the server yaml file doesn't include the new added
+   *     property
    */
   @Test
   public void testServerPodsRestartByChangingResource() throws Exception {
     Assume.assumeFalse(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
 
-    // domainYaml: the yaml file name with changed property under resources dir
-    String domainYaml = "resource.domain.yaml";
-    try {
-      logger.info(
-          "About to testDomainServerPodRestart for Domain: "
-              + domain.getDomainUid()
-              + " change resource:\n"
-              + "   cpu: 500m");
-      domain.testDomainServerPodRestart(domainYaml);
-      domain.findServerPropertyChange("cpu: 500m", "admin-server");
-      domain.findServerPropertyChange("cpu: 500m", "managed-server1");
-    } finally {
-      // bring back the domain into previous state
-      restoreDomain();
-    }
-
-    logger.info("SUCCESS - " + testMethodName);
-  }
-
-  /**
-   * Modify the annotations at ServerPod level using kubectl apply -f annotation.domain.yaml. Verify
-   * all pods re-started. The property tested is: annotations: "TSTAMP" --> "DATETIME"
-   *
-   * @throws Exception
-   */
-  @Test
-  public void testServerPodsRestartByChangingAnnotation() throws Exception {
-    Assume.assumeFalse(QUICKTEST);
-    String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
-    logTestBegin(testMethodName);
+    // firstly ensure that original domain.yaml doesn't include the property-to-be-addeded
+    String domainFileName =
+        BaseTest.getUserProjectsDir() + "/weblogic-domains/" + domainUid + "/domain.yaml";
+    boolean result = TestUtils.checkFileIncludeProperty("cpu: 500m", domainFileName);
+    Assert.assertFalse(result);
 
     // domainYaml: the yaml file name with changed property under resources dir
-    String domainYaml = "annotation.domain.yaml";
-    try {
-      logger.info(
-          "About to testDomainServerPodRestart for Domain: "
-              + domain.getDomainUid()
-              + " change annotation"
-              + "   annotations:\n"
-              + "     custom: \"DATETIME\"");
-      domain.testDomainServerPodRestart(domainYaml);
+    String domainYaml = "resource.domain.yaml";
 
-    } finally {
-      // bring back the domain into previous state
-      restoreDomain();
-    }
+    logger.info(
+        "About to testDomainServerPodRestart for Domain: "
+            + domain.getDomainUid()
+            + " change resource:\n"
+            + "   cpu: 500m");
+    domain.testDomainServerPodRestart(domainYaml);
+    domain.findServerPropertyChange("cpu: 500m", "admin-server");
+    domain.findServerPropertyChange("cpu: 500m", "managed-server1");
 
     logger.info("SUCCESS - " + testMethodName);
   }
@@ -373,12 +320,4 @@ private static void destroyPodsRestartdomain() throws Exception {
       domain.destroy();
     }
   }
-
-  private static void restoreDomain() throws Exception {
-    String yamlFile =
-        BaseTest.getUserProjectsDir() + "/weblogic-domains/" + domainUid + "/domain.yaml";
-    TestUtils.kubectlapply(yamlFile);
-    domain.verifyAdminServerRestarted();
-    domain.verifyManagedServersRestarted();
-  }
 }

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

@@ -981,23 +981,42 @@ public void findServerPropertyChange(String changedProperty, String serverName)
   }
 
   /**
-   * verify domain server pods get restarted after the property change by kubectl apply -f
-   * newDomainYamlfileWithChangedProperty
+   * verify domain server pods get restarted after the property change by kubectl apply -f new
+   * domain yaml file with added/changed property
    *
-   * @param fileNameWithChangedProperty
-   * @throws Exception
+   * @param fileNameWithChangedProperty - the fragment of domain yaml file with new added property
+   *     change
+   * @throws Exception - IOException when file is copied or errors occurred if the tested server is
+   *     not restarted
    */
   public void testDomainServerPodRestart(String fileNameWithChangedProperty) throws Exception {
     logger.info("Inside testDomainServerPodRestart domainYamlWithChangedProperty");
 
-    // kubectl apply the supplied domain yaml file under resources dir with changed property
-    String yamlDir = BaseTest.getProjectRoot() + "/integration-tests/src/test/resources/";
-    TestUtils.kubectlapply(yamlDir + fileNameWithChangedProperty);
+    // copy the original domain.yaml to domain_new.yaml
+    TestUtils.copyFile(
+        BaseTest.getUserProjectsDir() + "/weblogic-domains/" + domainUid + "/domain.yaml",
+        BaseTest.getUserProjectsDir() + "/weblogic-domains/" + domainUid + "/domain_new.yaml");
+
+    // append the file with changed property to the end of domain_new.yaml
+    TestUtils.concatFile(
+        BaseTest.getProjectRoot()
+            + "/integration-tests/src/test/resources/"
+            + fileNameWithChangedProperty,
+        BaseTest.getUserProjectsDir() + "/weblogic-domains/" + domainUid + "/domain_new.yaml");
+
+    // kubectl apply the new constructed domain_new.yaml
+    TestUtils.kubectlapply(
+        BaseTest.getUserProjectsDir() + "/weblogic-domains/" + domainUid + "/domain_new.yaml");
 
     // verify the servers in the domain are being restarted in a sequence
     verifyAdminServerRestarted();
     verifyManagedServersRestarted();
 
+    // make domain.yaml include the new changed property
+    TestUtils.copyFile(
+        BaseTest.getUserProjectsDir() + "/weblogic-domains/" + domainUid + "/domain_new.yaml",
+        BaseTest.getUserProjectsDir() + "/weblogic-domains/" + domainUid + "/domain.yaml");
+
     logger.info("Done - testDomainServerPodRestart with domainYamlWithChangedProperty");
   }
 

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

@@ -9,6 +9,7 @@
 import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
+import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -1202,4 +1203,53 @@ public static void copyFile(String fromFile, String toFile) throws Exception {
     logger.info("Copying file from  " + fromFile + " to " + toFile);
     Files.copy(new File(fromFile).toPath(), Paths.get(toFile), StandardCopyOption.REPLACE_EXISTING);
   }
+
+  /**
+   * append source file to the end of target file
+   *
+   * @param sourceFile - source file name
+   * @param targetFile - target file name
+   * @throws Exception
+   */
+  public static void concatFile(String sourceFile, String targetFile) throws Exception {
+    FileReader fr = null;
+    FileWriter fw = null;
+    try {
+      fr = new FileReader(sourceFile);
+      fw = new FileWriter(targetFile, true);
+      int c = fr.read();
+      while (c != -1) {
+        fw.write(c);
+        c = fr.read();
+      }
+    } catch (IOException e) {
+      e.printStackTrace();
+    } finally {
+      if (fr != null) {
+        fr.close();
+      }
+      if (fw != null) {
+        fw.close();
+      }
+    }
+  }
+
+  /**
+   * check whether a certain property(String)is included in the file
+   *
+   * @param property
+   * @param fileName
+   * @return result of above checking
+   */
+  public static boolean checkFileIncludeProperty(String property, String fileName) {
+    boolean result = false;
+    try {
+      String content = new String(Files.readAllBytes(Paths.get(fileName)));
+      result = content.indexOf(property) >= 0;
+      logger.info("the result for checkFileIncludeProperty " + fileName + " result: " + result);
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+    return result;
+  }
 }