Skip to content

Compare Models #601

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 56 commits into from
Apr 22, 2020
Merged

Compare Models #601

Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
bf23126
add support of model diff tool
Apr 10, 2020
8eefe36
Merge branch 'master' into model_diff
Apr 10, 2020
a9b50f1
update parameter
Apr 10, 2020
1cda1de
Fix various delete problem
Apr 10, 2020
9bf66f0
add message properties and command file for windows
Apr 13, 2020
1c4b54f
update exception
Apr 13, 2020
15db52b
add topology section
Apr 13, 2020
a720e77
Merge branch 'master' into model_diff
Apr 13, 2020
5c84886
merge from master
Apr 13, 2020
9d7ab02
grab from master
Apr 13, 2020
009d666
fix script name
Apr 13, 2020
767398b
Fix command line parameter
Apr 13, 2020
356b197
Fix merging problems
Apr 13, 2020
586e03f
correct spellings
Apr 13, 2020
a86b642
Experiment to use alias tree to figure out folder or attribute
Apr 14, 2020
96364f0
add validation
Apr 14, 2020
6c5751c
add message for validation
Apr 14, 2020
fe911e6
Use alias methods to check for folder or attributes
Apr 14, 2020
a383a5c
use for loop to prevent infinite loop
Apr 14, 2020
1903478
correct logic
Apr 14, 2020
e549d31
update method and add CompareException
Apr 14, 2020
e5b36ed
copyrights update
Apr 14, 2020
98a42fd
change wordings
Apr 14, 2020
81bf16a
removed operator specific logic
Apr 15, 2020
7ed9eeb
Add documentations
Apr 15, 2020
f412d72
Fix file writing issues
Apr 15, 2020
8574498
Fix file writing for results
Apr 15, 2020
a76b31b
remove unused var
Apr 15, 2020
7f39a51
add support of variable substitution
Apr 15, 2020
4e60c98
update doc
Apr 15, 2020
8749ba6
fix script error
Apr 16, 2020
402487f
update wordings and script
Apr 16, 2020
088c208
handle deleting top level tree
Apr 16, 2020
63eac89
fix code error
Apr 16, 2020
5ba6071
Add unit test for model diff
Apr 20, 2020
3b51492
Add parsing to catch error
Apr 21, 2020
d38ad40
Add translate error check
Apr 21, 2020
40c4e47
Add more tests for model_diff
Apr 21, 2020
22f25db
Add CreateException
Apr 21, 2020
15d27a1
minor refactor
Apr 21, 2020
fe0584a
update exception handling
Apr 21, 2020
d68eee5
update exception in test
Apr 21, 2020
49f1521
change to use true or false for dictionary check
Apr 22, 2020
c99fd03
update doc
Apr 22, 2020
7d285ad
rename model_diff to compare_model
Apr 22, 2020
9fd4957
renamed file and update test
Apr 22, 2020
9c15a87
change test to use new temporary directory each time
Apr 22, 2020
b68e3dd
update unit test
Apr 22, 2020
e87e991
doc updates
Apr 22, 2020
5087ee8
doc edit
Apr 22, 2020
8fd738c
adding messages for identical model
Apr 22, 2020
ed093a1
doc update
Apr 22, 2020
860ec84
doc update
Apr 22, 2020
41e4f9d
Merge branch 'master' into model_diff
ddsharpe Apr 22, 2020
1020256
Merge branch 'master' into model_diff
ddsharpe Apr 22, 2020
7fb4eea
Merge branch 'master' into model_diff
ddsharpe Apr 22, 2020
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
Prev Previous commit
Next Next commit
add topology section
  • Loading branch information
Johnny Shum committed Apr 13, 2020
commit 15db52bc8f99b0f0af23456aa3a779b0a1ec3a67
12 changes: 11 additions & 1 deletion core/src/main/python/model_diff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,11 @@ def _add_results(self, ar_changes, is_delete=False):

allowable_deletes = [ 'appDeployments|Application' ,
'appDeployments|Library',
'topology|Cluster',
'topology|Server',
'topology|ServerTemplate',
'topology|Machine',
'topology|UnixMachine',
'resources|CoherenceClusterSystemResource',
'resources|FileStore',
'resources|ForeignJNDIProvider',
Expand All @@ -230,7 +235,12 @@ def _add_results(self, ar_changes, is_delete=False):
'resources|ResourceGroupTemplate',
'resources|ResourceManagement',
'resources|SAFAgent',
'resources|SelfTuning',
'resources|SelfTuning|Capacity',
'resources|SelfTuning|FairShareRequestClass',
'resources|SelfTuning|MaxThreadsConstraint',
'resources|SelfTuning|MinThreadsConstraint',
'resources|SelfTuning|ResponseTimeRequestClass',
'resources|SelfTuning|WorkManager',
'resources|ShutdownClass',
'resources|SingletonService',
'resources|StartupClass',
Expand Down