Fix SO Request structure

Issue-ID: POLICY-438
Change-Id: I05e634782004fff5540b3e6fabb9e22846438cb1
Signed-off-by: Hockla, Ali (ah999m) <ah999m@att.com>

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 9cb211b..9e57980 100644 (file)
--- 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 6406498..2e7beab 100644 (file)
--- 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")\r
        public Integer orderVersion;\r
        \r
+       @SerializedName("requestorId")\r
+       public String requestorId;\r
 \r
        public SORequestInfo() {\r
        }\r

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 6b2017e..3b82edf 100644 (file)
--- 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 3e5af38..3aaf1dc 100644 (file)
--- 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
     //