Update API for changes in TOSCA provider

Knock on changes and some simplification of the code because the TOSCA
provider now does some of the checks that were in API, so those checks
are not needed in API any more. Various JUnit fixes.

Issue-ID: POLICY-1402
Change-Id: Ic3a08e415c8cce4f2aad4b5da2623e41280c4e66
Signed-off-by: liamfallon <liam.fallon@est.tech>

3 files changed, 32 insertions, 77 deletions

diff --git a/main/src/test/resources/policies/vCPE.policy.duplicate.policyversion.json b/main/src/test/resources/policies/vCPE.policy.different.policy.fields.json
index 6caeb503..cc7e4ee4 100644
--- a/main/src/test/resources/policies/vCPE.policy.duplicate.policyversion.json
+++ b/main/src/test/resources/policies/vCPE.policy.different.policy.fields.json
@@ -5,52 +5,9 @@
             {
                 "onap.restart.tca": {
                     "type": "onap.policies.monitoring.cdap.tca.hi.lo.app",
-                    "version": "1.0.0",
                     "type_version": "1.0.0",
-                    "metadata": {
-                        "policy-id": "onap.restart.tca"
-                    },
-                    "properties": {
-                        "tca_policy" : {
-                            "domain": "measurementsForVfScaling",
-                            "metricsPerEventName": [
-                                {
-                                    "eventName": "Measurement_vGMUX",
-                                    "controlLoopSchemaType": "VNF",
-                                    "policyScope": "DCAE",
-                                    "policyName": "DCAE.Config_tca-hi-lo",
-                                    "policyVersion": "v0.0.1",
-                                    "thresholds": [
-                                        {
-                                            "closedLoopControlName": "ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e",
-                                            "version": "1.0.2",
-                                            "fieldPath": "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value",
-                                            "thresholdValue": 0,
-                                            "direction": "EQUAL",
-                                            "severity": "MAJOR",
-                                            "closedLoopEventStatus": "ABATED"
-                                        },
-                                        {
-                                            "closedLoopControlName": "ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e",
-                                            "version": "1.0.2",
-                                            "fieldPath": "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value",
-                                            "thresholdValue": 0,
-                                            "direction": "GREATER",
-                                            "severity": "CRITICAL",
-                                            "closedLoopEventStatus": "ONSET"
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    }
-                }
-            },
-            {
-                "onap.restart.tca": {
-                    "type": "onap.policies.monitoring.cdap.tca.hi.lo.app",
                     "version": "1.0.0",
-                    "type_version": "1.0.0",
+                    "description": "description field added to policy",
                     "metadata": {
                         "policy-id": "onap.restart.tca"
                     },
diff --git a/main/src/test/resources/policies/vCPE.policy.monitoring.input.tosca.v2.yaml b/main/src/test/resources/policies/vCPE.policy.monitoring.input.tosca.v2.yaml
index 523e9bb5..459dcf7d 100644
--- a/main/src/test/resources/policies/vCPE.policy.monitoring.input.tosca.v2.yaml
+++ b/main/src/test/resources/policies/vCPE.policy.monitoring.input.tosca.v2.yaml
@@ -4,6 +4,7 @@ topology_template:
      -
        onap.restart.tca:
            type: onap.policies.monitoring.cdap.tca.hi.lo.app
+           type_version: 1.0.0
            version: 2.0.0
            metadata:
              policy-id: onap.restart.tca
diff --git a/main/src/test/resources/policies/vDNS.policy.monitoring.input.tosca.v2.yaml b/main/src/test/resources/policies/vDNS.policy.monitoring.input.tosca.v2.yaml
index 9893af1d..208c656f 100644
--- a/main/src/test/resources/policies/vDNS.policy.monitoring.input.tosca.v2.yaml
+++ b/main/src/test/resources/policies/vDNS.policy.monitoring.input.tosca.v2.yaml
@@ -1,36 +1,33 @@
 tosca_definitions_version: tosca_simple_yaml_1_0_0
 topology_template:
    policies:
-      -
-         onap.scaleout.tca:
-            type: onap.policies.monitoring.cdap.tca.hi.lo.app
-            version: 2.0.0
-            metadata:
-               policy-id: onap.scaleout.tca
-            properties:
-               tca_policy:
-                  domain: measurementsForVfScaling
-                  metricsPerEventName:
-                     -
-                        eventName: vLoadBalancer
-                        controlLoopSchemaType: VNF
-                        policyScope: "type=configuration"
-                        policyName: "onap.scaleout.tca"
-                        policyVersion: "v0.0.1"
-                        thresholds:
-                        -
-                           closedLoopControlName: "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3"
-                           closedLoopEventStatus: ONSET
-                           version: "1.0.2"
-                           fieldPath: "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated"
-                           thresholdValue: 500
-                           direction: LESS_OR_EQUAL
-                           severity: MAJOR
-                        -
-                           closedLoopControlName: "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3"
-                           closedLoopEventStatus: ONSET
-                           version: "1.0.2"
-                           fieldPath: "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated"
-                           thresholdValue: 5000
-                           direction: GREATER_OR_EQUAL
-                           severity: CRITICAL
+   -  onap.scaleout.tca:
+         type: onap.policies.monitoring.cdap.tca.hi.lo.app
+         type_version: 1.0.0
+         version: 2.0.0
+         metadata:
+            policy-id: onap.scaleout.tca
+         properties:
+            tca_policy:
+               domain: measurementsForVfScaling
+               metricsPerEventName:
+               -  eventName: vLoadBalancer
+                  controlLoopSchemaType: VNF
+                  policyScope: type=configuration
+                  policyName: onap.scaleout.tca
+                  policyVersion: v0.0.1
+                  thresholds:
+                  -  closedLoopControlName: ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3
+                     closedLoopEventStatus: ONSET
+                     version: 1.0.2
+                     fieldPath: $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
+                     thresholdValue: 500
+                     direction: LESS_OR_EQUAL
+                     severity: MAJOR
+                  -  closedLoopControlName: ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3
+                     closedLoopEventStatus: ONSET
+                     version: 1.0.2
+                     fieldPath: $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
+                     thresholdValue: 5000
+                     direction: GREATER_OR_EQUAL
+                     severity: CRITICAL
\ No newline at end of file