diff options
author | 2019-08-15 16:41:17 -0400 | |
---|---|---|
committer | 2019-08-27 12:35:23 -0400 | |
commit | 54426584a02e6fbfec5f7685c92e1a3fde62309f (patch) | |
tree | d5af6cfb361d2f1d782c109b7f141a4720fcf25b /ms/controllerblueprints/modules/blueprint-core/src | |
parent | 68676761d63eefc4dccc96dd2df6853cb8e10c42 (diff) |
Make source-db consistent across samples
Issue-Id: CCSDK-1623
Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com>
Change-Id: Iec7c6909c39c34894be11bfdac45f6394010d9cf
Diffstat (limited to 'ms/controllerblueprints/modules/blueprint-core/src')
3 files changed, 14 insertions, 11 deletions
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/service/BluePrintContext.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/service/BluePrintContext.kt index b368c01aa..99c80f8e6 100644 --- a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/service/BluePrintContext.kt +++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/service/BluePrintContext.kt @@ -101,12 +101,12 @@ class BluePrintContext(val serviceTemplate: ServiceTemplate) { fun workflowStepFirstCallOperation(workFlowName: String, stepName: String): String { return workflowStepByName(workFlowName, stepName).activities?.filter { it.callOperation != null }?.single()?.callOperation - ?: throw BluePrintException("could't get first callOperation for WorkFlow($workFlowName) ") + ?: throw BluePrintException("couldn't get first callOperation for WorkFlow($workFlowName) ") } // DSL fun dslPropertiesByName(name: String): JsonNode = dslDefinitions()?.get(name) - ?: throw BluePrintException("could't get policy type for the dsl($name)") + ?: throw BluePrintException("couldn't get policy type for the dsl($name)") // Data Type fun dataTypeByName(name: String): DataType? = dataTypes()?.get(name) @@ -269,4 +269,4 @@ class BluePrintContext(val serviceTemplate: ServiceTemplate) { return BluePrintChainedService(this).nodeTypeChainedProperties(nodeTypeName) } -}
\ No newline at end of file +} diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/JacksonUtils.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/JacksonUtils.kt index 73dff9379..23b0a1758 100644 --- a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/JacksonUtils.kt +++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/JacksonUtils.kt @@ -243,7 +243,8 @@ class JacksonUtils { BluePrintConstants.DATA_TYPE_FLOAT, BluePrintConstants.DATA_TYPE_DOUBLE, BluePrintConstants.DATA_TYPE_TIMESTAMP, - BluePrintConstants.DATA_TYPE_STRING -> + BluePrintConstants.DATA_TYPE_STRING, + BluePrintConstants.DATA_TYPE_NULL -> objectNode.set(key, value) else -> throw BluePrintException("populatePrimitiveValues expected only primitive values! Received: ($value)") } @@ -256,7 +257,9 @@ class JacksonUtils { BluePrintConstants.DATA_TYPE_FLOAT, BluePrintConstants.DATA_TYPE_DOUBLE, BluePrintConstants.DATA_TYPE_TIMESTAMP, - BluePrintConstants.DATA_TYPE_STRING -> arrayNode.add(value) + BluePrintConstants.DATA_TYPE_STRING, + BluePrintConstants.DATA_TYPE_NULL -> + arrayNode.add(value) else -> throw BluePrintException("populatePrimitiveValues expected only primitive values! Received: ($value)") } } diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/resources/dictionary/dictionary_schema.json b/ms/controllerblueprints/modules/blueprint-core/src/test/resources/dictionary/dictionary_schema.json index 0e1f84278..e8394a085 100644 --- a/ms/controllerblueprints/modules/blueprint-core/src/test/resources/dictionary/dictionary_schema.json +++ b/ms/controllerblueprints/modules/blueprint-core/src/test/resources/dictionary/dictionary_schema.json @@ -51,7 +51,7 @@ "default": { "type": "any" }, - "primary-aai-data": { + "aai-data": { "type": "object", "properties": { "verb": { @@ -92,7 +92,7 @@ } } }, - "primary-config-data": { + "config-data": { "type": "object", "properties": { "path": { @@ -142,7 +142,7 @@ } } }, - "primary-db": { + "processor-db": { "type": "object", "properties": { "query": { @@ -215,7 +215,7 @@ } } }, - "primary-aai-data": { + "aai-data": { "type": "object", "properties": { "names": { @@ -226,7 +226,7 @@ } } }, - "primary-config-data": { + "config-data": { "type": "object", "properties": { "names": { @@ -248,7 +248,7 @@ } } }, - "primary-db": { + "processor-db": { "type": "object", "properties": { "names": { |