adding support for specifying the topology profile in the typedef files

Author: robertpatrick

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

@@ -90,6 +90,7 @@
 from wlsdeploy.tool.util.rcu_helper import RCUHelper
 from wlsdeploy.tool.util.target_helper import TargetHelper
 from wlsdeploy.tool.util.targeting_types import TargetingType
+from wlsdeploy.tool.util.topology_profiles import TopologyProfile
 from wlsdeploy.tool.util.topology_helper import TopologyHelper
 from wlsdeploy.util import dictionary_utils
 from wlsdeploy.util import model
@@ -508,6 +509,12 @@ def __create_base_domain_with_select_template(self, domain_home):
         _method_name = '__create_base_domain_with_select_template'
 
         self.logger.entering(domain_home, class_name=self.__class_name, method_name=_method_name)
+
+        topology_profile = self._domain_typedef.get_topology_profile()
+        if topology_profile in TopologyProfile:
+            self.logger.info('WLSDPLY-12569', topology_profile, class_name=self.__class_name, method_name=_method_name)
+            self.wlst_helper.set_topology_profile(topology_profile)
+
         base_template = self._domain_typedef.get_base_template()
         self.logger.info('WLSDPLY-12210', base_template,
                          class_name=self.__class_name, method_name=_method_name)

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

@@ -13,6 +13,7 @@
 from wlsdeploy.json.json_translator import JsonToPython
 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 path_utils
 from wlsdeploy.util.cla_utils import CommandLineArgUtil
 from wlsdeploy.util.weblogic_helper import WebLogicHelper
@@ -81,6 +82,8 @@ def __init__(self, program_name, domain_type):
         else:
             self._system_elements = {}
 
+        self._topology_profile = self._resolve_topology_profile()
+
         return
 
     def set_model_context(self, model_context):
@@ -101,6 +104,13 @@ def get_domain_type(self):
         """
         return self._domain_type
 
+    def get_topology_profile(self):
+        """
+        Get the topology profile for the domain type, if any.
+        :return: the topology profile or None if no topology profile is specified
+        """
+        return self._topology_profile
+
     def has_jrf_resources(self):
         """
         Determine if the domain type has domain resources from either the JRF or Restricted JRF templates.
@@ -474,3 +484,31 @@ def _resolve_targeting_type(self):
             raise ex
 
         return TargetingType[targeting_text]
+
+    def _resolve_topology_profile(self):
+        """
+        Determine the topology profile based on the value in the typedef file.
+
+        :return: the matching topology profile enum value
+        :raises: ClaException: if there are problems or incompatibilities
+        """
+        _method_name = '_resolve_topology_profile'
+
+        if 'topologyProfile' not in self._domain_typedefs_dict:
+            return None
+        topology_profile = self._domain_typedefs_dict['topologyProfile'];
+
+        # there are no valid topology profiles for versions 12.1.x and below
+        if not self.wls_helper.is_topology_profile_supported():
+            ex = exception_helper.create_cla_exception('WLSDPLY-12314', topology_profile, self._domain_typedef_filename,
+                                                       self.wls_helper.get_weblogic_version())
+            self._logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
+            raise ex
+
+        # if specified, toppology profile must be one of the known types
+        if topology_profile not in TopologyProfile:
+            ex = exception_helper.create_cla_exception('WLSDPLY-12315', topology_profile, self._domain_typedef_filename)
+            self._logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
+            raise ex
+
+        return topology_profile

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

@@ -0,0 +1,10 @@
+"""
+Copyright (c) 2022, Oracle Corporation and/or its affiliates.
+Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+"""
+from wlsdeploy.util.enum import Enum
+
+TopologyProfile = Enum([
+    'Compact',
+    'Expanded'
+])

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

@@ -692,6 +692,24 @@ def load_templates(self):
             raise pwe
         self.__logger.exiting(class_name=self.__class_name, method_name=_method_name)
 
+    def set_topology_profile(self, profile):
+        """
+        Set the desired topology profile defined in the domain extension template.
+        :param profile: the profile to use
+        :raises: Exception for the specified tool type: if a WLST error occurs
+        """
+        _method_name = 'set-topology_profile'
+
+        self.__logger.entering(profile, class_name=self.__class_name, method_name=_method_name)
+        try:
+            self.__load_global('setTopologyProfile')(profile)
+        except offlineWLSTException, e:
+            pwe = exception_helper.create_exception(self.__exception_type, 'WLSDPLY-00128', profile,
+                                                    e.getLocalizedMessage(), error=e)
+            self.__logger.throwing(class_name=self.__class_name, method_name=_method_name, error=pwe)
+            raise pwe
+        self.__logger.exiting(class_name=self.__class_name, method_name=_method_name)
+
     def read_domain(self, domain_home):
         """
         Read the domain indicated by the domain_home name in offline mode.

core/src/main/python/wlsdeploy/util/weblogic_helper.py

@@ -117,6 +117,13 @@ def is_dynamic_cluster_server_groups_supported(self):
         """
         return self.is_weblogic_version_or_above('12.2.1.4')
 
+    def is_topology_profile_supported(self):
+        """
+        Is topology profile supported in domain extension templates?
+        :return: true if version is within the range supporting topology profiles, false otherwise
+        """
+        return self.is_weblogic_version_or_above('12.2.1')
+
     def get_jdbc_url_from_rcu_connect_string(self, rcu_connect_string):
         """
         Get the JDBC URL from the RCU connect string.

core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties

@@ -110,7 +110,7 @@ WLSDPLY-00124=Entering is_set({0}) method
 WLSDPLY-00125=is_set({0}) in {1} mode failed: {2}
 WLSDPLY-00126=Exiting is_set({0}) method
 WLSDPLY-00127=Unable to load the DomainRuntimeService from the WLST globals : {0}
-
+WLSDPLY-00128=setTopologyProfile({0}) failed: {1}
 
 ###############################################################################
 #                      Util messages (1000 - 3999)                            #
@@ -1330,6 +1330,7 @@ WLSDPLY-12565=The archive file was not provided so there are no custom files to
 WLSDPLY-12566=Installing {0} user custom files to domain home {1}
 WLSDPLY-12567=The archive file {0} contains no user custom files to install
 WLSDPLY-12568=Creating empty folder {0}. Folder contains no attributes or sub-folders.
+WLSDPLY-12569=Setting the topology profile to {0}
 
 # domain_typedef.py
 WLSDPLY-12300={0} got the domain type {1} but the domain type definition file {2} was not valid: {3}
@@ -1348,6 +1349,8 @@ WLSDPLY-12310=Version {0} returned from the domain home
 WLSDPLY-12311=Targeting type "{0}" in type definition file {1} is not allowed for WebLogic version {2}
 WLSDPLY-12312=Targeting type "{0}" in type definition file {1} is not valid
 WLSDPLY-12313=Domain type {0} is not supported for WebLogic version {1}
+WLSDDPL-12314=Topology profile "{0}" is typedef file {1} is not allowed for WebLogic version {2}
+WLSDPLY-12315=Topology profile "{0}" in type definition file {1} is not a known topology profile value
 
 # create.py
 WLSDPLY-12400={0} got the JAVA_HOME {1} from the environment variable but it was not a valid location: {2}