commit e803fb7f42efb66cb2fb05cc568c80ab818798f4
author Sébastien Determe <sd378r@intl.att.com> Thu Apr 19 16:39:56 2018 +0000
committer Gerrit Code Review <gerrit@onap.org> Thu Apr 19 16:39:56 2018 +0000
tree 89fbfb2b89e26bf2c53f4ec93b9db38f40c44362
parent 1ed00c10c10e743348fae994743821e3413c19c1
parent ab284ec6e60c48eb9550c8fae16cc34ec9c3aeae

Merge "Fix CsarInstaller"

src/main/resources/clds/templates/tca-policy-template.json

diff --git a/src/main/resources/clds/templates/tca-policy-template.json b/src/main/resources/clds/templates/tca-policy-template.json
index f91f239..575d170 100644
--- a/src/main/resources/clds/templates/tca-policy-template.json
+++ b/src/main/resources/clds/templates/tca-policy-template.json
@@ -4,6 +4,7 @@
 	"location": "SampleServiceLocation",
 	"configName": "SampleConfigName",
 	"uuid": "test",
+	"policyScope":"CLAMP",
 	"templateVersion": "OpenSource.version.1",
 	"policyName": "???",
 	"description": "MicroService Policy",

src/test/resources/clds/templates/tca-policy-template.json

diff --git a/src/test/resources/clds/templates/tca-policy-template.json b/src/test/resources/clds/templates/tca-policy-template.json
index 275b6a4..559aacb 100644
--- a/src/test/resources/clds/templates/tca-policy-template.json
+++ b/src/test/resources/clds/templates/tca-policy-template.json
@@ -4,6 +4,7 @@
 	"location": "SampleServiceLocation",
 	"configName": "SampleConfigName",
 	"uuid": "test",
+	"policyScope": "CLAMP",
 	"templateVersion": "OpenSource.version.1",
 	"policyName": "MicroService",
 	"description": "MicroService Policy",

src/test/resources/example/tca-policy-req/tca-policy-expected.json

diff --git a/src/test/resources/example/tca-policy-req/tca-policy-expected.json b/src/test/resources/example/tca-policy-req/tca-policy-expected.json
index 6b27307..18eec88 100644
--- a/src/test/resources/example/tca-policy-req/tca-policy-expected.json
+++ b/src/test/resources/example/tca-policy-req/tca-policy-expected.json
@@ -4,6 +4,7 @@
   "location": "SampleServiceLocation",
   "configName": "SampleConfigName",
   "uuid": "test",
+  "policyScope": "CLAMP",
   "templateVersion": "OpenSource.version.1",
   "policyName": "example_model01.ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf_TCA_1jy9to4",
   "description": "MicroService Policy",