Code Review
/
clamp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
combined
(merge:
b1012c7
9aea247
)
Merge "Rollback policyScope"
author
Sébastien Determe
<sd378r@intl.att.com>
Thu, 19 Apr 2018 16:39:44 +0000
(16:39 +0000)
committer
Gerrit Code Review
<gerrit@onap.org>
Thu, 19 Apr 2018 16:39:44 +0000
(16:39 +0000)
1
2
src/main/resources/clds/templates/tca-policy-template.json
patch
|
diff1
|
diff2
|
blob
|
history
src/test/resources/example/tca-policy-req/tca-policy-expected.json
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/main/resources/clds/templates/tca-policy-template.json
index
b3369a3
,
f91f239
..
575d170
---
1
/
src/main/resources/clds/templates/tca-policy-template.json
---
2
/
src/main/resources/clds/templates/tca-policy-template.json
+++ b/
src/main/resources/clds/templates/tca-policy-template.json
@@@
-4,9
-4,8
+4,9
@@@
"location": "SampleServiceLocation",
"configName": "SampleConfigName",
"uuid": "test",
+ "policyScope":"CLAMP",
"templateVersion": "OpenSource.version.1",
- "policyName": "
MicroService
",
+ "policyName": "
???
",
"description": "MicroService Policy",
"priority": "1",
"riskType": "SampleRiskType",
diff --cc
src/test/resources/example/tca-policy-req/tca-policy-expected.json
Simple merge