Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
5b7f82b
Fix for flattened folders without tokens in location
CarolynRountree Oct 7, 2022
5a03cd4
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Oct 26, 2022
94f8857
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Oct 27, 2022
3466703
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Oct 27, 2022
12fa7ed
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Oct 31, 2022
12b63a7
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Nov 15, 2022
fc56e10
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Nov 22, 2022
499f88b
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Nov 23, 2022
c35e6b5
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Nov 28, 2022
98ab6f2
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Nov 29, 2022
ed815d1
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Nov 29, 2022
b58411e
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Nov 30, 2022
4d646da
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Nov 30, 2022
76e2306
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Dec 1, 2022
f968f6d
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Dec 2, 2022
d03d4de
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Dec 2, 2022
e79edf7
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Dec 6, 2022
a395a3f
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Dec 12, 2022
6eecb64
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Dec 13, 2022
5d4ea19
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Dec 13, 2022
f57978e
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Dec 14, 2022
857f031
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Dec 14, 2022
9ec4b05
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Dec 15, 2022
4123d38
create a new domain before discover
CarolynRountree Dec 16, 2022
64c63b0
create a new domain before discover
CarolynRountree Dec 16, 2022
a6c85c5
discover unique domains
CarolynRountree Dec 20, 2022
de88601
discover unique domains
CarolynRountree Dec 20, 2022
dd5109c
discover unique domains
CarolynRountree Dec 20, 2022
54279ab
discover unique domains
CarolynRountree Dec 20, 2022
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix for flattened folders without tokens in location
  • Loading branch information
CarolynRountree committed Oct 7, 2022
commit 5b7f82b42377d017471306a0c200657309758c1e
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,11 @@ def verify_attributes(self, attributes, location):
:param location: current location in aliases
"""
_method_name = 'verify_attributes'
flattened_info = self._helper.aliases().get_wlst_flattened_folder_info(location)
if flattened_info is not None:
path_token = flattened_info.get_path_token()
mbean_name = flattened_info.get_mbean_name()
location.add_name_token(path_token, mbean_name)
model_name_map = self._model_attribute_map(location)
_logger.fine('WLSDPLYST-01211', location.get_folder_path(), model_name_map,
class_name=CLASS_NAME, method_name=_method_name)
Expand Down Expand Up @@ -973,6 +978,9 @@ def check_dictionary_against_model_list(self, location, dictionary, folder_map):
if flattened_info is not None:
_logger.finer('WLSDPLYST-01203', location.get_folder_path(), class_name=CLASS_NAME,
method_name=_method_name)
path_token = flattened_info.get_path_token()
mbean_name = flattened_info.get_mbean_name()
location.add_name_token(path_token, mbean_name)
else:
keys = folder_map.keys()
lower_case_map = all_utils.get_lower_case_dict(dictionary.keys())
Expand Down