Bug fixes to new rules

Also added VdnsTest, VfwTest, and VcpeTest.

Fixed a number of issues with notifications:
- event data (e.g., AAI) was missing
- notification was missing for the start of an operation
- "message" and "history" fields should contain Target object,
  target entity
- "message" field was missing various details (e.g., start time)

Still missing subRequestId - that will require enhancements to
the actors.

Issue-ID: POLICY-2385
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I7fc33ebcd5939d2f33a9d209ac6119e390e0836d

4 files changed, 66 insertions, 2 deletions

diff --git a/controlloop/common/controller-frankfurt/src/test/resources/vcpe/vcpe.onset.2.json b/controlloop/common/controller-frankfurt/src/test/resources/vcpe/vcpe.onset.2.json
index b8c76514e..d08ee47cd 100644
--- a/controlloop/common/controller-frankfurt/src/test/resources/vcpe/vcpe.onset.2.json
+++ b/controlloop/common/controller-frankfurt/src/test/resources/vcpe/vcpe.onset.2.json
@@ -3,7 +3,7 @@
   "closedLoopAlarmStart": 1463679805324,
   "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca",
   "closedLoopEventStatus": "ONSET",
-  "requestID": "8cf3cd05-1218-4224-931b-601494ffe55b",
+  "requestID": "664be3d2-6c12-4f4b-a3e7-c349acced200",
   "target_type": "VNF",
   "target": "generic-vnf.vnf-id",
   "AAI": {
diff --git a/controlloop/common/controller-frankfurt/src/test/resources/vcpe/vcpe.onset.3.json b/controlloop/common/controller-frankfurt/src/test/resources/vcpe/vcpe.onset.3.json
index 40f29b3cf..74a94eb0a 100644
--- a/controlloop/common/controller-frankfurt/src/test/resources/vcpe/vcpe.onset.3.json
+++ b/controlloop/common/controller-frankfurt/src/test/resources/vcpe/vcpe.onset.3.json
@@ -4,7 +4,7 @@
   "closedLoopAlarmEnd": 1570722876324999,
   "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca",
   "closedLoopEventStatus": "ONSET",
-  "requestID": "8cf3cd05-1218-4224-931b-601494ffe55b",
+  "requestID": "664be3d2-6c12-4f4b-a3e7-c349acced200",
   "target_type": "VNF",
   "target": "generic-vnf.vnf-id",
   "AAI": {
diff --git a/controlloop/common/controller-frankfurt/src/test/resources/vdns/tosca-compliant-vdns.json b/controlloop/common/controller-frankfurt/src/test/resources/vdns/tosca-compliant-vdns.json
new file mode 100644
index 000000000..1f4cb4125
--- /dev/null
+++ b/controlloop/common/controller-frankfurt/src/test/resources/vdns/tosca-compliant-vdns.json
@@ -0,0 +1,48 @@
+{
+    "type": "onap.policies.controlloop.operational.common.Drools",
+    "type_version": "1.0.0",
+    "version": "1.0.0",
+    "name": "operational.scale.up",
+    "metadata": {
+        "policy-id": "operational.scale.up"
+    },
+    "properties": {
+        "id": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
+        "timeout": 60,
+        "abatement": false,
+        "trigger": "unique-policy-id-1-scale-up",
+        "operations": [
+            {
+                "id": "unique-policy-id-1-scale-up",
+                "description": "Scale up",
+                "operation": {
+                    "actor": "SO",
+                    "operation": "VF Module Create",
+                    "target": {
+                        "targetType": "VFMODULE",
+                        "entityIds": {
+                            "modelInvariantId": "e6130d03-56f1-4b0a-9a1d-e1b2ebc30e0e",
+                            "modelVersionId": "94b18b1d-cc91-4f43-911a-e6348665f292",
+                            "modelName": "VfwclVfwsnkBbefb8ce2bde..base_vfw..module-0",
+                            "modelVersion": 1,
+                            "modelCustomizationId": "47958575-138f-452a-8c8d-d89b595f8164"
+                        }
+                    },
+                    "payload": {
+                        "requestParameters": "{\"usePreload\":true,\"userParams\":[]}",
+                        "configurationParameters": "[{\"ip-addr\":\"$.vf-module-topology.vf-module-parameters.param[9]\",\"oam-ip-addr\":\"$.vf-module-topology.vf-module-parameters.param[16]\",\"enabled\":\"$.vf-module-topology.vf-module-parameters.param[23]\"}]"
+                    }
+                },
+                "timeout": 30,
+                "retries": 0,
+                "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"
+            }
+        ],
+        "controllerName": "frankfurt"
+    }
+}
diff --git a/controlloop/common/controller-frankfurt/src/test/resources/vdns/vdns.onset.json b/controlloop/common/controller-frankfurt/src/test/resources/vdns/vdns.onset.json
new file mode 100644
index 000000000..13f690952
--- /dev/null
+++ b/controlloop/common/controller-frankfurt/src/test/resources/vdns/vdns.onset.json
@@ -0,0 +1,16 @@
+{
+  "closedLoopControlName": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
+  "closedLoopAlarmStart": 1463679805324,
+  "closedLoopEventClient": "microservice.stringmatcher",
+  "closedLoopEventStatus": "ONSET",
+  "requestID": "c7c6a4aa-bb61-4a15-b831-ba1472dd4a65",
+  "target_type": "VNF",
+  "target": "vserver.vserver-name",
+  "AAI": {
+    "vserver.is-closed-loop-disabled": "false",
+    "vserver.prov-status": "ACTIVE",
+    "vserver.vserver-name": "OzVServer"
+  },
+  "from": "DCAE",
+  "version": "1.0.2"
+}