Skip to content

Commit 256ed92

Browse files
Jira wdt 409 dynamic cluster server groups (#614)
* Fix java.lang.Boolean issues for ActiveDirectoryAuthenticator * add in domainInfo for targeting dynamic server groups to dynamic clusters * refine for pre 12214 * Changes for update * Add dynamic clusters value to system tests
1 parent 825be1f commit 256ed92

File tree

18 files changed

+267
-52
lines changed

18 files changed

+267
-52
lines changed

core/src/main/python/update.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,6 @@ def __update_online(model, model_context, aliases):
146146

147147
exit_code = 0
148148

149-
__update_online_domain(model_context)
150-
__wlst_helper.edit()
151-
__wlst_helper.start_edit()
152-
153149
topology_updater.set_server_groups()
154150
__update_online_domain(model_context)
155151
model_deployer.deploy_applications(model, model_context, aliases, wlst_mode=__wlst_mode)

core/src/main/python/wlsdeploy/aliases/model_constants.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
DOMAIN_INFO_ALIAS = 'DomainInfo'
102102
DOMAIN_LIBRARIES = 'domainLibraries'
103103
DOMAIN_SCRIPTS = 'domainBin'
104+
DYNAMIC_CLUSTER_SERVER_GROUP_TARGETING_LIMITS = 'DynamicClusterServerGroupTargetingLimits'
104105
DOMAIN_VERSION = 'DomainVersion'
105106
DYNAMIC_SERVERS = 'DynamicServers'
106107
EMBEDDED_LDAP = 'EmbeddedLDAP'
@@ -203,7 +204,7 @@
203204
PLAN_PATH = 'PlanPath'
204205
PREPEND = 'prepend'
205206
PROPERTIES = 'Properties'
206-
PRODUCTION_MODE_ENABLED='ProductionModeEnabled'
207+
PRODUCTION_MODE_ENABLED = 'ProductionModeEnabled'
207208
QUEUE = 'Queue'
208209
QUOTA = 'Quota'
209210
REALM = 'Realm'

core/src/main/python/wlsdeploy/tool/create/domain_creator.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -517,15 +517,17 @@ def __extend_domain_with_select_template(self, domain_home):
517517
topology_folder_list = self.alias_helper.get_model_topology_top_level_folder_names()
518518
self.__apply_base_domain_config(topology_folder_list)
519519

520-
self.logger.info('WLSDPLY-12206', self._domain_name, domain_home,
521-
class_name=self.__class_name, method_name=_method_name)
522520
server_groups_to_target = self._domain_typedef.get_server_groups_to_target()
523-
server_assigns, dynamic_assigns = self.target_helper.target_server_groups_to_servers(server_groups_to_target)
521+
dynamic_cluster_server_groups_to_target = self._domain_typedef.get_dynamic_cluster_server_groups()
522+
server_assigns = self.target_helper.target_server_groups_to_servers(server_groups_to_target)
523+
dynamic_assigns = \
524+
self.target_helper.target_server_groups_to_dynamic_clusters(dynamic_cluster_server_groups_to_target)
525+
524526
if len(server_assigns) > 0:
525527
self.target_helper.target_server_groups(server_assigns)
526528

527529
if len(dynamic_assigns) > 0:
528-
self.target_helper.target_server_groups_to_dynamic_clusters(dynamic_assigns)
530+
self.target_helper.target_dynamic_server_groups(dynamic_assigns)
529531

530532
self.logger.info('WLSDPLY-12205', self._domain_name, domain_home,
531533
class_name=self.__class_name, method_name=_method_name)

core/src/main/python/wlsdeploy/tool/create/domain_typedef.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,16 @@ def get_server_groups_to_target(self):
171171
self.__resolve_paths()
172172
return list(self._domain_typedef['serverGroupsToTarget'])
173173

174+
def get_dynamic_cluster_server_groups(self):
175+
"""
176+
For versions of WebLogic Server less than 12.2.1.4 that support associating a single server group to
177+
the dynamic clusters in the domain. In 12.2.1.4 can associate more than one server group.
178+
:return: the server group to be targeted to a dynamic cluster, or None if no server group to target
179+
:raises: CreateException: if an error occurs resolving the paths
180+
"""
181+
self.__resolve_paths()
182+
return list(self._domain_typedef['dynamicClusterServerGroupsToTarget'])
183+
174184
def get_rcu_schemas(self):
175185
"""
176186
Get the list of RCU schemas used by the domain type.
@@ -345,6 +355,9 @@ def __resolve_paths(self):
345355
if 'serverGroupsToTarget' not in self._domain_typedef:
346356
self._domain_typedef['serverGroupsToTarget'] = []
347357

358+
if 'dynamicClusterServerGroupsToTarget' not in self._domain_typedef:
359+
self._domain_typedef['dynamicClusterServerGroupsToTarget'] = [ ]
360+
348361
if 'rcuSchemas' not in self._domain_typedef:
349362
self._domain_typedef['rcuSchemas'] = []
350363

core/src/main/python/wlsdeploy/tool/deploy/topology_updater.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,14 @@ def update(self):
137137
def set_server_groups(self):
138138
if self.wls_helper.is_set_server_groups_supported():
139139
server_groups_to_target = self._domain_typedef.get_server_groups_to_target()
140-
server_assigns, dynamic_assigns = \
141-
self.target_helper.target_server_groups_to_servers(server_groups_to_target)
142-
if len(dynamic_assigns) > 0:
143-
self.target_helper.target_server_groups_to_dynamic_clusters(dynamic_assigns)
140+
dynamic_cluster_server_groups_to_target = self._domain_typedef.get_dynamic_cluster_server_groups()
141+
server_assigns = self.target_helper.target_server_groups_to_servers(server_groups_to_target)
142+
dynamic_assigns = \
143+
self.target_helper.target_server_groups_to_dynamic_clusters(dynamic_cluster_server_groups_to_target)
144144
if len(server_assigns) > 0:
145145
self.target_helper.target_server_groups(server_assigns)
146+
if len(dynamic_assigns) > 0:
147+
self.target_helper.target_dynamic_server_groups(dynamic_assigns)
146148
elif self._domain_typedef.is_jrf_domain_type():
147149
self.target_helper.target_jrf_groups_to_clusters_servers()
148150

0 commit comments

Comments
 (0)