Update the content send to Policy

Adding tca_policy tag under content section, while sending configBody to
Policy.

Change-Id: I184d366b0cda24ff6b95c4e8c29d0a90bde7ba06
Issue-ID: CLAMP-62
Signed-off-by: xg353y <xg353y@intl.att.com>

4 files changed, 36 insertions, 34 deletions

diff --git a/src/main/java/org/onap/clamp/clds/client/req/TcaRequestFormatter.java b/src/main/java/org/onap/clamp/clds/client/req/TcaRequestFormatter.java
index a71a5f37..9698a995 100644
--- a/src/main/java/org/onap/clamp/clds/client/req/TcaRequestFormatter.java
+++ b/src/main/java/org/onap/clamp/clds/client/req/TcaRequestFormatter.java
@@ -75,7 +75,7 @@ public class TcaRequestFormatter {
             String policyName = refProp.getStringValue("tca.policyid.prefix") + modelProperties.getCurrentPolicyScopeAndPolicyName();
             ((ObjectNode) rootNode).put("policyName", policyName);
             ((ObjectNode) rootNode).put("description", "MicroService vCPE Policy");
-            ((ObjectNode) rootNode).replace("content", createPolicyContent(refProp, modelProperties, service, policyName, tca));
+            ((ObjectNode) rootNode.get("content")).replace("tca_policy", createPolicyContent(refProp, modelProperties, service, policyName, tca));
 
             String tcaPolicyReq = rootNode.toString();
             logger.info("tcaPolicyReq=" + tcaPolicyReq);
diff --git a/src/main/resources/clds/clds-reference.properties b/src/main/resources/clds/clds-reference.properties
index 3bf018d3..ab33d5ce 100644
--- a/src/main/resources/clds/clds-reference.properties
+++ b/src/main/resources/clds/clds-reference.properties
@@ -48,7 +48,7 @@ policy.op.policyNamePrefix=Config_BRMS_Param_
 # TCA MicroService Policy request build properties

 #

 tca.policyid.prefix=DCAE.Config_

-tca.policy.template={"service": "policy_tosca_tca", "version": "1.0.0", "location": "SampleServiceLocation", "configName": "SampleConfigName", "uuid": "test", "policyScope": "resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e", "templateVersion": "OpenSource.version.1", "policyName": "MicroServicevCPE", "description": "MicroService Policy", "priority": "1", "riskType": "SampleRiskType", "riskLevel": "1", "guard": "False","content":{}}

+tca.policy.template={"service": "tca_policy", "version": "1.0.0", "location": "SampleServiceLocation", "configName": "SampleConfigName", "uuid": "test", "policyScope": "resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e", "templateVersion": "OpenSource.version.1", "policyName": "MicroServicevCPE", "description": "MicroService Policy", "priority": "1", "riskType": "SampleRiskType", "riskLevel": "1", "guard": "False","content":{"tca_policy": {}}}

 tca.template= {"domain": "measurementsForVfScaling", "metricsPerEventName": [{"eventName": "???", "controlLoopSchemaType":"VNF","policyScope": "DCAE","policyName": "???","policyVersion": "v0.0.1","thresholds": []}]}

 tca.thresholds.template={"closedLoopControlName": "???", "version": "1.0.2","fieldPath": "?????", "thresholdValue": 0,"direction": "???","severity": "MAJOR", "closedLoopEventStatus": "???"}

 

diff --git a/src/test/resources/clds/clds-reference.properties b/src/test/resources/clds/clds-reference.properties
index a9670e13..f45957e7 100644
--- a/src/test/resources/clds/clds-reference.properties
+++ b/src/test/resources/clds/clds-reference.properties
@@ -29,7 +29,7 @@
 # TCA MicroService Policy request build properties

 #

 tca.policyid.prefix=DCAE.Config_

-tca.policy.template={"service": "policy_tosca_tca", "version": "1.0.0", "location": "SampleServiceLocation", "configName": "SampleConfigName", "uuid": "test", "policyScope": "resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e", "templateVersion": "OpenSource.version.1", "policyName": "MicroServicevCPE", "description": "MicroService Policy", "priority": "1", "riskType": "SampleRiskType", "riskLevel": "1", "guard": "False","content":{}}

+tca.policy.template={"service": "tca_policy", "version": "1.0.0", "location": "SampleServiceLocation", "configName": "SampleConfigName", "uuid": "test", "policyScope": "resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e", "templateVersion": "OpenSource.version.1", "policyName": "MicroServicevCPE", "description": "MicroService Policy", "priority": "1", "riskType": "SampleRiskType", "riskLevel": "1", "guard": "False","content":{"tca_policy": {}}}

 tca.template= {"domain": "measurementsForVfScaling", "metricsPerEventName": [{"eventName": "???", "controlLoopSchemaType":"VNF","policyScope": "DCAE","policyName": "???","policyVersion": "v0.0.1","thresholds": []}]}

 tca.thresholds.template={"closedLoopControlName": "???", "version": "1.0.2","fieldPath": "?????", "thresholdValue": 0,"direction": "???","severity": "MAJOR", "closedLoopEventStatus": "???"}

 #

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 ad95c07b..2ade75f1 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
@@ -1,5 +1,5 @@
 {
-  "service": "policy_tosca_tca",
+  "service": "tca_policy",
   "version": "1.0.0",
   "location": "SampleServiceLocation",
   "configName": "SampleConfigName",
@@ -13,35 +13,37 @@
   "riskLevel": "1",
   "guard": "False",
   "content": {
-    "domain": "measurementsForVfScaling",
-    "metricsPerEventName": [
-      {
-        "eventName": "vFirewallBroadcastPackets",
-        "controlLoopSchemaType": "VNF",
-        "policyScope": "DCAE",
-        "policyName": "DCAE.Config_example_model01.ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf_TCA_1jy9to4",
-        "policyVersion": "v0.0.1",
-        "thresholds": [
-          {
-            "closedLoopControlName": "ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf_null",
-            "version": "1.0.2",
-            "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
-            "thresholdValue": 123,
-            "direction": "GREATER_OR_EQUAL",
-            "severity": "MAJOR",
-            "closedLoopEventStatus": "ONSET"
-          },
-          {
-            "closedLoopControlName": "ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf_null",
-            "version": "1.0.2",
-            "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
-            "thresholdValue": 123,
-            "direction": "GREATER_OR_EQUAL",
-            "severity": "MAJOR",
-            "closedLoopEventStatus": "ONSET"
-          }
-        ]
-      }
-    ]
+    "tca_policy": {
+        "domain": "measurementsForVfScaling",
+        "metricsPerEventName": [
+        {
+          "eventName": "vFirewallBroadcastPackets",
+          "controlLoopSchemaType": "VNF",
+          "policyScope": "DCAE",
+          "policyName": "DCAE.Config_example_model01.ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf_TCA_1jy9to4",
+          "policyVersion": "v0.0.1",
+          "thresholds": [
+            {
+              "closedLoopControlName": "ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf_null",
+              "version": "1.0.2",
+              "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
+              "thresholdValue": 123,
+              "direction": "GREATER_OR_EQUAL",
+              "severity": "MAJOR",
+              "closedLoopEventStatus": "ONSET"
+            },
+            {
+              "closedLoopControlName": "ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf_null",
+              "version": "1.0.2",
+              "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
+              "thresholdValue": 123,
+              "direction": "GREATER_OR_EQUAL",
+              "severity": "MAJOR",
+              "closedLoopEventStatus": "ONSET"
+            }
+          ]
+        }
+      ]
+    }
   }
 }