Merge branch 'filter-fixes' into 'main'

Move static cluster server port checks to final filter

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

Author: robertpatrick

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

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2024, Oracle and/or its affiliates.
+Copyright (c) 2017, 2025, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 import imp
@@ -11,6 +11,7 @@
 from wlsdeploy.tool.util.filters import wko_final_filter
 from wlsdeploy.util import dictionary_utils
 from wlsdeploy.util import path_helper
+from wlsdeploy.util import target_configuration
 from wlsdeploy.util.model_translator import FileToPython
 import wlsdeploy.util.unicode_helper as str_helper
 
@@ -65,7 +66,8 @@ def apply_filters(model, tool_type, model_context):
         if model_context and model_context.get_target():
             __filter_file_location = model_context.get_target_configuration_file()
             filters_dictionary = model_context.get_target_configuration().get_model_filters()
-            target_path = _path_helper.local_join('targets', model_context.get_target())
+            target_key = target_configuration.get_target_configuration_key(model_context.get_target())
+            target_path = _path_helper.local_join('targets', target_key)
 
             # Fix the tokenized path in the filter path
             for filter_list in filters_dictionary:

core/src/main/python/wlsdeploy/tool/util/filters/wko_filter.py

@@ -18,7 +18,6 @@
 from wlsdeploy.aliases.model_constants import CLUSTER_MESSAGING_MODE
 from wlsdeploy.aliases.model_constants import DATABASE_LESS_LEASING_BASIS
 from wlsdeploy.aliases.model_constants import DYNAMIC_SERVERS
-from wlsdeploy.aliases.model_constants import LISTEN_PORT
 from wlsdeploy.aliases.model_constants import MACHINE
 from wlsdeploy.aliases.model_constants import MIGRATION_BASIS
 from wlsdeploy.aliases.model_constants import NM_PROPERTIES
@@ -45,7 +44,6 @@
 from wlsdeploy.logging.platform_logger import PlatformLogger
 from wlsdeploy.tool.util.filters.model_traverse import ModelTraverse
 from wlsdeploy.util import dictionary_utils
-import wlsdeploy.util.unicode_helper as str_helper
 
 _class_name = 'wko_filter'
 _logger = PlatformLogger('wlsdeploy.tool.util')
@@ -99,7 +97,6 @@ def filter_online_attributes(model, model_context):
 def check_clustered_server_ports(model, _model_context):
     """
     Set the CalculatedListenPorts attribute to false for dynamic clusters in the specified model.
-    Warn if servers in a static cluster have different ports in the specified model.
     :param model: the model to be filtered
     :param _model_context: unused, passed by filter_helper if called independently
     """
@@ -119,32 +116,6 @@ def check_clustered_server_ports(model, _model_context):
                              method_name=_method_name)
                 dynamic_folder[CALCULATED_LISTEN_PORTS] = PyRealBoolean(False)
 
-    # be sure every server assigned to a cluster has the same listen port
-
-    server_port_map = {}
-    servers_folder = dictionary_utils.get_dictionary_element(topology_folder, SERVER)
-    for server_name, server_fields in servers_folder.items():
-        server_cluster = dictionary_utils.get_element(server_fields, CLUSTER)
-        server_port = dictionary_utils.get_element(server_fields, LISTEN_PORT)
-
-        if server_cluster and (server_port is not None):
-            server_port_text = str_helper.to_string(server_port)
-            if '@@' in server_port_text:
-                # prepareModel filters the model before and after it is tokenized,
-                # so disregard variable values in the tokenized pass
-                continue
-
-            if server_cluster in server_port_map:
-                cluster_info = server_port_map[server_cluster]
-                first_server = cluster_info["firstServer"]
-                cluster_port = cluster_info["serverPort"]
-                if server_port_text != cluster_port:
-                    _logger.warning('WLSDPLY-20203', SERVER, first_server, server_name, CLUSTER, server_cluster,
-                                    LISTEN_PORT, cluster_port, server_port_text, class_name=_class_name,
-                                    method_name=_method_name)
-            else:
-                server_port_map[server_cluster] = {"firstServer": server_name, "serverPort": server_port_text}
-
 
 def filter_domain_info(_model, _model_context):
     """
@@ -192,7 +163,7 @@ def filter_topology(model, _model_context):
     server_templates = dictionary_utils.get_dictionary_element(topology, SERVER_TEMPLATE)
     for key in server_templates:
         server_template = server_templates[key]
-        auto_migration_enabled = server_template[AUTO_MIGRATION_ENABLED]
+        auto_migration_enabled = dictionary_utils.get_element(server_template, AUTO_MIGRATION_ENABLED)
         if auto_migration_enabled is None or alias_utils.convert_boolean(auto_migration_enabled):
             server_template[AUTO_MIGRATION_ENABLED] = PyRealBoolean(False)
         for delete_key in [MACHINE, SERVER_START]:

core/src/main/python/wlsdeploy/tool/util/filters/wko_final_filter.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
 # ------------
@@ -8,17 +8,20 @@
 # These filters are applied to a merged, substituted model.
 # They apply any updates to a specified update model, to support use cases with multiple models.
 # These operations can be invoked as a single call, or independently of each other.
+
 from oracle.weblogic.deploy.util import PyOrderedDict
 
 from wlsdeploy.aliases.model_constants import ADMIN_SERVER_NAME
 from wlsdeploy.aliases.model_constants import CLUSTER
 from wlsdeploy.aliases.model_constants import DEFAULT_ADMIN_SERVER_NAME
 from wlsdeploy.aliases.model_constants import DYNAMIC_SERVERS
+from wlsdeploy.aliases.model_constants import LISTEN_PORT
 from wlsdeploy.aliases.model_constants import SERVER
 from wlsdeploy.aliases.model_constants import SERVER_NAME_PREFIX
 from wlsdeploy.aliases.model_constants import TOPOLOGY
 from wlsdeploy.logging.platform_logger import PlatformLogger
 from wlsdeploy.util import dictionary_utils
+from wlsdeploy.util import unicode_helper as str_helper
 
 _class_name = 'wko_final_filter'
 _logger = PlatformLogger('wlsdeploy.tool.util')
@@ -27,13 +30,14 @@
 def filter_final_model(model, update_model, model_context):
     """
     Perform the following operations on the specified model:
-    - Remove any online-only attributes
     - Check if dynamic cluster prefixes are specified and unique
+    - Check if servers in each static cluster have matching port numbers
     :param model: the model to be filtered
     :param update_model: the model to be updated with any changes
     :param model_context: used by nested filters
     """
     check_dynamic_cluster_prefixes(model, update_model, model_context)
+    check_static_cluster_server_ports(model, update_model, model_context)
 
 
 def filter_final_model_for_wko(model, update_model, model_context):
@@ -107,6 +111,42 @@ def check_dynamic_cluster_prefixes(model, update_model, _model_context):
             server_name_prefixes.append(server_name_prefix)
 
 
+def check_static_cluster_server_ports(model, _update_model, _model_context):
+    """
+    Warn if servers in a static cluster have different ports in the specified model.
+    :param model: the model to be checked
+    :param _update_model: unused, passed by filter_helper if called independently
+    :param _model_context: unused, passed by filter_helper if called independently
+    """
+    _method_name = 'check_static_cluster_server_ports'
+
+    server_port_map = {}
+    topology_folder = dictionary_utils.get_dictionary_element(model, TOPOLOGY)
+    servers_folder = dictionary_utils.get_dictionary_element(topology_folder, SERVER)
+    for server_name, server_fields in servers_folder.items():
+        server_cluster = dictionary_utils.get_element(server_fields, CLUSTER)
+        server_port = dictionary_utils.get_element(server_fields, LISTEN_PORT)
+
+        if server_cluster and (server_port is not None):
+            server_port_text = str_helper.to_string(server_port)
+            if '@@' in server_port_text:
+                # prepareModel filters the model before and after it is tokenized,
+                # so disregard variable values in the tokenized pass
+                continue
+
+            if server_cluster in server_port_map:
+                cluster_info = server_port_map[server_cluster]
+                first_server = cluster_info["firstServer"]
+                cluster_port = cluster_info["serverPort"]
+                if server_port_text != cluster_port:
+                    # issue a warning - we won't try to fix this
+                    _logger.warning('WLSDPLY-20203', SERVER, first_server, server_name, CLUSTER,
+                                    server_cluster, LISTEN_PORT, cluster_port, server_port_text,
+                                    class_name=_class_name, method_name=_method_name)
+            else:
+                server_port_map[server_cluster] = {"firstServer": server_name, "serverPort": server_port_text}
+
+
 def check_admin_server_defined(model, update_model, _model_context):
     """
     Ensure that the AdminServerName attribute is set, and that the server is defined.