1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>

1 files changed, 23 insertions, 4 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestParameters.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestParameters.java
index dee0649184..d6b79bf1eb 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestParameters.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestParameters.java
@@ -21,7 +21,6 @@
 package org.openecomp.mso.apihandlerinfra.serviceinstancebeans;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -29,8 +28,6 @@ import org.codehaus.jackson.annotate.JsonIgnore;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
 
-import org.openecomp.mso.apihandlerinfra.MsoRequest;
-
 @JsonSerialize(include=JsonSerialize.Inclusion.NON_DEFAULT)
 public class RequestParameters {
 
@@ -44,6 +41,10 @@ public class RequestParameters {
 	private boolean autoBuildVfModules = false;
 	@JsonSerialize(include=Inclusion.ALWAYS)
 	private boolean cascadeDelete = false;
+	@JsonSerialize(include=Inclusion.ALWAYS)
+	private boolean usePreload=true; // usePreload would always be true for Update
+	@JsonSerialize(include=Inclusion.ALWAYS)
+	private boolean rebuildVolumeGroups = false;
 
 
 	public String getSubscriptionServiceType() {
@@ -107,12 +108,30 @@ public class RequestParameters {
 		this.cascadeDelete = cascadeDelete;
 	}
 
+	public boolean isUsePreload() {
+		return usePreload;
+	}
+
+	public void setUsePreload(boolean usePreload) {
+		this.usePreload = usePreload;
+	}
+	
+	public boolean rebuildVolumeGroups() {
+		return rebuildVolumeGroups;
+	}
+
+	public void setRebuildVolumeGroups(boolean rebuildVolumeGroups) {
+		this.rebuildVolumeGroups = rebuildVolumeGroups;
+	}
+
 	@Override
 	public String toString() {
 		return "RequestParameters [subscriptionServiceType="
 				+ subscriptionServiceType + ", userParams=" + userParams
 				+ ", aLaCarte=" + aLaCarte + ", autoBuildVfModules="
-				+ autoBuildVfModules + "]";
+				+ autoBuildVfModules + ", usePreload="
+				+ usePreload + ", rebuildVolumeGroups="
+				+ rebuildVolumeGroups +"]";
 	}