vnf spin up gr api vnf s base module fails

[so.git] / bpmn / MSOCommonBPMN / src / test / java / org / onap / so / bpmn / servicedecomposition / tasks / BBInputSetupMapperLayerTest.java

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java
index c18dcf5..753a354 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java
@@ -23,6 +23,9 @@ package org.onap.so.bpmn.servicedecomposition.tasks;
 import static com.shazam.shazamcrest.MatcherAssert.assertThat;
 import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
@@ -33,7 +36,6 @@ import java.util.List;
 import java.util.Map;
 
 import org.junit.Test;
-import org.mockito.InjectMocks;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.CloudRegion;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Collection;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Configuration;
@@ -52,6 +54,7 @@ import org.onap.so.bpmn.servicedecomposition.bbobjects.VolumeGroup;
 import org.onap.so.bpmn.servicedecomposition.entities.ResourceKey;
 import org.onap.so.bpmn.servicedecomposition.generalobjects.OrchestrationContext;
 import org.onap.so.bpmn.servicedecomposition.generalobjects.RequestContext;
+import org.onap.so.bpmn.servicedecomposition.generalobjects.RequestParameters;
 import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoCollection;
 import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoConfiguration;
 import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoGenericVnf;
@@ -65,12 +68,15 @@ import org.onap.so.db.catalog.beans.CollectionResourceCustomization;
 import org.onap.so.db.catalog.beans.CollectionResourceInstanceGroupCustomization;
 import org.onap.so.db.catalog.beans.ConfigurationResource;
 import org.onap.so.db.catalog.beans.ConfigurationResourceCustomization;
+import org.onap.so.db.catalog.beans.CvnfcCustomization;
 import org.onap.so.db.catalog.beans.InstanceGroup;
 import org.onap.so.db.catalog.beans.NetworkResourceCustomization;
 import org.onap.so.db.catalog.beans.OrchestrationStatus;
 import org.onap.so.db.catalog.beans.Service;
 import org.onap.so.db.catalog.beans.VfModuleCustomization;
 import org.onap.so.db.catalog.beans.VnfResourceCustomization;
+import org.onap.so.db.catalog.beans.VnfVfmoduleCvnfcConfigurationCustomization;
+import org.onap.so.db.catalog.beans.VnfcCustomization;
 import org.onap.so.serviceinstancebeans.CloudConfiguration;
 import org.onap.so.serviceinstancebeans.RequestDetails;
 
@@ -546,7 +552,7 @@ public class BBInputSetupMapperLayerTest {
        @Test
        public void testMapOrchestrationContext() throws IOException {
                OrchestrationContext expected = new OrchestrationContext();
-               expected.setIsRollbackEnabled(false);
+               expected.setIsRollbackEnabled(true);
 
                RequestDetails requestDetails = mapper.readValue(new File(RESOURCE_PATH + "RequestDetailsInput_mapReqContext.json"), RequestDetails.class);
 
@@ -558,7 +564,7 @@ public class BBInputSetupMapperLayerTest {
        @Test
        public void testMapLocationContext() {
                CloudRegion expected = new CloudRegion();
-               expected.setCloudOwner("att-aic");
+               expected.setCloudOwner("test-owner-name");
                expected.setLcpCloudRegionId("cloudRegionId");
                expected.setComplex("complexName");
                expected.setTenantId("tenantId");
@@ -567,11 +573,11 @@ public class BBInputSetupMapperLayerTest {
                cloudConfig.setLcpCloudRegionId("cloudRegionId");
                cloudConfig.setAicNodeClli("aicNodeClli");
                org.onap.aai.domain.yang.CloudRegion cloudRegion = new org.onap.aai.domain.yang.CloudRegion();
-               cloudRegion.setCloudOwner("att-aic");
+               cloudRegion.setCloudOwner("test-owner-name");
                cloudRegion.setCloudRegionId("cloudRegionId");
                cloudRegion.setComplexName("complexName");
 
-               CloudRegion actual = bbInputSetupMapperLayer.mapCloudRegion(cloudConfig, cloudRegion, "att-aic");
+               CloudRegion actual = bbInputSetupMapperLayer.mapCloudRegion(cloudConfig, cloudRegion);
 
                assertThat(actual, sameBeanAs(expected));
        }
@@ -579,7 +585,7 @@ public class BBInputSetupMapperLayerTest {
        @Test
        public void testMapCloudRegion() {
                CloudRegion expected = new CloudRegion();
-               expected.setCloudOwner("att-aic");
+               expected.setCloudOwner("test-owner-name");
                expected.setLcpCloudRegionId("cloudRegionId");
                expected.setTenantId("tenantId");
                expected.setCloudRegionVersion("cloudRegionVersion");
@@ -590,11 +596,11 @@ public class BBInputSetupMapperLayerTest {
                cloudConfig.setAicNodeClli("aicNodeClli");
 
                org.onap.aai.domain.yang.CloudRegion cloudRegion = new org.onap.aai.domain.yang.CloudRegion();
-               cloudRegion.setCloudOwner("att-aic");
+               cloudRegion.setCloudOwner("test-owner-name");
                cloudRegion.setCloudRegionId("cloudRegionId");
                cloudRegion.setCloudRegionVersion("cloudRegionVersion");
 
-               CloudRegion actual = bbInputSetupMapperLayer.mapCloudRegion(cloudConfig, cloudRegion, "att-aic");
+               CloudRegion actual = bbInputSetupMapperLayer.mapCloudRegion(cloudConfig, cloudRegion);
 
                assertThat(actual, sameBeanAs(expected));
        }
@@ -603,7 +609,7 @@ public class BBInputSetupMapperLayerTest {
        public void testMapCloudRegionWithNullCheck() {
                CloudRegion expected = new CloudRegion();
 
-               CloudRegion actual = bbInputSetupMapperLayer.mapCloudRegion(null, null, null);
+               CloudRegion actual = bbInputSetupMapperLayer.mapCloudRegion(null, null);
 
                assertThat(actual, sameBeanAs(expected));
        }
@@ -613,18 +619,60 @@ public class BBInputSetupMapperLayerTest {
                String modelCustUUID = "modelCustomizationUUID";
                String modelInvariantUUID = "modelInvariantUUID";
                String modelVersionUUID = "modelUUID";
+               String policyName = "policyName";
                ModelInfoConfiguration expected = new ModelInfoConfiguration();
                expected.setModelCustomizationId(modelCustUUID);
                expected.setModelInvariantId(modelInvariantUUID);
                expected.setModelVersionId(modelVersionUUID);
+               expected.setPolicyName(policyName);
                ConfigurationResourceCustomization configurationResourceCustomization = new ConfigurationResourceCustomization();
                configurationResourceCustomization.setModelCustomizationUUID(modelCustUUID);
                configurationResourceCustomization.setConfigurationResource(new ConfigurationResource());
                configurationResourceCustomization.getConfigurationResource().setModelInvariantUUID(modelInvariantUUID);
                configurationResourceCustomization.getConfigurationResource().setModelUUID(modelVersionUUID);
+               VnfVfmoduleCvnfcConfigurationCustomization policyNameTable = new VnfVfmoduleCvnfcConfigurationCustomization();
+               policyNameTable.setCvnfcCustomization(new CvnfcCustomization());
+               policyNameTable.getCvnfcCustomization().setVnfcCustomization(new VnfcCustomization());
+               policyNameTable.setPolicyName(policyName);
                
-               ModelInfoConfiguration actual = bbInputSetupMapperLayer.mapCatalogConfigurationToConfiguration(configurationResourceCustomization );
+               ModelInfoConfiguration actual = bbInputSetupMapperLayer.mapCatalogConfigurationToConfiguration(configurationResourceCustomization, policyNameTable);
 
                assertThat(actual, sameBeanAs(expected));
        }
+       
+       @Test
+       public void testMapNameValueUserParams() throws IOException {           
+               RequestDetails requestDetails = mapper.readValue(new File(RESOURCE_PATH + "RequestDetailsInput_mapReqContext.json"), RequestDetails.class);
+               Map<String,Object> actual = bbInputSetupMapperLayer.mapNameValueUserParams(requestDetails.getRequestParameters());
+
+               assertTrue(actual.containsKey("name1"));
+               assertTrue(actual.containsValue("value1"));
+               assertTrue(actual.get("name1").equals("value1"));
+               assertTrue(actual.containsKey("name2"));
+               assertTrue(actual.containsValue("value2"));
+               assertTrue(actual.get("name2").equals("value2"));               
+               assertFalse(actual.containsKey("ignore"));
+               assertFalse(actual.containsValue("ignore"));            
+       }
+       
+       @Test
+       public void testMapRequestParameters() throws IOException {             
+               RequestDetails requestDetails = mapper.readValue(new File(RESOURCE_PATH + "RequestDetailsInput_mapReqContext.json"), RequestDetails.class);
+               RequestParameters actual = bbInputSetupMapperLayer.mapRequestParameters(requestDetails.getRequestParameters());
+               
+               assertEquals(actual.getUsePreload(), requestDetails.getRequestParameters().getUsePreload());
+               assertEquals(actual.getSubscriptionServiceType(), requestDetails.getRequestParameters().getSubscriptionServiceType());
+               assertEquals(actual.getPayload(), requestDetails.getRequestParameters().getPayload());                          
+       }
+       
+       protected RequestParameters mapRequestParameters(org.onap.so.serviceinstancebeans.RequestParameters requestParameters) {
+               RequestParameters requestParams = new RequestParameters();
+               requestParams.setaLaCarte(requestParameters.getALaCarte());
+               requestParams.setUsePreload(requestParameters.getUsePreload());
+               requestParams.setSubscriptionServiceType(requestParameters.getSubscriptionServiceType());
+               requestParams.setUserParams(requestParameters.getUserParams());
+               requestParams.setPayload(requestParameters.getPayload());
+               return requestParams;
+       }
+       
 }