X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=bpmn%2FMSOCommonBPMN%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fso%2Fbpmn%2Fservicedecomposition%2Ftasks%2FBBInputSetupMapperLayerTest.java;h=6f091304efffaf3a4b5321f3a8e757888c2201bd;hb=d4de474780d0ab820f2133a7ff368cc24939397d;hp=9195df09559332d490a0c60ce5f3045fc8cb580b;hpb=66b09af14e0a2cf774e9f917562f4ae54587eb19;p=so.git 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 9195df0955..6f091304ef 100644 --- 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 @@ -61,6 +61,7 @@ import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoGenericVnf; import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoInstanceGroup; import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoNetwork; import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoServiceInstance; +import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoPnf; import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoVfModule; import org.onap.so.db.catalog.beans.CollectionNetworkResourceCustomization; import org.onap.so.db.catalog.beans.CollectionResource; @@ -74,6 +75,8 @@ 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.PnfResource; +import org.onap.so.db.catalog.beans.PnfResourceCustomization; import org.onap.so.db.catalog.beans.VfModuleCustomization; import org.onap.so.db.catalog.beans.VnfResourceCustomization; import org.onap.so.db.catalog.beans.VnfcCustomization; @@ -507,6 +510,26 @@ public class BBInputSetupMapperLayerTest { assertThat(actualModelInfoGenericVnf, sameBeanAs(expectedModelInfoGenericVnf)); } + @Test + public void testMapCatalogPnfToPnf() throws IOException { + PnfResourceCustomization pnfResourceCustomization = mapper.readValue( + new File(RESOURCE_PATH + "PnfResourceCustomizationInput.json"), PnfResourceCustomization.class); + + PnfResource pnfResource = new PnfResource(); + pnfResource.setModelUUID("modelUuid"); + pnfResource.setModelInvariantUUID("modelInvariantUuid"); + pnfResource.setModelVersion("modelVersion"); + + pnfResourceCustomization.setPnfResources(pnfResource); + + ModelInfoPnf expectedModelInfoPnf = + mapper.readValue(new File(RESOURCE_PATH + "ModelInfoPnfExpected.json"), ModelInfoPnf.class); + + ModelInfoPnf actualModelInfoPnf = bbInputSetupMapperLayer.mapCatalogPnfToPnf(pnfResourceCustomization); + + assertThat(actualModelInfoPnf, sameBeanAs(expectedModelInfoPnf)); + } + @Test public void testMapCatalogVfModuleToVfModule() throws JsonParseException, JsonMappingException, IOException { VfModuleCustomization vfResourceCustomization = mapper