fixed previous merge of create-weblogic-domain.sh. fixed unit test in CreateDomainGeneratedFilesBaseTest to reflect changes for moving files to configMap

Author: alai8

kubernetes/internal/create-weblogic-domain.sh

@@ -414,6 +414,7 @@ function createYamlFiles {
   sed -i -e "s:%T3_CHANNEL_PORT%:${t3ChannelPort}:g" ${jobOutput}
   sed -i -e "s:%T3_PUBLIC_ADDRESS%:${t3PublicAddress}:g" ${jobOutput}
   sed -i -e "s:%CLUSTER_NAME%:${clusterName}:g" ${jobOutput}
+  sed -i -e "s:%CLUSTER_TYPE%:${clusterType}:g" ${jobOutput}
 
   # Generate the yaml to create the domain custom resource
   echo Generating ${dcrOutput}
@@ -440,6 +441,7 @@ function createYamlFiles {
   sed -i -e "s:%INITIAL_MANAGED_SERVER_REPLICAS%:${initialManagedServerReplicas}:g" ${dcrOutput}
   sed -i -e "s:%EXPOSE_T3_CHANNEL_PREFIX%:${exposeAdminT3ChannelPrefix}:g" ${dcrOutput}
   sed -i -e "s:%CLUSTER_NAME%:${clusterName}:g" ${dcrOutput}
+  sed -i -e "s:%CLUSTER_TYPE%:${clusterType}:g" ${dcrOutput}
   sed -i -e "s:%EXPOSE_ADMIN_PORT_PREFIX%:${exposeAdminNodePortPrefix}:g" ${dcrOutput}
   sed -i -e "s:%ADMIN_NODE_PORT%:${adminNodePort}:g" ${dcrOutput}
   sed -i -e "s:%JAVA_OPTIONS%:${javaOptions}:g" ${dcrOutput}

src/test/java/oracle/kubernetes/operator/create/CreateDomainGeneratedFilesBaseTest.java

@@ -189,7 +189,7 @@ protected V1Job getExpectedCreateWeblogicDomainJob() {
                     .secretName(getInputs().getWeblogicCredentialsSecretName()))))));
   }
 
-  //@Test TODO- INVESTIGATE!
+  @Test
   public void generatesCorrect_createWeblogicDomainConfigMap() throws Exception {
     // The config map contains several properties that contain shell and wlst scripts
     // that we don't want to duplicate in the test.  However, part of their text
@@ -261,27 +261,24 @@ protected void assertThatActualReadDomainSecretPyIsCorrect(String actualReadDoma
   protected void assertThatActualCreateDomainScriptShIsCorrect(String actualCreateDomainScriptSh) {
     /*
       create-domain-script.sh: |-
+        #!/bin/bash
+        #
+
+        # Include common utility functions
+        source /u01/weblogic/utility.sh
+
         export DOMAIN_HOME=${SHARED_PATH}/domain/%DOMAIN_NAME%
-            echo "AdminURL=http\://$3\:%ADMIN_PORT%" >> ${startProp}
-        nmConnect(admin_username, admin_password, '$1-$2',  '5556', '%DOMAIN_NAME%', '${DOMAIN_HOME}', 'plain')
-          nmConnect(admin_username, admin_password, '$1-$2',  '5556', '%DOMAIN_NAME%', '${DOMAIN_HOME}', 'plain')
-        createNodeMgrHome %DOMAIN_UID% %ADMIN_SERVER_NAME%
-        createStartScript %DOMAIN_UID% %ADMIN_SERVER_NAME%
-        createStopScript  %DOMAIN_UID% %ADMIN_SERVER_NAME%
-        while [ $index -lt %NUMBER_OF_MS% ]
-          createNodeMgrHome %DOMAIN_UID% %MANAGED_SERVER_NAME_BASE%${index} %DOMAIN_UID%-%ADMIN_SERVER_NAME%
-          createStartScript %DOMAIN_UID% %MANAGED_SERVER_NAME_BASE%${index}
-          createStopScript  %DOMAIN_UID% %MANAGED_SERVER_NAME_BASE%${index}
+
+        # Create the domain
+        wlst.sh -skipWLSModuleScanning /u01/weblogic/create-domain.py
+
+        echo "Successfully Completed"
     */
     assertThat(
       actualCreateDomainScriptSh,
       containsRegexps(
-        getInputs().getDomainUID(),
         getInputs().getDomainName(),
-        getInputs().getAdminServerName(),
-        getInputs().getManagedServerNameBase(),
-        getInputs().getDomainUID() + "-" + getInputs().getAdminServerName(),
-        "index -lt " + getInputs().getConfiguredManagedServerCount()));
+        "wlst.sh -skipWLSModuleScanning /u01/weblogic/create-domain.py"));
   }
 
   protected void assertThatActualCreateDomainPyIsCorrect(String actualCreateDomainPy) {
@@ -324,6 +321,7 @@ protected void assertThatActualCreateDomainPyIsCorrect(String actualCreateDomain
       containsRegexps(
         getInputs().getDomainName(),
         getInputs().getClusterName(),
+        getInputs().getClusterType(),
         getInputs().getAdminServerName(),
         getInputs().getManagedServerNameBase(),
         getInputs().getDomainUID() + "-" + getInputs().getAdminServerName(),