From 36fa9cdd9fb26aa3fbd3a1f35b2d8344d1301c11 Mon Sep 17 00:00:00 2001 From: "andre.schmid" Date: Thu, 22 Jul 2021 11:54:07 +0100 Subject: Specify a model while creating a VSP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6ed0a3c979e14c62ecd6488dfd70589df40636e9 Issue-ID: SDC-3656 Signed-off-by: André Schmid --- .../frontend/ci/tests/pages/VspCreationModal.java | 13 ++- .../mapping/MapVspDescriptionDtoToVspDetails.java | 2 + .../vsp/rest/mapping/MapVspDetailsToDto.java | 2 + .../types/VspDescriptionDto.java | 26 +++++ .../types/VspDetailsDto.java | 4 + .../types/VspRequestDto.java | 5 + .../types/VspDescriptionDtoTest.java | 63 +++++----- .../types/VspDetailsDtoTest.java | 11 +- .../types/VspRequestDtoTest.java | 11 +- .../vendorsoftwareproduct/dao/type/VspDetails.java | 16 ++- .../VendorSoftwareProductInfoDaoZusammenImpl.java | 22 ++-- .../convertor/ElementToVSPGeneralConvertor.java | 11 +- .../ElementToVSPGeneralConvertorTest.java | 127 +++++++++++++++++++++ openecomp-ui/resources/scss/components/_forms.scss | 4 + .../resources/scss/components/_inputOptions.scss | 14 +++ .../scss/modules/_softwareProductLandingPage.scss | 25 +++- .../src/nfvo-components/grid/GridSection.jsx | 4 +- openecomp-ui/src/nfvo-utils/i18n/en.json | 2 + .../softwareProduct/SoftwareProductActionHelper.js | 20 ++++ .../softwareProduct/SoftwareProductConstants.js | 7 ++ .../softwareProduct/SoftwareProductReducer.js | 7 ++ .../creation/SoftwareProductCreation.js | 13 ++- .../creation/SoftwareProductCreationReducer.js | 13 +++ .../creation/SoftwareProductCreationView.jsx | 126 +++++++++++++++++--- .../details/SoftwareProductDetailsView.jsx | 22 +++- .../landingPage/SoftwareProductLandingPageView.jsx | 21 +++- .../creation/SoftwareProductCreation.test.js | 42 +++++-- openecomp-ui/test/softwareProduct/details/test.js | 8 ++ 28 files changed, 548 insertions(+), 93 deletions(-) create mode 100644 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 diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/pages/VspCreationModal.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/pages/VspCreationModal.java index e83eac4ea0..5950b2d895 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/pages/VspCreationModal.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/pages/VspCreationModal.java @@ -59,6 +59,7 @@ public class VspCreationModal extends AbstractPageObject { selectCategory("resourceNewCategory.network l4+.common network resources"); fillDescription(vspName); selectNetworkPackageOnboardingProcedure(); + selectDefaultModel(); } /** @@ -96,6 +97,13 @@ public class VspCreationModal extends AbstractPageObject { setSelectIndex(XpathSelector.VENDOR_SELECT, 1); } + /** + * Selects the default model. + */ + public void selectDefaultModel() { + clickElement(XpathSelector.DEFAULT_MODEL_RADIO); + } + /** * Selects a category in the category list based on the option value. * @@ -109,7 +117,7 @@ public class VspCreationModal extends AbstractPageObject { * Selects the network package onboarding procedure option. */ public void selectNetworkPackageOnboardingProcedure() { - wrappingElement.findElement(By.xpath(XpathSelector.METHOD_RADIO.getXpath())).click(); + wrappingElement.findElement(By.xpath(XpathSelector.ONBOARDING_METHOD_RADIO.getXpath())).click(); } private void setInputValue(final XpathSelector inputTestId, final String value) { @@ -138,7 +146,8 @@ public class VspCreationModal extends AbstractPageObject { VENDOR_SELECT("new-vsp-vendor", "//select[@data-test-id='%s']"), CATEGORY_SELECT("new-vsp-category", "//select[@data-test-id='%s']"), DESCRIPTION_TXT("new-vsp-description", "//textarea[@data-test-id='%s']"), - METHOD_RADIO("new-vsp-creation-procedure-heat", "//input[@data-test-id='%s']/parent::label"), + ONBOARDING_METHOD_RADIO("new-vsp-creation-procedure-heat", "//input[@data-test-id='%s']/parent::label"), + DEFAULT_MODEL_RADIO("model-option-default", "//input[@data-test-id='%s']/parent::label"), CREATE_BTN("form-submit-button", "//*[@data-test-id='%s']"); @Getter diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/mapping/MapVspDescriptionDtoToVspDetails.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/mapping/MapVspDescriptionDtoToVspDetails.java index 4c9c16df89..418a512d66 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/mapping/MapVspDescriptionDtoToVspDetails.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/mapping/MapVspDescriptionDtoToVspDetails.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. @@ -48,5 +49,6 @@ public class MapVspDescriptionDtoToVspDetails extends MappingBase { target.setLicensingData(licensingData); } target.setOnboardingMethod(source.getOnboardingMethod()); + target.setSelectedModelList(source.getModelIdList()); } } diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/main/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/VspDescriptionDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/main/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/VspDescriptionDto.java index 90a094e817..e5f4ae0426 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/main/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/VspDescriptionDto.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/main/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/VspDescriptionDto.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. @@ -15,13 +16,22 @@ */ package org.openecomp.sdcrests.vendorsoftwareproducts.types; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; import javax.validation.constraints.NotNull; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import org.apache.commons.collections.CollectionUtils; import org.openecomp.sdc.common.util.ValidationUtils; import org.openecomp.sdc.vendorsoftwareproduct.dao.type.LicenseType; import org.openecomp.sdc.vendorsoftwareproduct.types.LicensingData; @Data +@ToString +@EqualsAndHashCode public class VspDescriptionDto { @NotNull @@ -40,6 +50,7 @@ public class VspDescriptionDto { private String licensingVersion; // this will be populated with vlm version private LicenseType licenseType; private LicensingData licensingData; + private List selectedModelList; public void setName(final String name) { this.name = ValidationUtils.sanitizeInputString(name); @@ -52,4 +63,19 @@ public class VspDescriptionDto { public void setDescription(final String description) { this.description = ValidationUtils.sanitizeInputString(description); } + + public void setSelectedModelList(final List selectedModelList) { + if (CollectionUtils.isEmpty(selectedModelList)) { + this.selectedModelList = new ArrayList<>(); + return; + } + this.selectedModelList = selectedModelList.stream().map(ValidationUtils::sanitizeInputString).collect(Collectors.toList()); + } + + public List getSelectedModelList() { + if (selectedModelList == null) { + return Collections.emptyList(); + } + return new ArrayList<>(selectedModelList); + } } diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/main/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/VspDetailsDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/main/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/VspDetailsDto.java index 2acc27e95a..973d8ea577 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/main/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/VspDetailsDto.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/main/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/VspDetailsDto.java @@ -17,12 +17,16 @@ package org.openecomp.sdcrests.vendorsoftwareproducts.types; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.openecomp.sdc.heat.datatypes.structure.ValidationStructureList; /** * Created by TALIO on 4/25/2016. */ @Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) @Schema(description = "VspDetails") public class VspDetailsDto extends VspRequestDto { diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/main/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/VspRequestDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/main/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/VspRequestDto.java index 13e21ba760..99334bceb6 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/main/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/VspRequestDto.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/main/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/VspRequestDto.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. @@ -17,8 +18,12 @@ package org.openecomp.sdcrests.vendorsoftwareproducts.types; import javax.validation.constraints.NotNull; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; @Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class VspRequestDto extends VspDescriptionDto { @NotNull diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/test/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/VspDescriptionDtoTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/test/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/VspDescriptionDtoTest.java index 2fd5d40a45..fa8acb1f72 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/test/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/VspDescriptionDtoTest.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/test/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/VspDescriptionDtoTest.java @@ -1,50 +1,53 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2019 Nokia. 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 +/* + * - + * ============LICENSE_START======================================================= + * Copyright (C) 2019 Nokia. 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. + * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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========================================================= + * 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.sdcrests.vendorsoftwareproducts.types; -import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanEquals; -import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCode; -import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanToString; -import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; +import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanEqualsExcluding; +import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeExcluding; +import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanToStringExcluding; +import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSettersExcluding; import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +class VspDescriptionDtoTest { -public class VspDescriptionDtoTest { @Test - public void shouldHaveValidGettersAndSetters() { - assertThat(VspDescriptionDto.class, hasValidGettersAndSetters()); + void shouldHaveValidGettersAndSetters() { + assertThat(VspDescriptionDto.class, hasValidGettersAndSettersExcluding("selectedModelList")); } @Test - public void shouldHaveValidToString() { - assertThat(VspDescriptionDto.class, hasValidBeanToString()); + void shouldHaveValidToString() { + assertThat(VspDescriptionDto.class, hasValidBeanToStringExcluding("selectedModelList")); } @Test - public void shouldHaveEquals() { - assertThat(VspDescriptionDto.class, hasValidBeanEquals()); + void shouldHaveEquals() { + assertThat(VspDescriptionDto.class, hasValidBeanEqualsExcluding("selectedModelList")); } @Test - public void shouldHaveHashCode() { - assertThat(VspDescriptionDto.class, hasValidBeanHashCode()); + void shouldHaveHashCode() { + assertThat(VspDescriptionDto.class, hasValidBeanHashCodeExcluding("selectedModelList")); } } \ No newline at end of file diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/test/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/VspDetailsDtoTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/test/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/VspDetailsDtoTest.java index be87a617e5..077f3a6b4e 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/test/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/VspDetailsDtoTest.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/test/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/VspDetailsDtoTest.java @@ -19,14 +19,15 @@ */ package org.openecomp.sdcrests.vendorsoftwareproducts.types; -import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; +import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSettersExcluding; import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +class VspDetailsDtoTest { -public class VspDetailsDtoTest { @Test - public void shouldHaveValidGettersAndSetters() { - assertThat(VspDetailsDto.class, hasValidGettersAndSetters()); + void shouldHaveValidGettersAndSetters() { + assertThat(VspDetailsDto.class, hasValidGettersAndSettersExcluding("selectedModelList")); } } \ No newline at end of file diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/test/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/VspRequestDtoTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/test/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/VspRequestDtoTest.java index dde6143b21..de35922486 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/test/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/VspRequestDtoTest.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/test/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/VspRequestDtoTest.java @@ -19,14 +19,15 @@ */ package org.openecomp.sdcrests.vendorsoftwareproducts.types; -import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; +import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSettersExcluding; import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +class VspRequestDtoTest { -public class VspRequestDtoTest { @Test - public void shouldHaveValidGettersAndSetters() { - assertThat(VspRequestDto.class, hasValidGettersAndSetters()); + void shouldHaveValidGettersAndSetters() { + assertThat(VspRequestDto.class, hasValidGettersAndSettersExcluding("selectedModelList")); } } \ No newline at end of file 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 featureGroups; private String onboardingMethod; + private List modelIdList; public VspDetails(String id, Version version) { this.id = id; @@ -62,10 +66,16 @@ public class VspDetails implements VersionableEntity { return getId(); } + public List 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 { @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 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 diff --git a/openecomp-ui/resources/scss/components/_forms.scss b/openecomp-ui/resources/scss/components/_forms.scss index 40c1aa16c4..1d806919d2 100644 --- a/openecomp-ui/resources/scss/components/_forms.scss +++ b/openecomp-ui/resources/scss/components/_forms.scss @@ -4,6 +4,10 @@ &:first-child { padding-top: 0; } + span.required { + color: $red; + margin: 0 4px 0 0; + } } .validation-form-content { diff --git a/openecomp-ui/resources/scss/components/_inputOptions.scss b/openecomp-ui/resources/scss/components/_inputOptions.scss index eb0fe79ea6..7ac975203c 100644 --- a/openecomp-ui/resources/scss/components/_inputOptions.scss +++ b/openecomp-ui/resources/scss/components/_inputOptions.scss @@ -63,6 +63,20 @@ border-color: $gray; } } + .select-multiple { + border: 1px solid $light-gray; + border-radius: 2px; + min-height: 60px; + float: left; + transition-property: width; + transition-duration: 300ms; + padding-top: 0; + padding-bottom: 0; + width: 100%; + &:hover { + border-color: $gray; + } + } .input-options-other { float: left; height: 30px; diff --git a/openecomp-ui/resources/scss/modules/_softwareProductLandingPage.scss b/openecomp-ui/resources/scss/modules/_softwareProductLandingPage.scss index a0620b3639..c1cf3cf778 100644 --- a/openecomp-ui/resources/scss/modules/_softwareProductLandingPage.scss +++ b/openecomp-ui/resources/scss/modules/_softwareProductLandingPage.scss @@ -1,3 +1,25 @@ +/*! + * - + * ============LICENSE_START======================================================= + * 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. + * 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========================================================= + */ + .upload-modal-body-content { padding-left: 30px; padding-right: 30px; @@ -132,7 +154,8 @@ } border: 1px solid $light-gray; padding: 20px 18px 0 18px; - height: 225px; + min-height: 285px; + height: 100%; display: flex; justify-content: space-between; background-color: $white; diff --git a/openecomp-ui/src/nfvo-components/grid/GridSection.jsx b/openecomp-ui/src/nfvo-components/grid/GridSection.jsx index f2e3588d9e..46063b2b98 100644 --- a/openecomp-ui/src/nfvo-components/grid/GridSection.jsx +++ b/openecomp-ui/src/nfvo-components/grid/GridSection.jsx @@ -22,7 +22,8 @@ const GridSection = ({ children, className = '', titleClassName, - hasLastColSet = false + hasLastColSet = false, + required = false }) => { return (
{title} + {required && *}
)}
{children}
diff --git a/openecomp-ui/src/nfvo-utils/i18n/en.json b/openecomp-ui/src/nfvo-utils/i18n/en.json index 786fe16313..a5518efddd 100644 --- a/openecomp-ui/src/nfvo-utils/i18n/en.json +++ b/openecomp-ui/src/nfvo-utils/i18n/en.json @@ -284,6 +284,7 @@ "Log Backup Frequency (days)": "Log Backup Frequency (days)", "Log File Location": "Log File Location", "Model": "Model", + "model.sdc.label": "SDC AID", "License Details": "License Details", "Feature Group": "Feature Group", "Please assign Feature Groups in VSP General": "Please assign Feature Groups in VSP General", @@ -386,6 +387,7 @@ "VendorSoftwareProduct/vendorName": "Vendor", "VendorSoftwareProduct/onboardingOrigin": "Onboarding Origin", "VendorSoftwareProduct/networkPackageName": "Network Package Name", + "vsp.model.select.label": "Other Models", "EntitlementPool" : "Entitlement Pool", "EntitlementPool/name" : "Name", diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js index 38600a60b8..29e278f928 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js @@ -1,6 +1,7 @@ /*! * Copyright © 2016-2018 European Support Limited * Modifications copyright (c) 2021 Nokia + * 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. @@ -100,11 +101,17 @@ function baseUrl() { const restPrefix = Configuration.get('restPrefix'); return `${restPrefix}/v1.0/vendor-software-products/`; } + function softwareProductCategoriesUrl() { const restCatalogPrefix = Configuration.get('restCatalogPrefix'); return `${restCatalogPrefix}/v1/categories/resources/`; } +function getModelUrl() { + const restCatalogPrefix = Configuration.get('restCatalogPrefix'); + return `${restCatalogPrefix}/v1/catalog/model/`; +} + function uploadFile(vspId, formData, version) { return RestAPIUtil.post( `${baseUrl()}${vspId}/versions/${ @@ -135,6 +142,7 @@ function putSoftwareProduct({ softwareProduct, version }) { : undefined, icon: softwareProduct.icon, licenseType: softwareProduct.licenseType, + selectedModelList: softwareProduct.selectedModelList, licensingData: getLicensingData(softwareProduct.licensingData) } ); @@ -264,6 +272,17 @@ function fetchSoftwareProductCategories(dispatch) { .catch(() => handleResponse(null)); } +function fetchModelList(dispatch) { + let handleResponse = response => + dispatch({ + type: actionTypes.SOFTWARE_PRODUCT_MODELS_LOADED, + modelList: response + }); + RestAPIUtil.fetch(getModelUrl()) + .then(handleResponse) + .catch(() => handleResponse(null)); +} + function loadLicensingData(dispatch, { licenseModelId, licensingVersion }) { return ItemsHelper.fetchVersion({ itemId: licenseModelId, @@ -329,6 +348,7 @@ const SoftwareProductActionHelper = { loadSoftwareProductAssociatedData(dispatch) { fetchSoftwareProductCategories(dispatch); + fetchModelList(dispatch); LicenseModelActionHelper.fetchFinalizedLicenseModels(dispatch); }, diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductConstants.js b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductConstants.js index e13225010f..22a11eab5e 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductConstants.js +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductConstants.js @@ -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. @@ -23,6 +24,7 @@ export const actionTypes = keyMirror( FINALIZED_SOFTWARE_PRODUCT_LIST_LOADED: null, SOFTWARE_PRODUCT_LIST_EDIT: null, SOFTWARE_PRODUCT_CATEGORIES_LOADED: null, + SOFTWARE_PRODUCT_MODELS_LOADED: null, SOFTWARE_PRODUCT_QUESTIONNAIRE_UPDATE: null, LOAD_LICENSING_VERSIONS_LIST: null, TOGGLE_NAVIGATION_ITEM: null, @@ -43,6 +45,11 @@ export const onboardingMethod = { NETWORK_PACKAGE: 'NetworkPackage' }; +export const ModelOption = { + DEFAULT: 'default', + SELECTED: 'selected' +}; + export const onboardingOriginTypes = { NONE: 'none', ZIP: 'zip', diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductReducer.js b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductReducer.js index dcec5c683f..06e974c78f 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductReducer.js +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductReducer.js @@ -1,5 +1,6 @@ /*! * 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. @@ -160,6 +161,12 @@ export default combineReducers({ } return state; }, + modelList: (state = [], action) => { + if (action.type === actionTypes.SOFTWARE_PRODUCT_MODELS_LOADED) { + return action.modelList; + } + return state; + }, softwareProductQuestionnaire: createJSONSchemaReducer( PRODUCT_QUESTIONNAIRE ), diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/creation/SoftwareProductCreation.js b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/creation/SoftwareProductCreation.js index 539bc12ca7..cccde7883e 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/creation/SoftwareProductCreation.js +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/creation/SoftwareProductCreation.js @@ -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. @@ -33,7 +34,11 @@ export const mapStateToProps = ({ archivedSoftwareProductList, softwareProductList, finalizedSoftwareProductList, - softwareProduct: { softwareProductCreation, softwareProductCategories } + softwareProduct: { + softwareProductCreation, + softwareProductCategories, + modelList + } }) => { let { genericFieldInfo, vendorList = [] } = softwareProductCreation; let isFormValid = ValidationHelper.checkFormValid(genericFieldInfo); @@ -55,6 +60,7 @@ export const mapStateToProps = ({ softwareProductCategories, finalizedLicenseModelList, vendorList, + modelList: modelList, isFormValid, formReady: softwareProductCreation.formReady, genericFieldInfo, @@ -65,12 +71,13 @@ export const mapStateToProps = ({ export const mapActionsToProps = dispatch => { return { - onDataChanged: (deltaData, formName, customValidations) => + onDataChanged: (deltaData, formName, customValidations) => { ValidationHelper.dataChanged(dispatch, { deltaData, formName, customValidations - }), + }); + }, onCancel: () => SoftwareProductCreationActionHelper.resetData(dispatch), onSubmit: (softwareProduct, usersList) => { SoftwareProductCreationActionHelper.resetData(dispatch); diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/creation/SoftwareProductCreationReducer.js b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/creation/SoftwareProductCreationReducer.js index 886037406f..496a251105 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/creation/SoftwareProductCreationReducer.js +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/creation/SoftwareProductCreationReducer.js @@ -1,5 +1,6 @@ /*! * 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. @@ -70,6 +71,18 @@ export default (state = {}, action) => { validations: [ { type: 'requiredChooseOption', data: true } ] + }, + modelOption: { + isValid: true, + errorText: '', + validations: [ + { type: 'requiredChooseOption', data: true } + ] + }, + selectedModelList: { + isValid: true, + errorText: '', + validations: [] } }, showModal: true diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/creation/SoftwareProductCreationView.jsx b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/creation/SoftwareProductCreationView.jsx index e4a9893f61..51e883427a 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/creation/SoftwareProductCreationView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/creation/SoftwareProductCreationView.jsx @@ -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. @@ -14,7 +15,7 @@ * permissions and limitations under the License. */ import React from 'react'; -import PropTypes from 'prop-types'; +import PropTypes, { string } from 'prop-types'; import i18n from 'nfvo-utils/i18n/i18n.js'; import Validator from 'nfvo-utils/Validator.js'; import Input from 'nfvo-components/input/validation/Input.jsx'; @@ -26,7 +27,11 @@ import { SP_CREATION_FORM_NAME } from './SoftwareProductCreationConstants.js'; import sortByStringProperty from 'nfvo-utils/sortByStringProperty.js'; import SoftwareProductCategoriesHelper from 'sdc-app/onboarding/softwareProduct/SoftwareProductCategoriesHelper.js'; -import { onboardingMethod as onboardingMethodConst } from '../SoftwareProductConstants.js'; +import { + ModelOption, + onboardingMethod as onboardingMethodConst +} from '../SoftwareProductConstants.js'; +import SelectInput from 'nfvo-components/input/SelectInput.jsx'; const SoftwareProductPropType = PropTypes.shape({ id: PropTypes.string, @@ -34,7 +39,8 @@ const SoftwareProductPropType = PropTypes.shape({ description: PropTypes.string, category: PropTypes.string, subCategory: PropTypes.string, - vendorId: PropTypes.string + vendorId: PropTypes.string, + selectedModelList: PropTypes.arrayOf(string) }); class SoftwareProductCreationView extends React.Component { @@ -44,6 +50,7 @@ class SoftwareProductCreationView extends React.Component { softwareProductCategories: PropTypes.array, VSPNames: PropTypes.object, usersList: PropTypes.array, + modelList: PropTypes.array, onDataChanged: PropTypes.func.isRequired, onSubmit: PropTypes.func.isRequired, onCancel: PropTypes.func.isRequired @@ -56,14 +63,17 @@ class SoftwareProductCreationView extends React.Component { onDataChanged, onCancel, genericFieldInfo, - disableVendor + disableVendor, + modelList } = this.props; let { name, description, vendorId, subCategory, - onboardingMethod + onboardingMethod, + modelOption, + selectedModelList } = data; const vendorList = this.getVendorList(); @@ -193,11 +203,24 @@ class SoftwareProductCreationView extends React.Component { /> - + + + + + + + + )} @@ -235,14 +258,12 @@ class SoftwareProductCreationView extends React.Component { } submit() { - let { - data: softwareProduct, - finalizedLicenseModelList, - usersList - } = this.props; + let { finalizedLicenseModelList, usersList } = this.props; + const softwareProduct = { ...this.props.data }; softwareProduct.vendorName = finalizedLicenseModelList.find( vendor => vendor.id === softwareProduct.vendorId ).name; + delete softwareProduct.modelOption; this.props.onSubmit(softwareProduct, usersList); } @@ -284,7 +305,7 @@ const OnboardingProcedure = ({ genericFieldInfo }) => { return ( - + { + function onSelectChanged(selectedValueList) { + let modelList1 = []; + if (selectedValueList) { + modelList1 = selectedValueList.map(item => item.value); + } + onDataChanged({ selectedModelList: modelList1 }, SP_CREATION_FORM_NAME); + } + + function selectDefaultModel() { + return () => { + onDataChanged( + { modelOption: ModelOption.DEFAULT }, + SP_CREATION_FORM_NAME + ); + onDataChanged({ selectedModelList: [] }, SP_CREATION_FORM_NAME); + }; + } + + return ( + + + + + onDataChanged( + { modelOption: ModelOption.SELECTED }, + SP_CREATION_FORM_NAME + ) + } + type="radio" + data-test-id="model-option-selected" + groupClassName="no-bottom-margin" + /> + + + {modelOption === ModelOption.SELECTED &&
} + {modelOption === ModelOption.SELECTED && ( + ({ + label: model.name, + value: model.name + }))} + onMultiSelectChanged={onSelectChanged} + value={selectedModelList} + clearable={true} + placeholder={i18n('vsp.model.select.label')} + multi + /> + )} + {modelOption === ModelOption.SELECTED &&
} + + + ); +}; + export default SoftwareProductCreationView; diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/details/SoftwareProductDetailsView.jsx b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/details/SoftwareProductDetailsView.jsx index 7df610a3ec..d24916f663 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/details/SoftwareProductDetailsView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/details/SoftwareProductDetailsView.jsx @@ -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. @@ -51,6 +52,7 @@ class GeneralSection extends React.Component { name: PropTypes.string, description: PropTypes.string, subCategory: PropTypes.string, + selectedModelList: PropTypes.arrayOf(PropTypes.string), softwareProductCategories: PropTypes.array, finalizedLicenseModelList: PropTypes.array, onDataChanged: PropTypes.func.isRequired, @@ -164,6 +166,22 @@ class GeneralSection extends React.Component { ) )} +
+ +
+ {this.props.selectedModelList.length > 0 ? ( +
    + {this.props.selectedModelList.map( + value =>
  • {value}
    • + )} +
+ ) : ( + i18n('model.sdc.label') + )} +
+
this.onSelectSubCategory(args), genericFieldInfo, vendorName, + selectedModelList, isVendorArchived, onArchivedVendorRemove }; diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/landingPage/SoftwareProductLandingPageView.jsx b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/landingPage/SoftwareProductLandingPageView.jsx index 0f18a44708..5f208345f7 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/landingPage/SoftwareProductLandingPageView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/landingPage/SoftwareProductLandingPageView.jsx @@ -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. @@ -36,7 +37,8 @@ const SoftwareProductPropType = PropTypes.shape({ licenseType: PropTypes.string, status: PropTypes.string, licensingData: PropTypes.object, - validationData: PropTypes.object + validationData: PropTypes.object, + selectedModelList: PropTypes.arrayOf(PropTypes.string) }); const ComponentPropType = PropTypes.shape({ @@ -259,7 +261,8 @@ const ProductSummary = ({ name = '', description = '', vendorName = '', - fullCategoryDisplayName = '' + fullCategoryDisplayName = '', + selectedModelList = [] } = currentSoftwareProduct; return (
@@ -285,6 +288,20 @@ const ProductSummary = ({ {fullCategoryDisplayName}
+
+
{i18n('Model')}
+
+ {selectedModelList.length > 0 ? ( +
    + {selectedModelList.map(value => ( +
  • {value}
    • + ))} +
+ ) : ( + i18n('model.sdc.label') + )} +
+
{i18n('License Agreement')} diff --git a/openecomp-ui/test/softwareProduct/creation/SoftwareProductCreation.test.js b/openecomp-ui/test/softwareProduct/creation/SoftwareProductCreation.test.js index 20ca17d3d0..2758e28f77 100644 --- a/openecomp-ui/test/softwareProduct/creation/SoftwareProductCreation.test.js +++ b/openecomp-ui/test/softwareProduct/creation/SoftwareProductCreation.test.js @@ -1,17 +1,23 @@ /* - * Copyright © 2016-2018 European Support Limited + * - + * ============LICENSE_START======================================================= + * 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. + * You may obtain a copy of the License at * - * 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 * - * 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. * - * 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========================================================= */ import React from 'react'; @@ -71,6 +77,22 @@ describe('Software Product Creation Module Tests', function() { expect(props.VSPNames).toEqual({vsp1: 'vsp1_id', vsp2: 'vsp2_id'}); }); + it ('should return model list', () => { + const modelList = ["model1", "model2", "model3"]; + let state = { + finalizedSoftwareProductList: [], + archivedSoftwareProductList: [], + softwareProductList: [], + softwareProduct: { + modelList: modelList, + softwareProductCreation: {} + }, + users: {} + }; + let props = mapStateToProps(state); + expect(props.modelList).toEqual(modelList); + }); + it('simple jsx test', () => { const store = storeCreator(); let dispatch = store.dispatch; diff --git a/openecomp-ui/test/softwareProduct/details/test.js b/openecomp-ui/test/softwareProduct/details/test.js index 92390f61ef..0e0c9ecafd 100644 --- a/openecomp-ui/test/softwareProduct/details/test.js +++ b/openecomp-ui/test/softwareProduct/details/test.js @@ -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. @@ -216,6 +217,13 @@ describe('Software Product Details Module Tests', function () { return []; }); + mockRest.addHandler('fetch', ({options, data, baseUrl}) => { + expect(baseUrl).toEqual('/sdc1/feProxy/rest/v1/catalog/model/'); + expect(data).toEqual(undefined); + expect(options).toEqual(undefined); + return []; + }); + mockRest.addHandler('fetch', ({options, data, baseUrl}) => { expect(baseUrl).toEqual('/onboarding-api/v1.0/vendor-license-models/?versionFilter=Certified'); expect(data).toEqual(undefined); -- cgit 1.2.3-korg