assignvfmodulebb must send use-preload

Corrections to JUnit data to account for usePreload usage.
Resurrect usage of usePreload value and pass fromPreload to SDNC.

Change-Id: I6fb52f6abf09ec501e90335a01e37db1c10ae2b3
Issue-ID: SO-1539
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

1 files changed, 17 insertions, 11 deletions

diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/RequestParameters.java b/common/src/main/java/org/onap/so/serviceinstancebeans/RequestParameters.java
index 4dfa1d4130..45f1accf2f 100644
--- a/common/src/main/java/org/onap/so/serviceinstancebeans/RequestParameters.java
+++ b/common/src/main/java/org/onap/so/serviceinstancebeans/RequestParameters.java
@@ -44,6 +44,8 @@ public class RequestParameters implements Serializable {
 	private Boolean aLaCarte;
 	@JsonProperty("payload")
 	private String payload;
+	@JsonProperty("usePreload")
+	private Boolean usePreload; // usePreload would always be true for Update
 	
 	// DONOT USE. It is intended to handle older VID requests(prior to 1802)
 	@Deprecated
@@ -55,8 +57,6 @@ public class RequestParameters implements Serializable {
 	private Boolean cascadeDelete;
 	@JsonProperty("testApi")
 	private String testApi; // usePreload would always be true for Update
-	@JsonProperty("usePreload")
-	private Boolean usePreload; // usePreload would always be true for Update
 	@JsonProperty("rebuildVolumeGroups")
 	private Boolean rebuildVolumeGroups;	
 
@@ -86,6 +86,20 @@ public class RequestParameters implements Serializable {
 	public void setPayload(String value){
 		this.payload = value;
 	}
+	
+	public Boolean isUsePreload() {
+		return usePreload;
+	}
+	
+	@JsonProperty("usePreload")
+	public Boolean getUsePreload() {
+		return usePreload;
+	}
+	
+	@JsonProperty("usePreload")
+	public void setUsePreload(Boolean usePreload) {
+		this.usePreload = usePreload;
+	}
 
 	@Deprecated
 	@Transient
@@ -141,15 +155,7 @@ public class RequestParameters implements Serializable {
 
 	public void setCascadeDelete(Boolean cascadeDelete) {
 		this.cascadeDelete = cascadeDelete;
-	}
-
-	public Boolean isUsePreload() {
-		return usePreload;
-	}
-
-	public void setUsePreload(Boolean usePreload) {
-		this.usePreload = usePreload;
-	}
+	}	
 	
 	public Boolean getRebuildVolumeGroups() {
 		return rebuildVolumeGroups;