Merge branch 'master' into WDT-334-attributes-not-in-lsa-map-not-discovered

Author: CarolynRountree

core/src/main/python/create.py

@@ -404,7 +404,10 @@ def main(args):
             __logger.severe('WLSDPLY-20008', _program_name, ex.getLocalizedMessage(), error=ex,
                             class_name=_class_name, method_name=_method_name)
         __clean_up_temp_files()
-        tool_exit.end(None, exit_code)
+
+        # create a minimal model for summary logging
+        model_context = ModelContext(_program_name, dict())
+        tool_exit.end(model_context, exit_code)
 
     model_file = model_context.get_model_file()
     try:

core/src/main/python/deploy.py

@@ -446,7 +446,10 @@ def main(args):
             __logger.severe('WLSDPLY-20008', _program_name, ex.getLocalizedMessage(), error=ex,
                             class_name=_class_name, method_name=_method_name)
         __clean_up_temp_files()
-        tool_exit.end(None, exit_code)
+
+        # create a minimal model for summary logging
+        model_context = ModelContext(_program_name, dict())
+        tool_exit.end(model_context, exit_code)
 
     model_file = model_context.get_model_file()
     try:

core/src/main/python/discover.py

@@ -489,7 +489,10 @@ def main(args):
         if exit_code != CommandLineArgUtil.HELP_EXIT_CODE:
             __logger.severe('WLSDPLY-20008', _program_name, ex.getLocalizedMessage(), error=ex,
                             class_name=_class_name, method_name=_method_name)
-        __log_and_exit(None, exit_code, _class_name, _method_name)
+
+        # create a minimal model for summary logging
+        model_context = ModelContext(_program_name, dict())
+        __log_and_exit(model_context, exit_code, _class_name, _method_name)
 
     try:
         __clear_archive_file(model_context)

core/src/main/python/update.py

@@ -465,7 +465,10 @@ def main(args):
             __logger.severe('WLSDPLY-20008', _program_name, ex.getLocalizedMessage(), error=ex,
                             class_name=_class_name, method_name=_method_name)
         __clean_up_temp_files()
-        tool_exit.end(None, exit_code)
+
+        # create a minimal model for summary logging
+        model_context = ModelContext(_program_name, dict())
+        tool_exit.end(model_context, exit_code)
 
     model_file = model_context.get_model_file()
     try:

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

@@ -76,6 +76,7 @@
 from wlsdeploy.tool.util.archive_helper import ArchiveHelper
 from wlsdeploy.tool.util.library_helper import LibraryHelper
 from wlsdeploy.tool.util.target_helper import TargetHelper
+from wlsdeploy.tool.util.targeting_types import TargetingType
 from wlsdeploy.tool.util.topology_helper import TopologyHelper
 from wlsdeploy.util import dictionary_utils
 from wlsdeploy.util import model as model_helper
@@ -416,12 +417,18 @@ def __extend_domain(self, domain_home):
         self.__configure_fmw_infra_database()
 
         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()
             self.target_helper.target_server_groups_to_servers(server_groups_to_target)
             self.wlst_helper.update_domain()
-        elif self._domain_typedef.is_jrf_domain_type():
+
+        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(domain_home)
+
         else:
+            # for 11g, if no targeting was needed, just update the domain
             self.wlst_helper.update_domain()
 
         self.wlst_helper.close_domain()

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

@@ -12,6 +12,7 @@
 from wlsdeploy.exception import exception_helper
 from wlsdeploy.json.json_translator import JsonToPython
 from wlsdeploy.logging.platform_logger import PlatformLogger
+from wlsdeploy.tool.util.targeting_types import TargetingType
 from wlsdeploy.util.cla_utils import CommandLineArgUtil
 from wlsdeploy.util.weblogic_helper import WebLogicHelper
 
@@ -70,6 +71,8 @@ def __init__(self, program_name, domain_type):
         self._model_context = None
         self._version_typedef_name = None
 
+        self._targeting_type = self._resolve_targeting_type()
+
         if 'system-elements' in self._domain_typedefs_dict:
             self._system_elements = self._domain_typedefs_dict['system-elements']
         else:
@@ -185,6 +188,13 @@ def required_rcu(self):
         # resolution for create.py argument processing.
         return 'rcuSchemas' in self._domain_typedef and len(self._domain_typedef['rcuSchemas']) > 0
 
+    def get_targeting(self):
+        """
+        Get the targeting type for the domain, or None if not specified.
+        :return: the TargetingType enum value for the domain, or None
+        """
+        return self._targeting_type
+
     def is_system_app(self, name):
         """
         Determine if the specified name matches a WLS system application.
@@ -409,3 +419,32 @@ def __match_version_typedef(self, versions_dict):
                 raise ex
         self._logger.exiting(self.__class_name, _method_name, result)
         return result
+
+    def _resolve_targeting_type(self):
+        """
+        Determine the targeting type based on the value in the definition.
+        Check for problems or incompatibilities.
+        :return: the matching TargetType enum value
+        :raises: ClaException: if there are problems or incompatibilities
+        """
+        _method_name = '_resolve_targeting_type'
+
+        if 'targeting' not in self._domain_typedef:
+            return None
+
+        targeting_text = self._domain_typedef['targeting']
+
+        # there are no valid targeting types for version 12c and up
+        if self.wls_helper.is_set_server_groups_supported():
+            ex = exception_helper.create_cla_exception('WLSDPLY-12311', targeting_text, 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, targeting must be one of the known types
+        if targeting_text not in TargetingType:
+            ex = exception_helper.create_cla_exception('WLSDPLY-12312', targeting_text, self._domain_typedef_filename)
+            self._logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
+            raise ex
+
+        return TargetingType[targeting_text]

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

@@ -0,0 +1,9 @@
+"""
+Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+The Universal Permissive License (UPL), Version 1.0
+"""
+from wlsdeploy.util.enum import Enum
+
+TargetingType = Enum([
+    'APPLY_JRF'
+])

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

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 The Universal Permissive License (UPL), Version 1.0
 """
 from oracle.weblogic.deploy.exception import ExceptionHelper
@@ -30,6 +30,12 @@ def __str__(self):
     def __iter__(self):
         return self
 
+    def __contains__(self, name):
+        return name in self.enum_list
+
+    def __getitem__(self, name):
+        return self.enum_list.index(name)
+
     def next(self):
         if self.current < len(self.enum_list):
             result = self.enum_list[self.current]

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

@@ -1096,6 +1096,8 @@ WLSDPLY-12308=Domain type {0} type definition in file {1} contained version {2}
   matches WebLogic version {3}
 WLSDPLY-12309=Domain type {0} type definition in file {1} did not contain a version that matched WebLogic version {2}
 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
 
 # create.py
 WLSDPLY-12400={0} got the JAVA_HOME {1} from the environment variable but it was not a valid location: {2}

core/src/main/resources/templates/WebLogicDeployToolingVersion.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * The Universal Permissive License (UPL), Version 1.0
  */
 package oracle.weblogic.deploy.util;
@@ -65,7 +65,7 @@ public static String getFullVersion() {
      * @param programName - the name of the WebLogic Deploy Tooling program that is running
      */
     public static void logVersionInfo(String programName) {
-        LOGGER.config("WLSDPLY-01750", programName, getFullVersion());
+        LOGGER.info("WLSDPLY-01750", programName, getFullVersion());
     }
 
     /**