From c405a83ec84c2bc1c090f06f9ac6207469e09cbb Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Thu, 19 Mar 2020 16:24:10 +0100
Subject: Fix loop submit bugs

Update the payload for policy creation and pdp group activation and
update the policy url accordingly.

Issue-ID: CLAMP-787
Change-Id: If39eeaccf780f1222b99ffc4dd5d7ef1460c4962
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 .../tosca/micro-service-policy-payload.json        |  1 +
 .../tosca/micro-service-policy-properties.json     | 44 +++++++++++-----------
 .../resources/tosca/pdp-group-policy-payload.json  | 12 +++---
 3 files changed, 30 insertions(+), 27 deletions(-)

(limited to 'src/test/resources/tosca')

diff --git a/src/test/resources/tosca/micro-service-policy-payload.json b/src/test/resources/tosca/micro-service-policy-payload.json
index 2de06b08..2533a541 100644
--- a/src/test/resources/tosca/micro-service-policy-payload.json
+++ b/src/test/resources/tosca/micro-service-policy-payload.json
@@ -5,6 +5,7 @@
 			{
 				"testPolicy": {
 					"type": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+					"type_version": "1.0.0",
 					"version": "1.0.0",
 					"metadata": {
 						"policy-id": "testPolicy"
diff --git a/src/test/resources/tosca/micro-service-policy-properties.json b/src/test/resources/tosca/micro-service-policy-properties.json
index 6baa3294..04fe0cc7 100644
--- a/src/test/resources/tosca/micro-service-policy-properties.json
+++ b/src/test/resources/tosca/micro-service-policy-properties.json
@@ -1,23 +1,25 @@
 {
-  "domain": "measurementsForVfScaling",
-  "metricsPerEventName": [
-    {
-      "policyVersion": "1.0.0",
-      "thresholds": [
-        {
-          "severity": "CRITICAL",
-          "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
-          "thresholdValue": 1,
-          "closedLoopEventStatus": "ONSET",
-          "closedLoopControlName": "test",
-          "version": "1.0.0",
-          "direction": "LESS"
-        }
-      ],
-      "policyName": "test",
-      "controlLoopSchemaType": "VM",
-      "policyScope": "test",
-      "eventName": "test"
-    }
-  ]
+  "tca_policy": {
+    "domain": "measurementsForVfScaling",
+    "metricsPerEventName": [
+      {
+        "policyVersion": "1.0.0",
+        "thresholds": [
+          {
+            "severity": "CRITICAL",
+            "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
+            "thresholdValue": 1,
+            "closedLoopEventStatus": "ONSET",
+            "closedLoopControlName": "test",
+            "version": "1.0.0",
+            "direction": "LESS"
+          }
+        ],
+        "policyName": "test",
+        "controlLoopSchemaType": "VM",
+        "policyScope": "test",
+        "eventName": "test"
+      }
+    ]
+  }
 }
diff --git a/src/test/resources/tosca/pdp-group-policy-payload.json b/src/test/resources/tosca/pdp-group-policy-payload.json
index 93a85457..4ea746de 100644
--- a/src/test/resources/tosca/pdp-group-policy-payload.json
+++ b/src/test/resources/tosca/pdp-group-policy-payload.json
@@ -1,14 +1,14 @@
 {
   "groups": [
     {
-      "name": "pdpGroup2",
+      "name": "pdpGroup1",
       "deploymentSubgroups": [
         {
-          "pdpType": "pdpSubgroup2",
+          "pdpType": "pdpSubgroup1",
           "action": "POST",
           "policies": [
             {
-              "name": "onap.policies.controlloop.Operational",
+              "name": "configPolicyTest",
               "version": "1.0.0"
             }
           ]
@@ -16,14 +16,14 @@
       ]
     },
     {
-      "name": "pdpGroup1",
+      "name": "pdpGroup2",
       "deploymentSubgroups": [
         {
-          "pdpType": "pdpSubgroup1",
+          "pdpType": "pdpSubgroup2",
           "action": "POST",
           "policies": [
             {
-              "name": "onap.policies.monitoring.test",
+              "name": "opPolicy",
               "version": "1.0.0"
             }
           ]
-- 
cgit 1.2.3-korg