fix wldf scaling, domainUID's

Author: vanajamukkara

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

@@ -56,9 +56,6 @@ public class ITOperator extends BaseTest {
 
   private static Operator operator1, operator2;
 
-  private static Operator operatorForDel1;
-  private static Operator operatorForDel2;
-
   private static Operator operatorForBackwardCompatibility;
 
   private static boolean QUICKTEST;
@@ -199,7 +196,7 @@ public void testDomainOnPVUsingWDT() throws Exception {
     } finally {
       if (domain != null && (JENKINS || testCompletedSuccessfully)) {
         // domain.destroy();
-        TestUtils.verifyBeforeDeletion(domain);
+        // TestUtils.verifyBeforeDeletion(domain);
         logger.info("About to delete domain: " + domain.getDomainUid());
         TestUtils.deleteWeblogicDomainResources(domain.getDomainUid());
         TestUtils.verifyAfterDeletion(domain);
@@ -235,7 +232,10 @@ public void testTwoDomainsManagedByTwoOperators() throws Exception {
     Domain domain1 = null, domain2 = null;
     boolean testCompletedSuccessfully = false;
     try {
-      domain1 = TestUtils.createDomain(domainOnPVUsingWLSTYamlFile);
+      // load input yaml to map and add configOverrides
+      Map<String, Object> wlstDomainMap = TestUtils.loadYaml(domainOnPVUsingWLSTYamlFile);
+      wlstDomainMap.put("domainUID", "domain1onpvwlst");
+      domain1 = TestUtils.createDomain(wlstDomainMap);
       domain1.verifyDomainCreated();
       testBasicUseCases(domain1);
       logger.info("Checking if operator2 is running, if not creating");
@@ -246,6 +246,7 @@ public void testTwoDomainsManagedByTwoOperators() throws Exception {
       // ToDo: configured cluster support is removed from samples, modify the test to create
       // configured cluster
       Map<String, Object> wdtDomainMap = TestUtils.loadYaml(domainOnPVUsingWDTYamlFile);
+      wdtDomainMap.put("domainUID", "domain2onpvwdt");
       // wdtDomainMap.put("clusterType", "Configured");
       domain2 = TestUtils.createDomain(wdtDomainMap);
       domain2.verifyDomainCreated();
@@ -418,6 +419,7 @@ public void testAutoAndCustomSitConfigOverrides() throws Exception {
       // load input yaml to map and add configOverrides
       Map<String, Object> domainMap = TestUtils.loadYaml(domainOnPVUsingWLSTYamlFile);
       domainMap.put("configOverrides", "sitconfigcm");
+      domainMap.put("domainUID", "customsitdomain");
 
       // use NFS for this domain on Jenkins, defaultis HOST_PATH
       if (System.getenv("JENKINS") != null && System.getenv("JENKINS").equalsIgnoreCase("true")) {

integration-tests/src/test/resources/domain-home-on-pv/customsitconfig/config.xml

@@ -3,7 +3,7 @@
     <name>admin-server</name>
     <network-access-point>
       <name>T3Channel</name>
-      <public-address f:combine-mode="replace">${secret:domainonpvwlst-t3publicaddress.hostname}</public-address>
+      <public-address f:combine-mode="replace">${secret:customsitdomain-t3publicaddress.hostname}</public-address>
     </network-access-point>
   </server>
   </domain>

integration-tests/src/test/resources/wldf/wldf.py

@@ -38,15 +38,15 @@
 scriptAct = wn1.createScriptAction('ScriptActionScaleUp')
 scriptAct.setEnabled(true)
 scriptAct.setTimeout(0)
-scriptAct.setWorkingDirectory('/shared/domains/domain3/bin/scripts/')
-scriptAct.setPathToScript('/shared/domains/domain3/bin/scripts/scalingAction.sh')
+scriptAct.setWorkingDirectory('/shared/domains/domainonpvwdt/bin/scripts/')
+scriptAct.setPathToScript('/shared/domains/domainonpvwdt/bin/scripts/scalingAction.sh')
 props = Properties()
 props.setProperty("INTERNAL_OPERATOR_CERT",  operator_cert_data);
 #props.setProperty("KUBERNETES_SERVICE_HOST", k8s_master_host);
 #props.setProperty("KUBERNETES_SERVICE_PORT", k8s_master_port);
 scriptAct.setEnvironment(props)
 
-params=['--action=scaleUp', '--domain_uid=domain3', '--cluster_name=cluster-1', '--wls_domain_namespace=test1', '--operator_namespace=weblogic-operator1']
+params=['--action=scaleUp', '--domain_uid=domainonpvwdt', '--cluster_name=cluster-1', '--wls_domain_namespace=test2', '--operator_namespace=weblogic-operator2']
 k8s_master_url='--kubernetes_master=%s' %(k8s_master)
 params.append(k8s_master_url)
 scriptAct.setParameters(params)