In wko_filter, check for servers with different listen ports in the same cluster

Author: rakillen

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

@@ -95,7 +95,7 @@ def _apply_filter(model, the_filter, model_context, filter_file_location):
     path = dictionary_utils.get_element(the_filter, 'path')
     if path is not None:
         name = dictionary_utils.get_element(the_filter, 'name')
-        __logger.info('WLSDPLY-20035', name, class_name=__class_name, method_name=_method_name)
+        __logger.info('WLSDPLY-20033', name, class_name=__class_name, method_name=_method_name)
         return _apply_path_filter(model, path)
 
     __logger.severe('WLSDPLY-20019', str(filter_file_location), class_name=__class_name, method_name=_method_name)

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

@@ -11,6 +11,8 @@
 from wlsdeploy.aliases.model_constants import CALCULATED_LISTEN_PORTS
 from wlsdeploy.aliases.model_constants import CLUSTER
 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 TOPOLOGY
 from wlsdeploy.aliases.validation_codes import ValidationCodes
 from wlsdeploy.aliases.wlst_modes import WlstModes
@@ -64,10 +66,36 @@ def check_clustered_server_ports(model, model_context):
         if dynamic_folder:
             calculated_listen_ports = dynamic_folder[CALCULATED_LISTEN_PORTS]
             if (calculated_listen_ports is None) or alias_utils.convert_boolean(calculated_listen_ports):
-                _logger.info('WLSDPLY-20036', CALCULATED_LISTEN_PORTS, cluster_name, class_name=_class_name,
+                _logger.info('WLSDPLY-20202', CALCULATED_LISTEN_PORTS, CLUSTER, cluster_name, class_name=_class_name,
                              method_name=_method_name)
                 dynamic_folder[CALCULATED_LISTEN_PORTS] = 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 = server_fields[CLUSTER]
+        server_port = server_fields[LISTEN_PORT]
+
+        if server_cluster and (server_port is not None):
+            server_port_text = str(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}
+
 
 class OnlineAttributeFilter(ModelTraverse):
     """
@@ -89,5 +117,5 @@ def unrecognized_field(self, model_dict, key, model_location):
         result, message = self._aliases.is_valid_model_attribute_name(model_location, key)
         if result == ValidationCodes.VERSION_INVALID:
             path = self._aliases.get_model_folder_path(model_location)
-            _logger.info('WLSDPLY-20033', key, path, class_name=_class_name, method_name=_method_name)
+            _logger.info('WLSDPLY-20201', key, path, class_name=_class_name, method_name=_method_name)
             del model_dict[key]

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

@@ -1633,10 +1633,13 @@ WLSDPLY-20029=Specified validation method to use was empty or null
 WLSDPLY-20030=Specified validation method {0} is invalid, must be one of: {1}
 WLSDPLY-20031={0} specified Variable File {1} is not a valid file: {2}
 WLSDPLY-20032=No model specified and no model in archive, no validation performed
-WLSDPLY-20033=Unsupported attribute {0} at location {1} removed from model
+WLSDPLY-20033=Applying filter with name "{0}"
 WLSDPLY-20034=Applying filter with ID "{0}"
-WLSDPLY-20035=Applying filter with name "{0}"
-WLSDPLY-20036=Changing {0} to false for cluster "{1}"
+
+# Messages for internal filters
+WLSDPLY-20201=Unsupported attribute {0} at location {1} removed from model
+WLSDPLY-20202=Changing {0} to false for {1} "{2}"
+WLSDPLY-20203={0} entries "{1}" and "{2}" in {3} "{4}" have different {5} values: {6} and {7}
 
 # Common messages used for tool exit and clean-up
 WLSDPLY-21000={0} Messages: