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>

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/GeneralTopologyObjectMapper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/GeneralTopologyObjectMapper.java
index fedbde2..b086b8a 100644 (file)
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/GeneralTopologyObjectMapper.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/GeneralTopologyObjectMapper.java
@@ -163,7 +163,7 @@ public class GeneralTopologyObjectMapper {
                        vfModuleInformation.setFromPreload(requestContext.getRequestParameters().getUsePreload());                      
                }
                else {
-                       vfModuleInformation.setFromPreload(false);
+                       vfModuleInformation.setFromPreload(true);
                }
                
                return vfModuleInformation;

diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/GeneralTopologyObjectMapperTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/GeneralTopologyObjectMapperTest.java
index 3bb5427..630bcce 100644 (file)
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/GeneralTopologyObjectMapperTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/GeneralTopologyObjectMapperTest.java
@@ -362,7 +362,7 @@ public class GeneralTopologyObjectMapperTest  extends TestDataSetup {
                assertNull(gcRequestInput.getOnapModelInformation());
                assertEquals(vfModule.getVfModuleId(),gcRequestInput.getVfModuleId());
                assertNotNull(gcRequestInput.getVfModuleId());
-               assertFalse(gcRequestInput.getFromPreload());
+               assertTrue(gcRequestInput.getFromPreload());
        }
        
        @Test
@@ -386,7 +386,7 @@ public class GeneralTopologyObjectMapperTest  extends TestDataSetup {
                assertNull(gcRequestInput.getOnapModelInformation());
                assertEquals(vfModule.getVfModuleId(),gcRequestInput.getVfModuleId());
                assertNotNull(gcRequestInput.getVfModuleId());
-               assertFalse(gcRequestInput.getFromPreload());
+               assertTrue(gcRequestInput.getFromPreload());
        }
        
        @Test

diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/genericResourceApiVfModuleOperationInformationUnassign.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/genericResourceApiVfModuleOperationInformationUnassign.json
index cecb4c1..c28b0fa 100644 (file)
--- a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/genericResourceApiVfModuleOperationInformationUnassign.json
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/genericResourceApiVfModuleOperationInformationUnassign.json
@@ -22,7 +22,7 @@
   },
   "vf-module-information" : {    
     "vf-module-id" : "testVfModuleId",
-    "from-preload": false  
+    "from-preload": true  
  },
   "vnf-information" : {    
     "vnf-id" : "testVnfId",

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 edb92ef..8e1a6f5 100644 (file)
--- 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
@@ -71,6 +71,23 @@ public class RequestParametersValidation implements ValidationRule{
                }
                if(requestScope.equalsIgnoreCase(ModelType.vfModule.name())){
                        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) {                                                      

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/validation/RequestParametersValidationTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/validation/RequestParametersValidationTest.java
index 2813ef7..8d456e3 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/validation/RequestParametersValidationTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/validation/RequestParametersValidationTest.java
@@ -66,7 +66,7 @@ public class RequestParametersValidationTest extends BaseTest{
                RequestParametersValidation validation = new RequestParametersValidation();
                validation.validate(info);
                
-               assertFalse(info.getReqParameters().getUsePreload());           
+               assertTrue(info.getReqParameters().getUsePreload());            
        }
        
        @Test
@@ -100,4 +100,68 @@ public class RequestParametersValidationTest extends BaseTest{
                
                assertTrue(info.getReqParameters().getUsePreload());
        }
+       
+       @Test
+       public void testServiceWithFalseALaCarte() throws IOException, ValidationException {
+               String requestJson = new String(Files.readAllBytes(Paths.get("src/test/resources/MsoRequestTest/RequestParameters/VfModuleModelVersionId.json")));
+               ObjectMapper mapper = new ObjectMapper();
+               ServiceInstancesRequest sir  = mapper.readValue(requestJson, ServiceInstancesRequest.class);    
+               sir.getRequestDetails().getRequestParameters().setUsePreload(null);             
+               ValidationInformation info = new ValidationInformation(sir, new HashMap<String, String>(), Action.createInstance, 
+                                                                                                                               6, false, sir.getRequestDetails().getRequestParameters());              
+               sir.setServiceInstanceId("0fd90c0c-0e3a-46e2-abb5-4c4820d5985b");
+               info.setRequestScope("service");
+               RequestParametersValidation validation = new RequestParametersValidation();
+               validation.validate(info);
+               
+               assertFalse(info.getReqParameters().getUsePreload());           
+       }
+       
+       @Test
+       public void testServiceWithNoALaCarte() throws IOException, ValidationException {
+               String requestJson = new String(Files.readAllBytes(Paths.get("src/test/resources/MsoRequestTest/RequestParameters/VfModuleRequestParametersNoALaCarte.json")));
+               ObjectMapper mapper = new ObjectMapper();
+               ServiceInstancesRequest sir  = mapper.readValue(requestJson, ServiceInstancesRequest.class);
+               ValidationInformation info = new ValidationInformation(sir, new HashMap<String, String>(), Action.createInstance, 
+                                                                                                                               6, false, sir.getRequestDetails().getRequestParameters());
+               sir.setServiceInstanceId("0fd90c0c-0e3a-46e2-abb5-4c4820d5985b");
+               sir.getRequestDetails().getRequestParameters().setSubscriptionServiceType("subscriptionServiceType");
+               info.setRequestScope("service");
+               RequestParametersValidation validation = new RequestParametersValidation();
+               validation.validate(info);
+               
+               assertFalse(info.getReqParameters().getUsePreload());           
+       }
+       
+       @Test
+       public void testServiceWithTrueALaCarte() throws IOException, ValidationException {
+               String requestJson = new String(Files.readAllBytes(Paths.get("src/test/resources/MsoRequestTest/RequestParameters/VfModuleRequestParametersIsALaCarte.json")));
+               ObjectMapper mapper = new ObjectMapper();
+               ServiceInstancesRequest sir  = mapper.readValue(requestJson, ServiceInstancesRequest.class);
+               sir.getRequestDetails().getRequestParameters().setUsePreload(null);
+               ValidationInformation info = new ValidationInformation(sir, new HashMap<String, String>(), Action.createInstance, 
+                                                                                                                               6, true, sir.getRequestDetails().getRequestParameters());
+               sir.setServiceInstanceId("0fd90c0c-0e3a-46e2-abb5-4c4820d5985b");       
+               info.setRequestScope("service");
+               RequestParametersValidation validation = new RequestParametersValidation();
+               validation.validate(info);
+               
+               assertTrue(info.getReqParameters().getUsePreload());
+       }
+       
+       @Test
+       public void testServiceWithReqVersionBelow4() throws IOException, ValidationException {
+               String requestJson = new String(Files.readAllBytes(Paths.get("src/test/resources/MsoRequestTest/RequestParameters/VfModuleModelVersionId.json")));
+               ObjectMapper mapper = new ObjectMapper();
+               ServiceInstancesRequest sir  = mapper.readValue(requestJson, ServiceInstancesRequest.class);            
+               sir.getRequestDetails().getRequestParameters().setUsePreload(null);
+               ValidationInformation info = new ValidationInformation(sir, new HashMap<String, String>(), Action.createInstance, 
+                                                                                                                               3, false, sir.getRequestDetails().getRequestParameters());
+               sir.setServiceInstanceId("0fd90c0c-0e3a-46e2-abb5-4c4820d5985b");
+               info.setRequestScope("service");
+               RequestParametersValidation validation = new RequestParametersValidation();
+               validation.validate(info);
+               
+               assertTrue(info.getReqParameters().getUsePreload());
+       }       
 }