Skip to content

Merge model kubernetes section to template for extract tool #1130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
May 20, 2022
Merged

Merge model kubernetes section to template for extract tool #1130

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c893117
Merge model kubernetes section to template for extract tool
rakillen May 18, 2022
81ae304
Merge branch 'main' into JIRA-WDT-610-extract-target
rakillen May 18, 2022
3de6589
Use option -domain_home argument in output file content
rakillen May 18, 2022
e076188
Output template files correctly when deprecated -domain_resource_file…
rakillen May 18, 2022
7c313a3
Convert model variables to correct types for domain resource file
rakillen May 19, 2022
4da6db2
Resolve problem with simple map elements
rakillen May 19, 2022
571049c
Use targets for extract resource test
rakillen May 19, 2022
d99d624
Support deprecated "named object list" model format
rakillen May 20, 2022
1737895
Sonar cleanup
rakillen May 20, 2022
83b0234
Update script help output
rakillen May 20, 2022
96772b8
Updated copyrights
rakillen May 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Resolve problem with simple map elements
  • Loading branch information
@rakillen
rakillen committed May 19, 2022
commit 4da6db221d204ce6db9bd4f675b65a2ca5dc9566
7 changes: 6 additions & 1 deletion core/src/main/python/wlsdeploy/tool/util/targets/output_file_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,12 @@ def _update_dictionary(output_dictionary, model_dictionary, schema_folder, schem
method_name=_method_name)
return

# no type checking for elements of simple (single type) map
if wko_schema_helper.is_simple_map(schema_folder):
for key, value in model_dictionary.items():
output_dictionary[key] = value
return

properties = wko_schema_helper.get_properties(schema_folder)

for key, value in model_dictionary.items():
Expand All @@ -143,7 +149,6 @@ def _update_dictionary(output_dictionary, model_dictionary, schema_folder, schem
_update_list(output_dictionary[key], value, property_folder, next_schema_path, output_file_path)
else:
output_dictionary[key] = value
pass


def _update_list(output_list, model_list, schema_folder, schema_path, output_file_path):
Expand Down