From fb230e85476a091f7f3a035242f1e884d631dee0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20de=20Talhou=C3=ABt?= Date: Sat, 12 Jan 2019 15:48:20 -0500 Subject: [PATCH] Implement BluePrintCatalogService MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: Ifcb0d730daec4da747d704c270b72b991e01f474 Issue-ID: CCSDK-908 Signed-off-by: Alexis de Talhouët --- .../db/BlueprintProcessorCatalogServiceImpl.kt | 119 ++++++++++++--------- .../db/primary/domain/BlueprintProcessorModel.kt | 15 +-- .../domain/BlueprintProcessorModelContent.kt | 6 +- .../db/BlueprintProcessorCatalogServiceImplTest.kt | 52 +++++++++ .../src/test/resources/application-test.properties | 5 +- .../commons/db-lib/src/test/resources/test-cba.zip | Bin 0 -> 9189 bytes .../selfservice/api/ExecutionServiceHandler.kt | 4 +- .../selfservice/api/mock/SelfServiceApiMocks.kt | 16 ++- 8 files changed, 139 insertions(+), 78 deletions(-) create mode 100644 ms/blueprintsprocessor/modules/commons/db-lib/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/db/BlueprintProcessorCatalogServiceImplTest.kt create mode 100644 ms/blueprintsprocessor/modules/commons/db-lib/src/test/resources/test-cba.zip diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/db/BlueprintProcessorCatalogServiceImpl.kt b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/db/BlueprintProcessorCatalogServiceImpl.kt index 89b7f649f..dee7ae86b 100755 --- a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/db/BlueprintProcessorCatalogServiceImpl.kt +++ b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/db/BlueprintProcessorCatalogServiceImpl.kt @@ -17,77 +17,98 @@ package org.onap.ccsdk.apps.blueprintsprocessor.db +import org.onap.ccsdk.apps.blueprintsprocessor.core.BluePrintCoreConfiguration import org.onap.ccsdk.apps.blueprintsprocessor.db.primary.domain.BlueprintProcessorModel import org.onap.ccsdk.apps.blueprintsprocessor.db.primary.domain.BlueprintProcessorModelContent -import org.onap.ccsdk.apps.blueprintsprocessor.db.primary.repository.BlueprintProcessorModelContentRepository import org.onap.ccsdk.apps.blueprintsprocessor.db.primary.repository.BlueprintProcessorModelRepository import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException import org.onap.ccsdk.apps.controllerblueprints.core.common.ApplicationConstants -import org.onap.ccsdk.apps.controllerblueprints.core.config.BluePrintLoadConfiguration import org.onap.ccsdk.apps.controllerblueprints.core.data.ErrorCode import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintValidatorService import org.onap.ccsdk.apps.controllerblueprints.core.utils.BluePrintArchiveUtils -import org.onap.ccsdk.apps.controllerblueprints.core.utils.BluePrintMetadataUtils import org.onap.ccsdk.apps.controllerblueprints.db.resources.BlueprintCatalogServiceImpl +import org.slf4j.LoggerFactory import org.springframework.dao.DataIntegrityViolationException import org.springframework.stereotype.Service import java.io.File import java.nio.file.Files +import java.nio.file.Path +import java.nio.file.Paths /** -Similar/Duplicate implementation in [org.onap.ccsdk.apps.controllerblueprints.service.load.ControllerBlueprintCatalogServiceImpl] + * Similar/Duplicate implementation in [org.onap.ccsdk.apps.controllerblueprints.service.load.ControllerBlueprintCatalogServiceImpl] */ @Service -class BlueprintProcessorCatalogServiceImpl(bluePrintLoadConfiguration: BluePrintLoadConfiguration, - private val bluePrintValidatorService: BluePrintValidatorService, +class BlueprintProcessorCatalogServiceImpl(bluePrintValidatorService: BluePrintValidatorService, + private val blueprintConfig: BluePrintCoreConfiguration, private val blueprintModelRepository: BlueprintProcessorModelRepository) - : BlueprintCatalogServiceImpl(bluePrintLoadConfiguration) { - - override fun saveToDataBase(extractedDirectory: File, id: String, archiveFile: File, checkValidity: Boolean?) { - var valid = false - val firstItem = BluePrintArchiveUtils.getFirstItemInDirectory(extractedDirectory) - val blueprintBaseDirectory = extractedDirectory.absolutePath + "/" + firstItem - // Validate Blueprint - val bluePrintRuntimeService = BluePrintMetadataUtils.getBluePrintRuntime(id, blueprintBaseDirectory) - - // Check Validity of blueprint - if (checkValidity!!) { - valid = bluePrintValidatorService.validateBluePrints(bluePrintRuntimeService) + : BlueprintCatalogServiceImpl(bluePrintValidatorService) { + + private val log = LoggerFactory.getLogger(BlueprintProcessorCatalogServiceImpl::class.toString()) + + init { + + log.info("BlueprintProcessorCatalogServiceImpl initialized") + } + + override fun delete(name: String, version: String) = blueprintModelRepository.deleteByArtifactNameAndArtifactVersion(name, version) + + + override fun get(name: String, version: String, extract: Boolean): Path? { + var path = "${blueprintConfig.archivePath}/$name/$version.zip" + + blueprintModelRepository.findByArtifactNameAndArtifactVersion(name, version)?.also { + it.blueprintModelContent.run { + val file = File(path) + file.parentFile.mkdirs() + file.createNewFile() + file.writeBytes(this!!.content!!).let { + if (extract) { + path = "${blueprintConfig.archivePath}/$name/$version" + BluePrintArchiveUtils.deCompress(file, path) + } + return Paths.get(path) + } + } } + return null + } - if ((valid && checkValidity!!) || (!valid && !checkValidity!!)) { - val metaData = bluePrintRuntimeService.bluePrintContext().metadata!! - // FIXME("Check Duplicate for Artifact Name and Artifact Version") - val blueprintModel = BlueprintProcessorModel() - blueprintModel.id = id - blueprintModel.artifactType = ApplicationConstants.ASDC_ARTIFACT_TYPE_SDNC_MODEL - blueprintModel.published = ApplicationConstants.ACTIVE_N - blueprintModel.artifactName = metaData[BluePrintConstants.METADATA_TEMPLATE_NAME] - blueprintModel.artifactVersion = metaData[BluePrintConstants.METADATA_TEMPLATE_VERSION] - blueprintModel.updatedBy = metaData[BluePrintConstants.METADATA_TEMPLATE_AUTHOR] - blueprintModel.tags = metaData[BluePrintConstants.METADATA_TEMPLATE_TAGS] - blueprintModel.artifactDescription = "Controller Blueprint for ${blueprintModel.artifactName}:${blueprintModel.artifactVersion}" - - val blueprintModelContent = BlueprintProcessorModelContent() - blueprintModelContent.id = id // For quick access both id's are same.always have one to one mapping. - blueprintModelContent.contentType = "CBA_ZIP" - blueprintModelContent.name = "${blueprintModel.artifactName}:${blueprintModel.artifactVersion}" - blueprintModelContent.description = "(${blueprintModel.artifactName}:${blueprintModel.artifactVersion} CBA Zip Content" - blueprintModelContent.content = Files.readAllBytes(archiveFile.toPath()) - - // Set the Blueprint Model into blueprintModelContent - blueprintModelContent.blueprintModel = blueprintModel - - // Set the Blueprint Model Content into blueprintModel - blueprintModel.blueprintModelContent = blueprintModelContent - - try { - blueprintModelRepository.saveAndFlush(blueprintModel) - } catch (ex: DataIntegrityViolationException) { - throw BluePrintException(ErrorCode.CONFLICT_ADDING_RESOURCE.value, "The blueprint entry " + - "is already exist in database: ${ex.message}", ex) + override fun save(metadata: MutableMap, archiveFile: File) { + val artifactName = metadata[BluePrintConstants.METADATA_TEMPLATE_NAME] + val artifactVersion = metadata[BluePrintConstants.METADATA_TEMPLATE_VERSION] + + log.isDebugEnabled.apply { + blueprintModelRepository.findByArtifactNameAndArtifactVersion(artifactName!!, artifactVersion!!)?.let { + log.debug("Overwriting blueprint model :$artifactName::$artifactVersion") } } + + val blueprintModel = BlueprintProcessorModel() + blueprintModel.id = metadata[BluePrintConstants.PROPERTY_BLUEPRINT_PROCESS_ID] + blueprintModel.artifactType = ApplicationConstants.ASDC_ARTIFACT_TYPE_SDNC_MODEL + blueprintModel.artifactName = artifactName + blueprintModel.artifactVersion = artifactVersion + blueprintModel.updatedBy = metadata[BluePrintConstants.METADATA_TEMPLATE_AUTHOR] + blueprintModel.tags = metadata[BluePrintConstants.METADATA_TEMPLATE_TAGS] + blueprintModel.artifactDescription = "Controller Blueprint for $artifactName:$artifactVersion" + + val blueprintModelContent = BlueprintProcessorModelContent() + blueprintModelContent.id = metadata[BluePrintConstants.PROPERTY_BLUEPRINT_PROCESS_ID] + blueprintModelContent.contentType = "CBA_ZIP" + blueprintModelContent.name = "$artifactName:$artifactVersion" + blueprintModelContent.description = "$artifactName:$artifactVersion CBA Zip Content" + blueprintModelContent.content = Files.readAllBytes(archiveFile.toPath()) + blueprintModelContent.blueprintModel = blueprintModel + + blueprintModel.blueprintModelContent = blueprintModelContent + + try { + blueprintModelRepository.saveAndFlush(blueprintModel) + } catch (ex: DataIntegrityViolationException) { + throw BluePrintException(ErrorCode.CONFLICT_ADDING_RESOURCE.value, "The blueprint entry " + + "is already exist in database: ${ex.message}", ex) + } } } \ No newline at end of file diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/db/primary/domain/BlueprintProcessorModel.kt b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/db/primary/domain/BlueprintProcessorModel.kt index 00d4830ea..0935d038c 100755 --- a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/db/primary/domain/BlueprintProcessorModel.kt +++ b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/db/primary/domain/BlueprintProcessorModel.kt @@ -40,13 +40,11 @@ import javax.persistence.TemporalType @Table(name = "BLUEPRINT_RUNTIME") @Proxy(lazy = false) class BlueprintProcessorModel : Serializable { + @Id - @Column(name = "config_model_id") + @Column(name = "blueprint_runtime_id") var id: String? = null - @Column(name = "artifact_uuid") - var artifactUUId: String? = null - @Column(name = "artifact_type") var artifactType: String? = null @@ -58,9 +56,6 @@ class BlueprintProcessorModel : Serializable { @Column(name = "artifact_description") var artifactDescription: String? = null - @Column(name = "internal_version") - var internalVersion: Int? = null - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") @LastModifiedDate @Temporal(TemporalType.TIMESTAMP) @@ -71,10 +66,6 @@ class BlueprintProcessorModel : Serializable { @ApiModelProperty(required = true) var artifactName: String? = null - @Column(name = "published", nullable = false) - @ApiModelProperty(required = true) - var published: String? = null - @Column(name = "updated_by", nullable = false) @ApiModelProperty(required = true) var updatedBy: String? = null @@ -90,4 +81,4 @@ class BlueprintProcessorModel : Serializable { companion object { private const val serialVersionUID = 1L } -} \ No newline at end of file +} diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/db/primary/domain/BlueprintProcessorModelContent.kt b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/db/primary/domain/BlueprintProcessorModelContent.kt index d012af58f..58bf8a338 100644 --- a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/db/primary/domain/BlueprintProcessorModelContent.kt +++ b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/db/primary/domain/BlueprintProcessorModelContent.kt @@ -40,7 +40,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener class BlueprintProcessorModelContent : Serializable { @Id - @Column(name = "config_model_content_id") + @Column(name = "blueprint_content_runtime_id") var id: String? = null @Column(name = "name", nullable = false) @@ -52,7 +52,7 @@ class BlueprintProcessorModelContent : Serializable { var contentType: String? = null @OneToOne - @JoinColumn(name = "config_model_id") + @JoinColumn(name = "blueprint_runtime_id") var blueprintModel: BlueprintProcessorModel? = null @Lob @@ -98,4 +98,4 @@ class BlueprintProcessorModelContent : Serializable { private const val serialVersionUID = 1L } -} \ No newline at end of file +} diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/db/BlueprintProcessorCatalogServiceImplTest.kt b/ms/blueprintsprocessor/modules/commons/db-lib/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/db/BlueprintProcessorCatalogServiceImplTest.kt new file mode 100644 index 000000000..4c953163a --- /dev/null +++ b/ms/blueprintsprocessor/modules/commons/db-lib/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/db/BlueprintProcessorCatalogServiceImplTest.kt @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2019 Bell Canada. + * + * 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. + */ +package org.onap.ccsdk.apps.blueprintsprocessor.db + +import org.junit.Test +import org.junit.runner.RunWith +import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintCatalogService +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.autoconfigure.EnableAutoConfiguration +import org.springframework.context.annotation.ComponentScan +import org.springframework.test.context.TestPropertySource +import org.springframework.test.context.junit4.SpringRunner +import java.io.File +import java.nio.file.Paths +import kotlin.test.assertTrue + +@RunWith(SpringRunner::class) +@EnableAutoConfiguration +@ComponentScan(basePackages = ["org.onap.ccsdk.apps.blueprintsprocessor", "org.onap.ccsdk.apps.controllerblueprints"]) +@TestPropertySource(locations = ["classpath:application-test.properties"]) +class BlueprintProcessorCatalogServiceImplTest { + + @Autowired + lateinit var blueprintCatalog: BluePrintCatalogService + + @Test + fun `test catalog service`() { + val file = Paths.get("./src/test/resources/test-cba.zip").toFile() + assertTrue(file.exists(), "couldnt get file ${file.absolutePath}") + + blueprintCatalog.saveToDatabase(file) + + blueprintCatalog.getFromDatabase("baseconfiguration", "1.0.0") + + blueprintCatalog.deleteFromDatabase("baseconfiguration", "1.0.0") + + File("./src/test/resources/baseconfiguration").deleteRecursively() + } +} \ No newline at end of file diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/src/test/resources/application-test.properties b/ms/blueprintsprocessor/modules/commons/db-lib/src/test/resources/application-test.properties index 6f10626e0..3ac7ec38b 100644 --- a/ms/blueprintsprocessor/modules/commons/db-lib/src/test/resources/application-test.properties +++ b/ms/blueprintsprocessor/modules/commons/db-lib/src/test/resources/application-test.properties @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -blueprintsprocessor.db.primary.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE +blueprintsprocessor.db.primary.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1 blueprintsprocessor.db.primary.username=sa blueprintsprocessor.db.primary.password= blueprintsprocessor.db.primary.driverClassName=org.h2.Driver @@ -22,7 +22,6 @@ blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=create-drop blueprintsprocessor.db.primary.hibernateDDLAuto=update blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.H2Dialect - # Controller Blueprints Core Configuration blueprintsprocessor.blueprintDeployPath=./target/blueprints/deploy -blueprintsprocessor.blueprintArchivePath=./target/blueprints/archive \ No newline at end of file +blueprintsprocessor.blueprintArchivePath=./target/blueprints/archive diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/src/test/resources/test-cba.zip b/ms/blueprintsprocessor/modules/commons/db-lib/src/test/resources/test-cba.zip new file mode 100644 index 0000000000000000000000000000000000000000..a62d4bfbbfdb6c797e2db2c7f5d6728d1ec8d82a GIT binary patch literal 9189 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