diff options
Diffstat (limited to 'ms/blueprintsprocessor/modules/commons/db-lib')
3 files changed, 177 insertions, 2 deletions
diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/BluePrintDBLibData.kt b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/BluePrintDBLibData.kt index d4d804857..f78334fcd 100644 --- a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/BluePrintDBLibData.kt +++ b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/BluePrintDBLibData.kt @@ -17,6 +17,7 @@ package org.onap.ccsdk.cds.blueprintsprocessor.db open class DBDataSourceProperties { + var type: String = DBLibConstants.MARIA_DB lateinit var url: String lateinit var username: String lateinit var password: String @@ -34,7 +35,6 @@ open class MariaDataSourceProperties : DBDataSourceProperties() { lateinit var hibernateHbm2ddlAuto: String lateinit var hibernateDDLAuto: String lateinit var hibernateNamingStrategy: String - lateinit var type: String lateinit var hibernateDialect: String override var driverClassName = DBLibConstants.DRIVER_MARIA_DB } @@ -43,7 +43,6 @@ open class MySqlDataSourceProperties : DBDataSourceProperties() { lateinit var hibernateHbm2ddlAuto: String lateinit var hibernateDDLAuto: String lateinit var hibernateNamingStrategy: String - lateinit var type: String lateinit var hibernateDialect: String override var driverClassName = DBLibConstants.DRIVER_MYSQL_DB } diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/DatabasePropertiesDSL.kt b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/DatabasePropertiesDSL.kt index 036beb369..2bf56f482 100644 --- a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/DatabasePropertiesDSL.kt +++ b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/DatabasePropertiesDSL.kt @@ -15,3 +15,109 @@ */ package org.onap.ccsdk.cds.blueprintsprocessor.db + +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.asJsonNode +import org.onap.ccsdk.cds.controllerblueprints.core.asJsonPrimitive +import org.onap.ccsdk.cds.controllerblueprints.core.data.RelationshipType +import org.onap.ccsdk.cds.controllerblueprints.core.dsl.PropertiesAssignmentBuilder +import org.onap.ccsdk.cds.controllerblueprints.core.dsl.RelationshipTemplateBuilder +import org.onap.ccsdk.cds.controllerblueprints.core.dsl.TopologyTemplateBuilder +import org.onap.ccsdk.cds.controllerblueprints.core.dsl.relationshipType + +/** Relationships Types DSL for Database Producer */ +fun BluePrintTypes.relationshipTypeConnectsToDb(): RelationshipType { + return relationshipType( + id = BluePrintConstants.MODEL_TYPE_RELATIONSHIPS_CONNECTS_TO_DB, + version = BluePrintConstants.DEFAULT_VERSION_NUMBER, + derivedFrom = BluePrintConstants.MODEL_TYPE_RELATIONSHIPS_CONNECTS_TO, + description = "Relationship connects to through Database." + ) { + property( + BluePrintConstants.PROPERTY_CONNECTION_CONFIG, + BluePrintConstants.DATA_TYPE_MAP, + true, + "Connection Config details." + ) + validTargetTypes(arrayListOf(BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT)) + } +} + +/** Relationships Templates for Database Server */ +fun TopologyTemplateBuilder.relationshipTemplateDb( + name: String, + description: String, + block: DbRelationshipTemplateBuilder.() -> Unit +) { + if (relationshipTemplates == null) relationshipTemplates = hashMapOf() + val relationshipTemplate = DbRelationshipTemplateBuilder(name, description).apply(block).build() + relationshipTemplates!![relationshipTemplate.id!!] = relationshipTemplate +} + +class DbRelationshipTemplateBuilder(name: String, description: String) : + RelationshipTemplateBuilder( + name, + BluePrintConstants.MODEL_TYPE_RELATIONSHIPS_CONNECTS_TO_DB, description + ) { + + fun mariaDb(block: DbMariaDataSourcePropertiesAssignmentBuilder.() -> Unit) { + property(BluePrintConstants.PROPERTY_CONNECTION_CONFIG, BluePrintTypes.mariaDbProperties(block)) + } + + fun mySqlDb(block: DbMySqlDataSourcePropertiesAssignmentBuilder.() -> Unit) { + property(BluePrintConstants.PROPERTY_CONNECTION_CONFIG, BluePrintTypes.mySqlDbProperties(block)) + } +} + +fun BluePrintTypes.mariaDbProperties(block: DbMariaDataSourcePropertiesAssignmentBuilder.() -> Unit): JsonNode { + val assignments = DbMariaDataSourcePropertiesAssignmentBuilder().apply(block).build() + assignments[DBDataSourceProperties::type.name] = DBLibConstants.MARIA_DB.asJsonPrimitive() + return assignments.asJsonNode() +} + +fun BluePrintTypes.mySqlDbProperties(block: DbMySqlDataSourcePropertiesAssignmentBuilder.() -> Unit): JsonNode { + val assignments = DbMySqlDataSourcePropertiesAssignmentBuilder().apply(block).build() + assignments[DBDataSourceProperties::type.name] = DBLibConstants.MYSQL_DB.asJsonPrimitive() + return assignments.asJsonNode() +} + +open class DbPropertiesAssignmentBuilder : PropertiesAssignmentBuilder() { + + fun url(url: String) = url(url.asJsonPrimitive()) + + fun url(url: JsonNode) = + property(DBDataSourceProperties::url, url) + + fun username(username: String) = username(username.asJsonPrimitive()) + + fun username(username: JsonNode) = property(DBDataSourceProperties::username, username) + + fun password(password: String) = password(password.asJsonPrimitive()) + + fun password(password: JsonNode) = property(DBDataSourceProperties::password, password) +} + +open class DbMariaDataSourcePropertiesAssignmentBuilder : DbPropertiesAssignmentBuilder() { + + fun hibernateHbm2ddlAuto(hibernateHbm2ddlAuto: String) = + hibernateHbm2ddlAuto(hibernateHbm2ddlAuto.asJsonPrimitive()) + + fun hibernateHbm2ddlAuto(hibernateHbm2ddlAuto: JsonNode) = + property(MariaDataSourceProperties::hibernateHbm2ddlAuto, hibernateHbm2ddlAuto) + + fun hibernateDDLAuto(hibernateDDLAuto: String) = + hibernateDDLAuto(hibernateDDLAuto.asJsonPrimitive()) + + fun hibernateDDLAuto(hibernateDDLAuto: JsonNode) = + property(MariaDataSourceProperties::hibernateDDLAuto, hibernateDDLAuto) + + fun hibernateNamingStrategy(hibernateNamingStrategy: String) = + hibernateNamingStrategy(hibernateNamingStrategy.asJsonPrimitive()) + + fun hibernateNamingStrategy(hibernateNamingStrategy: JsonNode) = + property(MariaDataSourceProperties::hibernateNamingStrategy, hibernateNamingStrategy) +} + +open class DbMySqlDataSourcePropertiesAssignmentBuilder : DbMariaDataSourcePropertiesAssignmentBuilder() diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/DatabasePropertiesDSLTest.kt b/ms/blueprintsprocessor/modules/commons/db-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/DatabasePropertiesDSLTest.kt new file mode 100644 index 000000000..b0c7d8b3c --- /dev/null +++ b/ms/blueprintsprocessor/modules/commons/db-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/DatabasePropertiesDSLTest.kt @@ -0,0 +1,70 @@ +/* + * Copyright © 2018-2019 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.cds.blueprintsprocessor.db + +import org.junit.Test +import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintTypes +import org.onap.ccsdk.cds.controllerblueprints.core.dsl.relationshipTypeConnectsTo +import org.onap.ccsdk.cds.controllerblueprints.core.dsl.serviceTemplate +import kotlin.test.assertEquals +import kotlin.test.assertNotNull + +class DatabasePropertiesDSLTest { + + @Test + fun testDatabasePropertiesDSL() { + val serviceTemplate = serviceTemplate("database-properties-test", "1.0.0", "xxx.@xx.com", "database") { + topologyTemplate { + relationshipTemplateDb("sample-maria-db", "Database Server") { + mariaDb { + url("jdbc://mariadb:3600") + username("user") + password("credential") + hibernateDDLAuto("hibernateDDLAuto") + hibernateHbm2ddlAuto("hibernateHbm2ddlAuto") + hibernateDDLAuto("hibernateDDLAuto") + hibernateNamingStrategy("hibernateNamingStrategy") + } + } + relationshipTemplateDb("sample-mysql-db", "Database Server") { + mySqlDb { + url("jdbc://mysql:3600") + username("user") + password("credential") + hibernateDDLAuto("hibernateDDLAuto") + hibernateHbm2ddlAuto("hibernateHbm2ddlAuto") + hibernateDDLAuto("hibernateDDLAuto") + hibernateNamingStrategy("hibernateNamingStrategy") + } + } + } + relationshipTypes( + arrayListOf( + BluePrintTypes.relationshipTypeConnectsToDb(), + BluePrintTypes.relationshipTypeConnectsTo() + ) + ) + } + assertNotNull(serviceTemplate, "failed to create service template") + val relationshipTemplates = serviceTemplate.topologyTemplate?.relationshipTemplates + assertNotNull(relationshipTemplates, "failed to get relationship templates") + assertEquals(2, relationshipTemplates.size, "relationshipTemplates doesn't match") + assertNotNull(relationshipTemplates["sample-maria-db"], "failed to get sample-maria-db") + assertNotNull(relationshipTemplates["sample-mysql-db"], "failed to get sample-mysql-db") + // println(serviceTemplate.asJsonString(true)) + } +} |