diff options
Diffstat (limited to 'openecomp-be/lib')
4 files changed, 159 insertions, 17 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/VspDetails.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/VspDetails.java index 88b020b673..01d1f0b72a 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/VspDetails.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/VspDetails.java @@ -3,6 +3,7 @@ * SDC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2021 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +20,8 @@ */ package org.openecomp.sdc.vendorsoftwareproduct.dao.type; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; import lombok.Getter; import lombok.NoArgsConstructor; @@ -46,6 +49,7 @@ public class VspDetails implements VersionableEntity { private String licenseAgreement; private List<String> featureGroups; private String onboardingMethod; + private List<String> modelIdList; public VspDetails(String id, Version version) { this.id = id; @@ -62,10 +66,16 @@ public class VspDetails implements VersionableEntity { return getId(); } + public List<String> getModelIdList() { + if (modelIdList == null) { + return Collections.emptyList(); + } + return new ArrayList<>(modelIdList); + } + @Override public String toString() { - return String - .format("Vsp id = '%s', Version = %s', Name = %s', Category = %s', Description = %s', Vendor = %s'", this.id, this.version, this.name, - this.category, this.description, this.vendorName); + return String.format("Vsp id = '%s', Version = '%s', Name = '%s', Category = '%s', Description = '%s', Vendor = '%s', Model = '%s'", + this.id, this.version, this.name, this.category, this.description, this.vendorName, this.modelIdList); } } diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/zusammen/VendorSoftwareProductInfoDaoZusammenImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/zusammen/VendorSoftwareProductInfoDaoZusammenImpl.java index 9655434e74..78ab818927 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/zusammen/VendorSoftwareProductInfoDaoZusammenImpl.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/zusammen/VendorSoftwareProductInfoDaoZusammenImpl.java @@ -1,5 +1,6 @@ /* * Copyright © 2016-2018 European Support Limited + * Modifications Copyright (C) 2021 Nordix Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +27,8 @@ import com.amdocs.zusammen.datatypes.item.Info; import java.io.ByteArrayInputStream; import java.util.Collection; import java.util.stream.Collectors; +import lombok.AllArgsConstructor; +import lombok.Getter; import org.openecomp.core.zusammen.api.ZusammenAdaptor; import org.openecomp.sdc.datatypes.model.ElementType; import org.openecomp.sdc.vendorsoftwareproduct.dao.VendorSoftwareProductInfoDao; @@ -189,7 +192,7 @@ public class VendorSoftwareProductInfoDaoZusammenImpl implements VendorSoftwareP return questionnaireElement; } - private void addVspDetailsToInfo(Info info, VspDetails vspDetails) { + private void addVspDetailsToInfo(final Info info, final VspDetails vspDetails) { info.addProperty(InfoPropertyName.NAME.getValue(), vspDetails.getName()); info.addProperty(InfoPropertyName.DESCRIPTION.getValue(), vspDetails.getDescription()); info.addProperty(InfoPropertyName.ICON.getValue(), vspDetails.getIcon()); @@ -204,8 +207,13 @@ public class VendorSoftwareProductInfoDaoZusammenImpl implements VendorSoftwareP info.addProperty(InfoPropertyName.LICENSE_AGREEMENT.getValue(), vspDetails.getLicenseAgreement()); info.addProperty(InfoPropertyName.FEATURE_GROUPS.getValue(), vspDetails.getFeatureGroups()); info.addProperty(InfoPropertyName.ON_BOARDING_METHOD.getValue(), vspDetails.getOnboardingMethod()); + if (!vspDetails.getModelIdList().isEmpty()) { + info.addProperty(InfoPropertyName.MODELS.getValue(), vspDetails.getModelIdList()); + } } + @AllArgsConstructor + @Getter public enum InfoPropertyName { // @formatter:off NAME("name"), @@ -219,17 +227,11 @@ public class VendorSoftwareProductInfoDaoZusammenImpl implements VendorSoftwareP LICENSE_TYPE("licenseType"), LICENSE_AGREEMENT("licenseAgreement"), FEATURE_GROUPS("featureGroups"), - ON_BOARDING_METHOD("onboardingMethod"); + ON_BOARDING_METHOD("onboardingMethod"), + MODELS("models"); // @formatter:on - private String value; - - InfoPropertyName(String value) { - this.value = value; - } + private final String value; - public String getValue() { - return value; - } } } diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/zusammen/convertor/ElementToVSPGeneralConvertor.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/zusammen/convertor/ElementToVSPGeneralConvertor.java index 8234eeeaf1..016c80ad0c 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/zusammen/convertor/ElementToVSPGeneralConvertor.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/zusammen/convertor/ElementToVSPGeneralConvertor.java @@ -3,6 +3,7 @@ * SDC * ================================================================================ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2021 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,10 +26,11 @@ import com.amdocs.zusammen.datatypes.item.Info; import com.amdocs.zusammen.datatypes.item.Item; import org.openecomp.convertor.ElementConvertor; import org.openecomp.sdc.vendorsoftwareproduct.dao.impl.zusammen.VendorSoftwareProductInfoDaoZusammenImpl; +import org.openecomp.sdc.vendorsoftwareproduct.dao.impl.zusammen.VendorSoftwareProductInfoDaoZusammenImpl.InfoPropertyName; import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspDetails; import org.openecomp.sdc.versioning.dao.types.Version; -public class ElementToVSPGeneralConvertor extends ElementConvertor { +public class ElementToVSPGeneralConvertor extends ElementConvertor<VspDetails> { @Override public VspDetails convert(Element element) { @@ -43,7 +45,7 @@ public class ElementToVSPGeneralConvertor extends ElementConvertor { if (item == null) { return null; } - VspDetails vspDetails = mapInfoToVspDetails(item.getInfo()); + var vspDetails = mapInfoToVspDetails(item.getInfo()); vspDetails.setId(item.getId().getValue()); return vspDetails; } @@ -56,8 +58,8 @@ public class ElementToVSPGeneralConvertor extends ElementConvertor { return mapInfoToVspDetails(elementInfo.getInfo()); } - private VspDetails mapInfoToVspDetails(Info info) { - VspDetails vspDetails = new VspDetails(); + private VspDetails mapInfoToVspDetails(final Info info) { + final var vspDetails = new VspDetails(); vspDetails.setName(info.getProperty(VendorSoftwareProductInfoDaoZusammenImpl.InfoPropertyName.NAME.getValue())); vspDetails.setDescription(info.getProperty(VendorSoftwareProductInfoDaoZusammenImpl.InfoPropertyName.DESCRIPTION.getValue())); vspDetails.setIcon(info.getProperty(VendorSoftwareProductInfoDaoZusammenImpl.InfoPropertyName.ICON.getValue())); @@ -73,6 +75,7 @@ public class ElementToVSPGeneralConvertor extends ElementConvertor { vspDetails.setLicenseAgreement(info.getProperty(VendorSoftwareProductInfoDaoZusammenImpl.InfoPropertyName.LICENSE_AGREEMENT.getValue())); vspDetails.setFeatureGroups(info.getProperty(VendorSoftwareProductInfoDaoZusammenImpl.InfoPropertyName.FEATURE_GROUPS.getValue())); vspDetails.setOnboardingMethod(info.getProperty(VendorSoftwareProductInfoDaoZusammenImpl.InfoPropertyName.ON_BOARDING_METHOD.getValue())); + vspDetails.setModelIdList(info.getProperty(InfoPropertyName.MODELS.getValue())); return vspDetails; } } diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/zusammen/convertor/ElementToVSPGeneralConvertorTest.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/zusammen/convertor/ElementToVSPGeneralConvertorTest.java new file mode 100644 index 0000000000..d5b80f19df --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/zusammen/convertor/ElementToVSPGeneralConvertorTest.java @@ -0,0 +1,127 @@ +/* + * - + * ============LICENSE_START======================================================= + * Copyright (C) 2021 Nordix Foundation. + * ================================================================================ + * 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. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.openecomp.sdc.vendorsoftwareproduct.dao.impl.zusammen.convertor; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; +import static org.openecomp.sdc.vendorsoftwareproduct.dao.impl.zusammen.VendorSoftwareProductInfoDaoZusammenImpl.InfoPropertyName.CATEGORY; +import static org.openecomp.sdc.vendorsoftwareproduct.dao.impl.zusammen.VendorSoftwareProductInfoDaoZusammenImpl.InfoPropertyName.DESCRIPTION; +import static org.openecomp.sdc.vendorsoftwareproduct.dao.impl.zusammen.VendorSoftwareProductInfoDaoZusammenImpl.InfoPropertyName.FEATURE_GROUPS; +import static org.openecomp.sdc.vendorsoftwareproduct.dao.impl.zusammen.VendorSoftwareProductInfoDaoZusammenImpl.InfoPropertyName.ICON; +import static org.openecomp.sdc.vendorsoftwareproduct.dao.impl.zusammen.VendorSoftwareProductInfoDaoZusammenImpl.InfoPropertyName.LICENSE_AGREEMENT; +import static org.openecomp.sdc.vendorsoftwareproduct.dao.impl.zusammen.VendorSoftwareProductInfoDaoZusammenImpl.InfoPropertyName.LICENSE_TYPE; +import static org.openecomp.sdc.vendorsoftwareproduct.dao.impl.zusammen.VendorSoftwareProductInfoDaoZusammenImpl.InfoPropertyName.MODELS; +import static org.openecomp.sdc.vendorsoftwareproduct.dao.impl.zusammen.VendorSoftwareProductInfoDaoZusammenImpl.InfoPropertyName.NAME; +import static org.openecomp.sdc.vendorsoftwareproduct.dao.impl.zusammen.VendorSoftwareProductInfoDaoZusammenImpl.InfoPropertyName.ON_BOARDING_METHOD; +import static org.openecomp.sdc.vendorsoftwareproduct.dao.impl.zusammen.VendorSoftwareProductInfoDaoZusammenImpl.InfoPropertyName.SUB_CATEGORY; +import static org.openecomp.sdc.vendorsoftwareproduct.dao.impl.zusammen.VendorSoftwareProductInfoDaoZusammenImpl.InfoPropertyName.VENDOR_ID; +import static org.openecomp.sdc.vendorsoftwareproduct.dao.impl.zusammen.VendorSoftwareProductInfoDaoZusammenImpl.InfoPropertyName.VENDOR_NAME; +import static org.openecomp.sdc.vendorsoftwareproduct.dao.impl.zusammen.VendorSoftwareProductInfoDaoZusammenImpl.InfoPropertyName.VENDOR_VERSION; + +import com.amdocs.zusammen.adaptor.inbound.api.types.item.Element; +import com.amdocs.zusammen.adaptor.inbound.api.types.item.ElementInfo; +import com.amdocs.zusammen.datatypes.Id; +import com.amdocs.zusammen.datatypes.item.Info; +import com.amdocs.zusammen.datatypes.item.Item; +import java.util.Arrays; +import java.util.List; +import java.util.Set; +import org.junit.jupiter.api.Test; +import org.openecomp.sdc.vendorsoftwareproduct.dao.impl.zusammen.VendorSoftwareProductInfoDaoZusammenImpl.InfoPropertyName; +import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspDetails; + +class ElementToVSPGeneralConvertorTest { + + final ElementToVSPGeneralConvertor elementToVSPGeneralConvertor = new ElementToVSPGeneralConvertor(); + + @Test + void convertElementTest() { + VspDetails actualVspDetails = elementToVSPGeneralConvertor.convert((Element) null); + assertNull(actualVspDetails); + final Element elementMock = mock(Element.class); + final Info defaultInfo = createDefaultInfo(); + when(elementMock.getInfo()).thenReturn(defaultInfo); + actualVspDetails = elementToVSPGeneralConvertor.convert(elementMock); + assertNotNull(actualVspDetails); + assertVspDetails(actualVspDetails, defaultInfo); + } + + @Test + void convertElementInfoTest() { + VspDetails actualVspDetails = elementToVSPGeneralConvertor.convert((ElementInfo) null); + assertNull(actualVspDetails); + final ElementInfo elementInfoMock = mock(ElementInfo.class); + final Info defaultInfo = createDefaultInfo(); + when(elementInfoMock.getInfo()).thenReturn(defaultInfo); + actualVspDetails = elementToVSPGeneralConvertor.convert(elementInfoMock); + assertNotNull(actualVspDetails); + assertVspDetails(actualVspDetails, defaultInfo); + } + + @Test + void convertItemTest() { + VspDetails actualVspDetails = elementToVSPGeneralConvertor.convert((Item) null); + assertNull(actualVspDetails); + final Item elementInfoMock = mock(Item.class); + final Info defaultInfo = createDefaultInfo(); + final var itemId = new Id(); + final var id = "anId"; + itemId.setValue(id); + + when(elementInfoMock.getInfo()).thenReturn(defaultInfo); + when(elementInfoMock.getId()).thenReturn(itemId); + actualVspDetails = elementToVSPGeneralConvertor.convert(elementInfoMock); + + assertNotNull(actualVspDetails); + assertEquals(actualVspDetails.getId(), id); + assertVspDetails(actualVspDetails, defaultInfo); + } + + private void assertVspDetails(final VspDetails vspDetails, final Info info) { + assertEquals(vspDetails.getName(), info.getProperty(NAME.getValue())); + assertEquals(vspDetails.getDescription(), info.getProperty(DESCRIPTION.getValue())); + assertEquals(vspDetails.getIcon(), info.getProperty(ICON.getValue())); + assertEquals(vspDetails.getCategory(), info.getProperty(CATEGORY.getValue())); + assertEquals(vspDetails.getSubCategory(), info.getProperty(SUB_CATEGORY.getValue())); + assertEquals(vspDetails.getVendorId(), info.getProperty(VENDOR_ID.getValue())); + assertEquals(vspDetails.getVendorName(), info.getProperty(VENDOR_NAME.getValue())); + assertEquals(vspDetails.getVlmVersion().getId(), info.getProperty(VENDOR_VERSION.getValue())); + assertEquals(vspDetails.getLicenseType(), info.getProperty(LICENSE_TYPE.getValue())); + assertEquals(vspDetails.getLicenseAgreement(), info.getProperty(LICENSE_AGREEMENT.getValue())); + assertEquals(vspDetails.getFeatureGroups(), info.getProperty(FEATURE_GROUPS.getValue())); + assertEquals(vspDetails.getOnboardingMethod(), info.getProperty(ON_BOARDING_METHOD.getValue())); + assertEquals(vspDetails.getModelIdList(), info.getProperty(MODELS.getValue())); + } + + private Info createDefaultInfo() { + var info = new Info(); + final Set<InfoPropertyName> collectionProperties = Set.of(FEATURE_GROUPS, MODELS); + Arrays.stream(InfoPropertyName.values()).filter(propertyName -> !collectionProperties.contains(propertyName)) + .forEach(propertyName -> info.addProperty(propertyName.getValue(), propertyName.getValue())); + info.addProperty(FEATURE_GROUPS.getValue(), List.of("group1", "group2")); + info.addProperty(MODELS.getValue(), List.of("model1", "model2")); + return info; + } +}
\ No newline at end of file |