diff options
Diffstat (limited to 'openecomp-be/lib')
11 files changed, 555 insertions, 9 deletions
diff --git a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/errors/Messages.java b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/errors/Messages.java index 21ad7a60a5..93100421d2 100644 --- a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/errors/Messages.java +++ b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/errors/Messages.java @@ -208,7 +208,7 @@ public enum Messages { UNEXPECTED_PROBLEM_HAPPENED_WHILE_GETTING("An unexpected problem happened while getting '%s'"); // @formatter:on - private String errorMessage; + private final String errorMessage; /** * Formats the message with the given parameters. 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/VspUploadStatusRecordAccessor.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/VspUploadStatusRecordAccessor.java new file mode 100644 index 0000000000..84ffde6ae4 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/VspUploadStatusRecordAccessor.java @@ -0,0 +1,44 @@ +/* + * - + * ============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; + +import com.datastax.driver.mapping.Result; +import com.datastax.driver.mapping.annotations.Accessor; +import com.datastax.driver.mapping.annotations.Query; +import java.util.UUID; +import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspUploadStatusRecord; + +/** + * Cassandra accessor for the {@link VspUploadStatusRecord} + */ +@Accessor +public interface VspUploadStatusRecordAccessor { + + @Query("SELECT * FROM vsp_upload_status WHERE vsp_id = ? AND vsp_version_id = ?") + Result<VspUploadStatusRecord> findAllByVspIdAndVspVersionId(final String vspId, final String vspVersionId); + + @Query("SELECT * FROM vsp_upload_status WHERE vsp_id = ? AND vsp_version_id = ? AND is_complete = FALSE") + Result<VspUploadStatusRecord> findAllIncomplete(final String vspId, final String vspVersionId); + + @Query("SELECT * FROM vsp_upload_status WHERE vsp_id = ? AND vsp_version_id = ? AND lock_id = ?") + Result<VspUploadStatusRecord> findByVspIdAndVersionIdAndLockId(final String vspId, final String vspVersionId, final UUID lockId); +} 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/VspUploadStatusRecordDao.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/VspUploadStatusRecordDao.java new file mode 100644 index 0000000000..3329eb176b --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/VspUploadStatusRecordDao.java @@ -0,0 +1,84 @@ +/* + * - + * ============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; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; +import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspUploadStatusRecord; + +/** + * Data Access Object for the package upload process status record. + */ +public interface VspUploadStatusRecordDao { + + /** + * Creates an upload status record. + * + * @param vspUploadStatusRecord the upload status record to create + */ + void create(final VspUploadStatusRecord vspUploadStatusRecord); + + /** + * Updates an upload status record. + * + * @param vspUploadStatusRecord the upload status record to update + */ + void update(final VspUploadStatusRecord vspUploadStatusRecord); + + /** + * Finds all upload status record by Vendor Software Product id and its version id. + * + * @param vspId the Vendor Software Product id + * @param vspVersionId the Vendor Software Product version id + * @return a list with all the status record found that matches the criteria + */ + List<VspUploadStatusRecord> findAllByVspIdAndVersionId(final String vspId, final String vspVersionId); + + /** + * Finds all upload status record by Vendor Software Product id and its version id. + * + * @param vspId the Vendor Software Product id + * @param vspVersionId the Vendor Software Product version id + * @return a list with all the status record found that matches the criteria + */ + Optional<VspUploadStatusRecord> findByVspIdAndVersionIdAndLockId(final String vspId, final String vspVersionId, final UUID lockId); + + /** + * Finds all uploads in progress by Vendor Software Product id and its version id. + * + * @param vspId the Vendor Software Product id + * @param vspVersionId the Vendor Software Product version id + * @return a list with all the status record found that matches the criteria + */ + List<VspUploadStatusRecord> findAllInProgress(final String vspId, final String vspVersionId); + + /** + * Finds the latest upload status record for the Vendor Software Product id and its version id. + * + * @param vspId the Vendor Software Product id + * @param vspVersionId the Vendor Software Product version id + * @return the latest upload status record that matches the criteria + */ + Optional<VspUploadStatusRecord> findLatest(final String vspId, final String vspVersionId); + +} 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/VspUploadStatus.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/VspUploadStatus.java new file mode 100644 index 0000000000..f5d9de36bd --- /dev/null +++ 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/VspUploadStatus.java @@ -0,0 +1,42 @@ +/* + * - + * ============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.type; + +import java.util.List; + +/** + * Represents the status of a Vendor Software Product package upload. + */ +public enum VspUploadStatus { + UPLOADING, + PROCESSING, + SUCCESS, + ERROR; + + public boolean isCompleteStatus() { + return getCompleteStatus().contains(this); + } + + public static List<VspUploadStatus> getCompleteStatus() { + return List.of(SUCCESS, ERROR); + } +} 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/VspUploadStatusRecord.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/VspUploadStatusRecord.java new file mode 100644 index 0000000000..d0ce91cc57 --- /dev/null +++ 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/VspUploadStatusRecord.java @@ -0,0 +1,75 @@ +/* + * - + * ============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.type; + +import com.datastax.driver.mapping.annotations.ClusteringColumn; +import com.datastax.driver.mapping.annotations.Column; +import com.datastax.driver.mapping.annotations.PartitionKey; +import com.datastax.driver.mapping.annotations.Table; +import java.util.Date; +import java.util.UUID; +import lombok.AccessLevel; +import lombok.Data; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Data +@NoArgsConstructor +@Table(keyspace = "dox", name = "vsp_upload_status") +public class VspUploadStatusRecord { + + @PartitionKey + @Column(name = "vsp_id") + private String vspId; + + @PartitionKey(value = 1) + @Column(name = "vsp_version_id") + private String vspVersionId; + + @ClusteringColumn + @Column(name = "lock_id") + private UUID lockId; + + @Column(name = "is_complete") + @Getter(AccessLevel.NONE) + @Setter(AccessLevel.NONE) + private boolean isComplete; + + @Column(name = "status") + private VspUploadStatus status; + + @ClusteringColumn(value = 1) + @Column(name = "created") + private Date created; + + @Column(name = "updated") + private Date updated; + + public boolean getIsComplete() { + return isComplete; + } + + public void setIsComplete(boolean complete) { + isComplete = complete; + } +}
\ 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/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/VspUploadStatusTest.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/VspUploadStatusTest.java new file mode 100644 index 0000000000..83618e74da --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/VspUploadStatusTest.java @@ -0,0 +1,48 @@ +/* + * - + * ============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.type; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.List; +import org.junit.jupiter.api.Test; + +class VspUploadStatusTest { + + @Test + void isCompleteStatus() { + assertTrue(VspUploadStatus.SUCCESS.isCompleteStatus()); + assertTrue(VspUploadStatus.ERROR.isCompleteStatus()); + assertFalse(VspUploadStatus.UPLOADING.isCompleteStatus()); + assertFalse(VspUploadStatus.PROCESSING.isCompleteStatus()); + } + + @Test + void getCompleteStatusTest() { + final List<VspUploadStatus> completeStatus = VspUploadStatus.getCompleteStatus(); + assertEquals(2, completeStatus.size()); + assertTrue(completeStatus.contains(VspUploadStatus.SUCCESS)); + assertTrue(completeStatus.contains(VspUploadStatus.ERROR)); + } +}
\ No newline at end of file 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/errors/VendorSoftwareProductNotFoundErrorBuilder.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/errors/VendorSoftwareProductNotFoundErrorBuilder.java index 8cb2d72d25..5b0933d03f 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/errors/VendorSoftwareProductNotFoundErrorBuilder.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/errors/VendorSoftwareProductNotFoundErrorBuilder.java @@ -27,6 +27,7 @@ import org.openecomp.sdc.common.errors.ErrorCode; public class VendorSoftwareProductNotFoundErrorBuilder { private static final String VSP_FOUND_MSG = "Vendor software product with Id %s not found."; + private static final String VSP_ID_AND_VERSION_ID_NOT_FOUND_MSG = "Vendor Software Product with id '%s' and version id '%s' not found."; private final ErrorCode.ErrorCodeBuilder builder = new ErrorCode.ErrorCodeBuilder(); /** @@ -40,6 +41,12 @@ public class VendorSoftwareProductNotFoundErrorBuilder { builder.withMessage(String.format(VSP_FOUND_MSG, vendorSoftwareProductId)); } + public VendorSoftwareProductNotFoundErrorBuilder(final String vendorSoftwareProductId, final String vendorSoftwareProductVersionId) { + builder.withId(VSP_NOT_FOUND); + builder.withCategory(ErrorCategory.APPLICATION); + builder.withMessage(String.format(VSP_ID_AND_VERSION_ID_NOT_FOUND_MSG, vendorSoftwareProductId, vendorSoftwareProductVersionId)); + } + public ErrorCode build() { return builder.build(); } 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/VspUploadStatusRecordDaoIml.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/VspUploadStatusRecordDaoIml.java new file mode 100644 index 0000000000..558016c9af --- /dev/null +++ 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/VspUploadStatusRecordDaoIml.java @@ -0,0 +1,97 @@ +/* + * - + * ============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 com.datastax.driver.extras.codecs.enums.EnumNameCodec; +import com.datastax.driver.mapping.Mapper; +import com.datastax.driver.mapping.MappingManager; +import com.datastax.driver.mapping.Result; +import java.util.Comparator; +import java.util.List; +import java.util.Optional; +import java.util.UUID; +import org.openecomp.core.nosqldb.factory.NoSqlDbFactory; +import org.openecomp.sdc.vendorsoftwareproduct.dao.VspUploadStatusRecordAccessor; +import org.openecomp.sdc.vendorsoftwareproduct.dao.VspUploadStatusRecordDao; +import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspUploadStatusRecord; +import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspUploadStatus; +import org.springframework.stereotype.Component; + +/** + * Data access object for the package upload process status. + */ +@Component("vsp-upload-status-record-dao-impl") +public class VspUploadStatusRecordDaoIml implements VspUploadStatusRecordDao { + + private final Mapper<VspUploadStatusRecord> mapper; + private final VspUploadStatusRecordAccessor accessor; + + public VspUploadStatusRecordDaoIml() { + final MappingManager mappingManager = NoSqlDbFactory.getInstance().createInterface().getMappingManager(); + mapper = mappingManager.mapper(VspUploadStatusRecord.class); + accessor = mappingManager.createAccessor(VspUploadStatusRecordAccessor.class); + mappingManager.getSession().getCluster().getConfiguration().getCodecRegistry().register(new EnumNameCodec<>(VspUploadStatus.class)); + } + + //for tests purpose + VspUploadStatusRecordDaoIml(final VspUploadStatusRecordAccessor accessor) { + this.accessor = accessor; + mapper = null; + } + + @Override + public void create(final VspUploadStatusRecord vspUploadStatusRecord) { + mapper.save(vspUploadStatusRecord); + } + + @Override + public void update(final VspUploadStatusRecord vspUploadStatusRecord) { + mapper.save(vspUploadStatusRecord); + } + + @Override + public List<VspUploadStatusRecord> findAllByVspIdAndVersionId(final String vspId, final String vspVersionId) { + final Result<VspUploadStatusRecord> allByVspIdAndVspVersionId = accessor.findAllByVspIdAndVspVersionId(vspId, vspVersionId); + return allByVspIdAndVspVersionId.all(); + } + + @Override + public Optional<VspUploadStatusRecord> findByVspIdAndVersionIdAndLockId(final String vspId, final String vspVersionId, final UUID lockId) { + final Result<VspUploadStatusRecord> vspUploadStatusRecordResult = accessor.findByVspIdAndVersionIdAndLockId(vspId, vspVersionId, lockId); + final VspUploadStatusRecord vspUploadStatusRecord = vspUploadStatusRecordResult.one(); + return Optional.ofNullable(vspUploadStatusRecord); + } + + @Override + public List<VspUploadStatusRecord> findAllInProgress(final String vspId, final String vspVersionId) { + final Result<VspUploadStatusRecord> incompleteUploadList = accessor.findAllIncomplete(vspId, vspVersionId); + return incompleteUploadList.all(); + } + + @Override + public Optional<VspUploadStatusRecord> findLatest(final String vspId, final String vspVersionId) { + final List<VspUploadStatusRecord> vspUploadStatusRecordList = accessor.findAllByVspIdAndVspVersionId(vspId, vspVersionId).all(); + vspUploadStatusRecordList.sort(Comparator.comparing(VspUploadStatusRecord::getCreated).reversed()); + return Optional.ofNullable(vspUploadStatusRecordList.get(0)); + } + +} 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/errors/VendorSoftwareProductErrorCodes.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/errors/VendorSoftwareProductErrorCodes.java index 13ade278bf..353dd2d727 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/errors/VendorSoftwareProductErrorCodes.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/errors/VendorSoftwareProductErrorCodes.java @@ -77,6 +77,11 @@ public class VendorSoftwareProductErrorCodes { public static final String UPDATE_IMAGE_NOT_ALLOWED = "UPDATE_IMAGE_NOT_ALLOWED"; public static final String INVALID_EXTENSION = "INVALID_EXTENSION"; public static final String VSP_ONBOARD_METHOD_UPDATE_NOT_ALLOWED = "VSP_ONBOARD_METHOD_UPDATE_NOT_ALLOWED"; + public static final String VSP_PROCESSING_IN_PROGRESS = "VSP_PROCESSING_IN_PROGRESS"; + public static final String VSP_CREATE_UPLOAD_LOCK_ERROR = "VSP_CREATE_UPLOAD_LOCK_ERROR"; + public static final String VSP_UPDATE_UPLOAD_LOCK_ERROR = "VSP_UPDATE_UPLOAD_LOCK_ERROR"; + public static final String VSP_UPLOAD_LOCK_NOT_FOUND_ERROR = "VSP_UPLOAD_LOCK_NOT_FOUND_ERROR"; + public static final String VSP_UPLOAD_ALREADY_FINISHED_ERROR = "VSP_UPLOAD_ALREADY_FINISHED_ERROR"; private VendorSoftwareProductErrorCodes() { } 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 |