From 09148c800bf7ca61ac2f96e005511753d4237aa0 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Wed, 2 Sep 2020 11:16:16 -0400 Subject: Use models-examples in CSITs Replaced tosca policies found in the test "data" directory with policies from models-examples. Also added the dmaap simulator to the pap CSIT to prevent the error log from filling with dmaap errors while trying to debug the CSIT. Issue-ID: POLICY-2813 Change-Id: I6bccffa41acd0fda0b945fe8e3cd6badde1ac4c1 Signed-off-by: Jim Hahn --- .../data/onap.policy.naming.decision.request.json | 2 +- .../data/vCPE.policy.monitoring.input.tosca.json | 51 ---------------------- 2 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 tests/policy/xacml-pdp/data/vCPE.policy.monitoring.input.tosca.json (limited to 'tests/policy/xacml-pdp/data') diff --git a/tests/policy/xacml-pdp/data/onap.policy.naming.decision.request.json b/tests/policy/xacml-pdp/data/onap.policy.naming.decision.request.json index d30e0e27..3833a241 100644 --- a/tests/policy/xacml-pdp/data/onap.policy.naming.decision.request.json +++ b/tests/policy/xacml-pdp/data/onap.policy.naming.decision.request.json @@ -1,6 +1,6 @@ { "ONAPName": "SDNC", - "ONAPComponent": "SNDC-component", + "ONAPComponent": "SDNC-component", "ONAPInstance": "SDNC-component-instance", "requestId": "unique-request-sdnc-1", "action": "naming", diff --git a/tests/policy/xacml-pdp/data/vCPE.policy.monitoring.input.tosca.json b/tests/policy/xacml-pdp/data/vCPE.policy.monitoring.input.tosca.json deleted file mode 100644 index 8ec03fe5..00000000 --- a/tests/policy/xacml-pdp/data/vCPE.policy.monitoring.input.tosca.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "tosca_definitions_version": "tosca_simple_yaml_1_1_0", - "topology_template": { - "policies": [ - { - "onap.restart.tca": { - "type": "onap.policies.monitoring.tcagen2", - "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" - } - ] - } - ] - } - } - } - } - ] - } -} -- cgit 1.2.3-korg