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
---
 .../main/java/org/onap/policy/sdnr/PciBody.java    | 32 +++++++++++++++++++
 .../main/java/org/onap/policy/sdnr/PciMessage.java | 36 ++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciBody.java
 create mode 100644 models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciMessage.java

(limited to 'models-interactions/model-impl')

diff --git a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciBody.java b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciBody.java
new file mode 100644
index 000000000..c264166ad
--- /dev/null
+++ b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciBody.java
@@ -0,0 +1,32 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.sdnr;
+
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class PciBody implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private PciRequest input;
+    private PciResponse output;
+}
diff --git a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciMessage.java b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciMessage.java
new file mode 100644
index 000000000..413de8d17
--- /dev/null
+++ b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciMessage.java
@@ -0,0 +1,36 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.sdnr;
+
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * Generic PCI message, which can contain a request or a response.
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PciMessage extends PciWrapper implements Serializable {
+    private static final long serialVersionUID = 879766924715980798L;
+
+    private PciBody body;
+}
-- 
cgit 1.2.3-korg