Skip to content

Commit dc041a4

Browse files
Wdt 390 do not provision mt in later versions (#549)
* Remove support of MT during create/update/deploy for WebLogic 14.1.1 and greater
1 parent 075cb46 commit dc041a4

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,20 +303,24 @@ def __run_rcu(self):
303303

304304
def __fail_mt_1221_domain_creation(self):
305305
"""
306-
Abort create if domain contains MT artifacts that cannot be created in the version of WLST offline being used.
306+
Abort create if domain contains MT artifacts that cannot be created in the version of WLST offline being used
307+
or if the version of WebLogic no longer supports MT.
307308
:raises: CreateException: if the MT domain cannot be provision on the specified version of WLST offline
308309
"""
309310
_method_name = '__fail_mt_1221_domain_creation'
310311

311-
if self.wls_helper.is_mt_offline_provisioning_supported():
312+
if self.wls_helper.is_mt_offline_provisioning_supported() and self.wls_helper.is_mt_provisioning_supported():
312313
return
313314

314315
resources_dict = self.model.get_model_resources()
315316
if (not dictionary_utils.is_empty_dictionary_element(self._topology, VIRTUAL_TARGET)) or \
316317
(not dictionary_utils.is_empty_dictionary_element(resources_dict, RESOURCE_GROUP_TEMPLATE)) or \
317318
(not dictionary_utils.is_empty_dictionary_element(resources_dict, RESOURCE_GROUP)) or \
318319
(not dictionary_utils.is_empty_dictionary_element(resources_dict, PARTITION)):
319-
ex = exception_helper.create_create_exception('WLSDPLY-12202', self.wls_helper.wl_version)
320+
if not self.wls_helper.is_mt_provisioning_supported():
321+
ex = exception_helper.create_create_exception('WLSDPLY-12254', self.wls_helper.wl_version)
322+
else:
323+
ex = exception_helper.create_create_exception('WLSDPLY-12202', self.wls_helper.wl_version)
320324
self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
321325
raise ex
322326
return

core/src/main/python/wlsdeploy/util/weblogic_helper.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
2+
Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.
33
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44
"""
55
import java.lang.Exception as JException
@@ -68,6 +68,13 @@ def is_mt_offline_provisioning_supported(self):
6868
"""
6969
return self.is_weblogic_version_or_above('12.2.1.1') or not self.is_weblogic_version_or_above('12.2.1')
7070

71+
def is_mt_provisioning_supported(self):
72+
"""
73+
Is MultiTenant offline provisioning in a version that is still supports MT?
74+
:return: true if MT provisioning is supported; false otherwise
75+
"""
76+
return not self.is_weblogic_version_or_above('14.1.1')
77+
7178
def is_select_template_supported(self):
7279
"""
7380
Is selectTemplate() supported in this version of WLST?

core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,6 +1173,7 @@ WLSDPLY-12250=Domain bin ({0}) specified in the model but the archive file name
11731173
WLSDPLY-12251=Installing domain script {0} from archive to bin directory of {1}
11741174
WLSDPLY-12252=Copying domain script {0} to bin directory of {1}
11751175
WLSDPLY-12253=Unable to copy domain user script {0} to directory {1}
1176+
WLSDPLY-12254=WLST provisioning of MT domains is not supported in WebLogic version {0}
11761177

11771178
# domain_typedef.py
11781179
WLSDPLY-12300={0} got the domain type {1} but the domain type definition file {2} was not valid: {3}

0 commit comments

Comments
 (0)