File tree Expand file tree Collapse file tree 3 files changed +16
-5
lines changed
core/src/main/python/wlsdeploy Expand file tree Collapse file tree 3 files changed +16
-5
lines changed Original file line number Diff line number Diff line change 1
1
"""
2
- Copyright (c) 2017, 2020 , Oracle Corporation and/or its affiliates. All rights reserved.
2
+ Copyright (c) 2017, 2022 , Oracle Corporation and/or its affiliates. All rights reserved.
3
3
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
4
4
"""
5
5
import imp
17
17
TARGET_CONFIG_TOKEN = '@@TARGET_CONFIG_DIR@@'
18
18
19
19
__id_filter_map = {
20
- # 'filterId': filter_method
20
+ # temporary - allow WDT 1.9 to specify no-op WDT 2.0 filter
21
+ 'wko_filter' : lambda x : x
21
22
}
22
23
23
24
Original file line number Diff line number Diff line change 1
1
"""
2
- Copyright (c) 2017, 2021 , Oracle Corporation and/or its affiliates.
2
+ Copyright (c) 2017, 2022 , Oracle Corporation and/or its affiliates.
3
3
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
4
4
5
5
Module that handles command-line argument parsing and common validation.
@@ -842,6 +842,10 @@ def is_validate_method_key(self, key):
842
842
def _validate_validate_method_arg (self , value ):
843
843
method_name = '_validate_validate_method_arg'
844
844
845
+ # temporary for WDT 1.9: allow WDT 2.0 method, just interpret as lax
846
+ if value == 'wktui' :
847
+ return self .LAX_VALIDATION_METHOD
848
+
845
849
if value is None or len (value ) == 0 :
846
850
ex = exception_helper .create_cla_exception ('WLSDPLY-20029' )
847
851
ex .setExitCode (self .ARG_VALIDATION_ERROR_EXIT_CODE )
Original file line number Diff line number Diff line change 1
1
"""
2
- Copyright (c) 2020, 2021 , Oracle and/or its affiliates.
2
+ Copyright (c) 2020, 2022 , Oracle and/or its affiliates.
3
3
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
4
4
"""
5
5
@@ -76,7 +76,13 @@ def get_validation_method(self):
76
76
Return the validation method for this target environment.
77
77
:return: the validation method, or None
78
78
"""
79
- return dictionary_utils .get_element (self .config_dictionary , 'validation_method' )
79
+ validation_method = dictionary_utils .get_element (self .config_dictionary , 'validation_method' )
80
+
81
+ # temporary for WDT 1.9: allow WDT 2.0 method, just interpret as lax
82
+ if validation_method == 'wktui' :
83
+ validation_method = 'lax'
84
+
85
+ return validation_method
80
86
81
87
def get_model_filters (self ):
82
88
"""
You can’t perform that action at this time.
0 commit comments