From aa8225b5211485b3c1150c21e51fd3e93b7f31d3 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Mon, 9 Mar 2020 15:15:05 -0400 Subject: Retool rules tests Extracted common code from various XxxBaseTest classes into: - Topics class to manage messages for test topics - HttpClients class to manage HttpClient objects for tests - Simulators class to manage simulators for tests - Rules class to manage start up and shutdown of rules Merged remaining code from XxxBaseTest classes into a single class. Modified the Frankfurt and Usescases tests to subclass from this new class and specify just the relevant tests to be executed. Issue-ID: POLICY-2385 Signed-off-by: Jim Hahn Change-Id: Iaf83c9d2b205a4c343e0dde23ec86508f5773693 --- .../duplicates/duplicates.appc.success.json | 22 +++++++++++++ .../resources/duplicates/duplicates.onset.1.json | 16 ++++++++++ .../resources/duplicates/duplicates.onset.2.json | 16 ++++++++++ .../duplicates/tosca-compliant-duplicates.json | 37 ++++++++++++++++++++++ 4 files changed, 91 insertions(+) create mode 100644 controlloop/common/rules-test/src/main/resources/duplicates/duplicates.appc.success.json create mode 100644 controlloop/common/rules-test/src/main/resources/duplicates/duplicates.onset.1.json create mode 100644 controlloop/common/rules-test/src/main/resources/duplicates/duplicates.onset.2.json create mode 100644 controlloop/common/rules-test/src/main/resources/duplicates/tosca-compliant-duplicates.json (limited to 'controlloop/common/rules-test/src/main/resources/duplicates') diff --git a/controlloop/common/rules-test/src/main/resources/duplicates/duplicates.appc.success.json b/controlloop/common/rules-test/src/main/resources/duplicates/duplicates.appc.success.json new file mode 100644 index 000000000..331021798 --- /dev/null +++ b/controlloop/common/rules-test/src/main/resources/duplicates/duplicates.appc.success.json @@ -0,0 +1,22 @@ +{ + "body": { + "output": { + "common-header": { + "timestamp": "2017-08-25T21:06:23.037Z", + "api-ver": "5.00", + "originator-id": "664be3d2-6c12-4f4b-a3e7-c349acced200", + "request-id": "664be3d2-6c12-4f4b-a3e7-c349acced200", + "sub-request-id": "${replaceMe}", + "flags": {} + }, + "status": { + "code": 400, + "message": "Restart Successful" + } + } + }, + "version": "2.0", + "rpc-name": "restart", + "correlation-id": "664be3d2-6c12-4f4b-a3e7-c349acced200-1", + "type": "response" +} diff --git a/controlloop/common/rules-test/src/main/resources/duplicates/duplicates.onset.1.json b/controlloop/common/rules-test/src/main/resources/duplicates/duplicates.onset.1.json new file mode 100644 index 000000000..70f48442f --- /dev/null +++ b/controlloop/common/rules-test/src/main/resources/duplicates/duplicates.onset.1.json @@ -0,0 +1,16 @@ +{ + "closedLoopControlName": "ControlLoop-Duplicates-48f0c2c3-a172-4192-9ae3-052274181b6e", + "closedLoopAlarmStart": 1463679805324, + "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca", + "closedLoopEventStatus": "ONSET", + "requestID": "${replaceMe}", + "target_type": "VNF", + "target": "generic-vnf.vnf-id", + "AAI": { + "vserver.is-closed-loop-disabled": "false", + "vserver.prov-status": "ACTIVE", + "generic-vnf.vnf-id": "duplicate-VNF" + }, + "from": "DCAE", + "version": "1.0.2" +} diff --git a/controlloop/common/rules-test/src/main/resources/duplicates/duplicates.onset.2.json b/controlloop/common/rules-test/src/main/resources/duplicates/duplicates.onset.2.json new file mode 100644 index 000000000..046243609 --- /dev/null +++ b/controlloop/common/rules-test/src/main/resources/duplicates/duplicates.onset.2.json @@ -0,0 +1,16 @@ +{ + "closedLoopControlName": "ControlLoop-Duplicates-48f0c2c3-a172-4192-9ae3-052274181b6e", + "closedLoopAlarmStart": 1463679805324, + "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca", + "closedLoopEventStatus": "ONSET", + "requestID": "664be3d2-6c12-4f4b-a3e7-c349acced200", + "target_type": "VNF", + "target": "generic-vnf.vnf-id", + "AAI": { + "vserver.is-closed-loop-disabled": "false", + "vserver.prov-status": "ACTIVE", + "generic-vnf.vnf-id": "vCPE_Infrastructure_vGMUX_demo_app" + }, + "from": "DCAE", + "version": "1.0.2" +} diff --git a/controlloop/common/rules-test/src/main/resources/duplicates/tosca-compliant-duplicates.json b/controlloop/common/rules-test/src/main/resources/duplicates/tosca-compliant-duplicates.json new file mode 100644 index 000000000..d67472743 --- /dev/null +++ b/controlloop/common/rules-test/src/main/resources/duplicates/tosca-compliant-duplicates.json @@ -0,0 +1,37 @@ +{ + "type": "onap.policies.controlloop.operational.common.Drools", + "type_version": "1.0.0", + "version": "1.0.0", + "name": "operational.restart", + "metadata": { + "policy-id": "operational.restart" + }, + "properties": { + "controllerName": "usecases", + "id": "ControlLoop-Duplicates-48f0c2c3-a172-4192-9ae3-052274181b6e", + "timeout": 3600, + "abatement": false, + "trigger": "unique-policy-id-1-restart", + "operations": [ + { + "id": "unique-policy-id-1-restart", + "description": "Restart the VM", + "operation": { + "actor": "APPC", + "operation": "Restart", + "target": { + "targetType": "VM" + } + }, + "timeout": 1200, + "retries": 3, + "success": "final_success", + "failure": "final_failure", + "failure_timeout": "final_failure_timeout", + "failure_retries": "final_failure_retries", + "failure_exception": "final_failure_exception", + "failure_guard": "final_failure_guard" + } + ] + } +} -- cgit 1.2.3-korg