Merge branch 'issue-#1506-check-jrf' into 'main'

Use typedef flag isJrfInstalled instead of examining templates

See merge request weblogic-cloud/weblogic-deploy-tooling!1526

Author: robertpatrick

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

@@ -574,7 +574,7 @@ def __extend_domain(self, domain_home):
             server_groups_to_target = self._domain_typedef.get_server_groups_to_target()
             self.target_helper.target_server_groups_to_servers(server_groups_to_target)
 
-        elif self._domain_typedef.is_jrf_domain_type() or \
+        elif self._domain_typedef.has_jrf_with_database_store() or \
                 (self._domain_typedef.get_targeting() == TargetingType.APPLY_JRF):
             # for 11g, if template list includes JRF, or if specified in domain typedef, use applyJRF
             self.target_helper.target_jrf_groups_to_clusters_servers()
@@ -693,26 +693,6 @@ def __extend_domain_with_select_template(self, domain_home):
 
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
 
-    def __set_server_groups(self):
-        _method_name = '__set_server_groups'
-        self.logger.entering(class_name=self.__class_name, method_name=_method_name)
-        if self.wls_helper.is_set_server_groups_supported():
-            # 12c versions set server groups directly
-            server_groups_to_target = self._domain_typedef.get_server_groups_to_target()
-            server_assigns, dynamic_assigns = \
-                self.target_helper.target_server_groups_to_servers(server_groups_to_target)
-            if len(server_assigns) > 0:
-                self.target_helper.target_server_groups(server_assigns)
-
-            if len(dynamic_assigns) > 0:
-                self.target_helper.target_server_groups_to_dynamic_clusters(dynamic_assigns)
-
-        elif self._domain_typedef.is_jrf_domain_type() or \
-                (self._domain_typedef.get_targeting() == TargetingType.APPLY_JRF):
-            # for 11g, if template list includes JRF, or if specified in domain typedef, use applyJRF
-            self.target_helper.target_jrf_groups_to_clusters_servers()
-        self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
-
     def __apply_base_domain_config(self, topology_folder_list, delete=True):
         """
         Apply the base domain configuration from the model topology section.
@@ -1602,7 +1582,7 @@ def __run_post_create_domain_script(self):
     def __configure_opss_secrets(self):
         _method_name = '__configure_opss_secrets'
 
-        if not self._domain_typedef.is_jrf_domain_type():
+        if not self._domain_typedef.has_jrf_with_database_store():
             return
 
         self.logger.entering(class_name=self.__class_name, method_name=_method_name)

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

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2023, Oracle Corporation and/or its affiliates.
+Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 import os
@@ -15,6 +15,7 @@
 from wlsdeploy.logging.platform_logger import PlatformLogger
 from wlsdeploy.tool.util.targeting_types import TargetingType
 from wlsdeploy.tool.util.topology_profiles import TopologyProfile
+from wlsdeploy.util import dictionary_utils
 from wlsdeploy.util import path_utils
 from wlsdeploy.util.exit_code import ExitCode
 from wlsdeploy.util.weblogic_helper import WebLogicHelper
@@ -162,31 +163,30 @@ def get_topology_profile(self):
         """
         return self._topology_profile
 
-    def is_jrf_domain_type(self):
+    def is_jrf_installed(self):
         """
-        Determine if this is a JRF domain type by checking for the JRF extension template or
-        JRF SVR GrOUP.
-        This returns False for the Restricted JRF domain type.
-        :return: True if the JRF template is present
+        Determine if this is domain type has JRF installed, based on a flag in the typedef file.
+        If this is not specified in the typedef file, the default is True.
+        :return: the value of the "isJrfInstalled" flag, or True if not specified
         """
-        if self.is_restricted_jrf_domain_type():
-            return False
-        for template in self.get_extension_templates():
-            if re.match(self.JRF_TEMPLATE_REGEX, template):
-                return True
-        if self.JRF_SERVER_GROUP in self.get_server_groups_to_target():
-            return True
-        return False
+        jrf_installed = dictionary_utils.get_element(self._domain_typedef, 'isJrfInstalled')
+        if jrf_installed is None:
+            jrf_installed = True
+        return jrf_installed
 
-    def is_restricted_jrf_domain_type(self):
+    def has_jrf_with_file_store(self):
         """
-        Determine if this domain type applies the Restricted JRF template.
-        :return: True if the Restricted JRF template is in the extension templates list
+        Determine if this domain type has JRF installed and uses a file store.
+        :return: True if the domain type has JRF installed and uses a file store, False otherwise
         """
-        for template in self.get_extension_templates():
-            if re.match(self.RESTRICTED_JRF_TEMPLATE_REGEX, template):
-                return True
-            return False
+        return self.is_jrf_installed() and not self.get_rcu_schemas()
+
+    def has_jrf_with_database_store(self):
+        """
+        Determine if this domain type has JRF installed and uses a database store.
+        :return: True if the domain type has JRF installed and uses a database store, False otherwise
+        """
+        return self.is_jrf_installed() and bool(self.get_rcu_schemas())
 
     def get_base_template(self):
         """

core/src/main/python/wlsdeploy/tool/deploy/odl_deployer.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2019, 2022, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2019, 2023, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 from java.io import File
@@ -66,7 +66,7 @@ def configure_odl(self, parent_dict, parent_location):
         odl_info = dictionary_utils.get_dictionary_element(parent_dict, ODL_CONFIGURATION)
         if len(odl_info):
             typedef = self.model_context.get_domain_typedef()
-            if not (typedef.is_jrf_domain_type() or typedef.is_restricted_jrf_domain_type()):
+            if not typedef.is_jrf_installed():
                 self.logger.info('WLSDPLY-19709', class_name=self.__class_name, method_name=_method_name)
             elif self.wlst_mode == WlstModes.ONLINE:
                 self.logger.info('WLSDPLY-19700', class_name=self.__class_name, method_name=_method_name)

core/src/main/python/wlsdeploy/tool/deploy/topology_updater.py

@@ -194,7 +194,7 @@ def set_server_groups(self):
                 self.target_helper.target_server_groups(server_assigns)
             if len(dynamic_assigns) > 0:
                 self.target_helper.target_dynamic_server_groups(dynamic_assigns)
-        elif self._domain_typedef.is_jrf_domain_type():
+        elif self._domain_typedef.has_jrf_with_database_store():
             self.target_helper.target_jrf_groups_to_clusters_servers()
 
     def _process_section(self, folder_dict, folder_list, key, location, delete_now=True):

core/src/main/python/wlsdeploy/tool/util/target_helper.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2022, Oracle Corporation and/or its affiliates.
+Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 
@@ -288,29 +288,14 @@ def target_dynamic_clusters(self, server_assigns):
                 ex = exception_helper.create_exception(self.exception_type, 'WLSDPLY-12256',
                                                        cluster, server_groups)
                 self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
-                raise ex 
+                raise ex
             elif len(server_groups) > 0:
                 self.logger.info('WLSDPLY-12255', server_groups[0], cluster_name,
                                  class_name=self.__class_name, method_name=_method_name)
                 self.wlst_helper.set_server_group_dynamic_cluster(cluster_name, server_groups[0])
 
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
 
-    def _target_jrf_resources(self, dynamic_cluster_assigns):
-        # Target the JRF resources directly using the applyJRF method.
-        _method_name = '_target_jrf_resources'
-        names_only = list()
-        for name in dynamic_cluster_assigns:
-            names_only.append(name)
-        if self.model_context.is_wlst_online() and \
-                self.model_context.get_domain_typedef().is_restricted_jrf_domain_type():
-            self.logger.warning('WLSDPLY-12244', str_helper.to_string(names_only), class_name=self.__class_name,
-                                _method_name=_method_name)
-        else:
-            self.logger.info('WLSDPLY-12236', str_helper.to_string(names_only),
-                             class_name=self.__class_name, method_name=_method_name)
-            self.wlst_helper.apply_jrf_with_context(names_only, self.model_context)
-
     def _get_existing_server_names(self):
         """
         Get the list of server names from WLST.

core/src/main/typedefs/JRF-Compact.json

@@ -1,5 +1,5 @@
 {
-    "copyright": "Copyright (c) 2022, 2023, Oracle Corporation and/or its affiliates.  All rights reserved.",
+    "copyright": "Copyright (c) 2022, 2023, Oracle and/or its affiliates.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "name": "JRF-Compact",
     "description": "JRF type domain with a compact profile definitions",
@@ -27,7 +27,8 @@
             ],
             "customExtensionTemplates": [ ],
             "serverGroupsToTarget": [ ],
-            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB", "WLS" ]
+            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB", "WLS" ],
+            "isJrfInstalled": true
         },
         "JRF_12CR2": {
             "baseTemplate": "Basic WebLogic Server Domain",
@@ -39,7 +40,8 @@
             ],
             "customExtensionTemplates": [ ],
             "serverGroupsToTarget": [ ],
-            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB", "WLS" ]
+            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB", "WLS" ],
+            "isJrfInstalled": true
         },
         "JRF_12CR2_LAST": {
             "baseTemplate": "Basic WebLogic Server Domain",
@@ -51,7 +53,8 @@
             ],
             "customExtensionTemplates": [ ],
             "serverGroupsToTarget": [ ],
-            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB", "WLS" ]
+            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB", "WLS" ],
+            "isJrfInstalled": true
         },
         "JRF_14": {
             "baseTemplate": "Basic WebLogic Server Domain",
@@ -63,7 +66,8 @@
             ],
             "customExtensionTemplates": [ ],
             "serverGroupsToTarget": [ ],
-            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB", "WLS" ]
+            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB", "WLS" ],
+            "isJrfInstalled": true
         }
     },
     "discover-filters": {

core/src/main/typedefs/JRF.json

@@ -1,5 +1,5 @@
 {
-    "copyright": "Copyright (c) 2017, 2023, Oracle Corporation and/or its affiliates.  All rights reserved.",
+    "copyright": "Copyright (c) 2017, 2023, Oracle and/or its affiliates.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "name": "JRF",
     "description": "JRF type domain definitions",
@@ -26,7 +26,8 @@
             ],
             "serverGroupsToTarget" : [ "JRF-MAN-SVR", "WSMPM-MAN-SVR" ],
             "customExtensionTemplates": [ ],
-            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS" ]
+            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS" ],
+            "isJrfInstalled": true
         },
         "JRF_1212" : {
             "baseTemplate": "@@WL_HOME@@/common/templates/wls/wls.jar",
@@ -38,7 +39,8 @@
             ],
             "customExtensionTemplates": [ ],
             "serverGroupsToTarget" : [ "JRF-MAN-SVR", "WSMPM-MAN-SVR" ],
-            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB" ]
+            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB" ],
+            "isJrfInstalled": true
         },
         "JRF_1213" : {
             "baseTemplate": "@@WL_HOME@@/common/templates/wls/wls.jar",
@@ -50,7 +52,8 @@
             ],
             "customExtensionTemplates": [ ],
             "serverGroupsToTarget" : [ "JRF-MAN-SVR", "WSMPM-MAN-SVR" ],
-            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB" ]
+            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB" ],
+            "isJrfInstalled": true
         },
         "JRF_12CR2_FIRST": {
             "baseTemplate": "Basic WebLogic Server Domain",
@@ -62,7 +65,8 @@
             ],
             "customExtensionTemplates": [ ],
             "serverGroupsToTarget": [ "JRF-MAN-SVR", "WSMPM-MAN-SVR" ],
-            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB", "WLS" ]
+            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB", "WLS" ],
+            "isJrfInstalled": true
         },
         "JRF_12CR2": {
             "baseTemplate": "Basic WebLogic Server Domain",
@@ -75,7 +79,8 @@
             "customExtensionTemplates": [ ],
             "serverGroupsToTarget": [ "JRF-MAN-SVR", "WSMPM-MAN-SVR" ],
             "dynamicClusterServerGroupsToTarget" : [ "WSMPM-DYN-CLUSTER" ],
-            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB", "WLS" ]
+            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB", "WLS" ],
+            "isJrfInstalled": true
         },
         "JRF_12CR2_LAST": {
             "baseTemplate": "Basic WebLogic Server Domain",
@@ -88,7 +93,8 @@
             "customExtensionTemplates": [ ],
             "serverGroupsToTarget": [ "JRF-MAN-SVR", "WSMPM-MAN-SVR" ],
             "dynamicClusterServerGroupsToTarget" : [ "WSMPM-DYN-CLUSTER", "WSM-CACHE-DYN-CLUSTER" ],
-            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB", "WLS" ]
+            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB", "WLS" ],
+            "isJrfInstalled": true
         },
         "JRF_14": {
             "baseTemplate": "Basic WebLogic Server Domain",
@@ -101,7 +107,8 @@
             "customExtensionTemplates": [ ],
             "serverGroupsToTarget": [ "JRF-MAN-SVR", "WSMPM-MAN-SVR" ],
             "dynamicClusterServerGroupsToTarget" : [ "WSMPM-DYN-CLUSTER", "WSM-CACHE-DYN-CLUSTER" ],
-            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB", "WLS" ]
+            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB", "WLS" ],
+            "isJrfInstalled": true
         }
     },
     "discover-filters": {

core/src/main/typedefs/RestrictedJRF.json

@@ -1,5 +1,5 @@
 {
-    "copyright": "Copyright (c) 2017, 2023, Oracle Corporation and/or its affiliates.  All rights reserved.",
+    "copyright": "Copyright (c) 2017, 2023, Oracle and/or its affiliates.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "name": "RestrictedJRF",
     "description": "Restricted JRF type domain definitions",
@@ -19,23 +19,26 @@
             "extensionTemplates": [ "Oracle Restricted JRF", "Oracle Enterprise Manager-Restricted JRF" ],
             "customExtensionTemplates": [ ],
             "serverGroupsToTarget": [ "JRF-MAN-SVR", "WSM-CACHE-SVR", "JRF-WS-CORE-MAN-SVR" ],
-            "rcuSchemas": [ ]
+            "rcuSchemas": [ ],
+            "isJrfInstalled": true
         },
         "RJRF_12CR2": {
             "baseTemplate": "Basic WebLogic Server Domain",
             "extensionTemplates": [ "Oracle Restricted JRF", "Oracle Enterprise Manager-Restricted JRF" ],
             "customExtensionTemplates": [ ],
             "serverGroupsToTarget": [ "JRF-MAN-SVR", "WSM-CACHE-SVR", "JRF-WS-CORE-MAN-SVR"] ,
             "dynamicClusterServerGroupsToTarget" : [ "WSM-CACHE-DYN-CLUSTER" ],
-            "rcuSchemas": [ ]
+            "rcuSchemas": [ ],
+            "isJrfInstalled": true
         },
         "RJRF_14": {
             "baseTemplate": "Basic WebLogic Server Domain",
             "extensionTemplates": [ "Oracle Restricted JRF", "Oracle Enterprise Manager-Restricted JRF" ],
             "customExtensionTemplates": [ ],
             "serverGroupsToTarget": [ "JRF-MAN-SVR", "WSM-CACHE-SVR", "JRF-WS-CORE-MAN-SVR" ],
             "dynamicClusterServerGroupsToTarget" : [ "WSM-CACHE-DYN-CLUSTER" ],
-            "rcuSchemas": [ ]
+            "rcuSchemas": [ ],
+            "isJrfInstalled": true
         }
 
     },

core/src/main/typedefs/WLS.json

@@ -1,5 +1,5 @@
 {
-    "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.",
+    "copyright": "Copyright (c) 2017, 2023, Oracle and/or its affiliates.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "name": "WLS",
     "description": "WLS type domain definitions",
@@ -19,28 +19,32 @@
             "extensionTemplates": [ ],
             "customExtensionTemplates": [ ],
             "serverGroupsToTarget": [ ],
-            "rcuSchemas": [ ]
+            "rcuSchemas": [ ],
+            "isJrfInstalled": false
         },
         "WLS_12CR1": {
             "baseTemplate": "@@WL_HOME@@/common/templates/wls/wls.jar",
             "extensionTemplates": [ ],
             "customExtensionTemplates": [ ],
             "serverGroupsToTarget": [ ],
-            "rcuSchemas": [ ]
+            "rcuSchemas": [ ],
+            "isJrfInstalled": false
         },
         "WLS_12CR2": {
             "baseTemplate": "Basic WebLogic Server Domain",
             "extensionTemplates": [ ],
             "customExtensionTemplates": [ ],
             "serverGroupsToTarget": [ ],
-            "rcuSchemas": [ ]
+            "rcuSchemas": [ ],
+            "isJrfInstalled": false
         },
         "WLS_14": {
             "baseTemplate": "Basic WebLogic Server Domain",
             "extensionTemplates": [ ],
             "customExtensionTemplates": [ ],
             "serverGroupsToTarget": [ ],
-            "rcuSchemas": [ ]
+            "rcuSchemas": [ ],
+            "isJrfInstalled": false
         }
     }
 }

pom.xml

@@ -114,7 +114,7 @@
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>2.14.0</version>
+                <version>2.15.0</version>
             </dependency>
             <dependency>
                 <groupId>info.picocli</groupId>