From ef5768de060c6cbf10b06569e00617b052dc7e61 Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Mon, 23 Mar 2020 11:36:09 -0400
Subject: Update new SDNR actor with v2.0 structures

SDNR v2.0 introduced an extra "input" and "output" layer within
the body of the messages.  Added POJOs to match that, and updated
the actor to use the new POJOs so that no extra steps are needed
during serialization or deserialization.
Also modified the SDNR and APPC-LCM simulators to discard request messages
when looking for the response, if the sink and source topics happen to
be the same.
Added the SDNR simulator.
Added more coverage to the SDNR actor.
Fixed a sonar issue in the SDNR junit code:
- use a constant instead of a literal (i.e., for "ModifyConfig")

Issue-ID: POLICY-2434
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I70914a299dd5e9ee8eaccb5d42a2596cab814091
---
 .../src/test/resources/simParameters.json              | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'models-sim/policy-models-simulators')

diff --git a/models-sim/policy-models-simulators/src/test/resources/simParameters.json b/models-sim/policy-models-simulators/src/test/resources/simParameters.json
index 5f946f105..33821a538 100644
--- a/models-sim/policy-models-simulators/src/test/resources/simParameters.json
+++ b/models-sim/policy-models-simulators/src/test/resources/simParameters.json
@@ -62,6 +62,12 @@
             "servers": ["localhost"],
             "topicCommInfrastructure": "DMAAP",
             "useHttps": true
+        },
+        {
+            "topic": "SDNR-CL",
+            "servers": ["localhost"],
+            "topicCommInfrastructure": "DMAAP",
+            "useHttps": true
         }
     ],
     "topicSources": [
@@ -76,6 +82,12 @@
             "servers": ["localhost"],
             "topicCommInfrastructure": "DMAAP",
             "useHttps": true
+        },
+        {
+            "topic": "SDNR-CL-RSP",
+            "servers": ["localhost"],
+            "topicCommInfrastructure": "DMAAP",
+            "useHttps": true
         }
     ],
     "topicServers": [
@@ -90,6 +102,12 @@
             "providerClass": "org.onap.policy.simulators.AppcLcmTopicServer",
             "sink": "APPC-LCM-WRITE",
             "source": "APPC-LCM-READ"
+        },
+        {
+            "name": "SDNR simulator",
+            "providerClass": "org.onap.policy.simulators.SdnrTopicServer",
+            "sink": "SDNR-CL",
+            "source": "SDNR-CL-RSP"
         }
     ]
 }
-- 
cgit 1.2.3-korg