Merge branch 'jira-wdt-929-attribute-messages' into 'main'

Reduce visibility of messages for unrecognized attributes

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

Author: robertpatrick

core/src/main/python/discover.py

@@ -15,7 +15,9 @@
 from java.lang import System
 from java.util import HashSet
 from oracle.weblogic.deploy.aliases import AliasException
+from oracle.weblogic.deploy.aliases import VersionUtils
 from oracle.weblogic.deploy.discover import DiscoverException
+from oracle.weblogic.deploy.exception import ExceptionHelper
 from oracle.weblogic.deploy.json import JsonException
 from oracle.weblogic.deploy.util import FileUtils
 from oracle.weblogic.deploy.util import PyOrderedDict
@@ -790,6 +792,23 @@ def __check_and_customize_model(model, model_context, aliases, credential_inject
     __logger.exiting(_class_name, _method_name)
     return model
 
+def __compare_wls_versions(model_context):
+    """
+    Compare the local and remote WLS versions, and log a notification if they are different.
+    No message will be logged for offline discovery, because there is no remote version.
+    """
+    _method_name = '__compare_wls_versions'
+    local_wls_version = model_context.get_local_wls_version()
+    remote_wls_version = model_context.get_remote_wls_version()
+    if remote_wls_version and local_wls_version != remote_wls_version:
+        if VersionUtils.compareVersions(local_wls_version, remote_wls_version) > 0:
+            message_key = 'WLSDPLY-06066'
+        else:
+            message_key = 'WLSDPLY-06067'
+        message_start = ExceptionHelper.getMessage(message_key, [local_wls_version, remote_wls_version])
+        __logger.notification(
+            'WLSDPLY-06068', message_start, class_name=_class_name, method_name=_method_name)
+
 def __fix_discovered_template_datasource(model, model_context):
     # fix the case for discovering template datasources.
     # If all the template datasources use the dame passwords then generate the RUCDbInfo section
@@ -1037,6 +1056,8 @@ def main(model_context):
                 password_key = 'WLSDPLY-06024'
         __logger.info(password_key, class_name=_class_name, method_name=_method_name)
 
+        __compare_wls_versions(model_context)
+
         extra_tokens = {}
         try:
             model = __discover(model_context, aliases, credential_injector, helper, extra_tokens)

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

@@ -328,7 +328,8 @@ def _get_model_name_and_value(self, location, wlst_name, wlst_value, wlst_path):
                 _logger.fine('WLSDPLY-06166', wlst_name, wlst_path,
                              class_name=_class_name, method_name=_method_name)
             else:
-                _logger.info('WLSDPLY-06106', wlst_name, wlst_path, de.getLocalizedMessage(),
+                # reduced this from info to fine to avoid excess output with WLS PSU mismatch
+                _logger.fine('WLSDPLY-06106', wlst_name, wlst_path, de.getLocalizedMessage(),
                              class_name=_class_name, method_name=_method_name)
 
         return  model_name, model_value

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

@@ -822,6 +822,9 @@ WLSDPLY-06062=Failed to read OPSS wallet passphrase: {0}
 WLSDPLY-06063=User failed to provide the required OPSS wallet passphrase
 WLSDPLY-06064={0} invoked with {1} argument but that argument is only valid in online mode.
 WLSDPLY-06065={0} invoked with both {1} and {2} arguments, which are mutually exclusive.
+WLSDPLY-06066=Local WebLogic version {0} is more recent than remote version {1}.
+WLSDPLY-06067=Local WebLogic version {0} is older than remote version {1}.
+WLSDPLY-06068={0} This may cause some attributes to be omitted from the discovered model.
 
 # discoverer.py
 WLSDPLY-06100=Find attributes at location {0}