Skip to content

Commit 01f3bb4

Browse files
Merge pull request #2700 from oracle/owls_95390_fix_backport_to_3.3
Backport fix for OWLS-95390 - Add validation check to reject domain configuration that uses same serverNamePrefix
2 parents f6baaee + 85adc7d commit 01f3bb4

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2018, 2021, Oracle and/or its affiliates.
1+
# Copyright (c) 2018, 2022, 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
# ------------
@@ -351,6 +351,7 @@ def validate(self):
351351
self.validateAdminServer()
352352
self.validateClusters()
353353
self.validateServerCustomChannelName()
354+
self.validateDynamicClustersDuplicateServerNamePrefix()
354355
return self.isValid()
355356

356357
def generate(self):
@@ -401,6 +402,15 @@ def validateAdminServer(self):
401402
if cluster is not None:
402403
self.addError("The admin server " + self.name(adminServer) + " belongs to the WebLogic cluster " + self.name(cluster) + ", the operator does not support having an admin server participate in a cluster.")
403404

405+
def validateDynamicClustersDuplicateServerNamePrefix(self):
406+
serverNamePrefixes = []
407+
for cluster in self.env.getDomain().getClusters():
408+
if self.getDynamicServersOrNone(cluster) is not None:
409+
if cluster.getDynamicServers().getServerNamePrefix() in serverNamePrefixes:
410+
self.addError("The ServerNamePrefix '" + cluster.getDynamicServers().getServerNamePrefix() + "' specified for WebLogic dynamic cluster " + self.name(cluster) + "'s dynamic servers is already in use. The ServerNamePrefix must be unique for each WebLogic dynamic cluster.")
411+
else:
412+
serverNamePrefixes.append(cluster.getDynamicServers().getServerNamePrefix())
413+
404414
def validateClusters(self):
405415
for cluster in self.env.getDomain().getClusters():
406416
self.validateCluster(cluster)

0 commit comments

Comments
 (0)