Skip to content

Commit 659b25b

Browse files
committed
Allow WDT 2.0 target configuration with reduced functionality
1 parent 61794b8 commit 659b25b

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

core/src/main/python/wlsdeploy/tool/util/filter_helper.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
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.
33
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44
"""
55
import imp
@@ -17,7 +17,8 @@
1717
TARGET_CONFIG_TOKEN = '@@TARGET_CONFIG_DIR@@'
1818

1919
__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
2122
}
2223

2324

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
Copyright (c) 2017, 2021, Oracle Corporation and/or its affiliates.
2+
Copyright (c) 2017, 2022, 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
Module that handles command-line argument parsing and common validation.
@@ -842,6 +842,10 @@ def is_validate_method_key(self, key):
842842
def _validate_validate_method_arg(self, value):
843843
method_name = '_validate_validate_method_arg'
844844

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+
845849
if value is None or len(value) == 0:
846850
ex = exception_helper.create_cla_exception('WLSDPLY-20029')
847851
ex.setExitCode(self.ARG_VALIDATION_ERROR_EXIT_CODE)

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
Copyright (c) 2020, 2021, Oracle and/or its affiliates.
2+
Copyright (c) 2020, 2022, Oracle 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

@@ -76,7 +76,13 @@ def get_validation_method(self):
7676
Return the validation method for this target environment.
7777
:return: the validation method, or None
7878
"""
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
8086

8187
def get_model_filters(self):
8288
"""

0 commit comments

Comments
 (0)