Fix SO Request body

- Renamed modelNameVersionId to modelVersionId in SOModelInfo
- Removed requestID from SO Request body
	- As a result of this, an SOResponseWrapper was needed in order to
	  attach the control loop event requestId to use in the SOResponse
	  rule in drl (the requestID that is returned in the SO response
	  is a newly generated requestId with no relation to the Policy
	  control loop event requestId as per Arthur)
	- Updated drl to reflect the above mentioned change
- Updated simulator and junits to reflect changes
- Added an additional null httpResponse check/logger statement in SOManager and RestManager

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

1 files changed, 6 insertions, 6 deletions

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 bf00a51d3..9cb211b22 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
@@ -327,7 +327,7 @@ public class SOActorServiceProvider implements Actor {
 
 			// Construct SO Request
 			SORequest request = new SORequest();
-			request.requestId = onset.requestID;
+//			request.requestId = onset.requestID;
 			request.requestDetails = new SORequestDetails();
 			request.requestDetails.modelInfo = new SOModelInfo();
 			request.requestDetails.cloudConfiguration = new SOCloudConfiguration();
@@ -344,7 +344,7 @@ public class SOActorServiceProvider implements Actor {
 			//
 			request.requestDetails.modelInfo.modelType = "vfModule";
 			request.requestDetails.modelInfo.modelInvariantId = getVfModuleItemModelInvariantId();
-			request.requestDetails.modelInfo.modelNameVersionId = getVfModuleItemModelNameVersionId();
+			request.requestDetails.modelInfo.modelVersionId = getVfModuleItemModelNameVersionId();
 			request.requestDetails.modelInfo.modelName = getVfModuleItemModelName();
 			request.requestDetails.modelInfo.modelVersion = getVfModuleItemModelVersionId();
 			//
@@ -365,7 +365,7 @@ public class SOActorServiceProvider implements Actor {
 			relatedInstanceListElement1.relatedInstance.modelInfo = new SOModelInfo();
 			relatedInstanceListElement1.relatedInstance.modelInfo.modelType = "service";
 			relatedInstanceListElement1.relatedInstance.modelInfo.modelInvariantId = getServiceItemModelInvariantId();
-			relatedInstanceListElement1.relatedInstance.modelInfo.modelNameVersionId = getServiceItemModelNameVersionId();
+			relatedInstanceListElement1.relatedInstance.modelInfo.modelVersionId = getServiceItemModelNameVersionId();
 			relatedInstanceListElement1.relatedInstance.modelInfo.modelName = getServiceItemModelName();
 			relatedInstanceListElement1.relatedInstance.modelInfo.modelVersion = getServiceItemModelVersion();
 			//
@@ -373,7 +373,7 @@ public class SOActorServiceProvider implements Actor {
 			relatedInstanceListElement2.relatedInstance.modelInfo = new SOModelInfo();
 			relatedInstanceListElement2.relatedInstance.modelInfo.modelType = "vnf";
 			relatedInstanceListElement2.relatedInstance.modelInfo.modelInvariantId = getVnfItemModelInvariantId();
-			relatedInstanceListElement2.relatedInstance.modelInfo.modelNameVersionId = getVnfItemModelNameVersionId();
+			relatedInstanceListElement2.relatedInstance.modelInfo.modelVersionId = getVnfItemModelNameVersionId();
 			relatedInstanceListElement2.relatedInstance.modelInfo.modelName = getVnfItemModelName();
 			relatedInstanceListElement2.relatedInstance.modelInfo.modelVersion = getVnfItemModelVersion();
 			relatedInstanceListElement2.relatedInstance.modelInfo.modelCustomizationName = getVnfItemVnfType();
@@ -397,9 +397,9 @@ public class SOActorServiceProvider implements Actor {
 	 * @param wm
 	 * @param request
 	 */
-	public static void sendRequest(WorkingMemory wm, Object request) {
+	public static void sendRequest(String requestID, WorkingMemory wm, Object request) {
 		SOManager Mm = new SOManager();
-		Mm.asyncSORestCall(wm, getServiceItemServiceInstanceId(), getVnfItemVnfId(), (SORequest)request);
+		Mm.asyncSORestCall(requestID, wm, getServiceItemServiceInstanceId(), getVnfItemVnfId(), (SORequest)request);
 	}
 		
 	/**