From dc272e0912390292fa09e84d56380ac3697250cd Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Wed, 8 Apr 2020 14:40:37 -0400
Subject: Add SDNR notifications to frankfurt rules

Issue-ID: POLICY-2468
Change-Id: Ibf4d3e5f62fa3106028dcf85050c270b8eab0a89
Signed-off-by: Jim Hahn <jrh3@att.com>
---
 .../controller-frankfurt/src/main/resources/frankfurt.drl  | 14 ++++++++++++++
 .../src/test/resources/config/event-manager.properties     |  2 +-
 .../test/resources/config/frankfurt-controller.properties  |  5 ++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'controlloop/common/controller-frankfurt/src')

diff --git a/controlloop/common/controller-frankfurt/src/main/resources/frankfurt.drl b/controlloop/common/controller-frankfurt/src/main/resources/frankfurt.drl
index 00c4f5f10..f54786da9 100644
--- a/controlloop/common/controller-frankfurt/src/main/resources/frankfurt.drl
+++ b/controlloop/common/controller-frankfurt/src/main/resources/frankfurt.drl
@@ -243,6 +243,20 @@ rule "EVENT.MANAGER.PROCESSING"
                 $manager, e);
     }
     //
+    // Generate Response notification
+    //
+    try {
+        ControlLoopResponse clResponse = $manager.getControlLoopResponse();
+        if (clResponse != null) {
+            PolicyEngineConstants.getManager().deliver("DCAE_CL_RSP", clResponse);
+        }
+
+    } catch(RuntimeException e) {
+        logger.warn("{}: {}.{}: manager={} exception generating Response notification",
+                $manager.getClosedLoopControlName(), $manager.getPolicyName(), drools.getRule().getName(),
+                $manager, e);
+    }
+    //
     // Discard this message and wait for the next response.
     //
     $manager.nextStep();
diff --git a/controlloop/common/controller-frankfurt/src/test/resources/config/event-manager.properties b/controlloop/common/controller-frankfurt/src/test/resources/config/event-manager.properties
index e5bd83c92..384346e84 100644
--- a/controlloop/common/controller-frankfurt/src/test/resources/config/event-manager.properties
+++ b/controlloop/common/controller-frankfurt/src/test/resources/config/event-manager.properties
@@ -67,7 +67,7 @@ actor.service.SDNC.operations.Reroute.path=\
 
 actor.service.SDNR.sinkTopic=SDNR-CL
 actor.service.SDNR.sourceTopic=SDNR-CL-RSP
-actor.service.SDNR.operations.ModifyConfig.placeholder=
+actor.service.SDNR.operations.any.placeholder=
 
 actor.service.SO.clientName=SO
 actor.service.SO.pathGet=orchestrationRequests/v5/
diff --git a/controlloop/common/controller-frankfurt/src/test/resources/config/frankfurt-controller.properties b/controlloop/common/controller-frankfurt/src/test/resources/config/frankfurt-controller.properties
index 8ed43c492..2839e0d2e 100644
--- a/controlloop/common/controller-frankfurt/src/test/resources/config/frankfurt-controller.properties
+++ b/controlloop/common/controller-frankfurt/src/test/resources/config/frankfurt-controller.properties
@@ -53,10 +53,13 @@ noop.source.topics.POLICY-CL-MGT.events.custom.gson=org.onap.policy.controlloop.
 noop.source.topics.APPC-LCM-READ.events=org.onap.policy.appclcm.AppcLcmDmaapWrapper
 noop.source.topics.APPC-LCM-READ.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson
 
-noop.sink.topics=APPC-CL,APPC-LCM-READ,POLICY-CL-MGT,SDNR-CL
+noop.sink.topics=APPC-CL,APPC-LCM-READ,POLICY-CL-MGT,SDNR-CL,DCAE_CL_RSP
 
 noop.sink.topics.POLICY-CL-MGT.events=org.onap.policy.controlloop.VirtualControlLoopNotification
 noop.sink.topics.POLICY-CL-MGT.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty
 
 noop.sink.topics.SDNR-CL.events=org.onap.policy.sdnr.PciRequestWrapper
 noop.sink.topics.SDNR-CL.events.custom.gson=org.onap.policy.sdnr.util.Serialization,gson
+
+noop.sink.topics.DCAE_CL_RSP.events=org.onap.policy.controlloop.ControlLoopResponse
+noop.sink.topics.DCAE_CL_RSP.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty
-- 
cgit 1.2.3-korg