|
1 |
| -# Copyright (c) 2018, 2022, Oracle and/or its affiliates. |
| 1 | +# Copyright (c) 2018, 2023, Oracle and/or its affiliates. |
2 | 2 | # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
|
3 | 3 | #
|
4 | 4 | # ------------
|
@@ -258,8 +258,8 @@ def getDynamicServersOrNone(self,cluster):
|
258 | 258 | childObjs = ls(returnMap='true', returnType='c')
|
259 | 259 | if not childObjs.isEmpty():
|
260 | 260 | 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. |
263 | 263 | ret = cmo
|
264 | 264 | except:
|
265 | 265 | trace("Ignoring cd() exception for cluster '" + cluster.getName() + "' in getDynamicServerOrNone() and returning None.")
|
@@ -547,7 +547,7 @@ def validateDynamicClusterReferencedByOneServerTemplate(self, cluster):
|
547 | 547 | 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) + ".")
|
548 | 548 | return
|
549 | 549 | 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.") |
551 | 551 |
|
552 | 552 | def validateServerTemplateNapListenPortIsSet(self, server_or_template):
|
553 | 553 | naps = server_or_template.getNetworkAccessPoints()
|
|
0 commit comments