From: Polavarapu, Chaitanya (cp8128) Date: Fri, 12 Mar 2021 20:28:47 +0000 (-0500) Subject: Resolve files with licensing issues in Babel X-Git-Tag: 1.9.0~2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0c610fedd5c3498a857cb6f7e5ab34151d9b4827;hp=59e7029dc20b750b4959b9495e26e3d13bb3bc81;p=aai%2Fbabel.git Resolve files with licensing issues in Babel Issue-ID: AAI-3301 Change-Id: Ia376802e449b0bf013dfd3a3e9843448234afef1 Signed-off-by: Polavarapu, Chaitanya (cp8128) --- diff --git a/src/test/java/org/onap/aai/babel/csar/vnfcatalog/TestVnfVendorImageExtractor.java b/src/test/java/org/onap/aai/babel/csar/vnfcatalog/TestVnfVendorImageExtractor.java index 83cbe20..7ab8ecd 100644 --- a/src/test/java/org/onap/aai/babel/csar/vnfcatalog/TestVnfVendorImageExtractor.java +++ b/src/test/java/org/onap/aai/babel/csar/vnfcatalog/TestVnfVendorImageExtractor.java @@ -104,15 +104,6 @@ public class TestVnfVendorImageExtractor { new VnfVendorImageExtractor().buildVendorImageConfigurations(null, vf); } - @Test - public void createVendorImageMappingsValidFileDifferentVnfNodeTypes() throws IOException, ToscaToCatalogException { - String expectedJson = new ArtifactTestUtils().getRequestJson("vnfodservice-vendorImageConfigurations.json"); - BabelArtifact artifact = CsarTest.VNFOD_SERVICE.extractVnfVendorImages(); - assertThat(artifact.getName(), is(equalTo("vnfVendorImageConfigurations"))); - assertThat(artifact.getType(), is(equalTo(ArtifactType.VNFCATALOG))); - assertThat(artifact.getPayload(), is(equalTo(expectedJson))); - } - @Test public void testSoftwareVersions() throws ToscaToCatalogException { VnfVendorImageExtractor extractor = new VnfVendorImageExtractor(); diff --git a/src/test/java/org/onap/aai/babel/service/TestCsarToXmlConverter.java b/src/test/java/org/onap/aai/babel/service/TestCsarToXmlConverter.java index 60cd264..ef3fb28 100644 --- a/src/test/java/org/onap/aai/babel/service/TestCsarToXmlConverter.java +++ b/src/test/java/org/onap/aai/babel/service/TestCsarToXmlConverter.java @@ -167,17 +167,6 @@ public class TestCsarToXmlConverter { assertThatGeneratedFilesMatchExpected(createExpectedXmlFiles(filesToLoad), CsarTest.RG_COLLECTOR_615_CSAR_FILE); } - @Test - public void generateXmlFromVdbeServiceCsar() throws IOException, CsarConverterException { - List filesToLoad = new ArrayList<>(); - filesToLoad.add("AAI-vDBE_srv-service-1.0.xml"); - filesToLoad.add("AAI-vDBE-resource-0.5.xml"); - filesToLoad.add("AAI-vdbe0..Vdbe..main..module-0-resource-2.xml"); - filesToLoad.add("AAI-oam_group-resource-3.xml"); - filesToLoad.add("AAI-untr_group-resource-3.xml"); - assertThatGeneratedFilesMatchExpected(createExpectedXmlFiles(filesToLoad), CsarTest.VDBE_SERVICE_CSAR_FILE); - } - @Test public void generatePortMirrorConfigurationModel() throws CsarConverterException, IOException, XmlArtifactGenerationException { diff --git a/src/test/java/org/onap/aai/babel/testdata/CsarTest.java b/src/test/java/org/onap/aai/babel/testdata/CsarTest.java index b8a86b4..461e75c 100644 --- a/src/test/java/org/onap/aai/babel/testdata/CsarTest.java +++ b/src/test/java/org/onap/aai/babel/testdata/CsarTest.java @@ -47,7 +47,6 @@ public enum CsarTest { MULTIPLE_VNF_CSAR("catalog_csar_too_many_vnfConfigurations.csar"), NETWORK_COLLECTION_CSAR_FILE("service_NetworkCollection.csar"), RG_COLLECTOR_615_CSAR_FILE("service-RgCollector615-csar.csar"), - VDBE_SERVICE_CSAR_FILE("service-VdbeSrv-csar.csar"), VNFOD_SERVICE("service-Dev2devnfodservice17July-csar.csar"), CHILD_RESOURCE_CSAR_FILE("service-NetworkCloudVnfServiceMock-csar.csar"), SERVICE_PROXY_CSAR_FILE("service-S1-csar.csar"); diff --git a/src/test/resources/compressedArtifacts/service-Dev2devnfodservice17July-csar.csar b/src/test/resources/compressedArtifacts/service-Dev2devnfodservice17July-csar.csar deleted file mode 100644 index 612a22d..0000000 Binary files a/src/test/resources/compressedArtifacts/service-Dev2devnfodservice17July-csar.csar and /dev/null differ diff --git a/src/test/resources/compressedArtifacts/service-NetworkCloudVnfServiceMock-csar.csar b/src/test/resources/compressedArtifacts/service-NetworkCloudVnfServiceMock-csar.csar deleted file mode 100644 index 5ec0f99..0000000 Binary files a/src/test/resources/compressedArtifacts/service-NetworkCloudVnfServiceMock-csar.csar and /dev/null differ diff --git a/src/test/resources/compressedArtifacts/service-VdbeSrv-csar.csar b/src/test/resources/compressedArtifacts/service-VdbeSrv-csar.csar deleted file mode 100644 index 265bb9f..0000000 Binary files a/src/test/resources/compressedArtifacts/service-VdbeSrv-csar.csar and /dev/null differ diff --git a/src/test/resources/jsonFiles/vnfodservice-vendorImageConfigurations.json b/src/test/resources/jsonFiles/vnfodservice-vendorImageConfigurations.json deleted file mode 100644 index 831b712..0000000 --- a/src/test/resources/jsonFiles/vnfodservice-vendorImageConfigurations.json +++ /dev/null @@ -1 +0,0 @@ -[{"application":"3099380c0183430ca9d593d94adc7b08","application-vendor":"Dev2DevNFODVf vendor","application-version":"1.1"}] \ No newline at end of file