Set fromPreload to true for aLaCarte and to false

Set fromPreload to true for aLaCarte and to false for Macro if no
usePreload value is specified.

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

1 files changed, 17 insertions, 0 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/validation/RequestParametersValidation.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/validation/RequestParametersValidation.java
index edb92ef68b..8e1a6f5d35 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/validation/RequestParametersValidation.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/validation/RequestParametersValidation.java
@@ -73,6 +73,23 @@ public class RequestParametersValidation implements ValidationRule{
         		if(action == Action.createInstance || action == Action.updateInstance){        			
         			if(requestParameters.isUsePreload() == null){        				
         				if(reqVersion >= 4){       					
+        					if (requestParameters.getALaCarte() == null || requestParameters.getALaCarte() == true) {        						
+        						requestParameters.setUsePreload(true);
+        					}
+        					else {        						
+        						requestParameters.setUsePreload(false);
+        					}
+        				}
+        				else {        				
+        					requestParameters.setUsePreload(true);
+        				}
+        			}
+        		}
+        	}
+        	if(requestScope.equalsIgnoreCase(ModelType.service.name())){
+        		if(action == Action.createInstance){        			
+        			if(requestParameters.isUsePreload() == null){        				
+        				if(reqVersion >= 4){       					
         					if (requestParameters.getALaCarte() == null || requestParameters.getALaCarte() == false) {        						
         						requestParameters.setUsePreload(false);
         					}