diff options
Diffstat (limited to 'openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/VSPFullTest.java')
| -rw-r--r-- | openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/VSPFullTest.java | 121 |
1 files changed, 82 insertions, 39 deletions
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/VSPFullTest.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/VSPFullTest.java index ebc4c3af64..d4dea70f2f 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/VSPFullTest.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/VSPFullTest.java @@ -1,24 +1,55 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + package org.openecomp.sdc.vendorsoftwareproduct; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.io.IOUtils; +import org.openecomp.core.enrichment.types.ArtifactType; +import org.openecomp.core.model.dao.EnrichedServiceModelDaoFactory; +import org.openecomp.core.util.UniqueValueUtil; +import org.openecomp.core.utilities.CommonMethods; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; import org.openecomp.sdc.tosca.datatypes.model.CapabilityDefinition; import org.openecomp.sdc.vendorlicense.dao.types.EntitlementPoolEntity; +import org.openecomp.sdc.vendorlicense.dao.types.FeatureGroupEntity; +import org.openecomp.sdc.vendorlicense.dao.types.LicenseAgreementEntity; import org.openecomp.sdc.vendorlicense.facade.VendorLicenseFacade; +import org.openecomp.sdc.vendorlicense.facade.VendorLicenseFacadeFactory; +import org.openecomp.sdc.vendorsoftwareproduct.dao.VendorSoftwareProductDao; import org.openecomp.sdc.vendorsoftwareproduct.dao.VendorSoftwareProductDaoFactory; +import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ComponentEntity; +import org.openecomp.sdc.vendorsoftwareproduct.dao.type.NicEntity; import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspDetails; -import org.openecomp.sdc.vendorsoftwareproduct.impl.VendorSoftwareProductManagerImpl; import org.openecomp.sdc.vendorsoftwareproduct.types.ValidationResponse; import org.openecomp.sdc.vendorsoftwareproduct.types.VersionedVendorSoftwareProductInfo; +import org.openecomp.sdc.vendorsoftwareproduct.utils.VSPCommon; import org.openecomp.sdc.versioning.dao.types.Version; -import org.openecomp.core.model.dao.EnrichedServiceModelDaoFactory; -import org.openecomp.core.util.UniqueValueUtil; -import org.openecomp.core.utilities.CommonMethods; -import org.apache.commons.collections4.MapUtils; -import org.apache.commons.io.IOUtils; import org.testng.Assert; import org.testng.annotations.Test; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; import java.net.URL; import java.util.Collection; import java.util.HashMap; @@ -27,17 +58,21 @@ import java.util.Set; import java.util.stream.Collectors; public class VSPFullTest { +/* public static final Version VERSION01 = new Version(0, 1); - private static final org.openecomp.sdc.vendorsoftwareproduct.dao.VendorSoftwareProductDao - vendorSoftwareProductDao = - VendorSoftwareProductDaoFactory.getInstance().createInterface(); + private static final VendorSoftwareProductDao vendorSoftwareProductDao = + VendorSoftwareProductDaoFactory + .getInstance().createInterface(); private static final String USER1 = "vspTestUser1"; - private static VendorSoftwareProductManager vendorSoftwareProductManager = - new VendorSoftwareProductManagerImpl(); + private static VendorSoftwareProductManager vendorSoftwareProductManager = null; + //new VendorSoftwareProductManagerImpl(); private static VendorLicenseFacade vendorLicenseFacade = - org.openecomp.sdc.vendorlicense.facade.VendorLicenseFacadeFactory.getInstance().createInterface(); + VendorLicenseFacadeFactory.getInstance().createInterface(); + private OrchestrationTemplateCandidateManager candidateManager; + private MibManager mibManager; + private NicManager nicManager; @Test public void testEnrichModelInSubmit() { @@ -51,13 +86,11 @@ public class VSPFullTest { String entitlementPoolId = vendorLicenseFacade .createEntitlementPool(new EntitlementPoolEntity(vlm1Id, null, null), USER1).getId(); - org.openecomp.sdc.vendorlicense.dao.types.FeatureGroupEntity - featureGroup = new org.openecomp.sdc.vendorlicense.dao.types.FeatureGroupEntity(vlm1Id, null, null); + FeatureGroupEntity featureGroup = new FeatureGroupEntity(vlm1Id, null, null); featureGroup.getEntitlementPoolIds().add(entitlementPoolId); String featureGroupId = vendorLicenseFacade.createFeatureGroup(featureGroup, USER1).getId(); - org.openecomp.sdc.vendorlicense.dao.types.LicenseAgreementEntity - licenseAgreement = new org.openecomp.sdc.vendorlicense.dao.types.LicenseAgreementEntity(vlm1Id, null, null); + LicenseAgreementEntity licenseAgreement = new LicenseAgreementEntity(vlm1Id, null, null); licenseAgreement.getFeatureGroupIds().add(featureGroupId); String licenseAgreementId = vendorLicenseFacade.createLicenseAgreement(licenseAgreement, USER1).getId(); @@ -67,8 +100,14 @@ public class VSPFullTest { String vspId = createVsp(vlm1Id, licenseAgreementId, licenseAgreement.getFeatureGroupIds()); - Collection<org.openecomp.sdc.vendorsoftwareproduct.dao.type.ComponentEntity> components = uploadFullCompositionFile(vspId); + Collection<ComponentEntity> components = uploadFullCompositionFile(vspId); + InputStream zis1 = getFileInputStream("/validation/zips/various/MIB.zip"); + mibManager + .upload(zis1, "MMSC.zip", vspId, VERSION01, + components.iterator().next().getId(), + ArtifactType.SNMP_TRAP, + USER1); //check in vendorSoftwareProductManager.checkin(vspId, USER1); @@ -78,11 +117,11 @@ public class VSPFullTest { //Assert.assertTrue(result.isValid()); //PackageInfo createPackageResult = vendorSoftwareProductManager.createPackage(vspId, USER1); - } catch (IOException e) { + } catch (IOException exception) { Assert.fail(); } VersionedVendorSoftwareProductInfo details = - vendorSoftwareProductManager.getVspDetails(vspId, null, USER1); + vendorSoftwareProductManager.getVsp(vspId, null, USER1); //File csar = vendorSoftwareProductManager.getTranslatedFile(vspId,details.getVersionInfo().getActiveVersion(),USER1); @@ -94,7 +133,7 @@ public class VSPFullTest { .getServiceModel(vspId, details.getVersionInfo().getActiveVersion()); Map<String, CapabilityDefinition> capabilities = new HashMap<>(); - for (org.openecomp.sdc.vendorsoftwareproduct.dao.type.ComponentEntity component : components) { + for (ComponentEntity component : components) { model.getServiceTemplates(). entrySet(). stream(). @@ -117,23 +156,26 @@ public class VSPFullTest { Assert.assertNotNull(capabilities); } - private Collection<org.openecomp.sdc.vendorsoftwareproduct.dao.type.ComponentEntity> uploadFullCompositionFile(String vspId) { - vendorSoftwareProductManager - .uploadFile(vspId, getFileInputStream("/vspmanager/zips/fullComposition.zip"), USER1); + private Collection<ComponentEntity> uploadFullCompositionFile(String vspId) { + candidateManager.upload(vspId, VERSION01, + getFileInputStream("/vspmanager/zips/fullComposition.zip"), USER1); + candidateManager.process(vspId, VERSION01, USER1); - Collection<org.openecomp.sdc.vendorsoftwareproduct.dao.type.ComponentEntity> components = - vendorSoftwareProductManager.listComponents(vspId, null, USER1); + Collection<ComponentEntity> components = null; + //vendorSoftwareProductManager.listComponents(vspId, null, USER1); Assert.assertFalse(components.isEmpty()); - for (org.openecomp.sdc.vendorsoftwareproduct.dao.type.ComponentEntity component : components) { - Assert.assertNotNull(vendorSoftwareProductManager - .getComponentQuestionnaire(vspId, null, component.getId(), USER1).getData()); + for (ComponentEntity component : components) { +*/ +/* Assert.assertNotNull(vendorSoftwareProductManager + .getQuestionnaire(vspId, null, component.getId(), USER1).getData());*//* + - Collection<org.openecomp.sdc.vendorsoftwareproduct.dao.type.NicEntity> nics = - vendorSoftwareProductManager.listNics(vspId, null, component.getId(), USER1); + Collection<NicEntity> nics = + nicManager.listNics(vspId, null, component.getId(), USER1); Assert.assertFalse(nics.isEmpty()); - for (org.openecomp.sdc.vendorsoftwareproduct.dao.type.NicEntity nic : nics) { - Assert.assertNotNull(vendorSoftwareProductManager + for (NicEntity nic : nics) { + Assert.assertNotNull(nicManager .getNicQuestionnaire(vspId, null, component.getId(), nic.getId(), USER1).getData()); } } @@ -146,14 +188,14 @@ public class VSPFullTest { .createVspDetails(null, null, "VSP_FullTest", "Test-vsp_fullTest", "vendorName", vlm1Id, "icon", "category", "subCategory", licenseAgreementId, featureGroupIds.stream().collect(Collectors.toList())); - String vspId = vendorSoftwareProductManager.createNewVsp(expectedVsp, USER1).getId(); + String vspId = vendorSoftwareProductManager.createVsp(expectedVsp, USER1).getId(); VspDetails actualVsp = vendorSoftwareProductDao.getVendorSoftwareProductInfo(new VspDetails(vspId, VERSION01)); expectedVsp.setId(vspId); expectedVsp.setVersion(VERSION01); - VendorSoftwareProductManagerTest.assertVspsEquals(actualVsp, expectedVsp); + //VendorSoftwareProductManagerImplTest.assertVspsEquals(actualVsp, expectedVsp); Assert.assertNotNull( vendorSoftwareProductManager.getVspQuestionnaire(vspId, null, USER1).getData()); return vspId; @@ -169,8 +211,8 @@ public class VSPFullTest { IOUtils.copy(in, out); in.close(); out.close(); - } catch (IOException e) { - throw new RuntimeException(e); + } catch (IOException exception) { + throw new RuntimeException(exception); } } @@ -184,11 +226,12 @@ public class VSPFullTest { URL url = this.getClass().getResource(fileName); try { return url.openStream(); - } catch (IOException e) { - e.printStackTrace(); + } catch (IOException exception) { + exception.printStackTrace(); return null; } } +*/ } |