Add STB back to the tyepdef and created method to check rcu is required for create check

Author: jshum2479

core/src/main/java/oracle/weblogic/deploy/create/RCURunner.java

@@ -99,10 +99,10 @@ public RCURunner(String domainType, String oracleHome, String javaHome, String r
         this.rcuPrefix = validateNonEmptyString(rcuPrefix, "rcu_prefix");
         this.rcuSchemas = validateNonEmptyListOfStrings(rcuSchemas, "rcu_schema_list");
         this.rcuVariables = rcuVariables;
-        if (this.rcuSchemas.contains(SERVICE_TABLE_COMPONENT)) {
-            LOGGER.warning("WLSDPLY-12000", CLASS, domainType, SERVICE_TABLE_COMPONENT);
-            this.rcuSchemas.remove(SERVICE_TABLE_COMPONENT);
-        }
+//        if (this.rcuSchemas.contains(SERVICE_TABLE_COMPONENT)) {
+//            LOGGER.warning("WLSDPLY-12000", CLASS, domainType, SERVICE_TABLE_COMPONENT);
+//            this.rcuSchemas.remove(SERVICE_TABLE_COMPONENT);
+//        }
     }
 
     /**
@@ -152,10 +152,10 @@ public RCURunner(String domainType, String oracleHome, String javaHome, List<Str
         this.atpTemporaryTablespace = rcuProperties.get(new PyString("atp.temp.tablespace")).toString();
         this.rcuVariables = rcuVariables;
 
-        if (!this.rcuSchemas.contains(SERVICE_TABLE_COMPONENT)) {
-            LOGGER.warning("WLSDPLY-12000", CLASS, domainType, SERVICE_TABLE_COMPONENT);
-            this.rcuSchemas.add(SERVICE_TABLE_COMPONENT);
-        }
+//        if (!this.rcuSchemas.contains(SERVICE_TABLE_COMPONENT)) {
+//            LOGGER.warning("WLSDPLY-12000", CLASS, domainType, SERVICE_TABLE_COMPONENT);
+//            this.rcuSchemas.add(SERVICE_TABLE_COMPONENT);
+//        }
     }
 
 
@@ -274,8 +274,8 @@ private String[] getRcuDropArgs() {
             dropArgs.add(rcuSchema);
         }
         // Add STB to the drop list since it is never specified in the create list...
-        dropArgs.add(COMPONENT_SWITCH);
-        dropArgs.add(SERVICE_TABLE_COMPONENT);
+//        dropArgs.add(COMPONENT_SWITCH);
+//        dropArgs.add(SERVICE_TABLE_COMPONENT);
 
         dropArgs.add(READ_STDIN_SWITCH);
 

core/src/main/python/create.py

@@ -364,7 +364,7 @@ def validateRCUArgsAndModel(model_context, model):
                     tool_exit.end(model_context, CommandLineArgUtil.PROG_ERROR_EXIT_CODE)
 
     else:
-        if model_context.get_domain_type() not in ['WLS', 'RestrictedJRF']:
+        if model_context.get_domain_typedef().required_rcu():
             if not model_context.get_rcu_database() or not model_context.get_rcu_prefix():
                 __logger.severe('WLSDPLY-12408', model_context.get_domain_type(), CommandLineArgUtil.RCU_DB_SWITCH,
                             CommandLineArgUtil.RCU_PREFIX_SWITCH)

core/src/main/python/wlsdeploy/tool/create/domain_typedef.py

@@ -131,6 +131,15 @@ def get_rcu_schemas(self):
         # resolution for create.py argument processing.
         return list(self._domain_typedef['rcuSchemas'])
 
+    def required_rcu(self):
+        """
+        Test whether it requires RCU components.
+        :return: true if it requires rcu compoent
+        """
+        # No need to resolve the paths and we need this to work prior to
+        # resolution for create.py argument processing.
+        return 'rcuSchemas' in self._domain_typedef and len(self._domain_typedef['rcuSchemas']) > 0
+
     def is_system_app(self, name):
         """
         Determine if the specified name matches a WLS system application.

core/src/main/typedefs/JRF.json

@@ -32,7 +32,7 @@
                 "@@ORACLE_HOME@@/em/common/templates/wls/oracle.em_wls_template_12.1.2.jar"
             ],
             "serverGroupsToTarget" : [ "JRF-MAN-SVR", "WSMPM-MAN-SVR" ],
-            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS" ]
+            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB" ]
         },
         "JRF_1213" : {
             "baseTemplate": "@@WL_HOME@@/common/templates/wls/wls.jar",
@@ -43,7 +43,7 @@
                 "@@ORACLE_HOME@@/em/common/templates/wls/oracle.em_wls_template_12.1.3.jar"
             ],
             "serverGroupsToTarget" : [ "JRF-MAN-SVR", "WSMPM-MAN-SVR" ],
-            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS" ]
+            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB" ]
         },
         "JRF_12CR2": {
             "baseTemplate": "Basic WebLogic Server Domain",
@@ -53,7 +53,7 @@
                 "Oracle Enterprise Manager"
             ],
             "serverGroupsToTarget": [ "JRF-MAN-SVR", "WSMPM-MAN-SVR" ],
-            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS" ]
+            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB" ]
         },
         "JRF_12213": {
             "baseTemplate": "Basic WebLogic Server Domain",
@@ -63,7 +63,7 @@
                 "Oracle Enterprise Manager"
             ],
             "serverGroupsToTarget": [ "JRF-MAN-SVR", "WSMPM-MAN-SVR" ],
-            "rcuSchemas": [ "WLS", "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS" ]
+            "rcuSchemas": [ "WLS", "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB"]
         },
         "JRF_19CR1": {
             "baseTemplate": "Basic WebLogic Server Domain",
@@ -73,7 +73,7 @@
                 "Oracle Enterprise Manager"
             ],
             "serverGroupsToTarget": [ "JRF-MAN-SVR", "WSMPM-MAN-SVR" ],
-            "rcuSchemas": [ "WLS", "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS" ]
+            "rcuSchemas": [ "WLS", "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB"]
         }
     },
     "system-elements": {