diff options
author | 2021-12-15 19:44:06 +0000 | |
---|---|---|
committer | 2022-01-21 13:25:16 +0000 | |
commit | 049d078d8abbe637b213a2f14c2192379208c168 (patch) | |
tree | 3fb61e7fe7a95684499329cfa120c82de0c533b5 /openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test | |
parent | b3761a858f0ec676dd0236101b29f8948d5d6a2e (diff) |
Onboarding upload control
Brings the initial structure to control asynchronously a VSP package
upload during the onboarding.
Instead of blocking the UI, the upload and processing status will be
controlled by the backend, so the frontend can query it and control the
behaviour of the UI.
Updates the upload endpoint to obtain/verify an upload lock, and creates
a second endpoint to check for the upload status.
Change-Id: If1c43fb4f0b11e1d8a5627578bafc75f266393c2
Issue-ID: SDC-3826, SDC-3827
Signed-off-by: andre.schmid <andre.schmid@est.tech>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test')
2 files changed, 152 insertions, 8 deletions
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/errors/VendorSoftwareProductNotFoundErrorBuilderTest.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/errors/VendorSoftwareProductNotFoundErrorBuilderTest.java index 9268178fbd..71b77b1ff5 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/VendorSoftwareProductNotFoundErrorBuilderTest.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/errors/VendorSoftwareProductNotFoundErrorBuilderTest.java @@ -15,21 +15,32 @@ */ package org.openecomp.sdc.vendorsoftwareproduct.dao.errors; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.openecomp.sdc.vendorsoftwareproduct.errors.VendorSoftwareProductErrorCodes.VSP_NOT_FOUND; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openecomp.sdc.common.errors.ErrorCategory; import org.openecomp.sdc.common.errors.ErrorCode; -public class VendorSoftwareProductNotFoundErrorBuilderTest { +class VendorSoftwareProductNotFoundErrorBuilderTest { @Test - public void shouldReturnVspNotFoundErrorCode() { - VendorSoftwareProductNotFoundErrorBuilder vendorSoftwareProductNotFoundErrorBuilder = - new VendorSoftwareProductNotFoundErrorBuilder("testVsp1"); + void shouldReturnVspNotFoundErrorCode() { + final var vendorSoftwareProductNotFoundErrorBuilder = new VendorSoftwareProductNotFoundErrorBuilder("testVsp1"); ErrorCode actual = vendorSoftwareProductNotFoundErrorBuilder.build(); - Assert.assertEquals(ErrorCategory.APPLICATION, actual.category()); - Assert.assertEquals(VSP_NOT_FOUND, actual.id()); + assertEquals(ErrorCategory.APPLICATION, actual.category()); + assertEquals(VSP_NOT_FOUND, actual.id()); + } + + @Test + void vspIdAndVspVersionIdConstructorTest() { + var vspId = "vspId"; + var vspVersionId = "vspVersionId"; + final var errorBuilder = new VendorSoftwareProductNotFoundErrorBuilder(vspId, vspVersionId); + final ErrorCode actualErrorCode = errorBuilder.build(); + assertEquals(ErrorCategory.APPLICATION, actualErrorCode.category()); + assertEquals(VSP_NOT_FOUND, actualErrorCode.id()); + final String expectedMsg = String.format("Vendor Software Product with id '%s' and version id '%s' not found.", vspId, vspVersionId); + assertEquals(expectedMsg, actualErrorCode.message()); } } 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/VspUploadStatusRecordDaoImlTest.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/VspUploadStatusRecordDaoImlTest.java new file mode 100644 index 0000000000..cd0bc1cd1e --- /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/VspUploadStatusRecordDaoImlTest.java @@ -0,0 +1,133 @@ +/* + * - + * ============LICENSE_START======================================================= + * Copyright (C) 2022 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; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import com.datastax.driver.mapping.Result; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; +import java.util.Optional; +import java.util.UUID; +import java.util.stream.IntStream; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.openecomp.sdc.vendorsoftwareproduct.dao.VspUploadStatusRecordAccessor; +import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspUploadStatusRecord; + +class VspUploadStatusRecordDaoImlTest { + + @Mock + private VspUploadStatusRecordAccessor accessor; + + private VspUploadStatusRecordDaoIml packageUploadManagerDaoIml; + + @BeforeEach + void setUp() { + MockitoAnnotations.openMocks(this); + packageUploadManagerDaoIml = new VspUploadStatusRecordDaoIml(accessor); + } + + @Test + void findAllByVspIdAndVersionIdSuccessTest() { + //given + final String vspId = "vspId"; + final String vspVersionId = "vspVersionId"; + final List<VspUploadStatusRecord> expectedVspUploadStatusRecordList = List.of(new VspUploadStatusRecord(), new VspUploadStatusRecord()); + final Result<VspUploadStatusRecord> resultMock = mock(Result.class); + when(resultMock.all()).thenReturn(expectedVspUploadStatusRecordList); + when(accessor.findAllByVspIdAndVspVersionId(vspId, vspVersionId)).thenReturn(resultMock); + //when + final List<VspUploadStatusRecord> actualVspUploadStatusRecordList = + packageUploadManagerDaoIml.findAllByVspIdAndVersionId(vspId, vspVersionId); + //then + assertEquals(expectedVspUploadStatusRecordList, actualVspUploadStatusRecordList); + } + + @Test + void findByVspIdAndVersionIdAndLockIdSuccessTest() { + //given + final String vspId = "vspId"; + final String vspVersionId = "vspVersionId"; + final UUID lockId = UUID.randomUUID(); + final var expectedVspUploadStatus = new VspUploadStatusRecord(); + final Result<VspUploadStatusRecord> resultMock = mock(Result.class); + when(resultMock.one()).thenReturn(expectedVspUploadStatus); + when(accessor.findByVspIdAndVersionIdAndLockId(vspId, vspVersionId, lockId)).thenReturn(resultMock); + //when + final Optional<VspUploadStatusRecord> vspUploadStatusOptional = + packageUploadManagerDaoIml.findByVspIdAndVersionIdAndLockId(vspId, vspVersionId, lockId); + //then + assertTrue(vspUploadStatusOptional.isPresent()); + assertEquals(expectedVspUploadStatus, vspUploadStatusOptional.get()); + } + + @Test + void findAllNotCompleteSuccessTest() { + //given + final String vspId = "vspId"; + final String vspVersionId = "vspVersionId"; + final List<VspUploadStatusRecord> expectedVspUploadStatusRecordList = List.of(new VspUploadStatusRecord(), new VspUploadStatusRecord()); + final Result<VspUploadStatusRecord> resultMock = mock(Result.class); + when(resultMock.all()).thenReturn(expectedVspUploadStatusRecordList); + when(accessor.findAllIncomplete(vspId, vspVersionId)).thenReturn(resultMock); + //when + final List<VspUploadStatusRecord> actualVspUploadStatusRecordList = packageUploadManagerDaoIml.findAllInProgress(vspId, vspVersionId); + //then + assertEquals(expectedVspUploadStatusRecordList, actualVspUploadStatusRecordList); + } + + @Test + void findLatestSuccessTest() { + //given + final String vspId = "vspId"; + final String vspVersionId = "vspVersionId"; + final List<VspUploadStatusRecord> expectedVspUploadStatusRecordList = new ArrayList<>(); + IntStream.rangeClosed(1, 31) + .mapToObj(day -> { + final VspUploadStatusRecord vspUploadStatusRecord = new VspUploadStatusRecord(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(2022, Calendar.JANUARY, day); + vspUploadStatusRecord.setCreated(calendar.getTime()); + return vspUploadStatusRecord; + }) + .forEach(expectedVspUploadStatusRecordList::add); + final Result<VspUploadStatusRecord> resultMock = mock(Result.class); + when(resultMock.all()).thenReturn(expectedVspUploadStatusRecordList); + + final VspUploadStatusRecord mostRecentVspUploadStatus = expectedVspUploadStatusRecordList.get(expectedVspUploadStatusRecordList.size() - 1); + + when(accessor.findAllByVspIdAndVspVersionId(vspId, vspVersionId)).thenReturn(resultMock); + //when + final Optional<VspUploadStatusRecord> vspUploadStatusOptional = packageUploadManagerDaoIml.findLatest(vspId, vspVersionId); + //then + assertTrue(vspUploadStatusOptional.isPresent()); + assertEquals(mostRecentVspUploadStatus, vspUploadStatusOptional.get()); + } + +}
\ No newline at end of file |