Merge changes I0c2e7e06,I7fa79a6c,I768b765f

* changes:
  Add Prefix to ModelName
  Flexible Policy code
  Fix Sdc Controller

diff --git a/src/main/resources/clds/templates/tca-policy-template.json b/src/main/resources/clds/templates/tca-policy-template.json
index 275b6a4..b3369a3 100644 (file)
--- 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": "MicroService",
        "description": "MicroService Policy",

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 (file)
--- 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",

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 a04e223..bbe9ca6 100644 (file)
--- 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",