Skip to content

Commit af566d1

Browse files
committed
Merge branch 'wko-filter-dict' into 'main'
Use helper methods to get dictionary elements See merge request weblogic-cloud/weblogic-deploy-tooling!1787
2 parents 8fa93b2 + ba6e91c commit af566d1

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2021, 2024, Oracle and/or its affiliates.
1+
# Copyright (c) 2021, 2025, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33
#
44
# ------------
@@ -111,9 +111,9 @@ def check_clustered_server_ports(model, _model_context):
111111

112112
clusters_folder = dictionary_utils.get_dictionary_element(topology_folder, CLUSTER)
113113
for cluster_name, cluster_fields in clusters_folder.items():
114-
dynamic_folder = cluster_fields[DYNAMIC_SERVERS]
114+
dynamic_folder = dictionary_utils.get_dictionary_element(cluster_fields, DYNAMIC_SERVERS)
115115
if dynamic_folder:
116-
calculated_listen_ports = dynamic_folder[CALCULATED_LISTEN_PORTS]
116+
calculated_listen_ports = dictionary_utils.get_element(dynamic_folder, CALCULATED_LISTEN_PORTS)
117117
if (calculated_listen_ports is None) or alias_utils.convert_boolean(calculated_listen_ports):
118118
_logger.info('WLSDPLY-20202', CALCULATED_LISTEN_PORTS, CLUSTER, cluster_name, class_name=_class_name,
119119
method_name=_method_name)
@@ -124,8 +124,8 @@ def check_clustered_server_ports(model, _model_context):
124124
server_port_map = {}
125125
servers_folder = dictionary_utils.get_dictionary_element(topology_folder, SERVER)
126126
for server_name, server_fields in servers_folder.items():
127-
server_cluster = server_fields[CLUSTER]
128-
server_port = server_fields[LISTEN_PORT]
127+
server_cluster = dictionary_utils.get_element(server_fields, CLUSTER)
128+
server_port = dictionary_utils.get_element(server_fields, LISTEN_PORT)
129129

130130
if server_cluster and (server_port is not None):
131131
server_port_text = str_helper.to_string(server_port)

0 commit comments

Comments
 (0)