const val PROPERTY_BLUEPRINT_NAME: String = "template_name"\r
const val PROPERTY_BLUEPRINT_VERSION: String = "template_version"\r
\r
+ const val TOSCA_METADATA_DIR: String = "TOSCA-Metadata"\r
const val TOSCA_METADATA_ENTRY_DEFINITION_FILE: String = "TOSCA-Metadata/TOSCA.meta"\r
+ const val TOSCA_DEFINITIONS_DIR: String = "Definitions"\r
const val TOSCA_PLANS_DIR: String = "Plans"\r
const val TOSCA_SCRIPTS_DIR: String = "Scripts"\r
const val TOSCA_MAPPINGS_DIR: String = "Mappings"\r
--- /dev/null
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ *
+ * 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.controllerblueprints.core.utils
+
+import com.att.eelf.configuration.EELFLogger
+import com.att.eelf.configuration.EELFManager
+import kotlinx.coroutines.runBlocking
+import org.apache.commons.io.FileUtils
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext
+import java.io.File
+import java.io.FileFilter
+import java.nio.file.Files
+import java.nio.file.StandardOpenOption
+
+class BluePrintFileUtils {
+ companion object {
+
+ private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())
+
+ fun createEmptyBluePrint(basePath: String) {
+
+ val blueprintDir = File(basePath)
+ FileUtils.deleteDirectory(blueprintDir)
+
+ Files.createDirectories(blueprintDir.toPath())
+
+ val metaDataDir = File(blueprintDir.absolutePath.plus(File.separator).plus(BluePrintConstants.TOSCA_METADATA_DIR))
+ Files.createDirectories(metaDataDir.toPath())
+
+ val metafile = File(blueprintDir.absolutePath.plus(File.separator).plus(BluePrintConstants.TOSCA_METADATA_ENTRY_DEFINITION_FILE))
+ Files.write(metafile.toPath(), getMetaDataContent().toByteArray(), StandardOpenOption.CREATE_NEW)
+
+ val definitionsDir = File(blueprintDir.absolutePath.plus(File.separator).plus(BluePrintConstants.TOSCA_DEFINITIONS_DIR))
+ Files.createDirectories(definitionsDir.toPath())
+
+ val scriptsDir = File(blueprintDir.absolutePath.plus(File.separator).plus(BluePrintConstants.TOSCA_SCRIPTS_DIR))
+ Files.createDirectories(scriptsDir.toPath())
+
+ val plansDir = File(blueprintDir.absolutePath.plus(File.separator).plus(BluePrintConstants.TOSCA_PLANS_DIR))
+ Files.createDirectories(plansDir.toPath())
+
+ val templatesDir = File(blueprintDir.absolutePath.plus(File.separator).plus(BluePrintConstants.TOSCA_TEMPLATES_DIR))
+ Files.createDirectories(templatesDir.toPath())
+
+ }
+
+ fun copyBluePrint(sourcePath: String, targetPath: String) {
+ val sourceFile = File(sourcePath)
+ val targetFile = File(targetPath)
+ sourceFile.copyRecursively(targetFile, true)
+ }
+
+ fun deleteBluePrintTypes(basePath: String) {
+ val definitionPath = basePath.plus(File.separator).plus(BluePrintConstants.TOSCA_DEFINITIONS_DIR)
+ log.info("deleting definition types under : $definitionPath")
+
+ val definitionDir = File(definitionPath)
+ // Find the Type Definitions
+ val fileFilter = FileFilter { pathname -> pathname.absolutePath.endsWith("_types.json") }
+ // Delete the Type Files
+ definitionDir.listFiles(fileFilter).forEach {
+ Files.deleteIfExists(it.toPath())
+ }
+ }
+
+ fun writeBluePrintTypes(blueprintContext: BluePrintContext) {
+
+ val basePath = blueprintContext.rootPath
+ val definitionPath = basePath.plus(File.separator).plus(BluePrintConstants.TOSCA_DEFINITIONS_DIR)
+ val definitionDir = File(definitionPath)
+
+ check(definitionDir.exists()) {
+ throw BluePrintException("couldn't get definition file under path(${definitionDir.absolutePath})")
+ }
+
+ blueprintContext.dataTypes.let {
+ val dataTypesContent = JacksonUtils.getWrappedJson(BluePrintConstants.PATH_DATA_TYPES, blueprintContext.dataTypes!!, true)
+ writeFile(definitionDir.absolutePath, BluePrintConstants.PATH_DATA_TYPES, dataTypesContent)
+
+ }
+
+ blueprintContext.artifactTypes.let {
+ val artifactTypesContent = JacksonUtils.getWrappedJson(BluePrintConstants.PATH_ARTIFACT_TYPES, blueprintContext.artifactTypes!!, true)
+ writeFile(definitionDir.absolutePath, BluePrintConstants.PATH_ARTIFACT_TYPES, artifactTypesContent)
+ }
+
+ blueprintContext.nodeTypes.let {
+ val nodeTypesContent = JacksonUtils.getWrappedJson(BluePrintConstants.PATH_NODE_TYPES, blueprintContext.nodeTypes!!, true)
+ writeFile(definitionDir.absolutePath, BluePrintConstants.PATH_NODE_TYPES, nodeTypesContent)
+ }
+
+ }
+
+ private fun writeFile(definitionPath: String, type: String, content: String) = runBlocking {
+ val typeFile = File(definitionPath.plus(File.separator).plus("$type.json"))
+
+ Files.write(typeFile.toPath(), content.toByteArray(), StandardOpenOption.CREATE_NEW)
+ check(typeFile.exists()) {
+ throw BluePrintException("couldn't write $type.json file under path(${typeFile.absolutePath})")
+ }
+ }
+
+ private fun getMetaDataContent(): String {
+ return "TOSCA-Meta-File-Version: 1.0.0" +
+ "\nCSAR-Version: <VERSION>" +
+ "\nCreated-By: <AUTHOR NAME>" +
+ "\nEntry-Definitions: Definitions/<BLUEPRINT_NAME>.json" +
+ "\nTemplate-Tags: <TAGS>"
+ }
+
+ }
+}
\ No newline at end of file
return getJson(any, false)\r
}\r
\r
+ @JvmStatic\r
+ fun getWrappedJson(wrapper: String, any: kotlin.Any, pretty: Boolean = false): String {\r
+ val wrapperMap = hashMapOf<String, Any>()\r
+ wrapperMap[wrapper] = any\r
+ return getJson(wrapperMap, pretty)\r
+ }\r
+\r
@JvmStatic\r
fun getJson(any: kotlin.Any, pretty: Boolean = false): String {\r
val objectMapper = jacksonObjectMapper()\r
--- /dev/null
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ *
+ * 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.controllerblueprints.core.utils
+
+import kotlinx.coroutines.runBlocking
+import org.junit.Test
+import java.io.File
+import java.nio.file.Paths
+import kotlin.test.assertTrue
+
+
+class BluePrintFileUtilsTest {
+
+ @Test
+ fun testNewBlueprint() = runBlocking {
+ val targetPath: String = Paths.get("target").toUri().toURL().path.plus("bp-new-test")
+ BluePrintFileUtils.createEmptyBluePrint(targetPath)
+
+ }
+
+ @Test
+ fun testBlueprintCopy() = runBlocking {
+ val sourcePath: String = "./../model-catalog/blueprint-model/starter-blueprint/baseconfiguration"
+
+ val targetPath: String = Paths.get("target").toUri().toURL().path.plus("bp-copy-test")
+
+ val targetDir = File(targetPath)
+ targetDir.deleteOnExit()
+ // Copy the BP file
+ BluePrintFileUtils.copyBluePrint(sourcePath, targetDir.absolutePath)
+
+ assertTrue(targetDir.exists(), "faield to copy blueprint to ${targetDir.absolutePath}")
+
+ // Delete Type Files
+ BluePrintFileUtils.deleteBluePrintTypes(targetDir.absolutePath)
+
+ // Generate the Type Files
+ val bluePrintContext = BluePrintMetadataUtils.getBluePrintContext(sourcePath)
+ bluePrintContext.rootPath = targetDir.absolutePath
+
+ BluePrintFileUtils.writeBluePrintTypes(bluePrintContext)
+
+
+ }
+}
\ No newline at end of file
},
"imports": [
{
- "file": "Definitions/data-types.json"
+ "file": "Definitions/data_types.json"
},
{
- "file": "Definitions/node-types.json"
+ "file": "Definitions/node_types.json"
},
{
- "file": "Definitions/artifact-types.json"
+ "file": "Definitions/artifact_types.json"
}
],
"topology_template": {
},
"baseconfig-mapping": {
"type": "artifact-mapping-resource",
- "file": "Mappings/baseconfig-mapping.json"
+ "file": "Definitions/baseconfig-mapping.json"
}
}
},
\r
package org.onap.ccsdk.apps.controllerblueprints.service;\r
\r
+import com.att.eelf.configuration.EELFLogger;\r
+import com.att.eelf.configuration.EELFManager;\r
import com.fasterxml.jackson.databind.JsonNode;\r
import com.google.common.base.Preconditions;\r
import org.apache.commons.collections.MapUtils;\r
import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException;\r
import org.onap.ccsdk.apps.controllerblueprints.core.ConfigModelConstant;\r
import org.onap.ccsdk.apps.controllerblueprints.core.data.*;\r
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.service.ResourceDefinitionRepoService;\r
-import org.onap.ccsdk.apps.controllerblueprints.service.enhancer.BluePrintEnhancerDefaultService;\r
import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;\r
import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment;\r
-import com.att.eelf.configuration.EELFLogger;\r
-import com.att.eelf.configuration.EELFManager;\r
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.service.ResourceDefinitionRepoService;\r
+import org.onap.ccsdk.apps.controllerblueprints.service.enhancer.BluePrintEnhancerDefaultService;\r
import org.onap.ccsdk.apps.controllerblueprints.service.enhancer.ResourceAssignmentEnhancerService;\r
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;\r
+import org.springframework.context.annotation.Scope;\r
+import org.springframework.context.annotation.ScopedProxyMode;\r
import org.springframework.stereotype.Service;\r
\r
import java.util.HashMap;\r
*/\r
\r
@Service\r
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE, proxyMode = ScopedProxyMode.TARGET_CLASS)\r
public class BluePrintEnhancerService extends BluePrintEnhancerDefaultService {\r
\r
private static EELFLogger log = EELFManager.getInstance().getLogger(BluePrintEnhancerService.class);\r
* @author Brinda Santh\r
* @version 1.0\r
*/\r
-\r
+@Deprecated\r
@Service\r
public class ConfigModelValidatorService {\r
\r
\r
package org.onap.ccsdk.apps.controllerblueprints.service.enhancer\r
\r
+import com.att.eelf.configuration.EELFLogger\r
+import com.att.eelf.configuration.EELFManager\r
import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException\r
import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintTypes\r
import org.onap.ccsdk.apps.controllerblueprints.core.data.*\r
import org.onap.ccsdk.apps.controllerblueprints.core.format\r
-import com.att.eelf.configuration.EELFLogger\r
-import com.att.eelf.configuration.EELFManager\r
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext\r
import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRepoService\r
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonReactorUtils\r
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.BluePrintFileUtils\r
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.BluePrintMetadataUtils\r
import java.io.Serializable\r
\r
/**\r
interface BluePrintEnhancerService : Serializable {\r
\r
@Throws(BluePrintException::class)\r
- fun enhance(content: String): ServiceTemplate\r
+ fun enhance(basePath: String, enrichedBasePath: String): BluePrintContext\r
\r
/**\r
- * Read Blueprint from CSAR structure Directory\r
+ * Read Blueprint from CBA structure Directory\r
*/\r
@Throws(BluePrintException::class)\r
- fun enhance(fileName: String, basePath: String): ServiceTemplate\r
+ fun enhance(basePath: String): BluePrintContext\r
\r
@Throws(BluePrintException::class)\r
fun enhance(serviceTemplate: ServiceTemplate): ServiceTemplate\r
\r
lateinit var serviceTemplate: ServiceTemplate\r
\r
- @Throws(BluePrintException::class)\r
- override fun enhance(content: String): ServiceTemplate {\r
- return JacksonReactorUtils.readValueFromFile(content, ServiceTemplate::class.java).map { serviceTemplate ->\r
- enhance(serviceTemplate!!)\r
- }.block()!!\r
+ override fun enhance(basePath: String, enrichedBasePath: String): BluePrintContext {\r
+ BluePrintFileUtils.copyBluePrint(basePath, enrichedBasePath)\r
+ BluePrintFileUtils.deleteBluePrintTypes(enrichedBasePath)\r
+ val enhancedBluePrintContext = enhance(enrichedBasePath)\r
+ BluePrintFileUtils.writeBluePrintTypes(enhancedBluePrintContext)\r
+ return enhancedBluePrintContext\r
}\r
\r
@Throws(BluePrintException::class)\r
- override fun enhance(fileName: String, basePath: String): ServiceTemplate {\r
- TODO("not implemented") //To change body of created functions use File | Settings | File Templates.\r
+ override fun enhance(basePath: String): BluePrintContext {\r
+ val bluePrintContext = BluePrintMetadataUtils.getBluePrintContext(basePath)\r
+ enhance(bluePrintContext.serviceTemplate)\r
+ return bluePrintContext\r
}\r
\r
@Throws(BluePrintException::class)\r
serviceTemplate.artifactTypes?.clear()\r
serviceTemplate.nodeTypes?.clear()\r
serviceTemplate.dataTypes?.clear()\r
+ serviceTemplate.policyTypes?.clear()\r
\r
- serviceTemplate.artifactTypes = HashMap()\r
- serviceTemplate.nodeTypes = HashMap()\r
- serviceTemplate.dataTypes = HashMap()\r
+ serviceTemplate.artifactTypes = mutableMapOf()\r
+ serviceTemplate.nodeTypes = mutableMapOf()\r
+ serviceTemplate.dataTypes = mutableMapOf()\r
+ serviceTemplate.policyTypes = mutableMapOf()\r
\r
}\r
\r
Code Review / ccsdk / apps.git / commitdiff