Skip to content

Commit efd4326

Browse files
authored
OWLS-106472 - Improve error handling when Server template is not set for dynamic cluster. (#3965)
* OWLS-106472 - Improve error handling when dynamic cluster doesn't have an associated server template. * Modified the check for dynamic cluster to look for either ServerTemplate or DynamicClusterSize > 0.
1 parent 280b547 commit efd4326

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

operator/src/main/resources/scripts/introspectDomain.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
1+
# Copyright (c) 2018, 2023, 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
# ------------
@@ -258,8 +258,8 @@ def getDynamicServersOrNone(self,cluster):
258258
childObjs = ls(returnMap='true', returnType='c')
259259
if not childObjs.isEmpty():
260260
cd(childObjs[0])
261-
if get('ServerTemplate') is not None:
262-
# Cluster is a dynamic cluster if a ServerTemplate MBean is found
261+
if get('ServerTemplate') is not None or int(get('DynamicClusterSize')) > 0:
262+
# Cluster is a dynamic cluster if a ServerTemplate MBean is found or DynamicClusterSize is greater than 0.
263263
ret = cmo
264264
except:
265265
trace("Ignoring cd() exception for cluster '" + cluster.getName() + "' in getDynamicServerOrNone() and returning None.")
@@ -547,7 +547,7 @@ def validateDynamicClusterReferencedByOneServerTemplate(self, cluster):
547547
self.addError("The WebLogic dynamic cluster " + self.name(cluster) + " is referenced the server template " + self.name(server_template) + " and the server template " + self.name(template) + ".")
548548
return
549549
if server_template is None:
550-
self.addError("The WebLogic dynamic cluster " + self.name(cluster) + "' is not referenced by any server template.")
550+
self.addError("The WebLogic dynamic cluster " + self.name(cluster) + " is not referenced by any server template.")
551551

552552
def validateServerTemplateNapListenPortIsSet(self, server_or_template):
553553
naps = server_or_template.getNetworkAccessPoints()

0 commit comments

Comments
 (0)