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>

5 files changed, 161 insertions, 4 deletions

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 9bbd665e4c..d7a9ff1cf7 100644
--- 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
@@ -115,7 +115,7 @@ public class GeneralTopologyObjectMapper {
 	/*
 	 * Build GenericResourceApiVfModuleinformationVfModuleInformation
 	 */
-	public GenericResourceApiVfmoduleinformationVfModuleInformation buildVfModuleInformation(VfModule vfModule, GenericVnf vnf, ServiceInstance serviceInstance, boolean includeModelInformation) throws MapperException {
+	public GenericResourceApiVfmoduleinformationVfModuleInformation buildVfModuleInformation(VfModule vfModule, GenericVnf vnf, ServiceInstance serviceInstance, RequestContext requestContext, boolean includeModelInformation) throws MapperException {
 		GenericResourceApiVfmoduleinformationVfModuleInformation vfModuleInformation = new GenericResourceApiVfmoduleinformationVfModuleInformation();
 		if (includeModelInformation) {
 			if (vfModule.getModelInfoVfModule() == null) {
@@ -135,7 +135,13 @@ public class GeneralTopologyObjectMapper {
 			vfModuleInformation.setVfModuleType(vfModule.getModelInfoVfModule().getModelName());
 		}
 		vfModuleInformation.setVfModuleId(vfModule.getVfModuleId());
-		vfModuleInformation.setFromPreload(null);
+		if (requestContext != null && requestContext.getRequestParameters() != null) {
+			vfModuleInformation.setFromPreload(requestContext.getRequestParameters().getUsePreload());			
+		}
+		else {
+			vfModuleInformation.setFromPreload(null);
+		}
+		
 		return vfModuleInformation;
 	}
 	
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/VfModuleTopologyOperationRequestMapper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/VfModuleTopologyOperationRequestMapper.java
index a6ef02bd4d..b656579c69 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/VfModuleTopologyOperationRequestMapper.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/VfModuleTopologyOperationRequestMapper.java
@@ -95,7 +95,7 @@ public class VfModuleTopologyOperationRequestMapper {
 				requestAction);
 		GenericResourceApiServiceinformationServiceInformation serviceInformation = generalTopologyObjectMapper.buildServiceInformation(serviceInstance, requestContext, customer, includeModelInformation);
 				GenericResourceApiVnfinformationVnfInformation vnfInformation = generalTopologyObjectMapper.buildVnfInformation(vnf, serviceInstance, includeModelInformation);
-		GenericResourceApiVfmoduleinformationVfModuleInformation vfModuleInformation = generalTopologyObjectMapper.buildVfModuleInformation(vfModule, vnf, serviceInstance, includeModelInformation);
+		GenericResourceApiVfmoduleinformationVfModuleInformation vfModuleInformation = generalTopologyObjectMapper.buildVfModuleInformation(vfModule, vnf, serviceInstance, requestContext, includeModelInformation);
 		GenericResourceApiVfmodulerequestinputVfModuleRequestInput vfModuleRequestInput = buildVfModuleRequestInput(vfModule, volumeGroup, cloudRegion, requestContext);
 		GenericResourceApiSdncrequestheaderSdncRequestHeader sdncRequestHeader = buildVfModuleSdncRequestHeader(sdncReqId, genericResourceApiSvcAction);		
 		
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 ba7dc8d618..c039e308f8 100644
--- 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
@@ -22,9 +22,11 @@ package org.onap.so.client.sdnc.mapper;
 
 import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 
 import java.util.HashMap;
 
@@ -43,6 +45,7 @@ import org.onap.sdnc.northbound.client.model.GenericResourceApiParamParam;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiSdncrequestheaderSdncRequestHeader;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiServiceinformationServiceInformation;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiSvcActionEnumeration;
+import org.onap.sdnc.northbound.client.model.GenericResourceApiVfmoduleinformationVfModuleInformation;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiVnfinformationVnfInformation;
 import org.onap.so.bpmn.common.data.TestDataSetup;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Configuration;
@@ -51,10 +54,14 @@ import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.L3Network;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceSubscription;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.VfModule;
 import org.onap.so.bpmn.servicedecomposition.generalobjects.RequestContext;
+import org.onap.so.bpmn.servicedecomposition.generalobjects.RequestParameters;
 import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoConfiguration;
 import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoNetwork;
 import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoServiceInstance;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoVfModule;
+import org.onap.so.client.exception.MapperException;
 import org.onap.so.client.sdnc.beans.SDNCSvcAction;
 
 
@@ -278,4 +285,145 @@ public class GeneralTopologyObjectMapperTest  extends TestDataSetup {
 		assertThat(networkInformation, sameBeanAs(genObjMapper.buildNetworkInformation(network)));
 		
 	}
+	
+
+	@Test
+	public void buildVfModuleInformationTest_withNoModelIsFromPreload() {
+		VfModule vfModule = new VfModule();
+		vfModule.setVfModuleId("TestVfModuleId");
+		ServiceInstance serviceInstance = new ServiceInstance();
+		serviceInstance.setServiceInstanceId("serviceInstanceId");
+		GenericVnf genericVnf = new GenericVnf();
+		genericVnf.setVnfId("TestVnfId");
+		RequestContext requestContext = new RequestContext();
+		RequestParameters requestParameters = new RequestParameters();
+		requestParameters.setUsePreload(true);
+		requestContext.setRequestParameters(requestParameters);
+		GenericResourceApiVfmoduleinformationVfModuleInformation gcRequestInput = null;
+		try {
+			gcRequestInput = genObjMapper.buildVfModuleInformation(vfModule, genericVnf, serviceInstance, requestContext, false);
+		}
+		catch (MapperException ex) {
+			
+		}
+		assertNotNull(gcRequestInput);
+		assertNull(vfModule.getModelInfoVfModule());
+		assertNull(gcRequestInput.getOnapModelInformation());
+		assertEquals(vfModule.getVfModuleId(),gcRequestInput.getVfModuleId());
+		assertNotNull(gcRequestInput.getVfModuleId());
+		assertTrue(gcRequestInput.getFromPreload());
+	}
+	
+	@Test
+	public void buildVfModuleInformationTest_withNoModelIsNotFromPreload() {
+		VfModule vfModule = new VfModule();
+		vfModule.setVfModuleId("TestVfModuleId");
+		ServiceInstance serviceInstance = new ServiceInstance();
+		serviceInstance.setServiceInstanceId("serviceInstanceId");
+		GenericVnf genericVnf = new GenericVnf();
+		genericVnf.setVnfId("TestVnfId");
+		RequestContext requestContext = new RequestContext();
+		RequestParameters requestParameters = new RequestParameters();
+		requestParameters.setUsePreload(false);
+		requestContext.setRequestParameters(requestParameters);
+		GenericResourceApiVfmoduleinformationVfModuleInformation gcRequestInput = null;
+		try {
+			gcRequestInput = genObjMapper.buildVfModuleInformation(vfModule, genericVnf, serviceInstance, requestContext, false);
+		}
+		catch (MapperException ex) {
+			
+		}
+		assertNotNull(gcRequestInput);
+		assertNull(vfModule.getModelInfoVfModule());
+		assertNull(gcRequestInput.getOnapModelInformation());
+		assertEquals(vfModule.getVfModuleId(),gcRequestInput.getVfModuleId());
+		assertNotNull(gcRequestInput.getVfModuleId());
+		assertFalse(gcRequestInput.getFromPreload());
+	}
+	
+	@Test
+	public void buildVfModuleInformationTest_withNoModelNoRequestContext() {
+		VfModule vfModule = new VfModule();
+		vfModule.setVfModuleId("TestVfModuleId");
+		ServiceInstance serviceInstance = new ServiceInstance();
+		serviceInstance.setServiceInstanceId("serviceInstanceId");
+		GenericVnf genericVnf = new GenericVnf();
+		genericVnf.setVnfId("TestVnfId");		
+		GenericResourceApiVfmoduleinformationVfModuleInformation gcRequestInput = null;
+		try {
+			gcRequestInput = genObjMapper.buildVfModuleInformation(vfModule, genericVnf, serviceInstance, null, false);
+		}
+		catch (MapperException ex) {
+			
+		}
+		assertNotNull(gcRequestInput);
+		assertNull(vfModule.getModelInfoVfModule());
+		assertNull(gcRequestInput.getOnapModelInformation());
+		assertEquals(vfModule.getVfModuleId(),gcRequestInput.getVfModuleId());
+		assertNotNull(gcRequestInput.getVfModuleId());
+		assertNull(gcRequestInput.getFromPreload());
+	}
+	
+	@Test
+	public void buildVfModuleInformationTest_withNoModelNoRequestParameters() {
+		VfModule vfModule = new VfModule();
+		vfModule.setVfModuleId("TestVfModuleId");
+		ServiceInstance serviceInstance = new ServiceInstance();
+		serviceInstance.setServiceInstanceId("serviceInstanceId");
+		GenericVnf genericVnf = new GenericVnf();
+		genericVnf.setVnfId("TestVnfId");
+		RequestContext requestContext = new RequestContext();		
+		GenericResourceApiVfmoduleinformationVfModuleInformation gcRequestInput = null;
+		try {
+			gcRequestInput = genObjMapper.buildVfModuleInformation(vfModule, genericVnf, serviceInstance, requestContext, false);
+		}
+		catch (MapperException ex) {
+			
+		}
+		assertNotNull(gcRequestInput);
+		assertNull(vfModule.getModelInfoVfModule());
+		assertNull(gcRequestInput.getOnapModelInformation());
+		assertEquals(vfModule.getVfModuleId(),gcRequestInput.getVfModuleId());
+		assertNotNull(gcRequestInput.getVfModuleId());
+		assertNull(gcRequestInput.getFromPreload());
+	}
+	
+	@Test
+	public void buildVfModuleInformationTest_withModel() {
+		VfModule vfModule = new VfModule();
+		vfModule.setVfModuleId("TestVfModuleId");
+		ModelInfoVfModule modelInfoVfModule = new ModelInfoVfModule();
+		modelInfoVfModule.setModelInvariantUUID("testModelInvariantUUID");
+		modelInfoVfModule.setModelName("testModelName");
+		modelInfoVfModule.setModelVersion("testModelVersion");
+		modelInfoVfModule.setModelUUID("testModelUUID");
+		modelInfoVfModule.setModelCustomizationUUID("testModelCustomizationUUID");
+		vfModule.setModelInfoVfModule(modelInfoVfModule);
+		ServiceInstance serviceInstance = new ServiceInstance();
+		serviceInstance.setServiceInstanceId("serviceInstanceId");
+		GenericVnf genericVnf = new GenericVnf();
+		genericVnf.setVnfId("TestVnfId");
+		RequestContext requestContext = new RequestContext();
+		RequestParameters requestParameters = new RequestParameters();
+		requestParameters.setUsePreload(true);
+		requestContext.setRequestParameters(requestParameters);
+		GenericResourceApiVfmoduleinformationVfModuleInformation gcRequestInput = null;
+		try {
+			gcRequestInput = genObjMapper.buildVfModuleInformation(vfModule, genericVnf, serviceInstance, requestContext, true);
+		}
+		catch (MapperException ex) {
+			
+		}
+		assertNotNull(gcRequestInput);
+		assertNotNull(vfModule.getModelInfoVfModule());
+		assertNotNull(gcRequestInput.getOnapModelInformation());
+		assertEquals(modelInfoVfModule.getModelInvariantUUID(), gcRequestInput.getOnapModelInformation().getModelInvariantUuid());
+		assertEquals(modelInfoVfModule.getModelName(), gcRequestInput.getOnapModelInformation().getModelName());
+		assertEquals(modelInfoVfModule.getModelVersion(), gcRequestInput.getOnapModelInformation().getModelVersion());
+		assertEquals(modelInfoVfModule.getModelUUID(), gcRequestInput.getOnapModelInformation().getModelUuid());
+		assertEquals(modelInfoVfModule.getModelCustomizationUUID(), gcRequestInput.getOnapModelInformation().getModelCustomizationUuid());
+		assertEquals(vfModule.getVfModuleId(),gcRequestInput.getVfModuleId());
+		assertNotNull(gcRequestInput.getVfModuleId());
+		assertTrue(gcRequestInput.getFromPreload());
+	}
 }
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/VfModuleTopologyOperationRequestMapperTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/VfModuleTopologyOperationRequestMapperTest.java
index f492ba3ead..7d5aa9d1d9 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/VfModuleTopologyOperationRequestMapperTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/VfModuleTopologyOperationRequestMapperTest.java
@@ -88,6 +88,9 @@ public class VfModuleTopologyOperationRequestMapperTest {
 		userParams.put("key1", "value1");		
 		requestContext.setUserParams(userParams);
 		requestContext.setProductFamilyId("productFamilyId");
+		RequestParameters requestParameters = new RequestParameters();
+		requestParameters.setUsePreload(true);
+		requestContext.setRequestParameters(requestParameters);
 
 		GenericVnf vnf = new GenericVnf();
 		vnf.setVnfId("testVnfId");
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/genericResourceApiVfModuleOperationInformationAssign.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/genericResourceApiVfModuleOperationInformationAssign.json
index a344e8081e..777f3444d2 100644
--- a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/genericResourceApiVfModuleOperationInformationAssign.json
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/genericResourceApiVfModuleOperationInformationAssign.json
@@ -55,7 +55,7 @@
       "model-invariant-uuid" : "vfModuleModelInvariantUuid"
     },
     "vf-module-id" : "testVfModuleId",
-    "from-preload" : null,
+    "from-preload" : true,
     "vf-module-type": "vfModuleModelName"
    
   },