Merge branch 'is_set_with_argument' into 'main'

Use isSet with isInConfig argument for upcoming WLS version

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

Author: robertpatrick

core/src/main/python/wlsdeploy/tool/discover/discoverer.py

@@ -240,14 +240,6 @@ def _uses_is_set(self, location, model_attribute):
         """
         return self._aliases.is_derived_default(location, model_attribute)
 
-    def _needs_is_set_revision(self, location, model_attribute):
-        """
-        Determine if the attribute value needs revision because it uses the unreliable version of isSet()
-        :param location: the location of the attribute to be examined
-        :param model_attribute: the model name of the attribute to be examined
-        """
-        return self._uses_is_set(location, model_attribute) and self._wlst_helper.is_unreliable_is_set()
-
     def _get_attribute_value_with_get(self, wlst_get_param, wlst_path):
         _method_name = '_get_attribute_value_with_get'
         _logger.finest('WLSDPLY-06104', wlst_get_param, class_name=_class_name, method_name=_method_name)

core/src/main/python/wlsdeploy/tool/discover/topology_discoverer.py

@@ -1029,7 +1029,8 @@ def _handle_inherited_default(self, model_name, model_value, location):
         """
         _method_name = '_handle_inherited_default'
         result = model_value
-        if self._needs_is_set_revision(location, model_name):
+        offline = self._wlst_mode == WlstModes.OFFLINE
+        if offline and self._weblogic_helper.are_offline_inherited_defaults_calculated():
             model_path = location.get_folder_path() + '/' + model_name
             domain_attribute = dictionary_utils.get_element(DOMAIN_INHERITED_DEFAULT_MAPPINGS, model_path)
             if domain_attribute is not None:

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

@@ -15,6 +15,7 @@
 from wlsdeploy.logging.platform_logger import PlatformLogger
 from wlsdeploy.tool.util.string_output_stream import StringOutputStream
 import wlsdeploy.util.unicode_helper as str_helper
+from wlsdeploy.util.weblogic_helper import WebLogicHelper
 
 wlst_functions = None
 
@@ -29,6 +30,7 @@ class WlstHelper(object):
 
     def __init__(self, exception_type):
         self.__exception_type = exception_type
+        self.wls_helper = WebLogicHelper(self.__logger)
 
     def get_online_server_version_data(self, username, password, url, timeout):
         """
@@ -164,19 +166,17 @@ def is_set(self, attribute):
         mbean_path = self.get_pwd()
 
         try:
-            if self.is_unreliable_is_set():
-                # put the value in the model; an att_handler may correct the value
-                result = True
-            elif self.__check_online_connection():
+            # if valid isSet method is not available, return True to include the attribute in the model.
+            # an att_handler may correct/remove the value after this point.
+            result = True
+
+            if self.__check_online_connection():
                 mbean = self.get_mbean(mbean_path)
-                # we may call for every attribute for online + local
-                if 'isSet' not in dir(mbean):
-                    return True
-                result = mbean.isSet(attribute)
-            else:
-                if not self.__has_global('isSet'):
-                    return True
-                result = self.__load_global('isSet')(attribute)
+                if 'isSet' in dir(mbean):
+                    result = mbean.isSet(attribute)
+            elif self.__uses_is_set_with_argument():
+                if self.__has_global('isSet'):
+                    result = self.__load_global('isSet')(attribute, isInConfig='true')
 
         except (self.__load_global('WLSTException'), offlineWLSTException), e:
             pwe = exception_helper.create_exception(self.__exception_type, 'WLSDPLY-00125', attribute,
@@ -192,15 +192,15 @@ def is_set(self, attribute):
         self.__logger.finest('WLSDPLY-00126', attribute, class_name=self.__class_name, method_name=_method_name)
         return result
 
-    def is_unreliable_is_set(self):
+    def __uses_is_set_with_argument(self):
         """
         Determine if this WLS version's implementation of the WLST isSet() method
-        is not reliable for deciding to include an attribute value.
-        Currently, all offline WLS versions that use isSet() (14.1.2+) are not reliable.
-        Future WLS versions may support a more reliable version of isSet().
-        :return: True if the implementation of isSet() is unreliable
+        uses the isInConfig argument for deciding to include an attribute value in the model.
+        Currently, offline WLS version 15.1.1 and above use this argument.
+        :return: True if the implementation of isSet() uses the isInConfig argument
         """
-        return not self.__check_online_connection()
+        offline = not self.__check_online_connection()
+        return offline and self.wls_helper.uses_offline_is_set_with_argument()
 
     def set_if_needed(self, wlst_name, wlst_value, masked=False):
         """

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

@@ -176,6 +176,21 @@ def is_secure_mode_implied_by_production_mode(self):
         """
         return self.is_weblogic_version_or_above('14.1.2')
 
+    def are_offline_inherited_defaults_calculated(self):
+        """
+        Determine if inherited default values need to be calculated.
+        This is needed for versions of WLS in which the isSet() method does not give a reliable result.
+        :return: true if version is within the range for this condition. false otherwise
+        """
+        return self.is_weblogic_version_or_above('14.1.2') and not self.uses_offline_is_set_with_argument()
+
+    def uses_offline_is_set_with_argument(self):
+        """
+        Does the offline WLST isSet() method use the argument isInConfig for consistent results?
+        :return: true if version is within the range for this condition. false otherwise
+        """
+        return self.is_weblogic_version_or_above('15.1.1')
+
     def get_jdbc_url_from_rcu_connect_string(self, rcu_connect_string, rcu_database_type='ORACLE'):
         """
         Get the JDBC URL from the RCU connect string.