initial cut for sharing PV across domains

Author: maggiehe00

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

@@ -45,6 +45,7 @@ public class BaseTest {
   public static final String DOMAIN_SAMPLE_DEFAULTS_YAML = "domainsampledefaults.yaml";
   public static final String DOMAININIMAGE_WLST_YAML = "domaininimagewlst.yaml";
   public static final String DOMAININIMAGE_WDT_YAML = "domaininimagewdt.yaml";
+  public static final String DOMAINONSHARINGPV_WLST_YAML = "domainonsharingpvwlst.yaml";
 
   // property file used to configure constants for integration tests
   public static final String APP_PROPS_FILE = "OperatorIT.properties";

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

@@ -229,6 +229,87 @@ public void testTwoDomainsManagedByTwoOperators() throws Exception {
     }
     logger.info("SUCCESS - " + testMethodName);
   }
+
+  /**
+   * Create one operator if it is not running. Create domain domain1 and domain2 dynamic cluster in
+   * default namespace, managed by operator. Both domains sharre one PV. Verify scaling for domain2
+   * cluster from 2 to 3 servers and back to 2, plus verify no impact on domain1. Cycle domain1 down
+   * and back up, plus verify no impact on domain2. shutdown by the domains using the delete
+   * resource script from samples.
+   *
+   * <p>ToDo: configured cluster support is removed from samples, modify the test to create
+   *
+   * @throws Exception
+   */
+  @Test
+  public void testTwoDomainsManagedByOneOperatorSharingPV() throws Exception {
+    Assume.assumeFalse(QUICKTEST);
+    String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
+    logTestBegin(testMethodName);
+    logger.info("Creating Domain domain1 & verifing the domain creation");
+
+    logger.info("Checking if operator1 and domain1 are running, if not creating");
+    if (operator1 == null) {
+      operator1 = TestUtils.createOperator(OPERATOR1_YAML);
+    }
+
+    Domain domain1 = null, domain2 = null;
+    boolean testCompletedSuccessfully = false;
+    try {
+      // load input yaml to map and add configOverrides
+      Map<String, Object> domain1Map = TestUtils.loadYaml(DOMAINONSHARINGPV_WLST_YAML);
+      domain1Map.put("domainUID", "d1onpv");
+      domain1Map.put("adminNodePort", new Integer("30711"));
+      domain1Map.put("t3ChannelPort", new Integer("30011"));
+      domain1Map.put("voyagerWebPort", new Integer("30388"));
+      domain1 = TestUtils.createDomain(domain1Map);
+      domain1.verifyDomainCreated();
+      testBasicUseCases(domain1);
+
+      Map<String, Object> domain2Map = TestUtils.loadYaml(DOMAINONSHARINGPV_WLST_YAML);
+      domain2Map.put("domainUID", "d2onpv");
+      domain2Map.put("adminNodePort", new Integer("30712"));
+      domain2Map.put("t3ChannelPort", new Integer("30021"));
+      // wdtDomainMap.put("clusterType", "Configured");
+      domain2Map.put("voyagerWebPort", new Integer("30399"));
+      domain2 = TestUtils.createDomain(domain2Map);
+      domain2.verifyDomainCreated();
+      testBasicUseCases(domain2);
+      logger.info("Verify the only remaining running domain domain1 is unaffected");
+      domain1.verifyDomainCreated();
+
+      testClusterScaling(operator1, domain2);
+
+      logger.info("Verify the only remaining running domain domain1 is unaffected");
+      domain1.verifyDomainCreated();
+
+      logger.info("Destroy and create domain1 and verify no impact on domain2");
+      domain1.destroy();
+      domain1.create();
+
+      logger.info("Verify no impact on domain2");
+      domain2.verifyDomainCreated();
+      testCompletedSuccessfully = true;
+
+    } finally {
+      String domainUidsToBeDeleted = "";
+
+      if (domain1 != null && (JENKINS || testCompletedSuccessfully)) {
+        domainUidsToBeDeleted = domain1.getDomainUid();
+      }
+      if (domain2 != null && (JENKINS || testCompletedSuccessfully)) {
+        domainUidsToBeDeleted = domainUidsToBeDeleted + "," + domain2.getDomainUid();
+      }
+      if (!domainUidsToBeDeleted.equals("")) {
+        logger.info("About to delete domains: " + domainUidsToBeDeleted);
+        TestUtils.deleteWeblogicDomainResources(domainUidsToBeDeleted);
+        TestUtils.verifyAfterDeletion(domain1);
+        TestUtils.verifyAfterDeletion(domain2);
+      }
+    }
+    logger.info("SUCCESS - " + testMethodName);
+  }
+
   /**
    * Create operator if its not running and create domain with serverStartPolicy="ADMIN_ONLY".
    * Verify only admin server is created. shutdown by deleting domain CRD. Create domain on existing

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

@@ -63,6 +63,7 @@ public class Domain {
   protected String userProjectsDir = "";
   private String projectRoot = "";
   private boolean ingressPerDomain = true;
+  private boolean pvSharing = false;
   private String imageTag;
   private String imageName;
 
@@ -873,10 +874,12 @@ protected void createPV() throws Exception {
                     + "/samples/scripts/create-weblogic-domain-pv-pvc/create-pv-pvc-inputs.yaml"));
     pvMap = yaml.load(pv_is);
     pv_is.close();
-    pvMap.put("domainUID", domainUid);
 
-    // each domain uses its own pv for now
-    if (domainUid != null)
+    logger.info("pvSharing for this domain is: " + pvSharing);
+    if (!pvSharing) pvMap.put("domainUID", domainUid);
+
+    // Now there is only one pvSharing test case and we just use"baseName" as PVC
+    if ((domainUid != null) && !pvSharing)
       domainMap.put("persistentVolumeClaimName", domainUid + "-" + pvMap.get("baseName") + "-pvc");
     else domainMap.put("persistentVolumeClaimName", pvMap.get("baseName") + "-pvc");
 
@@ -1473,6 +1476,10 @@ protected void initialize(Map<String, Object> inputDomainMap) throws Exception {
     clusterName = (String) domainMap.get("clusterName");
     clusterType = (String) domainMap.getOrDefault("clusterType", "DYNAMIC");
     serverStartPolicy = ((String) domainMap.get("serverStartPolicy")).trim();
+    if (domainMap.containsKey("pvSharing")) {
+      pvSharing = ((Boolean) domainMap.get("pvSharing")).booleanValue();
+    }
+    logger.info("pvSharing for this domain is: " + pvSharing);
 
     if (exposeAdminT3Channel) {
       domainMap.put("t3PublicAddress", TestUtils.getHostName());

integration-tests/src/test/resources/domainonsharingpvwlst.yaml

@@ -0,0 +1,21 @@
+# Copyright 2018, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+
+# This domain inputs file is used to create 2 domain with same namespace, same pv using wlst option and traefik load balancer.
+
+adminServerName: admin-server
+domainUID: domainonpvwlst
+clusterName: cluster-1
+configuredManagedServerCount: 4
+initialManagedServerReplicas: 2
+managedServerNameBase: managed-server
+#weblogicDomainStoragePath will be ignored, PV dir will be created at /<baseDir>/<USER>/acceptance_test_pv
+#weblogicDomainStoragePath: /scratch/external-domain-home/pv001/
+pvSharing: true
+exposeAdminT3Channel: true
+exposeAdminNodePort: true
+namespace: default
+loadBalancer: TRAEFIK
+ingressPerDomain: true
+createDomainPyScript: integration-tests/src/test/resources/domain-home-on-pv/create-domain-custom-nap.py
+voyagerWebPort: 30305