From 0a75480b52d70ba87e5cef53dc3360d0a79ce4ea Mon Sep 17 00:00:00 2001 From: "Hockla, Ali (ah999m)" Date: Thu, 9 Nov 2017 08:38:35 -0600 Subject: Fix SO Request structure Issue-ID: POLICY-438 Change-Id: I05e634782004fff5540b3e6fabb9e22846438cb1 Signed-off-by: Hockla, Ali (ah999m) --- .../org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java | 1 + .../model-impl/so/src/main/java/org/onap/policy/so/SORequestInfo.java | 2 ++ .../so/src/main/java/org/onap/policy/so/SOResponseWrapper.java | 3 +++ .../src/test/java/org/onap/policy/simulators/SoSimulatorTest.java | 1 + 4 files changed, 7 insertions(+) diff --git a/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java b/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java index 9cb211b22..9e579809c 100644 --- a/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java +++ b/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java @@ -353,6 +353,7 @@ public class SOActorServiceProvider implements Actor { request.requestDetails.requestInfo.instanceName = getVfModuleItemVfModuleName(); request.requestDetails.requestInfo.source = "POLICY"; request.requestDetails.requestInfo.suppressRollback = false; + request.requestDetails.requestInfo.requestorId = "policy"; // // relatedInstanceList // diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestInfo.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestInfo.java index 640649800..2e7beab16 100644 --- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestInfo.java +++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestInfo.java @@ -59,6 +59,8 @@ public class SORequestInfo implements Serializable { @SerializedName("orderVersion") public Integer orderVersion; + @SerializedName("requestorId") + public String requestorId; public SORequestInfo() { } diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOResponseWrapper.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOResponseWrapper.java index 6b2017eb2..3b82edf5b 100644 --- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOResponseWrapper.java +++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOResponseWrapper.java @@ -57,6 +57,9 @@ public class SOResponseWrapper implements Serializable { if (this == obj) { return true; } + if (obj == null) { + return false; + } if (getClass() != obj.getClass()) { return false; } diff --git a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/SoSimulatorTest.java b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/SoSimulatorTest.java index 3e5af3891..3aaf1dc55 100644 --- a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/SoSimulatorTest.java +++ b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/SoSimulatorTest.java @@ -96,6 +96,7 @@ public class SoSimulatorTest { "vDNS_Ete_Named90e1ab3-dcd5-4877-9edb-eadfc84e32c8"; request.requestDetails.requestInfo.source = "POLICY"; request.requestDetails.requestInfo.suppressRollback = false; + request.requestDetails.requestInfo.requestorId = "policy"; // // relatedInstanceList // -- cgit 1.2.3-korg