diff options
Diffstat (limited to 'ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl')
-rw-r--r-- | ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BluePrintDSL.kt (renamed from ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BlueprintDSL.kt) | 166 | ||||
-rw-r--r-- | ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BluePrintDSLBuilder.kt (renamed from ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BlueprintDSLBuilder.kt) | 40 | ||||
-rw-r--r-- | ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BluePrintDSLData.kt (renamed from ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BlueprintDSLData.kt) | 2 | ||||
-rw-r--r-- | ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BluePrintServiceTemplateGenerator.kt (renamed from ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BlueprintServiceTemplateGenerator.kt) | 32 | ||||
-rw-r--r-- | ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BluePrintTemplateDSLBuilder.kt (renamed from ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BlueprintTemplateDSLBuilder.kt) | 8 | ||||
-rw-r--r-- | ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BluePrintTypeDSLBuilder.kt (renamed from ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BlueprintTypeDSLBuilder.kt) | 8 | ||||
-rw-r--r-- | ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BluePrintWorkflowDSLBuilder.kt (renamed from ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BlueprintWorkflowDSLBuilder.kt) | 4 | ||||
-rw-r--r-- | ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/ServiceTemplateBuilder.kt | 14 |
8 files changed, 137 insertions, 137 deletions
diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BlueprintDSL.kt b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BluePrintDSL.kt index 81593c935..7f300041a 100644 --- a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BlueprintDSL.kt +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BluePrintDSL.kt @@ -17,8 +17,8 @@ package org.onap.ccsdk.cds.controllerblueprints.core.dsl import com.fasterxml.jackson.databind.JsonNode -import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintConstants -import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintTypes +import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants +import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintTypes import org.onap.ccsdk.cds.controllerblueprints.core.asJsonPrimitive import org.onap.ccsdk.cds.controllerblueprints.core.data.ArtifactType import org.onap.ccsdk.cds.controllerblueprints.core.data.DataType @@ -35,9 +35,9 @@ fun blueprint( version: String, author: String, tags: String, - block: DSLBlueprintBuilder.() -> Unit -): DSLBlueprint { - return DSLBlueprintBuilder(name, version, author, tags).apply(block).build() + block: DSLBluePrintBuilder.() -> Unit +): DSLBluePrint { + return DSLBluePrintBuilder(name, version, author, tags).apply(block).build() } // TOSCA DSLs @@ -172,59 +172,59 @@ fun getNodeTemplateOperationOutput( /** Blueprint Type Extensions */ fun ServiceTemplateBuilder.nodeTypeComponent() { - val nodeType = BlueprintTypes.nodeTypeComponent() + val nodeType = BluePrintTypes.nodeTypeComponent() if (this.nodeTypes == null) this.nodeTypes = hashMapOf() this.nodeTypes!![nodeType.id!!] = nodeType } -fun BlueprintTypes.nodeTypeComponent(): NodeType { +fun BluePrintTypes.nodeTypeComponent(): NodeType { return nodeType( - id = BlueprintConstants.MODEL_TYPE_NODE_COMPONENT, - version = BlueprintConstants.DEFAULT_VERSION_NUMBER, - derivedFrom = BlueprintConstants.MODEL_TYPE_NODES_ROOT, + id = BluePrintConstants.MODEL_TYPE_NODE_COMPONENT, + version = BluePrintConstants.DEFAULT_VERSION_NUMBER, + derivedFrom = BluePrintConstants.MODEL_TYPE_NODES_ROOT, description = "This is default Component Node" ) { } } @Deprecated("CDS won't support, use implerative workflow definitions.") -fun BlueprintTypes.nodeTypeWorkflow(): NodeType { +fun BluePrintTypes.nodeTypeWorkflow(): NodeType { return nodeType( - id = BlueprintConstants.MODEL_TYPE_NODE_WORKFLOW, - version = BlueprintConstants.DEFAULT_VERSION_NUMBER, - derivedFrom = BlueprintConstants.MODEL_TYPE_NODES_ROOT, + id = BluePrintConstants.MODEL_TYPE_NODE_WORKFLOW, + version = BluePrintConstants.DEFAULT_VERSION_NUMBER, + derivedFrom = BluePrintConstants.MODEL_TYPE_NODES_ROOT, description = "This is default Workflow Node" ) { } } fun ServiceTemplateBuilder.nodeTypeVnf() { - val nodeType = BlueprintTypes.nodeTypeVnf() + val nodeType = BluePrintTypes.nodeTypeVnf() if (this.nodeTypes == null) this.nodeTypes = hashMapOf() this.nodeTypes!![nodeType.id!!] = nodeType } -fun BlueprintTypes.nodeTypeVnf(): NodeType { +fun BluePrintTypes.nodeTypeVnf(): NodeType { return nodeType( - id = BlueprintConstants.MODEL_TYPE_NODE_VNF, - version = BlueprintConstants.DEFAULT_VERSION_NUMBER, - derivedFrom = BlueprintConstants.MODEL_TYPE_NODES_ROOT, + id = BluePrintConstants.MODEL_TYPE_NODE_VNF, + version = BluePrintConstants.DEFAULT_VERSION_NUMBER, + derivedFrom = BluePrintConstants.MODEL_TYPE_NODES_ROOT, description = "This is default VNF Node" ) { } } fun ServiceTemplateBuilder.nodeTypeResourceSource() { - val nodeType = BlueprintTypes.nodeTypeResourceSource() + val nodeType = BluePrintTypes.nodeTypeResourceSource() if (this.nodeTypes == null) this.nodeTypes = hashMapOf() this.nodeTypes!![nodeType.id!!] = nodeType } -fun BlueprintTypes.nodeTypeResourceSource(): NodeType { +fun BluePrintTypes.nodeTypeResourceSource(): NodeType { return nodeType( - id = BlueprintConstants.MODEL_TYPE_NODE_RESOURCE_SOURCE, - version = BlueprintConstants.DEFAULT_VERSION_NUMBER, - derivedFrom = BlueprintConstants.MODEL_TYPE_NODES_ROOT, + id = BluePrintConstants.MODEL_TYPE_NODE_RESOURCE_SOURCE, + version = BluePrintConstants.DEFAULT_VERSION_NUMBER, + derivedFrom = BluePrintConstants.MODEL_TYPE_NODES_ROOT, description = "This is default Resource Source Node" ) { } @@ -232,16 +232,16 @@ fun BlueprintTypes.nodeTypeResourceSource(): NodeType { /** Artifacts */ fun ServiceTemplateBuilder.artifactTypeTemplateVelocity() { - val artifactType = BlueprintTypes.artifactTypeTemplateVelocity() + val artifactType = BluePrintTypes.artifactTypeTemplateVelocity() if (this.artifactTypes == null) this.artifactTypes = hashMapOf() this.artifactTypes!![artifactType.id!!] = artifactType } -fun BlueprintTypes.artifactTypeTemplateVelocity(): ArtifactType { +fun BluePrintTypes.artifactTypeTemplateVelocity(): ArtifactType { return artifactType( - id = BlueprintConstants.MODEL_TYPE_ARTIFACT_TEMPLATE_VELOCITY, - version = BlueprintConstants.DEFAULT_VERSION_NUMBER, - derivedFrom = BlueprintConstants.MODEL_TYPE_ARTIFACT_TYPE_IMPLEMENTATION, + id = BluePrintConstants.MODEL_TYPE_ARTIFACT_TEMPLATE_VELOCITY, + version = BluePrintConstants.DEFAULT_VERSION_NUMBER, + derivedFrom = BluePrintConstants.MODEL_TYPE_ARTIFACT_TYPE_IMPLEMENTATION, description = "Velocity Artifact" ) { fileExt("vtl") @@ -249,16 +249,16 @@ fun BlueprintTypes.artifactTypeTemplateVelocity(): ArtifactType { } fun ServiceTemplateBuilder.artifactTypeTempleJinja() { - val artifactType = BlueprintTypes.artifactTypeTempleJinja() + val artifactType = BluePrintTypes.artifactTypeTempleJinja() if (this.artifactTypes == null) this.artifactTypes = hashMapOf() this.artifactTypes!![artifactType.id!!] = artifactType } -fun BlueprintTypes.artifactTypeTempleJinja(): ArtifactType { +fun BluePrintTypes.artifactTypeTempleJinja(): ArtifactType { return artifactType( - id = BlueprintConstants.MODEL_TYPE_ARTIFACT_TEMPLATE_JINJA, - version = BlueprintConstants.DEFAULT_VERSION_NUMBER, - derivedFrom = BlueprintConstants.MODEL_TYPE_ARTIFACT_TYPE_IMPLEMENTATION, + id = BluePrintConstants.MODEL_TYPE_ARTIFACT_TEMPLATE_JINJA, + version = BluePrintConstants.DEFAULT_VERSION_NUMBER, + derivedFrom = BluePrintConstants.MODEL_TYPE_ARTIFACT_TYPE_IMPLEMENTATION, description = "Jinja Artifact" ) { fileExt("jinja") @@ -266,16 +266,16 @@ fun BlueprintTypes.artifactTypeTempleJinja(): ArtifactType { } fun ServiceTemplateBuilder.artifactTypeMappingResource() { - val artifactType = BlueprintTypes.artifactTypeMappingResource() + val artifactType = BluePrintTypes.artifactTypeMappingResource() if (this.artifactTypes == null) this.artifactTypes = hashMapOf() this.artifactTypes!![artifactType.id!!] = artifactType } -fun BlueprintTypes.artifactTypeMappingResource(): ArtifactType { +fun BluePrintTypes.artifactTypeMappingResource(): ArtifactType { return artifactType( - id = BlueprintConstants.MODEL_TYPE_ARTIFACT_MAPPING_RESOURCE, - version = BlueprintConstants.DEFAULT_VERSION_NUMBER, - derivedFrom = BlueprintConstants.MODEL_TYPE_ARTIFACT_TYPE_IMPLEMENTATION, + id = BluePrintConstants.MODEL_TYPE_ARTIFACT_MAPPING_RESOURCE, + version = BluePrintConstants.DEFAULT_VERSION_NUMBER, + derivedFrom = BluePrintConstants.MODEL_TYPE_ARTIFACT_TYPE_IMPLEMENTATION, description = "Mapping Resource Artifact" ) { fileExt("json") @@ -283,11 +283,11 @@ fun BlueprintTypes.artifactTypeMappingResource(): ArtifactType { } @Deprecated("CDS won't support", replaceWith = ReplaceWith("artifactTypeScriptKotlin")) -fun BlueprintTypes.artifactTypeScriptJython(): ArtifactType { +fun BluePrintTypes.artifactTypeScriptJython(): ArtifactType { return artifactType( - id = BlueprintConstants.MODEL_TYPE_ARTIFACT_SCRIPT_JYTHON, - version = BlueprintConstants.DEFAULT_VERSION_NUMBER, - derivedFrom = BlueprintConstants.MODEL_TYPE_ARTIFACT_TYPE_IMPLEMENTATION, + id = BluePrintConstants.MODEL_TYPE_ARTIFACT_SCRIPT_JYTHON, + version = BluePrintConstants.DEFAULT_VERSION_NUMBER, + derivedFrom = BluePrintConstants.MODEL_TYPE_ARTIFACT_TYPE_IMPLEMENTATION, description = "Jython Script Artifact" ) { fileExt("py") @@ -295,16 +295,16 @@ fun BlueprintTypes.artifactTypeScriptJython(): ArtifactType { } fun ServiceTemplateBuilder.artifactTypeScriptKotlin() { - val artifactType = BlueprintTypes.artifactTypeScriptKotlin() + val artifactType = BluePrintTypes.artifactTypeScriptKotlin() if (this.artifactTypes == null) this.artifactTypes = hashMapOf() this.artifactTypes!![artifactType.id!!] = artifactType } -fun BlueprintTypes.artifactTypeScriptKotlin(): ArtifactType { +fun BluePrintTypes.artifactTypeScriptKotlin(): ArtifactType { return artifactType( - id = BlueprintConstants.MODEL_TYPE_ARTIFACT_SCRIPT_KOTLIN, - version = BlueprintConstants.DEFAULT_VERSION_NUMBER, - derivedFrom = BlueprintConstants.MODEL_TYPE_ARTIFACT_TYPE_IMPLEMENTATION, + id = BluePrintConstants.MODEL_TYPE_ARTIFACT_SCRIPT_KOTLIN, + version = BluePrintConstants.DEFAULT_VERSION_NUMBER, + derivedFrom = BluePrintConstants.MODEL_TYPE_ARTIFACT_TYPE_IMPLEMENTATION, description = "Kotlin Script Artifact" ) { fileExt("kts") @@ -312,43 +312,43 @@ fun BlueprintTypes.artifactTypeScriptKotlin(): ArtifactType { } fun ServiceTemplateBuilder.artifactTypeK8sProfileFolder() { - val artifactType = BlueprintTypes.artifactTypeK8sProfileFolder() + val artifactType = BluePrintTypes.artifactTypeK8sProfileFolder() if (this.artifactTypes == null) this.artifactTypes = hashMapOf() this.artifactTypes!![artifactType.id!!] = artifactType } -fun BlueprintTypes.artifactTypeK8sProfileFolder(): ArtifactType { +fun BluePrintTypes.artifactTypeK8sProfileFolder(): ArtifactType { return artifactType( - id = BlueprintConstants.MODEL_TYPE_ARTIFACT_K8S_PROFILE, - version = BlueprintConstants.DEFAULT_VERSION_NUMBER, - derivedFrom = BlueprintConstants.MODEL_TYPE_ARTIFACT_TYPE_IMPLEMENTATION, + id = BluePrintConstants.MODEL_TYPE_ARTIFACT_K8S_PROFILE, + version = BluePrintConstants.DEFAULT_VERSION_NUMBER, + derivedFrom = BluePrintConstants.MODEL_TYPE_ARTIFACT_TYPE_IMPLEMENTATION, description = "K8s Profile Folder Artifact" ) { } } fun ServiceTemplateBuilder.artifactTypeK8sConfigFolder() { - val artifactType = BlueprintTypes.artifactTypeK8sConfigFolder() + val artifactType = BluePrintTypes.artifactTypeK8sConfigFolder() if (this.artifactTypes == null) this.artifactTypes = hashMapOf() this.artifactTypes!![artifactType.id!!] = artifactType } -fun BlueprintTypes.artifactTypeK8sConfigFolder(): ArtifactType { +fun BluePrintTypes.artifactTypeK8sConfigFolder(): ArtifactType { return artifactType( - id = BlueprintConstants.MODEL_TYPE_ARTIFACT_K8S_CONFIG, - version = BlueprintConstants.DEFAULT_VERSION_NUMBER, - derivedFrom = BlueprintConstants.MODEL_TYPE_ARTIFACT_TYPE_IMPLEMENTATION, + id = BluePrintConstants.MODEL_TYPE_ARTIFACT_K8S_CONFIG, + version = BluePrintConstants.DEFAULT_VERSION_NUMBER, + derivedFrom = BluePrintConstants.MODEL_TYPE_ARTIFACT_TYPE_IMPLEMENTATION, description = "K8s Config Folder Artifact" ) { } } @Deprecated("CDS won't support, use implerative workflow definitions.") -fun BlueprintTypes.artifactTypeDirectedGraph(): ArtifactType { +fun BluePrintTypes.artifactTypeDirectedGraph(): ArtifactType { return artifactType( - id = BlueprintConstants.MODEL_TYPE_ARTIFACT_DIRECTED_GRAPH, - version = BlueprintConstants.DEFAULT_VERSION_NUMBER, - derivedFrom = BlueprintConstants.MODEL_TYPE_ARTIFACT_TYPE_IMPLEMENTATION, + id = BluePrintConstants.MODEL_TYPE_ARTIFACT_DIRECTED_GRAPH, + version = BluePrintConstants.DEFAULT_VERSION_NUMBER, + derivedFrom = BluePrintConstants.MODEL_TYPE_ARTIFACT_TYPE_IMPLEMENTATION, description = "Directed Graph Artifact" ) { fileExt("xml", "json") @@ -356,16 +356,16 @@ fun BlueprintTypes.artifactTypeDirectedGraph(): ArtifactType { } fun ServiceTemplateBuilder.artifactTypeComponentJar() { - val artifactType = BlueprintTypes.artifactTypeComponentJar() + val artifactType = BluePrintTypes.artifactTypeComponentJar() if (this.artifactTypes == null) this.artifactTypes = hashMapOf() this.artifactTypes!![artifactType.id!!] = artifactType } -fun BlueprintTypes.artifactTypeComponentJar(): ArtifactType { +fun BluePrintTypes.artifactTypeComponentJar(): ArtifactType { return artifactType( - id = BlueprintConstants.MODEL_TYPE_ARTIFACT_COMPONENT_JAR, - version = BlueprintConstants.DEFAULT_VERSION_NUMBER, - derivedFrom = BlueprintConstants.MODEL_TYPE_ARTIFACT_TYPE_IMPLEMENTATION, + id = BluePrintConstants.MODEL_TYPE_ARTIFACT_COMPONENT_JAR, + version = BluePrintConstants.DEFAULT_VERSION_NUMBER, + derivedFrom = BluePrintConstants.MODEL_TYPE_ARTIFACT_TYPE_IMPLEMENTATION, description = "Component Artifact" ) { fileExt("jar") @@ -375,49 +375,49 @@ fun BlueprintTypes.artifactTypeComponentJar(): ArtifactType { /** Relationship Types */ fun ServiceTemplateBuilder.relationshipTypeConnectsTo() { - val relationshipType = BlueprintTypes.relationshipTypeConnectsTo() + val relationshipType = BluePrintTypes.relationshipTypeConnectsTo() if (this.relationshipTypes == null) this.relationshipTypes = hashMapOf() this.relationshipTypes!![relationshipType.id!!] = relationshipType } -fun BlueprintTypes.relationshipTypeConnectsTo(): RelationshipType { +fun BluePrintTypes.relationshipTypeConnectsTo(): RelationshipType { return relationshipType( - id = BlueprintConstants.MODEL_TYPE_RELATIONSHIPS_CONNECTS_TO, - version = BlueprintConstants.DEFAULT_VERSION_NUMBER, - derivedFrom = BlueprintConstants.MODEL_TYPE_RELATIONSHIPS_ROOT, + id = BluePrintConstants.MODEL_TYPE_RELATIONSHIPS_CONNECTS_TO, + version = BluePrintConstants.DEFAULT_VERSION_NUMBER, + derivedFrom = BluePrintConstants.MODEL_TYPE_RELATIONSHIPS_ROOT, description = "Relationship connects to" ) { - validTargetTypes(arrayListOf(BlueprintConstants.MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT)) + validTargetTypes(arrayListOf(BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT)) } } fun ServiceTemplateBuilder.relationshipTypeDependsOn() { - val relationshipType = BlueprintTypes.relationshipTypeDependsOn() + val relationshipType = BluePrintTypes.relationshipTypeDependsOn() if (this.relationshipTypes == null) this.relationshipTypes = hashMapOf() this.relationshipTypes!![relationshipType.id!!] = relationshipType } -fun BlueprintTypes.relationshipTypeDependsOn(): RelationshipType { +fun BluePrintTypes.relationshipTypeDependsOn(): RelationshipType { return relationshipType( - id = BlueprintConstants.MODEL_TYPE_RELATIONSHIPS_DEPENDS_ON, - version = BlueprintConstants.DEFAULT_VERSION_NUMBER, - derivedFrom = BlueprintConstants.MODEL_TYPE_RELATIONSHIPS_ROOT, + id = BluePrintConstants.MODEL_TYPE_RELATIONSHIPS_DEPENDS_ON, + version = BluePrintConstants.DEFAULT_VERSION_NUMBER, + derivedFrom = BluePrintConstants.MODEL_TYPE_RELATIONSHIPS_ROOT, description = "Relationship depends on" ) { } } fun ServiceTemplateBuilder.relationshipTypeHostedOn() { - val relationshipType = BlueprintTypes.relationshipTypeHostedOn() + val relationshipType = BluePrintTypes.relationshipTypeHostedOn() if (this.relationshipTypes == null) this.relationshipTypes = hashMapOf() this.relationshipTypes!![relationshipType.id!!] = relationshipType } -fun BlueprintTypes.relationshipTypeHostedOn(): RelationshipType { +fun BluePrintTypes.relationshipTypeHostedOn(): RelationshipType { return relationshipType( - id = BlueprintConstants.MODEL_TYPE_RELATIONSHIPS_HOSTED_ON, - version = BlueprintConstants.DEFAULT_VERSION_NUMBER, - derivedFrom = BlueprintConstants.MODEL_TYPE_RELATIONSHIPS_ROOT, + id = BluePrintConstants.MODEL_TYPE_RELATIONSHIPS_HOSTED_ON, + version = BluePrintConstants.DEFAULT_VERSION_NUMBER, + derivedFrom = BluePrintConstants.MODEL_TYPE_RELATIONSHIPS_ROOT, description = "Relationship hosted on" ) { } diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BlueprintDSLBuilder.kt b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BluePrintDSLBuilder.kt index f92a955a5..b469ded74 100644 --- a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BlueprintDSLBuilder.kt +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BluePrintDSLBuilder.kt @@ -17,7 +17,7 @@ package org.onap.ccsdk.cds.controllerblueprints.core.dsl import com.fasterxml.jackson.databind.JsonNode -import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintConstants +import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants import org.onap.ccsdk.cds.controllerblueprints.core.asJsonType import org.onap.ccsdk.cds.controllerblueprints.core.data.ArtifactDefinition import org.onap.ccsdk.cds.controllerblueprints.core.data.ArtifactType @@ -30,14 +30,14 @@ import org.onap.ccsdk.cds.controllerblueprints.core.data.Step /** * @author Brinda Santh */ -class DSLBlueprintBuilder( +class DSLBluePrintBuilder( private val name: String, private val version: String, private val author: String, private val tags: String ) { - private var dslBlueprint = DSLBlueprint() + private var dslBluePrint = DSLBluePrint() private var metadata: MutableMap<String, String> = hashMapOf() var properties: MutableMap<String, JsonNode>? = null var dataTypes: MutableMap<String, DataType> = hashMapOf() @@ -47,10 +47,10 @@ class DSLBlueprintBuilder( var workflows: MutableMap<String, DSLWorkflow> = hashMapOf() private fun initMetaData() { - metadata[BlueprintConstants.METADATA_TEMPLATE_NAME] = name - metadata[BlueprintConstants.METADATA_TEMPLATE_VERSION] = version - metadata[BlueprintConstants.METADATA_TEMPLATE_AUTHOR] = author - metadata[BlueprintConstants.METADATA_TEMPLATE_TAGS] = tags + metadata[BluePrintConstants.METADATA_TEMPLATE_NAME] = name + metadata[BluePrintConstants.METADATA_TEMPLATE_VERSION] = version + metadata[BluePrintConstants.METADATA_TEMPLATE_AUTHOR] = author + metadata[BluePrintConstants.METADATA_TEMPLATE_TAGS] = tags } fun metadata(id: String, value: String) { @@ -117,16 +117,16 @@ class DSLBlueprintBuilder( workflows[id] = DSLWorkflowBuilder(id, description).apply(block).build() } - fun build(): DSLBlueprint { + fun build(): DSLBluePrint { initMetaData() - dslBlueprint.metadata = metadata - dslBlueprint.properties = properties - dslBlueprint.dataTypes = dataTypes - dslBlueprint.artifactTypes = artifactTypes - dslBlueprint.components = components - dslBlueprint.registryComponents = registryComponents - dslBlueprint.workflows = workflows - return dslBlueprint + dslBluePrint.metadata = metadata + dslBluePrint.properties = properties + dslBluePrint.dataTypes = dataTypes + dslBluePrint.artifactTypes = artifactTypes + dslBluePrint.components = components + dslBluePrint.registryComponents = registryComponents + dslBluePrint.workflows = workflows + return dslBluePrint } } @@ -190,7 +190,7 @@ class DSLComponentBuilder( properties!![id] = property } - fun implementation(timeout: Int, operationHost: String? = BlueprintConstants.PROPERTY_SELF) { + fun implementation(timeout: Int, operationHost: String? = BluePrintConstants.PROPERTY_SELF) { implementation = Implementation().apply { this.operationHost = operationHost!! this.timeout = timeout @@ -291,7 +291,7 @@ class DSLRegistryComponentBuilder( properties!![id] = expression.asJsonType() } - fun implementation(timeout: Int, operationHost: String? = BlueprintConstants.PROPERTY_SELF) { + fun implementation(timeout: Int, operationHost: String? = BluePrintConstants.PROPERTY_SELF) { implementation = Implementation().apply { this.operationHost = operationHost!! this.timeout = timeout @@ -413,7 +413,7 @@ class DSLWorkflowBuilder(private val actionName: String, private val description class DSLAttributeDefinitionBuilder( private val id: String, - private val type: String? = BlueprintConstants.DATA_TYPE_STRING, + private val type: String? = BluePrintConstants.DATA_TYPE_STRING, private val required: Boolean? = false, private val expression: JsonNode, private val description: String? = "" @@ -446,7 +446,7 @@ class DSLAttributeDefinitionBuilder( class DSLPropertyDefinitionBuilder( private val id: String, - private val type: String? = BlueprintConstants.DATA_TYPE_STRING, + private val type: String? = BluePrintConstants.DATA_TYPE_STRING, private val required: Boolean? = false, private val expression: JsonNode, private val description: String? = "" diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BlueprintDSLData.kt b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BluePrintDSLData.kt index 8f1a8d145..370531d2a 100644 --- a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BlueprintDSLData.kt +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BluePrintDSLData.kt @@ -31,7 +31,7 @@ import org.onap.ccsdk.cds.controllerblueprints.core.data.Step * @author Brinda Santh */ -class DSLBlueprint { +class DSLBluePrint { var metadata: MutableMap<String, String> = hashMapOf() var properties: MutableMap<String, JsonNode>? = null diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BlueprintServiceTemplateGenerator.kt b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BluePrintServiceTemplateGenerator.kt index 21bc8c7d8..d07fc9c71 100644 --- a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BlueprintServiceTemplateGenerator.kt +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BluePrintServiceTemplateGenerator.kt @@ -18,7 +18,7 @@ package org.onap.ccsdk.cds.controllerblueprints.core.dsl import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.node.NullNode -import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintConstants +import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants import org.onap.ccsdk.cds.controllerblueprints.core.bpClone import org.onap.ccsdk.cds.controllerblueprints.core.data.ArtifactType import org.onap.ccsdk.cds.controllerblueprints.core.data.AttributeDefinition @@ -38,7 +38,7 @@ import org.onap.ccsdk.cds.controllerblueprints.core.data.Workflow * Generate Service Template for the simplified DSL. * @author Brinda Santh */ -class BlueprintServiceTemplateGenerator(private val dslBlueprint: DSLBlueprint) { +class BluePrintServiceTemplateGenerator(private val dslBluePrint: DSLBluePrint) { private var serviceTemplate = ServiceTemplate() @@ -47,11 +47,11 @@ class BlueprintServiceTemplateGenerator(private val dslBlueprint: DSLBlueprint) private val dataTypes: MutableMap<String, DataType> = hashMapOf() fun serviceTemplate(): ServiceTemplate { - serviceTemplate.metadata = dslBlueprint.metadata - serviceTemplate.dslDefinitions = dslBlueprint.properties + serviceTemplate.metadata = dslBluePrint.metadata + serviceTemplate.dslDefinitions = dslBluePrint.properties - dataTypes.putAll(dslBlueprint.dataTypes) - artifactTypes.putAll(dslBlueprint.artifactTypes) + dataTypes.putAll(dslBluePrint.dataTypes) + artifactTypes.putAll(dslBluePrint.artifactTypes) serviceTemplate.dataTypes = dataTypes serviceTemplate.artifactTypes = artifactTypes @@ -74,7 +74,7 @@ class BlueprintServiceTemplateGenerator(private val dslBlueprint: DSLBlueprint) val nodeTemplates: MutableMap<String, NodeTemplate> = hashMapOf() // For New or Dynamic Components - val components = dslBlueprint.components + val components = dslBluePrint.components components.forEach { (dslCompName, dslComp) -> val nodeTemplate = NodeTemplate() nodeTemplate.type = dslComp.type @@ -88,7 +88,7 @@ class BlueprintServiceTemplateGenerator(private val dslBlueprint: DSLBlueprint) } // For Registry Components - val registryComponents = dslBlueprint.registryComponents + val registryComponents = dslBluePrint.registryComponents registryComponents.forEach { (dslCompName, dslComp) -> val nodeTemplate = NodeTemplate() nodeTemplate.type = dslComp.type @@ -102,10 +102,10 @@ class BlueprintServiceTemplateGenerator(private val dslBlueprint: DSLBlueprint) private fun populateWorkflow(): MutableMap<String, Workflow>? { var workflows: MutableMap<String, Workflow>? = null - if (dslBlueprint.workflows.isNotEmpty()) { + if (dslBluePrint.workflows.isNotEmpty()) { workflows = hashMapOf() - dslBlueprint.workflows.forEach { (dslWorkflowName, dslWorkflow) -> + dslBluePrint.workflows.forEach { (dslWorkflowName, dslWorkflow) -> val workflow = Workflow() workflow.description = dslWorkflow.description workflow.steps = dslWorkflow.steps @@ -119,7 +119,7 @@ class BlueprintServiceTemplateGenerator(private val dslBlueprint: DSLBlueprint) private fun populateNodeType(dslComponent: DSLComponent): NodeType { val nodeType = NodeType() - nodeType.derivedFrom = BlueprintConstants.MODEL_TYPE_NODES_ROOT + nodeType.derivedFrom = BluePrintConstants.MODEL_TYPE_NODES_ROOT nodeType.version = dslComponent.version nodeType.description = dslComponent.description nodeType.interfaces = populateInterfaceDefinitions(dslComponent, nodeType) @@ -136,13 +136,13 @@ class BlueprintServiceTemplateGenerator(private val dslBlueprint: DSLBlueprint) operationDefinition.outputs = propertyDefinitions(dslComponent.outputs) val operations: MutableMap<String, OperationDefinition> = hashMapOf() - operations[BlueprintConstants.DEFAULT_STEP_OPERATION] = operationDefinition + operations[BluePrintConstants.DEFAULT_STEP_OPERATION] = operationDefinition val interfaceDefinition = InterfaceDefinition() interfaceDefinition.operations = operations val interfaces: MutableMap<String, InterfaceDefinition> = hashMapOf() - interfaces[BlueprintConstants.DEFAULT_STEP_INTERFACE] = interfaceDefinition + interfaces[BluePrintConstants.DEFAULT_STEP_INTERFACE] = interfaceDefinition return interfaces } @@ -153,7 +153,7 @@ class BlueprintServiceTemplateGenerator(private val dslBlueprint: DSLBlueprint) operationAssignment.outputs = dslComponent.outputs val operations: MutableMap<String, OperationAssignment> = hashMapOf() - operations[BlueprintConstants.DEFAULT_STEP_OPERATION] = operationAssignment + operations[BluePrintConstants.DEFAULT_STEP_OPERATION] = operationAssignment val interfaceAssignment = InterfaceAssignment() interfaceAssignment.operations = operations @@ -170,13 +170,13 @@ class BlueprintServiceTemplateGenerator(private val dslBlueprint: DSLBlueprint) operationAssignment.outputs = propertyAssignments(dslComponent.outputs) val operations: MutableMap<String, OperationAssignment> = hashMapOf() - operations[BlueprintConstants.DEFAULT_STEP_OPERATION] = operationAssignment + operations[BluePrintConstants.DEFAULT_STEP_OPERATION] = operationAssignment val interfaceAssignment = InterfaceAssignment() interfaceAssignment.operations = operations val interfaces: MutableMap<String, InterfaceAssignment> = hashMapOf() - interfaces[BlueprintConstants.DEFAULT_STEP_INTERFACE] = interfaceAssignment + interfaces[BluePrintConstants.DEFAULT_STEP_INTERFACE] = interfaceAssignment return interfaces } diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BlueprintTemplateDSLBuilder.kt b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BluePrintTemplateDSLBuilder.kt index f8f6080ad..3a3503403 100644 --- a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BlueprintTemplateDSLBuilder.kt +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BluePrintTemplateDSLBuilder.kt @@ -17,7 +17,7 @@ package org.onap.ccsdk.cds.controllerblueprints.core.dsl import com.fasterxml.jackson.databind.JsonNode -import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintConstants +import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants import org.onap.ccsdk.cds.controllerblueprints.core.asJsonType import org.onap.ccsdk.cds.controllerblueprints.core.data.ArtifactDefinition import org.onap.ccsdk.cds.controllerblueprints.core.data.CapabilityAssignment @@ -156,7 +156,7 @@ open class NodeTemplateBuilder( if (interfaces == null) interfaces = hashMapOf() val interfaceAssignment = InterfaceAssignment() - val defaultOperationName = BlueprintConstants.DEFAULT_STEP_OPERATION + val defaultOperationName = BluePrintConstants.DEFAULT_STEP_OPERATION interfaceAssignment.operations = hashMapOf() interfaceAssignment.operations!![defaultOperationName] = OperationAssignmentBuilder<In, Out>(defaultOperationName, description).apply(block).build() @@ -380,7 +380,7 @@ class OperationAssignmentBuilder<In : PropertiesAssignmentBuilder, Out : Propert operationAssignment.implementation = implementation } - fun implementation(timeout: Int, operationHost: String? = BlueprintConstants.PROPERTY_SELF) { + fun implementation(timeout: Int, operationHost: String? = BluePrintConstants.PROPERTY_SELF) { operationAssignment.implementation = Implementation().apply { this.operationHost = operationHost!! this.timeout = timeout @@ -389,7 +389,7 @@ class OperationAssignmentBuilder<In : PropertiesAssignmentBuilder, Out : Propert fun implementation( timeout: Int, - operationHost: String? = BlueprintConstants.PROPERTY_SELF, + operationHost: String? = BluePrintConstants.PROPERTY_SELF, block: ImplementationBuilder.() -> Unit ) { operationAssignment.implementation = ImplementationBuilder(timeout, operationHost!!).apply(block).build() diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BlueprintTypeDSLBuilder.kt b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BluePrintTypeDSLBuilder.kt index 3b3b4b41f..3dfdbac57 100644 --- a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BlueprintTypeDSLBuilder.kt +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BluePrintTypeDSLBuilder.kt @@ -18,7 +18,7 @@ package org.onap.ccsdk.cds.controllerblueprints.core.dsl import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.node.ArrayNode -import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintConstants +import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants import org.onap.ccsdk.cds.controllerblueprints.core.asJsonPrimitive import org.onap.ccsdk.cds.controllerblueprints.core.asJsonType import org.onap.ccsdk.cds.controllerblueprints.core.asListOfString @@ -285,7 +285,7 @@ class CapabilityDefinitionBuilder(private val id: String, private val type: Stri private var capabilityDefinition = CapabilityDefinition() private val properties: MutableMap<String, PropertyDefinition> = hashMapOf() - fun property(id: String, type: String? = BlueprintConstants.DATA_TYPE_STRING, required: Boolean? = false, description: String? = "") { + fun property(id: String, type: String? = BluePrintConstants.DATA_TYPE_STRING, required: Boolean? = false, description: String? = "") { val property = PropertyDefinitionBuilder(id, type, required, description).build() properties[id] = property } @@ -361,7 +361,7 @@ class OperationDefinitionBuilder( class AttributeDefinitionBuilder( private val id: String, - private val type: String? = BlueprintConstants.DATA_TYPE_STRING, + private val type: String? = BluePrintConstants.DATA_TYPE_STRING, private val required: Boolean? = false, private val description: String? = "" ) { @@ -432,7 +432,7 @@ class PropertiesDefinitionBuilder { class PropertyDefinitionBuilder( private val id: String, - private val type: String? = BlueprintConstants.DATA_TYPE_STRING, + private val type: String? = BluePrintConstants.DATA_TYPE_STRING, private val required: Boolean? = false, private val description: String? = "" ) { diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BlueprintWorkflowDSLBuilder.kt b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BluePrintWorkflowDSLBuilder.kt index 0de1a510c..8a1a9d63c 100644 --- a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BlueprintWorkflowDSLBuilder.kt +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/BluePrintWorkflowDSLBuilder.kt @@ -16,7 +16,7 @@ package org.onap.ccsdk.cds.controllerblueprints.core.dsl -import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintConstants +import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants import org.onap.ccsdk.cds.controllerblueprints.core.asPropertyDefinitionMap import org.onap.ccsdk.cds.controllerblueprints.core.data.Activity import org.onap.ccsdk.cds.controllerblueprints.core.data.PropertyDefinition @@ -111,7 +111,7 @@ class StepBuilder( step.id = id step.target = target // Add Default Activity, Assumption is only one Operation - activity(".${BlueprintConstants.DEFAULT_STEP_OPERATION}") + activity(".${BluePrintConstants.DEFAULT_STEP_OPERATION}") step.description = description step.activities = activities step.onSuccess = onSuccess diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/ServiceTemplateBuilder.kt b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/ServiceTemplateBuilder.kt index 4391e89e0..254e644b3 100644 --- a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/ServiceTemplateBuilder.kt +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/dsl/ServiceTemplateBuilder.kt @@ -17,8 +17,8 @@ package org.onap.ccsdk.cds.controllerblueprints.core.dsl import com.fasterxml.jackson.databind.JsonNode -import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintConstants -import org.onap.ccsdk.cds.controllerblueprints.core.asBlueprintsDataTypes +import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants +import org.onap.ccsdk.cds.controllerblueprints.core.asBluePrintsDataTypes import org.onap.ccsdk.cds.controllerblueprints.core.asJsonNode import org.onap.ccsdk.cds.controllerblueprints.core.asJsonType import org.onap.ccsdk.cds.controllerblueprints.core.asPropertyDefinitionMap @@ -51,10 +51,10 @@ class ServiceTemplateBuilder( var policyTypes: MutableMap<String, PolicyType>? = null private fun initMetaData() { - metadata[BlueprintConstants.METADATA_TEMPLATE_NAME] = name - metadata[BlueprintConstants.METADATA_TEMPLATE_VERSION] = version - metadata[BlueprintConstants.METADATA_TEMPLATE_AUTHOR] = author - metadata[BlueprintConstants.METADATA_TEMPLATE_TAGS] = tags + metadata[BluePrintConstants.METADATA_TEMPLATE_NAME] = name + metadata[BluePrintConstants.METADATA_TEMPLATE_VERSION] = version + metadata[BluePrintConstants.METADATA_TEMPLATE_AUTHOR] = author + metadata[BluePrintConstants.METADATA_TEMPLATE_TAGS] = tags } fun metadata(id: String, value: String) { @@ -73,7 +73,7 @@ class ServiceTemplateBuilder( } fun dataType(dataType: KClass<*>) { - dataType(dataType.asBlueprintsDataTypes()) + dataType(dataType.asBluePrintsDataTypes()) } fun dsl(id: String, content: Any) { |