Refactor components core and resource dict modules 82/78082/1
authorMuthuramalingam, Brinda Santh <brindasanth@in.ibm.com>
Thu, 7 Feb 2019 19:51:50 +0000 (14:51 -0500)
committerMuthuramalingam, Brinda Santh <brindasanth@in.ibm.com>
Thu, 7 Feb 2019 19:51:50 +0000 (14:51 -0500)
Change-Id: I04e9e723d68a38ecefe48206e67fddbe43c55854
Issue-ID: CCSDK-1047
Signed-off-by: Muthuramalingam, Brinda Santh <brindasanth@in.ibm.com>
178 files changed:
components/parent/pom.xml
components/pom.xml
ms/blueprintsprocessor/application/pom.xml
ms/blueprintsprocessor/functions/python-executor/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/ComponentJythonExecutorTest.kt
ms/blueprintsprocessor/modules/commons/db-lib/pom.xml
ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml
ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml
ms/blueprintsprocessor/modules/services/execution-service/pom.xml
ms/blueprintsprocessor/modules/services/workflow-service/pom.xml
ms/blueprintsprocessor/parent/pom.xml
ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-bpmn-camunda.json [moved from components/core/load/model_type/artifact_type/artifact-bpmn-camunda.json with 94% similarity]
ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-directed-graph.json [moved from components/core/load/model_type/artifact_type/artifact-directed-graph.json with 94% similarity]
ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-mapping-resource.json [moved from components/core/load/model_type/artifact_type/artifact-mapping-resource.json with 96% similarity]
ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-script-python.json [moved from components/core/load/model_type/artifact_type/artifact-script-python.json with 95% similarity]
ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-template-velocity.json [moved from components/core/load/model_type/artifact_type/artifact-template-velocity.json with 95% similarity]
ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/tosca.artifacts.Implementation.json [moved from components/core/load/model_type/artifact_type/tosca.artifacts.Implementation.json with 96% similarity]
ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/datatype-property.json [moved from components/core/load/model_type/data_type/datatype-property.json with 95% similarity]
ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/datatype-resource-assignment.json [moved from components/core/load/model_type/data_type/datatype-resource-assignment.json with 94% similarity]
ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/dt-license-key.json [moved from components/core/load/model_type/data_type/dt-license-key.json with 94% similarity]
ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/dt-v4-aggregate.json [moved from components/core/load/model_type/data_type/dt-v4-aggregate.json with 94% similarity]
ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/tosca.datatypes.Credential.json [moved from components/core/load/model_type/data_type/tosca.datatypes.Credential.json with 94% similarity]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/artifact-config-template.json [moved from components/core/load/model_type/node_type/artifact-config-template.json with 94% similarity]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/component-config-generator.json [moved from components/core/load/model_type/node_type/component-config-generator.json with 97% similarity]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/component-netconf-executor.json [moved from components/core/load/model_type/node_type/component-netconf-executor.json with 97% similarity]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/component-resource-assignment.json [moved from components/core/load/model_type/node_type/component-resource-assignment.json with 96% similarity]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-activate-netconf.json [moved from components/core/load/model_type/node_type/dg-activate-netconf.json with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-config-generator.json [moved from components/core/load/model_type/node_type/dg-config-generator.json with 94% similarity]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assign-activate.json [moved from components/core/load/model_type/node_type/dg-resource-assign-activate.json with 95% similarity]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assignment.json [moved from components/core/load/model_type/node_type/dg-resource-assignment.json with 94% similarity]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.Artifact.json [moved from components/core/load/model_type/node_type/tosca.nodes.Artifact.json with 96% similarity]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.Component.json [moved from components/core/load/model_type/node_type/tosca.nodes.Component.json with 95% similarity]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.DG.json [moved from components/core/load/model_type/node_type/tosca.nodes.DG.json with 95% similarity]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.Vnf.json [moved from components/core/load/model_type/node_type/tosca.nodes.Vnf.json with 95% similarity]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.component.Python.json [moved from components/core/load/model_type/node_type/tosca.nodes.component.Python.json with 95% similarity]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/vnf-netconf-device.json [moved from components/core/load/model_type/node_type/vnf-netconf-device.json with 95% similarity]
ms/controllerblueprints/modules/blueprint-core/pom.xml [moved from components/core/pom.xml with 84% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintConstants.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintConstants.kt with 98% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintError.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintError.kt with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintException.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintException.kt with 96% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintProcessorException.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintProcessorException.kt with 96% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintTypes.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintTypes.kt with 97% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/ConfigModelConstant.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/ConfigModelConstant.kt with 96% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/CustomFunctions.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/CustomFunctions.kt with 96% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/common/ApplicationConstants.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/common/ApplicationConstants.kt with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/config/BluePrintLoadConfiguration.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/config/BluePrintLoadConfiguration.kt with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/data/BluePrintExpressionData.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/data/BluePrintExpressionData.kt with 96% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/data/BluePrintModel.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/data/BluePrintModel.kt with 97% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/data/BlueprintErrorCode.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/data/BlueprintErrorCode.kt with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/factory/BluePrintValidatorFactory.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/factory/BluePrintValidatorFactory.kt with 97% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BluePrintCatalogService.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BluePrintCatalogService.kt with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BluePrintEnhancer.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BluePrintEnhancer.kt with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BluePrintRepoService.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BluePrintRepoService.kt with 97% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BluePrintScriptsService.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BluePrintScriptsService.kt with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BlueprintFunctionNode.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BlueprintFunctionNode.kt with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BlueprintValidator.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BlueprintValidator.kt with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintChainedService.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintChainedService.kt with 97% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContext.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContext.kt with 98% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionService.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionService.kt with 97% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintImportService.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintImportService.kt with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintParserService.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintParserService.kt with 97% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRepoFileService.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRepoFileService.kt with 98% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeService.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeService.kt with 97% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintTemplateService.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintTemplateService.kt with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorService.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorService.kt with 98% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/PropertyAssignmentService.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/PropertyAssignmentService.kt with 97% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintArchiveUtils.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintArchiveUtils.kt with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintFileUtils.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintFileUtils.kt with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintMetadataUtils.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintMetadataUtils.kt with 98% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintRuntimeUtils.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintRuntimeUtils.kt with 97% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/JacksonReactorUtils.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/JacksonReactorUtils.kt with 97% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/JacksonUtils.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/JacksonUtils.kt with 97% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/ResourceResolverUtils.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/ResourceResolverUtils.kt with 97% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/ServiceTemplateUtils.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/ServiceTemplateUtils.kt with 97% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/TopologicalSortingUtils.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/TopologicalSortingUtils.kt with 96% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintArtifactTypeValidatorImpl.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintArtifactTypeValidatorImpl.kt with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintAttributeDefinitionValidatorImpl.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintAttributeDefinitionValidatorImpl.kt with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintDataTypeValidatorImpl.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintDataTypeValidatorImpl.kt with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintNodeTemplateValidatorImpl.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintNodeTemplateValidatorImpl.kt with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintNodeTypeValidatorImpl.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintNodeTypeValidatorImpl.kt with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintPropertyDefinitionValidatorImpl.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintPropertyDefinitionValidatorImpl.kt with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintServiceTemplateValidatorImpl.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintServiceTemplateValidatorImpl.kt with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintTopologyTemplateValidatorImpl.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintTopologyTemplateValidatorImpl.kt with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintValidatorServiceImpl.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintValidatorServiceImpl.kt with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintWorkflowValidatorImpl.kt [moved from components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintWorkflowValidatorImpl.kt with 94% similarity]
ms/controllerblueprints/modules/blueprint-core/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory [moved from components/core/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/CustomFunctionsTest.kt [moved from components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/CustomFunctionsTest.kt with 97% similarity]
ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/mock/MockBluePrintTypeValidatorService.kt [moved from components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/mock/MockBluePrintTypeValidatorService.kt with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContextTest.kt [moved from components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContextTest.kt with 91% similarity]
ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionServiceTest.kt [moved from components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionServiceTest.kt with 98% similarity]
ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRepoFileServiceTest.kt [moved from components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRepoFileServiceTest.kt with 97% similarity]
ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt [moved from components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt with 96% similarity]
ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintTemplateServiceTest.kt [moved from components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintTemplateServiceTest.kt with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorDefaultServiceTest.kt [moved from components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorDefaultServiceTest.kt with 89% similarity]
ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintFileUtilsTest.kt [moved from components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintFileUtilsTest.kt with 91% similarity]
ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintMetadataUtilsTest.kt [moved from components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintMetadataUtilsTest.kt with 89% similarity]
ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/JacksonUtilsTest.kt [moved from components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/JacksonUtilsTest.kt with 97% similarity]
ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/TopologicalSortingUtilsTest.kt [moved from components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/TopologicalSortingUtilsTest.kt with 97% similarity]
ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintValidatorServiceImplTest.kt [moved from components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintValidatorServiceImplTest.kt with 95% similarity]
ms/controllerblueprints/modules/blueprint-core/src/test/resources/componentnode/default.json [moved from components/core/src/test/resources/componentnode/default.json with 95% similarity]
ms/controllerblueprints/modules/blueprint-core/src/test/resources/data/alltype-data.json [moved from components/core/src/test/resources/data/alltype-data.json with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/test/resources/data/default-context.json [moved from components/core/src/test/resources/data/default-context.json with 95% similarity]
ms/controllerblueprints/modules/blueprint-core/src/test/resources/dictionary/dictionary_schema.json [moved from components/core/src/test/resources/dictionary/dictionary_schema.json with 94% similarity]
ms/controllerblueprints/modules/blueprint-core/src/test/resources/properties/convert.json [moved from components/core/src/test/resources/properties/convert.json with 96% similarity]
ms/controllerblueprints/modules/blueprint-core/src/test/resources/properties/default.json [moved from components/core/src/test/resources/properties/default.json with 96% similarity]
ms/controllerblueprints/modules/blueprint-core/src/test/resources/scripts/SampleBlueprintFunctionNode.kts [moved from components/core/src/test/resources/scripts/SampleBlueprintFunctionNode.kts with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/test/resources/templates/base-config-data.json [moved from components/core/src/test/resources/templates/base-config-data.json with 100% similarity]
ms/controllerblueprints/modules/blueprint-core/src/test/resources/templates/base-config-template.vtl [moved from components/core/src/test/resources/templates/base-config-template.vtl with 100% similarity]
ms/controllerblueprints/modules/blueprint-validation/pom.xml
ms/controllerblueprints/modules/db-resources/pom.xml
ms/controllerblueprints/modules/pom.xml
ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-component-java.json [moved from components/resource-dict/load/model_type/node_type/source-component-java.json with 100% similarity]
ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-default.json [moved from components/resource-dict/load/model_type/node_type/source-default.json with 100% similarity]
ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-input.json [moved from components/resource-dict/load/model_type/node_type/source-input.json with 100% similarity]
ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-primary-db.json [moved from components/resource-dict/load/model_type/node_type/source-primary-db.json with 100% similarity]
ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-rest.json [moved from components/resource-dict/load/model_type/node_type/source-rest.json with 100% similarity]
ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/tosca.nodes.ResourceSource.json [moved from components/resource-dict/load/model_type/node_type/tosca.nodes.ResourceSource.json with 100% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/address.json [moved from components/resource-dict/load/resource_dictionary/address.json with 100% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/aic-cloud-region.json [moved from components/resource-dict/load/resource_dictionary/aic-cloud-region.json with 95% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/aic_clli.json [moved from components/resource-dict/load/resource_dictionary/aic_clli.json with 94% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/availability_zone_0.json [moved from components/resource-dict/load/resource_dictionary/availability_zone_0.json with 95% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/default-source.json [moved from components/resource-dict/load/resource_dictionary/default-source.json with 95% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/input-source.json [moved from components/resource-dict/load/resource_dictionary/input-source.json with 93% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json [moved from components/resource-dict/load/resource_dictionary/mdsal-source.json with 97% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/name_0.json [moved from components/resource-dict/load/resource_dictionary/name_0.json with 94% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nf-role.json [moved from components/resource-dict/load/resource_dictionary/nf-role.json with 96% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nfc-naming-code.json [moved from components/resource-dict/load/resource_dictionary/nfc-naming-code.json with 96% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_cidr.json [moved from components/resource-dict/load/resource_dictionary/onap_private_net_cidr.json with 96% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_id.json [moved from components/resource-dict/load/resource_dictionary/onap_private_net_id.json with 95% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/primary-db-source.json [moved from components/resource-dict/load/resource_dictionary/primary-db-source.json with 96% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/private-prefix-id.json [moved from components/resource-dict/load/resource_dictionary/private-prefix-id.json with 96% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected-prefix-id.json [moved from components/resource-dict/load/resource_dictionary/protected-prefix-id.json with 96% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected_private_net_cidr.json [moved from components/resource-dict/load/resource_dictionary/protected_private_net_cidr.json with 96% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/public_net_id.json [moved from components/resource-dict/load/resource_dictionary/public_net_id.json with 100% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/service-instance-id.json [moved from components/resource-dict/load/resource_dictionary/service-instance-id.json with 95% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected-prefix-id.json [moved from components/resource-dict/load/resource_dictionary/unprotected-prefix-id.json with 96% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected_private_net_cidr.json [moved from components/resource-dict/load/resource_dictionary/unprotected_private_net_cidr.json with 100% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-id.json [moved from components/resource-dict/load/resource_dictionary/vf-module-id.json with 94% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-label.json [moved from components/resource-dict/load/resource_dictionary/vf-module-label.json with 96% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-model-customization-uuid.json [moved from components/resource-dict/load/resource_dictionary/vf-module-model-customization-uuid.json with 96% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-type.json [moved from components/resource-dict/load/resource_dictionary/vf-module-type.json with 96% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-naming-policy.json [moved from components/resource-dict/load/resource_dictionary/vf-naming-policy.json with 96% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-nf-code.json [moved from components/resource-dict/load/resource_dictionary/vf-nf-code.json with 96% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf_module_name.json [moved from components/resource-dict/load/resource_dictionary/vf_module_name.json with 95% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfccustomizationuuid.json [moved from components/resource-dict/load/resource_dictionary/vfccustomizationuuid.json with 97% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_0.json [moved from components/resource-dict/load/resource_dictionary/vfw_private_ip_0.json with 100% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_1.json [moved from components/resource-dict/load/resource_dictionary/vfw_private_ip_1.json with 100% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_2.json [moved from components/resource-dict/load/resource_dictionary/vfw_private_ip_2.json with 100% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vm-type.json [moved from components/resource-dict/load/resource_dictionary/vm-type.json with 96% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-id.json [moved from components/resource-dict/load/resource_dictionary/vnf-id.json with 94% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-model-customization-uuid.json [moved from components/resource-dict/load/resource_dictionary/vnf-model-customization-uuid.json with 95% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json [moved from components/resource-dict/load/resource_dictionary/vnf-name.json with 96% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf_name.json [moved from components/resource-dict/load/resource_dictionary/vnf_name.json with 96% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-invariant-uuid.json [moved from components/resource-dict/load/resource_dictionary/vnfc-model-invariant-uuid.json with 96% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-version.json [moved from components/resource-dict/load/resource_dictionary/vnfc-model-version.json with 96% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_0.json [moved from components/resource-dict/load/resource_dictionary/vpg_private_ip_0.json with 100% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_1.json [moved from components/resource-dict/load/resource_dictionary/vpg_private_ip_1.json with 100% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_0.json [moved from components/resource-dict/load/resource_dictionary/vsn_private_ip_0.json with 100% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_1.json [moved from components/resource-dict/load/resource_dictionary/vsn_private_ip_1.json with 100% similarity]
ms/controllerblueprints/modules/resource-dict/pom.xml [moved from components/resource-dict/pom.xml with 85% similarity]
ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt [moved from components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt with 100% similarity]
ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt [moved from components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt with 100% similarity]
ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactory.kt [moved from components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactory.kt with 97% similarity]
ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationService.kt [moved from components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationService.kt with 100% similarity]
ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionValidationService.kt [moved from components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionValidationService.kt with 100% similarity]
ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/BulkResourceSequencingUtils.kt [moved from components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/BulkResourceSequencingUtils.kt with 97% similarity]
ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtils.kt [moved from components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtils.kt with 100% similarity]
ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinitionTest.java [moved from components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinitionTest.java with 97% similarity]
ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java [moved from components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java with 97% similarity]
ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationServiceTest.kt [moved from components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationServiceTest.kt with 97% similarity]
ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionValidationServiceTest.java [moved from components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionValidationServiceTest.java with 100% similarity]
ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/BulkResourceSequencingUtilsTest.java [moved from components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/BulkResourceSequencingUtilsTest.java with 97% similarity]
ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java [moved from components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java with 97% similarity]
ms/controllerblueprints/modules/resource-dict/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt [moved from components/resource-dict/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt with 97% similarity]
ms/controllerblueprints/modules/resource-dict/src/test/resources/data/resource-assignment-input.json [moved from components/resource-dict/src/test/resources/data/resource-assignment-input.json with 100% similarity]
ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/cyclic.json [moved from components/resource-dict/src/test/resources/validation/cyclic.json with 95% similarity]
ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json [moved from components/resource-dict/src/test/resources/validation/duplicate.json with 95% similarity]
ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json [moved from components/resource-dict/src/test/resources/validation/success.json with 95% similarity]
ms/controllerblueprints/parent/pom.xml

index 6d5c2c1..761b0fa 100644 (file)
             </dependency>
 
 
-            <!-- Application Components -->
-            <dependency>
-                <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
-                <artifactId>core</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
-                <artifactId>resource-dict</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
             <!-- Testing Dependencies -->
             <dependency>
                 <groupId>io.mockk</groupId>
index 95ffd5c..c18e968 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Copyright © 2017-2018 AT&T Intellectual Property.
+  ~ Modifications Copyright © 2018 IBM.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -36,8 +37,6 @@
     </properties>
     <modules>
         <module>parent</module>
-        <module>core</module>
-        <module>resource-dict</module>
         <module>model-catalog/proto-definition</module>
     </modules>
 </project>
index 06752b7..9ad2ccb 100755 (executable)
@@ -33,7 +33,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
-            <artifactId>core</artifactId>
+            <artifactId>blueprint-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
index 83cf59c..96d683c 100644 (file)
 package org.onap.ccsdk.apps.blueprintsprocessor.functions.python.executor
 
 import com.fasterxml.jackson.databind.JsonNode
-import com.fasterxml.jackson.databind.node.JsonNodeFactory
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.onap.ccsdk.apps.blueprintsprocessor.core.api.data.ActionIdentifiers
-import org.onap.ccsdk.apps.blueprintsprocessor.core.api.data.CommonHeader
 import org.onap.ccsdk.apps.blueprintsprocessor.core.api.data.ExecutionServiceInput
 import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
 import org.onap.ccsdk.apps.controllerblueprints.core.asJsonNode
index 590c87f..7c5aecb 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~  Copyright © 2017-2018 AT&T Intellectual Property.
+  ~  Modifications Copyright © 2018 IBM.
   ~
   ~  Licensed under the Apache License, Version 2.0 (the "License");
   ~  you may not use this file except in compliance with the License.
@@ -30,7 +31,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
-            <artifactId>core</artifactId>
+            <artifactId>blueprint-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
index 773746b..f1d9789 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~  Copyright © 2017-2018 AT&T Intellectual Property.
+  ~  Modifications Copyright © 2018 IBM.
   ~
   ~  Licensed under the Apache License, Version 2.0 (the "License");
   ~  you may not use this file except in compliance with the License.
@@ -29,7 +30,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
-            <artifactId>core</artifactId>
+            <artifactId>blueprint-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId>
index 818adf9..4a30535 100755 (executable)
@@ -3,6 +3,7 @@
   ~  Copyright © 2017-2018 AT&T Intellectual Property.
   ~
   ~  Modifications Copyright © 2019 Bell Canada.
+  ~  Modifications Copyright © 2018 IBM.
   ~
   ~  Licensed under the Apache License, Version 2.0 (the "License");
   ~  you may not use this file except in compliance with the License.
@@ -39,7 +40,7 @@
         <dependency>
             <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
             <version>${project.version}</version>
-            <artifactId>core</artifactId>
+            <artifactId>blueprint-core</artifactId>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
index 96bb09f..19685b5 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~  Copyright © 2017-2018 AT&T Intellectual Property.
+  ~  Modifications Copyright © 2018 IBM.
   ~
   ~  Licensed under the Apache License, Version 2.0 (the "License");
   ~  you may not use this file except in compliance with the License.
@@ -30,7 +31,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
-            <artifactId>core</artifactId>
+            <artifactId>blueprint-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId>
index cc2a0e6..4f92906 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Copyright © 2017-2018 AT&T Intellectual Property.
+  ~  Modifications Copyright © 2018 IBM.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -29,7 +30,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
-            <artifactId>core</artifactId>
+            <artifactId>blueprint-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId>
index 0de4b42..685cf41 100755 (executable)
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
-                <artifactId>core</artifactId>
+                <artifactId>blueprint-core</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -1,8 +1,8 @@
-{\r
-  "description": " Camunda BPM File",\r
-  "version": "1.0.0",\r
-  "file_ext": [\r
-    "bpmn"\r
-  ],\r
-  "derived_from": "tosca.artifacts.Implementation"\r
+{
+  "description": " Camunda BPM File",
+  "version": "1.0.0",
+  "file_ext": [
+    "bpmn"
+  ],
+  "derived_from": "tosca.artifacts.Implementation"
 }
\ No newline at end of file
@@ -1,9 +1,9 @@
-{\r
-  "description": "Directed Graph File",\r
-  "version": "1.0.0",\r
-  "file_ext": [\r
-    "json",\r
-    "xml"\r
-  ],\r
-  "derived_from": "tosca.artifacts.Implementation"\r
+{
+  "description": "Directed Graph File",
+  "version": "1.0.0",
+  "file_ext": [
+    "json",
+    "xml"
+  ],
+  "derived_from": "tosca.artifacts.Implementation"
 }
\ No newline at end of file
@@ -1,8 +1,8 @@
-{\r
-  "description": " Velocity Template Resource Mapping File used along with Configuration template",\r
-  "version": "1.0.0",\r
-  "file_ext": [\r
-    "json"\r
-  ],\r
-  "derived_from": "tosca.artifacts.Implementation"\r
+{
+  "description": " Velocity Template Resource Mapping File used along with Configuration template",
+  "version": "1.0.0",
+  "file_ext": [
+    "json"
+  ],
+  "derived_from": "tosca.artifacts.Implementation"
 }
\ No newline at end of file
@@ -1,8 +1,8 @@
-{\r
-  "description": " Kotlin Script Template used for Configuration",\r
-  "version": "1.0.0",\r
-  "file_ext": [\r
-    "py"\r
-  ],\r
-  "derived_from": "tosca.artifacts.Implementation"\r
+{
+  "description": " Kotlin Script Template used for Configuration",
+  "version": "1.0.0",
+  "file_ext": [
+    "py"
+  ],
+  "derived_from": "tosca.artifacts.Implementation"
 }
\ No newline at end of file
@@ -1,8 +1,8 @@
-{\r
-  "description": " Velocity Template used for Configuration",\r
-  "version": "1.0.0",\r
-  "file_ext": [\r
-    "vtl"\r
-  ],\r
-  "derived_from": "tosca.artifacts.Implementation"\r
+{
+  "description": " Velocity Template used for Configuration",
+  "version": "1.0.0",
+  "file_ext": [
+    "vtl"
+  ],
+  "derived_from": "tosca.artifacts.Implementation"
 }
\ No newline at end of file
@@ -1,5 +1,5 @@
-{\r
-  "description": "TOSCA base type for implementation artifacts",\r
-  "version": "1.0.0",\r
-  "derived_from": "tosca.artifacts.Root"\r
+{
+  "description": "TOSCA base type for implementation artifacts",
+  "version": "1.0.0",
+  "derived_from": "tosca.artifacts.Root"
 }
\ No newline at end of file
@@ -1,27 +1,27 @@
-{\r
-       "version": "1.0.0",\r
-       "description": "This is Entry point Input Data Type, which is dynamic datatype, The parameter names will be populated during the Design time for each inputs",\r
-       "properties": {\r
-               "type": {\r
-                       "required": true,\r
-                       "type": "string"\r
-               },\r
-               "description": {\r
-                       "required": false,\r
-                       "type": "string"\r
-               },\r
-               "required": {\r
-                       "required": false,\r
-                       "type": "boolean"\r
-               },\r
-               "default": {\r
-                       "required": false,\r
-                       "type": "string"\r
-               },\r
-               "entry_schema": {\r
-                       "required": false,\r
-                       "type": "string"\r
-               }\r
-       },\r
-       "derived_from": "tosca.datatypes.Root"\r
+{
+       "version": "1.0.0",
+       "description": "This is Entry point Input Data Type, which is dynamic datatype, The parameter names will be populated during the Design time for each inputs",
+       "properties": {
+               "type": {
+                       "required": true,
+                       "type": "string"
+               },
+               "description": {
+                       "required": false,
+                       "type": "string"
+               },
+               "required": {
+                       "required": false,
+                       "type": "boolean"
+               },
+               "default": {
+                       "required": false,
+                       "type": "string"
+               },
+               "entry_schema": {
+                       "required": false,
+                       "type": "string"
+               }
+       },
+       "derived_from": "tosca.datatypes.Root"
 }
\ No newline at end of file
@@ -1,46 +1,46 @@
-{\r
-       "version": "1.0.0",\r
-       "description": "This is Resource Assignment Data Type",\r
-       "properties": {\r
-               "property": {\r
-                       "required": true,\r
-                       "type": "datatype-property"\r
-               },\r
-               "input-param": {\r
-                       "required": true,\r
-                       "type": "boolean"\r
-               },\r
-               "dictionary-name": {\r
-                       "required": false,\r
-                       "type": "string"\r
-               },\r
-               "dictionary-source": {\r
-                       "required": false,\r
-                       "type": "string"\r
-               },\r
-               "dependencies": {\r
-                       "required": true,\r
-                       "type": "list",\r
-                       "entry_schema": {\r
-                               "type": "string"\r
-                       }\r
-               },\r
-               "status": {\r
-                       "required": false,\r
-                       "type": "string"\r
-               },\r
-               "message": {\r
-                       "required": false,\r
-                       "type": "string"\r
-               },\r
-               "updated-date": {\r
-                       "required": false,\r
-                       "type": "string"\r
-               },\r
-               "updated-by": {\r
-                       "required": false,\r
-                       "type": "string"\r
-               }\r
-       },\r
-       "derived_from": "tosca.datatypes.Root"\r
+{
+       "version": "1.0.0",
+       "description": "This is Resource Assignment Data Type",
+       "properties": {
+               "property": {
+                       "required": true,
+                       "type": "datatype-property"
+               },
+               "input-param": {
+                       "required": true,
+                       "type": "boolean"
+               },
+               "dictionary-name": {
+                       "required": false,
+                       "type": "string"
+               },
+               "dictionary-source": {
+                       "required": false,
+                       "type": "string"
+               },
+               "dependencies": {
+                       "required": true,
+                       "type": "list",
+                       "entry_schema": {
+                               "type": "string"
+                       }
+               },
+               "status": {
+                       "required": false,
+                       "type": "string"
+               },
+               "message": {
+                       "required": false,
+                       "type": "string"
+               },
+               "updated-date": {
+                       "required": false,
+                       "type": "string"
+               },
+               "updated-by": {
+                       "required": false,
+                       "type": "string"
+               }
+       },
+       "derived_from": "tosca.datatypes.Root"
 }
\ No newline at end of file
@@ -1,11 +1,11 @@
-{\r
-       "version": "1.0.0",\r
-       "description": "This is dt-plicense-key Data Type",\r
-       "properties": {\r
-               "license-key": {\r
-                       "required": true,\r
-                       "type": "string"\r
-               }\r
-       },\r
-       "derived_from": "tosca.datatypes.Root"\r
+{
+       "version": "1.0.0",
+       "description": "This is dt-plicense-key Data Type",
+       "properties": {
+               "license-key": {
+                       "required": true,
+                       "type": "string"
+               }
+       },
+       "derived_from": "tosca.datatypes.Root"
 }
\ No newline at end of file
@@ -1,15 +1,15 @@
-{\r
-       "version": "1.0.0",\r
-       "description": "This is dt-v4-aggregate Data Type",\r
-       "properties": {\r
-               "ipv4-address": {\r
-                       "required": true,\r
-                       "type": "string"\r
-               },\r
-               "ipv4-plen": {\r
-                       "required": false,\r
-                       "type": "integer"\r
-               }\r
-       },\r
-       "derived_from": "tosca.datatypes.Root"\r
+{
+       "version": "1.0.0",
+       "description": "This is dt-v4-aggregate Data Type",
+       "properties": {
+               "ipv4-address": {
+                       "required": true,
+                       "type": "string"
+               },
+               "ipv4-plen": {
+                       "required": false,
+                       "type": "integer"
+               }
+       },
+       "derived_from": "tosca.datatypes.Root"
 }
\ No newline at end of file
@@ -1,31 +1,31 @@
-{\r
-  "version": "1.0.0",\r
-  "description": "Credential",\r
-  "properties": {\r
-    "protocol": {\r
-      "required": false,\r
-      "type": "string"\r
-    },\r
-    "token_type": {\r
-      "required": true,\r
-      "type": "string",\r
-      "default" : "password"\r
-    },\r
-    "token": {\r
-      "required": false,\r
-      "type": "string"\r
-    },\r
-    "keys": {\r
-      "required": false,\r
-      "type": "list",\r
-      "entry_schema": {\r
-        "type": "string"\r
-      }\r
-    },\r
-    "user": {\r
-      "required": false,\r
-      "type": "string"\r
-    }\r
-  },\r
-  "derived_from": "tosca.datatypes.Root"\r
+{
+  "version": "1.0.0",
+  "description": "Credential",
+  "properties": {
+    "protocol": {
+      "required": false,
+      "type": "string"
+    },
+    "token_type": {
+      "required": true,
+      "type": "string",
+      "default" : "password"
+    },
+    "token": {
+      "required": false,
+      "type": "string"
+    },
+    "keys": {
+      "required": false,
+      "type": "list",
+      "entry_schema": {
+        "type": "string"
+      }
+    },
+    "user": {
+      "required": false,
+      "type": "string"
+    }
+  },
+  "derived_from": "tosca.datatypes.Root"
 }
\ No newline at end of file
@@ -1,37 +1,37 @@
-{\r
-       "description": "This is Configuration Velocity Template",\r
-       "version": "1.0.0",\r
-       "properties": {\r
-               "action-names": {\r
-                       "required": true,\r
-                       "type": "list",\r
-                       "entry_schema": {\r
-                               "type": "string"\r
-                       }\r
-               }\r
-       },\r
-       "capabilities": {\r
-               "content": {\r
-                       "type": "tosca.capabilities.Content",\r
-                       "properties": {\r
-                               "content": {\r
-                                       "required": true,\r
-                                       "type": "string"\r
-                               }\r
-                       }\r
-               },\r
-               "mapping": {\r
-                       "type": "tosca.capabilities.Mapping",\r
-                       "properties": {\r
-                               "mapping": {\r
-                                       "required": false,\r
-                                       "type": "list",\r
-                                       "entry_schema": {\r
-                                               "type": "datatype-resource-assignment"\r
-                                       }\r
-                               }\r
-                       }\r
-               }\r
-       },\r
-       "derived_from": "tosca.nodes.Artifact"\r
+{
+       "description": "This is Configuration Velocity Template",
+       "version": "1.0.0",
+       "properties": {
+               "action-names": {
+                       "required": true,
+                       "type": "list",
+                       "entry_schema": {
+                               "type": "string"
+                       }
+               }
+       },
+       "capabilities": {
+               "content": {
+                       "type": "tosca.capabilities.Content",
+                       "properties": {
+                               "content": {
+                                       "required": true,
+                                       "type": "string"
+                               }
+                       }
+               },
+               "mapping": {
+                       "type": "tosca.capabilities.Mapping",
+                       "properties": {
+                               "mapping": {
+                                       "required": false,
+                                       "type": "list",
+                                       "entry_schema": {
+                                               "type": "datatype-resource-assignment"
+                                       }
+                               }
+                       }
+               }
+       },
+       "derived_from": "tosca.nodes.Artifact"
 }
\ No newline at end of file
@@ -1,72 +1,72 @@
-{\r
-       "description": "This is Generate Configuration Component API",\r
-       "version": "1.0.0",\r
-       "capabilities": {\r
-               "component-node": {\r
-                       "type": "tosca.capabilities.Node"\r
-               }\r
-       },\r
-       "interfaces": {\r
-               "org-onap-ccsdk-config-generator-service-ConfigGeneratorNode": {\r
-                       "operations": {\r
-                               "process": {\r
-                                       "inputs": {\r
-                                               "template-data": {\r
-                                                       "description": "Conditional : JSON string which is used to mash with template. Either template-data or ( resource-id and resource-type ) should be present",\r
-                                                       "required": false,\r
-                                                       "type": "string"\r
-                                               },\r
-                                               "template-content": {\r
-                                                       "description": "Conditional : Dynamic Template used to generate Configuration.",\r
-                                                       "required": false,\r
-                                                       "type": "string"\r
-                                               },\r
-                                               "resource-type": {\r
-                                                       "description": "Conditional : resource-type used to pull the data content from the data base. Either template-data or ( resource-id and resource-type ) should be present",\r
-                                                       "required": false,\r
-                                                       "type": "string"\r
-                                               },\r
-                                               "request-id": {\r
-                                                       "description": "Request Id used to store the generated configuration, in the database along with the template-name",\r
-                                                       "required": true,\r
-                                                       "type": "string"\r
-                                               },\r
-                                               "resource-id": {\r
-                                                       "description": "Conditional : Id used to pull the data content from the data base. Either template-data or ( resource-id and resource-type ) should be present",\r
-                                                       "required": false,\r
-                                                       "type": "string"\r
-                                               },\r
-                                               "action-name": {\r
-                                                       "description": "Conditional : Action Name to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",\r
-                                                       "required": false,\r
-                                                       "type": "string"\r
-                                               },\r
-                                               "template-name": {\r
-                                                       "description": "Conditional : Name of the Artifact Node Template, to get the template Content. If template-content is present, then content wont be reterived from the Artifact Node Template.",\r
-                                                       "required": true,\r
-                                                       "type": "string"\r
-                                               }\r
-                                       },\r
-                                       "outputs": {\r
-                                               "generated-config": {\r
-                                                       "description": "Generated Configuration for the Template adn Resource Data",\r
-                                                       "required": true,\r
-                                                       "type": "string"\r
-                                               },\r
-                                               "mask-info": {\r
-                                                       "description": "If template contains mask encription keys, then this mask-info field will be generated, This JSON Content alligns to the bean org.onap.ccsdk.apps.controllerblueprints.core.data.custom.MaskInfo ",\r
-                                                       "required": false,\r
-                                                       "type": "string"\r
-                                               },\r
-                                               "status": {\r
-                                                       "description": "Status of the Component Execution ( success or failure )",\r
-                                                       "required": true,\r
-                                                       "type": "string"\r
-                                               }\r
-                                       }\r
-                               }\r
-                       }\r
-               }\r
-       },\r
-       "derived_from": "tosca.nodes.Component"\r
+{
+       "description": "This is Generate Configuration Component API",
+       "version": "1.0.0",
+       "capabilities": {
+               "component-node": {
+                       "type": "tosca.capabilities.Node"
+               }
+       },
+       "interfaces": {
+               "org-onap-ccsdk-config-generator-service-ConfigGeneratorNode": {
+                       "operations": {
+                               "process": {
+                                       "inputs": {
+                                               "template-data": {
+                                                       "description": "Conditional : JSON string which is used to mash with template. Either template-data or ( resource-id and resource-type ) should be present",
+                                                       "required": false,
+                                                       "type": "string"
+                                               },
+                                               "template-content": {
+                                                       "description": "Conditional : Dynamic Template used to generate Configuration.",
+                                                       "required": false,
+                                                       "type": "string"
+                                               },
+                                               "resource-type": {
+                                                       "description": "Conditional : resource-type used to pull the data content from the data base. Either template-data or ( resource-id and resource-type ) should be present",
+                                                       "required": false,
+                                                       "type": "string"
+                                               },
+                                               "request-id": {
+                                                       "description": "Request Id used to store the generated configuration, in the database along with the template-name",
+                                                       "required": true,
+                                                       "type": "string"
+                                               },
+                                               "resource-id": {
+                                                       "description": "Conditional : Id used to pull the data content from the data base. Either template-data or ( resource-id and resource-type ) should be present",
+                                                       "required": false,
+                                                       "type": "string"
+                                               },
+                                               "action-name": {
+                                                       "description": "Conditional : Action Name to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",
+                                                       "required": false,
+                                                       "type": "string"
+                                               },
+                                               "template-name": {
+                                                       "description": "Conditional : Name of the Artifact Node Template, to get the template Content. If template-content is present, then content wont be reterived from the Artifact Node Template.",
+                                                       "required": true,
+                                                       "type": "string"
+                                               }
+                                       },
+                                       "outputs": {
+                                               "generated-config": {
+                                                       "description": "Generated Configuration for the Template adn Resource Data",
+                                                       "required": true,
+                                                       "type": "string"
+                                               },
+                                               "mask-info": {
+                                                       "description": "If template contains mask encription keys, then this mask-info field will be generated, This JSON Content alligns to the bean org.onap.ccsdk.apps.controllerblueprints.core.data.custom.MaskInfo ",
+                                                       "required": false,
+                                                       "type": "string"
+                                               },
+                                               "status": {
+                                                       "description": "Status of the Component Execution ( success or failure )",
+                                                       "required": true,
+                                                       "type": "string"
+                                               }
+                                       }
+                               }
+                       }
+               }
+       },
+       "derived_from": "tosca.nodes.Component"
 }
\ No newline at end of file
@@ -1,79 +1,79 @@
-{\r
-  "description": "This is Netconf Transaction Configuration Component API",\r
-  "version": "1.0.0",\r
-  "capabilities": {\r
-    "component-node": {\r
-      "type": "tosca.capabilities.Node"\r
-    }\r
-  },\r
-  "requirements": {\r
-    "netconf-connection": {\r
-      "capability": "netconf",\r
-      "node": "vnf-netconf-device",\r
-      "relationship": "tosca.relationships.ConnectsTo"\r
-    }\r
-  },\r
-  "interfaces": {\r
-    "org-onap-ccsdk-netconf-adaptor-service-NetconfExecutorNode": {\r
-      "operations": {\r
-        "process": {\r
-          "inputs": {\r
-            "request-id": {\r
-              "description": "Request Id used to store the generated configuration, in the database along with the template-name",\r
-              "required": true,\r
-              "type": "string"\r
-            },\r
-            "service-template-name": {\r
-              "description": "Service Template Name",\r
-              "required": true,\r
-              "type": "string"\r
-            },\r
-            "service-template-version": {\r
-              "description": "Service Template Version",\r
-              "required": true,\r
-              "type": "string"\r
-            },\r
-            "action-name": {\r
-              "description": "Action Name to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",\r
-              "required": false,\r
-              "type": "string"\r
-            },\r
-            "resource-type": {\r
-              "description": "Resource Type to get from Database, Either (message & mask-info ) or( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",\r
-              "required": false,\r
-              "type": "string"\r
-            },\r
-            "resource-id": {\r
-              "description": "Resource Id to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",\r
-              "required": false,\r
-              "type": "string"\r
-            },\r
-            "reservation-id": {\r
-                               "description": "Reservation Id used to send to NPM",\r
-                               "required": false,\r
-                               "type": "string"\r
-                       },\r
-            "execution-script": {\r
-              "description": "Python Script to Execute for this Component action, It should refer any one of Prython Artifact Definition for this Node Template.",\r
-              "required": true,\r
-              "type": "string"\r
-            }\r
-          },\r
-          "outputs": {\r
-            "response-data": {\r
-              "description": "Execution Response Data in JSON format.",\r
-              "required": false,\r
-              "type": "string"\r
-            },\r
-            "status": {\r
-              "description": "Status of the Component Execution ( success or failure )",\r
-              "required": true,\r
-              "type": "string"\r
-            }\r
-          }\r
-        }\r
-      }\r
-    }\r
-  },\r
-  "derived_from": "tosca.nodes.Component"\r
+{
+  "description": "This is Netconf Transaction Configuration Component API",
+  "version": "1.0.0",
+  "capabilities": {
+    "component-node": {
+      "type": "tosca.capabilities.Node"
+    }
+  },
+  "requirements": {
+    "netconf-connection": {
+      "capability": "netconf",
+      "node": "vnf-netconf-device",
+      "relationship": "tosca.relationships.ConnectsTo"
+    }
+  },
+  "interfaces": {
+    "org-onap-ccsdk-netconf-adaptor-service-NetconfExecutorNode": {
+      "operations": {
+        "process": {
+          "inputs": {
+            "request-id": {
+              "description": "Request Id used to store the generated configuration, in the database along with the template-name",
+              "required": true,
+              "type": "string"
+            },
+            "service-template-name": {
+              "description": "Service Template Name",
+              "required": true,
+              "type": "string"
+            },
+            "service-template-version": {
+              "description": "Service Template Version",
+              "required": true,
+              "type": "string"
+            },
+            "action-name": {
+              "description": "Action Name to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",
+              "required": false,
+              "type": "string"
+            },
+            "resource-type": {
+              "description": "Resource Type to get from Database, Either (message & mask-info ) or( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",
+              "required": false,
+              "type": "string"
+            },
+            "resource-id": {
+              "description": "Resource Id to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",
+              "required": false,
+              "type": "string"
+            },
+            "reservation-id": {
+                               "description": "Reservation Id used to send to NPM",
+                               "required": false,
+                               "type": "string"
+                       },
+            "execution-script": {
+              "description": "Python Script to Execute for this Component action, It should refer any one of Prython Artifact Definition for this Node Template.",
+              "required": true,
+              "type": "string"
+            }
+          },
+          "outputs": {
+            "response-data": {
+              "description": "Execution Response Data in JSON format.",
+              "required": false,
+              "type": "string"
+            },
+            "status": {
+              "description": "Status of the Component Execution ( success or failure )",
+              "required": true,
+              "type": "string"
+            }
+          }
+        }
+      }
+    }
+  },
+  "derived_from": "tosca.nodes.Component"
 }
\ No newline at end of file
@@ -1,68 +1,68 @@
-{\r
-  "description": "This is Resource Assignment Component API",\r
-  "version": "1.0.0",\r
-  "capabilities": {\r
-    "component-node": {\r
-      "type": "tosca.capabilities.Node"\r
-    }\r
-  },\r
-  "interfaces": {\r
-    "ResourceAssignmentComponent": {\r
-      "operations": {\r
-        "process": {\r
-          "inputs": {\r
-            "service-template-name": {\r
-              "description": "Service Template Name.",\r
-              "required": true,\r
-              "type": "string"\r
-            },\r
-            "service-template-version": {\r
-              "description": "Service Template Version.",\r
-              "required": true,\r
-              "type": "string"\r
-            },\r
-            "resource-type": {\r
-              "description": "Request type.",\r
-              "required": true,\r
-              "type": "string"\r
-            },\r
-            "template-names": {\r
-              "description": "Name of the artifact Node Templates, to get the template Content.",\r
-              "required": true,\r
-              "type": "list",\r
-              "entry_schema": {\r
-                "type": "string"\r
-              }\r
-            },\r
-            "request-id": {\r
-              "description": "Request Id, Unique Id for the request.",\r
-              "required": true,\r
-              "type": "string"\r
-            },\r
-            "resource-id": {\r
-              "description": "Resource Id.",\r
-              "required": true,\r
-              "type": "string"\r
-            },\r
-            "action-name": {\r
-              "description": "Action Name of the process",\r
-              "required": true,\r
-              "type": "string"\r
-            }\r
-          },\r
-          "outputs": {\r
-            "resource-assignment-params": {\r
-              "required": true,\r
-              "type": "string"\r
-            },\r
-            "status": {\r
-              "required": true,\r
-              "type": "string"\r
-            }\r
-          }\r
-        }\r
-      }\r
-    }\r
-  },\r
-  "derived_from": "tosca.nodes.Component"\r
+{
+  "description": "This is Resource Assignment Component API",
+  "version": "1.0.0",
+  "capabilities": {
+    "component-node": {
+      "type": "tosca.capabilities.Node"
+    }
+  },
+  "interfaces": {
+    "ResourceAssignmentComponent": {
+      "operations": {
+        "process": {
+          "inputs": {
+            "service-template-name": {
+              "description": "Service Template Name.",
+              "required": true,
+              "type": "string"
+            },
+            "service-template-version": {
+              "description": "Service Template Version.",
+              "required": true,
+              "type": "string"
+            },
+            "resource-type": {
+              "description": "Request type.",
+              "required": true,
+              "type": "string"
+            },
+            "template-names": {
+              "description": "Name of the artifact Node Templates, to get the template Content.",
+              "required": true,
+              "type": "list",
+              "entry_schema": {
+                "type": "string"
+              }
+            },
+            "request-id": {
+              "description": "Request Id, Unique Id for the request.",
+              "required": true,
+              "type": "string"
+            },
+            "resource-id": {
+              "description": "Resource Id.",
+              "required": true,
+              "type": "string"
+            },
+            "action-name": {
+              "description": "Action Name of the process",
+              "required": true,
+              "type": "string"
+            }
+          },
+          "outputs": {
+            "resource-assignment-params": {
+              "required": true,
+              "type": "string"
+            },
+            "status": {
+              "required": true,
+              "type": "string"
+            }
+          }
+        }
+      }
+    }
+  },
+  "derived_from": "tosca.nodes.Component"
 }
\ No newline at end of file
@@ -1,51 +1,51 @@
-{\r
-       "description": "This is Activate DG for Config Generator Directed Graph",\r
-       "version": "1.0.0",\r
-       "properties": {\r
-               "mode": {\r
-                       "required": false,\r
-                       "type": "string",\r
-                       "default": "sync"\r
-               },\r
-               "version": {\r
-                       "required": false,\r
-                       "type": "string",\r
-                       "default": "LATEST"\r
-               },\r
-               "is-start-flow": {\r
-                       "required": false,\r
-                       "type": "boolean",\r
-                       "default": false\r
-               }\r
-       },\r
-       "capabilities": {\r
-               "dg-node": {\r
-                       "type": "tosca.capabilities.Node"\r
-               }\r
-       },\r
-       "requirements": {\r
-               "component-dependency": {\r
-                       "capability": "component-node",\r
-                       "node": "component-config-generator",\r
-                       "relationship": "tosca.relationships.DependsOn"\r
-               }\r
-       },\r
-       "interfaces": {\r
-               "CONFIG": {\r
-                       "operations": {\r
-                               "GenerateConfiguration": {\r
-                                       "inputs": {\r
-                                               "params": {\r
-                                                       "required": false,\r
-                                                       "type": "list",\r
-                                                       "entry_schema": {\r
-                                                               "type": "datatype-property"\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               }\r
-                       }\r
-               }\r
-       },\r
-       "derived_from": "tosca.nodes.DG"\r
+{
+       "description": "This is Activate DG for Config Generator Directed Graph",
+       "version": "1.0.0",
+       "properties": {
+               "mode": {
+                       "required": false,
+                       "type": "string",
+                       "default": "sync"
+               },
+               "version": {
+                       "required": false,
+                       "type": "string",
+                       "default": "LATEST"
+               },
+               "is-start-flow": {
+                       "required": false,
+                       "type": "boolean",
+                       "default": false
+               }
+       },
+       "capabilities": {
+               "dg-node": {
+                       "type": "tosca.capabilities.Node"
+               }
+       },
+       "requirements": {
+               "component-dependency": {
+                       "capability": "component-node",
+                       "node": "component-config-generator",
+                       "relationship": "tosca.relationships.DependsOn"
+               }
+       },
+       "interfaces": {
+               "CONFIG": {
+                       "operations": {
+                               "GenerateConfiguration": {
+                                       "inputs": {
+                                               "params": {
+                                                       "required": false,
+                                                       "type": "list",
+                                                       "entry_schema": {
+                                                               "type": "datatype-property"
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+               }
+       },
+       "derived_from": "tosca.nodes.DG"
 }
\ No newline at end of file
@@ -1,56 +1,56 @@
-{\r
-       "description": "This is Resource Assign and Activate Netconf Directed Graph",\r
-       "version": "1.0.0",\r
-       "properties": {\r
-               "mode": {\r
-                       "required": false,\r
-                       "type": "string",\r
-                       "default": "sync"\r
-               },\r
-               "version": {\r
-                       "required": false,\r
-                       "type": "string",\r
-                       "default": "LATEST"\r
-               },\r
-               "is-start-flow": {\r
-                       "required": false,\r
-                       "type": "boolean",\r
-                       "default": false\r
-               }\r
-       },\r
-       "capabilities": {\r
-               "dg-node": {\r
-                       "type": "tosca.capabilities.Node"\r
-               }\r
-       },\r
-       "requirements": {\r
-               "ra-component": {\r
-                       "capability": "component-node",\r
-                       "node": "component-resource-assignment",\r
-                       "relationship": "tosca.relationships.DependsOn"\r
-               },\r
-               "netconf-component": {\r
-                       "capability": "component-node",\r
-                       "node": "component-netconf-executor",\r
-                       "relationship": "tosca.relationships.DependsOn"\r
-               }\r
-       },\r
-       "interfaces": {\r
-               "CONFIG": {\r
-                       "operations": {\r
-                               "ResourceAssignAndActivate": {\r
-                                       "inputs": {\r
-                                               "params": {\r
-                                                       "required": false,\r
-                                                       "type": "list",\r
-                                                       "entry_schema": {\r
-                                                               "type": "datatype-property"\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               }\r
-                       }\r
-               }\r
-       },\r
-       "derived_from": "tosca.nodes.DG"\r
+{
+       "description": "This is Resource Assign and Activate Netconf Directed Graph",
+       "version": "1.0.0",
+       "properties": {
+               "mode": {
+                       "required": false,
+                       "type": "string",
+                       "default": "sync"
+               },
+               "version": {
+                       "required": false,
+                       "type": "string",
+                       "default": "LATEST"
+               },
+               "is-start-flow": {
+                       "required": false,
+                       "type": "boolean",
+                       "default": false
+               }
+       },
+       "capabilities": {
+               "dg-node": {
+                       "type": "tosca.capabilities.Node"
+               }
+       },
+       "requirements": {
+               "ra-component": {
+                       "capability": "component-node",
+                       "node": "component-resource-assignment",
+                       "relationship": "tosca.relationships.DependsOn"
+               },
+               "netconf-component": {
+                       "capability": "component-node",
+                       "node": "component-netconf-executor",
+                       "relationship": "tosca.relationships.DependsOn"
+               }
+       },
+       "interfaces": {
+               "CONFIG": {
+                       "operations": {
+                               "ResourceAssignAndActivate": {
+                                       "inputs": {
+                                               "params": {
+                                                       "required": false,
+                                                       "type": "list",
+                                                       "entry_schema": {
+                                                               "type": "datatype-property"
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+               }
+       },
+       "derived_from": "tosca.nodes.DG"
 }
\ No newline at end of file
@@ -1,51 +1,51 @@
-{\r
-       "description": "This is Resource Assignment Directed Graph",\r
-       "version": "1.0.0",\r
-       "properties": {\r
-               "mode": {\r
-                       "required": false,\r
-                       "type": "string",\r
-                       "default": "sync"\r
-               },\r
-               "version": {\r
-                       "required": false,\r
-                       "type": "string",\r
-                       "default": "LATEST"\r
-               },\r
-               "is-start-flow": {\r
-                       "required": false,\r
-                       "type": "boolean",\r
-                       "default": false\r
-               }\r
-       },\r
-       "capabilities": {\r
-               "dg-node": {\r
-                       "type": "tosca.capabilities.Node"\r
-               }\r
-       },\r
-       "requirements": {\r
-               "component-dependency": {\r
-                       "capability": "component-node",\r
-                       "node": "component-resource-assignment",\r
-                       "relationship": "tosca.relationships.DependsOn"\r
-               }\r
-       },\r
-       "interfaces": {\r
-               "CONFIG": {\r
-                       "operations": {\r
-                               "ResourceAssignment": {\r
-                                       "inputs": {\r
-                                               "params": {\r
-                                                       "required": false,\r
-                                                       "type": "list",\r
-                                                       "entry_schema": {\r
-                                                               "type": "datatype-property"\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               }\r
-                       }\r
-               }\r
-       },\r
-       "derived_from": "tosca.nodes.DG"\r
+{
+       "description": "This is Resource Assignment Directed Graph",
+       "version": "1.0.0",
+       "properties": {
+               "mode": {
+                       "required": false,
+                       "type": "string",
+                       "default": "sync"
+               },
+               "version": {
+                       "required": false,
+                       "type": "string",
+                       "default": "LATEST"
+               },
+               "is-start-flow": {
+                       "required": false,
+                       "type": "boolean",
+                       "default": false
+               }
+       },
+       "capabilities": {
+               "dg-node": {
+                       "type": "tosca.capabilities.Node"
+               }
+       },
+       "requirements": {
+               "component-dependency": {
+                       "capability": "component-node",
+                       "node": "component-resource-assignment",
+                       "relationship": "tosca.relationships.DependsOn"
+               }
+       },
+       "interfaces": {
+               "CONFIG": {
+                       "operations": {
+                               "ResourceAssignment": {
+                                       "inputs": {
+                                               "params": {
+                                                       "required": false,
+                                                       "type": "list",
+                                                       "entry_schema": {
+                                                               "type": "datatype-property"
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+               }
+       },
+       "derived_from": "tosca.nodes.DG"
 }
\ No newline at end of file
@@ -1,5 +1,5 @@
-{\r
-  "description": "This is Deprecated Artifact Node Type.",\r
-  "version": "1.0.0",\r
-  "derived_from": "tosca.nodes.Root"\r
+{
+  "description": "This is Deprecated Artifact Node Type.",
+  "version": "1.0.0",
+  "derived_from": "tosca.nodes.Root"
 }
\ No newline at end of file
@@ -1,5 +1,5 @@
-{\r
-  "description": "This is default Component Node",\r
-  "version": "1.0.0",\r
-  "derived_from": "tosca.nodes.Root"\r
+{
+  "description": "This is default Component Node",
+  "version": "1.0.0",
+  "derived_from": "tosca.nodes.Root"
 }
\ No newline at end of file
@@ -1,5 +1,5 @@
-{\r
-  "description": "This is Directed Graph Node Type",\r
-  "version": "1.0.0",\r
-  "derived_from": "tosca.nodes.Root"\r
+{
+  "description": "This is Directed Graph Node Type",
+  "version": "1.0.0",
+  "derived_from": "tosca.nodes.Root"
 }
\ No newline at end of file
@@ -1,5 +1,5 @@
-{\r
-  "description": "This is VNF Node Type",\r
-  "version": "1.0.0",\r
-  "derived_from": "tosca.nodes.Root"\r
+{
+  "description": "This is VNF Node Type",
+  "version": "1.0.0",
+  "derived_from": "tosca.nodes.Root"
 }
\ No newline at end of file
@@ -1,5 +1,5 @@
-{\r
-  "description": "This is Python Component",\r
-  "version": "1.0.0",\r
-  "derived_from": "tosca.nodes.Root"\r
+{
+  "description": "This is Python Component",
+  "version": "1.0.0",
+  "derived_from": "tosca.nodes.Root"
 }
\ No newline at end of file
@@ -1,42 +1,42 @@
-{\r
-       "description": "This is VNF Device with Netconf  Capability",\r
-       "version": "1.0.0",\r
-       "capabilities": {\r
-               "netconf": {\r
-                       "type": "tosca.capability.Netconf",\r
-                       "properties": {\r
-                               "login-key": {\r
-                                       "required": true,\r
-                                       "type": "string",\r
-                                       "default": "sdnc"\r
-                               },\r
-                               "login-account": {\r
-                                       "required": true,\r
-                                       "type": "string",\r
-                                       "default": "sdnc-tacacs"\r
-                               },\r
-                               "source": {\r
-                                       "required": true,\r
-                                       "type": "string",\r
-                                       "default": "npm"\r
-                               },\r
-                               "target-ip-address": {\r
-                                       "required": true,\r
-                                       "type": "string"\r
-                               },\r
-                               "port-number": {\r
-                                       "required": true,\r
-                                       "type": "integer",\r
-                                       "default": 830\r
-                               },\r
-                               "connection-time-out": {\r
-                                       "required": false,\r
-                                       "type": "integer",\r
-                                       "default": 30\r
-                               }\r
-                       }\r
-               }\r
-       },\r
-       "derived_from": "tosca.nodes.Vnf"\r
-       \r
-}\r
+{
+       "description": "This is VNF Device with Netconf  Capability",
+       "version": "1.0.0",
+       "capabilities": {
+               "netconf": {
+                       "type": "tosca.capability.Netconf",
+                       "properties": {
+                               "login-key": {
+                                       "required": true,
+                                       "type": "string",
+                                       "default": "sdnc"
+                               },
+                               "login-account": {
+                                       "required": true,
+                                       "type": "string",
+                                       "default": "sdnc-tacacs"
+                               },
+                               "source": {
+                                       "required": true,
+                                       "type": "string",
+                                       "default": "npm"
+                               },
+                               "target-ip-address": {
+                                       "required": true,
+                                       "type": "string"
+                               },
+                               "port-number": {
+                                       "required": true,
+                                       "type": "integer",
+                                       "default": 830
+                               },
+                               "connection-time-out": {
+                                       "required": false,
+                                       "type": "integer",
+                                       "default": 30
+                               }
+                       }
+               }
+       },
+       "derived_from": "tosca.nodes.Vnf"
+       
+}
similarity index 84%
rename from components/core/pom.xml
rename to ms/controllerblueprints/modules/blueprint-core/pom.xml
index 03d46f4..9461b2c 100644 (file)
   -->
 
 <project
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+        xmlns="http://maven.apache.org/POM/4.0.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.onap.ccsdk.apps.components</groupId>
-        <artifactId>parent</artifactId>
+        <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
+        <artifactId>modules</artifactId>
         <version>0.4.1-SNAPSHOT</version>
-        <relativePath>../parent</relativePath>
     </parent>
-    <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
-    <artifactId>core</artifactId>
+    <artifactId>blueprint-core</artifactId>
     <name>Controller Blueprints Core</name>
 
     <dependencies>
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- * Modifications Copyright © 2018 IBM.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core\r
-\r
-/**\r
- * BluePrintConstants\r
- *\r
- * @author Brinda Santh\r
- */\r
-object BluePrintConstants {\r
-\r
-    const val RESPONSE_HEADER_TRANSACTION_ID: String = "X-ONAP-RequestID"\r
-    const val RESPONSE_HEADER_MINOR_VERSION: String = "X-MinorVersion"\r
-    const val RESPONSE_HEADER_PATCH_VERSION: String = "X-PatchVersion"\r
-    const val RESPONSE_HEADER_LATEST_VERSION: String = "X-LatestVersion"\r
-\r
-    const val STATUS_SUCCESS: String = "success"\r
-    const val STATUS_PROCESSING: String = "processing"\r
-    const val STATUS_FAILURE: String = "failure"\r
-\r
-    const val TYPE_DEFAULT: String = "default"\r
-\r
-    const val DATA_TYPE_STRING: String = "string"\r
-    const val DATA_TYPE_INTEGER: String = "integer"\r
-    const val DATA_TYPE_FLOAT: String = "float"\r
-    const val DATA_TYPE_DOUBLE: String = "double"\r
-    const val DATA_TYPE_BOOLEAN: String = "boolean"\r
-    const val DATA_TYPE_TIMESTAMP: String = "timestamp"\r
-    const val DATA_TYPE_NULL: String = "null"\r
-    const val DATA_TYPE_LIST: String = "list"\r
-    const val DATA_TYPE_MAP: String = "map"\r
-\r
-    const val USER_SYSTEM: String = "System"\r
-\r
-    const val PATH_DIVIDER: String = "/"\r
-    const val PATH_SERVICE_TEMPLATE: String = "service_template"\r
-    const val PATH_TOPOLOGY_TEMPLATE: String = "topology_template"\r
-    const val PATH_METADATA: String = "metadata"\r
-    const val PATH_NODE_TYPES: String = "node_types"\r
-    const val PATH_POLICY_TYPES: String = "policy_types"\r
-    const val PATH_RELATIONSHIP_TYPES: String = "relationship_types"\r
-    const val PATH_ARTIFACT_TYPES: String = "artifact_types"\r
-    const val PATH_DATA_TYPES: String = "data_types"\r
-    const val PATH_INPUTS: String = "inputs"\r
-    const val PATH_NODE_WORKFLOWS: String = "workflows"\r
-    const val PATH_NODE_TEMPLATES: String = "node_templates"\r
-    const val PATH_CAPABILITIES: String = "capabilities"\r
-    const val PATH_REQUIREMENTS: String = "requirements"\r
-    const val PATH_INTERFACES: String = "interfaces"\r
-    const val PATH_OPERATIONS: String = "operations"\r
-    const val PATH_OUTPUTS: String = "outputs"\r
-    const val PATH_PROPERTIES: String = "properties"\r
-    const val PATH_ATTRIBUTES: String = "attributes"\r
-    const val PATH_ARTIFACTS: String = "artifacts"\r
-\r
-    const val MODEL_DIR_MODEL_TYPE: String = "definition-type"\r
-\r
-    const val MODEL_DEFINITION_TYPE_NODE_TYPE: String = "node_type"\r
-    const val MODEL_DEFINITION_TYPE_ARTIFACT_TYPE: String = "artifact_type"\r
-    const val MODEL_DEFINITION_TYPE_CAPABILITY_TYPE: String = "capability_type"\r
-    const val MODEL_DEFINITION_TYPE_RELATIONSHIP_TYPE: String = "relationship_type"\r
-    const val MODEL_DEFINITION_TYPE_DATA_TYPE: String = "data_type"\r
-\r
-    const val MODEL_TYPE_DATATYPES_ROOT: String = "tosca.datatypes.Root"\r
-    const val MODEL_TYPE_NODES_ROOT: String = "tosca.nodes.Root"\r
-    const val MODEL_TYPE_GROUPS_ROOT: String = "tosca.groups.Root"\r
-    const val MODEL_TYPE_RELATIONSHIPS_ROOT: String = "tosca.relationships.Root"\r
-    const val MODEL_TYPE_ARTIFACTS_ROOT: String = "tosca.artifacts.Root"\r
-    const val MODEL_TYPE_CAPABILITIES_ROOT: String = "tosca.capabilities.Root"\r
-    const val MODEL_TYPE_INTERFACES_ROOT: String = "tosca.interfaces.Root"\r
-\r
-    const val MODEL_TYPE_RELATIONSHIPS_DEPENDS_ON = "tosca.relationships.DependsOn"\r
-    const val MODEL_TYPE_RELATIONSHIPS_HOSTED_ON = "tosca.relationships.HostedOn"\r
-    const val MODEL_TYPE_RELATIONSHIPS_CONNECTS_TO = "tosca.relationships.ConnectsTo"\r
-    const val MODEL_TYPE_RELATIONSHIPS_ATTACH_TO = "tosca.relationships.AttachesTo"\r
-    const val MODEL_TYPE_RELATIONSHIPS_ROUTES_TO = "tosca.relationships.RoutesTo"\r
-\r
-    const val MODEL_TYPE_NODE_DG = "tosca.nodes.DG"\r
-    const val MODEL_TYPE_NODE_COMPONENT = "tosca.nodes.Component"\r
-    const val MODEL_TYPE_NODE_VNF = "tosca.nodes.Vnf"\r
-    @Deprecated("Artifacts will be attached to Node Template")\r
-    const val MODEL_TYPE_NODE_ARTIFACT = "tosca.nodes.Artifact"\r
-    const val MODEL_TYPE_NODE_RESOURCE_SOURCE = "tosca.nodes.ResourceSource"\r
-\r
-    const val MODEL_TYPE_NODES_COMPONENT_JAVA: String = "tosca.nodes.component.Java"\r
-    const val MODEL_TYPE_NODES_COMPONENT_BUNDLE: String = "tosca.nodes.component.Bundle"\r
-    const val MODEL_TYPE_NODES_COMPONENT_SCRIPT: String = "tosca.nodes.component.Script"\r
-    const val MODEL_TYPE_NODES_COMPONENT_PYTHON: String = "tosca.nodes.component.Python"\r
-    const val MODEL_TYPE_NODES_COMPONENT_JYTHON: String = "tosca.nodes.component.Jython"\r
-    const val MODEL_TYPE_NODES_COMPONENT_KOTLIN: String = "tosca.nodes.component.Kotlin"\r
-    const val MODEL_TYPE_NODES_COMPONENT_JAVA_SCRIPT: String = "tosca.nodes.component.JavaScript"\r
-\r
-    const val MODEL_TYPE_ARTIFACT_TYPE_IMPLEMENTATION = "tosca.artifacts.Implementation"\r
-\r
-    const val MODEL_TYPE_DATA_TYPE_DYNAMIC = "tosca.datatypes.Dynamic"\r
-\r
-    const val MODEL_TYPE_CAPABILITY_TYPE_NODE = "tosca.capabilities.Node"\r
-    const val MODEL_TYPE_CAPABILITY_TYPE_COMPUTE = "tosca.capabilities.Compute"\r
-    const val MODEL_TYPE_CAPABILITY_TYPE_NETWORK = "tosca.capabilities.Network"\r
-    const val MODEL_TYPE_CAPABILITY_TYPE_STORAGE = "tosca.capabilities.Storage"\r
-    const val MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT = "tosca.capabilities.Endpoint"\r
-    const val MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT_PUBLIC = "tosca.capabilities.Endpoint.Public"\r
-    const val MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT_ADMIN = "tosca.capabilities.Endpoint.Admin"\r
-    const val MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT_DATABASE = "tosca.capabilities.Endpoint.Database"\r
-    const val MODEL_TYPE_CAPABILITY_TYPE_ATTACHMENT = "tosca.capabilities.Attachment"\r
-    const val MODEL_TYPE_CAPABILITY_TYPE_OPERATION_SYSTEM = "tosca.capabilities.OperatingSystem"\r
-    const val MODEL_TYPE_CAPABILITY_TYPE_BINDABLE = "tosca.capabilities.network.Bindable"\r
-    // Custom capabilities\r
-    const val MODEL_TYPE_CAPABILITY_TYPE_CONTENT = "tosca.capabilities.Content"\r
-    const val MODEL_TYPE_CAPABILITY_TYPE_MAPPING = "tosca.capabilities.Mapping"\r
-    const val MODEL_TYPE_CAPABILITY_TYPE_NETCONF = "tosca.capabilities.Netconf"\r
-    const val MODEL_TYPE_CAPABILITY_TYPE_SSH = "tosca.capabilities.Ssh"\r
-    const val MODEL_TYPE_CAPABILITY_TYPE_SFTP = "tosca.capabilities.Sftp"\r
-\r
-    const val EXPRESSION_GET_INPUT: String = "get_input"\r
-    const val EXPRESSION_GET_ATTRIBUTE: String = "get_attribute"\r
-    const val EXPRESSION_GET_ARTIFACT: String = "get_artifact"\r
-    const val EXPRESSION_GET_PROPERTY: String = "get_property"\r
-    const val EXPRESSION_GET_OPERATION_OUTPUT: String = "get_operation_output"\r
-    const val EXPRESSION_GET_NODE_OF_TYPE: String = "get_nodes_of_type"\r
-\r
-    const val PROPERTY_BLUEPRINT_PROCESS_ID: String = "blueprint-process-id"\r
-    const val PROPERTY_BLUEPRINT_BASE_PATH: String = "blueprint-basePath"\r
-    const val PROPERTY_BLUEPRINT_RUNTIME: String = "blueprint-runtime"\r
-    const val PROPERTY_BLUEPRINT_INPUTS_DATA: String = "blueprint-inputs-data"\r
-    const val PROPERTY_BLUEPRINT_CONTEXT: String = "blueprint-context"\r
-    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
-    const val TOSCA_TEMPLATES_DIR: String = "Templates"\r
-    const val TOSCA_SCRIPTS_KOTLIN_DIR: String = "$TOSCA_SCRIPTS_DIR/kotlin"\r
-\r
-    const val METADATA_USER_GROUPS = "user-groups"\r
-    const val METADATA_TEMPLATE_NAME = "template_name"\r
-    const val METADATA_TEMPLATE_VERSION = "template_version"\r
-    const val METADATA_TEMPLATE_AUTHOR = "template_author"\r
-    const val METADATA_TEMPLATE_TAGS = "template_tags"\r
-    const val METADATA_WORKFLOW_NAME = "workflow_name"\r
-\r
-    const val PAYLOAD_DATA = "payload-data"\r
-    const val PROPERTY_CURRENT_STEP = "current-step"\r
-    const val PROPERTY_CURRENT_NODE_TEMPLATE = "current-node-template"\r
-    const val PROPERTY_CURRENT_INTERFACE = "current-interface"\r
-    const val PROPERTY_CURRENT_OPERATION = "current-operation"\r
-    const val PROPERTY_CURRENT_IMPLEMENTATION = "current-implementation"\r
-    const val PROPERTY_EXECUTION_REQUEST = "execution-request"\r
-\r
-    const val OPERATION_PROCESS = "process"\r
-    const val OPERATION_PREPARE = "prepare"\r
-\r
-    const val BLUEPRINT_RETRIEVE_TYPE_DB = "db"\r
-    const val BLUEPRINT_RETRIEVE_TYPE_FILE = "file"\r
-    const val BLUEPRINT_RETRIEVE_TYPE_REPO = "repo"\r
-\r
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
+ *
+ * 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
+
+/**
+ * BluePrintConstants
+ *
+ * @author Brinda Santh
+ */
+object BluePrintConstants {
+
+    const val RESPONSE_HEADER_TRANSACTION_ID: String = "X-ONAP-RequestID"
+    const val RESPONSE_HEADER_MINOR_VERSION: String = "X-MinorVersion"
+    const val RESPONSE_HEADER_PATCH_VERSION: String = "X-PatchVersion"
+    const val RESPONSE_HEADER_LATEST_VERSION: String = "X-LatestVersion"
+
+    const val STATUS_SUCCESS: String = "success"
+    const val STATUS_PROCESSING: String = "processing"
+    const val STATUS_FAILURE: String = "failure"
+
+    const val TYPE_DEFAULT: String = "default"
+
+    const val DATA_TYPE_STRING: String = "string"
+    const val DATA_TYPE_INTEGER: String = "integer"
+    const val DATA_TYPE_FLOAT: String = "float"
+    const val DATA_TYPE_DOUBLE: String = "double"
+    const val DATA_TYPE_BOOLEAN: String = "boolean"
+    const val DATA_TYPE_TIMESTAMP: String = "timestamp"
+    const val DATA_TYPE_NULL: String = "null"
+    const val DATA_TYPE_LIST: String = "list"
+    const val DATA_TYPE_MAP: String = "map"
+
+    const val USER_SYSTEM: String = "System"
+
+    const val PATH_DIVIDER: String = "/"
+    const val PATH_SERVICE_TEMPLATE: String = "service_template"
+    const val PATH_TOPOLOGY_TEMPLATE: String = "topology_template"
+    const val PATH_METADATA: String = "metadata"
+    const val PATH_NODE_TYPES: String = "node_types"
+    const val PATH_POLICY_TYPES: String = "policy_types"
+    const val PATH_RELATIONSHIP_TYPES: String = "relationship_types"
+    const val PATH_ARTIFACT_TYPES: String = "artifact_types"
+    const val PATH_DATA_TYPES: String = "data_types"
+    const val PATH_INPUTS: String = "inputs"
+    const val PATH_NODE_WORKFLOWS: String = "workflows"
+    const val PATH_NODE_TEMPLATES: String = "node_templates"
+    const val PATH_CAPABILITIES: String = "capabilities"
+    const val PATH_REQUIREMENTS: String = "requirements"
+    const val PATH_INTERFACES: String = "interfaces"
+    const val PATH_OPERATIONS: String = "operations"
+    const val PATH_OUTPUTS: String = "outputs"
+    const val PATH_PROPERTIES: String = "properties"
+    const val PATH_ATTRIBUTES: String = "attributes"
+    const val PATH_ARTIFACTS: String = "artifacts"
+
+    const val MODEL_DIR_MODEL_TYPE: String = "definition-type"
+
+    const val MODEL_DEFINITION_TYPE_NODE_TYPE: String = "node_type"
+    const val MODEL_DEFINITION_TYPE_ARTIFACT_TYPE: String = "artifact_type"
+    const val MODEL_DEFINITION_TYPE_CAPABILITY_TYPE: String = "capability_type"
+    const val MODEL_DEFINITION_TYPE_RELATIONSHIP_TYPE: String = "relationship_type"
+    const val MODEL_DEFINITION_TYPE_DATA_TYPE: String = "data_type"
+
+    const val MODEL_TYPE_DATATYPES_ROOT: String = "tosca.datatypes.Root"
+    const val MODEL_TYPE_NODES_ROOT: String = "tosca.nodes.Root"
+    const val MODEL_TYPE_GROUPS_ROOT: String = "tosca.groups.Root"
+    const val MODEL_TYPE_RELATIONSHIPS_ROOT: String = "tosca.relationships.Root"
+    const val MODEL_TYPE_ARTIFACTS_ROOT: String = "tosca.artifacts.Root"
+    const val MODEL_TYPE_CAPABILITIES_ROOT: String = "tosca.capabilities.Root"
+    const val MODEL_TYPE_INTERFACES_ROOT: String = "tosca.interfaces.Root"
+
+    const val MODEL_TYPE_RELATIONSHIPS_DEPENDS_ON = "tosca.relationships.DependsOn"
+    const val MODEL_TYPE_RELATIONSHIPS_HOSTED_ON = "tosca.relationships.HostedOn"
+    const val MODEL_TYPE_RELATIONSHIPS_CONNECTS_TO = "tosca.relationships.ConnectsTo"
+    const val MODEL_TYPE_RELATIONSHIPS_ATTACH_TO = "tosca.relationships.AttachesTo"
+    const val MODEL_TYPE_RELATIONSHIPS_ROUTES_TO = "tosca.relationships.RoutesTo"
+
+    const val MODEL_TYPE_NODE_DG = "tosca.nodes.DG"
+    const val MODEL_TYPE_NODE_COMPONENT = "tosca.nodes.Component"
+    const val MODEL_TYPE_NODE_VNF = "tosca.nodes.Vnf"
+    @Deprecated("Artifacts will be attached to Node Template")
+    const val MODEL_TYPE_NODE_ARTIFACT = "tosca.nodes.Artifact"
+    const val MODEL_TYPE_NODE_RESOURCE_SOURCE = "tosca.nodes.ResourceSource"
+
+    const val MODEL_TYPE_NODES_COMPONENT_JAVA: String = "tosca.nodes.component.Java"
+    const val MODEL_TYPE_NODES_COMPONENT_BUNDLE: String = "tosca.nodes.component.Bundle"
+    const val MODEL_TYPE_NODES_COMPONENT_SCRIPT: String = "tosca.nodes.component.Script"
+    const val MODEL_TYPE_NODES_COMPONENT_PYTHON: String = "tosca.nodes.component.Python"
+    const val MODEL_TYPE_NODES_COMPONENT_JYTHON: String = "tosca.nodes.component.Jython"
+    const val MODEL_TYPE_NODES_COMPONENT_KOTLIN: String = "tosca.nodes.component.Kotlin"
+    const val MODEL_TYPE_NODES_COMPONENT_JAVA_SCRIPT: String = "tosca.nodes.component.JavaScript"
+
+    const val MODEL_TYPE_ARTIFACT_TYPE_IMPLEMENTATION = "tosca.artifacts.Implementation"
+
+    const val MODEL_TYPE_DATA_TYPE_DYNAMIC = "tosca.datatypes.Dynamic"
+
+    const val MODEL_TYPE_CAPABILITY_TYPE_NODE = "tosca.capabilities.Node"
+    const val MODEL_TYPE_CAPABILITY_TYPE_COMPUTE = "tosca.capabilities.Compute"
+    const val MODEL_TYPE_CAPABILITY_TYPE_NETWORK = "tosca.capabilities.Network"
+    const val MODEL_TYPE_CAPABILITY_TYPE_STORAGE = "tosca.capabilities.Storage"
+    const val MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT = "tosca.capabilities.Endpoint"
+    const val MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT_PUBLIC = "tosca.capabilities.Endpoint.Public"
+    const val MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT_ADMIN = "tosca.capabilities.Endpoint.Admin"
+    const val MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT_DATABASE = "tosca.capabilities.Endpoint.Database"
+    const val MODEL_TYPE_CAPABILITY_TYPE_ATTACHMENT = "tosca.capabilities.Attachment"
+    const val MODEL_TYPE_CAPABILITY_TYPE_OPERATION_SYSTEM = "tosca.capabilities.OperatingSystem"
+    const val MODEL_TYPE_CAPABILITY_TYPE_BINDABLE = "tosca.capabilities.network.Bindable"
+    // Custom capabilities
+    const val MODEL_TYPE_CAPABILITY_TYPE_CONTENT = "tosca.capabilities.Content"
+    const val MODEL_TYPE_CAPABILITY_TYPE_MAPPING = "tosca.capabilities.Mapping"
+    const val MODEL_TYPE_CAPABILITY_TYPE_NETCONF = "tosca.capabilities.Netconf"
+    const val MODEL_TYPE_CAPABILITY_TYPE_SSH = "tosca.capabilities.Ssh"
+    const val MODEL_TYPE_CAPABILITY_TYPE_SFTP = "tosca.capabilities.Sftp"
+
+    const val EXPRESSION_GET_INPUT: String = "get_input"
+    const val EXPRESSION_GET_ATTRIBUTE: String = "get_attribute"
+    const val EXPRESSION_GET_ARTIFACT: String = "get_artifact"
+    const val EXPRESSION_GET_PROPERTY: String = "get_property"
+    const val EXPRESSION_GET_OPERATION_OUTPUT: String = "get_operation_output"
+    const val EXPRESSION_GET_NODE_OF_TYPE: String = "get_nodes_of_type"
+
+    const val PROPERTY_BLUEPRINT_PROCESS_ID: String = "blueprint-process-id"
+    const val PROPERTY_BLUEPRINT_BASE_PATH: String = "blueprint-basePath"
+    const val PROPERTY_BLUEPRINT_RUNTIME: String = "blueprint-runtime"
+    const val PROPERTY_BLUEPRINT_INPUTS_DATA: String = "blueprint-inputs-data"
+    const val PROPERTY_BLUEPRINT_CONTEXT: String = "blueprint-context"
+    const val PROPERTY_BLUEPRINT_NAME: String = "template_name"
+    const val PROPERTY_BLUEPRINT_VERSION: String = "template_version"
+
+    const val TOSCA_METADATA_DIR: String = "TOSCA-Metadata"
+    const val TOSCA_METADATA_ENTRY_DEFINITION_FILE: String = "TOSCA-Metadata/TOSCA.meta"
+    const val TOSCA_DEFINITIONS_DIR: String = "Definitions"
+    const val TOSCA_PLANS_DIR: String = "Plans"
+    const val TOSCA_SCRIPTS_DIR: String = "Scripts"
+    const val TOSCA_MAPPINGS_DIR: String = "Mappings"
+    const val TOSCA_TEMPLATES_DIR: String = "Templates"
+    const val TOSCA_SCRIPTS_KOTLIN_DIR: String = "$TOSCA_SCRIPTS_DIR/kotlin"
+
+    const val METADATA_USER_GROUPS = "user-groups"
+    const val METADATA_TEMPLATE_NAME = "template_name"
+    const val METADATA_TEMPLATE_VERSION = "template_version"
+    const val METADATA_TEMPLATE_AUTHOR = "template_author"
+    const val METADATA_TEMPLATE_TAGS = "template_tags"
+    const val METADATA_WORKFLOW_NAME = "workflow_name"
+
+    const val PAYLOAD_DATA = "payload-data"
+    const val PROPERTY_CURRENT_STEP = "current-step"
+    const val PROPERTY_CURRENT_NODE_TEMPLATE = "current-node-template"
+    const val PROPERTY_CURRENT_INTERFACE = "current-interface"
+    const val PROPERTY_CURRENT_OPERATION = "current-operation"
+    const val PROPERTY_CURRENT_IMPLEMENTATION = "current-implementation"
+    const val PROPERTY_EXECUTION_REQUEST = "execution-request"
+
+    const val OPERATION_PROCESS = "process"
+    const val OPERATION_PREPARE = "prepare"
+
+    const val BLUEPRINT_RETRIEVE_TYPE_DB = "db"
+    const val BLUEPRINT_RETRIEVE_TYPE_FILE = "file"
+    const val BLUEPRINT_RETRIEVE_TYPE_REPO = "repo"
+
 }
\ No newline at end of file
@@ -1,49 +1,49 @@
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core\r
-/**\r
- *\r
- *\r
- * @author Brinda Santh\r
- */\r
-class BluePrintException : Exception {\r
-\r
-    var code: Int = 100\r
-\r
-    constructor(cause: Throwable) : super(cause)\r
-    constructor(message: String) : super(message)\r
-    constructor(message: String, cause: Throwable) : super(message, cause)\r
-    constructor(cause: Throwable, message: String, vararg args: Any?) : super(String.format(message, *args), cause)\r
-\r
-    constructor(code: Int, cause: Throwable) : super(cause) {\r
-        this.code = code\r
-    }\r
-\r
-    constructor(code: Int, message: String) : super(message) {\r
-        this.code = code\r
-    }\r
-\r
-    constructor(code: Int, message: String, cause: Throwable) : super(message, cause) {\r
-        this.code = code\r
-    }\r
-\r
-    constructor(code: Int, cause: Throwable, message: String, vararg args: Any?)\r
-            : super(String.format(message, *args), cause) {\r
-        this.code = code\r
-    }\r
-}\r
-\r
+/*
+ * 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
+/**
+ *
+ *
+ * @author Brinda Santh
+ */
+class BluePrintException : Exception {
+
+    var code: Int = 100
+
+    constructor(cause: Throwable) : super(cause)
+    constructor(message: String) : super(message)
+    constructor(message: String, cause: Throwable) : super(message, cause)
+    constructor(cause: Throwable, message: String, vararg args: Any?) : super(String.format(message, *args), cause)
+
+    constructor(code: Int, cause: Throwable) : super(cause) {
+        this.code = code
+    }
+
+    constructor(code: Int, message: String) : super(message) {
+        this.code = code
+    }
+
+    constructor(code: Int, message: String, cause: Throwable) : super(message, cause) {
+        this.code = code
+    }
+
+    constructor(code: Int, cause: Throwable, message: String, vararg args: Any?)
+            : super(String.format(message, *args), cause) {
+        this.code = code
+    }
+}
+
@@ -1,50 +1,50 @@
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- * Modifications Copyright © 2018 IBM.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core\r
-\r
-/**\r
- *\r
- *\r
- * @author Brinda Santh\r
- */\r
-class BluePrintProcessorException : RuntimeException {\r
-    var code: Int = 100\r
-\r
-    constructor(message: String, cause: Throwable) : super(message, cause)\r
-    constructor(message: String) : super(message)\r
-    constructor(cause: Throwable) : super(cause)\r
-    constructor(cause: Throwable, message: String, vararg args: Any?) : super(format(message, *args), cause)\r
-\r
-    constructor(code: Int, cause: Throwable) : super(cause) {\r
-        this.code = code\r
-    }\r
-\r
-    constructor(code: Int, message: String) : super(message) {\r
-        this.code = code\r
-    }\r
-\r
-    constructor(code: Int, message: String, cause: Throwable) : super(message, cause) {\r
-        this.code = code\r
-    }\r
-\r
-    constructor(code: Int, cause: Throwable, message: String, vararg args: Any?)\r
-            : super(String.format(message, *args), cause) {\r
-        this.code = code\r
-    }\r
-}\r
-\r
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
+ *
+ * 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
+
+/**
+ *
+ *
+ * @author Brinda Santh
+ */
+class BluePrintProcessorException : RuntimeException {
+    var code: Int = 100
+
+    constructor(message: String, cause: Throwable) : super(message, cause)
+    constructor(message: String) : super(message)
+    constructor(cause: Throwable) : super(cause)
+    constructor(cause: Throwable, message: String, vararg args: Any?) : super(format(message, *args), cause)
+
+    constructor(code: Int, cause: Throwable) : super(cause) {
+        this.code = code
+    }
+
+    constructor(code: Int, message: String) : super(message) {
+        this.code = code
+    }
+
+    constructor(code: Int, message: String, cause: Throwable) : super(message, cause) {
+        this.code = code
+    }
+
+    constructor(code: Int, cause: Throwable, message: String, vararg args: Any?)
+            : super(String.format(message, *args), cause) {
+        this.code = code
+    }
+}
+
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core\r
-\r
-import org.onap.ccsdk.apps.controllerblueprints.core.data.PropertyDefinition\r
-\r
-/**\r
- *\r
- *\r
- * @author Brinda Santh\r
- */\r
-object BluePrintTypes {\r
-\r
-    @JvmStatic\r
-    val validNodeTypeDerivedFroms: MutableList<String> = arrayListOf(\r
-            BluePrintConstants.MODEL_TYPE_NODES_ROOT,\r
-            BluePrintConstants.MODEL_TYPE_NODE_DG,\r
-            BluePrintConstants.MODEL_TYPE_NODE_COMPONENT,\r
-            BluePrintConstants.MODEL_TYPE_NODE_VNF,\r
-            BluePrintConstants.MODEL_TYPE_NODE_ARTIFACT,\r
-            BluePrintConstants.MODEL_TYPE_NODE_RESOURCE_SOURCE,\r
-            BluePrintConstants.MODEL_TYPE_NODES_COMPONENT_JAVA,\r
-            BluePrintConstants.MODEL_TYPE_NODES_COMPONENT_BUNDLE,\r
-            BluePrintConstants.MODEL_TYPE_NODES_COMPONENT_SCRIPT,\r
-            BluePrintConstants.MODEL_TYPE_NODES_COMPONENT_PYTHON,\r
-            BluePrintConstants.MODEL_TYPE_NODES_COMPONENT_JYTHON,\r
-            BluePrintConstants.MODEL_TYPE_NODES_COMPONENT_JAVA_SCRIPT\r
-    )\r
-\r
-    @JvmStatic\r
-    val validArtifactTypeDerivedFroms: MutableList<String> = arrayListOf(\r
-            BluePrintConstants.MODEL_TYPE_ARTIFACTS_ROOT,\r
-            BluePrintConstants.MODEL_TYPE_ARTIFACT_TYPE_IMPLEMENTATION\r
-    )\r
-\r
-    @JvmStatic\r
-    val validDataTypeDerivedFroms: MutableList<String> = arrayListOf(\r
-            BluePrintConstants.MODEL_TYPE_DATATYPES_ROOT,\r
-            BluePrintConstants.MODEL_TYPE_DATA_TYPE_DYNAMIC\r
-    )\r
-\r
-    @Deprecated("This has to move to Relationship Types Model Drive")\r
-    @JvmStatic\r
-    val validRelationShipDerivedFroms: MutableList<String> = arrayListOf(\r
-            BluePrintConstants.MODEL_TYPE_RELATIONSHIPS_ROOT,\r
-            BluePrintConstants.MODEL_TYPE_RELATIONSHIPS_DEPENDS_ON,\r
-            BluePrintConstants.MODEL_TYPE_RELATIONSHIPS_HOSTED_ON,\r
-            BluePrintConstants.MODEL_TYPE_RELATIONSHIPS_CONNECTS_TO,\r
-            BluePrintConstants.MODEL_TYPE_RELATIONSHIPS_ATTACH_TO,\r
-            BluePrintConstants.MODEL_TYPE_RELATIONSHIPS_ROUTES_TO\r
-    )\r
-\r
-    @Deprecated("This has to move to Capability Types Model Drive")\r
-    @JvmStatic\r
-    val validCapabilityTypes: MutableList<String> = arrayListOf(\r
-            BluePrintConstants.MODEL_TYPE_CAPABILITIES_ROOT,\r
-            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_NODE,\r
-            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_COMPUTE,\r
-            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_NETWORK,\r
-            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_STORAGE,\r
-            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT,\r
-            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT_PUBLIC,\r
-            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT_ADMIN,\r
-            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT_DATABASE,\r
-            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_ATTACHMENT,\r
-            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_OPERATION_SYSTEM,\r
-            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_BINDABLE,\r
-            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_CONTENT,\r
-            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_MAPPING,\r
-            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_NETCONF,\r
-            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_SSH,\r
-            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_SFTP\r
-    )\r
-\r
-    @JvmStatic\r
-    fun validModelTypes(): List<String> {\r
-        val validTypes: MutableList<String> = arrayListOf()\r
-        validTypes.add(BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE)\r
-        validTypes.add(BluePrintConstants.MODEL_DEFINITION_TYPE_ARTIFACT_TYPE)\r
-        validTypes.add(BluePrintConstants.MODEL_DEFINITION_TYPE_NODE_TYPE)\r
-        validTypes.add(BluePrintConstants.MODEL_DEFINITION_TYPE_CAPABILITY_TYPE)\r
-        validTypes.add(BluePrintConstants.MODEL_DEFINITION_TYPE_RELATIONSHIP_TYPE)\r
-        return validTypes\r
-    }\r
-\r
-    @JvmStatic\r
-    fun validPropertyTypes(): List<String> {\r
-        val validTypes: MutableList<String> = arrayListOf()\r
-        validTypes.add(BluePrintConstants.DATA_TYPE_STRING)\r
-        validTypes.add(BluePrintConstants.DATA_TYPE_INTEGER)\r
-        validTypes.add(BluePrintConstants.DATA_TYPE_FLOAT)\r
-        validTypes.add(BluePrintConstants.DATA_TYPE_DOUBLE)\r
-        validTypes.add(BluePrintConstants.DATA_TYPE_BOOLEAN)\r
-        validTypes.add(BluePrintConstants.DATA_TYPE_TIMESTAMP)\r
-        validTypes.add(BluePrintConstants.DATA_TYPE_NULL)\r
-        validTypes.add(BluePrintConstants.DATA_TYPE_LIST)\r
-        validTypes.add(BluePrintConstants.DATA_TYPE_MAP)\r
-        return validTypes\r
-    }\r
-\r
-    @JvmStatic\r
-    fun validPrimitiveTypes(): List<String> {\r
-        val validTypes: MutableList<String> = arrayListOf()\r
-        validTypes.add(BluePrintConstants.DATA_TYPE_STRING)\r
-        validTypes.add(BluePrintConstants.DATA_TYPE_INTEGER)\r
-        validTypes.add(BluePrintConstants.DATA_TYPE_FLOAT)\r
-        validTypes.add(BluePrintConstants.DATA_TYPE_DOUBLE)\r
-        validTypes.add(BluePrintConstants.DATA_TYPE_BOOLEAN)\r
-        validTypes.add(BluePrintConstants.DATA_TYPE_TIMESTAMP)\r
-        validTypes.add(BluePrintConstants.DATA_TYPE_NULL)\r
-        return validTypes\r
-    }\r
-\r
-    @JvmStatic\r
-    fun validCollectionTypes(): List<String> {\r
-        val validTypes: MutableList<String> = arrayListOf()\r
-        validTypes.add(BluePrintConstants.DATA_TYPE_LIST)\r
-        validTypes.add(BluePrintConstants.DATA_TYPE_MAP)\r
-        return validTypes\r
-    }\r
-\r
-    @JvmStatic\r
-    fun validPrimitiveOrCollectionPrimitive(propertyDefinition: PropertyDefinition): Boolean {\r
-        val entrySchema = propertyDefinition.entrySchema?.type ?: BluePrintConstants.DATA_TYPE_NULL\r
-        return BluePrintTypes.validPropertyTypes().contains(propertyDefinition.type)\r
-                && BluePrintTypes.validPrimitiveTypes().contains(entrySchema)\r
-    }\r
-\r
-    @JvmStatic\r
-    fun validCommands(): List<String> {\r
-        return listOf(BluePrintConstants.EXPRESSION_GET_INPUT,\r
-                BluePrintConstants.EXPRESSION_GET_ATTRIBUTE,\r
-                BluePrintConstants.EXPRESSION_GET_PROPERTY,\r
-                BluePrintConstants.EXPRESSION_GET_ARTIFACT,\r
-                BluePrintConstants.EXPRESSION_GET_OPERATION_OUTPUT,\r
-                BluePrintConstants.EXPRESSION_GET_NODE_OF_TYPE)\r
-    }\r
-\r
-    @JvmStatic\r
-    fun rootNodeTypes(): List<String> {\r
-        return listOf(BluePrintConstants.MODEL_TYPE_NODES_ROOT)\r
-    }\r
-\r
-    @JvmStatic\r
-    fun rootDataTypes(): List<String> {\r
-        return listOf(BluePrintConstants.MODEL_TYPE_DATATYPES_ROOT)\r
-    }\r
-\r
-\r
+/*
+ * 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
+
+import org.onap.ccsdk.apps.controllerblueprints.core.data.PropertyDefinition
+
+/**
+ *
+ *
+ * @author Brinda Santh
+ */
+object BluePrintTypes {
+
+    @JvmStatic
+    val validNodeTypeDerivedFroms: MutableList<String> = arrayListOf(
+            BluePrintConstants.MODEL_TYPE_NODES_ROOT,
+            BluePrintConstants.MODEL_TYPE_NODE_DG,
+            BluePrintConstants.MODEL_TYPE_NODE_COMPONENT,
+            BluePrintConstants.MODEL_TYPE_NODE_VNF,
+            BluePrintConstants.MODEL_TYPE_NODE_ARTIFACT,
+            BluePrintConstants.MODEL_TYPE_NODE_RESOURCE_SOURCE,
+            BluePrintConstants.MODEL_TYPE_NODES_COMPONENT_JAVA,
+            BluePrintConstants.MODEL_TYPE_NODES_COMPONENT_BUNDLE,
+            BluePrintConstants.MODEL_TYPE_NODES_COMPONENT_SCRIPT,
+            BluePrintConstants.MODEL_TYPE_NODES_COMPONENT_PYTHON,
+            BluePrintConstants.MODEL_TYPE_NODES_COMPONENT_JYTHON,
+            BluePrintConstants.MODEL_TYPE_NODES_COMPONENT_JAVA_SCRIPT
+    )
+
+    @JvmStatic
+    val validArtifactTypeDerivedFroms: MutableList<String> = arrayListOf(
+            BluePrintConstants.MODEL_TYPE_ARTIFACTS_ROOT,
+            BluePrintConstants.MODEL_TYPE_ARTIFACT_TYPE_IMPLEMENTATION
+    )
+
+    @JvmStatic
+    val validDataTypeDerivedFroms: MutableList<String> = arrayListOf(
+            BluePrintConstants.MODEL_TYPE_DATATYPES_ROOT,
+            BluePrintConstants.MODEL_TYPE_DATA_TYPE_DYNAMIC
+    )
+
+    @Deprecated("This has to move to Relationship Types Model Drive")
+    @JvmStatic
+    val validRelationShipDerivedFroms: MutableList<String> = arrayListOf(
+            BluePrintConstants.MODEL_TYPE_RELATIONSHIPS_ROOT,
+            BluePrintConstants.MODEL_TYPE_RELATIONSHIPS_DEPENDS_ON,
+            BluePrintConstants.MODEL_TYPE_RELATIONSHIPS_HOSTED_ON,
+            BluePrintConstants.MODEL_TYPE_RELATIONSHIPS_CONNECTS_TO,
+            BluePrintConstants.MODEL_TYPE_RELATIONSHIPS_ATTACH_TO,
+            BluePrintConstants.MODEL_TYPE_RELATIONSHIPS_ROUTES_TO
+    )
+
+    @Deprecated("This has to move to Capability Types Model Drive")
+    @JvmStatic
+    val validCapabilityTypes: MutableList<String> = arrayListOf(
+            BluePrintConstants.MODEL_TYPE_CAPABILITIES_ROOT,
+            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_NODE,
+            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_COMPUTE,
+            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_NETWORK,
+            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_STORAGE,
+            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT,
+            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT_PUBLIC,
+            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT_ADMIN,
+            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT_DATABASE,
+            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_ATTACHMENT,
+            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_OPERATION_SYSTEM,
+            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_BINDABLE,
+            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_CONTENT,
+            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_MAPPING,
+            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_NETCONF,
+            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_SSH,
+            BluePrintConstants.MODEL_TYPE_CAPABILITY_TYPE_SFTP
+    )
+
+    @JvmStatic
+    fun validModelTypes(): List<String> {
+        val validTypes: MutableList<String> = arrayListOf()
+        validTypes.add(BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE)
+        validTypes.add(BluePrintConstants.MODEL_DEFINITION_TYPE_ARTIFACT_TYPE)
+        validTypes.add(BluePrintConstants.MODEL_DEFINITION_TYPE_NODE_TYPE)
+        validTypes.add(BluePrintConstants.MODEL_DEFINITION_TYPE_CAPABILITY_TYPE)
+        validTypes.add(BluePrintConstants.MODEL_DEFINITION_TYPE_RELATIONSHIP_TYPE)
+        return validTypes
+    }
+
+    @JvmStatic
+    fun validPropertyTypes(): List<String> {
+        val validTypes: MutableList<String> = arrayListOf()
+        validTypes.add(BluePrintConstants.DATA_TYPE_STRING)
+        validTypes.add(BluePrintConstants.DATA_TYPE_INTEGER)
+        validTypes.add(BluePrintConstants.DATA_TYPE_FLOAT)
+        validTypes.add(BluePrintConstants.DATA_TYPE_DOUBLE)
+        validTypes.add(BluePrintConstants.DATA_TYPE_BOOLEAN)
+        validTypes.add(BluePrintConstants.DATA_TYPE_TIMESTAMP)
+        validTypes.add(BluePrintConstants.DATA_TYPE_NULL)
+        validTypes.add(BluePrintConstants.DATA_TYPE_LIST)
+        validTypes.add(BluePrintConstants.DATA_TYPE_MAP)
+        return validTypes
+    }
+
+    @JvmStatic
+    fun validPrimitiveTypes(): List<String> {
+        val validTypes: MutableList<String> = arrayListOf()
+        validTypes.add(BluePrintConstants.DATA_TYPE_STRING)
+        validTypes.add(BluePrintConstants.DATA_TYPE_INTEGER)
+        validTypes.add(BluePrintConstants.DATA_TYPE_FLOAT)
+        validTypes.add(BluePrintConstants.DATA_TYPE_DOUBLE)
+        validTypes.add(BluePrintConstants.DATA_TYPE_BOOLEAN)
+        validTypes.add(BluePrintConstants.DATA_TYPE_TIMESTAMP)
+        validTypes.add(BluePrintConstants.DATA_TYPE_NULL)
+        return validTypes
+    }
+
+    @JvmStatic
+    fun validCollectionTypes(): List<String> {
+        val validTypes: MutableList<String> = arrayListOf()
+        validTypes.add(BluePrintConstants.DATA_TYPE_LIST)
+        validTypes.add(BluePrintConstants.DATA_TYPE_MAP)
+        return validTypes
+    }
+
+    @JvmStatic
+    fun validPrimitiveOrCollectionPrimitive(propertyDefinition: PropertyDefinition): Boolean {
+        val entrySchema = propertyDefinition.entrySchema?.type ?: BluePrintConstants.DATA_TYPE_NULL
+        return BluePrintTypes.validPropertyTypes().contains(propertyDefinition.type)
+                && BluePrintTypes.validPrimitiveTypes().contains(entrySchema)
+    }
+
+    @JvmStatic
+    fun validCommands(): List<String> {
+        return listOf(BluePrintConstants.EXPRESSION_GET_INPUT,
+                BluePrintConstants.EXPRESSION_GET_ATTRIBUTE,
+                BluePrintConstants.EXPRESSION_GET_PROPERTY,
+                BluePrintConstants.EXPRESSION_GET_ARTIFACT,
+                BluePrintConstants.EXPRESSION_GET_OPERATION_OUTPUT,
+                BluePrintConstants.EXPRESSION_GET_NODE_OF_TYPE)
+    }
+
+    @JvmStatic
+    fun rootNodeTypes(): List<String> {
+        return listOf(BluePrintConstants.MODEL_TYPE_NODES_ROOT)
+    }
+
+    @JvmStatic
+    fun rootDataTypes(): List<String> {
+        return listOf(BluePrintConstants.MODEL_TYPE_DATATYPES_ROOT)
+    }
+
+
 }
\ No newline at end of file
@@ -1,30 +1,30 @@
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- * Modifications Copyright © 2018 IBM.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core\r
-\r
-/**\r
- *\r
- *\r
- * @author Brinda Santh\r
- */\r
-object ConfigModelConstant {\r
-\r
-    const val MODEL_CONTENT_TYPE_TOSCA_JSON = "TOSCA_JSON"\r
-    const val MODEL_CONTENT_TYPE_TEMPLATE = "TEMPLATE"\r
-    const val CAPABILITY_PROPERTY_MAPPING = "mapping"\r
-}\r
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
+ *
+ * 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
+
+/**
+ *
+ *
+ * @author Brinda Santh
+ */
+object ConfigModelConstant {
+
+    const val MODEL_CONTENT_TYPE_TOSCA_JSON = "TOSCA_JSON"
+    const val MODEL_CONTENT_TYPE_TEMPLATE = "TEMPLATE"
+    const val CAPABILITY_PROPERTY_MAPPING = "mapping"
+}
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core\r
-\r
-import com.fasterxml.jackson.databind.JsonNode\r
-import com.fasterxml.jackson.databind.node.BooleanNode\r
-import com.fasterxml.jackson.databind.node.DoubleNode\r
-import com.fasterxml.jackson.databind.node.IntNode\r
-import com.fasterxml.jackson.databind.node.TextNode\r
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils\r
-import org.slf4j.helpers.MessageFormatter\r
-import java.io.File\r
-import java.io.InputStream\r
-import kotlin.reflect.KClass\r
-\r
-/**\r
- *\r
- *\r
- * @author Brinda Santh\r
- */\r
-\r
-fun String.asJsonPrimitive(): TextNode {\r
-    return TextNode(this)\r
-}\r
-\r
-fun Boolean.asJsonPrimitive(): BooleanNode {\r
-    return BooleanNode.valueOf(this)\r
-}\r
-\r
-fun Int.asJsonPrimitive(): IntNode {\r
-    return IntNode.valueOf(this)\r
-}\r
-\r
-fun Double.asJsonPrimitive(): DoubleNode {\r
-    return DoubleNode.valueOf(this)\r
-}\r
-\r
-fun MutableMap<String, *>.asJsonNode(): JsonNode {\r
-    return JacksonUtils.jsonNodeFromObject(this)\r
-}\r
-\r
-fun format(message: String, vararg args: Any?): String {\r
-    if (args != null && args.isNotEmpty()) {\r
-        return MessageFormatter.arrayFormat(message, args).message\r
-    }\r
-    return message\r
-}\r
-\r
-fun <T : Any> MutableMap<String, *>.castOptionalValue(key: String, valueType: KClass<T>): T? {\r
-    if (containsKey(key)) {\r
-        return get(key) as? T\r
-    } else {\r
-        return null\r
-    }\r
-}\r
-\r
-fun <T : Any> MutableMap<String, *>.castValue(key: String, valueType: KClass<T>): T {\r
-    if (containsKey(key)) {\r
-        return get(key) as T\r
-    } else {\r
-        throw BluePrintException("couldn't find the key $key")\r
-    }\r
-}\r
-\r
-fun MutableMap<String, JsonNode>.putJsonElement(key: String, value: Any) {\r
-    when (value) {\r
-        is JsonNode ->\r
-            this[key] = value\r
-        is String ->\r
-            this[key] = TextNode(value)\r
-        is Boolean ->\r
-            this[key] = BooleanNode.valueOf(value)\r
-        is Int ->\r
-            this[key] = IntNode.valueOf(value.toInt())\r
-        is Double ->\r
-            this[key] = DoubleNode.valueOf(value.toDouble())\r
-        else ->\r
-            this[key] = JacksonUtils.jsonNodeFromObject(value)\r
-    }\r
-}\r
-\r
-fun MutableMap<String, JsonNode>.getAsString(key: String): String {\r
-    return this[key]?.asText() ?: throw BluePrintException("couldn't find value for key($key)")\r
-}\r
-\r
-fun MutableMap<String, JsonNode>.getAsBoolean(key: String): Boolean {\r
-    return this[key]?.asBoolean() ?: throw BluePrintException("couldn't find value for key($key)")\r
-}\r
-\r
-fun MutableMap<String, JsonNode>.getAsInt(key: String): Int {\r
-    return this[key]?.asInt() ?: throw BluePrintException("couldn't find value for key($key)")\r
-}\r
-\r
-fun MutableMap<String, JsonNode>.getAsDouble(key: String): Double {\r
-    return this[key]?.asDouble() ?: throw BluePrintException("couldn't find value for key($key)")\r
-}\r
-\r
-// Checks\r
-\r
-fun checkNotEmpty(value: String?): Boolean {\r
-    return value != null && value.isNotBlank()\r
-}\r
-\r
-fun checkNotEmptyOrThrow(value: String?, message: String? = value.plus(" is null/empty ")): Boolean {\r
-    val notEmpty = checkNotEmpty(value)\r
-    if (!notEmpty) {\r
-        throw BluePrintException(message!!)\r
-    }\r
-    return notEmpty\r
-}\r
-\r
-fun checkEqualsOrThrow(value1: String?, value2: String?, lazyMessage: () -> Any): Boolean {\r
-    if (value1.equals(value2, ignoreCase = true)) {\r
-        return true\r
-    } else {\r
-        throw BluePrintException(lazyMessage().toString())\r
-    }\r
-}\r
-\r
-fun nullToEmpty(value: String?): String {\r
-    return if (checkNotEmpty(value)) value!! else ""\r
-}\r
-\r
-fun returnNotEmptyOrThrow(value: String?, lazyMessage: () -> Any): String {\r
-    if (checkNotEmpty(value)) {\r
-        return value!!\r
-    } else {\r
-        throw IllegalStateException(lazyMessage().toString())\r
-    }\r
-}\r
-\r
-fun InputStream.toFile(path: String): File {\r
-    val file = File(path)\r
-    file.outputStream().use { this.copyTo(it) }\r
-    return file\r
-}\r
-\r
+/*
+ * 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
+
+import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.databind.node.BooleanNode
+import com.fasterxml.jackson.databind.node.DoubleNode
+import com.fasterxml.jackson.databind.node.IntNode
+import com.fasterxml.jackson.databind.node.TextNode
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
+import org.slf4j.helpers.MessageFormatter
+import java.io.File
+import java.io.InputStream
+import kotlin.reflect.KClass
+
+/**
+ *
+ *
+ * @author Brinda Santh
+ */
+
+fun String.asJsonPrimitive(): TextNode {
+    return TextNode(this)
+}
+
+fun Boolean.asJsonPrimitive(): BooleanNode {
+    return BooleanNode.valueOf(this)
+}
+
+fun Int.asJsonPrimitive(): IntNode {
+    return IntNode.valueOf(this)
+}
+
+fun Double.asJsonPrimitive(): DoubleNode {
+    return DoubleNode.valueOf(this)
+}
+
+fun MutableMap<String, *>.asJsonNode(): JsonNode {
+    return JacksonUtils.jsonNodeFromObject(this)
+}
+
+fun format(message: String, vararg args: Any?): String {
+    if (args != null && args.isNotEmpty()) {
+        return MessageFormatter.arrayFormat(message, args).message
+    }
+    return message
+}
+
+fun <T : Any> MutableMap<String, *>.castOptionalValue(key: String, valueType: KClass<T>): T? {
+    if (containsKey(key)) {
+        return get(key) as? T
+    } else {
+        return null
+    }
+}
+
+fun <T : Any> MutableMap<String, *>.castValue(key: String, valueType: KClass<T>): T {
+    if (containsKey(key)) {
+        return get(key) as T
+    } else {
+        throw BluePrintException("couldn't find the key $key")
+    }
+}
+
+fun MutableMap<String, JsonNode>.putJsonElement(key: String, value: Any) {
+    when (value) {
+        is JsonNode ->
+            this[key] = value
+        is String ->
+            this[key] = TextNode(value)
+        is Boolean ->
+            this[key] = BooleanNode.valueOf(value)
+        is Int ->
+            this[key] = IntNode.valueOf(value.toInt())
+        is Double ->
+            this[key] = DoubleNode.valueOf(value.toDouble())
+        else ->
+            this[key] = JacksonUtils.jsonNodeFromObject(value)
+    }
+}
+
+fun MutableMap<String, JsonNode>.getAsString(key: String): String {
+    return this[key]?.asText() ?: throw BluePrintException("couldn't find value for key($key)")
+}
+
+fun MutableMap<String, JsonNode>.getAsBoolean(key: String): Boolean {
+    return this[key]?.asBoolean() ?: throw BluePrintException("couldn't find value for key($key)")
+}
+
+fun MutableMap<String, JsonNode>.getAsInt(key: String): Int {
+    return this[key]?.asInt() ?: throw BluePrintException("couldn't find value for key($key)")
+}
+
+fun MutableMap<String, JsonNode>.getAsDouble(key: String): Double {
+    return this[key]?.asDouble() ?: throw BluePrintException("couldn't find value for key($key)")
+}
+
+// Checks
+
+fun checkNotEmpty(value: String?): Boolean {
+    return value != null && value.isNotBlank()
+}
+
+fun checkNotEmptyOrThrow(value: String?, message: String? = value.plus(" is null/empty ")): Boolean {
+    val notEmpty = checkNotEmpty(value)
+    if (!notEmpty) {
+        throw BluePrintException(message!!)
+    }
+    return notEmpty
+}
+
+fun checkEqualsOrThrow(value1: String?, value2: String?, lazyMessage: () -> Any): Boolean {
+    if (value1.equals(value2, ignoreCase = true)) {
+        return true
+    } else {
+        throw BluePrintException(lazyMessage().toString())
+    }
+}
+
+fun nullToEmpty(value: String?): String {
+    return if (checkNotEmpty(value)) value!! else ""
+}
+
+fun returnNotEmptyOrThrow(value: String?, lazyMessage: () -> Any): String {
+    if (checkNotEmpty(value)) {
+        return value!!
+    } else {
+        throw IllegalStateException(lazyMessage().toString())
+    }
+}
+
+fun InputStream.toFile(path: String): File {
+    val file = File(path)
+    file.outputStream().use { this.copyTo(it) }
+    return file
+}
+
@@ -1,70 +1,70 @@
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.data\r
-\r
-import com.fasterxml.jackson.databind.JsonNode\r
-import com.fasterxml.jackson.databind.node.ObjectNode\r
-/**\r
- *\r
- *\r
- * @author Brinda Santh\r
- */\r
-data class ExpressionData(\r
-        var isExpression: Boolean = false,\r
-        var valueNode: JsonNode,\r
-        var expressionNode: ObjectNode? = null,\r
-        var inputExpression: InputExpression? = null,\r
-        var propertyExpression: PropertyExpression? = null,\r
-        var attributeExpression: AttributeExpression? = null,\r
-        var artifactExpression: ArtifactExpression? = null,\r
-        var operationOutputExpression: OperationOutputExpression? = null,\r
-        var command: String? = null\r
-)\r
-\r
-data class InputExpression(\r
-        var propertyName: String\r
-)\r
-\r
-data class PropertyExpression(\r
-        var modelableEntityName: String = "SELF",\r
-        var reqOrCapEntityName: String? = null,\r
-        var propertyName: String,\r
-        var subPropertyName: String?  = null\r
-)\r
-\r
-data class AttributeExpression(\r
-        var modelableEntityName: String = "SELF",\r
-        var reqOrCapEntityName: String? = null,\r
-        var attributeName: String,\r
-        var subAttributeName: String? = null\r
-)\r
-\r
-data class ArtifactExpression(\r
-        val modelableEntityName: String = "SELF",\r
-        val artifactName: String,\r
-        val location: String? =  "LOCAL_FILE",\r
-        val remove: Boolean? = false\r
-)\r
-\r
-data class OperationOutputExpression(\r
-        val modelableEntityName: String = "SELF",\r
-        val interfaceName: String,\r
-        val operationName: String,\r
-        val propertyName: String\r
-)\r
-\r
-\r
+/*
+ * 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.data
+
+import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.databind.node.ObjectNode
+/**
+ *
+ *
+ * @author Brinda Santh
+ */
+data class ExpressionData(
+        var isExpression: Boolean = false,
+        var valueNode: JsonNode,
+        var expressionNode: ObjectNode? = null,
+        var inputExpression: InputExpression? = null,
+        var propertyExpression: PropertyExpression? = null,
+        var attributeExpression: AttributeExpression? = null,
+        var artifactExpression: ArtifactExpression? = null,
+        var operationOutputExpression: OperationOutputExpression? = null,
+        var command: String? = null
+)
+
+data class InputExpression(
+        var propertyName: String
+)
+
+data class PropertyExpression(
+        var modelableEntityName: String = "SELF",
+        var reqOrCapEntityName: String? = null,
+        var propertyName: String,
+        var subPropertyName: String?  = null
+)
+
+data class AttributeExpression(
+        var modelableEntityName: String = "SELF",
+        var reqOrCapEntityName: String? = null,
+        var attributeName: String,
+        var subAttributeName: String? = null
+)
+
+data class ArtifactExpression(
+        val modelableEntityName: String = "SELF",
+        val artifactName: String,
+        val location: String? =  "LOCAL_FILE",
+        val remove: Boolean? = false
+)
+
+data class OperationOutputExpression(
+        val modelableEntityName: String = "SELF",
+        val interfaceName: String,
+        val operationName: String,
+        val propertyName: String
+)
+
+
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- * Modifications Copyright © 2018 IBM.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.data\r
-\r
-import com.fasterxml.jackson.annotation.JsonIgnore\r
-import com.fasterxml.jackson.annotation.JsonProperty\r
-import com.fasterxml.jackson.annotation.JsonPropertyOrder\r
-import com.fasterxml.jackson.databind.JsonNode\r
-import io.swagger.annotations.ApiModelProperty\r
-\r
-/**\r
- *\r
- *\r
- * @author Brinda Santh\r
- */\r
-open class EntityType {\r
-    @get:JsonIgnore\r
-    var id: String? = null\r
-    var description: String? = null\r
-    var version: String = "1.0.0"\r
-    var metadata: MutableMap<String, String>? = null\r
-    @get:JsonProperty("derived_from")\r
-    lateinit var derivedFrom: String\r
-    var attributes: MutableMap<String, AttributeDefinition>? = null\r
-    var properties: MutableMap<String, PropertyDefinition>? = null\r
-}\r
-\r
-/*\r
- 5.3.2 tosca.datatypes.Credential\r
- The Credential type is a complex TOSCA data Type used when describing\r
- authorization credentials used to access network accessible resources.\r
- */\r
-class Credential {\r
-    @get:JsonIgnore\r
-    var id: String? = null\r
-    var protocol: String? = null\r
-    @get:JsonProperty("token_type")\r
-    lateinit var tokenType: String\r
-    lateinit var token: String\r
-    var keys: MutableMap<String, String>? = null\r
-    lateinit var user: String\r
-}\r
-\r
-/*\r
-3.5.2 Constraint clause\r
-A constraint clause defines an operation along with one or more compatible values that can be used to define a constraint on a property or parameter’s allowed values when it is defined in a TOSCA Service Template or one of its entities.\r
- */\r
-class ConstraintClause {\r
-    @get:JsonProperty("equal")\r
-    var equal: JsonNode? = null\r
-    @get:JsonProperty("greater_than")\r
-    var greaterThan: Any? = null\r
-    @get:JsonProperty("greater_or_equal")\r
-    var greaterOrEqual: Any? = null\r
-    @get:JsonProperty("less_than")\r
-    var lessThan: Any? = null\r
-    @get:JsonProperty("less_or_equal")\r
-    var lessOrEqual: Any? = null\r
-    @get:JsonProperty("in_range")\r
-    var inRange: Any? = null\r
-    @get:JsonProperty("valid_values")\r
-    var validValues: MutableList<JsonNode>? = null\r
-    @get:JsonProperty("length")\r
-    var length: Any? = null\r
-    @get:JsonProperty("min_length")\r
-    var minLength: Any? = null\r
-    @get:JsonProperty("max_length")\r
-    var maxLength: Any? = null\r
-    var pattern: String? = null\r
-    var schema: String? = null\r
-}\r
-\r
-/*\r
-3.5.4 Node Filter definition\r
-A node filter definition defines criteria for selection of a TOSCA Node Template based upon the template’s property values, capabilities and capability properties.\r
- */\r
-\r
-class NodeFilterDefinition {\r
-    var properties: MutableMap<String, PropertyDefinition>? = null\r
-    var capabilities: MutableList<String>? = null\r
-}\r
-\r
-/*\r
-3.5.5 Repository definition\r
- A repository definition defines a named external repository which contains deployment\r
- and implementation artifacts that are referenced within the TOSCA Service Template.\r
-*/\r
-class RepositoryDefinition {\r
-    @get:JsonIgnore\r
-    var id: String? = null\r
-    var description: String? = null\r
-    lateinit var url: String\r
-    var credential: Credential? = null\r
-}\r
-\r
-\r
-/*\r
-3.5.6 Artifact definition\r
-An artifact definition defines a named, typed file that can be associated with Node Type\r
-or Node Template and used by orchestration engine to facilitate deployment and implementation of interface operations.\r
- */\r
-class ArtifactDefinition {\r
-    @get:JsonIgnore\r
-    var id: String? = null\r
-    var type: String? = null\r
-    var file: String? = null\r
-    var repository: String? = null\r
-    var description: String? = null\r
-    @get:JsonProperty("deploy_Path")\r
-    var deployPath: String? = null\r
-    var properties: MutableMap<String, JsonNode>? = null\r
-    var content: String? = null\r
-    @Deprecated("Mapping content is define by the Type")\r
-    var mappingContent: String? = null\r
-}\r
-\r
-\r
-/*\r
-3.5.7 Import definition\r
-An import definition is used within a TOSCA Service Template to locate and uniquely name\r
-another TOSCA Service Template file which has type and template definitions to be imported (included)\r
-and referenced within another Service Template.\r
- */\r
-class ImportDefinition {\r
-    @get:JsonIgnore\r
-    var id: String? = null\r
-    lateinit var file: String\r
-    var repository: String? = null\r
-    @get:JsonProperty("namespace_uri")\r
-    var namespaceUri: String? = null\r
-    @get:JsonProperty("namespace_prefix")\r
-    var namespacePrefix: String? = null\r
-}\r
-\r
-/*\r
-3.5.8 Property definition A property definition defines a named, typed value and related data that can be associated with an\r
-entity defined in this specification (e.g., Node Types, Relationship Types, Capability Types, etc.).\r
-Properties are used by template authors to provide input values to TOSCA entities which indicate their “desired state” when they are\r
-instantiated. The value of a property can be retrieved using the get_property function within TOSCA Service Templates.\r
- */\r
-class PropertyDefinition {\r
-    @get:JsonIgnore\r
-    var id: String? = null\r
-    var description: String? = null\r
-    var required: Boolean? = null\r
-    lateinit var type: String\r
-    @get:JsonProperty("default")\r
-    var defaultValue: JsonNode? = null\r
-    var status: String? = null\r
-    var constraints: MutableList<ConstraintClause>? = null\r
-    @get:JsonProperty("entry_schema")\r
-    var entrySchema: EntrySchema? = null\r
-    @get:ApiModelProperty(notes = "Property Value, It may be raw JSON or primitive data type values")\r
-    var value: JsonNode? = null\r
-}\r
-\r
-\r
-/*\r
-3.5.10 Attribute definition\r
-\r
-An attribute definition defines a named, typed value that can be associated with an entity defined in this\r
-specification (e.g., a Node, Relationship or Capability Type).  Specifically, it is used to expose the\r
-“actual state” of some property of a TOSCA entity after it has been deployed and instantiated\r
-(as set by the TOSCA orchestrator). Attribute values can be retrieved via the get_attribute function\r
-from the instance model and used as values to other entities within TOSCA Service Templates.\r
- */\r
-\r
-class AttributeDefinition {\r
-    @get:JsonIgnore\r
-    var id: String? = null\r
-    var description: String? = null\r
-    var required: Boolean? = null\r
-    lateinit var type: String\r
-    @JsonProperty("default")\r
-    var defaultValue: JsonNode? = null\r
-    var status: String? = null\r
-    var constraints: MutableList<ConstraintClause>? = null\r
-    @JsonProperty("entry_schema")\r
-    var entrySchema: EntrySchema? = null\r
-}\r
-\r
-/*\r
-3.5.13 Operation definition\r
-An operation definition defines a named function or procedure that can be bound to an implementation artifact (e.g., a script).\r
- */\r
-class OperationDefinition {\r
-    @get:JsonIgnore\r
-    var id: String? = null\r
-    var description: String? = null\r
-    var implementation: Implementation? = null\r
-    var inputs: MutableMap<String, PropertyDefinition>? = null\r
-    var outputs: MutableMap<String, PropertyDefinition>? = null\r
-}\r
-\r
-class Implementation {\r
-    lateinit var primary: String\r
-    var dependencies: MutableList<String>? = null\r
-}\r
-\r
-/*\r
-3.5.14 Interface definition\r
-An interface definition defines a named interface that can be associated with a Node or Relationship Type\r
- */\r
-class InterfaceDefinition {\r
-    @get:JsonIgnore\r
-    var id: String? = null\r
-    var type: String? = null\r
-    var operations: MutableMap<String, OperationDefinition>? = null\r
-    var inputs: MutableMap<String, PropertyDefinition>? = null\r
-}\r
-\r
-/*\r
-3.5.15 Event Filter definition\r
-An event filter definition defines criteria for selection of an attribute, for the purpose of monitoring it, within a TOSCA entity, or one its capabilities.\r
- */\r
-class EventFilterDefinition {\r
-    @get:JsonIgnore\r
-    var id: String? = null\r
-    lateinit var node: String\r
-    var requirement: String? = null\r
-    var capability: String? = null\r
-}\r
-\r
-/*\r
-3.5.16 Trigger definition TODO\r
-A trigger definition defines the event, condition and action that is used to “trigger” a policy it is associated with.\r
- */\r
-class TriggerDefinition {\r
-    @get:JsonIgnore\r
-    var id: String? = null\r
-    var description: String? = null\r
-    @get:JsonProperty("event_type")\r
-    lateinit var eventType: String\r
-    @get:JsonProperty("target_filter")\r
-    var targetFilter: EventFilterDefinition? = null\r
-    var condition: ConditionClause? = null\r
-    var constraint: ConditionClause? = null\r
-    var method: String? = null\r
-    lateinit var action: String\r
-}\r
-\r
-/*\r
-    3.5.17 Workflow activity definition\r
-    A workflow activity defines an operation to be performed in a TOSCA workflow. Activities allows to:\r
-    · Delegate the workflow for a node expected to be provided        by the orchestrator\r
-    · Set the state of a node\r
-    · Call an operation       defined on a TOSCA interface of a node, relationship or group\r
-    · Inline another workflow defined in the topology (to allow reusability)\r
- */\r
-class Activity {\r
-    var delegate: String? = null\r
-    @get:JsonProperty("set_state")\r
-    var setState: String? = null\r
-    @get:JsonProperty("call_operation")\r
-    var callOperation: String? = null\r
-    var inlines: ArrayList<String>? = null\r
-}\r
-\r
-/*\r
-3.5.20 Workflow precondition definition\r
-A workflow condition can be used as a filter or precondition to check if a workflow can be processed or not based on the state of the instances of a TOSCA topology deployment. When not met, the workflow will not be triggered.\r
- */\r
-class PreConditionDefinition {\r
-    @get:JsonIgnore\r
-    var id: String? = null\r
-    lateinit var target: String\r
-    @get:JsonProperty("target_relationship")\r
-    lateinit var targetRelationship: String\r
-    lateinit var condition: ArrayList<ConditionClause>\r
-}\r
-\r
-/*\r
-3.5.21 Workflow step definition\r
-A workflow step allows to define one or multiple sequenced activities in a workflow and how they are connected to other steps in the workflow. They are the building blocks of a declarative workflow.\r
- */\r
-class Step {\r
-    @get:JsonIgnore\r
-    var id: String? = null\r
-    var description: String? = null\r
-    var target: String? = null\r
-    @JsonProperty("target_relationship")\r
-    var targetRelationship: String? = null\r
-    @JsonProperty("operation_host")\r
-    var operationHost: String? = null\r
-    var activities: ArrayList<Activity>? = null\r
-    @get:JsonProperty("on_success")\r
-    var onSuccess: ArrayList<String>? = null\r
-    @get:JsonProperty("on_failure")\r
-    var onFailure: ArrayList<String>? = null\r
-}\r
-\r
-/*\r
-3.6.2 Capability definition\r
-A capability definition defines a named, typed set of data that can be associated with Node Type or Node Template to describe a transparent capability or feature of the software component the node describes.\r
- */\r
-\r
-class CapabilityDefinition {\r
-    @get:JsonIgnore\r
-    var id: String? = null\r
-    lateinit var type: String\r
-    var description: String? = null\r
-    var properties: MutableMap<String, PropertyDefinition>? = null\r
-    @get:JsonProperty("valid_source_types")\r
-    var validSourceTypes: MutableList<String>? = null\r
-    var occurrences: MutableList<Any>? = null\r
-}\r
-\r
-/*\r
-3.6.3 Requirement definition\r
-The Requirement definition describes a named requirement (dependencies) of a TOSCA Node Type or Node template which needs to be fulfilled by a matching Capability definition declared by another TOSCA modelable entity.  The requirement definition may itself include the specific name of the fulfilling entity (explicitly) or provide an abstract type, along with additional filtering characteristics, that a TOSCA orchestrator can use to fulfill the capability at runtime (implicitly).\r
- */\r
-class RequirementDefinition {\r
-    @get:JsonIgnore\r
-    var id: String? = null\r
-    var description: String? = null\r
-    var capability: String? = null\r
-    var node: String? = null\r
-    var relationship: String? = null\r
-    var occurrences: MutableList<Any>? = null\r
-}\r
-\r
-/*\r
-3.6.4 Artifact Type\r
-An Artifact Type is a reusable entity that defines the type of one or more files that are used to define implementation or deployment artifacts that are referenced by nodes or relationships on their operations.\r
- */\r
-class ArtifactType : EntityType() {\r
-    @get:JsonProperty("mime_type")\r
-    var mimeType: String? = null\r
-    @get:JsonProperty("file_ext")\r
-    var fileExt: MutableList<String>? = null\r
-\r
-}\r
-\r
-/*\r
-3.6.6 Data Type\r
-A Data Type definition defines the schema for new named datatypes in TOSCA.\r
- */\r
-\r
-class DataType : EntityType() {\r
-    var constraints: MutableList<ConstraintClause>? = null\r
-}\r
-\r
-/*\r
-3.6.9 Node Type\r
-A Node Type is a reusable entity that defines the type of one or more Node Templates. As such, a Node Type defines the structure of observable properties via a Properties Definition, the Requirements and Capabilities of the node as well as its supported interfaces.\r
-\r
- */\r
-\r
-class NodeType : EntityType() {\r
-    var capabilities: MutableMap<String, CapabilityDefinition>? = null\r
-    var requirements: MutableMap<String, RequirementDefinition>? = null\r
-    var interfaces: MutableMap<String, InterfaceDefinition>? = null\r
-    var artifacts: MutableMap<String, ArtifactDefinition>? = null\r
-}\r
-\r
-/*\r
-3.6.8 Requirement Type\r
-A Requirement Type is a reusable entity that describes a kind of requirement that a Node Type can declare to expose.  The TOSCA Simple Profile seeks to simplify the need for declaring specific Requirement Types from nodes and instead rely upon nodes declaring their features sets using TOSCA Capability Types along with a named Feature notation.\r
- */\r
-\r
-class RequirementType : EntityType() {\r
-    var requirements: MutableMap<String, RequirementDefinition>? = null\r
-    var capabilities: MutableMap<String, CapabilityDefinition>? = null\r
-    var interfaces: MutableMap<String, InterfaceDefinition>? = null\r
-    var artifacts: MutableMap<String, ArtifactDefinition>? = null\r
-}\r
-\r
-/*\r
-3.6.10 Relationship Type\r
-A Relationship Type is a reusable entity that defines the type of one or more relationships between Node Types or Node Templates.\r
-*/\r
-\r
-class RelationshipType : EntityType() {\r
-    var interfaces: MutableMap<String, InterfaceDefinition>? = null\r
-    @get:JsonProperty("valid_target_types")\r
-    var validTargetTypes: ArrayList<String>? = null\r
-}\r
-\r
-/*\r
-3.6.11 Group Type\r
-A Group Type defines logical grouping types for nodes, typically for different management purposes.\r
-Groups can effectively be viewed as logical nodes that are not part of the physical deployment topology\r
- of an application, yet can have capabilities and the ability to attach policies and interfaces\r
- that can be applied (depending on the group type) to its member nodes.\r
- */\r
-\r
-class GroupType : EntityType() {\r
-    var members: MutableList<String>? = null\r
-    var requirements: ArrayList<RequirementDefinition>? = null\r
-    var capabilities: MutableMap<String, CapabilityDefinition>? = null\r
-    var interfaces: MutableMap<String, InterfaceDefinition>? = null\r
-\r
-}\r
-\r
-/*\r
-    3.6.12 Policy Type\r
-    A Policy Type defines a type of requirement that affects or governs an application or service’s\r
-    topology at some stage of its lifecycle, but is not explicitly part of the topology itself\r
-    (i.e., it does not prevent the application or service from being deployed or run if it did not exist).\r
- */\r
-class PolicyType : EntityType() {\r
-    lateinit var targets: MutableList<String>\r
-}\r
-\r
-/*\r
-3.7.1 Capability assignment\r
-A capability assignment allows node template authors to assign values to properties and attributes for a named capability definition that is part of a Node Template’s type definition.\r
- */\r
-class CapabilityAssignment {\r
-    @get:JsonIgnore\r
-    var id: String? = null\r
-    var attributes: MutableMap<String, JsonNode>? = null\r
-    var properties: MutableMap<String, JsonNode>? = null\r
-}\r
-\r
-/*\r
-3.7.4 Relationship Template\r
-A Relationship Template specifies the occurrence of a manageable relationship between node templates as part of an application’s topology model that is defined in a TOSCA Service Template.  A Relationship template is an instance of a specified Relationship Type and can provide customized properties, constraints or operations which override the defaults provided by its Relationship Type and its implementations.\r
- */\r
-class GroupDefinition {\r
-    @get:JsonIgnore\r
-    var id: String? = null\r
-    lateinit var type: String\r
-    var description: String? = null\r
-    var metadata: MutableMap<String, String>? = null\r
-    var properties: MutableMap<String, JsonNode>? = null\r
-    var members = ArrayList<String>()\r
-    var interfaces: MutableMap<String, InterfaceDefinition>? = null\r
-}\r
-\r
-/*\r
-3.7.6 Policy definition\r
-A policy definition defines a policy that can be associated with a TOSCA topology or top-level entity definition (e.g., group definition, node template, etc.).\r
- */\r
-class PolicyDefinition {\r
-    @get:JsonIgnore\r
-    var id: String? = null\r
-    lateinit var type: String\r
-    var description: String? = null\r
-    var metadata: MutableMap<String, String>? = null\r
-    var properties: MutableMap<String, JsonNode>? = null\r
-    var targets: MutableList<String>? = null\r
-}\r
-\r
-\r
-/*\r
-3.8 Topology Template definition\r
-This section defines the topology template of a cloud application. The main ingredients of the topology template are node templates representing components of the application and relationship templates representing links between the components. These elements are defined in the nested node_templates section and the nested relationship_templates sections, respectively.  Furthermore, a topology template allows for defining input parameters, output parameters as well as grouping of node templates.\r
- */\r
-class TopologyTemplate {\r
-    @get:JsonIgnore\r
-    var id: String? = null\r
-    var description: String? = null\r
-    var inputs: MutableMap<String, PropertyDefinition>? = null\r
-    @get:JsonProperty("node_templates")\r
-    var nodeTemplates: MutableMap<String, NodeTemplate>? = null\r
-    @get:JsonProperty("relationship_templates")\r
-    var relationshipTemplates: MutableMap<String, RelationshipTemplate>? = null\r
-    var policies: MutableMap<String, PolicyDefinition>? = null\r
-    var outputs: MutableMap<String, PropertyDefinition>? = null\r
-    @get:JsonProperty("substitution_mappings")\r
-    var substitutionMappings: Any? = null\r
-    var workflows: MutableMap<String, Workflow>? = null\r
-}\r
-\r
-class SubstitutionMapping {\r
-    @get:JsonProperty("node_type")\r
-    lateinit var nodeType: String\r
-    lateinit var capabilities: ArrayList<String>\r
-    lateinit var requirements: ArrayList<String>\r
-}\r
-\r
-class EntrySchema {\r
-    lateinit var type: String\r
-    var constraints: MutableList<ConstraintClause>? = null\r
-}\r
-\r
-class InterfaceAssignment {\r
-    @get:JsonIgnore\r
-    var id: String? = null\r
-    var operations: MutableMap<String, OperationAssignment>? = null\r
-    var inputs: MutableMap<String, JsonNode>? = null\r
-}\r
-\r
-/*\r
-3.7.3 Node Template\r
-A Node Template specifies the occurrence of a manageable software component as part of an application’s topology model which is defined in a TOSCA Service Template.  A Node template is an instance of a specified Node Type and can provide customized properties, constraints or operations which override the defaults provided by its Node Type and its implementations.\r
- */\r
-\r
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
+ *
+ * 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.data
+
+import com.fasterxml.jackson.annotation.JsonIgnore
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonPropertyOrder
+import com.fasterxml.jackson.databind.JsonNode
+import io.swagger.annotations.ApiModelProperty
+
+/**
+ *
+ *
+ * @author Brinda Santh
+ */
+open class EntityType {
+    @get:JsonIgnore
+    var id: String? = null
+    var description: String? = null
+    var version: String = "1.0.0"
+    var metadata: MutableMap<String, String>? = null
+    @get:JsonProperty("derived_from")
+    lateinit var derivedFrom: String
+    var attributes: MutableMap<String, AttributeDefinition>? = null
+    var properties: MutableMap<String, PropertyDefinition>? = null
+}
+
+/*
+ 5.3.2 tosca.datatypes.Credential
+ The Credential type is a complex TOSCA data Type used when describing
+ authorization credentials used to access network accessible resources.
+ */
+class Credential {
+    @get:JsonIgnore
+    var id: String? = null
+    var protocol: String? = null
+    @get:JsonProperty("token_type")
+    lateinit var tokenType: String
+    lateinit var token: String
+    var keys: MutableMap<String, String>? = null
+    lateinit var user: String
+}
+
+/*
+3.5.2 Constraint clause
+A constraint clause defines an operation along with one or more compatible values that can be used to define a constraint on a property or parameter’s allowed values when it is defined in a TOSCA Service Template or one of its entities.
+ */
+class ConstraintClause {
+    @get:JsonProperty("equal")
+    var equal: JsonNode? = null
+    @get:JsonProperty("greater_than")
+    var greaterThan: Any? = null
+    @get:JsonProperty("greater_or_equal")
+    var greaterOrEqual: Any? = null
+    @get:JsonProperty("less_than")
+    var lessThan: Any? = null
+    @get:JsonProperty("less_or_equal")
+    var lessOrEqual: Any? = null
+    @get:JsonProperty("in_range")
+    var inRange: Any? = null
+    @get:JsonProperty("valid_values")
+    var validValues: MutableList<JsonNode>? = null
+    @get:JsonProperty("length")
+    var length: Any? = null
+    @get:JsonProperty("min_length")
+    var minLength: Any? = null
+    @get:JsonProperty("max_length")
+    var maxLength: Any? = null
+    var pattern: String? = null
+    var schema: String? = null
+}
+
+/*
+3.5.4 Node Filter definition
+A node filter definition defines criteria for selection of a TOSCA Node Template based upon the template’s property values, capabilities and capability properties.
+ */
+
+class NodeFilterDefinition {
+    var properties: MutableMap<String, PropertyDefinition>? = null
+    var capabilities: MutableList<String>? = null
+}
+
+/*
+3.5.5 Repository definition
+ A repository definition defines a named external repository which contains deployment
+ and implementation artifacts that are referenced within the TOSCA Service Template.
+*/
+class RepositoryDefinition {
+    @get:JsonIgnore
+    var id: String? = null
+    var description: String? = null
+    lateinit var url: String
+    var credential: Credential? = null
+}
+
+
+/*
+3.5.6 Artifact definition
+An artifact definition defines a named, typed file that can be associated with Node Type
+or Node Template and used by orchestration engine to facilitate deployment and implementation of interface operations.
+ */
+class ArtifactDefinition {
+    @get:JsonIgnore
+    var id: String? = null
+    var type: String? = null
+    var file: String? = null
+    var repository: String? = null
+    var description: String? = null
+    @get:JsonProperty("deploy_Path")
+    var deployPath: String? = null
+    var properties: MutableMap<String, JsonNode>? = null
+    var content: String? = null
+    @Deprecated("Mapping content is define by the Type")
+    var mappingContent: String? = null
+}
+
+
+/*
+3.5.7 Import definition
+An import definition is used within a TOSCA Service Template to locate and uniquely name
+another TOSCA Service Template file which has type and template definitions to be imported (included)
+and referenced within another Service Template.
+ */
+class ImportDefinition {
+    @get:JsonIgnore
+    var id: String? = null
+    lateinit var file: String
+    var repository: String? = null
+    @get:JsonProperty("namespace_uri")
+    var namespaceUri: String? = null
+    @get:JsonProperty("namespace_prefix")
+    var namespacePrefix: String? = null
+}
+
+/*
+3.5.8 Property definition A property definition defines a named, typed value and related data that can be associated with an
+entity defined in this specification (e.g., Node Types, Relationship Types, Capability Types, etc.).
+Properties are used by template authors to provide input values to TOSCA entities which indicate their “desired state” when they are
+instantiated. The value of a property can be retrieved using the get_property function within TOSCA Service Templates.
+ */
+class PropertyDefinition {
+    @get:JsonIgnore
+    var id: String? = null
+    var description: String? = null
+    var required: Boolean? = null
+    lateinit var type: String
+    @get:JsonProperty("default")
+    var defaultValue: JsonNode? = null
+    var status: String? = null
+    var constraints: MutableList<ConstraintClause>? = null
+    @get:JsonProperty("entry_schema")
+    var entrySchema: EntrySchema? = null
+    @get:ApiModelProperty(notes = "Property Value, It may be raw JSON or primitive data type values")
+    var value: JsonNode? = null
+}
+
+
+/*
+3.5.10 Attribute definition
+
+An attribute definition defines a named, typed value that can be associated with an entity defined in this
+specification (e.g., a Node, Relationship or Capability Type).  Specifically, it is used to expose the
+“actual state” of some property of a TOSCA entity after it has been deployed and instantiated
+(as set by the TOSCA orchestrator). Attribute values can be retrieved via the get_attribute function
+from the instance model and used as values to other entities within TOSCA Service Templates.
+ */
+
+class AttributeDefinition {
+    @get:JsonIgnore
+    var id: String? = null
+    var description: String? = null
+    var required: Boolean? = null
+    lateinit var type: String
+    @JsonProperty("default")
+    var defaultValue: JsonNode? = null
+    var status: String? = null
+    var constraints: MutableList<ConstraintClause>? = null
+    @JsonProperty("entry_schema")
+    var entrySchema: EntrySchema? = null
+}
+
+/*
+3.5.13 Operation definition
+An operation definition defines a named function or procedure that can be bound to an implementation artifact (e.g., a script).
+ */
+class OperationDefinition {
+    @get:JsonIgnore
+    var id: String? = null
+    var description: String? = null
+    var implementation: Implementation? = null
+    var inputs: MutableMap<String, PropertyDefinition>? = null
+    var outputs: MutableMap<String, PropertyDefinition>? = null
+}
+
+class Implementation {
+    lateinit var primary: String
+    var dependencies: MutableList<String>? = null
+}
+
+/*
+3.5.14 Interface definition
+An interface definition defines a named interface that can be associated with a Node or Relationship Type
+ */
+class InterfaceDefinition {
+    @get:JsonIgnore
+    var id: String? = null
+    var type: String? = null
+    var operations: MutableMap<String, OperationDefinition>? = null
+    var inputs: MutableMap<String, PropertyDefinition>? = null
+}
+
+/*
+3.5.15 Event Filter definition
+An event filter definition defines criteria for selection of an attribute, for the purpose of monitoring it, within a TOSCA entity, or one its capabilities.
+ */
+class EventFilterDefinition {
+    @get:JsonIgnore
+    var id: String? = null
+    lateinit var node: String
+    var requirement: String? = null
+    var capability: String? = null
+}
+
+/*
+3.5.16 Trigger definition TODO
+A trigger definition defines the event, condition and action that is used to “trigger” a policy it is associated with.
+ */
+class TriggerDefinition {
+    @get:JsonIgnore
+    var id: String? = null
+    var description: String? = null
+    @get:JsonProperty("event_type")
+    lateinit var eventType: String
+    @get:JsonProperty("target_filter")
+    var targetFilter: EventFilterDefinition? = null
+    var condition: ConditionClause? = null
+    var constraint: ConditionClause? = null
+    var method: String? = null
+    lateinit var action: String
+}
+
+/*
+    3.5.17 Workflow activity definition
+    A workflow activity defines an operation to be performed in a TOSCA workflow. Activities allows to:
+    · Delegate the workflow for a node expected to be provided        by the orchestrator
+    · Set the state of a node
+    · Call an operation       defined on a TOSCA interface of a node, relationship or group
+    · Inline another workflow defined in the topology (to allow reusability)
+ */
+class Activity {
+    var delegate: String? = null
+    @get:JsonProperty("set_state")
+    var setState: String? = null
+    @get:JsonProperty("call_operation")
+    var callOperation: String? = null
+    var inlines: ArrayList<String>? = null
+}
+
+/*
+3.5.20 Workflow precondition definition
+A workflow condition can be used as a filter or precondition to check if a workflow can be processed or not based on the state of the instances of a TOSCA topology deployment. When not met, the workflow will not be triggered.
+ */
+class PreConditionDefinition {
+    @get:JsonIgnore
+    var id: String? = null
+    lateinit var target: String
+    @get:JsonProperty("target_relationship")
+    lateinit var targetRelationship: String
+    lateinit var condition: ArrayList<ConditionClause>
+}
+
+/*
+3.5.21 Workflow step definition
+A workflow step allows to define one or multiple sequenced activities in a workflow and how they are connected to other steps in the workflow. They are the building blocks of a declarative workflow.
+ */
+class Step {
+    @get:JsonIgnore
+    var id: String? = null
+    var description: String? = null
+    var target: String? = null
+    @JsonProperty("target_relationship")
+    var targetRelationship: String? = null
+    @JsonProperty("operation_host")
+    var operationHost: String? = null
+    var activities: ArrayList<Activity>? = null
+    @get:JsonProperty("on_success")
+    var onSuccess: ArrayList<String>? = null
+    @get:JsonProperty("on_failure")
+    var onFailure: ArrayList<String>? = null
+}
+
+/*
+3.6.2 Capability definition
+A capability definition defines a named, typed set of data that can be associated with Node Type or Node Template to describe a transparent capability or feature of the software component the node describes.
+ */
+
+class CapabilityDefinition {
+    @get:JsonIgnore
+    var id: String? = null
+    lateinit var type: String
+    var description: String? = null
+    var properties: MutableMap<String, PropertyDefinition>? = null
+    @get:JsonProperty("valid_source_types")
+    var validSourceTypes: MutableList<String>? = null
+    var occurrences: MutableList<Any>? = null
+}
+
+/*
+3.6.3 Requirement definition
+The Requirement definition describes a named requirement (dependencies) of a TOSCA Node Type or Node template which needs to be fulfilled by a matching Capability definition declared by another TOSCA modelable entity.  The requirement definition may itself include the specific name of the fulfilling entity (explicitly) or provide an abstract type, along with additional filtering characteristics, that a TOSCA orchestrator can use to fulfill the capability at runtime (implicitly).
+ */
+class RequirementDefinition {
+    @get:JsonIgnore
+    var id: String? = null
+    var description: String? = null
+    var capability: String? = null
+    var node: String? = null
+    var relationship: String? = null
+    var occurrences: MutableList<Any>? = null
+}
+
+/*
+3.6.4 Artifact Type
+An Artifact Type is a reusable entity that defines the type of one or more files that are used to define implementation or deployment artifacts that are referenced by nodes or relationships on their operations.
+ */
+class ArtifactType : EntityType() {
+    @get:JsonProperty("mime_type")
+    var mimeType: String? = null
+    @get:JsonProperty("file_ext")
+    var fileExt: MutableList<String>? = null
+
+}
+
+/*
+3.6.6 Data Type
+A Data Type definition defines the schema for new named datatypes in TOSCA.
+ */
+
+class DataType : EntityType() {
+    var constraints: MutableList<ConstraintClause>? = null
+}
+
+/*
+3.6.9 Node Type
+A Node Type is a reusable entity that defines the type of one or more Node Templates. As such, a Node Type defines the structure of observable properties via a Properties Definition, the Requirements and Capabilities of the node as well as its supported interfaces.
+
+ */
+
+class NodeType : EntityType() {
+    var capabilities: MutableMap<String, CapabilityDefinition>? = null
+    var requirements: MutableMap<String, RequirementDefinition>? = null
+    var interfaces: MutableMap<String, InterfaceDefinition>? = null
+    var artifacts: MutableMap<String, ArtifactDefinition>? = null
+}
+
+/*
+3.6.8 Requirement Type
+A Requirement Type is a reusable entity that describes a kind of requirement that a Node Type can declare to expose.  The TOSCA Simple Profile seeks to simplify the need for declaring specific Requirement Types from nodes and instead rely upon nodes declaring their features sets using TOSCA Capability Types along with a named Feature notation.
+ */
+
+class RequirementType : EntityType() {
+    var requirements: MutableMap<String, RequirementDefinition>? = null
+    var capabilities: MutableMap<String, CapabilityDefinition>? = null
+    var interfaces: MutableMap<String, InterfaceDefinition>? = null
+    var artifacts: MutableMap<String, ArtifactDefinition>? = null
+}
+
+/*
+3.6.10 Relationship Type
+A Relationship Type is a reusable entity that defines the type of one or more relationships between Node Types or Node Templates.
+*/
+
+class RelationshipType : EntityType() {
+    var interfaces: MutableMap<String, InterfaceDefinition>? = null
+    @get:JsonProperty("valid_target_types")
+    var validTargetTypes: ArrayList<String>? = null
+}
+
+/*
+3.6.11 Group Type
+A Group Type defines logical grouping types for nodes, typically for different management purposes.
+Groups can effectively be viewed as logical nodes that are not part of the physical deployment topology
+ of an application, yet can have capabilities and the ability to attach policies and interfaces
+ that can be applied (depending on the group type) to its member nodes.
+ */
+
+class GroupType : EntityType() {
+    var members: MutableList<String>? = null
+    var requirements: ArrayList<RequirementDefinition>? = null
+    var capabilities: MutableMap<String, CapabilityDefinition>? = null
+    var interfaces: MutableMap<String, InterfaceDefinition>? = null
+
+}
+
+/*
+    3.6.12 Policy Type
+    A Policy Type defines a type of requirement that affects or governs an application or service’s
+    topology at some stage of its lifecycle, but is not explicitly part of the topology itself
+    (i.e., it does not prevent the application or service from being deployed or run if it did not exist).
+ */
+class PolicyType : EntityType() {
+    lateinit var targets: MutableList<String>
+}
+
+/*
+3.7.1 Capability assignment
+A capability assignment allows node template authors to assign values to properties and attributes for a named capability definition that is part of a Node Template’s type definition.
+ */
+class CapabilityAssignment {
+    @get:JsonIgnore
+    var id: String? = null
+    var attributes: MutableMap<String, JsonNode>? = null
+    var properties: MutableMap<String, JsonNode>? = null
+}
+
+/*
+3.7.4 Relationship Template
+A Relationship Template specifies the occurrence of a manageable relationship between node templates as part of an application’s topology model that is defined in a TOSCA Service Template.  A Relationship template is an instance of a specified Relationship Type and can provide customized properties, constraints or operations which override the defaults provided by its Relationship Type and its implementations.
+ */
+class GroupDefinition {
+    @get:JsonIgnore
+    var id: String? = null
+    lateinit var type: String
+    var description: String? = null
+    var metadata: MutableMap<String, String>? = null
+    var properties: MutableMap<String, JsonNode>? = null
+    var members = ArrayList<String>()
+    var interfaces: MutableMap<String, InterfaceDefinition>? = null
+}
+
+/*
+3.7.6 Policy definition
+A policy definition defines a policy that can be associated with a TOSCA topology or top-level entity definition (e.g., group definition, node template, etc.).
+ */
+class PolicyDefinition {
+    @get:JsonIgnore
+    var id: String? = null
+    lateinit var type: String
+    var description: String? = null
+    var metadata: MutableMap<String, String>? = null
+    var properties: MutableMap<String, JsonNode>? = null
+    var targets: MutableList<String>? = null
+}
+
+
+/*
+3.8 Topology Template definition
+This section defines the topology template of a cloud application. The main ingredients of the topology template are node templates representing components of the application and relationship templates representing links between the components. These elements are defined in the nested node_templates section and the nested relationship_templates sections, respectively.  Furthermore, a topology template allows for defining input parameters, output parameters as well as grouping of node templates.
+ */
+class TopologyTemplate {
+    @get:JsonIgnore
+    var id: String? = null
+    var description: String? = null
+    var inputs: MutableMap<String, PropertyDefinition>? = null
+    @get:JsonProperty("node_templates")
+    var nodeTemplates: MutableMap<String, NodeTemplate>? = null
+    @get:JsonProperty("relationship_templates")
+    var relationshipTemplates: MutableMap<String, RelationshipTemplate>? = null
+    var policies: MutableMap<String, PolicyDefinition>? = null
+    var outputs: MutableMap<String, PropertyDefinition>? = null
+    @get:JsonProperty("substitution_mappings")
+    var substitutionMappings: Any? = null
+    var workflows: MutableMap<String, Workflow>? = null
+}
+
+class SubstitutionMapping {
+    @get:JsonProperty("node_type")
+    lateinit var nodeType: String
+    lateinit var capabilities: ArrayList<String>
+    lateinit var requirements: ArrayList<String>
+}
+
+class EntrySchema {
+    lateinit var type: String
+    var constraints: MutableList<ConstraintClause>? = null
+}
+
+class InterfaceAssignment {
+    @get:JsonIgnore
+    var id: String? = null
+    var operations: MutableMap<String, OperationAssignment>? = null
+    var inputs: MutableMap<String, JsonNode>? = null
+}
+
+/*
+3.7.3 Node Template
+A Node Template specifies the occurrence of a manageable software component as part of an application’s topology model which is defined in a TOSCA Service Template.  A Node template is an instance of a specified Node Type and can provide customized properties, constraints or operations which override the defaults provided by its Node Type and its implementations.
+ */
+
 open class NodeTemplate {
-    @get:JsonIgnore\r
-    var id: String? = null\r
-    var description: String? = null\r
-    lateinit var type: String\r
-    var metadata: MutableMap<String, String>? = null\r
-    var directives: MutableList<String>? = null\r
-    //@get:JsonSerialize(using = PropertyDefinitionValueSerializer::class)\r
-    var properties: MutableMap<String, JsonNode>? = null\r
-    var attributes: MutableMap<String, JsonNode>? = null\r
-    var capabilities: MutableMap<String, CapabilityAssignment>? = null\r
-    var requirements: MutableMap<String, RequirementAssignment>? = null\r
-    var interfaces: MutableMap<String, InterfaceAssignment>? = null\r
-    var artifacts: MutableMap<String, ArtifactDefinition>? = null\r
-    @get:JsonProperty("node_filter")\r
-    var nodeFilter: NodeFilterDefinition? = null\r
-    var copy: String? = null\r
-}\r
-\r
-class OperationAssignment {\r
-    @get:JsonIgnore\r
-    var id: String? = null\r
-    var description: String? = null\r
-    var implementation: Implementation? = null\r
-    var inputs: MutableMap<String, JsonNode>? = null\r
-    var outputs: MutableMap<String, JsonNode>? = null\r
-}\r
-\r
-/*\r
-3.7.4 Relationship Template\r
-A Relationship Template specifies the occurrence of a manageable relationship between node templates as part of an application’s topology model that is defined in a TOSCA Service Template.  A Relationship template is an instance of a specified Relationship Type and can provide customized properties, constraints or operations which override the defaults provided by its Relationship Type and its implementations.\r
- */\r
-\r
-class RelationshipTemplate {\r
-    var type: String? = null\r
-    var description: String? = null\r
-    var metadata: MutableMap<String, String>? = null\r
-    var properties: MutableMap<String, PropertyDefinition>? = null\r
-    var attributes: MutableMap<String, JsonNode>? = null\r
-    var interfaces: MutableMap<String, InterfaceDefinition>? = null\r
-    var copy: String? = null\r
-}\r
-\r
-/*\r
-3.7.2 Requirement assignment\r
-A Requirement assignment allows template authors to provide either concrete names of TOSCA templates or provide abstract selection criteria for providers to use to find matching TOSCA templates that are used to fulfill a named requirement’s declared TOSCA Node Type.\r
- */\r
-\r
-class RequirementAssignment {\r
-    @get:JsonIgnore\r
-    var id: String? = null\r
-    var capability: String? = null\r
-    var node: String? = null\r
-    //Relationship Type or Relationship Template\r
-    var relationship: String? = null\r
-}\r
-\r
-\r
-class Workflow {\r
-    @get:JsonIgnore\r
-    var id: String? = null\r
-    var description: String? = null\r
-    var steps: MutableMap<String, Step>? = null\r
-    var preconditions: ArrayList<PreConditionDefinition>? = null\r
-    var inputs: MutableMap<String, PropertyDefinition>? = null\r
-}\r
-\r
-\r
-class ConditionClause {\r
-    var and: ArrayList<MutableMap<String, Any>>? = null\r
-    var or: ArrayList<MutableMap<String, Any>>? = null\r
-    @get:JsonProperty("assert")\r
-    var assertConditions: ArrayList<MutableMap<String, Any>>? = null\r
-}\r
-\r
-/*\r
-3.9 Service Template definition\r
-A TOSCA Service Template (YAML) document contains element definitions of building blocks for cloud application, or complete models of cloud applications. This section describes the top-level structural elements (TOSCA keynames) along with their grammars, which are allowed to appear in a TOSCA Service Template document.\r
- */\r
-\r
-@JsonPropertyOrder(value = ["toscaDefinitionsVersion", "description", "metadata", "imports", "topologyTemplate"])\r
-class ServiceTemplate : Cloneable {\r
-    @get:JsonIgnore\r
-    var id: String? = null\r
-    @get:JsonProperty("tosca_definitions_version")\r
-    var toscaDefinitionsVersion: String = "controller_blueprint_1_0_0"\r
-    var metadata: MutableMap<String, String>? = null\r
-    var description: String? = null\r
-    @get:JsonProperty("dsl_definitions")\r
-    var dslDefinitions: MutableMap<String, Any>? = null\r
-    var repositories: MutableMap<String, RepositoryDefinition>? = null\r
-    var imports: MutableList<ImportDefinition>? = null\r
-    @get:JsonProperty("artifact_types")\r
-    var artifactTypes: MutableMap<String, ArtifactType>? = null\r
-    @get:JsonProperty("data_types")\r
-    var dataTypes: MutableMap<String, DataType>? = null\r
-    @get:JsonProperty("relationship_types")\r
-    var relationshipTypes: MutableMap<String, RelationshipType>? = null\r
-    @get:JsonProperty("node_types")\r
-    var nodeTypes: MutableMap<String, NodeType>? = null\r
-    @get:JsonProperty("policy_types")\r
-    var policyTypes: MutableMap<String, PolicyType>? = null\r
-    @get:JsonProperty("topology_template")\r
-    var topologyTemplate: TopologyTemplate? = null\r
-\r
-    override public fun clone(): ServiceTemplate {\r
-        return super.clone() as ServiceTemplate\r
-    }\r
-}\r
-\r
-class ToscaMetaData {\r
-    lateinit var toscaMetaFileVersion: String\r
-    lateinit var csarVersion: String\r
-    lateinit var createdBy: String\r
-    lateinit var entityDefinitions: String\r
-    var templateTags: String? = null\r
-}\r
-\r
+    @get:JsonIgnore
+    var id: String? = null
+    var description: String? = null
+    lateinit var type: String
+    var metadata: MutableMap<String, String>? = null
+    var directives: MutableList<String>? = null
+    //@get:JsonSerialize(using = PropertyDefinitionValueSerializer::class)
+    var properties: MutableMap<String, JsonNode>? = null
+    var attributes: MutableMap<String, JsonNode>? = null
+    var capabilities: MutableMap<String, CapabilityAssignment>? = null
+    var requirements: MutableMap<String, RequirementAssignment>? = null
+    var interfaces: MutableMap<String, InterfaceAssignment>? = null
+    var artifacts: MutableMap<String, ArtifactDefinition>? = null
+    @get:JsonProperty("node_filter")
+    var nodeFilter: NodeFilterDefinition? = null
+    var copy: String? = null
+}
+
+class OperationAssignment {
+    @get:JsonIgnore
+    var id: String? = null
+    var description: String? = null
+    var implementation: Implementation? = null
+    var inputs: MutableMap<String, JsonNode>? = null
+    var outputs: MutableMap<String, JsonNode>? = null
+}
+
+/*
+3.7.4 Relationship Template
+A Relationship Template specifies the occurrence of a manageable relationship between node templates as part of an application’s topology model that is defined in a TOSCA Service Template.  A Relationship template is an instance of a specified Relationship Type and can provide customized properties, constraints or operations which override the defaults provided by its Relationship Type and its implementations.
+ */
+
+class RelationshipTemplate {
+    var type: String? = null
+    var description: String? = null
+    var metadata: MutableMap<String, String>? = null
+    var properties: MutableMap<String, PropertyDefinition>? = null
+    var attributes: MutableMap<String, JsonNode>? = null
+    var interfaces: MutableMap<String, InterfaceDefinition>? = null
+    var copy: String? = null
+}
+
+/*
+3.7.2 Requirement assignment
+A Requirement assignment allows template authors to provide either concrete names of TOSCA templates or provide abstract selection criteria for providers to use to find matching TOSCA templates that are used to fulfill a named requirement’s declared TOSCA Node Type.
+ */
+
+class RequirementAssignment {
+    @get:JsonIgnore
+    var id: String? = null
+    var capability: String? = null
+    var node: String? = null
+    //Relationship Type or Relationship Template
+    var relationship: String? = null
+}
+
+
+class Workflow {
+    @get:JsonIgnore
+    var id: String? = null
+    var description: String? = null
+    var steps: MutableMap<String, Step>? = null
+    var preconditions: ArrayList<PreConditionDefinition>? = null
+    var inputs: MutableMap<String, PropertyDefinition>? = null
+}
+
+
+class ConditionClause {
+    var and: ArrayList<MutableMap<String, Any>>? = null
+    var or: ArrayList<MutableMap<String, Any>>? = null
+    @get:JsonProperty("assert")
+    var assertConditions: ArrayList<MutableMap<String, Any>>? = null
+}
+
+/*
+3.9 Service Template definition
+A TOSCA Service Template (YAML) document contains element definitions of building blocks for cloud application, or complete models of cloud applications. This section describes the top-level structural elements (TOSCA keynames) along with their grammars, which are allowed to appear in a TOSCA Service Template document.
+ */
+
+@JsonPropertyOrder(value = ["toscaDefinitionsVersion", "description", "metadata", "imports", "topologyTemplate"])
+class ServiceTemplate : Cloneable {
+    @get:JsonIgnore
+    var id: String? = null
+    @get:JsonProperty("tosca_definitions_version")
+    var toscaDefinitionsVersion: String = "controller_blueprint_1_0_0"
+    var metadata: MutableMap<String, String>? = null
+    var description: String? = null
+    @get:JsonProperty("dsl_definitions")
+    var dslDefinitions: MutableMap<String, Any>? = null
+    var repositories: MutableMap<String, RepositoryDefinition>? = null
+    var imports: MutableList<ImportDefinition>? = null
+    @get:JsonProperty("artifact_types")
+    var artifactTypes: MutableMap<String, ArtifactType>? = null
+    @get:JsonProperty("data_types")
+    var dataTypes: MutableMap<String, DataType>? = null
+    @get:JsonProperty("relationship_types")
+    var relationshipTypes: MutableMap<String, RelationshipType>? = null
+    @get:JsonProperty("node_types")
+    var nodeTypes: MutableMap<String, NodeType>? = null
+    @get:JsonProperty("policy_types")
+    var policyTypes: MutableMap<String, PolicyType>? = null
+    @get:JsonProperty("topology_template")
+    var topologyTemplate: TopologyTemplate? = null
+
+    override public fun clone(): ServiceTemplate {
+        return super.clone() as ServiceTemplate
+    }
+}
+
+class ToscaMetaData {
+    lateinit var toscaMetaFileVersion: String
+    lateinit var csarVersion: String
+    lateinit var createdBy: String
+    lateinit var entityDefinitions: String
+    var templateTags: String? = null
+}
+
@@ -1,45 +1,45 @@
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.factory\r
-\r
-\r
-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintValidatorDefaultService\r
-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintValidatorService\r
-\r
-/**\r
- *\r
- *\r
- * @author Brinda Santh\r
- */\r
-\r
-object BluePrintValidatorFactory {\r
-\r
-    var bluePrintValidatorServices: MutableMap<String, BluePrintValidatorService> = HashMap()\r
-\r
-    init {\r
-        bluePrintValidatorServices[org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants.TYPE_DEFAULT] = BluePrintValidatorDefaultService()\r
-    }\r
-\r
-    fun register(key:String, bluePrintValidatorService: BluePrintValidatorService){\r
-        bluePrintValidatorServices[key] = bluePrintValidatorService\r
-    }\r
-\r
-    fun instance(key : String) : BluePrintValidatorService?{\r
-        return bluePrintValidatorServices[key]\r
-    }\r
-\r
+/*
+ * 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.factory
+
+
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintValidatorDefaultService
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintValidatorService
+
+/**
+ *
+ *
+ * @author Brinda Santh
+ */
+
+object BluePrintValidatorFactory {
+
+    var bluePrintValidatorServices: MutableMap<String, BluePrintValidatorService> = HashMap()
+
+    init {
+        bluePrintValidatorServices[org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants.TYPE_DEFAULT] = BluePrintValidatorDefaultService()
+    }
+
+    fun register(key:String, bluePrintValidatorService: BluePrintValidatorService){
+        bluePrintValidatorServices[key] = bluePrintValidatorService
+    }
+
+    fun instance(key : String) : BluePrintValidatorService?{
+        return bluePrintValidatorServices[key]
+    }
+
 }
\ No newline at end of file
@@ -1,47 +1,47 @@
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- * Modifications Copyright © 2018 IBM.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.interfaces\r
-\r
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException\r
-import org.onap.ccsdk.apps.controllerblueprints.core.data.*\r
-import java.io.Serializable\r
-\r
-/**\r
- * BluePrintRepoFileService\r
- * @author Brinda Santh\r
- *\r
- */\r
-\r
-interface BluePrintRepoService : Serializable {\r
-\r
-    @Throws(BluePrintException::class)\r
-    fun getNodeType(nodeTypeName: String): NodeType\r
-\r
-    @Throws(BluePrintException::class)\r
-    fun getDataType(dataTypeName: String): DataType\r
-\r
-    @Throws(BluePrintException::class)\r
-    fun getArtifactType(artifactTypeName: String): ArtifactType\r
-\r
-    @Throws(BluePrintException::class)\r
-    fun getRelationshipType(relationshipTypeName: String): RelationshipType\r
-\r
-    @Throws(BluePrintException::class)\r
-    fun getCapabilityDefinition(capabilityDefinitionName: String): CapabilityDefinition\r
-\r
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
+ *
+ * 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.interfaces
+
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
+import org.onap.ccsdk.apps.controllerblueprints.core.data.*
+import java.io.Serializable
+
+/**
+ * BluePrintRepoFileService
+ * @author Brinda Santh
+ *
+ */
+
+interface BluePrintRepoService : Serializable {
+
+    @Throws(BluePrintException::class)
+    fun getNodeType(nodeTypeName: String): NodeType
+
+    @Throws(BluePrintException::class)
+    fun getDataType(dataTypeName: String): DataType
+
+    @Throws(BluePrintException::class)
+    fun getArtifactType(artifactTypeName: String): ArtifactType
+
+    @Throws(BluePrintException::class)
+    fun getRelationshipType(relationshipTypeName: String): RelationshipType
+
+    @Throws(BluePrintException::class)
+    fun getCapabilityDefinition(capabilityDefinitionName: String): CapabilityDefinition
+
 }
\ No newline at end of file
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.service\r
-\r
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintTypes\r
-import org.onap.ccsdk.apps.controllerblueprints.core.data.*\r
-/**\r
- *\r
- *\r
- * @author Brinda Santh\r
- */\r
-class BluePrintChainedService {\r
-    var bpc : BluePrintContext\r
-\r
-    constructor(bpc : BluePrintContext){\r
-        this.bpc = bpc\r
-    }\r
-\r
-    fun nodeTypeChained(nodeTypeName: String): NodeType {\r
-\r
-        val nodeType: NodeType = bpc.nodeTypeByName(nodeTypeName)\r
-        val attributes = hashMapOf<String, AttributeDefinition>()\r
-        val properties = hashMapOf<String, PropertyDefinition>()\r
-        val requirements = hashMapOf<String, RequirementDefinition>()\r
-        val capabilities = hashMapOf<String, CapabilityDefinition>()\r
-        val interfaces = hashMapOf<String, InterfaceDefinition>()\r
-        val artifacts = hashMapOf<String, ArtifactDefinition>()\r
-\r
-        recNodeTypesChained(nodeTypeName).forEach { nodeType ->\r
-\r
-            val subAttributes =  bpc.nodeTypeByName(nodeType.id!!).attributes\r
-            if (subAttributes != null) {\r
-                attributes.putAll(subAttributes)\r
-            }\r
-\r
-            val subProperties =  bpc.nodeTypeByName(nodeType.id!!).properties\r
-            if (subProperties != null) {\r
-                properties.putAll(subProperties)\r
-            }\r
-\r
-            val subRequirements =  bpc.nodeTypeByName(nodeType.id!!).requirements\r
-            if (subRequirements != null) {\r
-                requirements.putAll(subRequirements)\r
-            }\r
-            val subCapabilities =  bpc.nodeTypeByName(nodeType.id!!).capabilities\r
-            if (subCapabilities != null) {\r
-                capabilities.putAll(subCapabilities)\r
-            }\r
-            val subInterfaces =  bpc.nodeTypeByName(nodeType.id!!).interfaces\r
-            if (subInterfaces != null) {\r
-                interfaces.putAll(subInterfaces)\r
-            }\r
-\r
-            val subArtifacts =  bpc.nodeTypeByName(nodeType.id!!).artifacts\r
-            if (subArtifacts != null) {\r
-                artifacts.putAll(subArtifacts)\r
-            }\r
-        }\r
-        nodeType.attributes = attributes\r
-        nodeType.properties = properties\r
-        nodeType.requirements = requirements\r
-        nodeType.capabilities = capabilities\r
-        nodeType.interfaces = interfaces\r
-        nodeType.artifacts = artifacts\r
-        return nodeType\r
-    }\r
-\r
-    fun nodeTypeChainedProperties(nodeTypeName: String): MutableMap<String, PropertyDefinition>? {\r
-        val nodeType =  bpc.nodeTypeByName(nodeTypeName)\r
-        val properties = hashMapOf<String, PropertyDefinition>()\r
-\r
-        recNodeTypesChained(nodeTypeName).forEach { nodeType ->\r
-            val subProperties =  bpc.nodeTypeByName(nodeType.id!!).properties\r
-            if (subProperties != null) {\r
-                properties.putAll(subProperties)\r
-            }\r
-        }\r
-        return properties\r
-    }\r
-\r
-    private fun recNodeTypesChained(nodeTypeName: String, nodeTypes: MutableList<NodeType>? = arrayListOf()): MutableList<NodeType> {\r
-        val nodeType: NodeType =  bpc.nodeTypeByName(nodeTypeName)\r
-        nodeType.id = nodeTypeName\r
-        val derivedFrom: String = nodeType.derivedFrom\r
-        if (!BluePrintTypes.rootNodeTypes().contains(derivedFrom)) {\r
-            recNodeTypesChained(derivedFrom, nodeTypes)\r
-        }\r
-        nodeTypes!!.add(nodeType)\r
-        return nodeTypes\r
-    }\r
-\r
-    private fun recDataTypesChained(dataTypeName: String, dataTypes: MutableList<DataType>? = arrayListOf()): MutableList<DataType> {\r
-        val dataType: DataType =  bpc.dataTypeByName(dataTypeName)!!\r
-        dataType.id = dataTypeName\r
-        val derivedFrom: String = dataType.derivedFrom\r
-        if (!BluePrintTypes.rootDataTypes().contains(derivedFrom)) {\r
-            recDataTypesChained(derivedFrom, dataTypes)\r
-        }\r
-        dataTypes!!.add(dataType)\r
-        return dataTypes\r
-    }\r
-\r
+/*
+ * 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.service
+
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintTypes
+import org.onap.ccsdk.apps.controllerblueprints.core.data.*
+/**
+ *
+ *
+ * @author Brinda Santh
+ */
+class BluePrintChainedService {
+    var bpc : BluePrintContext
+
+    constructor(bpc : BluePrintContext){
+        this.bpc = bpc
+    }
+
+    fun nodeTypeChained(nodeTypeName: String): NodeType {
+
+        val nodeType: NodeType = bpc.nodeTypeByName(nodeTypeName)
+        val attributes = hashMapOf<String, AttributeDefinition>()
+        val properties = hashMapOf<String, PropertyDefinition>()
+        val requirements = hashMapOf<String, RequirementDefinition>()
+        val capabilities = hashMapOf<String, CapabilityDefinition>()
+        val interfaces = hashMapOf<String, InterfaceDefinition>()
+        val artifacts = hashMapOf<String, ArtifactDefinition>()
+
+        recNodeTypesChained(nodeTypeName).forEach { nodeType ->
+
+            val subAttributes =  bpc.nodeTypeByName(nodeType.id!!).attributes
+            if (subAttributes != null) {
+                attributes.putAll(subAttributes)
+            }
+
+            val subProperties =  bpc.nodeTypeByName(nodeType.id!!).properties
+            if (subProperties != null) {
+                properties.putAll(subProperties)
+            }
+
+            val subRequirements =  bpc.nodeTypeByName(nodeType.id!!).requirements
+            if (subRequirements != null) {
+                requirements.putAll(subRequirements)
+            }
+            val subCapabilities =  bpc.nodeTypeByName(nodeType.id!!).capabilities
+            if (subCapabilities != null) {
+                capabilities.putAll(subCapabilities)
+            }
+            val subInterfaces =  bpc.nodeTypeByName(nodeType.id!!).interfaces
+            if (subInterfaces != null) {
+                interfaces.putAll(subInterfaces)
+            }
+
+            val subArtifacts =  bpc.nodeTypeByName(nodeType.id!!).artifacts
+            if (subArtifacts != null) {
+                artifacts.putAll(subArtifacts)
+            }
+        }
+        nodeType.attributes = attributes
+        nodeType.properties = properties
+        nodeType.requirements = requirements
+        nodeType.capabilities = capabilities
+        nodeType.interfaces = interfaces
+        nodeType.artifacts = artifacts
+        return nodeType
+    }
+
+    fun nodeTypeChainedProperties(nodeTypeName: String): MutableMap<String, PropertyDefinition>? {
+        val nodeType =  bpc.nodeTypeByName(nodeTypeName)
+        val properties = hashMapOf<String, PropertyDefinition>()
+
+        recNodeTypesChained(nodeTypeName).forEach { nodeType ->
+            val subProperties =  bpc.nodeTypeByName(nodeType.id!!).properties
+            if (subProperties != null) {
+                properties.putAll(subProperties)
+            }
+        }
+        return properties
+    }
+
+    private fun recNodeTypesChained(nodeTypeName: String, nodeTypes: MutableList<NodeType>? = arrayListOf()): MutableList<NodeType> {
+        val nodeType: NodeType =  bpc.nodeTypeByName(nodeTypeName)
+        nodeType.id = nodeTypeName
+        val derivedFrom: String = nodeType.derivedFrom
+        if (!BluePrintTypes.rootNodeTypes().contains(derivedFrom)) {
+            recNodeTypesChained(derivedFrom, nodeTypes)
+        }
+        nodeTypes!!.add(nodeType)
+        return nodeTypes
+    }
+
+    private fun recDataTypesChained(dataTypeName: String, dataTypes: MutableList<DataType>? = arrayListOf()): MutableList<DataType> {
+        val dataType: DataType =  bpc.dataTypeByName(dataTypeName)!!
+        dataType.id = dataTypeName
+        val derivedFrom: String = dataType.derivedFrom
+        if (!BluePrintTypes.rootDataTypes().contains(derivedFrom)) {
+            recDataTypesChained(derivedFrom, dataTypes)
+        }
+        dataTypes!!.add(dataType)
+        return dataTypes
+    }
+
 }
\ No newline at end of file
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-@file:Suppress("unused")\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.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 org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants\r
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException\r
-import org.onap.ccsdk.apps.controllerblueprints.core.data.*\r
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils\r
-\r
-/**\r
- *\r
- *\r
- * @author Brinda Santh\r
- */\r
-class BluePrintContext(val serviceTemplate: ServiceTemplate) {\r
-\r
-    private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())\r
-\r
-    /**\r
-     * Blueprint CBA extracted file location\r
-     */\r
-    var rootPath = "."\r
-    /**\r
-     * Root Definition file path\r
-     */\r
-    var entryDefinition = ""\r
-\r
-    val imports: List<ImportDefinition>? = serviceTemplate.imports\r
-\r
-    val metadata: MutableMap<String, String>? = serviceTemplate.metadata\r
-\r
-    val dataTypes: MutableMap<String, DataType>? = serviceTemplate.dataTypes\r
-\r
-    val inputs: MutableMap<String, PropertyDefinition>? = serviceTemplate.topologyTemplate?.inputs\r
-\r
-    fun blueprintJson(pretty: Boolean = false): String = print("json", pretty)\r
-\r
-    private fun print(type: String? = "json", pretty: Boolean = false): String {\r
-        return JacksonUtils.getJson(serviceTemplate, pretty)\r
-    }\r
-\r
-    fun name(): String = metadata?.get(BluePrintConstants.METADATA_TEMPLATE_NAME)\r
-            ?: throw BluePrintException("could't get template name from meta data")\r
-\r
-    fun version(): String = metadata?.get(BluePrintConstants.METADATA_TEMPLATE_VERSION)\r
-            ?: throw BluePrintException("could't get template version from meta data")\r
-\r
-    fun author(): String = metadata?.get(BluePrintConstants.METADATA_TEMPLATE_AUTHOR)\r
-            ?: throw BluePrintException("could't get template author from meta data")\r
-\r
-    // Workflow\r
-    val workflows: MutableMap<String, Workflow>? = serviceTemplate.topologyTemplate?.workflows\r
-\r
-    fun workflowByName(workFlowName: String): Workflow = workflows?.get(workFlowName)\r
-            ?: throw BluePrintException("could't get workflow($workFlowName)")\r
-\r
-    fun workflowInputs(workFlowName: String) = workflowByName(workFlowName).inputs\r
-\r
-    fun workflowStepByName(workFlowName: String, stepName: String): Step {\r
-        return workflowByName(workFlowName).steps?.get(stepName)\r
-                ?: throw BluePrintException("could't get step($stepName) for workflow($workFlowName)")\r
-    }\r
-\r
-    fun workflowStepNodeTemplate(workFlowName: String, stepName: String): String {\r
-        return workflowStepByName(workFlowName, stepName).target\r
-                ?: throw BluePrintException("could't get node template name for workflow($workFlowName)'s step($stepName)")\r
-    }\r
-\r
-    fun workflowFirstStepNodeTemplate(workFlowName: String): String {\r
-        val firstStepName = workflowByName(workFlowName).steps?.keys?.first()\r
-                ?: throw BluePrintException("could't get first step for workflow($workFlowName)")\r
-        return workflowStepNodeTemplate(workFlowName, firstStepName)\r
-    }\r
-\r
-    fun workflowStepFirstCallOperation(workFlowName: String, stepName: String): String {\r
-        return workflowStepByName(workFlowName, stepName).activities?.filter { it.callOperation != null }?.single()?.callOperation\r
-                ?: throw BluePrintException("could't get first callOperation for WorkFlow($workFlowName) ")\r
-    }\r
-\r
-    // Data Type\r
-    fun dataTypeByName(name: String): DataType? = dataTypes?.get(name)\r
-\r
-    // Artifact Type\r
-    val artifactTypes: MutableMap<String, ArtifactType>? = serviceTemplate.artifactTypes\r
-\r
-    // Policy Types\r
-    val policyTypes: MutableMap<String, PolicyType>? = serviceTemplate.policyTypes\r
-\r
-    fun policyTypeByName(policyName: String) = policyTypes?.get(policyName)\r
-            ?: throw BluePrintException("could't get policy type for the name($policyName)")\r
-\r
-    fun policyTypesDerivedFrom(name: String): MutableMap<String, PolicyType>? {\r
-        return policyTypes?.filterValues { policyType -> policyType.derivedFrom == name }?.toMutableMap()\r
-    }\r
-\r
-    fun policyTypesTarget(target: String): MutableMap<String, PolicyType>? {\r
-        return policyTypes?.filterValues { it.targets.contains(target) }?.toMutableMap()\r
-    }\r
-\r
-    fun policyTypesTargetNDerivedFrom(target: String, derivedFrom: String): MutableMap<String, PolicyType>? {\r
-        return policyTypesDerivedFrom(derivedFrom)?.filterValues {\r
-            it.targets.contains(target)\r
-        }?.toMutableMap()\r
-    }\r
-\r
-    // Node Type Methods\r
-    val nodeTypes: MutableMap<String, NodeType>? = serviceTemplate.nodeTypes\r
-\r
-    fun nodeTypeByName(name: String): NodeType =\r
-            nodeTypes?.get(name)\r
-                    ?: throw BluePrintException("could't get node type for the name($name)")\r
-\r
-    fun nodeTypeDerivedFrom(name: String): MutableMap<String, NodeType>? {\r
-        return nodeTypes?.filterValues { nodeType -> nodeType.derivedFrom == name }?.toMutableMap()\r
-    }\r
-\r
-    fun nodeTypeInterface(nodeTypeName: String, interfaceName: String): InterfaceDefinition {\r
-        return nodeTypeByName(nodeTypeName).interfaces?.get(interfaceName)\r
-                ?: throw BluePrintException("could't get node type($nodeTypeName)'s interface definition($interfaceName)")\r
-    }\r
-\r
-    fun nodeTypeInterfaceOperation(nodeTypeName: String, interfaceName: String, operationName: String): OperationDefinition {\r
-        return nodeTypeInterface(nodeTypeName, interfaceName).operations?.get(operationName)\r
-                ?: throw BluePrintException("could't get node type($nodeTypeName)'s interface definition($interfaceName) operation definition($operationName)")\r
-    }\r
-\r
-    fun interfaceNameForNodeType(nodeTypeName: String): String {\r
-        return nodeTypeByName(nodeTypeName).interfaces?.keys?.first()\r
-                ?: throw BluePrintException("could't get NodeType($nodeTypeName)'s first InterfaceDefinition name")\r
-    }\r
-\r
-    fun nodeTypeInterfaceOperationInputs(nodeTypeName: String, interfaceName: String, operationName: String): MutableMap<String, PropertyDefinition>? {\r
-        return nodeTypeInterfaceOperation(nodeTypeName, interfaceName, operationName).inputs\r
-    }\r
-\r
-    fun nodeTypeInterfaceOperationOutputs(nodeTypeName: String, interfaceName: String, operationName: String): MutableMap<String, PropertyDefinition>? {\r
-        return nodeTypeInterfaceOperation(nodeTypeName, interfaceName, operationName).outputs\r
-    }\r
-\r
-    // Node Template Methods\r
-    val nodeTemplates: MutableMap<String, NodeTemplate>? = serviceTemplate.topologyTemplate?.nodeTemplates\r
-\r
-    fun nodeTemplateByName(name: String): NodeTemplate =\r
-            nodeTemplates?.get(name) ?: throw BluePrintException("could't get node template for the name($name)")\r
-\r
-    fun nodeTemplateForNodeType(name: String): MutableMap<String, NodeTemplate>? {\r
-        return nodeTemplates?.filterValues { nodeTemplate -> nodeTemplate.type == name }?.toMutableMap()\r
-    }\r
-\r
-    fun nodeTemplateNodeType(nodeTemplateName: String): NodeType {\r
-        val nodeTemplateType: String = nodeTemplateByName(nodeTemplateName).type\r
-        return nodeTypeByName(nodeTemplateType)\r
-    }\r
-\r
-    fun nodeTemplateProperty(nodeTemplateName: String, propertyName: String): Any? {\r
-        return nodeTemplateByName(nodeTemplateName).properties?.get(propertyName)\r
-    }\r
-\r
-    fun nodeTemplateArtifacts(nodeTemplateName: String): MutableMap<String, ArtifactDefinition>? {\r
-        return nodeTemplateByName(nodeTemplateName).artifacts\r
-    }\r
-\r
-    fun nodeTemplateArtifact(nodeTemplateName: String, artifactName: String): ArtifactDefinition {\r
-        return nodeTemplateArtifacts(nodeTemplateName)?.get(artifactName)\r
-                ?: throw BluePrintException("could't get NodeTemplate($nodeTemplateName)'s ArtifactDefinition($artifactName)")\r
-    }\r
-\r
-    fun nodeTemplateArtifactForArtifactType(nodeTemplateName: String, artifactType: String): ArtifactDefinition {\r
-        return nodeTemplateArtifacts(nodeTemplateName)?.filter { it.value.type == artifactType }?.map { it.value }?.get(0)\r
-                ?: throw BluePrintException("could't get NodeTemplate($nodeTemplateName)'s Artifact Type($artifactType)")\r
-    }\r
-\r
-    fun nodeTemplateFirstInterface(nodeTemplateName: String): InterfaceAssignment {\r
-        return nodeTemplateByName(nodeTemplateName).interfaces?.values?.first()\r
-                ?: throw BluePrintException("could't get NodeTemplate($nodeTemplateName)'s first InterfaceAssignment")\r
-    }\r
-\r
-    fun nodeTemplateFirstInterfaceName(nodeTemplateName: String): String {\r
-        return nodeTemplateByName(nodeTemplateName).interfaces?.keys?.first()\r
-                ?: throw BluePrintException("could't get NodeTemplate($nodeTemplateName)'s first InterfaceAssignment name")\r
-    }\r
-\r
-    fun nodeTemplateFirstInterfaceFirstOperationName(nodeTemplateName: String): String {\r
-        return nodeTemplateFirstInterface(nodeTemplateName).operations?.keys?.first()\r
-                ?: throw BluePrintException("could't get NodeTemplate($nodeTemplateName)'s first InterfaceAssignment's first OperationAssignment name")\r
-    }\r
-\r
-    fun nodeTemplateInterfaceOperationInputs(nodeTemplateName: String, interfaceName: String, operationName: String): MutableMap<String, JsonNode>? {\r
-        return nodeTemplateInterfaceOperation(nodeTemplateName, interfaceName, operationName).inputs\r
-    }\r
-\r
-    fun nodeTemplateInterfaceOperationOutputs(nodeTemplateName: String, interfaceName: String, operationName: String): MutableMap<String, JsonNode>? {\r
-        return nodeTemplateInterfaceOperation(nodeTemplateName, interfaceName, operationName).outputs\r
-    }\r
-\r
-    fun nodeTemplateInterface(nodeTemplateName: String, interfaceName: String): InterfaceAssignment {\r
-        return nodeTemplateByName(nodeTemplateName).interfaces?.get(interfaceName)\r
-                ?: throw BluePrintException("could't get NodeTemplate($nodeTemplateName)'s InterfaceAssignment($interfaceName)")\r
-    }\r
-\r
-    fun nodeTemplateInterfaceOperation(nodeTemplateName: String, interfaceName: String, operationName: String): OperationAssignment {\r
-        return nodeTemplateInterface(nodeTemplateName, interfaceName).operations?.get(operationName)\r
-                ?: throw BluePrintException("could't get NodeTemplate($nodeTemplateName)'s InterfaceAssignment($interfaceName) OperationAssignment($operationName)")\r
-    }\r
-\r
-    fun nodeTemplateCapability(nodeTemplateName: String, capabilityName: String): CapabilityAssignment {\r
-        return nodeTemplateByName(nodeTemplateName).capabilities?.get(capabilityName)\r
-                ?: throw BluePrintException("could't get NodeTemplate($nodeTemplateName)'s CapabilityAssignment($capabilityName)")\r
-    }\r
-\r
-    fun nodeTemplateRequirement(nodeTemplateName: String, requirementName: String): RequirementAssignment {\r
-        return nodeTemplateByName(nodeTemplateName).requirements?.get(requirementName)\r
-                ?: throw BluePrintException("could't get NodeTemplate($nodeTemplateName)'s first RequirementAssignment($requirementName)")\r
-    }\r
-\r
-    fun nodeTemplateRequirementNode(nodeTemplateName: String, requirementName: String): NodeTemplate {\r
-        val filteredNodeTemplateName: String = nodeTemplateByName(nodeTemplateName).requirements?.get(requirementName)?.node\r
-                ?: throw BluePrintException("could't NodeTemplate for NodeTemplate's($nodeTemplateName) requirement's ($requirementName) ")\r
-        return nodeTemplateByName(filteredNodeTemplateName)\r
-    }\r
-\r
-    fun nodeTemplateCapabilityProperty(nodeTemplateName: String, capabilityName: String, propertyName: String): Any? {\r
-        return nodeTemplateCapability(nodeTemplateName, capabilityName).properties?.get(propertyName)\r
-    }\r
-\r
-    // Chained Functions\r
-\r
-    fun nodeTypeChained(nodeTypeName: String): NodeType {\r
-        return BluePrintChainedService(this).nodeTypeChained(nodeTypeName)\r
-    }\r
-\r
-    fun nodeTypeChainedProperties(nodeTypeName: String): MutableMap<String, PropertyDefinition>? {\r
-        return BluePrintChainedService(this).nodeTypeChainedProperties(nodeTypeName)\r
-    }\r
-\r
+/*
+ * 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.
+ */
+@file:Suppress("unused")
+
+package org.onap.ccsdk.apps.controllerblueprints.core.service
+
+import com.att.eelf.configuration.EELFLogger
+import com.att.eelf.configuration.EELFManager
+import com.fasterxml.jackson.databind.JsonNode
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
+import org.onap.ccsdk.apps.controllerblueprints.core.data.*
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
+
+/**
+ *
+ *
+ * @author Brinda Santh
+ */
+class BluePrintContext(val serviceTemplate: ServiceTemplate) {
+
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())
+
+    /**
+     * Blueprint CBA extracted file location
+     */
+    var rootPath = "."
+    /**
+     * Root Definition file path
+     */
+    var entryDefinition = ""
+
+    val imports: List<ImportDefinition>? = serviceTemplate.imports
+
+    val metadata: MutableMap<String, String>? = serviceTemplate.metadata
+
+    val dataTypes: MutableMap<String, DataType>? = serviceTemplate.dataTypes
+
+    val inputs: MutableMap<String, PropertyDefinition>? = serviceTemplate.topologyTemplate?.inputs
+
+    fun blueprintJson(pretty: Boolean = false): String = print("json", pretty)
+
+    private fun print(type: String? = "json", pretty: Boolean = false): String {
+        return JacksonUtils.getJson(serviceTemplate, pretty)
+    }
+
+    fun name(): String = metadata?.get(BluePrintConstants.METADATA_TEMPLATE_NAME)
+            ?: throw BluePrintException("could't get template name from meta data")
+
+    fun version(): String = metadata?.get(BluePrintConstants.METADATA_TEMPLATE_VERSION)
+            ?: throw BluePrintException("could't get template version from meta data")
+
+    fun author(): String = metadata?.get(BluePrintConstants.METADATA_TEMPLATE_AUTHOR)
+            ?: throw BluePrintException("could't get template author from meta data")
+
+    // Workflow
+    val workflows: MutableMap<String, Workflow>? = serviceTemplate.topologyTemplate?.workflows
+
+    fun workflowByName(workFlowName: String): Workflow = workflows?.get(workFlowName)
+            ?: throw BluePrintException("could't get workflow($workFlowName)")
+
+    fun workflowInputs(workFlowName: String) = workflowByName(workFlowName).inputs
+
+    fun workflowStepByName(workFlowName: String, stepName: String): Step {
+        return workflowByName(workFlowName).steps?.get(stepName)
+                ?: throw BluePrintException("could't get step($stepName) for workflow($workFlowName)")
+    }
+
+    fun workflowStepNodeTemplate(workFlowName: String, stepName: String): String {
+        return workflowStepByName(workFlowName, stepName).target
+                ?: throw BluePrintException("could't get node template name for workflow($workFlowName)'s step($stepName)")
+    }
+
+    fun workflowFirstStepNodeTemplate(workFlowName: String): String {
+        val firstStepName = workflowByName(workFlowName).steps?.keys?.first()
+                ?: throw BluePrintException("could't get first step for workflow($workFlowName)")
+        return workflowStepNodeTemplate(workFlowName, firstStepName)
+    }
+
+    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) ")
+    }
+
+    // Data Type
+    fun dataTypeByName(name: String): DataType? = dataTypes?.get(name)
+
+    // Artifact Type
+    val artifactTypes: MutableMap<String, ArtifactType>? = serviceTemplate.artifactTypes
+
+    // Policy Types
+    val policyTypes: MutableMap<String, PolicyType>? = serviceTemplate.policyTypes
+
+    fun policyTypeByName(policyName: String) = policyTypes?.get(policyName)
+            ?: throw BluePrintException("could't get policy type for the name($policyName)")
+
+    fun policyTypesDerivedFrom(name: String): MutableMap<String, PolicyType>? {
+        return policyTypes?.filterValues { policyType -> policyType.derivedFrom == name }?.toMutableMap()
+    }
+
+    fun policyTypesTarget(target: String): MutableMap<String, PolicyType>? {
+        return policyTypes?.filterValues { it.targets.contains(target) }?.toMutableMap()
+    }
+
+    fun policyTypesTargetNDerivedFrom(target: String, derivedFrom: String): MutableMap<String, PolicyType>? {
+        return policyTypesDerivedFrom(derivedFrom)?.filterValues {
+            it.targets.contains(target)
+        }?.toMutableMap()
+    }
+
+    // Node Type Methods
+    val nodeTypes: MutableMap<String, NodeType>? = serviceTemplate.nodeTypes
+
+    fun nodeTypeByName(name: String): NodeType =
+            nodeTypes?.get(name)
+                    ?: throw BluePrintException("could't get node type for the name($name)")
+
+    fun nodeTypeDerivedFrom(name: String): MutableMap<String, NodeType>? {
+        return nodeTypes?.filterValues { nodeType -> nodeType.derivedFrom == name }?.toMutableMap()
+    }
+
+    fun nodeTypeInterface(nodeTypeName: String, interfaceName: String): InterfaceDefinition {
+        return nodeTypeByName(nodeTypeName).interfaces?.get(interfaceName)
+                ?: throw BluePrintException("could't get node type($nodeTypeName)'s interface definition($interfaceName)")
+    }
+
+    fun nodeTypeInterfaceOperation(nodeTypeName: String, interfaceName: String, operationName: String): OperationDefinition {
+        return nodeTypeInterface(nodeTypeName, interfaceName).operations?.get(operationName)
+                ?: throw BluePrintException("could't get node type($nodeTypeName)'s interface definition($interfaceName) operation definition($operationName)")
+    }
+
+    fun interfaceNameForNodeType(nodeTypeName: String): String {
+        return nodeTypeByName(nodeTypeName).interfaces?.keys?.first()
+                ?: throw BluePrintException("could't get NodeType($nodeTypeName)'s first InterfaceDefinition name")
+    }
+
+    fun nodeTypeInterfaceOperationInputs(nodeTypeName: String, interfaceName: String, operationName: String): MutableMap<String, PropertyDefinition>? {
+        return nodeTypeInterfaceOperation(nodeTypeName, interfaceName, operationName).inputs
+    }
+
+    fun nodeTypeInterfaceOperationOutputs(nodeTypeName: String, interfaceName: String, operationName: String): MutableMap<String, PropertyDefinition>? {
+        return nodeTypeInterfaceOperation(nodeTypeName, interfaceName, operationName).outputs
+    }
+
+    // Node Template Methods
+    val nodeTemplates: MutableMap<String, NodeTemplate>? = serviceTemplate.topologyTemplate?.nodeTemplates
+
+    fun nodeTemplateByName(name: String): NodeTemplate =
+            nodeTemplates?.get(name) ?: throw BluePrintException("could't get node template for the name($name)")
+
+    fun nodeTemplateForNodeType(name: String): MutableMap<String, NodeTemplate>? {
+        return nodeTemplates?.filterValues { nodeTemplate -> nodeTemplate.type == name }?.toMutableMap()
+    }
+
+    fun nodeTemplateNodeType(nodeTemplateName: String): NodeType {
+        val nodeTemplateType: String = nodeTemplateByName(nodeTemplateName).type
+        return nodeTypeByName(nodeTemplateType)
+    }
+
+    fun nodeTemplateProperty(nodeTemplateName: String, propertyName: String): Any? {
+        return nodeTemplateByName(nodeTemplateName).properties?.get(propertyName)
+    }
+
+    fun nodeTemplateArtifacts(nodeTemplateName: String): MutableMap<String, ArtifactDefinition>? {
+        return nodeTemplateByName(nodeTemplateName).artifacts
+    }
+
+    fun nodeTemplateArtifact(nodeTemplateName: String, artifactName: String): ArtifactDefinition {
+        return nodeTemplateArtifacts(nodeTemplateName)?.get(artifactName)
+                ?: throw BluePrintException("could't get NodeTemplate($nodeTemplateName)'s ArtifactDefinition($artifactName)")
+    }
+
+    fun nodeTemplateArtifactForArtifactType(nodeTemplateName: String, artifactType: String): ArtifactDefinition {
+        return nodeTemplateArtifacts(nodeTemplateName)?.filter { it.value.type == artifactType }?.map { it.value }?.get(0)
+                ?: throw BluePrintException("could't get NodeTemplate($nodeTemplateName)'s Artifact Type($artifactType)")
+    }
+
+    fun nodeTemplateFirstInterface(nodeTemplateName: String): InterfaceAssignment {
+        return nodeTemplateByName(nodeTemplateName).interfaces?.values?.first()
+                ?: throw BluePrintException("could't get NodeTemplate($nodeTemplateName)'s first InterfaceAssignment")
+    }
+
+    fun nodeTemplateFirstInterfaceName(nodeTemplateName: String): String {
+        return nodeTemplateByName(nodeTemplateName).interfaces?.keys?.first()
+                ?: throw BluePrintException("could't get NodeTemplate($nodeTemplateName)'s first InterfaceAssignment name")
+    }
+
+    fun nodeTemplateFirstInterfaceFirstOperationName(nodeTemplateName: String): String {
+        return nodeTemplateFirstInterface(nodeTemplateName).operations?.keys?.first()
+                ?: throw BluePrintException("could't get NodeTemplate($nodeTemplateName)'s first InterfaceAssignment's first OperationAssignment name")
+    }
+
+    fun nodeTemplateInterfaceOperationInputs(nodeTemplateName: String, interfaceName: String, operationName: String): MutableMap<String, JsonNode>? {
+        return nodeTemplateInterfaceOperation(nodeTemplateName, interfaceName, operationName).inputs
+    }
+
+    fun nodeTemplateInterfaceOperationOutputs(nodeTemplateName: String, interfaceName: String, operationName: String): MutableMap<String, JsonNode>? {
+        return nodeTemplateInterfaceOperation(nodeTemplateName, interfaceName, operationName).outputs
+    }
+
+    fun nodeTemplateInterface(nodeTemplateName: String, interfaceName: String): InterfaceAssignment {
+        return nodeTemplateByName(nodeTemplateName).interfaces?.get(interfaceName)
+                ?: throw BluePrintException("could't get NodeTemplate($nodeTemplateName)'s InterfaceAssignment($interfaceName)")
+    }
+
+    fun nodeTemplateInterfaceOperation(nodeTemplateName: String, interfaceName: String, operationName: String): OperationAssignment {
+        return nodeTemplateInterface(nodeTemplateName, interfaceName).operations?.get(operationName)
+                ?: throw BluePrintException("could't get NodeTemplate($nodeTemplateName)'s InterfaceAssignment($interfaceName) OperationAssignment($operationName)")
+    }
+
+    fun nodeTemplateCapability(nodeTemplateName: String, capabilityName: String): CapabilityAssignment {
+        return nodeTemplateByName(nodeTemplateName).capabilities?.get(capabilityName)
+                ?: throw BluePrintException("could't get NodeTemplate($nodeTemplateName)'s CapabilityAssignment($capabilityName)")
+    }
+
+    fun nodeTemplateRequirement(nodeTemplateName: String, requirementName: String): RequirementAssignment {
+        return nodeTemplateByName(nodeTemplateName).requirements?.get(requirementName)
+                ?: throw BluePrintException("could't get NodeTemplate($nodeTemplateName)'s first RequirementAssignment($requirementName)")
+    }
+
+    fun nodeTemplateRequirementNode(nodeTemplateName: String, requirementName: String): NodeTemplate {
+        val filteredNodeTemplateName: String = nodeTemplateByName(nodeTemplateName).requirements?.get(requirementName)?.node
+                ?: throw BluePrintException("could't NodeTemplate for NodeTemplate's($nodeTemplateName) requirement's ($requirementName) ")
+        return nodeTemplateByName(filteredNodeTemplateName)
+    }
+
+    fun nodeTemplateCapabilityProperty(nodeTemplateName: String, capabilityName: String, propertyName: String): Any? {
+        return nodeTemplateCapability(nodeTemplateName, capabilityName).properties?.get(propertyName)
+    }
+
+    // Chained Functions
+
+    fun nodeTypeChained(nodeTypeName: String): NodeType {
+        return BluePrintChainedService(this).nodeTypeChained(nodeTypeName)
+    }
+
+    fun nodeTypeChainedProperties(nodeTypeName: String): MutableMap<String, PropertyDefinition>? {
+        return BluePrintChainedService(this).nodeTypeChainedProperties(nodeTypeName)
+    }
+
 }
\ No newline at end of file
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.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.fasterxml.jackson.databind.node.ArrayNode\r
-import com.fasterxml.jackson.databind.node.ObjectNode\r
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants\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
-\r
-/**\r
- *\r
- *\r
- * @author Brinda Santh\r
- */\r
-object BluePrintExpressionService {\r
-    val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())\r
-\r
-    @JvmStatic\r
-    fun getExpressionData(propertyAssignmentNode: JsonNode): ExpressionData {\r
-        log.trace("Assignment Data/Expression : {}", propertyAssignmentNode)\r
-        val expressionData = ExpressionData(valueNode = propertyAssignmentNode)\r
-        if (propertyAssignmentNode is ObjectNode) {\r
-\r
-            val commands: Set<String> = propertyAssignmentNode.fieldNames().asSequence().toList().intersect(BluePrintTypes.validCommands())\r
-            if (commands.isNotEmpty()) {\r
-                expressionData.isExpression = true\r
-                expressionData.command = commands.first()\r
-                expressionData.expressionNode = propertyAssignmentNode\r
-\r
-                when (expressionData.command) {\r
-                    BluePrintConstants.EXPRESSION_GET_INPUT -> {\r
-                        expressionData.inputExpression = populateInputExpression(propertyAssignmentNode)\r
-                    }\r
-                    BluePrintConstants.EXPRESSION_GET_ATTRIBUTE -> {\r
-                        expressionData.attributeExpression = populateAttributeExpression(propertyAssignmentNode)\r
-                    }\r
-                    BluePrintConstants.EXPRESSION_GET_PROPERTY -> {\r
-                        expressionData.propertyExpression = populatePropertyExpression(propertyAssignmentNode)\r
-                    }\r
-                    BluePrintConstants.EXPRESSION_GET_OPERATION_OUTPUT -> {\r
-                        expressionData.operationOutputExpression = populateOperationOutputExpression(propertyAssignmentNode)\r
-                    }\r
-                    BluePrintConstants.EXPRESSION_GET_ARTIFACT -> {\r
-                        expressionData.artifactExpression = populateArtifactExpression(propertyAssignmentNode)\r
-                    }\r
-                }\r
-            }\r
-        }\r
-        return expressionData\r
-    }\r
-\r
-    @JvmStatic\r
-    fun populateInputExpression(jsonNode: JsonNode): InputExpression {\r
-        return InputExpression(propertyName = jsonNode.first().textValue())\r
-    }\r
-\r
-    @JvmStatic\r
-    fun populatePropertyExpression(jsonNode: JsonNode): PropertyExpression {\r
-        val arrayNode: ArrayNode = jsonNode.first() as ArrayNode\r
-        check(arrayNode.size() >= 2) {\r
-            throw BluePrintException(String.format("missing property expression, " +\r
-                    "it should be [ <modelable_entity_name>, <optional_req_or_cap_name>, <property_name>, " +\r
-                    "<nested_property_name_or_index_1>, ..., <nested_property_name_or_index_n> ] , but present {}", jsonNode))\r
-        }\r
-        var reqOrCapEntityName: String? = null\r
-        var propertyName = ""\r
-        var subProperty: String? = null\r
-        when {\r
-            arrayNode.size() == 2 -> propertyName = arrayNode[1].textValue()\r
-            arrayNode.size() == 3 -> {\r
-                reqOrCapEntityName = arrayNode[1].textValue()\r
-                propertyName = arrayNode[2].textValue()\r
-            }\r
-            arrayNode.size() > 3 -> {\r
-                reqOrCapEntityName = arrayNode[1].textValue()\r
-                propertyName = arrayNode[2].textValue()\r
-                val propertyPaths: List<String> = arrayNode.filterIndexed { index, _ ->\r
-                    index >= 3\r
-                }.map { it.textValue() }\r
-                subProperty = propertyPaths.joinToString("/")\r
-            }\r
-        }\r
-\r
-        return PropertyExpression(modelableEntityName = arrayNode[0].asText(),\r
-                reqOrCapEntityName = reqOrCapEntityName,\r
-                propertyName = propertyName,\r
-                subPropertyName = subProperty\r
-        )\r
-    }\r
-\r
-    @JvmStatic\r
-    fun populateAttributeExpression(jsonNode: JsonNode): AttributeExpression {\r
-        val arrayNode: ArrayNode = jsonNode.first() as ArrayNode\r
-        check(arrayNode.size() >= 2) {\r
-            throw BluePrintException(String.format("missing attribute expression, " +\r
-                    "it should be [ <modelable_entity_name>, <optional_req_or_cap_name>, <attribute_name>," +\r
-                    " <nested_attribute_name_or_index_1>, ..., <nested_attribute_name_or_index_n> ] , but present {}", jsonNode))\r
-        }\r
-\r
-        var reqOrCapEntityName: String? = null\r
-        var attributeName = ""\r
-        var subAttributeName: String? = null\r
-        when {\r
-            arrayNode.size() == 2 -> attributeName = arrayNode[1].textValue()\r
-            arrayNode.size() == 3 -> {\r
-                reqOrCapEntityName = arrayNode[1].textValue()\r
-                attributeName = arrayNode[2].textValue()\r
-            }\r
-            arrayNode.size() > 3 -> {\r
-                reqOrCapEntityName = arrayNode[1].textValue()\r
-                attributeName = arrayNode[2].textValue()\r
-                val propertyPaths: List<String> = arrayNode.filterIndexed { index, _ ->\r
-                    index >= 3\r
-                }.map { it.textValue() }\r
-                subAttributeName = propertyPaths.joinToString("/")\r
-            }\r
-        }\r
-        return AttributeExpression(modelableEntityName = arrayNode[0].asText(),\r
-                reqOrCapEntityName = reqOrCapEntityName,\r
-                attributeName = attributeName,\r
-                subAttributeName = subAttributeName\r
-        )\r
-    }\r
-\r
-    @JvmStatic\r
-    fun populateOperationOutputExpression(jsonNode: JsonNode): OperationOutputExpression {\r
-        val arrayNode: ArrayNode = jsonNode.first() as ArrayNode\r
-\r
-        check(arrayNode.size() >= 4) {\r
-            throw BluePrintException(String.format("missing operation output expression, " +\r
-                    "it should be (<modelable_entity_name>, <interface_name>, <operation_name>, <output_variable_name>) , but present {}", jsonNode))\r
-        }\r
-        return OperationOutputExpression(modelableEntityName = arrayNode[0].asText(),\r
-                interfaceName = arrayNode[1].asText(),\r
-                operationName = arrayNode[2].asText(),\r
-                propertyName = arrayNode[3].asText()\r
-        )\r
-    }\r
-\r
-    @JvmStatic\r
-    fun populateArtifactExpression(jsonNode: JsonNode): ArtifactExpression {\r
-        val arrayNode: ArrayNode = jsonNode.first() as ArrayNode\r
-\r
-        check(arrayNode.size() >= 2) {\r
-            throw BluePrintException(String.format("missing artifact expression, " +\r
-                    "it should be [ <modelable_entity_name>, <artifact_name>, <location>, <remove> ] , but present {}", jsonNode))\r
-        }\r
-        return ArtifactExpression(modelableEntityName = arrayNode[0].asText(),\r
-                artifactName = arrayNode[1].asText(),\r
-                location = arrayNode[2]?.asText() ?: "LOCAL_FILE",\r
-                remove = arrayNode[3]?.asBoolean() ?: false\r
-        )\r
-    }\r
+/*
+ * 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.service
+
+import com.att.eelf.configuration.EELFLogger
+import com.att.eelf.configuration.EELFManager
+import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.databind.node.ArrayNode
+import com.fasterxml.jackson.databind.node.ObjectNode
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintTypes
+import org.onap.ccsdk.apps.controllerblueprints.core.data.*
+
+/**
+ *
+ *
+ * @author Brinda Santh
+ */
+object BluePrintExpressionService {
+    val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())
+
+    @JvmStatic
+    fun getExpressionData(propertyAssignmentNode: JsonNode): ExpressionData {
+        log.trace("Assignment Data/Expression : {}", propertyAssignmentNode)
+        val expressionData = ExpressionData(valueNode = propertyAssignmentNode)
+        if (propertyAssignmentNode is ObjectNode) {
+
+            val commands: Set<String> = propertyAssignmentNode.fieldNames().asSequence().toList().intersect(BluePrintTypes.validCommands())
+            if (commands.isNotEmpty()) {
+                expressionData.isExpression = true
+                expressionData.command = commands.first()
+                expressionData.expressionNode = propertyAssignmentNode
+
+                when (expressionData.command) {
+                    BluePrintConstants.EXPRESSION_GET_INPUT -> {
+                        expressionData.inputExpression = populateInputExpression(propertyAssignmentNode)
+                    }
+                    BluePrintConstants.EXPRESSION_GET_ATTRIBUTE -> {
+                        expressionData.attributeExpression = populateAttributeExpression(propertyAssignmentNode)
+                    }
+                    BluePrintConstants.EXPRESSION_GET_PROPERTY -> {
+                        expressionData.propertyExpression = populatePropertyExpression(propertyAssignmentNode)
+                    }
+                    BluePrintConstants.EXPRESSION_GET_OPERATION_OUTPUT -> {
+                        expressionData.operationOutputExpression = populateOperationOutputExpression(propertyAssignmentNode)
+                    }
+                    BluePrintConstants.EXPRESSION_GET_ARTIFACT -> {
+                        expressionData.artifactExpression = populateArtifactExpression(propertyAssignmentNode)
+                    }
+                }
+            }
+        }
+        return expressionData
+    }
+
+    @JvmStatic
+    fun populateInputExpression(jsonNode: JsonNode): InputExpression {
+        return InputExpression(propertyName = jsonNode.first().textValue())
+    }
+
+    @JvmStatic
+    fun populatePropertyExpression(jsonNode: JsonNode): PropertyExpression {
+        val arrayNode: ArrayNode = jsonNode.first() as ArrayNode
+        check(arrayNode.size() >= 2) {
+            throw BluePrintException(String.format("missing property expression, " +
+                    "it should be [ <modelable_entity_name>, <optional_req_or_cap_name>, <property_name>, " +
+                    "<nested_property_name_or_index_1>, ..., <nested_property_name_or_index_n> ] , but present {}", jsonNode))
+        }
+        var reqOrCapEntityName: String? = null
+        var propertyName = ""
+        var subProperty: String? = null
+        when {
+            arrayNode.size() == 2 -> propertyName = arrayNode[1].textValue()
+            arrayNode.size() == 3 -> {
+                reqOrCapEntityName = arrayNode[1].textValue()
+                propertyName = arrayNode[2].textValue()
+            }
+            arrayNode.size() > 3 -> {
+                reqOrCapEntityName = arrayNode[1].textValue()
+                propertyName = arrayNode[2].textValue()
+                val propertyPaths: List<String> = arrayNode.filterIndexed { index, _ ->
+                    index >= 3
+                }.map { it.textValue() }
+                subProperty = propertyPaths.joinToString("/")
+            }
+        }
+
+        return PropertyExpression(modelableEntityName = arrayNode[0].asText(),
+                reqOrCapEntityName = reqOrCapEntityName,
+                propertyName = propertyName,
+                subPropertyName = subProperty
+        )
+    }
+
+    @JvmStatic
+    fun populateAttributeExpression(jsonNode: JsonNode): AttributeExpression {
+        val arrayNode: ArrayNode = jsonNode.first() as ArrayNode
+        check(arrayNode.size() >= 2) {
+            throw BluePrintException(String.format("missing attribute expression, " +
+                    "it should be [ <modelable_entity_name>, <optional_req_or_cap_name>, <attribute_name>," +
+                    " <nested_attribute_name_or_index_1>, ..., <nested_attribute_name_or_index_n> ] , but present {}", jsonNode))
+        }
+
+        var reqOrCapEntityName: String? = null
+        var attributeName = ""
+        var subAttributeName: String? = null
+        when {
+            arrayNode.size() == 2 -> attributeName = arrayNode[1].textValue()
+            arrayNode.size() == 3 -> {
+                reqOrCapEntityName = arrayNode[1].textValue()
+                attributeName = arrayNode[2].textValue()
+            }
+            arrayNode.size() > 3 -> {
+                reqOrCapEntityName = arrayNode[1].textValue()
+                attributeName = arrayNode[2].textValue()
+                val propertyPaths: List<String> = arrayNode.filterIndexed { index, _ ->
+                    index >= 3
+                }.map { it.textValue() }
+                subAttributeName = propertyPaths.joinToString("/")
+            }
+        }
+        return AttributeExpression(modelableEntityName = arrayNode[0].asText(),
+                reqOrCapEntityName = reqOrCapEntityName,
+                attributeName = attributeName,
+                subAttributeName = subAttributeName
+        )
+    }
+
+    @JvmStatic
+    fun populateOperationOutputExpression(jsonNode: JsonNode): OperationOutputExpression {
+        val arrayNode: ArrayNode = jsonNode.first() as ArrayNode
+
+        check(arrayNode.size() >= 4) {
+            throw BluePrintException(String.format("missing operation output expression, " +
+                    "it should be (<modelable_entity_name>, <interface_name>, <operation_name>, <output_variable_name>) , but present {}", jsonNode))
+        }
+        return OperationOutputExpression(modelableEntityName = arrayNode[0].asText(),
+                interfaceName = arrayNode[1].asText(),
+                operationName = arrayNode[2].asText(),
+                propertyName = arrayNode[3].asText()
+        )
+    }
+
+    @JvmStatic
+    fun populateArtifactExpression(jsonNode: JsonNode): ArtifactExpression {
+        val arrayNode: ArrayNode = jsonNode.first() as ArrayNode
+
+        check(arrayNode.size() >= 2) {
+            throw BluePrintException(String.format("missing artifact expression, " +
+                    "it should be [ <modelable_entity_name>, <artifact_name>, <location>, <remove> ] , but present {}", jsonNode))
+        }
+        return ArtifactExpression(modelableEntityName = arrayNode[0].asText(),
+                artifactName = arrayNode[1].asText(),
+                location = arrayNode[2]?.asText() ?: "LOCAL_FILE",
+                remove = arrayNode[3]?.asBoolean() ?: false
+        )
+    }
 }
\ No newline at end of file
@@ -1,62 +1,62 @@
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.service\r
-\r
-import org.onap.ccsdk.apps.controllerblueprints.core.data.ServiceTemplate\r
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.ServiceTemplateUtils\r
-import com.att.eelf.configuration.EELFLogger\r
-import com.att.eelf.configuration.EELFManager\r
-import java.io.File\r
-import java.io.Serializable\r
-\r
-/**\r
- *\r
- *\r
- * @author Brinda Santh\r
- */\r
-interface BluePrintParserService : Serializable {\r
-    fun readBlueprint(content: String) : BluePrintContext\r
-    fun readBlueprintFile(fileName: String) : BluePrintContext\r
-    /**\r
-     * Read Blueprint from CSAR structure Directory\r
-     */\r
-    fun readBlueprintFile(fileName: String, basePath : String) : BluePrintContext\r
-}\r
-\r
-class BluePrintParserDefaultService : BluePrintParserService {\r
-\r
-    private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())\r
-\r
-    var basePath : String = javaClass.classLoader.getResource(".").path\r
-\r
-    override fun readBlueprint(content: String): BluePrintContext {\r
-        return BluePrintContext(ServiceTemplateUtils.getServiceTemplateFromContent(content))\r
-    }\r
-\r
-    override fun readBlueprintFile(fileName: String): BluePrintContext {\r
-        return readBlueprintFile(fileName, basePath )\r
-    }\r
-\r
-    override fun readBlueprintFile(fileName: String, basePath : String): BluePrintContext {\r
-        val rootFilePath: String = StringBuilder().append(basePath).append(File.separator).append(fileName).toString()\r
-        val rootServiceTemplate : ServiceTemplate = ServiceTemplateUtils.getServiceTemplate(rootFilePath)\r
-        // TODO("Nested Lookup Implementation based on Import files")\r
-        return BluePrintContext(rootServiceTemplate)\r
-    }\r
-\r
-\r
-}\r
+/*
+ * 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.service
+
+import org.onap.ccsdk.apps.controllerblueprints.core.data.ServiceTemplate
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.ServiceTemplateUtils
+import com.att.eelf.configuration.EELFLogger
+import com.att.eelf.configuration.EELFManager
+import java.io.File
+import java.io.Serializable
+
+/**
+ *
+ *
+ * @author Brinda Santh
+ */
+interface BluePrintParserService : Serializable {
+    fun readBlueprint(content: String) : BluePrintContext
+    fun readBlueprintFile(fileName: String) : BluePrintContext
+    /**
+     * Read Blueprint from CSAR structure Directory
+     */
+    fun readBlueprintFile(fileName: String, basePath : String) : BluePrintContext
+}
+
+class BluePrintParserDefaultService : BluePrintParserService {
+
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())
+
+    var basePath : String = javaClass.classLoader.getResource(".").path
+
+    override fun readBlueprint(content: String): BluePrintContext {
+        return BluePrintContext(ServiceTemplateUtils.getServiceTemplateFromContent(content))
+    }
+
+    override fun readBlueprintFile(fileName: String): BluePrintContext {
+        return readBlueprintFile(fileName, basePath )
+    }
+
+    override fun readBlueprintFile(fileName: String, basePath : String): BluePrintContext {
+        val rootFilePath: String = StringBuilder().append(basePath).append(File.separator).append(fileName).toString()
+        val rootServiceTemplate : ServiceTemplate = ServiceTemplateUtils.getServiceTemplate(rootFilePath)
+        // TODO("Nested Lookup Implementation based on Import files")
+        return BluePrintContext(rootServiceTemplate)
+    }
+
+
+}
@@ -1,71 +1,71 @@
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.service\r
-\r
-import com.att.eelf.configuration.EELFLogger\r
-import com.att.eelf.configuration.EELFManager\r
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants\r
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException\r
-import org.onap.ccsdk.apps.controllerblueprints.core.data.*\r
-import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintRepoService\r
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils\r
-\r
-open class BluePrintRepoFileService(modelTypePath: String) : BluePrintRepoService {\r
-\r
-    private val log: EELFLogger = EELFManager.getInstance().getLogger(BluePrintRepoFileService::class.toString())\r
-\r
-    private val dataTypePath = modelTypePath.plus(BluePrintConstants.PATH_DIVIDER).plus(BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE)\r
-    private val nodeTypePath = modelTypePath.plus(BluePrintConstants.PATH_DIVIDER).plus(BluePrintConstants.MODEL_DEFINITION_TYPE_NODE_TYPE)\r
-    private val artifactTypePath = modelTypePath.plus(BluePrintConstants.PATH_DIVIDER).plus(BluePrintConstants.MODEL_DEFINITION_TYPE_ARTIFACT_TYPE)\r
-    private val capabilityTypePath = modelTypePath.plus(BluePrintConstants.PATH_DIVIDER).plus(BluePrintConstants.MODEL_DEFINITION_TYPE_CAPABILITY_TYPE)\r
-    private val relationshipTypePath = modelTypePath.plus(BluePrintConstants.PATH_DIVIDER).plus(BluePrintConstants.MODEL_DEFINITION_TYPE_RELATIONSHIP_TYPE)\r
-    private val extension = ".json"\r
-\r
-    override fun getDataType(dataTypeName: String): DataType {\r
-        val fileName = dataTypePath.plus(BluePrintConstants.PATH_DIVIDER)\r
-                .plus(dataTypeName).plus(extension)\r
-        return getModelType(fileName, DataType::class.java)\r
-    }\r
-\r
-    override fun getNodeType(nodeTypeName: String): NodeType {\r
-        val fileName = nodeTypePath.plus(BluePrintConstants.PATH_DIVIDER).plus(nodeTypeName).plus(extension)\r
-        return getModelType(fileName, NodeType::class.java)\r
-    }\r
-\r
-    override fun getArtifactType(artifactTypeName: String): ArtifactType {\r
-        val fileName = artifactTypePath.plus(BluePrintConstants.PATH_DIVIDER)\r
-                .plus(artifactTypeName).plus(extension)\r
-        return getModelType(fileName, ArtifactType::class.java)\r
-    }\r
-\r
-    override fun getRelationshipType(relationshipTypeName: String): RelationshipType {\r
-        val fileName = relationshipTypePath.plus(BluePrintConstants.PATH_DIVIDER)\r
-                .plus(relationshipTypeName).plus(extension)\r
-        return getModelType(fileName, RelationshipType::class.java)\r
-    }\r
-\r
-    override fun getCapabilityDefinition(capabilityDefinitionName: String): CapabilityDefinition {\r
-        val fileName = capabilityTypePath.plus(BluePrintConstants.PATH_DIVIDER)\r
-                .plus(capabilityDefinitionName).plus(extension)\r
-        return getModelType(fileName, CapabilityDefinition::class.java)\r
-    }\r
-\r
-    private fun <T> getModelType(fileName: String, valueType: Class<T>): T {\r
-        return JacksonUtils.readValueFromFile(fileName, valueType)\r
-                ?: throw BluePrintException("couldn't get file($fileName) for type(${valueType.name}")\r
-    }\r
+/*
+ * 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.service
+
+import com.att.eelf.configuration.EELFLogger
+import com.att.eelf.configuration.EELFManager
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
+import org.onap.ccsdk.apps.controllerblueprints.core.data.*
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintRepoService
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
+
+open class BluePrintRepoFileService(modelTypePath: String) : BluePrintRepoService {
+
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(BluePrintRepoFileService::class.toString())
+
+    private val dataTypePath = modelTypePath.plus(BluePrintConstants.PATH_DIVIDER).plus(BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE)
+    private val nodeTypePath = modelTypePath.plus(BluePrintConstants.PATH_DIVIDER).plus(BluePrintConstants.MODEL_DEFINITION_TYPE_NODE_TYPE)
+    private val artifactTypePath = modelTypePath.plus(BluePrintConstants.PATH_DIVIDER).plus(BluePrintConstants.MODEL_DEFINITION_TYPE_ARTIFACT_TYPE)
+    private val capabilityTypePath = modelTypePath.plus(BluePrintConstants.PATH_DIVIDER).plus(BluePrintConstants.MODEL_DEFINITION_TYPE_CAPABILITY_TYPE)
+    private val relationshipTypePath = modelTypePath.plus(BluePrintConstants.PATH_DIVIDER).plus(BluePrintConstants.MODEL_DEFINITION_TYPE_RELATIONSHIP_TYPE)
+    private val extension = ".json"
+
+    override fun getDataType(dataTypeName: String): DataType {
+        val fileName = dataTypePath.plus(BluePrintConstants.PATH_DIVIDER)
+                .plus(dataTypeName).plus(extension)
+        return getModelType(fileName, DataType::class.java)
+    }
+
+    override fun getNodeType(nodeTypeName: String): NodeType {
+        val fileName = nodeTypePath.plus(BluePrintConstants.PATH_DIVIDER).plus(nodeTypeName).plus(extension)
+        return getModelType(fileName, NodeType::class.java)
+    }
+
+    override fun getArtifactType(artifactTypeName: String): ArtifactType {
+        val fileName = artifactTypePath.plus(BluePrintConstants.PATH_DIVIDER)
+                .plus(artifactTypeName).plus(extension)
+        return getModelType(fileName, ArtifactType::class.java)
+    }
+
+    override fun getRelationshipType(relationshipTypeName: String): RelationshipType {
+        val fileName = relationshipTypePath.plus(BluePrintConstants.PATH_DIVIDER)
+                .plus(relationshipTypeName).plus(extension)
+        return getModelType(fileName, RelationshipType::class.java)
+    }
+
+    override fun getCapabilityDefinition(capabilityDefinitionName: String): CapabilityDefinition {
+        val fileName = capabilityTypePath.plus(BluePrintConstants.PATH_DIVIDER)
+                .plus(capabilityDefinitionName).plus(extension)
+        return getModelType(fileName, CapabilityDefinition::class.java)
+    }
+
+    private fun <T> getModelType(fileName: String, valueType: Class<T>): T {
+        return JacksonUtils.readValueFromFile(fileName, valueType)
+                ?: throw BluePrintException("couldn't get file($fileName) for type(${valueType.name}")
+    }
 }
\ No newline at end of file
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- * Modifications Copyright © 2018 IBM.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.service\r
-\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.fasterxml.jackson.databind.node.NullNode\r
-import com.fasterxml.jackson.databind.node.ObjectNode\r
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper\r
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants\r
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintError\r
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintProcessorException\r
-import org.onap.ccsdk.apps.controllerblueprints.core.data.ArtifactDefinition\r
-import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeTemplate\r
-import org.onap.ccsdk.apps.controllerblueprints.core.data.PropertyDefinition\r
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils\r
-\r
-interface BluePrintRuntimeService<T> {\r
-\r
-    fun id(): String\r
-\r
-    fun bluePrintContext(): BluePrintContext\r
-\r
-    fun getExecutionContext(): T\r
-\r
-    fun setExecutionContext(executionContext: T)\r
-\r
-    fun put(key: String, value: JsonNode)\r
-\r
-    fun get(key: String): JsonNode?\r
-\r
-    fun check(key: String): Boolean\r
-\r
-    fun cleanRuntime()\r
-\r
-    fun getAsString(key: String): String?\r
-\r
-    fun getAsBoolean(key: String): Boolean?\r
-\r
-    fun getAsInt(key: String): Int?\r
-\r
-    fun getAsDouble(key: String): Double?\r
-\r
-    fun getBluePrintError(): BluePrintError\r
-\r
-    fun setBluePrintError(bluePrintError: BluePrintError)\r
-\r
-    fun resolveNodeTemplatePropertyAssignments(nodeTemplateName: String,\r
-                                               propertyDefinitions: MutableMap<String, PropertyDefinition>,\r
-                                               propertyAssignments: MutableMap<String, JsonNode>): MutableMap<String, JsonNode>\r
-\r
-    fun resolveNodeTemplateProperties(nodeTemplateName: String): MutableMap<String, JsonNode>\r
-\r
-    fun resolveNodeTemplateCapabilityProperties(nodeTemplateName: String, capabilityName: String): MutableMap<String,\r
-            JsonNode>\r
-\r
-    fun resolveNodeTemplateInterfaceOperationInputs(nodeTemplateName: String, interfaceName: String,\r
-                                                    operationName: String): MutableMap<String, JsonNode>\r
-\r
-    fun resolveNodeTemplateInterfaceOperationOutputs(nodeTemplateName: String, interfaceName: String,\r
-                                                     operationName: String): MutableMap<String, JsonNode>\r
-\r
-    fun resolveNodeTemplateArtifact(nodeTemplateName: String, artifactName: String): String\r
-\r
-    fun resolveNodeTemplateArtifactDefinition(nodeTemplateName: String, artifactName: String): ArtifactDefinition\r
-\r
-    fun setInputValue(propertyName: String, propertyDefinition: PropertyDefinition, value: JsonNode)\r
-\r
-    fun setWorkflowInputValue(workflowName: String, propertyName: String, propertyDefinition: PropertyDefinition, value: JsonNode)\r
-\r
-    fun setNodeTemplatePropertyValue(nodeTemplateName: String, propertyName: String, value: JsonNode)\r
-\r
-    fun setNodeTemplateAttributeValue(nodeTemplateName: String, attributeName: String, value: JsonNode)\r
-\r
-    fun setNodeTemplateOperationPropertyValue(nodeTemplateName: String, interfaceName: String,\r
-                                              operationName: String, propertyName: String, value: JsonNode)\r
-\r
-    fun setNodeTemplateOperationInputValue(nodeTemplateName: String, interfaceName: String,\r
-                                           operationName: String, propertyName: String, value: JsonNode)\r
-\r
-    fun setNodeTemplateOperationOutputValue(nodeTemplateName: String, interfaceName: String,\r
-                                            operationName: String, propertyName: String, value: JsonNode)\r
-\r
-    fun getInputValue(propertyName: String): JsonNode\r
-\r
-    fun getNodeTemplateOperationOutputValue(nodeTemplateName: String, interfaceName: String,\r
-                                            operationName: String, propertyName: String): JsonNode\r
-\r
-    fun getNodeTemplatePropertyValue(nodeTemplateName: String, propertyName: String): JsonNode?\r
-\r
-    fun getNodeTemplateAttributeValue(nodeTemplateName: String, attributeName: String): JsonNode?\r
-\r
-    fun assignInputs(jsonNode: JsonNode)\r
-\r
-    fun assignWorkflowInputs(workflowName: String, jsonNode: JsonNode)\r
-\r
-    fun getJsonForNodeTemplateAttributeProperties(nodeTemplateName: String, keys: List<String>): JsonNode\r
-}\r
-\r
-/**\r
- *\r
- *\r
- * @author Brinda Santh\r
- */\r
-open class DefaultBluePrintRuntimeService(private var id: String, private var bluePrintContext: BluePrintContext)\r
-    : BluePrintRuntimeService<MutableMap<String, JsonNode>> {\r
-\r
-    @Transient\r
-    private val log: EELFLogger = EELFManager.getInstance().getLogger(BluePrintRuntimeService::class.toString())\r
-\r
-    private var store: MutableMap<String, JsonNode> = hashMapOf()\r
-\r
-    private var bluePrintError = BluePrintError()\r
-\r
-    override fun id(): String {\r
-        return id\r
-    }\r
-\r
-    override fun bluePrintContext(): BluePrintContext {\r
-        return bluePrintContext\r
-    }\r
-\r
-    override fun getExecutionContext(): MutableMap<String, JsonNode> {\r
-        return store\r
-    }\r
-\r
-    @Suppress("UNCHECKED_CAST")\r
-    override fun setExecutionContext(executionContext: MutableMap<String, JsonNode>) {\r
-        this.store = executionContext\r
-    }\r
-\r
-    override fun put(key: String, value: JsonNode) {\r
-        store[key] = value\r
-    }\r
-\r
-    override fun get(key: String): JsonNode {\r
-        return store[key] ?: throw BluePrintProcessorException("failed to get execution property($key)")\r
-    }\r
-\r
-    override fun check(key: String): Boolean {\r
-        return store.containsKey(key)\r
-    }\r
-\r
-    override fun cleanRuntime() {\r
-        store.clear()\r
-    }\r
-\r
-    private fun getJsonNode(key: String): JsonNode {\r
-        return get(key)\r
-    }\r
-\r
-    override fun getAsString(key: String): String? {\r
-        return get(key).asText()\r
-    }\r
-\r
-    override fun getAsBoolean(key: String): Boolean? {\r
-        return get(key).asBoolean()\r
-    }\r
-\r
-    override fun getAsInt(key: String): Int? {\r
-        return get(key).asInt()\r
-    }\r
-\r
-    override fun getAsDouble(key: String): Double? {\r
-        return get(key).asDouble()\r
-    }\r
-\r
-    override fun getBluePrintError(): BluePrintError {\r
-        return this.bluePrintError\r
-    }\r
-\r
-    override fun setBluePrintError(bluePrintError: BluePrintError) {\r
-        this.bluePrintError = bluePrintError\r
-    }\r
-\r
-    /**\r
-     * Resolve any property assignments for the node\r
-     */\r
-    override fun resolveNodeTemplatePropertyAssignments(nodeTemplateName: String,\r
-                                                        propertyDefinitions: MutableMap<String, PropertyDefinition>,\r
-                                                        propertyAssignments: MutableMap<String, JsonNode>)\r
-            : MutableMap<String, JsonNode> {\r
-\r
-        val propertyAssignmentValue: MutableMap<String, JsonNode> = hashMapOf()\r
-\r
-        propertyDefinitions.forEach { nodeTypePropertyName, nodeTypeProperty ->\r
-            // Get the Express or Value for the Node Template\r
-            val propertyAssignment: JsonNode? = propertyAssignments[nodeTypePropertyName]\r
-\r
-            var resolvedValue: JsonNode = NullNode.getInstance()\r
-            if (propertyAssignment != null) {\r
-                // Resolve the Expressing\r
-                val propertyAssignmentExpression = PropertyAssignmentService(this)\r
-                resolvedValue = propertyAssignmentExpression.resolveAssignmentExpression(nodeTemplateName,\r
-                        nodeTypePropertyName, propertyAssignment)\r
-            } else {\r
-                // Assign default value to the Operation\r
-                nodeTypeProperty.defaultValue?.let {\r
-                    resolvedValue = JacksonUtils.jsonNodeFromObject(nodeTypeProperty.defaultValue!!)\r
-                }\r
-            }\r
-            // Set for Return of method\r
-            propertyAssignmentValue[nodeTypePropertyName] = resolvedValue\r
-        }\r
-        return propertyAssignmentValue\r
-    }\r
-\r
-    override fun resolveNodeTemplateProperties(nodeTemplateName: String): MutableMap<String, JsonNode> {\r
-        log.info("resolveNodeTemplatePropertyValues for node template ({})", nodeTemplateName)\r
-\r
-        val nodeTemplate: NodeTemplate = bluePrintContext.nodeTemplateByName(nodeTemplateName)\r
-\r
-        val propertyAssignments: MutableMap<String, JsonNode> = nodeTemplate.properties!!\r
-\r
-        // Get the Node Type Definitions\r
-        val nodeTypePropertieDefinitions: MutableMap<String, PropertyDefinition> = bluePrintContext\r
-                .nodeTypeChainedProperties(nodeTemplate.type)!!\r
-\r
-        /**\r
-         * Resolve the NodeTemplate Property Assignment Values.\r
-         */\r
-        return resolveNodeTemplatePropertyAssignments(nodeTemplateName, nodeTypePropertieDefinitions,\r
-                propertyAssignments)\r
-    }\r
-\r
-    override fun resolveNodeTemplateCapabilityProperties(nodeTemplateName: String, capabilityName: String):\r
-            MutableMap<String, JsonNode> {\r
-        log.info("resolveNodeTemplateCapabilityProperties for node template($nodeTemplateName) capability " +\r
-                "($capabilityName)")\r
-        val nodeTemplate: NodeTemplate = bluePrintContext.nodeTemplateByName(nodeTemplateName)\r
-\r
-        val propertyAssignments = nodeTemplate.capabilities?.get(capabilityName)?.properties ?: hashMapOf()\r
-\r
-        val propertyDefinitions = bluePrintContext.nodeTemplateNodeType(nodeTemplateName)\r
-                .capabilities?.get(capabilityName)?.properties ?: hashMapOf()\r
-\r
-        /**\r
-         * Resolve the Capability Property Assignment Values.\r
-         */\r
-        return resolveNodeTemplatePropertyAssignments(nodeTemplateName, propertyDefinitions,\r
-                propertyAssignments)\r
-    }\r
-\r
-    override fun resolveNodeTemplateInterfaceOperationInputs(nodeTemplateName: String,\r
-                                                             interfaceName: String,\r
-                                                             operationName: String): MutableMap<String, JsonNode> {\r
-        log.info("resolveNodeTemplateInterfaceOperationInputs for node template ($nodeTemplateName),interface name " +\r
-                "($interfaceName), operationName($operationName)")\r
-\r
-        val propertyAssignments: MutableMap<String, JsonNode> =\r
-                bluePrintContext.nodeTemplateInterfaceOperationInputs(nodeTemplateName, interfaceName, operationName)\r
-                        ?: hashMapOf()\r
-\r
-        val nodeTypeName = bluePrintContext.nodeTemplateByName(nodeTemplateName).type\r
-\r
-        val nodeTypeInterfaceOperationInputs: MutableMap<String, PropertyDefinition> =\r
-                bluePrintContext.nodeTypeInterfaceOperationInputs(nodeTypeName, interfaceName, operationName)\r
-                        ?: hashMapOf()\r
-\r
-        log.info("input definition for node template ($nodeTemplateName), values ($propertyAssignments)")\r
-\r
-        /**\r
-         * Resolve the Property Input Assignment Values.\r
-         */\r
-        return resolveNodeTemplatePropertyAssignments(nodeTemplateName, nodeTypeInterfaceOperationInputs,\r
-                propertyAssignments)\r
-\r
-    }\r
-\r
-\r
-    override fun resolveNodeTemplateInterfaceOperationOutputs(nodeTemplateName: String,\r
-                                                              interfaceName: String,\r
-                                                              operationName: String): MutableMap<String, JsonNode> {\r
-        log.info("resolveNodeTemplateInterfaceOperationOutputs for node template ($nodeTemplateName),interface name " +\r
-                "($interfaceName), operationName($operationName)")\r
-\r
-        val propertyAssignments: MutableMap<String, JsonNode> =\r
-                bluePrintContext.nodeTemplateInterfaceOperationOutputs(nodeTemplateName, interfaceName, operationName)\r
-                        ?: hashMapOf()\r
-\r
-        val nodeTypeName = bluePrintContext.nodeTemplateByName(nodeTemplateName).type\r
-\r
-        val nodeTypeInterfaceOperationOutputs: MutableMap<String, PropertyDefinition> =\r
-                bluePrintContext.nodeTypeInterfaceOperationOutputs(nodeTypeName, interfaceName, operationName)\r
-                        ?: hashMapOf()\r
-        /**\r
-         * Resolve the Property Output Assignment Values.\r
-         */\r
-        val propertyAssignmentValue = resolveNodeTemplatePropertyAssignments(nodeTemplateName,\r
-                nodeTypeInterfaceOperationOutputs, propertyAssignments)\r
-\r
-        // Store  operation output values into context\r
-        propertyAssignmentValue.forEach { key, value ->\r
-            setNodeTemplateOperationOutputValue(nodeTemplateName, interfaceName, operationName, key, value)\r
-        }\r
-        return propertyAssignmentValue\r
-    }\r
-\r
-    override fun resolveNodeTemplateArtifact(nodeTemplateName: String, artifactName: String): String {\r
-        val artifactDefinition: ArtifactDefinition = resolveNodeTemplateArtifactDefinition(nodeTemplateName, artifactName)\r
-        val propertyAssignmentExpression = PropertyAssignmentService(this)\r
-        return propertyAssignmentExpression.artifactContent(artifactDefinition)\r
-    }\r
-\r
-    override fun resolveNodeTemplateArtifactDefinition(nodeTemplateName: String, artifactName: String): ArtifactDefinition {\r
-        val nodeTemplate = bluePrintContext.nodeTemplateByName(nodeTemplateName)\r
-\r
-        return nodeTemplate.artifacts?.get(artifactName)\r
-                ?: throw BluePrintProcessorException("failed to get artifat definition($artifactName) from the node " +\r
-                        "template")\r
-\r
-    }\r
-\r
-    override fun setInputValue(propertyName: String, propertyDefinition: PropertyDefinition, value: JsonNode) {\r
-        val path = StringBuilder(BluePrintConstants.PATH_INPUTS)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(propertyName).toString()\r
-        log.trace("setting input path ({}), values ({})", path, value)\r
-        put(path, value)\r
-    }\r
-\r
-    override fun setWorkflowInputValue(workflowName: String, propertyName: String,\r
-                                       propertyDefinition: PropertyDefinition, value: JsonNode) {\r
-        val path: String = StringBuilder(BluePrintConstants.PATH_NODE_WORKFLOWS)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(workflowName)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_INPUTS)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_PROPERTIES)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(propertyName).toString()\r
-        put(path, value)\r
-    }\r
-\r
-    override fun setNodeTemplatePropertyValue(nodeTemplateName: String, propertyName: String, value: JsonNode) {\r
-\r
-        val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_PROPERTIES)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(propertyName).toString()\r
-        put(path, value)\r
-    }\r
-\r
-    override fun setNodeTemplateAttributeValue(nodeTemplateName: String, attributeName: String, value: JsonNode) {\r
-\r
-        val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_ATTRIBUTES)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(attributeName).toString()\r
-        put(path, value)\r
-    }\r
-\r
-    override fun setNodeTemplateOperationPropertyValue(nodeTemplateName: String, interfaceName: String, operationName: String, propertyName: String,\r
-                                                       value: JsonNode) {\r
-        val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_INTERFACES)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(interfaceName)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_OPERATIONS)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(operationName)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_PROPERTIES)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(propertyName).toString()\r
-        log.trace("setting operation property path ({}), values ({})", path, value)\r
-        put(path, value)\r
-    }\r
-\r
-    override fun setNodeTemplateOperationInputValue(nodeTemplateName: String, interfaceName: String,\r
-                                                    operationName: String, propertyName: String,\r
-                                                    value: JsonNode) {\r
-        val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_INTERFACES)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(interfaceName)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_OPERATIONS)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(operationName)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_INPUTS)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_PROPERTIES)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(propertyName).toString()\r
-        put(path, value)\r
-    }\r
-\r
-    override fun setNodeTemplateOperationOutputValue(nodeTemplateName: String, interfaceName: String,\r
-                                                     operationName: String, propertyName: String,\r
-                                                     value: JsonNode) {\r
-        val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_INTERFACES)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(interfaceName)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_OPERATIONS)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(operationName)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_OUTPUTS)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_PROPERTIES)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(propertyName).toString()\r
-        put(path, value)\r
-    }\r
-\r
-\r
-    override fun getInputValue(propertyName: String): JsonNode {\r
-        val path = StringBuilder(BluePrintConstants.PATH_INPUTS)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(propertyName).toString()\r
-        return getJsonNode(path)\r
-    }\r
-\r
-    override fun getNodeTemplateOperationOutputValue(nodeTemplateName: String, interfaceName: String,\r
-                                                     operationName: String, propertyName: String): JsonNode {\r
-        val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_INTERFACES)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(interfaceName)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_OPERATIONS)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(operationName)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_OUTPUTS)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_PROPERTIES)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(propertyName).toString()\r
-        return getJsonNode(path)\r
-    }\r
-\r
-    override fun getNodeTemplatePropertyValue(nodeTemplateName: String, propertyName: String): JsonNode {\r
-        val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_PROPERTIES)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(propertyName).toString()\r
-        return getJsonNode(path)\r
-    }\r
-\r
-    override fun getNodeTemplateAttributeValue(nodeTemplateName: String, attributeName: String): JsonNode {\r
-        val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_ATTRIBUTES)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(attributeName).toString()\r
-        return getJsonNode(path)\r
-    }\r
-\r
-    override fun assignInputs(jsonNode: JsonNode) {\r
-        log.info("assignInputs from input JSON ({})", jsonNode.toString())\r
-        bluePrintContext.inputs?.forEach { propertyName, property ->\r
-            val valueNode: JsonNode = jsonNode.at(BluePrintConstants.PATH_DIVIDER + propertyName)\r
-                    ?: NullNode.getInstance()\r
-            setInputValue(propertyName, property, valueNode)\r
-        }\r
-    }\r
-\r
-    override fun assignWorkflowInputs(workflowName: String, jsonNode: JsonNode) {\r
-        log.info("assign workflow {} input value ({})", workflowName, jsonNode.toString())\r
-\r
-        val dynamicInputPropertiesName = "$workflowName-properties"\r
-\r
-        bluePrintContext.workflowByName(workflowName).inputs?.forEach { propertyName, property ->\r
-            if (propertyName != dynamicInputPropertiesName) {\r
-                val valueNode: JsonNode = jsonNode.at(BluePrintConstants.PATH_DIVIDER + propertyName)\r
-                        ?: NullNode.getInstance()\r
-                setInputValue(propertyName, property, valueNode)\r
-            }\r
-        }\r
-        // Load Dynamic data Types\r
-        val workflowDynamicInputs: JsonNode? = jsonNode.get(dynamicInputPropertiesName)\r
-\r
-        workflowDynamicInputs?.let {\r
-            bluePrintContext.dataTypeByName("dt-$dynamicInputPropertiesName")?.properties?.forEach { propertyName, property ->\r
-                val valueNode: JsonNode = workflowDynamicInputs.at(BluePrintConstants.PATH_DIVIDER + propertyName)\r
-                        ?: NullNode.getInstance()\r
-                setInputValue(propertyName, property, valueNode)\r
-\r
-            }\r
-        }\r
-    }\r
-\r
-    override fun getJsonForNodeTemplateAttributeProperties(nodeTemplateName: String, keys: List<String>): JsonNode {\r
-\r
-        val jsonNode: ObjectNode = jacksonObjectMapper().createObjectNode()\r
-        val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)\r
-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_ATTRIBUTES)\r
-                .append(BluePrintConstants.PATH_DIVIDER).toString()\r
-        store.keys.filter {\r
-            it.startsWith(path)\r
-        }.map {\r
-            val key = it.replace(path, "")\r
-            if (keys.contains(key)) {\r
-                val value = store[it] as JsonNode\r
-                jsonNode.set(key, value)\r
-            }\r
-        }\r
-        return jsonNode\r
-    }\r
-\r
-\r
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
+ *
+ * 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.service
+
+
+import com.att.eelf.configuration.EELFLogger
+import com.att.eelf.configuration.EELFManager
+import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.databind.node.NullNode
+import com.fasterxml.jackson.databind.node.ObjectNode
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintError
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintProcessorException
+import org.onap.ccsdk.apps.controllerblueprints.core.data.ArtifactDefinition
+import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeTemplate
+import org.onap.ccsdk.apps.controllerblueprints.core.data.PropertyDefinition
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
+
+interface BluePrintRuntimeService<T> {
+
+    fun id(): String
+
+    fun bluePrintContext(): BluePrintContext
+
+    fun getExecutionContext(): T
+
+    fun setExecutionContext(executionContext: T)
+
+    fun put(key: String, value: JsonNode)
+
+    fun get(key: String): JsonNode?
+
+    fun check(key: String): Boolean
+
+    fun cleanRuntime()
+
+    fun getAsString(key: String): String?
+
+    fun getAsBoolean(key: String): Boolean?
+
+    fun getAsInt(key: String): Int?
+
+    fun getAsDouble(key: String): Double?
+
+    fun getBluePrintError(): BluePrintError
+
+    fun setBluePrintError(bluePrintError: BluePrintError)
+
+    fun resolveNodeTemplatePropertyAssignments(nodeTemplateName: String,
+                                               propertyDefinitions: MutableMap<String, PropertyDefinition>,
+                                               propertyAssignments: MutableMap<String, JsonNode>): MutableMap<String, JsonNode>
+
+    fun resolveNodeTemplateProperties(nodeTemplateName: String): MutableMap<String, JsonNode>
+
+    fun resolveNodeTemplateCapabilityProperties(nodeTemplateName: String, capabilityName: String): MutableMap<String,
+            JsonNode>
+
+    fun resolveNodeTemplateInterfaceOperationInputs(nodeTemplateName: String, interfaceName: String,
+                                                    operationName: String): MutableMap<String, JsonNode>
+
+    fun resolveNodeTemplateInterfaceOperationOutputs(nodeTemplateName: String, interfaceName: String,
+                                                     operationName: String): MutableMap<String, JsonNode>
+
+    fun resolveNodeTemplateArtifact(nodeTemplateName: String, artifactName: String): String
+
+    fun resolveNodeTemplateArtifactDefinition(nodeTemplateName: String, artifactName: String): ArtifactDefinition
+
+    fun setInputValue(propertyName: String, propertyDefinition: PropertyDefinition, value: JsonNode)
+
+    fun setWorkflowInputValue(workflowName: String, propertyName: String, propertyDefinition: PropertyDefinition, value: JsonNode)
+
+    fun setNodeTemplatePropertyValue(nodeTemplateName: String, propertyName: String, value: JsonNode)
+
+    fun setNodeTemplateAttributeValue(nodeTemplateName: String, attributeName: String, value: JsonNode)
+
+    fun setNodeTemplateOperationPropertyValue(nodeTemplateName: String, interfaceName: String,
+                                              operationName: String, propertyName: String, value: JsonNode)
+
+    fun setNodeTemplateOperationInputValue(nodeTemplateName: String, interfaceName: String,
+                                           operationName: String, propertyName: String, value: JsonNode)
+
+    fun setNodeTemplateOperationOutputValue(nodeTemplateName: String, interfaceName: String,
+                                            operationName: String, propertyName: String, value: JsonNode)
+
+    fun getInputValue(propertyName: String): JsonNode
+
+    fun getNodeTemplateOperationOutputValue(nodeTemplateName: String, interfaceName: String,
+                                            operationName: String, propertyName: String): JsonNode
+
+    fun getNodeTemplatePropertyValue(nodeTemplateName: String, propertyName: String): JsonNode?
+
+    fun getNodeTemplateAttributeValue(nodeTemplateName: String, attributeName: String): JsonNode?
+
+    fun assignInputs(jsonNode: JsonNode)
+
+    fun assignWorkflowInputs(workflowName: String, jsonNode: JsonNode)
+
+    fun getJsonForNodeTemplateAttributeProperties(nodeTemplateName: String, keys: List<String>): JsonNode
+}
+
+/**
+ *
+ *
+ * @author Brinda Santh
+ */
+open class DefaultBluePrintRuntimeService(private var id: String, private var bluePrintContext: BluePrintContext)
+    : BluePrintRuntimeService<MutableMap<String, JsonNode>> {
+
+    @Transient
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(BluePrintRuntimeService::class.toString())
+
+    private var store: MutableMap<String, JsonNode> = hashMapOf()
+
+    private var bluePrintError = BluePrintError()
+
+    override fun id(): String {
+        return id
+    }
+
+    override fun bluePrintContext(): BluePrintContext {
+        return bluePrintContext
+    }
+
+    override fun getExecutionContext(): MutableMap<String, JsonNode> {
+        return store
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    override fun setExecutionContext(executionContext: MutableMap<String, JsonNode>) {
+        this.store = executionContext
+    }
+
+    override fun put(key: String, value: JsonNode) {
+        store[key] = value
+    }
+
+    override fun get(key: String): JsonNode {
+        return store[key] ?: throw BluePrintProcessorException("failed to get execution property($key)")
+    }
+
+    override fun check(key: String): Boolean {
+        return store.containsKey(key)
+    }
+
+    override fun cleanRuntime() {
+        store.clear()
+    }
+
+    private fun getJsonNode(key: String): JsonNode {
+        return get(key)
+    }
+
+    override fun getAsString(key: String): String? {
+        return get(key).asText()
+    }
+
+    override fun getAsBoolean(key: String): Boolean? {
+        return get(key).asBoolean()
+    }
+
+    override fun getAsInt(key: String): Int? {
+        return get(key).asInt()
+    }
+
+    override fun getAsDouble(key: String): Double? {
+        return get(key).asDouble()
+    }
+
+    override fun getBluePrintError(): BluePrintError {
+        return this.bluePrintError
+    }
+
+    override fun setBluePrintError(bluePrintError: BluePrintError) {
+        this.bluePrintError = bluePrintError
+    }
+
+    /**
+     * Resolve any property assignments for the node
+     */
+    override fun resolveNodeTemplatePropertyAssignments(nodeTemplateName: String,
+                                                        propertyDefinitions: MutableMap<String, PropertyDefinition>,
+                                                        propertyAssignments: MutableMap<String, JsonNode>)
+            : MutableMap<String, JsonNode> {
+
+        val propertyAssignmentValue: MutableMap<String, JsonNode> = hashMapOf()
+
+        propertyDefinitions.forEach { nodeTypePropertyName, nodeTypeProperty ->
+            // Get the Express or Value for the Node Template
+            val propertyAssignment: JsonNode? = propertyAssignments[nodeTypePropertyName]
+
+            var resolvedValue: JsonNode = NullNode.getInstance()
+            if (propertyAssignment != null) {
+                // Resolve the Expressing
+                val propertyAssignmentExpression = PropertyAssignmentService(this)
+                resolvedValue = propertyAssignmentExpression.resolveAssignmentExpression(nodeTemplateName,
+                        nodeTypePropertyName, propertyAssignment)
+            } else {
+                // Assign default value to the Operation
+                nodeTypeProperty.defaultValue?.let {
+                    resolvedValue = JacksonUtils.jsonNodeFromObject(nodeTypeProperty.defaultValue!!)
+                }
+            }
+            // Set for Return of method
+            propertyAssignmentValue[nodeTypePropertyName] = resolvedValue
+        }
+        return propertyAssignmentValue
+    }
+
+    override fun resolveNodeTemplateProperties(nodeTemplateName: String): MutableMap<String, JsonNode> {
+        log.info("resolveNodeTemplatePropertyValues for node template ({})", nodeTemplateName)
+
+        val nodeTemplate: NodeTemplate = bluePrintContext.nodeTemplateByName(nodeTemplateName)
+
+        val propertyAssignments: MutableMap<String, JsonNode> = nodeTemplate.properties!!
+
+        // Get the Node Type Definitions
+        val nodeTypePropertieDefinitions: MutableMap<String, PropertyDefinition> = bluePrintContext
+                .nodeTypeChainedProperties(nodeTemplate.type)!!
+
+        /**
+         * Resolve the NodeTemplate Property Assignment Values.
+         */
+        return resolveNodeTemplatePropertyAssignments(nodeTemplateName, nodeTypePropertieDefinitions,
+                propertyAssignments)
+    }
+
+    override fun resolveNodeTemplateCapabilityProperties(nodeTemplateName: String, capabilityName: String):
+            MutableMap<String, JsonNode> {
+        log.info("resolveNodeTemplateCapabilityProperties for node template($nodeTemplateName) capability " +
+                "($capabilityName)")
+        val nodeTemplate: NodeTemplate = bluePrintContext.nodeTemplateByName(nodeTemplateName)
+
+        val propertyAssignments = nodeTemplate.capabilities?.get(capabilityName)?.properties ?: hashMapOf()
+
+        val propertyDefinitions = bluePrintContext.nodeTemplateNodeType(nodeTemplateName)
+                .capabilities?.get(capabilityName)?.properties ?: hashMapOf()
+
+        /**
+         * Resolve the Capability Property Assignment Values.
+         */
+        return resolveNodeTemplatePropertyAssignments(nodeTemplateName, propertyDefinitions,
+                propertyAssignments)
+    }
+
+    override fun resolveNodeTemplateInterfaceOperationInputs(nodeTemplateName: String,
+                                                             interfaceName: String,
+                                                             operationName: String): MutableMap<String, JsonNode> {
+        log.info("resolveNodeTemplateInterfaceOperationInputs for node template ($nodeTemplateName),interface name " +
+                "($interfaceName), operationName($operationName)")
+
+        val propertyAssignments: MutableMap<String, JsonNode> =
+                bluePrintContext.nodeTemplateInterfaceOperationInputs(nodeTemplateName, interfaceName, operationName)
+                        ?: hashMapOf()
+
+        val nodeTypeName = bluePrintContext.nodeTemplateByName(nodeTemplateName).type
+
+        val nodeTypeInterfaceOperationInputs: MutableMap<String, PropertyDefinition> =
+                bluePrintContext.nodeTypeInterfaceOperationInputs(nodeTypeName, interfaceName, operationName)
+                        ?: hashMapOf()
+
+        log.info("input definition for node template ($nodeTemplateName), values ($propertyAssignments)")
+
+        /**
+         * Resolve the Property Input Assignment Values.
+         */
+        return resolveNodeTemplatePropertyAssignments(nodeTemplateName, nodeTypeInterfaceOperationInputs,
+                propertyAssignments)
+
+    }
+
+
+    override fun resolveNodeTemplateInterfaceOperationOutputs(nodeTemplateName: String,
+                                                              interfaceName: String,
+                                                              operationName: String): MutableMap<String, JsonNode> {
+        log.info("resolveNodeTemplateInterfaceOperationOutputs for node template ($nodeTemplateName),interface name " +
+                "($interfaceName), operationName($operationName)")
+
+        val propertyAssignments: MutableMap<String, JsonNode> =
+                bluePrintContext.nodeTemplateInterfaceOperationOutputs(nodeTemplateName, interfaceName, operationName)
+                        ?: hashMapOf()
+
+        val nodeTypeName = bluePrintContext.nodeTemplateByName(nodeTemplateName).type
+
+        val nodeTypeInterfaceOperationOutputs: MutableMap<String, PropertyDefinition> =
+                bluePrintContext.nodeTypeInterfaceOperationOutputs(nodeTypeName, interfaceName, operationName)
+                        ?: hashMapOf()
+        /**
+         * Resolve the Property Output Assignment Values.
+         */
+        val propertyAssignmentValue = resolveNodeTemplatePropertyAssignments(nodeTemplateName,
+                nodeTypeInterfaceOperationOutputs, propertyAssignments)
+
+        // Store  operation output values into context
+        propertyAssignmentValue.forEach { key, value ->
+            setNodeTemplateOperationOutputValue(nodeTemplateName, interfaceName, operationName, key, value)
+        }
+        return propertyAssignmentValue
+    }
+
+    override fun resolveNodeTemplateArtifact(nodeTemplateName: String, artifactName: String): String {
+        val artifactDefinition: ArtifactDefinition = resolveNodeTemplateArtifactDefinition(nodeTemplateName, artifactName)
+        val propertyAssignmentExpression = PropertyAssignmentService(this)
+        return propertyAssignmentExpression.artifactContent(artifactDefinition)
+    }
+
+    override fun resolveNodeTemplateArtifactDefinition(nodeTemplateName: String, artifactName: String): ArtifactDefinition {
+        val nodeTemplate = bluePrintContext.nodeTemplateByName(nodeTemplateName)
+
+        return nodeTemplate.artifacts?.get(artifactName)
+                ?: throw BluePrintProcessorException("failed to get artifat definition($artifactName) from the node " +
+                        "template")
+
+    }
+
+    override fun setInputValue(propertyName: String, propertyDefinition: PropertyDefinition, value: JsonNode) {
+        val path = StringBuilder(BluePrintConstants.PATH_INPUTS)
+                .append(BluePrintConstants.PATH_DIVIDER).append(propertyName).toString()
+        log.trace("setting input path ({}), values ({})", path, value)
+        put(path, value)
+    }
+
+    override fun setWorkflowInputValue(workflowName: String, propertyName: String,
+                                       propertyDefinition: PropertyDefinition, value: JsonNode) {
+        val path: String = StringBuilder(BluePrintConstants.PATH_NODE_WORKFLOWS)
+                .append(BluePrintConstants.PATH_DIVIDER).append(workflowName)
+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_INPUTS)
+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_PROPERTIES)
+                .append(BluePrintConstants.PATH_DIVIDER).append(propertyName).toString()
+        put(path, value)
+    }
+
+    override fun setNodeTemplatePropertyValue(nodeTemplateName: String, propertyName: String, value: JsonNode) {
+
+        val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES)
+                .append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)
+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_PROPERTIES)
+                .append(BluePrintConstants.PATH_DIVIDER).append(propertyName).toString()
+        put(path, value)
+    }
+
+    override fun setNodeTemplateAttributeValue(nodeTemplateName: String, attributeName: String, value: JsonNode) {
+
+        val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES)
+                .append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)
+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_ATTRIBUTES)
+                .append(BluePrintConstants.PATH_DIVIDER).append(attributeName).toString()
+        put(path, value)
+    }
+
+    override fun setNodeTemplateOperationPropertyValue(nodeTemplateName: String, interfaceName: String, operationName: String, propertyName: String,
+                                                       value: JsonNode) {
+        val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES)
+                .append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)
+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_INTERFACES)
+                .append(BluePrintConstants.PATH_DIVIDER).append(interfaceName)
+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_OPERATIONS)
+                .append(BluePrintConstants.PATH_DIVIDER).append(operationName)
+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_PROPERTIES)
+                .append(BluePrintConstants.PATH_DIVIDER).append(propertyName).toString()
+        log.trace("setting operation property path ({}), values ({})", path, value)
+        put(path, value)
+    }
+
+    override fun setNodeTemplateOperationInputValue(nodeTemplateName: String, interfaceName: String,
+                                                    operationName: String, propertyName: String,
+                                                    value: JsonNode) {
+        val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES)
+                .append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)
+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_INTERFACES)
+                .append(BluePrintConstants.PATH_DIVIDER).append(interfaceName)
+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_OPERATIONS)
+                .append(BluePrintConstants.PATH_DIVIDER).append(operationName)
+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_INPUTS)
+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_PROPERTIES)
+                .append(BluePrintConstants.PATH_DIVIDER).append(propertyName).toString()
+        put(path, value)
+    }
+
+    override fun setNodeTemplateOperationOutputValue(nodeTemplateName: String, interfaceName: String,
+                                                     operationName: String, propertyName: String,
+                                                     value: JsonNode) {
+        val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES)
+                .append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)
+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_INTERFACES)
+                .append(BluePrintConstants.PATH_DIVIDER).append(interfaceName)
+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_OPERATIONS)
+                .append(BluePrintConstants.PATH_DIVIDER).append(operationName)
+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_OUTPUTS)
+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_PROPERTIES)
+                .append(BluePrintConstants.PATH_DIVIDER).append(propertyName).toString()
+        put(path, value)
+    }
+
+
+    override fun getInputValue(propertyName: String): JsonNode {
+        val path = StringBuilder(BluePrintConstants.PATH_INPUTS)
+                .append(BluePrintConstants.PATH_DIVIDER).append(propertyName).toString()
+        return getJsonNode(path)
+    }
+
+    override fun getNodeTemplateOperationOutputValue(nodeTemplateName: String, interfaceName: String,
+                                                     operationName: String, propertyName: String): JsonNode {
+        val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES)
+                .append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)
+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_INTERFACES)
+                .append(BluePrintConstants.PATH_DIVIDER).append(interfaceName)
+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_OPERATIONS)
+                .append(BluePrintConstants.PATH_DIVIDER).append(operationName)
+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_OUTPUTS)
+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_PROPERTIES)
+                .append(BluePrintConstants.PATH_DIVIDER).append(propertyName).toString()
+        return getJsonNode(path)
+    }
+
+    override fun getNodeTemplatePropertyValue(nodeTemplateName: String, propertyName: String): JsonNode {
+        val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES)
+                .append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)
+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_PROPERTIES)
+                .append(BluePrintConstants.PATH_DIVIDER).append(propertyName).toString()
+        return getJsonNode(path)
+    }
+
+    override fun getNodeTemplateAttributeValue(nodeTemplateName: String, attributeName: String): JsonNode {
+        val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES)
+                .append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)
+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_ATTRIBUTES)
+                .append(BluePrintConstants.PATH_DIVIDER).append(attributeName).toString()
+        return getJsonNode(path)
+    }
+
+    override fun assignInputs(jsonNode: JsonNode) {
+        log.info("assignInputs from input JSON ({})", jsonNode.toString())
+        bluePrintContext.inputs?.forEach { propertyName, property ->
+            val valueNode: JsonNode = jsonNode.at(BluePrintConstants.PATH_DIVIDER + propertyName)
+                    ?: NullNode.getInstance()
+            setInputValue(propertyName, property, valueNode)
+        }
+    }
+
+    override fun assignWorkflowInputs(workflowName: String, jsonNode: JsonNode) {
+        log.info("assign workflow {} input value ({})", workflowName, jsonNode.toString())
+
+        val dynamicInputPropertiesName = "$workflowName-properties"
+
+        bluePrintContext.workflowByName(workflowName).inputs?.forEach { propertyName, property ->
+            if (propertyName != dynamicInputPropertiesName) {
+                val valueNode: JsonNode = jsonNode.at(BluePrintConstants.PATH_DIVIDER + propertyName)
+                        ?: NullNode.getInstance()
+                setInputValue(propertyName, property, valueNode)
+            }
+        }
+        // Load Dynamic data Types
+        val workflowDynamicInputs: JsonNode? = jsonNode.get(dynamicInputPropertiesName)
+
+        workflowDynamicInputs?.let {
+            bluePrintContext.dataTypeByName("dt-$dynamicInputPropertiesName")?.properties?.forEach { propertyName, property ->
+                val valueNode: JsonNode = workflowDynamicInputs.at(BluePrintConstants.PATH_DIVIDER + propertyName)
+                        ?: NullNode.getInstance()
+                setInputValue(propertyName, property, valueNode)
+
+            }
+        }
+    }
+
+    override fun getJsonForNodeTemplateAttributeProperties(nodeTemplateName: String, keys: List<String>): JsonNode {
+
+        val jsonNode: ObjectNode = jacksonObjectMapper().createObjectNode()
+        val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES)
+                .append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)
+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_ATTRIBUTES)
+                .append(BluePrintConstants.PATH_DIVIDER).toString()
+        store.keys.filter {
+            it.startsWith(path)
+        }.map {
+            val key = it.replace(path, "")
+            if (keys.contains(key)) {
+                val value = store[it] as JsonNode
+                jsonNode.set(key, value)
+            }
+        }
+        return jsonNode
+    }
+
+
 }
\ No newline at end of file
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- * Modifications Copyright © 2018 IBM.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.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.lang3.StringUtils\r
-import org.onap.ccsdk.apps.controllerblueprints.core.*\r
-import org.onap.ccsdk.apps.controllerblueprints.core.data.*\r
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils\r
-import java.io.Serializable\r
-\r
-/**\r
- *\r
- *\r
- * @author Brinda Santh\r
- */\r
-interface BluePrintValidatorService : Serializable {\r
-\r
-    @Throws(BluePrintException::class)\r
-    fun validateBlueprint(bluePrintContext: BluePrintContext, properties: MutableMap<String, Any>)\r
-\r
-    @Throws(BluePrintException::class)\r
-    fun validateBlueprint(serviceTemplate: ServiceTemplate, properties: MutableMap<String, Any>)\r
-}\r
-\r
-open class BluePrintValidatorDefaultService : BluePrintValidatorService {\r
-\r
-    val log: EELFLogger = EELFManager.getInstance().getLogger(BluePrintValidatorDefaultService::class.toString())\r
-\r
-    lateinit var bluePrintContext: BluePrintContext\r
-    lateinit var serviceTemplate: ServiceTemplate\r
-    lateinit var properties: MutableMap<String, Any>\r
-    var message: StringBuilder = StringBuilder()\r
-    private val separator: String = BluePrintConstants.PATH_DIVIDER\r
-    var paths: MutableList<String> = arrayListOf()\r
-\r
-    @Throws(BluePrintException::class)\r
-    override fun validateBlueprint(bluePrintContext: BluePrintContext, properties: MutableMap<String, Any>) {\r
-        validateBlueprint(bluePrintContext.serviceTemplate, properties)\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    override fun validateBlueprint(serviceTemplate: ServiceTemplate, properties: MutableMap<String, Any>) {\r
-        this.bluePrintContext = BluePrintContext(serviceTemplate)\r
-        this.serviceTemplate = serviceTemplate\r
-        this.properties = properties\r
-        try {\r
-            message.appendln("-> Config Blueprint")\r
-            serviceTemplate.metadata?.let { validateMetadata(serviceTemplate.metadata!!) }\r
-            serviceTemplate.artifactTypes?.let { validateArtifactTypes(serviceTemplate.artifactTypes!!) }\r
-            serviceTemplate.dataTypes?.let { validateDataTypes(serviceTemplate.dataTypes!!) }\r
-            serviceTemplate.nodeTypes?.let { validateNodeTypes(serviceTemplate.nodeTypes!!) }\r
-            serviceTemplate.topologyTemplate?.let { validateTopologyTemplate(serviceTemplate.topologyTemplate!!) }\r
-        } catch (e: Exception) {\r
-            log.error("validation failed in the path : {}", paths.joinToString(separator), e)\r
-            log.error("validation trace message :{} ", message)\r
-            throw BluePrintException(e,\r
-                    format("failed to validate blueprint on path ({}) with message {}"\r
-                            , paths.joinToString(separator), e.message))\r
-        }\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateMetadata(metaDataMap: MutableMap<String, String>) {\r
-        paths.add("metadata")\r
-\r
-        val templateName = metaDataMap[BluePrintConstants.METADATA_TEMPLATE_NAME]\r
-        val templateVersion = metaDataMap[BluePrintConstants.METADATA_TEMPLATE_VERSION]\r
-        val templateTags = metaDataMap[BluePrintConstants.METADATA_TEMPLATE_TAGS]\r
-        val templateAuthor = metaDataMap[BluePrintConstants.METADATA_TEMPLATE_AUTHOR]\r
-\r
-        Preconditions.checkArgument(StringUtils.isNotBlank(templateName), "failed to get template name metadata")\r
-        Preconditions.checkArgument(StringUtils.isNotBlank(templateVersion), "failed to get template version metadata")\r
-        Preconditions.checkArgument(StringUtils.isNotBlank(templateTags), "failed to get template tags metadata")\r
-        Preconditions.checkArgument(StringUtils.isNotBlank(templateAuthor), "failed to get template author metadata")\r
-        paths.removeAt(paths.lastIndex)\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateArtifactTypes(artifactTypes: MutableMap<String, ArtifactType>) {\r
-        paths.add("artifact_types")\r
-        artifactTypes.forEach { artifactName, artifactType ->\r
-            paths.add(artifactName)\r
-            message.appendln("--> Artifact Type :" + paths.joinToString(separator))\r
-            artifactType.properties?.let { validatePropertyDefinitions(artifactType.properties!!) }\r
-            paths.removeAt(paths.lastIndex)\r
-        }\r
-        paths.removeAt(paths.lastIndex)\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateDataTypes(dataTypes: MutableMap<String, DataType>) {\r
-        paths.add("dataTypes")\r
-        dataTypes.forEach { dataTypeName, dataType ->\r
-            paths.add(dataTypeName)\r
-            message.appendln("--> DataType :" + paths.joinToString(separator))\r
-            dataType.properties?.let { validatePropertyDefinitions(dataType.properties!!) }\r
-            paths.removeAt(paths.lastIndex)\r
-        }\r
-        paths.removeAt(paths.lastIndex)\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateNodeTypes(nodeTypes: MutableMap<String, NodeType>) {\r
-        paths.add("nodeTypes")\r
-        nodeTypes.forEach { nodeTypeName, nodeType ->\r
-            // Validate Single Node Type\r
-            validateNodeType(nodeTypeName, nodeType)\r
-        }\r
-        paths.removeAt(paths.lastIndex)\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateNodeType(nodeTypeName: String, nodeType: NodeType) {\r
-        paths.add(nodeTypeName)\r
-        message.appendln("--> Node Type :" + paths.joinToString(separator))\r
-        val derivedFrom: String = nodeType.derivedFrom\r
-        //Check Derived From\r
-        checkValidNodeTypesDerivedFrom(nodeTypeName, derivedFrom)\r
-\r
-        if (!BluePrintTypes.rootNodeTypes().contains(derivedFrom)) {\r
-            serviceTemplate.nodeTypes?.get(derivedFrom)\r
-                    ?: throw BluePrintException(format("Failed to get derivedFrom NodeType({})'s for NodeType({}) ",\r
-                            derivedFrom, nodeTypeName))\r
-        }\r
-\r
-        nodeType.properties?.let { validatePropertyDefinitions(nodeType.properties!!) }\r
-        nodeType.capabilities?.let { validateCapabilityDefinitions(nodeTypeName, nodeType) }\r
-        nodeType.requirements?.let { validateRequirementDefinitions(nodeTypeName, nodeType) }\r
-        nodeType.interfaces?.let { validateInterfaceDefinitions(nodeType.interfaces!!) }\r
-        paths.removeAt(paths.lastIndex)\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun checkValidNodeTypesDerivedFrom(nodeTypeName: String, derivedFrom: String) {\r
-        check(BluePrintTypes.validNodeTypeDerivedFroms.contains(derivedFrom)) {\r
-            throw BluePrintException(format("Failed to get node type ({})'s  derivedFrom({}) definition ", nodeTypeName, derivedFrom))\r
-        }\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateTopologyTemplate(topologyTemplate: TopologyTemplate) {\r
-        paths.add("topology")\r
-        message.appendln("--> Topology Template")\r
-        topologyTemplate.inputs?.let { validateInputs(topologyTemplate.inputs!!) }\r
-        topologyTemplate.nodeTemplates?.let { validateNodeTemplates(topologyTemplate.nodeTemplates!!) }\r
-        topologyTemplate.workflows?.let { validateWorkFlows(topologyTemplate.workflows!!) }\r
-        paths.removeAt(paths.lastIndex)\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateInputs(inputs: MutableMap<String, PropertyDefinition>) {\r
-        paths.add("inputs")\r
-        message.appendln("---> Input :" + paths.joinToString(separator))\r
-        validatePropertyDefinitions(inputs)\r
-        paths.removeAt(paths.lastIndex)\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateNodeTemplates(nodeTemplates: MutableMap<String, NodeTemplate>) {\r
-        paths.add("nodeTemplates")\r
-        nodeTemplates.forEach { nodeTemplateName, nodeTemplate ->\r
-            validateNodeTemplate(nodeTemplateName, nodeTemplate)\r
-        }\r
-        paths.removeAt(paths.lastIndex)\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateNodeTemplate(nodeTemplateName: String, nodeTemplate: NodeTemplate) {\r
-        paths.add(nodeTemplateName)\r
-        message.appendln("---> NodeTemplate :" + paths.joinToString(separator))\r
-        val type: String = nodeTemplate.type\r
-\r
-        val nodeType: NodeType = serviceTemplate.nodeTypes?.get(type)\r
-                ?: throw BluePrintException(format("Failed to get NodeType({}) definition for NodeTemplate({})", type, nodeTemplateName))\r
-\r
-        nodeTemplate.artifacts?.let { validateArtifactDefinitions(nodeTemplate.artifacts!!) }\r
-        nodeTemplate.properties?.let { validatePropertyAssignments(nodeType.properties!!, nodeTemplate.properties!!) }\r
-        nodeTemplate.capabilities?.let { validateCapabilityAssignments(nodeType, nodeTemplateName, nodeTemplate) }\r
-        nodeTemplate.requirements?.let { validateRequirementAssignments(nodeType, nodeTemplateName, nodeTemplate) }\r
-        nodeTemplate.interfaces?.let { validateInterfaceAssignments(nodeType, nodeTemplateName, nodeTemplate) }\r
-        paths.removeAt(paths.lastIndex)\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateArtifactDefinitions(artifacts: MutableMap<String, ArtifactDefinition>) {\r
-        paths.add("artifacts")\r
-        artifacts.forEach { artifactDefinitionName, artifactDefinition ->\r
-            paths.add(artifactDefinitionName)\r
-            message.appendln("Validating artifact " + paths.joinToString(separator))\r
-            val type: String = artifactDefinition.type\r
-                    ?: throw BluePrintException(format("type is missing for ArtifactDefinition({})", artifactDefinitionName))\r
-            // Check Artifact Type\r
-            checkValidArtifactType(artifactDefinitionName, type)\r
-\r
-            val file: String = artifactDefinition.file\r
-                    ?: throw BluePrintException(format("file is missing for ArtifactDefinition({})", artifactDefinitionName))\r
-\r
-            paths.removeAt(paths.lastIndex)\r
-        }\r
-        paths.removeAt(paths.lastIndex)\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateWorkFlows(workflows: MutableMap<String, Workflow>) {\r
-        paths.add("workflows")\r
-        workflows.forEach { workflowName, workflow ->\r
-\r
-            // Validate Single workflow\r
-            validateWorkFlow(workflowName, workflow)\r
-        }\r
-        paths.removeAt(paths.lastIndex)\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateWorkFlow(workflowName: String, workflow: Workflow) {\r
-        paths.add(workflowName)\r
-        message.appendln("---> Workflow :" + paths.joinToString(separator))\r
-        // Step Validation Start\r
-        paths.add("steps")\r
-        workflow.steps?.forEach { stepName, _ ->\r
-            paths.add(stepName)\r
-            message.appendln("----> Steps :" + paths.joinToString(separator))\r
-            paths.removeAt(paths.lastIndex)\r
-        }\r
-        paths.removeAt(paths.lastIndex)\r
-        // Step Validation Ends\r
-        paths.removeAt(paths.lastIndex)\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validatePropertyDefinitions(properties: MutableMap<String, PropertyDefinition>) {\r
-        paths.add("properties")\r
-        properties.forEach { propertyName, propertyDefinition ->\r
-            paths.add(propertyName)\r
-            val dataType: String = propertyDefinition.type\r
-            when {\r
-                BluePrintTypes.validPrimitiveTypes().contains(dataType) -> {\r
-                    // Do Nothing\r
-                }\r
-                BluePrintTypes.validCollectionTypes().contains(dataType) -> {\r
-                    val entrySchemaType: String = propertyDefinition.entrySchema?.type\r
-                            ?: throw BluePrintException(format("Entry schema for DataType ({}) for the property ({}) not found", dataType, propertyName))\r
-                    checkPrimitiveOrComplex(entrySchemaType, propertyName)\r
-                }\r
-                else -> checkPropertyDataType(dataType, propertyName)\r
-            }\r
-            message.appendln("property " + paths.joinToString(separator) + " of type " + dataType)\r
-            paths.removeAt(paths.lastIndex)\r
-        }\r
-        paths.removeAt(paths.lastIndex)\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validatePropertyAssignments(nodeTypeProperties: MutableMap<String, PropertyDefinition>,\r
-                                         properties: MutableMap<String, JsonNode>) {\r
-        properties.forEach { propertyName, propertyAssignment ->\r
-            val propertyDefinition: PropertyDefinition = nodeTypeProperties[propertyName]\r
-                    ?: throw BluePrintException(format("failed to get definition for the property ({})", propertyName))\r
-\r
-            validatePropertyAssignment(propertyName, propertyDefinition, propertyAssignment)\r
-\r
-        }\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validatePropertyAssignment(propertyName: String, propertyDefinition: PropertyDefinition,\r
-                                        propertyAssignment: JsonNode) {\r
-        // Check and Validate if Expression Node\r
-        val expressionData = BluePrintExpressionService.getExpressionData(propertyAssignment)\r
-        if (!expressionData.isExpression) {\r
-            checkPropertyValue(propertyName, propertyDefinition, propertyAssignment)\r
-        }\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateCapabilityAssignments(nodeType: NodeType, nodeTemplateName: String, nodeTemplate: NodeTemplate) {\r
-        val capabilities = nodeTemplate.capabilities\r
-        paths.add("capabilities")\r
-        capabilities?.forEach { capabilityName, capabilityAssignment ->\r
-            paths.add(capabilityName)\r
-\r
-            val capabilityDefinition = nodeType.capabilities?.get(capabilityName)\r
-                    ?: throw BluePrintException(format("Failed to get NodeTemplate({}) capability definition ({}) " +\r
-                            "from NodeType({}) ", nodeTemplateName, capabilityName, nodeTemplate.type))\r
-\r
-            validateCapabilityAssignment(nodeTemplateName, capabilityName, capabilityDefinition, capabilityAssignment)\r
-\r
-            paths.removeAt(paths.lastIndex)\r
-        }\r
-        paths.removeAt(paths.lastIndex)\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateCapabilityAssignment(nodeTemplateName: String, capabilityName: String,\r
-                                          capabilityDefinition: CapabilityDefinition, capabilityAssignment: CapabilityAssignment) {\r
-\r
-        capabilityAssignment.properties?.let { validatePropertyAssignments(capabilityDefinition.properties!!, capabilityAssignment.properties!!) }\r
-\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateRequirementAssignments(nodeType: NodeType, nodeTemplateName: String, nodeTemplate: NodeTemplate) {\r
-        val requirements = nodeTemplate.requirements\r
-        paths.add("requirements")\r
-        requirements?.forEach { requirementName, requirementAssignment ->\r
-            paths.add(requirementName)\r
-            val requirementDefinition = nodeType.requirements?.get(requirementName)\r
-                    ?: throw BluePrintException(format("Failed to get NodeTemplate({}) requirement definition ({}) from" +\r
-                            " NodeType({}) ", nodeTemplateName, requirementName, nodeTemplate.type))\r
-            // Validate Requirement Assignment\r
-            validateRequirementAssignment(nodeTemplateName, requirementName, requirementDefinition, requirementAssignment)\r
-            paths.removeAt(paths.lastIndex)\r
-        }\r
-        paths.removeAt(paths.lastIndex)\r
-\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateRequirementAssignment(nodeTemplateName: String, requirementAssignmentName: String,\r
-                                           requirementDefinition: RequirementDefinition, requirementAssignment: RequirementAssignment) {\r
-        log.info("Validating NodeTemplate({}) requirement assignment ({}) ", nodeTemplateName, requirementAssignmentName)\r
-        val requirementNodeTemplateName = requirementAssignment.node!!\r
-        val capabilityName = requirementAssignment.capability\r
-        val relationship = requirementAssignment.relationship!!\r
-\r
-        check(BluePrintTypes.validRelationShipDerivedFroms.contains(relationship)) {\r
-            throw BluePrintException(format("Failed to get relationship type ({}) for NodeTemplate({})'s requirement({}) ",\r
-                    relationship, nodeTemplateName, requirementAssignmentName))\r
-        }\r
-\r
-        val relationShipNodeTemplate = serviceTemplate.topologyTemplate?.nodeTemplates?.get(requirementNodeTemplateName)\r
-                ?: throw BluePrintException(format("Failed to get requirement NodeTemplate({})'s for NodeTemplate({}) requirement({}) ",\r
-                        requirementNodeTemplateName, nodeTemplateName, requirementAssignmentName))\r
-\r
-        relationShipNodeTemplate.capabilities?.get(capabilityName)\r
-                ?: throw BluePrintException(format("Failed to get requirement NodeTemplate({})'s capability({}) for NodeTemplate ({})'s requirement({}) ",\r
-                        requirementNodeTemplateName, capabilityName, nodeTemplateName, requirementAssignmentName))\r
-\r
-\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateInterfaceAssignments(nodeType: NodeType, nodeTemplateName: String, nodeTemplate: NodeTemplate) {\r
-\r
-        val interfaces = nodeTemplate.interfaces\r
-        paths.add("interfaces")\r
-        interfaces?.forEach { interfaceAssignmentName, interfaceAssignment ->\r
-            paths.add(interfaceAssignmentName)\r
-            val interfaceDefinition = nodeType.interfaces?.get(interfaceAssignmentName)\r
-                    ?: throw BluePrintException(format("Failed to get NodeTemplate({}) interface definition ({}) from" +\r
-                            " NodeType({}) ", nodeTemplateName, interfaceAssignmentName, nodeTemplate.type))\r
-\r
-            validateInterfaceAssignment(nodeTemplateName, interfaceAssignmentName, interfaceDefinition,\r
-                    interfaceAssignment)\r
-            paths.removeAt(paths.lastIndex)\r
-        }\r
-        paths.removeAt(paths.lastIndex)\r
-\r
-\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateInterfaceAssignment(nodeTemplateName: String, interfaceAssignmentName: String,\r
-                                         interfaceDefinition: InterfaceDefinition,\r
-                                         interfaceAssignment: InterfaceAssignment) {\r
-\r
-        val operations = interfaceAssignment.operations\r
-        operations?.let {\r
-            validateInterfaceOperationsAssignment(nodeTemplateName, interfaceAssignmentName, interfaceDefinition,\r
-                    interfaceAssignment)\r
-        }\r
-\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateInterfaceOperationsAssignment(nodeTemplateName: String, interfaceAssignmentName: String,\r
-                                                   interfaceDefinition: InterfaceDefinition,\r
-                                                   interfaceAssignment: InterfaceAssignment) {\r
-\r
-        val operations = interfaceAssignment.operations\r
-        operations?.let {\r
-            it.forEach { operationAssignmentName, operationAssignments ->\r
-\r
-                val operationDefinition = interfaceDefinition.operations?.get(operationAssignmentName)\r
-                        ?: throw BluePrintException(format("Failed to get NodeTemplate({}) operation definition ({}) ",\r
-                                nodeTemplateName, operationAssignmentName))\r
-\r
-                log.info("Validation NodeTemplate({}) Interface({}) Operation ({})", nodeTemplateName,\r
-                        interfaceAssignmentName, operationAssignmentName)\r
-\r
-                val inputs = operationAssignments.inputs\r
-                val outputs = operationAssignments.outputs\r
-\r
-                inputs?.forEach { propertyName, propertyAssignment ->\r
-                    val propertyDefinition = operationDefinition.inputs?.get(propertyName)\r
-                            ?: throw BluePrintException(format("Failed to get NodeTemplate({}) operation definition ({}) " +\r
-                                    "property definition({})", nodeTemplateName, operationAssignmentName, propertyName))\r
-                    // Check the property values with property definition\r
-                    validatePropertyAssignment(propertyName, propertyDefinition, propertyAssignment)\r
-                }\r
-\r
-                outputs?.forEach { propertyName, propertyAssignment ->\r
-                    val propertyDefinition = operationDefinition.outputs?.get(propertyName)\r
-                            ?: throw BluePrintException(format("Failed to get NodeTemplate({}) operation definition ({}) " +\r
-                                    "output property definition({})", nodeTemplateName, operationAssignmentName,\r
-                                    propertyName))\r
-                    // Check the property values with property definition\r
-                    validatePropertyAssignment(propertyName, propertyDefinition, propertyAssignment)\r
-                }\r
-\r
-            }\r
-        }\r
-\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateCapabilityDefinitions(nodeTypeName: String, nodeType: NodeType) {\r
-        val capabilities = nodeType.capabilities\r
-        paths.add("capabilities")\r
-        capabilities?.forEach { capabilityName, capabilityDefinition ->\r
-            paths.add(capabilityName)\r
-\r
-            validateCapabilityDefinition(nodeTypeName, nodeType, capabilityName, capabilityDefinition)\r
-\r
-            paths.removeAt(paths.lastIndex)\r
-        }\r
-        paths.removeAt(paths.lastIndex)\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateCapabilityDefinition(nodeTypeName: String, nodeType: NodeType, capabilityName: String,\r
-                                          capabilityDefinition: CapabilityDefinition) {\r
-        val capabilityType = capabilityDefinition.type\r
-        check(BluePrintTypes.validCapabilityTypes.contains(capabilityType)) {\r
-            throw BluePrintException(format("Failed to get CapabilityType({}) for NodeType({})",\r
-                    capabilityType, nodeTypeName))\r
-        }\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateRequirementDefinitions(nodeName: String, nodeType: NodeType) {\r
-        paths.add("requirements")\r
-        val requirements = nodeType.requirements\r
-\r
-        requirements?.forEach { requirementDefinitionName, requirementDefinition ->\r
-            paths.add(requirementDefinitionName)\r
-            message.appendln("Validating : " + paths.joinToString(separator))\r
-            validateRequirementDefinition(nodeName, nodeType, requirementDefinitionName, requirementDefinition)\r
-            paths.removeAt(paths.lastIndex)\r
-        }\r
-        paths.removeAt(paths.lastIndex)\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateRequirementDefinition(nodeTypeName: String, nodeType: NodeType, requirementDefinitionName: String,\r
-                                           requirementDefinition: RequirementDefinition) {\r
-\r
-        log.info("Validating NodeType({}) RequirementDefinition ({}) ", nodeTypeName, requirementDefinitionName)\r
-        val requirementNodeTypeName = requirementDefinition.node!!\r
-        val capabilityName = requirementDefinition.capability\r
-        val relationship = requirementDefinition.relationship!!\r
-\r
-        check(BluePrintTypes.validRelationShipDerivedFroms.contains(relationship)) {\r
-            throw BluePrintException(format("Failed to get relationship({}) for NodeType({})'s requirement({}) ",\r
-                    relationship, nodeTypeName, requirementDefinitionName))\r
-        }\r
-\r
-        val relationShipNodeType = serviceTemplate.nodeTypes?.get(requirementNodeTypeName)\r
-                ?: throw BluePrintException(format("Failed to get requirement NodeType({})'s for requirement({}) ",\r
-                        requirementNodeTypeName, requirementDefinitionName))\r
-\r
-        relationShipNodeType.capabilities?.get(capabilityName)\r
-                ?: throw BluePrintException(format("Failed to get requirement NodeType({})'s capability({}) for NodeType ({})'s requirement({}) ",\r
-                        requirementNodeTypeName, capabilityName, nodeTypeName, requirementDefinitionName))\r
-\r
-    }\r
-\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateInterfaceDefinitions(interfaces: MutableMap<String, InterfaceDefinition>) {\r
-        paths.add("interfaces")\r
-        interfaces.forEach { interfaceName, interfaceDefinition ->\r
-            paths.add(interfaceName)\r
-            message.appendln("Validating : " + paths.joinToString(separator))\r
-            interfaceDefinition.operations?.let { validateOperationDefinitions(interfaceDefinition.operations!!) }\r
-            paths.removeAt(paths.lastIndex)\r
-        }\r
-        paths.removeAt(paths.lastIndex)\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateOperationDefinitions(operations: MutableMap<String, OperationDefinition>) {\r
-        paths.add("operations")\r
-        operations.forEach { opertaionName, operationDefinition ->\r
-            paths.add(opertaionName)\r
-            message.appendln("Validating : " + paths.joinToString(separator))\r
-            operationDefinition.implementation?.let { validateImplementation(operationDefinition.implementation!!) }\r
-            operationDefinition.inputs?.let { validatePropertyDefinitions(operationDefinition.inputs!!) }\r
-            operationDefinition.outputs?.let { validatePropertyDefinitions(operationDefinition.outputs!!) }\r
-            paths.removeAt(paths.lastIndex)\r
-        }\r
-        paths.removeAt(paths.lastIndex)\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun validateImplementation(implementation: Implementation) {\r
-        checkNotEmptyOrThrow(implementation.primary)\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun checkValidArtifactType(artifactDefinitionName: String, artifactTypeName: String) {\r
-\r
-        val artifactType = serviceTemplate.artifactTypes?.get(artifactTypeName)\r
-                ?: throw BluePrintException("failed to artifactType($artifactTypeName) for ArtifactDefinition($artifactDefinitionName)")\r
-\r
-        checkValidArtifactTypeDerivedFrom(artifactTypeName, artifactType.derivedFrom)\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun checkValidArtifactTypeDerivedFrom(artifactTypeName: String, derivedFrom: String) {\r
-        check(BluePrintTypes.validArtifactTypeDerivedFroms.contains(derivedFrom)) {\r
-            throw BluePrintException("failed to get artifactType($artifactTypeName)'s derivedFrom($derivedFrom) definition")\r
-        }\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun checkValidDataTypeDerivedFrom(dataTypeName: String, derivedFrom: String) {\r
-        check(BluePrintTypes.validDataTypeDerivedFroms.contains(derivedFrom)) {\r
-            throw BluePrintException(format("Failed to get DataType({})'s  derivedFrom({}) definition ", dataTypeName, derivedFrom))\r
-        }\r
-    }\r
-\r
-    @Throws(BluePrintException::class)\r
-    open fun checkValidRelationshipTypeDerivedFrom(relationshipTypeName: String, derivedFrom: String) {\r
-        check(BluePrintTypes.validRelationShipDerivedFroms.contains(derivedFrom)) {\r
-            throw BluePrintException(format("Failed to get relationship type ({})'s  derivedFrom({}) definition ", relationshipTypeName, derivedFrom))\r
-        }\r
-    }\r
-\r
-    open fun checkPropertyValue(propertyName: String, propertyDefinition: PropertyDefinition, propertyAssignment: JsonNode) {\r
-        val propertyType = propertyDefinition.type\r
-        val isValid: Boolean\r
-\r
-        if (BluePrintTypes.validPrimitiveTypes().contains(propertyType)) {\r
-            isValid = JacksonUtils.checkJsonNodeValueOfPrimitiveType(propertyType, propertyAssignment)\r
-\r
-        } else if (BluePrintTypes.validCollectionTypes().contains(propertyType)) {\r
-\r
-            val entrySchemaType = propertyDefinition.entrySchema?.type\r
-                    ?: throw BluePrintException(format("Failed to get EntrySchema type for the collection property ({})", propertyName))\r
-\r
-            if (!BluePrintTypes.validPropertyTypes().contains(entrySchemaType)) {\r
-                checkPropertyDataType(entrySchemaType, propertyName)\r
-            }\r
-            isValid = JacksonUtils.checkJsonNodeValueOfCollectionType(propertyType, propertyAssignment)\r
-        } else {\r
-            checkPropertyDataType(propertyType, propertyName)\r
-            isValid = true\r
-        }\r
-\r
-        check(isValid) {\r
-            throw BluePrintException(format("property({}) defined of type({}) is not comptable with the value ({})",\r
-                    propertyName, propertyType, propertyAssignment))\r
-        }\r
-    }\r
-\r
-    private fun checkPropertyDataType(dataTypeName: String, propertyName: String) {\r
-\r
-        val dataType = serviceTemplate.dataTypes?.get(dataTypeName)\r
-                ?: throw BluePrintException(format("DataType ({}) for the property ({}) not found", dataTypeName, propertyName))\r
-\r
-        checkValidDataTypeDerivedFrom(propertyName, dataType.derivedFrom)\r
-\r
-    }\r
-\r
-    private fun checkPrimitiveOrComplex(dataType: String, propertyName: String): Boolean {\r
-        if (BluePrintTypes.validPrimitiveTypes().contains(dataType) || checkDataType(dataType)) {\r
-            return true\r
-        } else {\r
-            throw BluePrintException(format("DataType({}) for the property({}) is not valid", dataType, propertyName))\r
-        }\r
-    }\r
-\r
-    private fun checkDataType(key: String): Boolean {\r
-        return serviceTemplate.dataTypes?.containsKey(key) ?: false\r
-    }\r
-\r
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
+ *
+ * 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.service
+
+import com.att.eelf.configuration.EELFLogger
+import com.att.eelf.configuration.EELFManager
+import com.fasterxml.jackson.databind.JsonNode
+import com.google.common.base.Preconditions
+import org.apache.commons.lang3.StringUtils
+import org.onap.ccsdk.apps.controllerblueprints.core.*
+import org.onap.ccsdk.apps.controllerblueprints.core.data.*
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
+import java.io.Serializable
+
+/**
+ *
+ *
+ * @author Brinda Santh
+ */
+interface BluePrintValidatorService : Serializable {
+
+    @Throws(BluePrintException::class)
+    fun validateBlueprint(bluePrintContext: BluePrintContext, properties: MutableMap<String, Any>)
+
+    @Throws(BluePrintException::class)
+    fun validateBlueprint(serviceTemplate: ServiceTemplate, properties: MutableMap<String, Any>)
+}
+
+open class BluePrintValidatorDefaultService : BluePrintValidatorService {
+
+    val log: EELFLogger = EELFManager.getInstance().getLogger(BluePrintValidatorDefaultService::class.toString())
+
+    lateinit var bluePrintContext: BluePrintContext
+    lateinit var serviceTemplate: ServiceTemplate
+    lateinit var properties: MutableMap<String, Any>
+    var message: StringBuilder = StringBuilder()
+    private val separator: String = BluePrintConstants.PATH_DIVIDER
+    var paths: MutableList<String> = arrayListOf()
+
+    @Throws(BluePrintException::class)
+    override fun validateBlueprint(bluePrintContext: BluePrintContext, properties: MutableMap<String, Any>) {
+        validateBlueprint(bluePrintContext.serviceTemplate, properties)
+    }
+
+    @Throws(BluePrintException::class)
+    override fun validateBlueprint(serviceTemplate: ServiceTemplate, properties: MutableMap<String, Any>) {
+        this.bluePrintContext = BluePrintContext(serviceTemplate)
+        this.serviceTemplate = serviceTemplate
+        this.properties = properties
+        try {
+            message.appendln("-> Config Blueprint")
+            serviceTemplate.metadata?.let { validateMetadata(serviceTemplate.metadata!!) }
+            serviceTemplate.artifactTypes?.let { validateArtifactTypes(serviceTemplate.artifactTypes!!) }
+            serviceTemplate.dataTypes?.let { validateDataTypes(serviceTemplate.dataTypes!!) }
+            serviceTemplate.nodeTypes?.let { validateNodeTypes(serviceTemplate.nodeTypes!!) }
+            serviceTemplate.topologyTemplate?.let { validateTopologyTemplate(serviceTemplate.topologyTemplate!!) }
+        } catch (e: Exception) {
+            log.error("validation failed in the path : {}", paths.joinToString(separator), e)
+            log.error("validation trace message :{} ", message)
+            throw BluePrintException(e,
+                    format("failed to validate blueprint on path ({}) with message {}"
+                            , paths.joinToString(separator), e.message))
+        }
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateMetadata(metaDataMap: MutableMap<String, String>) {
+        paths.add("metadata")
+
+        val templateName = metaDataMap[BluePrintConstants.METADATA_TEMPLATE_NAME]
+        val templateVersion = metaDataMap[BluePrintConstants.METADATA_TEMPLATE_VERSION]
+        val templateTags = metaDataMap[BluePrintConstants.METADATA_TEMPLATE_TAGS]
+        val templateAuthor = metaDataMap[BluePrintConstants.METADATA_TEMPLATE_AUTHOR]
+
+        Preconditions.checkArgument(StringUtils.isNotBlank(templateName), "failed to get template name metadata")
+        Preconditions.checkArgument(StringUtils.isNotBlank(templateVersion), "failed to get template version metadata")
+        Preconditions.checkArgument(StringUtils.isNotBlank(templateTags), "failed to get template tags metadata")
+        Preconditions.checkArgument(StringUtils.isNotBlank(templateAuthor), "failed to get template author metadata")
+        paths.removeAt(paths.lastIndex)
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateArtifactTypes(artifactTypes: MutableMap<String, ArtifactType>) {
+        paths.add("artifact_types")
+        artifactTypes.forEach { artifactName, artifactType ->
+            paths.add(artifactName)
+            message.appendln("--> Artifact Type :" + paths.joinToString(separator))
+            artifactType.properties?.let { validatePropertyDefinitions(artifactType.properties!!) }
+            paths.removeAt(paths.lastIndex)
+        }
+        paths.removeAt(paths.lastIndex)
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateDataTypes(dataTypes: MutableMap<String, DataType>) {
+        paths.add("dataTypes")
+        dataTypes.forEach { dataTypeName, dataType ->
+            paths.add(dataTypeName)
+            message.appendln("--> DataType :" + paths.joinToString(separator))
+            dataType.properties?.let { validatePropertyDefinitions(dataType.properties!!) }
+            paths.removeAt(paths.lastIndex)
+        }
+        paths.removeAt(paths.lastIndex)
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateNodeTypes(nodeTypes: MutableMap<String, NodeType>) {
+        paths.add("nodeTypes")
+        nodeTypes.forEach { nodeTypeName, nodeType ->
+            // Validate Single Node Type
+            validateNodeType(nodeTypeName, nodeType)
+        }
+        paths.removeAt(paths.lastIndex)
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateNodeType(nodeTypeName: String, nodeType: NodeType) {
+        paths.add(nodeTypeName)
+        message.appendln("--> Node Type :" + paths.joinToString(separator))
+        val derivedFrom: String = nodeType.derivedFrom
+        //Check Derived From
+        checkValidNodeTypesDerivedFrom(nodeTypeName, derivedFrom)
+
+        if (!BluePrintTypes.rootNodeTypes().contains(derivedFrom)) {
+            serviceTemplate.nodeTypes?.get(derivedFrom)
+                    ?: throw BluePrintException(format("Failed to get derivedFrom NodeType({})'s for NodeType({}) ",
+                            derivedFrom, nodeTypeName))
+        }
+
+        nodeType.properties?.let { validatePropertyDefinitions(nodeType.properties!!) }
+        nodeType.capabilities?.let { validateCapabilityDefinitions(nodeTypeName, nodeType) }
+        nodeType.requirements?.let { validateRequirementDefinitions(nodeTypeName, nodeType) }
+        nodeType.interfaces?.let { validateInterfaceDefinitions(nodeType.interfaces!!) }
+        paths.removeAt(paths.lastIndex)
+    }
+
+    @Throws(BluePrintException::class)
+    open fun checkValidNodeTypesDerivedFrom(nodeTypeName: String, derivedFrom: String) {
+        check(BluePrintTypes.validNodeTypeDerivedFroms.contains(derivedFrom)) {
+            throw BluePrintException(format("Failed to get node type ({})'s  derivedFrom({}) definition ", nodeTypeName, derivedFrom))
+        }
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateTopologyTemplate(topologyTemplate: TopologyTemplate) {
+        paths.add("topology")
+        message.appendln("--> Topology Template")
+        topologyTemplate.inputs?.let { validateInputs(topologyTemplate.inputs!!) }
+        topologyTemplate.nodeTemplates?.let { validateNodeTemplates(topologyTemplate.nodeTemplates!!) }
+        topologyTemplate.workflows?.let { validateWorkFlows(topologyTemplate.workflows!!) }
+        paths.removeAt(paths.lastIndex)
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateInputs(inputs: MutableMap<String, PropertyDefinition>) {
+        paths.add("inputs")
+        message.appendln("---> Input :" + paths.joinToString(separator))
+        validatePropertyDefinitions(inputs)
+        paths.removeAt(paths.lastIndex)
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateNodeTemplates(nodeTemplates: MutableMap<String, NodeTemplate>) {
+        paths.add("nodeTemplates")
+        nodeTemplates.forEach { nodeTemplateName, nodeTemplate ->
+            validateNodeTemplate(nodeTemplateName, nodeTemplate)
+        }
+        paths.removeAt(paths.lastIndex)
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateNodeTemplate(nodeTemplateName: String, nodeTemplate: NodeTemplate) {
+        paths.add(nodeTemplateName)
+        message.appendln("---> NodeTemplate :" + paths.joinToString(separator))
+        val type: String = nodeTemplate.type
+
+        val nodeType: NodeType = serviceTemplate.nodeTypes?.get(type)
+                ?: throw BluePrintException(format("Failed to get NodeType({}) definition for NodeTemplate({})", type, nodeTemplateName))
+
+        nodeTemplate.artifacts?.let { validateArtifactDefinitions(nodeTemplate.artifacts!!) }
+        nodeTemplate.properties?.let { validatePropertyAssignments(nodeType.properties!!, nodeTemplate.properties!!) }
+        nodeTemplate.capabilities?.let { validateCapabilityAssignments(nodeType, nodeTemplateName, nodeTemplate) }
+        nodeTemplate.requirements?.let { validateRequirementAssignments(nodeType, nodeTemplateName, nodeTemplate) }
+        nodeTemplate.interfaces?.let { validateInterfaceAssignments(nodeType, nodeTemplateName, nodeTemplate) }
+        paths.removeAt(paths.lastIndex)
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateArtifactDefinitions(artifacts: MutableMap<String, ArtifactDefinition>) {
+        paths.add("artifacts")
+        artifacts.forEach { artifactDefinitionName, artifactDefinition ->
+            paths.add(artifactDefinitionName)
+            message.appendln("Validating artifact " + paths.joinToString(separator))
+            val type: String = artifactDefinition.type
+                    ?: throw BluePrintException(format("type is missing for ArtifactDefinition({})", artifactDefinitionName))
+            // Check Artifact Type
+            checkValidArtifactType(artifactDefinitionName, type)
+
+            val file: String = artifactDefinition.file
+                    ?: throw BluePrintException(format("file is missing for ArtifactDefinition({})", artifactDefinitionName))
+
+            paths.removeAt(paths.lastIndex)
+        }
+        paths.removeAt(paths.lastIndex)
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateWorkFlows(workflows: MutableMap<String, Workflow>) {
+        paths.add("workflows")
+        workflows.forEach { workflowName, workflow ->
+
+            // Validate Single workflow
+            validateWorkFlow(workflowName, workflow)
+        }
+        paths.removeAt(paths.lastIndex)
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateWorkFlow(workflowName: String, workflow: Workflow) {
+        paths.add(workflowName)
+        message.appendln("---> Workflow :" + paths.joinToString(separator))
+        // Step Validation Start
+        paths.add("steps")
+        workflow.steps?.forEach { stepName, _ ->
+            paths.add(stepName)
+            message.appendln("----> Steps :" + paths.joinToString(separator))
+            paths.removeAt(paths.lastIndex)
+        }
+        paths.removeAt(paths.lastIndex)
+        // Step Validation Ends
+        paths.removeAt(paths.lastIndex)
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validatePropertyDefinitions(properties: MutableMap<String, PropertyDefinition>) {
+        paths.add("properties")
+        properties.forEach { propertyName, propertyDefinition ->
+            paths.add(propertyName)
+            val dataType: String = propertyDefinition.type
+            when {
+                BluePrintTypes.validPrimitiveTypes().contains(dataType) -> {
+                    // Do Nothing
+                }
+                BluePrintTypes.validCollectionTypes().contains(dataType) -> {
+                    val entrySchemaType: String = propertyDefinition.entrySchema?.type
+                            ?: throw BluePrintException(format("Entry schema for DataType ({}) for the property ({}) not found", dataType, propertyName))
+                    checkPrimitiveOrComplex(entrySchemaType, propertyName)
+                }
+                else -> checkPropertyDataType(dataType, propertyName)
+            }
+            message.appendln("property " + paths.joinToString(separator) + " of type " + dataType)
+            paths.removeAt(paths.lastIndex)
+        }
+        paths.removeAt(paths.lastIndex)
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validatePropertyAssignments(nodeTypeProperties: MutableMap<String, PropertyDefinition>,
+                                         properties: MutableMap<String, JsonNode>) {
+        properties.forEach { propertyName, propertyAssignment ->
+            val propertyDefinition: PropertyDefinition = nodeTypeProperties[propertyName]
+                    ?: throw BluePrintException(format("failed to get definition for the property ({})", propertyName))
+
+            validatePropertyAssignment(propertyName, propertyDefinition, propertyAssignment)
+
+        }
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validatePropertyAssignment(propertyName: String, propertyDefinition: PropertyDefinition,
+                                        propertyAssignment: JsonNode) {
+        // Check and Validate if Expression Node
+        val expressionData = BluePrintExpressionService.getExpressionData(propertyAssignment)
+        if (!expressionData.isExpression) {
+            checkPropertyValue(propertyName, propertyDefinition, propertyAssignment)
+        }
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateCapabilityAssignments(nodeType: NodeType, nodeTemplateName: String, nodeTemplate: NodeTemplate) {
+        val capabilities = nodeTemplate.capabilities
+        paths.add("capabilities")
+        capabilities?.forEach { capabilityName, capabilityAssignment ->
+            paths.add(capabilityName)
+
+            val capabilityDefinition = nodeType.capabilities?.get(capabilityName)
+                    ?: throw BluePrintException(format("Failed to get NodeTemplate({}) capability definition ({}) " +
+                            "from NodeType({}) ", nodeTemplateName, capabilityName, nodeTemplate.type))
+
+            validateCapabilityAssignment(nodeTemplateName, capabilityName, capabilityDefinition, capabilityAssignment)
+
+            paths.removeAt(paths.lastIndex)
+        }
+        paths.removeAt(paths.lastIndex)
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateCapabilityAssignment(nodeTemplateName: String, capabilityName: String,
+                                          capabilityDefinition: CapabilityDefinition, capabilityAssignment: CapabilityAssignment) {
+
+        capabilityAssignment.properties?.let { validatePropertyAssignments(capabilityDefinition.properties!!, capabilityAssignment.properties!!) }
+
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateRequirementAssignments(nodeType: NodeType, nodeTemplateName: String, nodeTemplate: NodeTemplate) {
+        val requirements = nodeTemplate.requirements
+        paths.add("requirements")
+        requirements?.forEach { requirementName, requirementAssignment ->
+            paths.add(requirementName)
+            val requirementDefinition = nodeType.requirements?.get(requirementName)
+                    ?: throw BluePrintException(format("Failed to get NodeTemplate({}) requirement definition ({}) from" +
+                            " NodeType({}) ", nodeTemplateName, requirementName, nodeTemplate.type))
+            // Validate Requirement Assignment
+            validateRequirementAssignment(nodeTemplateName, requirementName, requirementDefinition, requirementAssignment)
+            paths.removeAt(paths.lastIndex)
+        }
+        paths.removeAt(paths.lastIndex)
+
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateRequirementAssignment(nodeTemplateName: String, requirementAssignmentName: String,
+                                           requirementDefinition: RequirementDefinition, requirementAssignment: RequirementAssignment) {
+        log.info("Validating NodeTemplate({}) requirement assignment ({}) ", nodeTemplateName, requirementAssignmentName)
+        val requirementNodeTemplateName = requirementAssignment.node!!
+        val capabilityName = requirementAssignment.capability
+        val relationship = requirementAssignment.relationship!!
+
+        check(BluePrintTypes.validRelationShipDerivedFroms.contains(relationship)) {
+            throw BluePrintException(format("Failed to get relationship type ({}) for NodeTemplate({})'s requirement({}) ",
+                    relationship, nodeTemplateName, requirementAssignmentName))
+        }
+
+        val relationShipNodeTemplate = serviceTemplate.topologyTemplate?.nodeTemplates?.get(requirementNodeTemplateName)
+                ?: throw BluePrintException(format("Failed to get requirement NodeTemplate({})'s for NodeTemplate({}) requirement({}) ",
+                        requirementNodeTemplateName, nodeTemplateName, requirementAssignmentName))
+
+        relationShipNodeTemplate.capabilities?.get(capabilityName)
+                ?: throw BluePrintException(format("Failed to get requirement NodeTemplate({})'s capability({}) for NodeTemplate ({})'s requirement({}) ",
+                        requirementNodeTemplateName, capabilityName, nodeTemplateName, requirementAssignmentName))
+
+
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateInterfaceAssignments(nodeType: NodeType, nodeTemplateName: String, nodeTemplate: NodeTemplate) {
+
+        val interfaces = nodeTemplate.interfaces
+        paths.add("interfaces")
+        interfaces?.forEach { interfaceAssignmentName, interfaceAssignment ->
+            paths.add(interfaceAssignmentName)
+            val interfaceDefinition = nodeType.interfaces?.get(interfaceAssignmentName)
+                    ?: throw BluePrintException(format("Failed to get NodeTemplate({}) interface definition ({}) from" +
+                            " NodeType({}) ", nodeTemplateName, interfaceAssignmentName, nodeTemplate.type))
+
+            validateInterfaceAssignment(nodeTemplateName, interfaceAssignmentName, interfaceDefinition,
+                    interfaceAssignment)
+            paths.removeAt(paths.lastIndex)
+        }
+        paths.removeAt(paths.lastIndex)
+
+
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateInterfaceAssignment(nodeTemplateName: String, interfaceAssignmentName: String,
+                                         interfaceDefinition: InterfaceDefinition,
+                                         interfaceAssignment: InterfaceAssignment) {
+
+        val operations = interfaceAssignment.operations
+        operations?.let {
+            validateInterfaceOperationsAssignment(nodeTemplateName, interfaceAssignmentName, interfaceDefinition,
+                    interfaceAssignment)
+        }
+
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateInterfaceOperationsAssignment(nodeTemplateName: String, interfaceAssignmentName: String,
+                                                   interfaceDefinition: InterfaceDefinition,
+                                                   interfaceAssignment: InterfaceAssignment) {
+
+        val operations = interfaceAssignment.operations
+        operations?.let {
+            it.forEach { operationAssignmentName, operationAssignments ->
+
+                val operationDefinition = interfaceDefinition.operations?.get(operationAssignmentName)
+                        ?: throw BluePrintException(format("Failed to get NodeTemplate({}) operation definition ({}) ",
+                                nodeTemplateName, operationAssignmentName))
+
+                log.info("Validation NodeTemplate({}) Interface({}) Operation ({})", nodeTemplateName,
+                        interfaceAssignmentName, operationAssignmentName)
+
+                val inputs = operationAssignments.inputs
+                val outputs = operationAssignments.outputs
+
+                inputs?.forEach { propertyName, propertyAssignment ->
+                    val propertyDefinition = operationDefinition.inputs?.get(propertyName)
+                            ?: throw BluePrintException(format("Failed to get NodeTemplate({}) operation definition ({}) " +
+                                    "property definition({})", nodeTemplateName, operationAssignmentName, propertyName))
+                    // Check the property values with property definition
+                    validatePropertyAssignment(propertyName, propertyDefinition, propertyAssignment)
+                }
+
+                outputs?.forEach { propertyName, propertyAssignment ->
+                    val propertyDefinition = operationDefinition.outputs?.get(propertyName)
+                            ?: throw BluePrintException(format("Failed to get NodeTemplate({}) operation definition ({}) " +
+                                    "output property definition({})", nodeTemplateName, operationAssignmentName,
+                                    propertyName))
+                    // Check the property values with property definition
+                    validatePropertyAssignment(propertyName, propertyDefinition, propertyAssignment)
+                }
+
+            }
+        }
+
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateCapabilityDefinitions(nodeTypeName: String, nodeType: NodeType) {
+        val capabilities = nodeType.capabilities
+        paths.add("capabilities")
+        capabilities?.forEach { capabilityName, capabilityDefinition ->
+            paths.add(capabilityName)
+
+            validateCapabilityDefinition(nodeTypeName, nodeType, capabilityName, capabilityDefinition)
+
+            paths.removeAt(paths.lastIndex)
+        }
+        paths.removeAt(paths.lastIndex)
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateCapabilityDefinition(nodeTypeName: String, nodeType: NodeType, capabilityName: String,
+                                          capabilityDefinition: CapabilityDefinition) {
+        val capabilityType = capabilityDefinition.type
+        check(BluePrintTypes.validCapabilityTypes.contains(capabilityType)) {
+            throw BluePrintException(format("Failed to get CapabilityType({}) for NodeType({})",
+                    capabilityType, nodeTypeName))
+        }
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateRequirementDefinitions(nodeName: String, nodeType: NodeType) {
+        paths.add("requirements")
+        val requirements = nodeType.requirements
+
+        requirements?.forEach { requirementDefinitionName, requirementDefinition ->
+            paths.add(requirementDefinitionName)
+            message.appendln("Validating : " + paths.joinToString(separator))
+            validateRequirementDefinition(nodeName, nodeType, requirementDefinitionName, requirementDefinition)
+            paths.removeAt(paths.lastIndex)
+        }
+        paths.removeAt(paths.lastIndex)
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateRequirementDefinition(nodeTypeName: String, nodeType: NodeType, requirementDefinitionName: String,
+                                           requirementDefinition: RequirementDefinition) {
+
+        log.info("Validating NodeType({}) RequirementDefinition ({}) ", nodeTypeName, requirementDefinitionName)
+        val requirementNodeTypeName = requirementDefinition.node!!
+        val capabilityName = requirementDefinition.capability
+        val relationship = requirementDefinition.relationship!!
+
+        check(BluePrintTypes.validRelationShipDerivedFroms.contains(relationship)) {
+            throw BluePrintException(format("Failed to get relationship({}) for NodeType({})'s requirement({}) ",
+                    relationship, nodeTypeName, requirementDefinitionName))
+        }
+
+        val relationShipNodeType = serviceTemplate.nodeTypes?.get(requirementNodeTypeName)
+                ?: throw BluePrintException(format("Failed to get requirement NodeType({})'s for requirement({}) ",
+                        requirementNodeTypeName, requirementDefinitionName))
+
+        relationShipNodeType.capabilities?.get(capabilityName)
+                ?: throw BluePrintException(format("Failed to get requirement NodeType({})'s capability({}) for NodeType ({})'s requirement({}) ",
+                        requirementNodeTypeName, capabilityName, nodeTypeName, requirementDefinitionName))
+
+    }
+
+
+    @Throws(BluePrintException::class)
+    open fun validateInterfaceDefinitions(interfaces: MutableMap<String, InterfaceDefinition>) {
+        paths.add("interfaces")
+        interfaces.forEach { interfaceName, interfaceDefinition ->
+            paths.add(interfaceName)
+            message.appendln("Validating : " + paths.joinToString(separator))
+            interfaceDefinition.operations?.let { validateOperationDefinitions(interfaceDefinition.operations!!) }
+            paths.removeAt(paths.lastIndex)
+        }
+        paths.removeAt(paths.lastIndex)
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateOperationDefinitions(operations: MutableMap<String, OperationDefinition>) {
+        paths.add("operations")
+        operations.forEach { opertaionName, operationDefinition ->
+            paths.add(opertaionName)
+            message.appendln("Validating : " + paths.joinToString(separator))
+            operationDefinition.implementation?.let { validateImplementation(operationDefinition.implementation!!) }
+            operationDefinition.inputs?.let { validatePropertyDefinitions(operationDefinition.inputs!!) }
+            operationDefinition.outputs?.let { validatePropertyDefinitions(operationDefinition.outputs!!) }
+            paths.removeAt(paths.lastIndex)
+        }
+        paths.removeAt(paths.lastIndex)
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateImplementation(implementation: Implementation) {
+        checkNotEmptyOrThrow(implementation.primary)
+    }
+
+    @Throws(BluePrintException::class)
+    open fun checkValidArtifactType(artifactDefinitionName: String, artifactTypeName: String) {
+
+        val artifactType = serviceTemplate.artifactTypes?.get(artifactTypeName)
+                ?: throw BluePrintException("failed to artifactType($artifactTypeName) for ArtifactDefinition($artifactDefinitionName)")
+
+        checkValidArtifactTypeDerivedFrom(artifactTypeName, artifactType.derivedFrom)
+    }
+
+    @Throws(BluePrintException::class)
+    open fun checkValidArtifactTypeDerivedFrom(artifactTypeName: String, derivedFrom: String) {
+        check(BluePrintTypes.validArtifactTypeDerivedFroms.contains(derivedFrom)) {
+            throw BluePrintException("failed to get artifactType($artifactTypeName)'s derivedFrom($derivedFrom) definition")
+        }
+    }
+
+    @Throws(BluePrintException::class)
+    open fun checkValidDataTypeDerivedFrom(dataTypeName: String, derivedFrom: String) {
+        check(BluePrintTypes.validDataTypeDerivedFroms.contains(derivedFrom)) {
+            throw BluePrintException(format("Failed to get DataType({})'s  derivedFrom({}) definition ", dataTypeName, derivedFrom))
+        }
+    }
+
+    @Throws(BluePrintException::class)
+    open fun checkValidRelationshipTypeDerivedFrom(relationshipTypeName: String, derivedFrom: String) {
+        check(BluePrintTypes.validRelationShipDerivedFroms.contains(derivedFrom)) {
+            throw BluePrintException(format("Failed to get relationship type ({})'s  derivedFrom({}) definition ", relationshipTypeName, derivedFrom))
+        }
+    }
+
+    open fun checkPropertyValue(propertyName: String, propertyDefinition: PropertyDefinition, propertyAssignment: JsonNode) {
+        val propertyType = propertyDefinition.type
+        val isValid: Boolean
+
+        if (BluePrintTypes.validPrimitiveTypes().contains(propertyType)) {
+            isValid = JacksonUtils.checkJsonNodeValueOfPrimitiveType(propertyType, propertyAssignment)
+
+        } else if (BluePrintTypes.validCollectionTypes().contains(propertyType)) {
+
+            val entrySchemaType = propertyDefinition.entrySchema?.type
+                    ?: throw BluePrintException(format("Failed to get EntrySchema type for the collection property ({})", propertyName))
+
+            if (!BluePrintTypes.validPropertyTypes().contains(entrySchemaType)) {
+                checkPropertyDataType(entrySchemaType, propertyName)
+            }
+            isValid = JacksonUtils.checkJsonNodeValueOfCollectionType(propertyType, propertyAssignment)
+        } else {
+            checkPropertyDataType(propertyType, propertyName)
+            isValid = true
+        }
+
+        check(isValid) {
+            throw BluePrintException(format("property({}) defined of type({}) is not comptable with the value ({})",
+                    propertyName, propertyType, propertyAssignment))
+        }
+    }
+
+    private fun checkPropertyDataType(dataTypeName: String, propertyName: String) {
+
+        val dataType = serviceTemplate.dataTypes?.get(dataTypeName)
+                ?: throw BluePrintException(format("DataType ({}) for the property ({}) not found", dataTypeName, propertyName))
+
+        checkValidDataTypeDerivedFrom(propertyName, dataType.derivedFrom)
+
+    }
+
+    private fun checkPrimitiveOrComplex(dataType: String, propertyName: String): Boolean {
+        if (BluePrintTypes.validPrimitiveTypes().contains(dataType) || checkDataType(dataType)) {
+            return true
+        } else {
+            throw BluePrintException(format("DataType({}) for the property({}) is not valid", dataType, propertyName))
+        }
+    }
+
+    private fun checkDataType(key: String): Boolean {
+        return serviceTemplate.dataTypes?.containsKey(key) ?: false
+    }
+
 }
\ No newline at end of file
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- * Modifications Copyright © 2018 IBM.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.service\r
-\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.fasterxml.jackson.databind.node.NullNode\r
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants\r
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException\r
-import org.onap.ccsdk.apps.controllerblueprints.core.data.*\r
-import org.onap.ccsdk.apps.controllerblueprints.core.format\r
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils\r
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.ResourceResolverUtils\r
-\r
-/**\r
- *\r
- *\r
- * @author Brinda Santh\r
- */\r
-class PropertyAssignmentService(var bluePrintRuntimeService: BluePrintRuntimeService<MutableMap<String, JsonNode>>) {\r
-    private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())\r
-\r
-    private var bluePrintContext: BluePrintContext = bluePrintRuntimeService.bluePrintContext()\r
-\r
-/*\r
-\r
-If Property Assignment is Expression.\r
-    Get the Expression\r
-    Recursively resolve the expression\r
- */\r
-\r
-    fun resolveAssignmentExpression(nodeTemplateName: String, assignmentName: String,\r
-                                    assignment: JsonNode): JsonNode {\r
-        val valueNode: JsonNode\r
-        log.trace("Assignment ({})", assignment)\r
-        val expressionData = BluePrintExpressionService.getExpressionData(assignment)\r
-\r
-        if (expressionData.isExpression) {\r
-            valueNode = resolveExpression(nodeTemplateName, assignmentName, expressionData)\r
-        } else {\r
-            valueNode = expressionData.valueNode\r
-        }\r
-        return valueNode\r
-    }\r
-\r
-    fun resolveExpression(nodeTemplateName: String, propName: String, expressionData: ExpressionData): JsonNode {\r
-\r
-        var valueNode: JsonNode = NullNode.getInstance()\r
-\r
-        if (expressionData.isExpression) {\r
-            val command = expressionData.command!!\r
-\r
-            when (command) {\r
-                BluePrintConstants.EXPRESSION_GET_INPUT -> {\r
-                    valueNode = bluePrintRuntimeService.getInputValue(expressionData.inputExpression?.propertyName!!)\r
-                }\r
-                BluePrintConstants.EXPRESSION_GET_ATTRIBUTE -> {\r
-                    valueNode = resolveAttributeExpression(nodeTemplateName, expressionData.attributeExpression!!)\r
-                }\r
-                BluePrintConstants.EXPRESSION_GET_PROPERTY -> {\r
-                    valueNode = resolvePropertyExpression(nodeTemplateName, expressionData.propertyExpression!!)\r
-                }\r
-                BluePrintConstants.EXPRESSION_GET_OPERATION_OUTPUT -> {\r
-                    valueNode = resolveOperationOutputExpression(nodeTemplateName, expressionData.operationOutputExpression!!)\r
-                }\r
-                BluePrintConstants.EXPRESSION_GET_ARTIFACT -> {\r
-                    valueNode = resolveArtifactExpression(nodeTemplateName, expressionData.artifactExpression!!)\r
-                }\r
-                BluePrintConstants.EXPRESSION_GET_NODE_OF_TYPE -> {\r
-\r
-                }\r
-                else -> {\r
-                    throw BluePrintException(format("for property ({}), command ({}) is not supported ", propName, command))\r
-                }\r
-            }\r
-        }\r
-        return valueNode\r
-    }\r
-\r
-    /*\r
-    get_property: [ <modelable_entity_name>, <optional_req_or_cap_name>, <property_name>,\r
-    <nested_property_name_or_index_1>, ..., <nested_property_name_or_index_n> ]\r
- */\r
-    fun resolveAttributeExpression(nodeTemplateName: String, attributeExpression: AttributeExpression): JsonNode {\r
-        val valueNode: JsonNode\r
-\r
-        val attributeName = attributeExpression.attributeName\r
-        val subAttributeName: String? = attributeExpression.subAttributeName\r
-\r
-        var attributeNodeTemplateName = nodeTemplateName\r
-        when (attributeExpression.modelableEntityName) {\r
-            "ENV" -> {\r
-                val environmentValue = System.getProperty(attributeName)\r
-                valueNode = JacksonUtils.jsonNode(environmentValue)\r
-            }\r
-            else -> {\r
-                if (!attributeExpression.modelableEntityName.equals("SELF", true)) {\r
-                    attributeNodeTemplateName = attributeExpression.modelableEntityName\r
-                }\r
-                /* Enable in ONAP Dublin Release\r
-                val nodeTemplateAttributeExpression = bluePrintContext.nodeTemplateByName(attributeNodeTemplateName).attributes?.get(attributeName)\r
-                        ?: throw BluePrintException(format("failed to get attribute definitions for node template " +\r
-                                "({})'s property name ({}) ", nodeTemplateName, attributeName))\r
-\r
-                var attributeDefinition: AttributeDefinition = bluePrintContext.nodeTemplateNodeType(attributeNodeTemplateName).attributes?.get(attributeName)!!\r
-\r
-                log.info("node template name ({}), property Name ({}) resolved value ({})", attributeNodeTemplateName, attributeName, nodeTemplateAttributeExpression)\r
-                */\r
-\r
-                valueNode = bluePrintRuntimeService.getNodeTemplateAttributeValue(attributeNodeTemplateName, attributeName)\r
-                        ?: throw BluePrintException(format("failed to get node template ({})'s attribute ({}) ", nodeTemplateName, attributeName))\r
-            }\r
-\r
-        }\r
-//        subPropertyName?.let {\r
-//            valueNode = valueNode.at(JsonPointer.valueOf(subPropertyName))\r
-//        }\r
-        return valueNode\r
-    }\r
-\r
-    /*\r
-        get_property: [ <modelable_entity_name>, <optional_req_or_cap_name>, <property_name>,\r
-        <nested_property_name_or_index_1>, ..., <nested_property_name_or_index_n> ]\r
-     */\r
-    fun resolvePropertyExpression(nodeTemplateName: String, propertyExpression: PropertyExpression): JsonNode {\r
-        val valueNode: JsonNode\r
-\r
-        val propertyName = propertyExpression.propertyName\r
-        val subPropertyName: String? = propertyExpression.subPropertyName\r
-\r
-        var propertyNodeTemplateName = nodeTemplateName\r
-        if (!propertyExpression.modelableEntityName.equals("SELF", true)) {\r
-            propertyNodeTemplateName = propertyExpression.modelableEntityName\r
-        }\r
-\r
-        val nodeTemplatePropertyExpression = bluePrintContext.nodeTemplateByName(propertyNodeTemplateName).properties?.get(propertyName)\r
-                ?: throw BluePrintException(format("failed to get property definitions for node template ({})'s property name ({}) ", nodeTemplateName, propertyName))\r
-\r
-        var propertyDefinition: PropertyDefinition = bluePrintContext.nodeTemplateNodeType(propertyNodeTemplateName).properties?.get(propertyName)!!\r
-\r
-        log.info("node template name ({}), property Name ({}) resolved value ({})", propertyNodeTemplateName, propertyName, nodeTemplatePropertyExpression)\r
-\r
-        // Check it it is a nested expression\r
-        valueNode = resolveAssignmentExpression(propertyNodeTemplateName, propertyName, nodeTemplatePropertyExpression)\r
-\r
-//        subPropertyName?.let {\r
-//            valueNode = valueNode.at(JsonPointer.valueOf(subPropertyName))\r
-//        }\r
-        return valueNode\r
-    }\r
-\r
-    /*\r
-    get_operation_output: <modelable_entity_name>, <interface_name>, <operation_name>, <output_variable_name>\r
-     */\r
-    fun resolveOperationOutputExpression(nodeTemplateName: String, operationOutputExpression: OperationOutputExpression): JsonNode {\r
-        var outputNodeTemplateName = nodeTemplateName\r
-        if (!operationOutputExpression.modelableEntityName.equals("SELF", true)) {\r
-            outputNodeTemplateName = operationOutputExpression.modelableEntityName\r
-        }\r
-        return bluePrintRuntimeService.getNodeTemplateOperationOutputValue(outputNodeTemplateName,\r
-                operationOutputExpression.interfaceName, operationOutputExpression.operationName,\r
-                operationOutputExpression.propertyName)\r
-    }\r
-\r
-    /*\r
-    get_artifact: [ <modelable_entity_name>, <artifact_name>, <location>, <remove> ]\r
-     */\r
-    fun resolveArtifactExpression(nodeTemplateName: String, artifactExpression: ArtifactExpression): JsonNode {\r
-\r
-        var artifactNodeTemplateName = nodeTemplateName\r
-        if (!artifactExpression.modelableEntityName.equals("SELF", true)) {\r
-            artifactNodeTemplateName = artifactExpression.modelableEntityName\r
-        }\r
-        val artifactDefinition: ArtifactDefinition = bluePrintContext.nodeTemplateByName(artifactNodeTemplateName)\r
-                .artifacts?.get(artifactExpression.artifactName)\r
-                ?: throw BluePrintException(format("failed to get artifact definitions for node template ({})'s " +\r
-                        "artifact name ({}) ", nodeTemplateName, artifactExpression.artifactName))\r
-\r
-        return JacksonUtils.jsonNodeFromObject(artifactContent(artifactDefinition))\r
-    }\r
-\r
-    fun artifactContent(artifactDefinition: ArtifactDefinition): String {\r
-        val bluePrintBasePath: String = bluePrintContext.rootPath\r
-\r
-        if (artifactDefinition.repository != null) {\r
-            TODO()\r
-        } else if (artifactDefinition.file != null) {\r
-            return ResourceResolverUtils.getFileContent(artifactDefinition.file!!, bluePrintBasePath)\r
-        }\r
-        return ""\r
-    }\r
-}\r
-\r
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
+ *
+ * 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.service
+
+
+import com.att.eelf.configuration.EELFLogger
+import com.att.eelf.configuration.EELFManager
+import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.databind.node.NullNode
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
+import org.onap.ccsdk.apps.controllerblueprints.core.data.*
+import org.onap.ccsdk.apps.controllerblueprints.core.format
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.ResourceResolverUtils
+
+/**
+ *
+ *
+ * @author Brinda Santh
+ */
+class PropertyAssignmentService(var bluePrintRuntimeService: BluePrintRuntimeService<MutableMap<String, JsonNode>>) {
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())
+
+    private var bluePrintContext: BluePrintContext = bluePrintRuntimeService.bluePrintContext()
+
+/*
+
+If Property Assignment is Expression.
+    Get the Expression
+    Recursively resolve the expression
+ */
+
+    fun resolveAssignmentExpression(nodeTemplateName: String, assignmentName: String,
+                                    assignment: JsonNode): JsonNode {
+        val valueNode: JsonNode
+        log.trace("Assignment ({})", assignment)
+        val expressionData = BluePrintExpressionService.getExpressionData(assignment)
+
+        if (expressionData.isExpression) {
+            valueNode = resolveExpression(nodeTemplateName, assignmentName, expressionData)
+        } else {
+            valueNode = expressionData.valueNode
+        }
+        return valueNode
+    }
+
+    fun resolveExpression(nodeTemplateName: String, propName: String, expressionData: ExpressionData): JsonNode {
+
+        var valueNode: JsonNode = NullNode.getInstance()
+
+        if (expressionData.isExpression) {
+            val command = expressionData.command!!
+
+            when (command) {
+                BluePrintConstants.EXPRESSION_GET_INPUT -> {
+                    valueNode = bluePrintRuntimeService.getInputValue(expressionData.inputExpression?.propertyName!!)
+                }
+                BluePrintConstants.EXPRESSION_GET_ATTRIBUTE -> {
+                    valueNode = resolveAttributeExpression(nodeTemplateName, expressionData.attributeExpression!!)
+                }
+                BluePrintConstants.EXPRESSION_GET_PROPERTY -> {
+                    valueNode = resolvePropertyExpression(nodeTemplateName, expressionData.propertyExpression!!)
+                }
+                BluePrintConstants.EXPRESSION_GET_OPERATION_OUTPUT -> {
+                    valueNode = resolveOperationOutputExpression(nodeTemplateName, expressionData.operationOutputExpression!!)
+                }
+                BluePrintConstants.EXPRESSION_GET_ARTIFACT -> {
+                    valueNode = resolveArtifactExpression(nodeTemplateName, expressionData.artifactExpression!!)
+                }
+                BluePrintConstants.EXPRESSION_GET_NODE_OF_TYPE -> {
+
+                }
+                else -> {
+                    throw BluePrintException(format("for property ({}), command ({}) is not supported ", propName, command))
+                }
+            }
+        }
+        return valueNode
+    }
+
+    /*
+    get_property: [ <modelable_entity_name>, <optional_req_or_cap_name>, <property_name>,
+    <nested_property_name_or_index_1>, ..., <nested_property_name_or_index_n> ]
+ */
+    fun resolveAttributeExpression(nodeTemplateName: String, attributeExpression: AttributeExpression): JsonNode {
+        val valueNode: JsonNode
+
+        val attributeName = attributeExpression.attributeName
+        val subAttributeName: String? = attributeExpression.subAttributeName
+
+        var attributeNodeTemplateName = nodeTemplateName
+        when (attributeExpression.modelableEntityName) {
+            "ENV" -> {
+                val environmentValue = System.getProperty(attributeName)
+                valueNode = JacksonUtils.jsonNode(environmentValue)
+            }
+            else -> {
+                if (!attributeExpression.modelableEntityName.equals("SELF", true)) {
+                    attributeNodeTemplateName = attributeExpression.modelableEntityName
+                }
+                /* Enable in ONAP Dublin Release
+                val nodeTemplateAttributeExpression = bluePrintContext.nodeTemplateByName(attributeNodeTemplateName).attributes?.get(attributeName)
+                        ?: throw BluePrintException(format("failed to get attribute definitions for node template " +
+                                "({})'s property name ({}) ", nodeTemplateName, attributeName))
+
+                var attributeDefinition: AttributeDefinition = bluePrintContext.nodeTemplateNodeType(attributeNodeTemplateName).attributes?.get(attributeName)!!
+
+                log.info("node template name ({}), property Name ({}) resolved value ({})", attributeNodeTemplateName, attributeName, nodeTemplateAttributeExpression)
+                */
+
+                valueNode = bluePrintRuntimeService.getNodeTemplateAttributeValue(attributeNodeTemplateName, attributeName)
+                        ?: throw BluePrintException(format("failed to get node template ({})'s attribute ({}) ", nodeTemplateName, attributeName))
+            }
+
+        }
+//        subPropertyName?.let {
+//            valueNode = valueNode.at(JsonPointer.valueOf(subPropertyName))
+//        }
+        return valueNode
+    }
+
+    /*
+        get_property: [ <modelable_entity_name>, <optional_req_or_cap_name>, <property_name>,
+        <nested_property_name_or_index_1>, ..., <nested_property_name_or_index_n> ]
+     */
+    fun resolvePropertyExpression(nodeTemplateName: String, propertyExpression: PropertyExpression): JsonNode {
+        val valueNode: JsonNode
+
+        val propertyName = propertyExpression.propertyName
+        val subPropertyName: String? = propertyExpression.subPropertyName
+
+        var propertyNodeTemplateName = nodeTemplateName
+        if (!propertyExpression.modelableEntityName.equals("SELF", true)) {
+            propertyNodeTemplateName = propertyExpression.modelableEntityName
+        }
+
+        val nodeTemplatePropertyExpression = bluePrintContext.nodeTemplateByName(propertyNodeTemplateName).properties?.get(propertyName)
+                ?: throw BluePrintException(format("failed to get property definitions for node template ({})'s property name ({}) ", nodeTemplateName, propertyName))
+
+        var propertyDefinition: PropertyDefinition = bluePrintContext.nodeTemplateNodeType(propertyNodeTemplateName).properties?.get(propertyName)!!
+
+        log.info("node template name ({}), property Name ({}) resolved value ({})", propertyNodeTemplateName, propertyName, nodeTemplatePropertyExpression)
+
+        // Check it it is a nested expression
+        valueNode = resolveAssignmentExpression(propertyNodeTemplateName, propertyName, nodeTemplatePropertyExpression)
+
+//        subPropertyName?.let {
+//            valueNode = valueNode.at(JsonPointer.valueOf(subPropertyName))
+//        }
+        return valueNode
+    }
+
+    /*
+    get_operation_output: <modelable_entity_name>, <interface_name>, <operation_name>, <output_variable_name>
+     */
+    fun resolveOperationOutputExpression(nodeTemplateName: String, operationOutputExpression: OperationOutputExpression): JsonNode {
+        var outputNodeTemplateName = nodeTemplateName
+        if (!operationOutputExpression.modelableEntityName.equals("SELF", true)) {
+            outputNodeTemplateName = operationOutputExpression.modelableEntityName
+        }
+        return bluePrintRuntimeService.getNodeTemplateOperationOutputValue(outputNodeTemplateName,
+                operationOutputExpression.interfaceName, operationOutputExpression.operationName,
+                operationOutputExpression.propertyName)
+    }
+
+    /*
+    get_artifact: [ <modelable_entity_name>, <artifact_name>, <location>, <remove> ]
+     */
+    fun resolveArtifactExpression(nodeTemplateName: String, artifactExpression: ArtifactExpression): JsonNode {
+
+        var artifactNodeTemplateName = nodeTemplateName
+        if (!artifactExpression.modelableEntityName.equals("SELF", true)) {
+            artifactNodeTemplateName = artifactExpression.modelableEntityName
+        }
+        val artifactDefinition: ArtifactDefinition = bluePrintContext.nodeTemplateByName(artifactNodeTemplateName)
+                .artifacts?.get(artifactExpression.artifactName)
+                ?: throw BluePrintException(format("failed to get artifact definitions for node template ({})'s " +
+                        "artifact name ({}) ", nodeTemplateName, artifactExpression.artifactName))
+
+        return JacksonUtils.jsonNodeFromObject(artifactContent(artifactDefinition))
+    }
+
+    fun artifactContent(artifactDefinition: ArtifactDefinition): String {
+        val bluePrintBasePath: String = bluePrintContext.rootPath
+
+        if (artifactDefinition.repository != null) {
+            TODO()
+        } else if (artifactDefinition.file != null) {
+            return ResourceResolverUtils.getFileContent(artifactDefinition.file!!, bluePrintBasePath)
+        }
+        return ""
+    }
+}
+
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.utils\r
-\r
-\r
-import com.att.eelf.configuration.EELFLogger\r
-import com.att.eelf.configuration.EELFManager\r
-import com.fasterxml.jackson.databind.JsonNode\r
-import org.apache.commons.io.FileUtils\r
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants\r
-import org.onap.ccsdk.apps.controllerblueprints.core.asJsonPrimitive\r
-import org.onap.ccsdk.apps.controllerblueprints.core.data.ToscaMetaData\r
-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext\r
-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintImportService\r
-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRuntimeService\r
-import org.onap.ccsdk.apps.controllerblueprints.core.service.DefaultBluePrintRuntimeService\r
-import java.io.File\r
-import java.nio.charset.Charset\r
-\r
-class BluePrintMetadataUtils {\r
-    companion object {\r
-        private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())\r
-\r
-\r
-        fun toscaMetaData(basePath: String): ToscaMetaData {\r
-            val toscaMetaPath = basePath.plus(BluePrintConstants.PATH_DIVIDER)\r
-                    .plus(BluePrintConstants.TOSCA_METADATA_ENTRY_DEFINITION_FILE)\r
-            return toscaMetaDataFromMetaFile(toscaMetaPath)\r
-        }\r
-\r
-        fun entryDefinitionFile(basePath: String): String {\r
-            val toscaMetaPath = basePath.plus(BluePrintConstants.PATH_DIVIDER)\r
-                    .plus(BluePrintConstants.TOSCA_METADATA_ENTRY_DEFINITION_FILE)\r
-            return toscaMetaDataFromMetaFile(toscaMetaPath).entityDefinitions\r
-        }\r
-\r
-        fun toscaMetaDataFromMetaFile(metaFilePath: String): ToscaMetaData {\r
-            val toscaMetaData = ToscaMetaData()\r
-            val lines: MutableList<String> = FileUtils.readLines(File(metaFilePath), Charset.defaultCharset())\r
-            lines.forEach { line ->\r
-                if (line.contains(":")) {\r
-                    val keyValue = line.split(":")\r
-                    if (keyValue.size == 2) {\r
-                        val value: String = keyValue[1].trim()\r
-                        when (keyValue[0]) {\r
-                            "TOSCA-Meta-File-Version" -> toscaMetaData.toscaMetaFileVersion = value\r
-                            "CSAR-Version" -> toscaMetaData.csarVersion = value\r
-                            "Created-By" -> toscaMetaData.createdBy = value\r
-                            "Entry-Definitions" -> toscaMetaData.entityDefinitions = value\r
-                            "Template-Tags" -> toscaMetaData.templateTags = value\r
-                        }\r
-                    }\r
-                }\r
-\r
-            }\r
-            return toscaMetaData\r
-        }\r
-\r
-        fun getBluePrintRuntime(id: String, blueprintBasePath: String): BluePrintRuntimeService<MutableMap<String, JsonNode>> {\r
-\r
-            val bluePrintContext: BluePrintContext = getBluePrintContext(blueprintBasePath)\r
-\r
-            val context: MutableMap<String, JsonNode> = hashMapOf()\r
-            context[BluePrintConstants.PROPERTY_BLUEPRINT_BASE_PATH] = blueprintBasePath.asJsonPrimitive()\r
-            context[BluePrintConstants.PROPERTY_BLUEPRINT_PROCESS_ID] = id.asJsonPrimitive()\r
-\r
-            val bluePrintRuntimeService = DefaultBluePrintRuntimeService(id, bluePrintContext)\r
-            bluePrintRuntimeService.setExecutionContext(context)\r
-\r
-            return bluePrintRuntimeService\r
-        }\r
-\r
-        fun getBaseEnhancementBluePrintRuntime(id: String, blueprintBasePath: String): BluePrintRuntimeService<MutableMap<String, JsonNode>> {\r
-\r
-            val bluePrintContext: BluePrintContext = getBaseEnhancementBluePrintContext(blueprintBasePath)\r
-            val context: MutableMap<String, JsonNode> = hashMapOf()\r
-            context[BluePrintConstants.PROPERTY_BLUEPRINT_BASE_PATH] = blueprintBasePath.asJsonPrimitive()\r
-            context[BluePrintConstants.PROPERTY_BLUEPRINT_PROCESS_ID] = id.asJsonPrimitive()\r
-\r
-            val bluePrintRuntimeService = DefaultBluePrintRuntimeService(id, bluePrintContext)\r
-            bluePrintRuntimeService.setExecutionContext(context)\r
-\r
-            return bluePrintRuntimeService\r
-        }\r
-\r
-        fun getBluePrintRuntime(id: String, blueprintBasePath: String, executionContext: MutableMap<String, JsonNode>): BluePrintRuntimeService<MutableMap<String, JsonNode>> {\r
-            val bluePrintContext: BluePrintContext = getBluePrintContext(blueprintBasePath)\r
-            val bluePrintRuntimeService = DefaultBluePrintRuntimeService(id, bluePrintContext)\r
-            bluePrintRuntimeService.setExecutionContext(executionContext)\r
-            return bluePrintRuntimeService\r
-        }\r
-\r
-        fun getBluePrintContext(blueprintBasePath: String): BluePrintContext {\r
-\r
-            val toscaMetaData: ToscaMetaData = toscaMetaData(blueprintBasePath)\r
-\r
-            log.info("Reading blueprint path($blueprintBasePath) and entry definition file (${toscaMetaData.entityDefinitions})")\r
-\r
-            return readBlueprintFile(toscaMetaData.entityDefinitions, blueprintBasePath)\r
-        }\r
-\r
-        private fun getBaseEnhancementBluePrintContext(blueprintBasePath: String): BluePrintContext {\r
-            val toscaMetaData: ToscaMetaData = toscaMetaData(blueprintBasePath)\r
-            // Clean Type files\r
-            BluePrintFileUtils.deleteBluePrintTypes(blueprintBasePath)\r
-            val rootFilePath: String = blueprintBasePath.plus(File.separator).plus(toscaMetaData.entityDefinitions)\r
-            val rootServiceTemplate = ServiceTemplateUtils.getServiceTemplate(rootFilePath)\r
-\r
-            // Clean the Import Definitions\r
-            BluePrintFileUtils.cleanImportTypes(rootServiceTemplate)\r
-\r
-            val blueprintContext = BluePrintContext(rootServiceTemplate)\r
-            blueprintContext.rootPath = blueprintBasePath\r
-            blueprintContext.entryDefinition = toscaMetaData.entityDefinitions\r
-            return blueprintContext\r
-        }\r
-\r
-        private fun readBlueprintFile(entityDefinitions: String, basePath: String): BluePrintContext {\r
-            val rootFilePath: String = basePath.plus(File.separator).plus(entityDefinitions)\r
-            val rootServiceTemplate = ServiceTemplateUtils.getServiceTemplate(rootFilePath)\r
-            // Recursively Import Template files\r
-            val schemaImportResolverUtils = BluePrintImportService(rootServiceTemplate, basePath)\r
-            val completeServiceTemplate = schemaImportResolverUtils.getImportResolvedServiceTemplate()\r
-            val blueprintContext = BluePrintContext(completeServiceTemplate)\r
-            blueprintContext.rootPath = basePath\r
-            blueprintContext.entryDefinition = entityDefinitions\r
-            return blueprintContext\r
-        }\r
-    }\r
+/*
+ * 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 com.fasterxml.jackson.databind.JsonNode
+import org.apache.commons.io.FileUtils
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
+import org.onap.ccsdk.apps.controllerblueprints.core.asJsonPrimitive
+import org.onap.ccsdk.apps.controllerblueprints.core.data.ToscaMetaData
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintImportService
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRuntimeService
+import org.onap.ccsdk.apps.controllerblueprints.core.service.DefaultBluePrintRuntimeService
+import java.io.File
+import java.nio.charset.Charset
+
+class BluePrintMetadataUtils {
+    companion object {
+        private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())
+
+
+        fun toscaMetaData(basePath: String): ToscaMetaData {
+            val toscaMetaPath = basePath.plus(BluePrintConstants.PATH_DIVIDER)
+                    .plus(BluePrintConstants.TOSCA_METADATA_ENTRY_DEFINITION_FILE)
+            return toscaMetaDataFromMetaFile(toscaMetaPath)
+        }
+
+        fun entryDefinitionFile(basePath: String): String {
+            val toscaMetaPath = basePath.plus(BluePrintConstants.PATH_DIVIDER)
+                    .plus(BluePrintConstants.TOSCA_METADATA_ENTRY_DEFINITION_FILE)
+            return toscaMetaDataFromMetaFile(toscaMetaPath).entityDefinitions
+        }
+
+        fun toscaMetaDataFromMetaFile(metaFilePath: String): ToscaMetaData {
+            val toscaMetaData = ToscaMetaData()
+            val lines: MutableList<String> = FileUtils.readLines(File(metaFilePath), Charset.defaultCharset())
+            lines.forEach { line ->
+                if (line.contains(":")) {
+                    val keyValue = line.split(":")
+                    if (keyValue.size == 2) {
+                        val value: String = keyValue[1].trim()
+                        when (keyValue[0]) {
+                            "TOSCA-Meta-File-Version" -> toscaMetaData.toscaMetaFileVersion = value
+                            "CSAR-Version" -> toscaMetaData.csarVersion = value
+                            "Created-By" -> toscaMetaData.createdBy = value
+                            "Entry-Definitions" -> toscaMetaData.entityDefinitions = value
+                            "Template-Tags" -> toscaMetaData.templateTags = value
+                        }
+                    }
+                }
+
+            }
+            return toscaMetaData
+        }
+
+        fun getBluePrintRuntime(id: String, blueprintBasePath: String): BluePrintRuntimeService<MutableMap<String, JsonNode>> {
+
+            val bluePrintContext: BluePrintContext = getBluePrintContext(blueprintBasePath)
+
+            val context: MutableMap<String, JsonNode> = hashMapOf()
+            context[BluePrintConstants.PROPERTY_BLUEPRINT_BASE_PATH] = blueprintBasePath.asJsonPrimitive()
+            context[BluePrintConstants.PROPERTY_BLUEPRINT_PROCESS_ID] = id.asJsonPrimitive()
+
+            val bluePrintRuntimeService = DefaultBluePrintRuntimeService(id, bluePrintContext)
+            bluePrintRuntimeService.setExecutionContext(context)
+
+            return bluePrintRuntimeService
+        }
+
+        fun getBaseEnhancementBluePrintRuntime(id: String, blueprintBasePath: String): BluePrintRuntimeService<MutableMap<String, JsonNode>> {
+
+            val bluePrintContext: BluePrintContext = getBaseEnhancementBluePrintContext(blueprintBasePath)
+            val context: MutableMap<String, JsonNode> = hashMapOf()
+            context[BluePrintConstants.PROPERTY_BLUEPRINT_BASE_PATH] = blueprintBasePath.asJsonPrimitive()
+            context[BluePrintConstants.PROPERTY_BLUEPRINT_PROCESS_ID] = id.asJsonPrimitive()
+
+            val bluePrintRuntimeService = DefaultBluePrintRuntimeService(id, bluePrintContext)
+            bluePrintRuntimeService.setExecutionContext(context)
+
+            return bluePrintRuntimeService
+        }
+
+        fun getBluePrintRuntime(id: String, blueprintBasePath: String, executionContext: MutableMap<String, JsonNode>): BluePrintRuntimeService<MutableMap<String, JsonNode>> {
+            val bluePrintContext: BluePrintContext = getBluePrintContext(blueprintBasePath)
+            val bluePrintRuntimeService = DefaultBluePrintRuntimeService(id, bluePrintContext)
+            bluePrintRuntimeService.setExecutionContext(executionContext)
+            return bluePrintRuntimeService
+        }
+
+        fun getBluePrintContext(blueprintBasePath: String): BluePrintContext {
+
+            val toscaMetaData: ToscaMetaData = toscaMetaData(blueprintBasePath)
+
+            log.info("Reading blueprint path($blueprintBasePath) and entry definition file (${toscaMetaData.entityDefinitions})")
+
+            return readBlueprintFile(toscaMetaData.entityDefinitions, blueprintBasePath)
+        }
+
+        private fun getBaseEnhancementBluePrintContext(blueprintBasePath: String): BluePrintContext {
+            val toscaMetaData: ToscaMetaData = toscaMetaData(blueprintBasePath)
+            // Clean Type files
+            BluePrintFileUtils.deleteBluePrintTypes(blueprintBasePath)
+            val rootFilePath: String = blueprintBasePath.plus(File.separator).plus(toscaMetaData.entityDefinitions)
+            val rootServiceTemplate = ServiceTemplateUtils.getServiceTemplate(rootFilePath)
+
+            // Clean the Import Definitions
+            BluePrintFileUtils.cleanImportTypes(rootServiceTemplate)
+
+            val blueprintContext = BluePrintContext(rootServiceTemplate)
+            blueprintContext.rootPath = blueprintBasePath
+            blueprintContext.entryDefinition = toscaMetaData.entityDefinitions
+            return blueprintContext
+        }
+
+        private fun readBlueprintFile(entityDefinitions: String, basePath: String): BluePrintContext {
+            val rootFilePath: String = basePath.plus(File.separator).plus(entityDefinitions)
+            val rootServiceTemplate = ServiceTemplateUtils.getServiceTemplate(rootFilePath)
+            // Recursively Import Template files
+            val schemaImportResolverUtils = BluePrintImportService(rootServiceTemplate, basePath)
+            val completeServiceTemplate = schemaImportResolverUtils.getImportResolvedServiceTemplate()
+            val blueprintContext = BluePrintContext(completeServiceTemplate)
+            blueprintContext.rootPath = basePath
+            blueprintContext.entryDefinition = entityDefinitions
+            return blueprintContext
+        }
+    }
 }
\ No newline at end of file
@@ -1,61 +1,61 @@
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.utils\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.fasterxml.jackson.databind.node.NullNode\r
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants\r
-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext\r
-\r
-/**\r
- *\r
- *\r
- * @author Brinda Santh\r
- */\r
-object BluePrintRuntimeUtils {\r
-    private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())\r
-\r
-    fun assignInputsFromFile(bluePrintContext: BluePrintContext, fileName: String, context: MutableMap<String, JsonNode>) {\r
-        val jsonNode: JsonNode = JacksonUtils.jsonNodeFromFile(fileName)\r
-        return assignInputs(bluePrintContext, jsonNode, context)\r
-    }\r
-\r
-    fun assignInputsFromClassPathFile(bluePrintContext: BluePrintContext, fileName: String, context: MutableMap<String,\r
-            JsonNode>) {\r
-        val jsonNode = JacksonUtils.jsonNodeFromClassPathFile(fileName)\r
-        return assignInputs(bluePrintContext, jsonNode, context)\r
-    }\r
-\r
-    fun assignInputsFromContent(bluePrintContext: BluePrintContext, content: String, context: MutableMap<String, JsonNode>) {\r
-        val jsonNode: JsonNode = JacksonUtils.jsonNode(content)\r
-        return assignInputs(bluePrintContext, jsonNode, context)\r
-    }\r
-\r
-    fun assignInputs(bluePrintContext: BluePrintContext, jsonNode: JsonNode, context: MutableMap<String, JsonNode>) {\r
-        log.info("assignInputs from input JSON ({})", jsonNode.toString())\r
-        bluePrintContext.inputs?.forEach { propertyName, _ ->\r
-            val valueNode: JsonNode = jsonNode.at("/".plus(propertyName)) ?: NullNode.getInstance()\r
-\r
-            val path = BluePrintConstants.PATH_INPUTS.plus(BluePrintConstants.PATH_DIVIDER).plus(propertyName)\r
-            log.trace("setting input path ({}), values ({})", path, valueNode)\r
-            context[path] = valueNode\r
-        }\r
-    }\r
-\r
+/*
+ * 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 com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.databind.node.NullNode
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext
+
+/**
+ *
+ *
+ * @author Brinda Santh
+ */
+object BluePrintRuntimeUtils {
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())
+
+    fun assignInputsFromFile(bluePrintContext: BluePrintContext, fileName: String, context: MutableMap<String, JsonNode>) {
+        val jsonNode: JsonNode = JacksonUtils.jsonNodeFromFile(fileName)
+        return assignInputs(bluePrintContext, jsonNode, context)
+    }
+
+    fun assignInputsFromClassPathFile(bluePrintContext: BluePrintContext, fileName: String, context: MutableMap<String,
+            JsonNode>) {
+        val jsonNode = JacksonUtils.jsonNodeFromClassPathFile(fileName)
+        return assignInputs(bluePrintContext, jsonNode, context)
+    }
+
+    fun assignInputsFromContent(bluePrintContext: BluePrintContext, content: String, context: MutableMap<String, JsonNode>) {
+        val jsonNode: JsonNode = JacksonUtils.jsonNode(content)
+        return assignInputs(bluePrintContext, jsonNode, context)
+    }
+
+    fun assignInputs(bluePrintContext: BluePrintContext, jsonNode: JsonNode, context: MutableMap<String, JsonNode>) {
+        log.info("assignInputs from input JSON ({})", jsonNode.toString())
+        bluePrintContext.inputs?.forEach { propertyName, _ ->
+            val valueNode: JsonNode = jsonNode.at("/".plus(propertyName)) ?: NullNode.getInstance()
+
+            val path = BluePrintConstants.PATH_INPUTS.plus(BluePrintConstants.PATH_DIVIDER).plus(propertyName)
+            log.trace("setting input path ({}), values ({})", path, valueNode)
+            context[path] = valueNode
+        }
+    }
+
 }
\ No newline at end of file
-/*\r
- *  Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- *  Licensed under the Apache License, Version 2.0 (the "License");\r
- *  you may not use this file except in compliance with the License.\r
- *  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- *  Unless required by applicable law or agreed to in writing, software\r
- *  distributed under the License is distributed on an "AS IS" BASIS,\r
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- *  See the License for the specific language governing permissions and\r
- *  limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.utils\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.fasterxml.jackson.module.kotlin.jacksonObjectMapper\r
-import reactor.core.publisher.Mono\r
-import reactor.core.publisher.toMono\r
-\r
-@Deprecated("Reactor will be replaced by coroutines by default")\r
-object JacksonReactorUtils {\r
-    private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())\r
-\r
-    @JvmStatic\r
-    fun getContent(fileName: String): Mono<String> {\r
-        return JacksonUtils.getContent(fileName).toMono()\r
-    }\r
-\r
-    @JvmStatic\r
-    fun getClassPathFileContent(fileName: String): Mono<String> {\r
-        return JacksonUtils.getClassPathFileContent(fileName).toMono()\r
-    }\r
-\r
-    @JvmStatic\r
-    fun <T> readValue(content: String, valueType: Class<T>): Mono<T> {\r
-        return Mono.just(jacksonObjectMapper().readValue(content, valueType))\r
-    }\r
-\r
-    @JvmStatic\r
-    fun jsonNode(content: String): Mono<JsonNode> {\r
-        return Mono.just(jacksonObjectMapper().readTree(content))\r
-    }\r
-\r
-    @JvmStatic\r
-    fun getJson(any: kotlin.Any, pretty: Boolean = false): Mono<String> {\r
-        return Mono.just(JacksonUtils.getJson(any, pretty))\r
-    }\r
-\r
-    @JvmStatic\r
-    fun <T> getListFromJson(content: String, valueType: Class<T>): Mono<List<T>> {\r
-        val objectMapper = jacksonObjectMapper()\r
-        val javaType = objectMapper.typeFactory.constructCollectionType(List::class.java, valueType)\r
-        return objectMapper.readValue<List<T>>(content, javaType).toMono()\r
-    }\r
-\r
-    @JvmStatic\r
-    fun <T> readValueFromFile(fileName: String, valueType: Class<T>): Mono<T> {\r
-        return getContent(fileName)\r
-                .flatMap { content ->\r
-                    readValue(content, valueType)\r
-                }\r
-    }\r
-\r
-    @JvmStatic\r
-    fun <T> readValueFromClassPathFile(fileName: String, valueType: Class<T>): Mono<T> {\r
-        return getClassPathFileContent(fileName)\r
-                .flatMap { content ->\r
-                    readValue(content, valueType)\r
-                }\r
-    }\r
-\r
-    @JvmStatic\r
-    fun jsonNodeFromFile(fileName: String): Mono<JsonNode> {\r
-        return getContent(fileName)\r
-                .flatMap { content ->\r
-                    jsonNode(content)\r
-                }\r
-    }\r
-\r
-    @JvmStatic\r
-    fun jsonNodeFromClassPathFile(fileName: String): Mono<JsonNode> {\r
-        return getClassPathFileContent(fileName)\r
-                .flatMap { content ->\r
-                    jsonNode(content)\r
-                }\r
-    }\r
-\r
-    @JvmStatic\r
-    fun <T> getListFromFile(fileName: String, valueType: Class<T>): Mono<List<T>> {\r
-        return getContent(fileName)\r
-                .flatMap { content ->\r
-                    getListFromJson(content, valueType)\r
-                }\r
-    }\r
-\r
-    @JvmStatic\r
-    fun <T> getListFromClassPathFile(fileName: String, valueType: Class<T>): Mono<List<T>> {\r
-        return getClassPathFileContent(fileName)\r
-                .flatMap { content ->\r
-                    getListFromJson(content, valueType)\r
-                }\r
-    }\r
+/*
+ *  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 com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import reactor.core.publisher.Mono
+import reactor.core.publisher.toMono
+
+@Deprecated("Reactor will be replaced by coroutines by default")
+object JacksonReactorUtils {
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())
+
+    @JvmStatic
+    fun getContent(fileName: String): Mono<String> {
+        return JacksonUtils.getContent(fileName).toMono()
+    }
+
+    @JvmStatic
+    fun getClassPathFileContent(fileName: String): Mono<String> {
+        return JacksonUtils.getClassPathFileContent(fileName).toMono()
+    }
+
+    @JvmStatic
+    fun <T> readValue(content: String, valueType: Class<T>): Mono<T> {
+        return Mono.just(jacksonObjectMapper().readValue(content, valueType))
+    }
+
+    @JvmStatic
+    fun jsonNode(content: String): Mono<JsonNode> {
+        return Mono.just(jacksonObjectMapper().readTree(content))
+    }
+
+    @JvmStatic
+    fun getJson(any: kotlin.Any, pretty: Boolean = false): Mono<String> {
+        return Mono.just(JacksonUtils.getJson(any, pretty))
+    }
+
+    @JvmStatic
+    fun <T> getListFromJson(content: String, valueType: Class<T>): Mono<List<T>> {
+        val objectMapper = jacksonObjectMapper()
+        val javaType = objectMapper.typeFactory.constructCollectionType(List::class.java, valueType)
+        return objectMapper.readValue<List<T>>(content, javaType).toMono()
+    }
+
+    @JvmStatic
+    fun <T> readValueFromFile(fileName: String, valueType: Class<T>): Mono<T> {
+        return getContent(fileName)
+                .flatMap { content ->
+                    readValue(content, valueType)
+                }
+    }
+
+    @JvmStatic
+    fun <T> readValueFromClassPathFile(fileName: String, valueType: Class<T>): Mono<T> {
+        return getClassPathFileContent(fileName)
+                .flatMap { content ->
+                    readValue(content, valueType)
+                }
+    }
+
+    @JvmStatic
+    fun jsonNodeFromFile(fileName: String): Mono<JsonNode> {
+        return getContent(fileName)
+                .flatMap { content ->
+                    jsonNode(content)
+                }
+    }
+
+    @JvmStatic
+    fun jsonNodeFromClassPathFile(fileName: String): Mono<JsonNode> {
+        return getClassPathFileContent(fileName)
+                .flatMap { content ->
+                    jsonNode(content)
+                }
+    }
+
+    @JvmStatic
+    fun <T> getListFromFile(fileName: String, valueType: Class<T>): Mono<List<T>> {
+        return getContent(fileName)
+                .flatMap { content ->
+                    getListFromJson(content, valueType)
+                }
+    }
+
+    @JvmStatic
+    fun <T> getListFromClassPathFile(fileName: String, valueType: Class<T>): Mono<List<T>> {
+        return getClassPathFileContent(fileName)
+                .flatMap { content ->
+                    getListFromJson(content, valueType)
+                }
+    }
 }
\ No newline at end of file
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- * Modifications Copyright © 2018 IBM.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.onap.ccsdk.apps.controllerblueprints.core.utils\r
-\r
-import com.att.eelf.configuration.EELFLogger\r
-import com.att.eelf.configuration.EELFManager\r
-import com.fasterxml.jackson.annotation.JsonInclude\r
-import com.fasterxml.jackson.core.type.TypeReference\r
-import com.fasterxml.jackson.databind.JsonNode\r
-import com.fasterxml.jackson.databind.SerializationFeature\r
-import com.fasterxml.jackson.databind.node.ArrayNode\r
-import com.fasterxml.jackson.databind.node.NullNode\r
-import com.fasterxml.jackson.databind.node.ObjectNode\r
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper\r
-import kotlinx.coroutines.Dispatchers\r
-import kotlinx.coroutines.async\r
-import kotlinx.coroutines.runBlocking\r
-import kotlinx.coroutines.withContext\r
-import org.apache.commons.io.IOUtils\r
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants\r
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException\r
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintProcessorException\r
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintTypes\r
-import java.io.File\r
-import java.nio.charset.Charset\r
-import kotlin.reflect.jvm.internal.impl.load.kotlin.JvmType\r
-\r
-/**\r
- *\r
- *\r
- * @author Brinda Santh\r
- */\r
-class JacksonUtils {\r
-    companion object {\r
-        private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())\r
-        inline fun <reified T : Any> readValue(content: String): T =\r
-                jacksonObjectMapper().readValue(content, T::class.java)\r
-\r
-        fun <T> readValue(content: String, valueType: Class<T>): T? {\r
-            return jacksonObjectMapper().readValue(content, valueType)\r
-        }\r
-\r
-        fun <T> readValue(node: JsonNode, valueType: Class<T>): T? {\r
-            return jacksonObjectMapper().treeToValue(node, valueType)\r
-        }\r
-\r
-        fun removeJsonNullNode(node: JsonNode) {\r
-            val it = node.iterator()\r
-            while (it.hasNext()) {\r
-                val child = it.next()\r
-                if (child.isNull) {\r
-                    it.remove()\r
-                } else {\r
-                    removeJsonNullNode(child)\r
-                }\r
-            }\r
-        }\r
-\r
-        fun getContent(fileName: String): String = runBlocking {\r
-            async {\r
-                try {\r
-                    File(fileName).readText(Charsets.UTF_8)\r
-                } catch (e: Exception) {\r
-                    throw BluePrintException("couldn't get file ($fileName) content : ${e.message}")\r
-                }\r
-            }.await()\r
-        }\r
-\r
-        fun getClassPathFileContent(fileName: String): String {\r
-            return runBlocking {\r
-                withContext(Dispatchers.Default) {\r
-                    IOUtils.toString(JacksonUtils::class.java.classLoader\r
-                            .getResourceAsStream(fileName), Charset.defaultCharset())\r
-                }\r
-            }\r
-        }\r
-\r
-        fun <T> readValueFromFile(fileName: String, valueType: Class<T>): T? {\r
-            val content: String = getContent(fileName)\r
-            return readValue(content, valueType)\r
-        }\r
-\r
-        fun <T> readValueFromClassPathFile(fileName: String, valueType: Class<T>): T? {\r
-            val content: String = getClassPathFileContent(fileName)\r
-            return readValue(content, valueType)\r
-        }\r
-\r
-        fun jsonNodeFromObject(from: kotlin.Any): JsonNode {\r
-            return jacksonObjectMapper().convertValue(from, JsonNode::class.java)\r
-        }\r
-\r
-        fun jsonNodeFromClassPathFile(fileName: String): JsonNode {\r
-            val content: String = getClassPathFileContent(fileName)\r
-            return jsonNode(content)\r
-        }\r
-\r
-        fun jsonNodeFromFile(fileName: String): JsonNode {\r
-            val content: String = getContent(fileName)\r
-            return jsonNode(content)\r
-        }\r
-\r
-        fun jsonNode(content: String): JsonNode {\r
-            return jacksonObjectMapper().readTree(content)\r
-        }\r
-\r
-        fun getJson(any: kotlin.Any): String {\r
-            return getJson(any, false)\r
-        }\r
-\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
-        fun getJson(any: kotlin.Any, pretty: Boolean = false): String {\r
-            val objectMapper = jacksonObjectMapper()\r
-            objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL)\r
-            if (pretty) {\r
-                objectMapper.enable(SerializationFeature.INDENT_OUTPUT)\r
-            }\r
-            return objectMapper.writeValueAsString(any)\r
-        }\r
-\r
-        fun getJsonNode(any: kotlin.Any?, pretty: Boolean = false): JsonNode {\r
-            val objectMapper = jacksonObjectMapper()\r
-            objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL)\r
-            if (pretty) {\r
-                objectMapper.enable(SerializationFeature.INDENT_OUTPUT)\r
-            }\r
-            return objectMapper.valueToTree(any)\r
-        }\r
-\r
-        fun <T> getListFromJsonNode(node: JsonNode, valueType: Class<T>): List<T>? {\r
-            return getListFromJson(node.toString(), valueType)\r
-        }\r
-\r
-        fun <T> getListFromJson(content: String, valueType: Class<T>): List<T>? {\r
-            val objectMapper = jacksonObjectMapper()\r
-            val javaType = objectMapper.typeFactory.constructCollectionType(List::class.java, valueType)\r
-            return objectMapper.readValue<List<T>>(content, javaType)\r
-        }\r
-\r
-        fun <T> getListFromFile(fileName: String, valueType: Class<T>): List<T>? {\r
-            val content: String = getContent(fileName)\r
-            return getListFromJson(content, valueType)\r
-        }\r
-\r
-        fun <T> getListFromClassPathFile(fileName: String, valueType: Class<T>): List<T>? {\r
-            val content: String = getClassPathFileContent(fileName)\r
-            return getListFromJson(content, valueType)\r
-        }\r
-\r
-        fun <T> getMapFromJson(content: String, valueType: Class<T>): MutableMap<String, T>? {\r
-            val objectMapper = jacksonObjectMapper()\r
-            val typeRef = object : TypeReference<MutableMap<String, T>>() {}\r
-            return objectMapper.readValue(content, typeRef)\r
-        }\r
-\r
-        fun <T> getMapFromFile(fileName: String, valueType: Class<T>): MutableMap<String, T>? {\r
-            val content: String = getContent(fileName)\r
-            return getMapFromJson(content, valueType)\r
-        }\r
-\r
-        fun <T> getInstanceFromMap(properties: MutableMap<String, JsonNode>, classType: Class<T>): T {\r
-            return readValue(getJson(properties), classType)\r
-                    ?: throw BluePrintProcessorException("failed to transform content ($properties) to type ($classType)")\r
-        }\r
-\r
-        fun checkJsonNodeValueOfType(type: String, jsonNode: JsonNode): Boolean {\r
-            if (BluePrintTypes.validPrimitiveTypes().contains(type.toLowerCase())) {\r
-                return checkJsonNodeValueOfPrimitiveType(type, jsonNode)\r
-            } else if (BluePrintTypes.validCollectionTypes().contains(type)) {\r
-                return checkJsonNodeValueOfCollectionType(type, jsonNode)\r
-            }\r
-            return false\r
-        }\r
-\r
-        fun checkIfPrimitiveType(primitiveType: String): Boolean {\r
-            return when (primitiveType.toLowerCase()) {\r
-                BluePrintConstants.DATA_TYPE_STRING -> true\r
-                BluePrintConstants.DATA_TYPE_BOOLEAN -> true\r
-                BluePrintConstants.DATA_TYPE_INTEGER -> true\r
-                BluePrintConstants.DATA_TYPE_FLOAT -> true\r
-                BluePrintConstants.DATA_TYPE_DOUBLE -> true\r
-                BluePrintConstants.DATA_TYPE_TIMESTAMP -> true\r
-                else -> false\r
-            }\r
-        }\r
-\r
-        fun checkJsonNodeValueOfPrimitiveType(primitiveType: String, jsonNode: JsonNode): Boolean {\r
-            return when (primitiveType.toLowerCase()) {\r
-                BluePrintConstants.DATA_TYPE_STRING -> jsonNode.isTextual\r
-                BluePrintConstants.DATA_TYPE_BOOLEAN -> jsonNode.isBoolean\r
-                BluePrintConstants.DATA_TYPE_INTEGER -> jsonNode.isInt\r
-                BluePrintConstants.DATA_TYPE_FLOAT -> jsonNode.isDouble\r
-                BluePrintConstants.DATA_TYPE_DOUBLE -> jsonNode.isDouble\r
-                BluePrintConstants.DATA_TYPE_TIMESTAMP -> jsonNode.isTextual\r
-                else -> false\r
-            }\r
-        }\r
-\r
-        fun checkJsonNodeValueOfCollectionType(type: String, jsonNode: JsonNode): Boolean {\r
-            return when (type.toLowerCase()) {\r
-                BluePrintConstants.DATA_TYPE_LIST -> jsonNode.isArray\r
-                BluePrintConstants.DATA_TYPE_MAP -> jsonNode.isContainerNode\r
-                else -> false\r
-            }\r
-        }\r
-\r
-        fun populatePrimitiveValues(key: String, value: Any, primitiveType: String, objectNode: ObjectNode) {\r
-            when (primitiveType.toLowerCase()) {\r
-                BluePrintConstants.DATA_TYPE_BOOLEAN -> objectNode.put(key, value as Boolean)\r
-                BluePrintConstants.DATA_TYPE_INTEGER -> objectNode.put(key, value as Int)\r
-                BluePrintConstants.DATA_TYPE_FLOAT -> objectNode.put(key, value as Float)\r
-                BluePrintConstants.DATA_TYPE_DOUBLE -> objectNode.put(key, value as Double)\r
-                BluePrintConstants.DATA_TYPE_TIMESTAMP -> objectNode.put(key, value as String)\r
-                else -> objectNode.put(key, value as String)\r
-            }\r
-        }\r
-\r
-        fun populatePrimitiveValues(value: Any, primitiveType: String, arrayNode: ArrayNode) {\r
-            when (primitiveType.toLowerCase()) {\r
-                BluePrintConstants.DATA_TYPE_BOOLEAN -> arrayNode.add(value as Boolean)\r
-                BluePrintConstants.DATA_TYPE_INTEGER -> arrayNode.add(value as Int)\r
-                BluePrintConstants.DATA_TYPE_FLOAT -> arrayNode.add(value as Float)\r
-                BluePrintConstants.DATA_TYPE_DOUBLE -> arrayNode.add(value as Double)\r
-                BluePrintConstants.DATA_TYPE_TIMESTAMP -> arrayNode.add(value as String)\r
-                else -> arrayNode.add(value as String)\r
-            }\r
-        }\r
-\r
-        fun populatePrimitiveDefaultValues(key: String, primitiveType: String, objectNode: ObjectNode) {\r
-            when (primitiveType.toLowerCase()) {\r
-                BluePrintConstants.DATA_TYPE_BOOLEAN -> objectNode.put(key, false)\r
-                BluePrintConstants.DATA_TYPE_INTEGER -> objectNode.put(key, 0)\r
-                BluePrintConstants.DATA_TYPE_FLOAT -> objectNode.put(key, 0.0)\r
-                BluePrintConstants.DATA_TYPE_DOUBLE -> objectNode.put(key, 0.0)\r
-                else -> objectNode.put(key, "")\r
-            }\r
-        }\r
-\r
-        fun populatePrimitiveDefaultValuesForArrayNode(primitiveType: String, arrayNode: ArrayNode) {\r
-            when (primitiveType.toLowerCase()) {\r
-                BluePrintConstants.DATA_TYPE_BOOLEAN -> arrayNode.add(false)\r
-                BluePrintConstants.DATA_TYPE_INTEGER -> arrayNode.add(0)\r
-                BluePrintConstants.DATA_TYPE_FLOAT -> arrayNode.add(0.0)\r
-                BluePrintConstants.DATA_TYPE_DOUBLE -> arrayNode.add(0.0)\r
-                else -> arrayNode.add("")\r
-            }\r
-        }\r
-\r
-        fun populateJsonNodeValues(key: String, nodeValue: JsonNode?, type: String, objectNode: ObjectNode) {\r
-            if (nodeValue == null || nodeValue is NullNode) {\r
-                objectNode.set(key, nodeValue)\r
-            } else if (BluePrintTypes.validPrimitiveTypes().contains(type)) {\r
-                populatePrimitiveValues(key, nodeValue, type, objectNode)\r
-            } else {\r
-                objectNode.set(key, nodeValue)\r
-            }\r
-        }\r
-\r
-        fun convertPrimitiveResourceValue(type: String, value: String): JsonNode {\r
-            return when (type.toLowerCase()) {\r
-                BluePrintConstants.DATA_TYPE_BOOLEAN -> jsonNodeFromObject(java.lang.Boolean.valueOf(value))\r
-                BluePrintConstants.DATA_TYPE_INTEGER -> jsonNodeFromObject(Integer.valueOf(value))\r
-                BluePrintConstants.DATA_TYPE_FLOAT -> jsonNodeFromObject(java.lang.Float.valueOf(value))\r
-                BluePrintConstants.DATA_TYPE_DOUBLE -> jsonNodeFromObject(java.lang.Double.valueOf(value))\r
-                else -> getJsonNode(value)\r
-            }\r
-        }\r
-\r
-    }\r
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
+ *
+ * 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 com.fasterxml.jackson.annotation.JsonInclude
+import com.fasterxml.jackson.core.type.TypeReference
+import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.databind.SerializationFeature
+import com.fasterxml.jackson.databind.node.ArrayNode
+import com.fasterxml.jackson.databind.node.NullNode
+import com.fasterxml.jackson.databind.node.ObjectNode
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import org.apache.commons.io.IOUtils
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintProcessorException
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintTypes
+import java.io.File
+import java.nio.charset.Charset
+
+/**
+ *
+ *
+ * @author Brinda Santh
+ */
+class JacksonUtils {
+    companion object {
+        private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())
+        inline fun <reified T : Any> readValue(content: String): T =
+                jacksonObjectMapper().readValue(content, T::class.java)
+
+        fun <T> readValue(content: String, valueType: Class<T>): T? {
+            return jacksonObjectMapper().readValue(content, valueType)
+        }
+
+        fun <T> readValue(node: JsonNode, valueType: Class<T>): T? {
+            return jacksonObjectMapper().treeToValue(node, valueType)
+        }
+
+        fun removeJsonNullNode(node: JsonNode) {
+            val it = node.iterator()
+            while (it.hasNext()) {
+                val child = it.next()
+                if (child.isNull) {
+                    it.remove()
+                } else {
+                    removeJsonNullNode(child)
+                }
+            }
+        }
+
+        fun getContent(fileName: String): String = runBlocking {
+            async {
+                try {
+                    File(fileName).readText(Charsets.UTF_8)
+                } catch (e: Exception) {
+                    throw BluePrintException("couldn't get file ($fileName) content : ${e.message}")
+                }
+            }.await()
+        }
+
+        fun getClassPathFileContent(fileName: String): String {
+            return runBlocking {
+                withContext(Dispatchers.Default) {
+                    IOUtils.toString(JacksonUtils::class.java.classLoader
+                            .getResourceAsStream(fileName), Charset.defaultCharset())
+                }
+            }
+        }
+
+        fun <T> readValueFromFile(fileName: String, valueType: Class<T>): T? {
+            val content: String = getContent(fileName)
+            return readValue(content, valueType)
+        }
+
+        fun <T> readValueFromClassPathFile(fileName: String, valueType: Class<T>): T? {
+            val content: String = getClassPathFileContent(fileName)
+            return readValue(content, valueType)
+        }
+
+        fun jsonNodeFromObject(from: kotlin.Any): JsonNode {
+            return jacksonObjectMapper().convertValue(from, JsonNode::class.java)
+        }
+
+        fun jsonNodeFromClassPathFile(fileName: String): JsonNode {
+            val content: String = getClassPathFileContent(fileName)
+            return jsonNode(content)
+        }
+
+        fun jsonNodeFromFile(fileName: String): JsonNode {
+            val content: String = getContent(fileName)
+            return jsonNode(content)
+        }
+
+        fun jsonNode(content: String): JsonNode {
+            return jacksonObjectMapper().readTree(content)
+        }
+
+        fun getJson(any: kotlin.Any): String {
+            return getJson(any, false)
+        }
+
+        fun getWrappedJson(wrapper: String, any: kotlin.Any, pretty: Boolean = false): String {
+            val wrapperMap = hashMapOf<String, Any>()
+            wrapperMap[wrapper] = any
+            return getJson(wrapperMap, pretty)
+        }
+
+        fun getJson(any: kotlin.Any, pretty: Boolean = false): String {
+            val objectMapper = jacksonObjectMapper()
+            objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL)
+            if (pretty) {
+                objectMapper.enable(SerializationFeature.INDENT_OUTPUT)
+            }
+            return objectMapper.writeValueAsString(any)
+        }
+
+        fun getJsonNode(any: kotlin.Any?, pretty: Boolean = false): JsonNode {
+            val objectMapper = jacksonObjectMapper()
+            objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL)
+            if (pretty) {
+                objectMapper.enable(SerializationFeature.INDENT_OUTPUT)
+            }
+            return objectMapper.valueToTree(any)
+        }
+
+        fun <T> getListFromJsonNode(node: JsonNode, valueType: Class<T>): List<T>? {
+            return getListFromJson(node.toString(), valueType)
+        }
+
+        fun <T> getListFromJson(content: String, valueType: Class<T>): List<T>? {
+            val objectMapper = jacksonObjectMapper()
+            val javaType = objectMapper.typeFactory.constructCollectionType(List::class.java, valueType)
+            return objectMapper.readValue<List<T>>(content, javaType)
+        }
+
+        fun <T> getListFromFile(fileName: String, valueType: Class<T>): List<T>? {
+            val content: String = getContent(fileName)
+            return getListFromJson(content, valueType)
+        }
+
+        fun <T> getListFromClassPathFile(fileName: String, valueType: Class<T>): List<T>? {
+            val content: String = getClassPathFileContent(fileName)
+            return getListFromJson(content, valueType)
+        }
+
+        fun <T> getMapFromJson(content: String, valueType: Class<T>): MutableMap<String, T>? {
+            val objectMapper = jacksonObjectMapper()
+            val typeRef = object : TypeReference<MutableMap<String, T>>() {}
+            return objectMapper.readValue(content, typeRef)
+        }
+
+        fun <T> getMapFromFile(fileName: String, valueType: Class<T>): MutableMap<String, T>? {
+            val content: String = getContent(fileName)
+            return getMapFromJson(content, valueType)
+        }
+
+        fun <T> getInstanceFromMap(properties: MutableMap<String, JsonNode>, classType: Class<T>): T {
+            return readValue(getJson(properties), classType)
+                    ?: throw BluePrintProcessorException("failed to transform content ($properties) to type ($classType)")
+        }
+
+        fun checkJsonNodeValueOfType(type: String, jsonNode: JsonNode): Boolean {
+            if (BluePrintTypes.validPrimitiveTypes().contains(type.toLowerCase())) {
+                return checkJsonNodeValueOfPrimitiveType(type, jsonNode)
+            } else if (BluePrintTypes.validCollectionTypes().contains(type)) {
+                return checkJsonNodeValueOfCollectionType(type, jsonNode)
+            }
+            return false
+        }
+
+        fun checkIfPrimitiveType(primitiveType: String): Boolean {
+            return when (primitiveType.toLowerCase()) {
+                BluePrintConstants.DATA_TYPE_STRING -> true
+                BluePrintConstants.DATA_TYPE_BOOLEAN -> true
+                BluePrintConstants.DATA_TYPE_INTEGER -> true
+                BluePrintConstants.DATA_TYPE_FLOAT -> true
+                BluePrintConstants.DATA_TYPE_DOUBLE -> true
+                BluePrintConstants.DATA_TYPE_TIMESTAMP -> true
+                else -> false
+            }
+        }
+
+        fun checkJsonNodeValueOfPrimitiveType(primitiveType: String, jsonNode: JsonNode): Boolean {
+            return when (primitiveType.toLowerCase()) {
+                BluePrintConstants.DATA_TYPE_STRING -> jsonNode.isTextual
+                BluePrintConstants.DATA_TYPE_BOOLEAN -> jsonNode.isBoolean
+                BluePrintConstants.DATA_TYPE_INTEGER -> jsonNode.isInt
+                BluePrintConstants.DATA_TYPE_FLOAT -> jsonNode.isDouble
+                BluePrintConstants.DATA_TYPE_DOUBLE -> jsonNode.isDouble
+                BluePrintConstants.DATA_TYPE_TIMESTAMP -> jsonNode.isTextual
+                else -> false
+            }
+        }
+
+        fun checkJsonNodeValueOfCollectionType(type: String, jsonNode: JsonNode): Boolean {
+            return when (type.toLowerCase()) {
+                BluePrintConstants.DATA_TYPE_LIST -> jsonNode.isArray
+                BluePrintConstants.DATA_TYPE_MAP -> jsonNode.isContainerNode
+                else -> false
+            }
+        }
+
+        fun populatePrimitiveValues(key: String, value: Any, primitiveType: String, objectNode: ObjectNode) {
+            when (primitiveType.toLowerCase()) {
+                BluePrintConstants.DATA_TYPE_BOOLEAN -> objectNode.put(key, value as Boolean)
+                BluePrintConstants.DATA_TYPE_INTEGER -> objectNode.put(key, value as Int)
+                BluePrintConstants.DATA_TYPE_FLOAT -> objectNode.put(key, value as Float)
+                BluePrintConstants.DATA_TYPE_DOUBLE -> objectNode.put(key, value as Double)
+                BluePrintConstants.DATA_TYPE_TIMESTAMP -> objectNode.put(key, value as String)
+                else -> objectNode.put(key, value as String)
+            }
+        }
+
+        fun populatePrimitiveValues(value: Any, primitiveType: String, arrayNode: ArrayNode) {
+            when (primitiveType.toLowerCase()) {
+                BluePrintConstants.DATA_TYPE_BOOLEAN -> arrayNode.add(value as Boolean)
+                BluePrintConstants.DATA_TYPE_INTEGER -> arrayNode.add(value as Int)
+                BluePrintConstants.DATA_TYPE_FLOAT -> arrayNode.add(value as Float)
+                BluePrintConstants.DATA_TYPE_DOUBLE -> arrayNode.add(value as Double)
+                BluePrintConstants.DATA_TYPE_TIMESTAMP -> arrayNode.add(value as String)
+                else -> arrayNode.add(value as String)
+            }
+        }
+
+        fun populatePrimitiveDefaultValues(key: String, primitiveType: String, objectNode: ObjectNode) {
+            when (primitiveType.toLowerCase()) {
+                BluePrintConstants.DATA_TYPE_BOOLEAN -> objectNode.put(key, false)
+                BluePrintConstants.DATA_TYPE_INTEGER -> objectNode.put(key, 0)
+                BluePrintConstants.DATA_TYPE_FLOAT -> objectNode.put(key, 0.0)
+                BluePrintConstants.DATA_TYPE_DOUBLE -> objectNode.put(key, 0.0)
+                else -> objectNode.put(key, "")
+            }
+        }
+
+        fun populatePrimitiveDefaultValuesForArrayNode(primitiveType: String, arrayNode: ArrayNode) {
+            when (primitiveType.toLowerCase()) {
+                BluePrintConstants.DATA_TYPE_BOOLEAN -> arrayNode.add(false)
+                BluePrintConstants.DATA_TYPE_INTEGER -> arrayNode.add(0)
+                BluePrintConstants.DATA_TYPE_FLOAT -> arrayNode.add(0.0)
+                BluePrintConstants.DATA_TYPE_DOUBLE -> arrayNode.add(0.0)
+                else -> arrayNode.add("")
+            }
+        }
+
+        fun populateJsonNodeValues(key: String, nodeValue: JsonNode?, type: String, objectNode: ObjectNode) {
+            if (nodeValue == null || nodeValue is NullNode) {
+                objectNode.set(key, nodeValue)
+            } else if (BluePrintTypes.validPrimitiveTypes().contains(type)) {
+                populatePrimitiveValues(key, nodeValue, type, objectNode)
+            } else {
+                objectNode.set(key, nodeValue)
+            }
+        }
+
+        fun convertPrimitiveResourceValue(type: String, value: String): JsonNode {
+            return when (type.toLowerCase()) {
+                BluePrintConstants.DATA_TYPE_BOOLEAN -> jsonNodeFromObject(java.lang.Boolean.valueOf(value))
+                BluePrintConstants.DATA_TYPE_INTEGER -> jsonNodeFromObject(Integer.valueOf(value))
+                BluePrintConstants.DATA_TYPE_FLOAT -> jsonNodeFromObject(java.lang.Float.valueOf(value))
+                BluePrintConstants.DATA_TYPE_DOUBLE -> jsonNodeFromObject(java.lang.Double.valueOf(value))
+                else -> getJsonNode(value)
+            }
+        }
+
+    }
 }
\ No newline at end of file
@@ -1,62 +1,62 @@
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.utils\r
-\r
-import org.apache.commons.io.FileUtils\r
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException\r
-import org.onap.ccsdk.apps.controllerblueprints.core.checkNotEmpty\r
-import com.att.eelf.configuration.EELFLogger\r
-import com.att.eelf.configuration.EELFManager\r
-import java.io.File\r
-import java.net.URL\r
-import java.nio.charset.Charset\r
-/**\r
- *\r
- *\r
- * @author Brinda Santh\r
- */\r
-object ResourceResolverUtils {\r
-    private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())\r
-\r
-    @JvmStatic\r
-    fun getFileContent(filename : String, basePath : String?): String {\r
-        log.trace("file ({}), basePath ({}) ", filename, basePath)\r
-        try{\r
-            var resolvedFileName : String = filename\r
-            if(filename.startsWith("http", true)\r
-                    || filename.startsWith("https", true)){\r
-                val givenUrl : String = URL(filename).toString()\r
-                val systemUrl : String = File(".").toURI().toURL().toString()\r
-                log.trace("givenUrl ({}), systemUrl ({}) ", givenUrl, systemUrl)\r
-                if(givenUrl.startsWith(systemUrl)){\r
-\r
-                }\r
-            }else{\r
-                if(!filename.startsWith("/")){\r
-                    if (checkNotEmpty(basePath)) {\r
-                        resolvedFileName = basePath.plus(File.separator).plus(filename)\r
-                    }else{\r
-                        resolvedFileName = javaClass.classLoader.getResource(".").path.plus(filename)\r
-                    }\r
-                }\r
-            }\r
-            return FileUtils.readFileToString(File(resolvedFileName), Charset.defaultCharset())\r
-        }catch (e : Exception){\r
-            throw BluePrintException(e, "failed to file (%s), basePath (%s) ", filename, basePath)\r
-        }\r
-    }\r
+/*
+ * 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 org.apache.commons.io.FileUtils
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
+import org.onap.ccsdk.apps.controllerblueprints.core.checkNotEmpty
+import com.att.eelf.configuration.EELFLogger
+import com.att.eelf.configuration.EELFManager
+import java.io.File
+import java.net.URL
+import java.nio.charset.Charset
+/**
+ *
+ *
+ * @author Brinda Santh
+ */
+object ResourceResolverUtils {
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())
+
+    @JvmStatic
+    fun getFileContent(filename : String, basePath : String?): String {
+        log.trace("file ({}), basePath ({}) ", filename, basePath)
+        try{
+            var resolvedFileName : String = filename
+            if(filename.startsWith("http", true)
+                    || filename.startsWith("https", true)){
+                val givenUrl : String = URL(filename).toString()
+                val systemUrl : String = File(".").toURI().toURL().toString()
+                log.trace("givenUrl ({}), systemUrl ({}) ", givenUrl, systemUrl)
+                if(givenUrl.startsWith(systemUrl)){
+
+                }
+            }else{
+                if(!filename.startsWith("/")){
+                    if (checkNotEmpty(basePath)) {
+                        resolvedFileName = basePath.plus(File.separator).plus(filename)
+                    }else{
+                        resolvedFileName = javaClass.classLoader.getResource(".").path.plus(filename)
+                    }
+                }
+            }
+            return FileUtils.readFileToString(File(resolvedFileName), Charset.defaultCharset())
+        }catch (e : Exception){
+            throw BluePrintException(e, "failed to file (%s), basePath (%s) ", filename, basePath)
+        }
+    }
 }
\ No newline at end of file
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.utils\r
-\r
-import org.apache.commons.io.FileUtils\r
-import org.onap.ccsdk.apps.controllerblueprints.core.data.ServiceTemplate\r
-import org.onap.ccsdk.apps.controllerblueprints.core.data.TopologyTemplate\r
-import java.io.File\r
-import java.nio.charset.Charset\r
-\r
-/**\r
- *\r
- *\r
- * @author Brinda Santh\r
- */\r
-object ServiceTemplateUtils {\r
-\r
-    @JvmStatic\r
-    fun getServiceTemplate(fileName: String): ServiceTemplate {\r
-        val content: String = FileUtils.readFileToString(File(fileName), Charset.defaultCharset())\r
-        return getServiceTemplateFromContent(content)\r
-    }\r
-\r
-\r
-    @JvmStatic\r
-    fun getServiceTemplateFromContent(content: String): ServiceTemplate {\r
-        return JacksonUtils.readValue(content)\r
-    }\r
-\r
-    fun merge(parentServiceTemplate: ServiceTemplate, toMerge: ServiceTemplate, removeImports: Boolean? = true): ServiceTemplate {\r
-        if (removeImports!!) {\r
-            parentServiceTemplate.imports = null\r
-            toMerge.imports = null\r
-        }\r
-\r
-        toMerge.metadata?.let {\r
-            parentServiceTemplate.metadata = parentServiceTemplate.metadata ?: hashMapOf()\r
-            parentServiceTemplate.metadata?.putAll(toMerge.metadata as MutableMap)\r
-        }\r
-\r
-        toMerge.dslDefinitions?.let {\r
-            parentServiceTemplate.dslDefinitions = parentServiceTemplate.dslDefinitions ?: hashMapOf()\r
-            parentServiceTemplate.dslDefinitions?.putAll(toMerge.dslDefinitions as MutableMap)\r
-        }\r
-\r
-        toMerge.dataTypes?.let {\r
-            parentServiceTemplate.dataTypes = parentServiceTemplate.dataTypes ?: hashMapOf()\r
-            parentServiceTemplate.dataTypes?.putAll(toMerge.dataTypes as MutableMap)\r
-        }\r
-\r
-        toMerge.nodeTypes?.let {\r
-            parentServiceTemplate.nodeTypes = parentServiceTemplate.nodeTypes ?: hashMapOf()\r
-            parentServiceTemplate.nodeTypes?.putAll(toMerge.nodeTypes as MutableMap)\r
-        }\r
-\r
-        toMerge.artifactTypes?.let {\r
-            parentServiceTemplate.artifactTypes = parentServiceTemplate.artifactTypes ?: hashMapOf()\r
-            parentServiceTemplate.artifactTypes?.putAll(toMerge.artifactTypes as MutableMap)\r
-        }\r
-\r
-        toMerge.repositories?.let {\r
-            parentServiceTemplate.repositories = parentServiceTemplate.repositories ?: hashMapOf()\r
-            parentServiceTemplate.repositories?.putAll(toMerge.repositories as MutableMap)\r
-        }\r
-\r
-        parentServiceTemplate.topologyTemplate = parentServiceTemplate.topologyTemplate ?: TopologyTemplate()\r
-\r
-        toMerge.topologyTemplate?.inputs?.let {\r
-            parentServiceTemplate.topologyTemplate?.inputs = parentServiceTemplate.topologyTemplate?.inputs ?: hashMapOf()\r
-            parentServiceTemplate.topologyTemplate?.inputs?.putAll(parentServiceTemplate.topologyTemplate?.inputs as MutableMap)\r
-        }\r
-\r
-        toMerge.topologyTemplate?.nodeTemplates?.let {\r
-            parentServiceTemplate.topologyTemplate?.nodeTemplates = parentServiceTemplate.topologyTemplate?.nodeTemplates ?: hashMapOf()\r
-            parentServiceTemplate.topologyTemplate?.nodeTemplates?.putAll(parentServiceTemplate.topologyTemplate?.nodeTemplates as MutableMap)\r
-        }\r
-\r
-        toMerge.topologyTemplate?.relationshipTemplates?.let {\r
-            parentServiceTemplate.topologyTemplate?.relationshipTemplates = parentServiceTemplate.topologyTemplate?.relationshipTemplates ?: hashMapOf()\r
-            parentServiceTemplate.topologyTemplate?.relationshipTemplates?.putAll(parentServiceTemplate.topologyTemplate?.relationshipTemplates as MutableMap)\r
-        }\r
-\r
-        toMerge.topologyTemplate?.policies?.let {\r
-            parentServiceTemplate.topologyTemplate?.policies = parentServiceTemplate.topologyTemplate?.policies ?: hashMapOf()\r
-            parentServiceTemplate.topologyTemplate?.policies?.putAll(parentServiceTemplate.topologyTemplate?.policies as MutableMap)\r
-        }\r
-\r
-        toMerge.topologyTemplate?.workflows?.let {\r
-            parentServiceTemplate.topologyTemplate?.workflows = parentServiceTemplate.topologyTemplate?.workflows ?: hashMapOf()\r
-            parentServiceTemplate.topologyTemplate?.workflows?.putAll(parentServiceTemplate.topologyTemplate?.workflows as MutableMap)\r
-        }\r
-        return parentServiceTemplate\r
-    }\r
-\r
-\r
+/*
+ * 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 org.apache.commons.io.FileUtils
+import org.onap.ccsdk.apps.controllerblueprints.core.data.ServiceTemplate
+import org.onap.ccsdk.apps.controllerblueprints.core.data.TopologyTemplate
+import java.io.File
+import java.nio.charset.Charset
+
+/**
+ *
+ *
+ * @author Brinda Santh
+ */
+object ServiceTemplateUtils {
+
+    @JvmStatic
+    fun getServiceTemplate(fileName: String): ServiceTemplate {
+        val content: String = FileUtils.readFileToString(File(fileName), Charset.defaultCharset())
+        return getServiceTemplateFromContent(content)
+    }
+
+
+    @JvmStatic
+    fun getServiceTemplateFromContent(content: String): ServiceTemplate {
+        return JacksonUtils.readValue(content)
+    }
+
+    fun merge(parentServiceTemplate: ServiceTemplate, toMerge: ServiceTemplate, removeImports: Boolean? = true): ServiceTemplate {
+        if (removeImports!!) {
+            parentServiceTemplate.imports = null
+            toMerge.imports = null
+        }
+
+        toMerge.metadata?.let {
+            parentServiceTemplate.metadata = parentServiceTemplate.metadata ?: hashMapOf()
+            parentServiceTemplate.metadata?.putAll(toMerge.metadata as MutableMap)
+        }
+
+        toMerge.dslDefinitions?.let {
+            parentServiceTemplate.dslDefinitions = parentServiceTemplate.dslDefinitions ?: hashMapOf()
+            parentServiceTemplate.dslDefinitions?.putAll(toMerge.dslDefinitions as MutableMap)
+        }
+
+        toMerge.dataTypes?.let {
+            parentServiceTemplate.dataTypes = parentServiceTemplate.dataTypes ?: hashMapOf()
+            parentServiceTemplate.dataTypes?.putAll(toMerge.dataTypes as MutableMap)
+        }
+
+        toMerge.nodeTypes?.let {
+            parentServiceTemplate.nodeTypes = parentServiceTemplate.nodeTypes ?: hashMapOf()
+            parentServiceTemplate.nodeTypes?.putAll(toMerge.nodeTypes as MutableMap)
+        }
+
+        toMerge.artifactTypes?.let {
+            parentServiceTemplate.artifactTypes = parentServiceTemplate.artifactTypes ?: hashMapOf()
+            parentServiceTemplate.artifactTypes?.putAll(toMerge.artifactTypes as MutableMap)
+        }
+
+        toMerge.repositories?.let {
+            parentServiceTemplate.repositories = parentServiceTemplate.repositories ?: hashMapOf()
+            parentServiceTemplate.repositories?.putAll(toMerge.repositories as MutableMap)
+        }
+
+        parentServiceTemplate.topologyTemplate = parentServiceTemplate.topologyTemplate ?: TopologyTemplate()
+
+        toMerge.topologyTemplate?.inputs?.let {
+            parentServiceTemplate.topologyTemplate?.inputs = parentServiceTemplate.topologyTemplate?.inputs ?: hashMapOf()
+            parentServiceTemplate.topologyTemplate?.inputs?.putAll(parentServiceTemplate.topologyTemplate?.inputs as MutableMap)
+        }
+
+        toMerge.topologyTemplate?.nodeTemplates?.let {
+            parentServiceTemplate.topologyTemplate?.nodeTemplates = parentServiceTemplate.topologyTemplate?.nodeTemplates ?: hashMapOf()
+            parentServiceTemplate.topologyTemplate?.nodeTemplates?.putAll(parentServiceTemplate.topologyTemplate?.nodeTemplates as MutableMap)
+        }
+
+        toMerge.topologyTemplate?.relationshipTemplates?.let {
+            parentServiceTemplate.topologyTemplate?.relationshipTemplates = parentServiceTemplate.topologyTemplate?.relationshipTemplates ?: hashMapOf()
+            parentServiceTemplate.topologyTemplate?.relationshipTemplates?.putAll(parentServiceTemplate.topologyTemplate?.relationshipTemplates as MutableMap)
+        }
+
+        toMerge.topologyTemplate?.policies?.let {
+            parentServiceTemplate.topologyTemplate?.policies = parentServiceTemplate.topologyTemplate?.policies ?: hashMapOf()
+            parentServiceTemplate.topologyTemplate?.policies?.putAll(parentServiceTemplate.topologyTemplate?.policies as MutableMap)
+        }
+
+        toMerge.topologyTemplate?.workflows?.let {
+            parentServiceTemplate.topologyTemplate?.workflows = parentServiceTemplate.topologyTemplate?.workflows ?: hashMapOf()
+            parentServiceTemplate.topologyTemplate?.workflows?.putAll(parentServiceTemplate.topologyTemplate?.workflows as MutableMap)
+        }
+        return parentServiceTemplate
+    }
+
+
 }
\ No newline at end of file
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.utils\r
-\r
-import java.util.*\r
-\r
-/**\r
- *\r
- *\r
- * @author Brinda Santh\r
- */\r
-class TopologicalSortingUtils<V> {\r
-\r
-    private val neighbors: MutableMap<V, MutableList<V>> = hashMapOf()\r
-\r
-    val isDag: Boolean\r
-        get() = topSort() != null\r
-\r
-    override fun toString(): String {\r
-        val s = StringBuffer()\r
-        for (v in neighbors.keys)\r
-            s.append("\n    " + v + " -> " + neighbors[v])\r
-        return s.toString()\r
-    }\r
-\r
-    fun getNeighbors(): Map<V, List<V>> {\r
-        return neighbors\r
-    }\r
-\r
-    fun add(vertex: V) {\r
-        if (neighbors.containsKey(vertex))\r
-            return\r
-        neighbors[vertex] = arrayListOf()\r
-    }\r
-\r
-    operator fun contains(vertex: V): Boolean {\r
-        return neighbors.containsKey(vertex)\r
-    }\r
-\r
-    fun add(from: V, to: V) {\r
-        this.add(from)\r
-        this.add(to)\r
-        neighbors[from]?.add(to)\r
-    }\r
-\r
-    fun remove(from: V, to: V) {\r
-        if (!(this.contains(from) && this.contains(to)))\r
-            throw IllegalArgumentException("Nonexistent vertex")\r
-        neighbors[from]?.remove(to)\r
-    }\r
-\r
-    fun outDegree(): Map<V, Int> {\r
-        val result: MutableMap<V, Int> = hashMapOf()\r
-        for (v in neighbors.keys)\r
-            result[v] = neighbors[v]!!.size\r
-        return result\r
-    }\r
-\r
-\r
-    fun inDegree(): MutableMap<V, Int> {\r
-        val result = HashMap<V, Int>()\r
-        for (v in neighbors.keys)\r
-            result[v] = 0       // All in-degrees are 0\r
-        for (from in neighbors.keys) {\r
-            for (to in neighbors[from]!!) {\r
-                result[to] = result[to]!! + 1           // Increment in-degree\r
-            }\r
-        }\r
-        return result\r
-    }\r
-\r
-    fun topSort(): List<V>? {\r
-        val degree = inDegree()\r
-        // Determine all vertices with zero in-degree\r
-        val zeroVerts = Stack<V>()        // Stack as good as any here\r
-        for (v in degree.keys) {\r
-            if (degree[v] == 0) zeroVerts.push(v)\r
-        }\r
-        // Determine the topological order\r
-        val result = ArrayList<V>()\r
-        while (!zeroVerts.isEmpty()) {\r
-            val v = zeroVerts.pop()                  // Choose a vertex with zero in-degree\r
-            result.add(v)                          // Vertex v is next in topol order\r
-            // "Remove" vertex v by updating its neighbors\r
-            for (neighbor in neighbors[v]!!) {\r
-                degree[neighbor] = degree[neighbor]!! - 1\r
-                // Remember any vertices that now have zero in-degree\r
-                if (degree[neighbor] == 0) zeroVerts.push(neighbor)\r
-            }\r
-        }\r
-        // Check that we have used the entire graph (if not, there was a cycle)\r
-        return if (result.size != neighbors.size) null else result\r
-    }\r
-\r
-\r
-    fun bfsDistance(start: V): Map<*, *> {\r
-        val distance: MutableMap<V, Int> = hashMapOf()\r
-        // Initially, all distance are infinity, except start node\r
-        for (v in neighbors.keys)\r
-            distance[v] = -1\r
-        distance[start] = 0\r
-        // Process nodes in queue order\r
-        val queue = LinkedList<V>()\r
-        queue.offer(start)                                    // Place start node in queue\r
-        while (!queue.isEmpty()) {\r
-            val v = queue.remove()\r
-            val vDist = distance[v]!!\r
-            // Update neighbors\r
-            for (neighbor in neighbors[v]!!) {\r
-                if (distance[neighbor] != null) continue  // Ignore if already done\r
-                distance[neighbor] = vDist + 1\r
-                queue.offer(neighbor)\r
-            }\r
-        }\r
-        return distance\r
-    }\r
+/*
+ * 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 java.util.*
+
+/**
+ *
+ *
+ * @author Brinda Santh
+ */
+class TopologicalSortingUtils<V> {
+
+    private val neighbors: MutableMap<V, MutableList<V>> = hashMapOf()
+
+    val isDag: Boolean
+        get() = topSort() != null
+
+    override fun toString(): String {
+        val s = StringBuffer()
+        for (v in neighbors.keys)
+            s.append("\n    " + v + " -> " + neighbors[v])
+        return s.toString()
+    }
+
+    fun getNeighbors(): Map<V, List<V>> {
+        return neighbors
+    }
+
+    fun add(vertex: V) {
+        if (neighbors.containsKey(vertex))
+            return
+        neighbors[vertex] = arrayListOf()
+    }
+
+    operator fun contains(vertex: V): Boolean {
+        return neighbors.containsKey(vertex)
+    }
+
+    fun add(from: V, to: V) {
+        this.add(from)
+        this.add(to)
+        neighbors[from]?.add(to)
+    }
+
+    fun remove(from: V, to: V) {
+        if (!(this.contains(from) && this.contains(to)))
+            throw IllegalArgumentException("Nonexistent vertex")
+        neighbors[from]?.remove(to)
+    }
+
+    fun outDegree(): Map<V, Int> {
+        val result: MutableMap<V, Int> = hashMapOf()
+        for (v in neighbors.keys)
+            result[v] = neighbors[v]!!.size
+        return result
+    }
+
+
+    fun inDegree(): MutableMap<V, Int> {
+        val result = HashMap<V, Int>()
+        for (v in neighbors.keys)
+            result[v] = 0       // All in-degrees are 0
+        for (from in neighbors.keys) {
+            for (to in neighbors[from]!!) {
+                result[to] = result[to]!! + 1           // Increment in-degree
+            }
+        }
+        return result
+    }
+
+    fun topSort(): List<V>? {
+        val degree = inDegree()
+        // Determine all vertices with zero in-degree
+        val zeroVerts = Stack<V>()        // Stack as good as any here
+        for (v in degree.keys) {
+            if (degree[v] == 0) zeroVerts.push(v)
+        }
+        // Determine the topological order
+        val result = ArrayList<V>()
+        while (!zeroVerts.isEmpty()) {
+            val v = zeroVerts.pop()                  // Choose a vertex with zero in-degree
+            result.add(v)                          // Vertex v is next in topol order
+            // "Remove" vertex v by updating its neighbors
+            for (neighbor in neighbors[v]!!) {
+                degree[neighbor] = degree[neighbor]!! - 1
+                // Remember any vertices that now have zero in-degree
+                if (degree[neighbor] == 0) zeroVerts.push(neighbor)
+            }
+        }
+        // Check that we have used the entire graph (if not, there was a cycle)
+        return if (result.size != neighbors.size) null else result
+    }
+
+
+    fun bfsDistance(start: V): Map<*, *> {
+        val distance: MutableMap<V, Int> = hashMapOf()
+        // Initially, all distance are infinity, except start node
+        for (v in neighbors.keys)
+            distance[v] = -1
+        distance[start] = 0
+        // Process nodes in queue order
+        val queue = LinkedList<V>()
+        queue.offer(start)                                    // Place start node in queue
+        while (!queue.isEmpty()) {
+            val v = queue.remove()
+            val vDist = distance[v]!!
+            // Update neighbors
+            for (neighbor in neighbors[v]!!) {
+                if (distance[neighbor] != null) continue  // Ignore if already done
+                distance[neighbor] = vDist + 1
+                queue.offer(neighbor)
+            }
+        }
+        return distance
+    }
 }
\ No newline at end of file
@@ -19,10 +19,7 @@ package org.onap.ccsdk.apps.controllerblueprints.core.validation
 import com.att.eelf.configuration.EELFLogger
 import com.att.eelf.configuration.EELFManager
 import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
-import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeTemplate
 import org.onap.ccsdk.apps.controllerblueprints.core.data.Workflow
-import org.onap.ccsdk.apps.controllerblueprints.core.format
 import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
 import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintWorkflowValidator
 import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRuntimeService
@@ -1,35 +1,35 @@
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core\r
-\r
-import org.junit.Test\r
-import kotlin.test.assertEquals\r
-/**\r
- *\r
- *\r
- * @author Brinda Santh\r
- */\r
-class CustomFunctionsTest {\r
-    @Test\r
-    fun testFormat(): Unit {\r
-        val returnValue : String = format("This is {} for times {}", "test", 2)\r
-        assertEquals("This is test for times 2", returnValue, "Failed to format String")\r
-\r
-        val returnValue1 : String = format("This is test for times 2")\r
-        assertEquals("This is test for times 2", returnValue1, "Failed to format empty args")\r
-    }\r
+/*
+ * 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
+
+import org.junit.Test
+import kotlin.test.assertEquals
+/**
+ *
+ *
+ * @author Brinda Santh
+ */
+class CustomFunctionsTest {
+    @Test
+    fun testFormat(): Unit {
+        val returnValue : String = format("This is {} for times {}", "test", 2)
+        assertEquals("This is test for times 2", returnValue, "Failed to format String")
+
+        val returnValue1 : String = format("This is test for times 2")
+        assertEquals("This is test for times 2", returnValue1, "Failed to format empty args")
+    }
 }
\ No newline at end of file
@@ -1,53 +1,54 @@
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.service\r
-\r
-\r
-import com.att.eelf.configuration.EELFLogger\r
-import com.att.eelf.configuration.EELFManager\r
-import org.junit.Test\r
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.BluePrintMetadataUtils\r
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils\r
-import kotlin.test.assertNotNull\r
-\r
-/**\r
- *\r
- *\r
- * @author Brinda Santh\r
- */\r
-class BluePrintContextTest {\r
-\r
-    private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())\r
-\r
-    val blueprintBasePath: String = ("./../model-catalog/blueprint-model/starter-blueprint/baseconfiguration")\r
-\r
-    @Test\r
-    fun testBluePrintContextCreation() {\r
-        val bluePrintContext = BluePrintMetadataUtils.getBluePrintContext(blueprintBasePath)\r
-        assertNotNull(bluePrintContext, "Failed to populate Blueprint context")\r
-    }\r
-\r
-    @Test\r
-    fun testChainedProperty() {\r
-        val bluePrintContext = BluePrintMetadataUtils.getBluePrintContext(blueprintBasePath)\r
-        val nodeType = bluePrintContext.nodeTypeChained("component-resource-assignment")\r
-        assertNotNull(nodeType, "Failed to get chained node type")\r
-        log.trace("Properties {}", JacksonUtils.getJson(nodeType, true))\r
-    }\r
-\r
-\r
-}\r
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
+ *
+ * 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.service
+
+
+import com.att.eelf.configuration.EELFLogger
+import com.att.eelf.configuration.EELFManager
+import org.junit.Test
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.BluePrintMetadataUtils
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
+import kotlin.test.assertNotNull
+
+/**
+ *
+ *
+ * @author Brinda Santh
+ */
+class BluePrintContextTest {
+
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())
+
+    val blueprintBasePath: String = ("./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration")
+
+    @Test
+    fun testBluePrintContextCreation() {
+        val bluePrintContext = BluePrintMetadataUtils.getBluePrintContext(blueprintBasePath)
+        assertNotNull(bluePrintContext, "Failed to populate Blueprint context")
+    }
+
+    @Test
+    fun testChainedProperty() {
+        val bluePrintContext = BluePrintMetadataUtils.getBluePrintContext(blueprintBasePath)
+        val nodeType = bluePrintContext.nodeTypeChained("component-resource-assignment")
+        assertNotNull(nodeType, "Failed to get chained node type")
+        log.trace("Properties {}", JacksonUtils.getJson(nodeType, true))
+    }
+
+
+}
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.service\r
-\r
-import com.fasterxml.jackson.databind.JsonNode\r
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper\r
-import org.junit.Test\r
-import org.onap.ccsdk.apps.controllerblueprints.core.data.ExpressionData\r
-import kotlin.test.assertEquals\r
-import kotlin.test.assertNotNull\r
-/**\r
- *\r
- *\r
- * @author Brinda Santh\r
- */\r
-class BluePrintExpressionServiceTest {\r
-    @Test\r
-    fun testInputExpression() {\r
-        val node : JsonNode = jacksonObjectMapper().readTree("{ \"get_input\" : \"input-name\" }")\r
-        val expressionData : ExpressionData = BluePrintExpressionService.getExpressionData(node)\r
-        assertNotNull(expressionData, " Failed to populate expression data")\r
-        assertEquals(expressionData.isExpression, true, "Failed to identify as expression")\r
-        assertNotNull(expressionData.inputExpression, " Failed to populate input expression data")\r
-        assertEquals("input-name", expressionData.inputExpression?.propertyName, "Failed to get propertyName from expression data")\r
-    }\r
-\r
-    @Test\r
-    fun testPropertyExpression() {\r
-        val node : JsonNode = jacksonObjectMapper().readTree("{ \"get_property\" : [\"SELF\", \"property-name\"] }")\r
-        val expressionData : ExpressionData = BluePrintExpressionService.getExpressionData(node)\r
-        assertNotNull(expressionData, " Failed to populate expression data")\r
-        assertEquals(expressionData.isExpression, true, "Failed to identify as expression")\r
-        assertNotNull(expressionData.propertyExpression, " Failed to populate property expression data")\r
-        assertEquals("SELF", expressionData.propertyExpression?.modelableEntityName, " Failed to get expected modelableEntityName")\r
-        assertEquals("property-name", expressionData.propertyExpression?.propertyName, " Failed to get expected propertyName")\r
-\r
-        val node1 : JsonNode = jacksonObjectMapper().readTree("{ \"get_property\" : [\"SELF\", \"\",\"property-name\", \"resource\", \"name\"] }")\r
-        val expressionData1  : ExpressionData  = BluePrintExpressionService.getExpressionData(node1)\r
-        assertNotNull(expressionData1, " Failed to populate expression data")\r
-        assertEquals(expressionData1.isExpression, true, "Failed to identify as nested property expression")\r
-        assertNotNull(expressionData1.propertyExpression, " Failed to populate nested property expression data")\r
-        assertEquals("SELF", expressionData1.propertyExpression?.modelableEntityName, " Failed to get expected modelableEntityName")\r
-        assertEquals("property-name", expressionData1.propertyExpression?.propertyName, " Failed to get expected propertyName")\r
-        assertEquals("resource/name",expressionData1.propertyExpression?.subPropertyName, " Failed to populate nested subPropertyName expression data")\r
-    }\r
-\r
-    @Test\r
-    fun testAttributeExpression() {\r
-        val node : JsonNode = jacksonObjectMapper().readTree("{ \"get_attribute\" : [\"SELF\", \"resource\"] }")\r
-        val expressionData : ExpressionData = BluePrintExpressionService.getExpressionData(node)\r
-        assertNotNull(expressionData, " Failed to populate expression data")\r
-        assertEquals(expressionData.isExpression, true, "Failed to identify as expression")\r
-        assertNotNull(expressionData.attributeExpression, " Failed to populate attribute expression data")\r
-        assertEquals("SELF", expressionData.attributeExpression?.modelableEntityName, " Failed to get expected modelableEntityName")\r
-        assertEquals("resource", expressionData.attributeExpression?.attributeName, " Failed to get expected attributeName")\r
-\r
-        val node1 : JsonNode = jacksonObjectMapper().readTree("{ \"get_attribute\" : [\"SELF\", \"\",\"attribute-name\", \"resource\", \"name\"] }")\r
-        val expressionData1 : ExpressionData = BluePrintExpressionService.getExpressionData(node1)\r
-        assertNotNull(expressionData1, " Failed to populate expression data")\r
-        assertEquals(expressionData1.isExpression, true, "Failed to identify as expression")\r
-        assertNotNull(expressionData1.attributeExpression, " Failed to populate attribute expression data")\r
-        assertEquals("SELF", expressionData1.attributeExpression?.modelableEntityName, " Failed to get expected modelableEntityName")\r
-        assertEquals("attribute-name", expressionData1.attributeExpression?.attributeName, " Failed to get expected attributeName")\r
-        assertEquals("resource/name",expressionData1.attributeExpression?.subAttributeName, " Failed to populate nested subAttributeName expression data")\r
-    }\r
-\r
-\r
-    @Test\r
-    fun testOutputOperationExpression() {\r
-        val node : JsonNode = jacksonObjectMapper().readTree("{ \"get_operation_output\": [\"SELF\", \"interface-name\", \"operation-name\", \"output-property-name\"] }")\r
-        val expressionData : ExpressionData = BluePrintExpressionService.getExpressionData(node)\r
-        assertNotNull(expressionData, " Failed to populate expression data")\r
-        assertEquals(expressionData.isExpression, true, "Failed to identify as expression")\r
-        assertNotNull(expressionData.operationOutputExpression, " Failed to populate output expression data")\r
-        assertEquals("SELF", expressionData.operationOutputExpression?.modelableEntityName, " Failed to get expected modelableEntityName")\r
-        assertEquals("interface-name", expressionData.operationOutputExpression?.interfaceName, " Failed to get expected interfaceName")\r
-        assertEquals("operation-name", expressionData.operationOutputExpression?.operationName, " Failed to get expected operationName")\r
-        assertEquals("output-property-name", expressionData.operationOutputExpression?.propertyName, " Failed to get expected propertyName")\r
-    }\r
-\r
-\r
-    @Test\r
-    fun testArtifactExpression() {\r
-        val node : JsonNode = jacksonObjectMapper().readTree("{ \"get_artifact\" : [\"SELF\", \"artifact-template\"] }")\r
-        val expressionData : ExpressionData = BluePrintExpressionService.getExpressionData(node)\r
-        assertNotNull(expressionData, " Failed to populate expression data")\r
-        assertEquals(expressionData.isExpression, true, "Failed to identify as expression")\r
-        assertNotNull(expressionData.artifactExpression, " Failed to populate Artifact expression data")\r
-        assertEquals("SELF", expressionData.artifactExpression?.modelableEntityName, " Failed to get expected modelableEntityName")\r
-        assertEquals("artifact-template", expressionData.artifactExpression?.artifactName, " Failed to get expected artifactName")\r
-\r
-\r
-        val node1 : JsonNode = jacksonObjectMapper().readTree("{ \"get_artifact\" : [\"SELF\", \"artifact-template\", \"location\", true] }")\r
-        val expressionData1 : ExpressionData = BluePrintExpressionService.getExpressionData(node1)\r
-        assertNotNull(expressionData1, " Failed to populate expression data")\r
-        assertEquals(expressionData1.isExpression, true, "Failed to identify as expression")\r
-        assertNotNull(expressionData1.artifactExpression, " Failed to populate Artifact expression data")\r
-        assertEquals("SELF", expressionData1.artifactExpression?.modelableEntityName, " Failed to get expected modelableEntityName")\r
-        assertEquals("artifact-template", expressionData1.artifactExpression?.artifactName, " Failed to get expected artifactName")\r
-        assertEquals("location", expressionData1.artifactExpression?.location, " Failed to get expected location")\r
-        assertEquals(true, expressionData1.artifactExpression?.remove, " Failed to get expected remove")\r
-    }\r
+/*
+ * 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.service
+
+import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import org.junit.Test
+import org.onap.ccsdk.apps.controllerblueprints.core.data.ExpressionData
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+/**
+ *
+ *
+ * @author Brinda Santh
+ */
+class BluePrintExpressionServiceTest {
+    @Test
+    fun testInputExpression() {
+        val node : JsonNode = jacksonObjectMapper().readTree("{ \"get_input\" : \"input-name\" }")
+        val expressionData : ExpressionData = BluePrintExpressionService.getExpressionData(node)
+        assertNotNull(expressionData, " Failed to populate expression data")
+        assertEquals(expressionData.isExpression, true, "Failed to identify as expression")
+        assertNotNull(expressionData.inputExpression, " Failed to populate input expression data")
+        assertEquals("input-name", expressionData.inputExpression?.propertyName, "Failed to get propertyName from expression data")
+    }
+
+    @Test
+    fun testPropertyExpression() {
+        val node : JsonNode = jacksonObjectMapper().readTree("{ \"get_property\" : [\"SELF\", \"property-name\"] }")
+        val expressionData : ExpressionData = BluePrintExpressionService.getExpressionData(node)
+        assertNotNull(expressionData, " Failed to populate expression data")
+        assertEquals(expressionData.isExpression, true, "Failed to identify as expression")
+        assertNotNull(expressionData.propertyExpression, " Failed to populate property expression data")
+        assertEquals("SELF", expressionData.propertyExpression?.modelableEntityName, " Failed to get expected modelableEntityName")
+        assertEquals("property-name", expressionData.propertyExpression?.propertyName, " Failed to get expected propertyName")
+
+        val node1 : JsonNode = jacksonObjectMapper().readTree("{ \"get_property\" : [\"SELF\", \"\",\"property-name\", \"resource\", \"name\"] }")
+        val expressionData1  : ExpressionData  = BluePrintExpressionService.getExpressionData(node1)
+        assertNotNull(expressionData1, " Failed to populate expression data")
+        assertEquals(expressionData1.isExpression, true, "Failed to identify as nested property expression")
+        assertNotNull(expressionData1.propertyExpression, " Failed to populate nested property expression data")
+        assertEquals("SELF", expressionData1.propertyExpression?.modelableEntityName, " Failed to get expected modelableEntityName")
+        assertEquals("property-name", expressionData1.propertyExpression?.propertyName, " Failed to get expected propertyName")
+        assertEquals("resource/name",expressionData1.propertyExpression?.subPropertyName, " Failed to populate nested subPropertyName expression data")
+    }
+
+    @Test
+    fun testAttributeExpression() {
+        val node : JsonNode = jacksonObjectMapper().readTree("{ \"get_attribute\" : [\"SELF\", \"resource\"] }")
+        val expressionData : ExpressionData = BluePrintExpressionService.getExpressionData(node)
+        assertNotNull(expressionData, " Failed to populate expression data")
+        assertEquals(expressionData.isExpression, true, "Failed to identify as expression")
+        assertNotNull(expressionData.attributeExpression, " Failed to populate attribute expression data")
+        assertEquals("SELF", expressionData.attributeExpression?.modelableEntityName, " Failed to get expected modelableEntityName")
+        assertEquals("resource", expressionData.attributeExpression?.attributeName, " Failed to get expected attributeName")
+
+        val node1 : JsonNode = jacksonObjectMapper().readTree("{ \"get_attribute\" : [\"SELF\", \"\",\"attribute-name\", \"resource\", \"name\"] }")
+        val expressionData1 : ExpressionData = BluePrintExpressionService.getExpressionData(node1)
+        assertNotNull(expressionData1, " Failed to populate expression data")
+        assertEquals(expressionData1.isExpression, true, "Failed to identify as expression")
+        assertNotNull(expressionData1.attributeExpression, " Failed to populate attribute expression data")
+        assertEquals("SELF", expressionData1.attributeExpression?.modelableEntityName, " Failed to get expected modelableEntityName")
+        assertEquals("attribute-name", expressionData1.attributeExpression?.attributeName, " Failed to get expected attributeName")
+        assertEquals("resource/name",expressionData1.attributeExpression?.subAttributeName, " Failed to populate nested subAttributeName expression data")
+    }
+
+
+    @Test
+    fun testOutputOperationExpression() {
+        val node : JsonNode = jacksonObjectMapper().readTree("{ \"get_operation_output\": [\"SELF\", \"interface-name\", \"operation-name\", \"output-property-name\"] }")
+        val expressionData : ExpressionData = BluePrintExpressionService.getExpressionData(node)
+        assertNotNull(expressionData, " Failed to populate expression data")
+        assertEquals(expressionData.isExpression, true, "Failed to identify as expression")
+        assertNotNull(expressionData.operationOutputExpression, " Failed to populate output expression data")
+        assertEquals("SELF", expressionData.operationOutputExpression?.modelableEntityName, " Failed to get expected modelableEntityName")
+        assertEquals("interface-name", expressionData.operationOutputExpression?.interfaceName, " Failed to get expected interfaceName")
+        assertEquals("operation-name", expressionData.operationOutputExpression?.operationName, " Failed to get expected operationName")
+        assertEquals("output-property-name", expressionData.operationOutputExpression?.propertyName, " Failed to get expected propertyName")
+    }
+
+
+    @Test
+    fun testArtifactExpression() {
+        val node : JsonNode = jacksonObjectMapper().readTree("{ \"get_artifact\" : [\"SELF\", \"artifact-template\"] }")
+        val expressionData : ExpressionData = BluePrintExpressionService.getExpressionData(node)
+        assertNotNull(expressionData, " Failed to populate expression data")
+        assertEquals(expressionData.isExpression, true, "Failed to identify as expression")
+        assertNotNull(expressionData.artifactExpression, " Failed to populate Artifact expression data")
+        assertEquals("SELF", expressionData.artifactExpression?.modelableEntityName, " Failed to get expected modelableEntityName")
+        assertEquals("artifact-template", expressionData.artifactExpression?.artifactName, " Failed to get expected artifactName")
+
+
+        val node1 : JsonNode = jacksonObjectMapper().readTree("{ \"get_artifact\" : [\"SELF\", \"artifact-template\", \"location\", true] }")
+        val expressionData1 : ExpressionData = BluePrintExpressionService.getExpressionData(node1)
+        assertNotNull(expressionData1, " Failed to populate expression data")
+        assertEquals(expressionData1.isExpression, true, "Failed to identify as expression")
+        assertNotNull(expressionData1.artifactExpression, " Failed to populate Artifact expression data")
+        assertEquals("SELF", expressionData1.artifactExpression?.modelableEntityName, " Failed to get expected modelableEntityName")
+        assertEquals("artifact-template", expressionData1.artifactExpression?.artifactName, " Failed to get expected artifactName")
+        assertEquals("location", expressionData1.artifactExpression?.location, " Failed to get expected location")
+        assertEquals(true, expressionData1.artifactExpression?.remove, " Failed to get expected remove")
+    }
 }
\ No newline at end of file
@@ -1,57 +1,57 @@
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- * Modifications Copyright © 2018 IBM.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.service\r
-\r
-import org.junit.Test\r
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException\r
-import kotlin.test.assertNotNull\r
-\r
-/**\r
- * BluePrintRepoFileServiceTest\r
- * @author Brinda Santh\r
- *\r
- */\r
-class BluePrintRepoFileServiceTest {\r
-\r
-    private val basePath = "load/model_type"\r
-    private val bluePrintRepoFileService = BluePrintRepoFileService(basePath)\r
-\r
-    @Test\r
-    fun testGetDataType() {\r
-        val dataType = bluePrintRepoFileService.getDataType("dt-v4-aggregate")\r
-        assertNotNull(dataType, "Failed to get DataType from repo")\r
-    }\r
-\r
-    @Test\r
-    fun testGetNodeType() {\r
-        val nodeType = bluePrintRepoFileService.getNodeType("component-resource-assignment")\r
-        assertNotNull(nodeType, "Failed to get NodeType from repo")\r
-    }\r
-\r
-    @Test\r
-    fun testGetArtifactType() {\r
-        val nodeType = bluePrintRepoFileService.getArtifactType("artifact-template-velocity")\r
-        assertNotNull(nodeType, "Failed to get ArtifactType from repo")\r
-    }\r
-\r
-    @Test(expected = BluePrintException::class)\r
-    fun testModelNotFound() {\r
-        val dataType = bluePrintRepoFileService.getDataType("dt-not-found")\r
-        assertNotNull(dataType, "Failed to get DataType from repo")\r
-    }\r
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
+ *
+ * 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.service
+
+import org.junit.Test
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
+import kotlin.test.assertNotNull
+
+/**
+ * BluePrintRepoFileServiceTest
+ * @author Brinda Santh
+ *
+ */
+class BluePrintRepoFileServiceTest {
+
+    private val basePath = "load/model_type"
+    private val bluePrintRepoFileService = BluePrintRepoFileService(basePath)
+
+    @Test
+    fun testGetDataType() {
+        val dataType = bluePrintRepoFileService.getDataType("dt-v4-aggregate")
+        assertNotNull(dataType, "Failed to get DataType from repo")
+    }
+
+    @Test
+    fun testGetNodeType() {
+        val nodeType = bluePrintRepoFileService.getNodeType("component-resource-assignment")
+        assertNotNull(nodeType, "Failed to get NodeType from repo")
+    }
+
+    @Test
+    fun testGetArtifactType() {
+        val nodeType = bluePrintRepoFileService.getArtifactType("artifact-template-velocity")
+        assertNotNull(nodeType, "Failed to get ArtifactType from repo")
+    }
+
+    @Test(expected = BluePrintException::class)
+    fun testModelNotFound() {
+        val dataType = bluePrintRepoFileService.getDataType("dt-not-found")
+        assertNotNull(dataType, "Failed to get DataType from repo")
+    }
 }
\ No newline at end of file
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- * Modifications Copyright © 2018 IBM.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.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.fasterxml.jackson.databind.node.NullNode\r
-import org.junit.Test\r
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants\r
-import org.onap.ccsdk.apps.controllerblueprints.core.asJsonPrimitive\r
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.BluePrintMetadataUtils\r
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.BluePrintRuntimeUtils\r
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils\r
-import kotlin.test.assertEquals\r
-import kotlin.test.assertNotNull\r
-\r
-/**\r
- *\r
- *\r
- * @author Brinda Santh\r
- */\r
-class BluePrintRuntimeServiceTest {\r
-    private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())\r
-\r
-    @Test\r
-    fun `test Resolve NodeTemplate Properties`() {\r
-        log.info("************************ testResolveNodeTemplateProperties **********************")\r
-\r
-        val bluePrintRuntimeService = getBluePrintRuntimeService()\r
-\r
-        val inputDataPath = "src/test/resources/data/default-context.json"\r
-\r
-        val inputNode: JsonNode = JacksonUtils.jsonNodeFromFile(inputDataPath)\r
-        bluePrintRuntimeService.assignInputs(inputNode)\r
-\r
-        val propContext: MutableMap<String, JsonNode> = bluePrintRuntimeService\r
-                .resolveNodeTemplateProperties("activate-process")\r
-\r
-        assertNotNull(propContext, "Failed to populate interface property values")\r
-    }\r
-\r
-    @Test\r
-    fun `test resolve NodeTemplate Capability Properties`() {\r
-        log.info("************************ testResolveNodeTemplateRequirementProperties **********************")\r
-        val bluePrintRuntimeService = getBluePrintRuntimeService()\r
-\r
-        val executionContext = bluePrintRuntimeService.getExecutionContext()\r
-\r
-        BluePrintRuntimeUtils.assignInputsFromClassPathFile(bluePrintRuntimeService.bluePrintContext(),\r
-                "data/default-context.json", executionContext)\r
-\r
-        val capProperties = bluePrintRuntimeService.resolveNodeTemplateCapabilityProperties("sample-netconf-device",\r
-                "netconf")\r
-        assertNotNull(capProperties, "Failed to populate capability property values")\r
-        assertEquals(capProperties["target-ip-address"], JacksonUtils.jsonNodeFromObject("localhost"), "Failed to populate parameter target-ip-address")\r
-        assertEquals(capProperties["port-number"], JacksonUtils.jsonNodeFromObject(830), "Failed to populate parameter port-number")\r
-    }\r
-\r
-    @Test\r
-    fun `test Resolve NodeTemplate Interface Operation Inputs`() {\r
-        log.info("************************ testResolveNodeTemplateInterfaceOperationInputs **********************")\r
-\r
-        val bluePrintRuntimeService = getBluePrintRuntimeService()\r
-\r
-        val executionContext = bluePrintRuntimeService.getExecutionContext()\r
-\r
-        BluePrintRuntimeUtils.assignInputsFromClassPathFile(bluePrintRuntimeService.bluePrintContext(),\r
-                "data/default-context.json", executionContext)\r
-\r
-        val inContext: MutableMap<String, JsonNode> = bluePrintRuntimeService\r
-                .resolveNodeTemplateInterfaceOperationInputs("resource-assignment",\r
-                        "ResourceAssignmentComponent", "process")\r
-\r
-        assertNotNull(inContext, "Failed to populate interface input property values")\r
-        assertEquals(inContext["action-name"], JacksonUtils.jsonNodeFromObject("sample-action"), "Failed to populate parameter action-name")\r
-        assertEquals(inContext["request-id"], JacksonUtils.jsonNodeFromObject("12345"), "Failed to populate parameter action-name")\r
-    }\r
-\r
-    @Test\r
-    fun `test Resolve NodeTemplate Interface Operation Outputs`() {\r
-        log.info("************************ testResolveNodeTemplateInterfaceOperationOutputs **********************")\r
-\r
-        val bluePrintRuntimeService = getBluePrintRuntimeService()\r
-\r
-        bluePrintRuntimeService.setNodeTemplateAttributeValue("resource-assignment", "assignment-params", NullNode.getInstance())\r
-\r
-        bluePrintRuntimeService.resolveNodeTemplateInterfaceOperationOutputs("resource-assignment",\r
-                "ResourceAssignmentComponent", "process")\r
-\r
-        val outputStatus = bluePrintRuntimeService.getNodeTemplateOperationOutputValue("resource-assignment",\r
-                "ResourceAssignmentComponent", "process", "status")\r
-        assertEquals("success".asJsonPrimitive(), outputStatus, "Failed to get operation property status")\r
-\r
-        val outputParams = bluePrintRuntimeService.getNodeTemplateOperationOutputValue("resource-assignment",\r
-                "ResourceAssignmentComponent", "process", "resource-assignment-params")\r
-        assertEquals(NullNode.getInstance(), outputParams, "Failed to get operation property resource-assignment-params")\r
-\r
-    }\r
-\r
-    @Test\r
-    fun `test NodeTemplate Context Property`() {\r
-        log.info("************************ testNodeTemplateContextProperty **********************")\r
-        val bluePrintRuntimeService = getBluePrintRuntimeService()\r
-\r
-        bluePrintRuntimeService.setNodeTemplateAttributeValue("resource-assignment-ra-component", "context1",\r
-                JacksonUtils.jsonNodeFromObject("context1-value"))\r
-        bluePrintRuntimeService.setNodeTemplateAttributeValue("resource-assignment-ra-component", "context2",\r
-                JacksonUtils.jsonNodeFromObject("context2-value"))\r
-\r
-        val keys = listOf("context1", "context2")\r
-\r
-        val jsonValueNode = bluePrintRuntimeService.getJsonForNodeTemplateAttributeProperties("resource-assignment-ra-component", keys)\r
-        assertNotNull(jsonValueNode, "Failed to get Json for Node Template Context Properties")\r
-        log.info("JSON Prepared Value Context {}", jsonValueNode)\r
-\r
-    }\r
-\r
-    private fun getBluePrintRuntimeService(): BluePrintRuntimeService<MutableMap<String, JsonNode>> {\r
-        val blueprintBasePath: String = ("./../model-catalog/blueprint-model/starter-blueprint/baseconfiguration")\r
-        val blueprintRuntime = BluePrintMetadataUtils.getBluePrintRuntime("1234", blueprintBasePath)\r
-        val checkBasePath = blueprintRuntime.get(BluePrintConstants.PROPERTY_BLUEPRINT_BASE_PATH)\r
-\r
-        assertEquals(blueprintBasePath.asJsonPrimitive(), checkBasePath, "Failed to get base path after runtime creation")\r
-\r
-        return blueprintRuntime\r
-    }\r
-\r
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
+ *
+ * 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.service
+
+import com.att.eelf.configuration.EELFLogger
+import com.att.eelf.configuration.EELFManager
+import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.databind.node.NullNode
+import org.junit.Test
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
+import org.onap.ccsdk.apps.controllerblueprints.core.asJsonPrimitive
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.BluePrintMetadataUtils
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.BluePrintRuntimeUtils
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+/**
+ *
+ *
+ * @author Brinda Santh
+ */
+class BluePrintRuntimeServiceTest {
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())
+
+    @Test
+    fun `test Resolve NodeTemplate Properties`() {
+        log.info("************************ testResolveNodeTemplateProperties **********************")
+
+        val bluePrintRuntimeService = getBluePrintRuntimeService()
+
+        val inputDataPath = "src/test/resources/data/default-context.json"
+
+        val inputNode: JsonNode = JacksonUtils.jsonNodeFromFile(inputDataPath)
+        bluePrintRuntimeService.assignInputs(inputNode)
+
+        val propContext: MutableMap<String, JsonNode> = bluePrintRuntimeService
+                .resolveNodeTemplateProperties("activate-process")
+
+        assertNotNull(propContext, "Failed to populate interface property values")
+    }
+
+    @Test
+    fun `test resolve NodeTemplate Capability Properties`() {
+        log.info("************************ testResolveNodeTemplateRequirementProperties **********************")
+        val bluePrintRuntimeService = getBluePrintRuntimeService()
+
+        val executionContext = bluePrintRuntimeService.getExecutionContext()
+
+        BluePrintRuntimeUtils.assignInputsFromClassPathFile(bluePrintRuntimeService.bluePrintContext(),
+                "data/default-context.json", executionContext)
+
+        val capProperties = bluePrintRuntimeService.resolveNodeTemplateCapabilityProperties("sample-netconf-device",
+                "netconf")
+        assertNotNull(capProperties, "Failed to populate capability property values")
+        assertEquals(capProperties["target-ip-address"], JacksonUtils.jsonNodeFromObject("localhost"), "Failed to populate parameter target-ip-address")
+        assertEquals(capProperties["port-number"], JacksonUtils.jsonNodeFromObject(830), "Failed to populate parameter port-number")
+    }
+
+    @Test
+    fun `test Resolve NodeTemplate Interface Operation Inputs`() {
+        log.info("************************ testResolveNodeTemplateInterfaceOperationInputs **********************")
+
+        val bluePrintRuntimeService = getBluePrintRuntimeService()
+
+        val executionContext = bluePrintRuntimeService.getExecutionContext()
+
+        BluePrintRuntimeUtils.assignInputsFromClassPathFile(bluePrintRuntimeService.bluePrintContext(),
+                "data/default-context.json", executionContext)
+
+        val inContext: MutableMap<String, JsonNode> = bluePrintRuntimeService
+                .resolveNodeTemplateInterfaceOperationInputs("resource-assignment",
+                        "ResourceAssignmentComponent", "process")
+
+        assertNotNull(inContext, "Failed to populate interface input property values")
+        assertEquals(inContext["action-name"], JacksonUtils.jsonNodeFromObject("sample-action"), "Failed to populate parameter action-name")
+        assertEquals(inContext["request-id"], JacksonUtils.jsonNodeFromObject("12345"), "Failed to populate parameter action-name")
+    }
+
+    @Test
+    fun `test Resolve NodeTemplate Interface Operation Outputs`() {
+        log.info("************************ testResolveNodeTemplateInterfaceOperationOutputs **********************")
+
+        val bluePrintRuntimeService = getBluePrintRuntimeService()
+
+        bluePrintRuntimeService.setNodeTemplateAttributeValue("resource-assignment", "assignment-params", NullNode.getInstance())
+
+        bluePrintRuntimeService.resolveNodeTemplateInterfaceOperationOutputs("resource-assignment",
+                "ResourceAssignmentComponent", "process")
+
+        val outputStatus = bluePrintRuntimeService.getNodeTemplateOperationOutputValue("resource-assignment",
+                "ResourceAssignmentComponent", "process", "status")
+        assertEquals("success".asJsonPrimitive(), outputStatus, "Failed to get operation property status")
+
+        val outputParams = bluePrintRuntimeService.getNodeTemplateOperationOutputValue("resource-assignment",
+                "ResourceAssignmentComponent", "process", "resource-assignment-params")
+        assertEquals(NullNode.getInstance(), outputParams, "Failed to get operation property resource-assignment-params")
+
+    }
+
+    @Test
+    fun `test NodeTemplate Context Property`() {
+        log.info("************************ testNodeTemplateContextProperty **********************")
+        val bluePrintRuntimeService = getBluePrintRuntimeService()
+
+        bluePrintRuntimeService.setNodeTemplateAttributeValue("resource-assignment-ra-component", "context1",
+                JacksonUtils.jsonNodeFromObject("context1-value"))
+        bluePrintRuntimeService.setNodeTemplateAttributeValue("resource-assignment-ra-component", "context2",
+                JacksonUtils.jsonNodeFromObject("context2-value"))
+
+        val keys = listOf("context1", "context2")
+
+        val jsonValueNode = bluePrintRuntimeService.getJsonForNodeTemplateAttributeProperties("resource-assignment-ra-component", keys)
+        assertNotNull(jsonValueNode, "Failed to get Json for Node Template Context Properties")
+        log.info("JSON Prepared Value Context {}", jsonValueNode)
+
+    }
+
+    private fun getBluePrintRuntimeService(): BluePrintRuntimeService<MutableMap<String, JsonNode>> {
+        val blueprintBasePath: String = ("./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration")
+        val blueprintRuntime = BluePrintMetadataUtils.getBluePrintRuntime("1234", blueprintBasePath)
+        val checkBasePath = blueprintRuntime.get(BluePrintConstants.PROPERTY_BLUEPRINT_BASE_PATH)
+
+        assertEquals(blueprintBasePath.asJsonPrimitive(), checkBasePath, "Failed to get base path after runtime creation")
+
+        return blueprintRuntime
+    }
+
 }
\ No newline at end of file
@@ -1,49 +1,50 @@
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.service\r
-\r
-import com.att.eelf.configuration.EELFLogger\r
-import com.att.eelf.configuration.EELFManager\r
-import org.junit.Before\r
-import org.junit.Test\r
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.BluePrintMetadataUtils\r
-\r
-/**\r
- *\r
- *\r
- * @author Brinda Santh\r
- */\r
-class BluePrintValidatorDefaultServiceTest {\r
-    private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())\r
-\r
-    @Before\r
-    fun setUp(): Unit {\r
-\r
-    }\r
-\r
-    @Test\r
-    fun testValidateBluePrint() {\r
-\r
-        val blueprintBasePath: String = ("./../model-catalog/blueprint-model/starter-blueprint/baseconfiguration")\r
-        val bluePrintContext = BluePrintMetadataUtils.getBluePrintContext(blueprintBasePath)\r
-        val properties: MutableMap<String, Any> = hashMapOf()\r
-\r
-        val validatorService = BluePrintValidatorDefaultService()\r
-        validatorService.validateBlueprint(bluePrintContext.serviceTemplate, properties)\r
-        log.info("Validation Message {}", properties)\r
-    }\r
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
+ *
+ * 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.service
+
+import com.att.eelf.configuration.EELFLogger
+import com.att.eelf.configuration.EELFManager
+import org.junit.Before
+import org.junit.Test
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.BluePrintMetadataUtils
+
+/**
+ *
+ *
+ * @author Brinda Santh
+ */
+class BluePrintValidatorDefaultServiceTest {
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())
+
+    @Before
+    fun setUp(): Unit {
+
+    }
+
+    @Test
+    fun testValidateBluePrint() {
+
+        val blueprintBasePath: String = ("./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration")
+        val bluePrintContext = BluePrintMetadataUtils.getBluePrintContext(blueprintBasePath)
+        val properties: MutableMap<String, Any> = hashMapOf()
+
+        val validatorService = BluePrintValidatorDefaultService()
+        validatorService.validateBlueprint(bluePrintContext.serviceTemplate, properties)
+        log.info("Validation Message {}", properties)
+    }
 }
\ No newline at end of file
@@ -1,5 +1,6 @@
 /*
  * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +35,7 @@ class BluePrintFileUtilsTest {
 
     @Test
     fun testBlueprintCopy() = runBlocking {
-        val sourcePath: String = "./../model-catalog/blueprint-model/starter-blueprint/baseconfiguration"
+        val sourcePath: String = "./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration"
 
         val targetPath: String = Paths.get("target").toUri().toURL().path.plus("/bp-copy-test")
 
@@ -1,40 +1,41 @@
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.utils\r
-\r
-\r
-import org.junit.Test\r
-import org.onap.ccsdk.apps.controllerblueprints.core.data.ToscaMetaData\r
-import kotlin.test.assertNotNull\r
-\r
-class BluePrintMetadataUtilsTest {\r
-    \r
-    @Test\r
-    fun testToscaMetaData(){\r
-\r
-        val basePath : String = "./../model-catalog/blueprint-model/starter-blueprint/baseconfiguration"\r
-\r
-        val toscaMetaData : ToscaMetaData =  BluePrintMetadataUtils.toscaMetaData(basePath)\r
-        assertNotNull(toscaMetaData, "Missing Tosca Definition Object")\r
-        assertNotNull(toscaMetaData.toscaMetaFileVersion, "Missing Tosca Metadata Version")\r
-        assertNotNull(toscaMetaData.csarVersion, "Missing CSAR version")\r
-        assertNotNull(toscaMetaData.createdBy, "Missing Created by")\r
-        assertNotNull(toscaMetaData.entityDefinitions, "Missing Tosca Entity Definition")\r
-        assertNotNull(toscaMetaData.templateTags, "Missing Template Tags")\r
-\r
-    }\r
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
+ *
+ * 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 org.junit.Test
+import org.onap.ccsdk.apps.controllerblueprints.core.data.ToscaMetaData
+import kotlin.test.assertNotNull
+
+class BluePrintMetadataUtilsTest {
+    
+    @Test
+    fun testToscaMetaData(){
+
+        val basePath : String = "./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration"
+
+        val toscaMetaData : ToscaMetaData =  BluePrintMetadataUtils.toscaMetaData(basePath)
+        assertNotNull(toscaMetaData, "Missing Tosca Definition Object")
+        assertNotNull(toscaMetaData.toscaMetaFileVersion, "Missing Tosca Metadata Version")
+        assertNotNull(toscaMetaData.csarVersion, "Missing CSAR version")
+        assertNotNull(toscaMetaData.createdBy, "Missing Created by")
+        assertNotNull(toscaMetaData.entityDefinitions, "Missing Tosca Entity Definition")
+        assertNotNull(toscaMetaData.templateTags, "Missing Template Tags")
+
+    }
 }
\ No newline at end of file
@@ -1,78 +1,78 @@
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- * Modifications Copyright © 2018 IBM.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.utils\r
-\r
-import com.att.eelf.configuration.EELFLogger\r
-import com.att.eelf.configuration.EELFManager\r
-import org.junit.Test\r
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants\r
-import kotlin.test.assertNotNull\r
-import kotlin.test.assertTrue\r
-\r
-/**\r
- * JacksonUtilsTest\r
- * @author Brinda Santh\r
- * ${DATA}\r
- */\r
-class JacksonUtilsTest {\r
-\r
-    private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())\r
-\r
-    @Test\r
-    fun testJsonNodeFromClassPathFile() {\r
-        val filePath = "data/default-context.json"\r
-        JacksonUtils.jsonNodeFromClassPathFile(filePath)\r
-    }\r
-\r
-    @Test\r
-    fun testJsonNodeFromFile() {\r
-        val filePath = "src/test/resources/data/default-context.json"\r
-        JacksonUtils.jsonNodeFromFile(filePath)\r
-    }\r
-\r
-    @Test\r
-    fun testGetListFromJson() {\r
-        val content = "[\"good\",\"boy\" ]"\r
-        val nodeType = JacksonUtils.getListFromJson(content, String::class.java)\r
-        assertNotNull(nodeType, "Failed to get String array from content")\r
-    }\r
-\r
-\r
-    @Test\r
-    fun testJsonValue() {\r
-        val filePath = "data/alltype-data.json"\r
-        val rootJson = JacksonUtils.jsonNodeFromClassPathFile(filePath)\r
-        assertNotNull(rootJson, "Failed to get all type data json node")\r
-        val intValue = rootJson.get("intValue")\r
-        assertTrue(JacksonUtils.checkJsonNodeValueOfType(BluePrintConstants.DATA_TYPE_INTEGER, intValue), "Failed to get as int value")\r
-        val floatValue = rootJson.get("floatValue")\r
-        assertTrue(JacksonUtils.checkJsonNodeValueOfType(BluePrintConstants.DATA_TYPE_FLOAT, floatValue), "Failed to get as float value")\r
-        val stringValue = rootJson.get("stringValue")\r
-        assertTrue(JacksonUtils.checkJsonNodeValueOfType(BluePrintConstants.DATA_TYPE_STRING, stringValue), "Failed to get as string value")\r
-        val booleanValue = rootJson.get("booleanValue")\r
-        assertTrue(JacksonUtils.checkJsonNodeValueOfType(BluePrintConstants.DATA_TYPE_BOOLEAN, booleanValue), "Failed to get as boolean value")\r
-        val arrayStringValue = rootJson.get("arrayStringValue")\r
-        assertTrue(JacksonUtils.checkJsonNodeValueOfType(BluePrintConstants.DATA_TYPE_LIST, arrayStringValue), "Failed to get as List value")\r
-        val mapValue = rootJson.get("mapValue")\r
-        assertTrue(JacksonUtils.checkJsonNodeValueOfType(BluePrintConstants.DATA_TYPE_MAP, mapValue), "Failed to get as Map value")\r
-\r
-        assertTrue(!JacksonUtils.checkJsonNodeValueOfType(BluePrintConstants.DATA_TYPE_LIST, stringValue), "Negative type failed")\r
-\r
-\r
-    }\r
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
+ *
+ * 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 org.junit.Test
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+
+/**
+ * JacksonUtilsTest
+ * @author Brinda Santh
+ * ${DATA}
+ */
+class JacksonUtilsTest {
+
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())
+
+    @Test
+    fun testJsonNodeFromClassPathFile() {
+        val filePath = "data/default-context.json"
+        JacksonUtils.jsonNodeFromClassPathFile(filePath)
+    }
+
+    @Test
+    fun testJsonNodeFromFile() {
+        val filePath = "src/test/resources/data/default-context.json"
+        JacksonUtils.jsonNodeFromFile(filePath)
+    }
+
+    @Test
+    fun testGetListFromJson() {
+        val content = "[\"good\",\"boy\" ]"
+        val nodeType = JacksonUtils.getListFromJson(content, String::class.java)
+        assertNotNull(nodeType, "Failed to get String array from content")
+    }
+
+
+    @Test
+    fun testJsonValue() {
+        val filePath = "data/alltype-data.json"
+        val rootJson = JacksonUtils.jsonNodeFromClassPathFile(filePath)
+        assertNotNull(rootJson, "Failed to get all type data json node")
+        val intValue = rootJson.get("intValue")
+        assertTrue(JacksonUtils.checkJsonNodeValueOfType(BluePrintConstants.DATA_TYPE_INTEGER, intValue), "Failed to get as int value")
+        val floatValue = rootJson.get("floatValue")
+        assertTrue(JacksonUtils.checkJsonNodeValueOfType(BluePrintConstants.DATA_TYPE_FLOAT, floatValue), "Failed to get as float value")
+        val stringValue = rootJson.get("stringValue")
+        assertTrue(JacksonUtils.checkJsonNodeValueOfType(BluePrintConstants.DATA_TYPE_STRING, stringValue), "Failed to get as string value")
+        val booleanValue = rootJson.get("booleanValue")
+        assertTrue(JacksonUtils.checkJsonNodeValueOfType(BluePrintConstants.DATA_TYPE_BOOLEAN, booleanValue), "Failed to get as boolean value")
+        val arrayStringValue = rootJson.get("arrayStringValue")
+        assertTrue(JacksonUtils.checkJsonNodeValueOfType(BluePrintConstants.DATA_TYPE_LIST, arrayStringValue), "Failed to get as List value")
+        val mapValue = rootJson.get("mapValue")
+        assertTrue(JacksonUtils.checkJsonNodeValueOfType(BluePrintConstants.DATA_TYPE_MAP, mapValue), "Failed to get as Map value")
+
+        assertTrue(!JacksonUtils.checkJsonNodeValueOfType(BluePrintConstants.DATA_TYPE_LIST, stringValue), "Negative type failed")
+
+
+    }
 }
\ No newline at end of file
@@ -1,36 +1,36 @@
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.core.utils\r
-\r
-import org.junit.Test\r
-\r
-class TopologicalSortingUtilsTest {\r
-    \r
-    @Test\r
-    fun testSorting(): Unit {\r
-        val graph: TopologicalSortingUtils<String> = TopologicalSortingUtils()\r
-        graph.add("bundle-id", "bundle-mac")\r
-        graph.add("bundle-id", "bundle-ip")\r
-        graph.add("bundle-mac", "bundle-ip")\r
-        graph.add("bundle-ip", "bundle-mac")\r
-\r
-        println("The current graph: " + graph)\r
-        println("In-degrees: " + graph.inDegree())\r
-        println("Out-degrees: " + graph.outDegree())\r
-        println("A topological sort of the vertices: " + graph.topSort())\r
-    }\r
+/*
+ * 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 org.junit.Test
+
+class TopologicalSortingUtilsTest {
+    
+    @Test
+    fun testSorting(): Unit {
+        val graph: TopologicalSortingUtils<String> = TopologicalSortingUtils()
+        graph.add("bundle-id", "bundle-mac")
+        graph.add("bundle-id", "bundle-ip")
+        graph.add("bundle-mac", "bundle-ip")
+        graph.add("bundle-ip", "bundle-mac")
+
+        println("The current graph: " + graph)
+        println("In-degrees: " + graph.inDegree())
+        println("Out-degrees: " + graph.outDegree())
+        println("A topological sort of the vertices: " + graph.topSort())
+    }
 }
\ No newline at end of file
@@ -1,5 +1,6 @@
 /*
  * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +19,7 @@ package org.onap.ccsdk.apps.controllerblueprints.core.validation
 
 import io.mockk.every
 import io.mockk.mockk
-import org.junit.Ignore
 import org.junit.Test
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
 import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintError
 import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeTemplate
 import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeType
@@ -35,7 +34,7 @@ import kotlin.test.assertTrue
 
 class BluePrintValidatorServiceImplTest {
 
-    private val blueprintBasePath: String = ("./../model-catalog/blueprint-model/starter-blueprint/baseconfiguration")
+    private val blueprintBasePath: String = ("./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration")
     private val bluePrintRuntime = BluePrintMetadataUtils.getBluePrintRuntime("1234", blueprintBasePath)
     private val mockBluePrintTypeValidatorService = MockBluePrintTypeValidatorService()
     private val defaultBluePrintValidatorService = BluePrintValidatorServiceImpl(mockBluePrintTypeValidatorService)
-{\r
-       "metadata": {\r
-               "template_author": "bs2796",\r
-               "vendor": "Juniper",\r
-               "os": "XXX",\r
-               "service-type": "AVPN",\r
-               "vnf-type": "VRR",\r
-               "action": "Base Configuration",\r
-               "sub-action": "Generate Configuration",\r
-               "template_name": "VRR-baseconfiguration",\r
-               "template_version": "1.0.0"\r
-       },\r
-       "topology_template": {\r
-               "inputs": {\r
-                       "service-instance-id": {\r
-                               "required": true,\r
-                               "type": "string"\r
-                       },\r
-                       "vnf-id": {\r
-                               "required": true,\r
-                               "type": "string"\r
-                       },\r
-                       "service": {\r
-                               "required": true,\r
-                               "type": "string"\r
-                       },\r
-                       "region": {\r
-                               "required": true,\r
-                               "type": "string"\r
-                       },\r
-                       "bundle-id": {\r
-                               "required": true,\r
-                               "type": "string"\r
-                       },\r
-                       "bundle-mac": {\r
-                               "required": true,\r
-                               "type": "string"\r
-                       }\r
-               },\r
-               "node_templates": {\r
-                       "generate-configuration": {\r
-                               "type": "mock-component-generateConfig",\r
-                               "interfaces": {\r
-                                       "org-onap-ccsdk-config-params-service-MockComponentNode": {\r
-                                               "operations": {\r
-                                                       "process": {\r
-                                                               "inputs": {\r
-                                                                       "entity-type": "vnf-type",\r
-                                                                       "template-content": "sample-template",\r
-                                                                       "entity-id": { "get_input" : "vnf-id" }\r
-                                                               },\r
-                                                               "outputs": {\r
-                                                                       "mergedData": "merged Data",\r
-                                                                       "status": "status"\r
-                                                               }\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               }\r
-                       }\r
-               }\r
-       },\r
-       "node_types": {\r
-               "mock-component-generateConfig": {\r
-                       "interfaces": {\r
-                               "org-onap-ccsdk-config-params-service-MockComponentNode": {\r
-                                       "operations": {\r
-                                               "process": {\r
-                                                       "inputs": {\r
-                                                               "entity-type": {\r
-                                                                       "required": false,\r
-                                                                       "type": "string"\r
-                                                               },\r
-                                                               "template-content": {\r
-                                                                       "required": false,\r
-                                                                       "type": "string"\r
-                                                               },\r
-                                                               "entity-id": {\r
-                                                                       "required": true,\r
-                                                                       "type": "string"\r
-                                                               }\r
-                                                       },\r
-                                                       "outputs": {\r
-                                                               "generated-config": {\r
-                                                                       "required": true,\r
-                                                                       "type": "string"\r
-                                                               },\r
-                                                               "status": {\r
-                                                                       "required": true,\r
-                                                                       "type": "string"\r
-                                                               }\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               }\r
-                       },\r
-                       "derived_from": "tosca.nodes.Component"\r
-               }\r
-       }\r
-}\r
+{
+       "metadata": {
+               "template_author": "bs2796",
+               "vendor": "Juniper",
+               "os": "XXX",
+               "service-type": "AVPN",
+               "vnf-type": "VRR",
+               "action": "Base Configuration",
+               "sub-action": "Generate Configuration",
+               "template_name": "VRR-baseconfiguration",
+               "template_version": "1.0.0"
+       },
+       "topology_template": {
+               "inputs": {
+                       "service-instance-id": {
+                               "required": true,
+                               "type": "string"
+                       },
+                       "vnf-id": {
+                               "required": true,
+                               "type": "string"
+                       },
+                       "service": {
+                               "required": true,
+                               "type": "string"
+                       },
+                       "region": {
+                               "required": true,
+                               "type": "string"
+                       },
+                       "bundle-id": {
+                               "required": true,
+                               "type": "string"
+                       },
+                       "bundle-mac": {
+                               "required": true,
+                               "type": "string"
+                       }
+               },
+               "node_templates": {
+                       "generate-configuration": {
+                               "type": "mock-component-generateConfig",
+                               "interfaces": {
+                                       "org-onap-ccsdk-config-params-service-MockComponentNode": {
+                                               "operations": {
+                                                       "process": {
+                                                               "inputs": {
+                                                                       "entity-type": "vnf-type",
+                                                                       "template-content": "sample-template",
+                                                                       "entity-id": { "get_input" : "vnf-id" }
+                                                               },
+                                                               "outputs": {
+                                                                       "mergedData": "merged Data",
+                                                                       "status": "status"
+                                                               }
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+               }
+       },
+       "node_types": {
+               "mock-component-generateConfig": {
+                       "interfaces": {
+                               "org-onap-ccsdk-config-params-service-MockComponentNode": {
+                                       "operations": {
+                                               "process": {
+                                                       "inputs": {
+                                                               "entity-type": {
+                                                                       "required": false,
+                                                                       "type": "string"
+                                                               },
+                                                               "template-content": {
+                                                                       "required": false,
+                                                                       "type": "string"
+                                                               },
+                                                               "entity-id": {
+                                                                       "required": true,
+                                                                       "type": "string"
+                                                               }
+                                                       },
+                                                       "outputs": {
+                                                               "generated-config": {
+                                                                       "required": true,
+                                                                       "type": "string"
+                                                               },
+                                                               "status": {
+                                                                       "required": true,
+                                                                       "type": "string"
+                                                               }
+                                                       }
+                                               }
+                                       }
+                               }
+                       },
+                       "derived_from": "tosca.nodes.Component"
+               }
+       }
+}
@@ -1,7 +1,7 @@
-{\r
-  "request-id" : "12345",\r
-  "hostname" : "localhost",\r
-  "template_name": "baseconfiguration",\r
-  "template_version": "1.0.0",\r
-  "action-name" : "sample-action"\r
+{
+  "request-id" : "12345",
+  "hostname" : "localhost",
+  "template_name": "baseconfiguration",
+  "template_version": "1.0.0",
+  "action-name" : "sample-action"
 }
\ No newline at end of file
-{\r
-       "type": "object",\r
-       "properties": {\r
-               "resource-path": {\r
-                       "type": "string",\r
-                       "required": true\r
-               },\r
-               "description": {\r
-                       "type": "string"\r
-               },\r
-               "updated-by": {\r
-                       "type": "string"\r
-               },\r
-               "data-type": {\r
-                       "type": "string",\r
-                       "required": true\r
-               },\r
-               "source": {\r
-                       "type": "object",\r
-                       "required": true,\r
-                       "properties": {\r
-                               "input": {\r
-                                       "type": "object",\r
-                                       "properties": {\r
-                                               "key": {\r
-                                                       "type": "string"\r
-                                               }\r
-                                       }\r
-                               },\r
-                               "component": {\r
-                                       "type": "object",\r
-                                       "properties": {\r
-                                               "name": {\r
-                                                       "type": "string",\r
-                                                       "required": true\r
-                                               },\r
-                                               "input-key-mapping": {\r
-                                                       "type": "object",\r
-                                                       "additionalProperties": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               },\r
-                                               "output-key-mapping": {\r
-                                                       "type": "object",\r
-                                                       "additionalProperties": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               },\r
-                               "default": {\r
-                                       "type": "any"\r
-                               },\r
-                               "aai": {\r
-                                       "type": "any"\r
-                               },\r
-                               "primary-config-data": {\r
-                                       "type": "object",\r
-                                       "properties": {\r
-                                               "path": {\r
-                                                       "type": "string",\r
-                                                       "required": true\r
-                                               },\r
-                                               "url-path": {\r
-                                                       "type": "string",\r
-                                                       "required": true\r
-                                               },\r
-                                               "input-key-mapping": {\r
-                                                       "type": "object",\r
-                                                       "additionalProperties": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               },\r
-                                               "type": {\r
-                                                       "type": "string",\r
-                                                       "required": true\r
-                                               },\r
-                                               "output-key-mapping": {\r
-                                                       "type": "object",\r
-                                                       "additionalProperties": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               },\r
-                                               "base": {\r
-                                                       "type": "string",\r
-                                                       "required": true\r
-                                               }\r
-                                       }\r
-                               },\r
-                               "network-resource-discovery": {\r
-                                       "type": "object",\r
-                                       "properties": {\r
-                                               "input-key-mapping": {\r
-                                                       "type": "object",\r
-                                                       "additionalProperties": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               },\r
-                                               "output-key-mapping": {\r
-                                                       "type": "object",\r
-                                                       "additionalProperties": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               },\r
-                               "primary-db": {\r
-                                       "type": "object",\r
-                                       "properties": {\r
-                                               "query": {\r
-                                                       "type": "string",\r
-                                                       "required": true\r
-                                               },\r
-                                               "input-key-mapping": {\r
-                                                       "type": "object",\r
-                                                       "additionalProperties": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               },\r
-                                               "type": {\r
-                                                       "type": "string",\r
-                                                       "required": true\r
-                                               },\r
-                                               "output-key-mapping": {\r
-                                                       "type": "object",\r
-                                                       "additionalProperties": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               },\r
-                                               "base": {\r
-                                                       "type": "string",\r
-                                                       "required": true\r
-                                               }\r
-                                       }\r
-                               },\r
-                               "policy": {\r
-                                       "type": "object",\r
-                                       "properties": {\r
-                                               "input-key-mapping": {\r
-                                                       "type": "object",\r
-                                                       "additionalProperties": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               },\r
-                                               "output-key-mapping": {\r
-                                                       "type": "object",\r
-                                                       "additionalProperties": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               }\r
-                       }\r
-               },\r
-               "candidate-dependency": {\r
-                       "type": "object",\r
-                       "properties": {\r
-                               "input": {\r
-                                       "type": "object",\r
-                                       "properties": {\r
-                                               "names": {\r
-                                                       "type": "array",\r
-                                                       "items": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               },\r
-                               "component": {\r
-                                       "type": "object",\r
-                                       "properties": {\r
-                                               "names": {\r
-                                                       "type": "array",\r
-                                                       "items": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               },\r
-                               "aai": {\r
-                                       "type": "object",\r
-                                       "properties": {\r
-                                               "names": {\r
-                                                       "type": "array",\r
-                                                       "items": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               },\r
-                               "primary-config-data": {\r
-                                       "type": "object",\r
-                                       "properties": {\r
-                                               "names": {\r
-                                                       "type": "array",\r
-                                                       "items": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               },\r
-                               "network-resource-discovery": {\r
-                                       "type": "object",\r
-                                       "properties": {\r
-                                               "names": {\r
-                                                       "type": "array",\r
-                                                       "items": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               },\r
-                               "primary-db": {\r
-                                       "type": "object",\r
-                                       "properties": {\r
-                                               "names": {\r
-                                                       "type": "array",\r
-                                                       "items": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               },\r
-                               "policy": {\r
-                                       "type": "object",\r
-                                       "properties": {\r
-                                               "names": {\r
-                                                       "type": "array",\r
-                                                       "items": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               }\r
-                       }\r
-               },\r
-               "tags": {\r
-                       "type": "string"\r
-               },\r
-               "default": {\r
-                       "type": "any"\r
-               },\r
-               "name": {\r
-                       "type": "string",\r
-                       "required": true\r
-               },\r
-               "valid-values": {\r
-                       "type": "string"\r
-               },\r
-               "resource-type": {\r
-                       "type": "string",\r
-                       "required": true\r
-               },\r
-               "sample-value": {\r
-                       "type": "string"\r
-               },\r
-               "entry-schema": {\r
-                       "type": "string"\r
-               }\r
-       }\r
-}\r
+{
+       "type": "object",
+       "properties": {
+               "resource-path": {
+                       "type": "string",
+                       "required": true
+               },
+               "description": {
+                       "type": "string"
+               },
+               "updated-by": {
+                       "type": "string"
+               },
+               "data-type": {
+                       "type": "string",
+                       "required": true
+               },
+               "source": {
+                       "type": "object",
+                       "required": true,
+                       "properties": {
+                               "input": {
+                                       "type": "object",
+                                       "properties": {
+                                               "key": {
+                                                       "type": "string"
+                                               }
+                                       }
+                               },
+                               "component": {
+                                       "type": "object",
+                                       "properties": {
+                                               "name": {
+                                                       "type": "string",
+                                                       "required": true
+                                               },
+                                               "input-key-mapping": {
+                                                       "type": "object",
+                                                       "additionalProperties": {
+                                                               "type": "string"
+                                                       }
+                                               },
+                                               "output-key-mapping": {
+                                                       "type": "object",
+                                                       "additionalProperties": {
+                                                               "type": "string"
+                                                       }
+                                               }
+                                       }
+                               },
+                               "default": {
+                                       "type": "any"
+                               },
+                               "aai": {
+                                       "type": "any"
+                               },
+                               "primary-config-data": {
+                                       "type": "object",
+                                       "properties": {
+                                               "path": {
+                                                       "type": "string",
+                                                       "required": true
+                                               },
+                                               "url-path": {
+                                                       "type": "string",
+                                                       "required": true
+                                               },
+                                               "input-key-mapping": {
+                                                       "type": "object",
+                                                       "additionalProperties": {
+                                                               "type": "string"
+                                                       }
+                                               },
+                                               "type": {
+                                                       "type": "string",
+                                                       "required": true
+                                               },
+                                               "output-key-mapping": {
+                                                       "type": "object",
+                                                       "additionalProperties": {
+                                                               "type": "string"
+                                                       }
+                                               },
+                                               "base": {
+                                                       "type": "string",
+                                                       "required": true
+                                               }
+                                       }
+                               },
+                               "network-resource-discovery": {
+                                       "type": "object",
+                                       "properties": {
+                                               "input-key-mapping": {
+                                                       "type": "object",
+                                                       "additionalProperties": {
+                                                               "type": "string"
+                                                       }
+                                               },
+                                               "output-key-mapping": {
+                                                       "type": "object",
+                                                       "additionalProperties": {
+                                                               "type": "string"
+                                                       }
+                                               }
+                                       }
+                               },
+                               "primary-db": {
+                                       "type": "object",
+                                       "properties": {
+                                               "query": {
+                                                       "type": "string",
+                                                       "required": true
+                                               },
+                                               "input-key-mapping": {
+                                                       "type": "object",
+                                                       "additionalProperties": {
+                                                               "type": "string"
+                                                       }
+                                               },
+                                               "type": {
+                                                       "type": "string",
+                                                       "required": true
+                                               },
+                                               "output-key-mapping": {
+                                                       "type": "object",
+                                                       "additionalProperties": {
+                                                               "type": "string"
+                                                       }
+                                               },
+                                               "base": {
+                                                       "type": "string",
+                                                       "required": true
+                                               }
+                                       }
+                               },
+                               "policy": {
+                                       "type": "object",
+                                       "properties": {
+                                               "input-key-mapping": {
+                                                       "type": "object",
+                                                       "additionalProperties": {
+                                                               "type": "string"
+                                                       }
+                                               },
+                                               "output-key-mapping": {
+                                                       "type": "object",
+                                                       "additionalProperties": {
+                                                               "type": "string"
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+               },
+               "candidate-dependency": {
+                       "type": "object",
+                       "properties": {
+                               "input": {
+                                       "type": "object",
+                                       "properties": {
+                                               "names": {
+                                                       "type": "array",
+                                                       "items": {
+                                                               "type": "string"
+                                                       }
+                                               }
+                                       }
+                               },
+                               "component": {
+                                       "type": "object",
+                                       "properties": {
+                                               "names": {
+                                                       "type": "array",
+                                                       "items": {
+                                                               "type": "string"
+                                                       }
+                                               }
+                                       }
+                               },
+                               "aai": {
+                                       "type": "object",
+                                       "properties": {
+                                               "names": {
+                                                       "type": "array",
+                                                       "items": {
+                                                               "type": "string"
+                                                       }
+                                               }
+                                       }
+                               },
+                               "primary-config-data": {
+                                       "type": "object",
+                                       "properties": {
+                                               "names": {
+                                                       "type": "array",
+                                                       "items": {
+                                                               "type": "string"
+                                                       }
+                                               }
+                                       }
+                               },
+                               "network-resource-discovery": {
+                                       "type": "object",
+                                       "properties": {
+                                               "names": {
+                                                       "type": "array",
+                                                       "items": {
+                                                               "type": "string"
+                                                       }
+                                               }
+                                       }
+                               },
+                               "primary-db": {
+                                       "type": "object",
+                                       "properties": {
+                                               "names": {
+                                                       "type": "array",
+                                                       "items": {
+                                                               "type": "string"
+                                                       }
+                                               }
+                                       }
+                               },
+                               "policy": {
+                                       "type": "object",
+                                       "properties": {
+                                               "names": {
+                                                       "type": "array",
+                                                       "items": {
+                                                               "type": "string"
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+               },
+               "tags": {
+                       "type": "string"
+               },
+               "default": {
+                       "type": "any"
+               },
+               "name": {
+                       "type": "string",
+                       "required": true
+               },
+               "valid-values": {
+                       "type": "string"
+               },
+               "resource-type": {
+                       "type": "string",
+                       "required": true
+               },
+               "sample-value": {
+                       "type": "string"
+               },
+               "entry-schema": {
+                       "type": "string"
+               }
+       }
+}
@@ -1,36 +1,36 @@
-{\r
-  "type": "sdnc-component-getResourceAssignment",\r
-  "interfaces": {\r
-    "ResourceAssignmentService": {\r
-      "operations": {\r
-        "getResourceAssignment": {\r
-          "inputs": {\r
-            "assignment-mappings": [\r
-              {\r
-                "name": "service-name",\r
-                "mapping-field": "service",\r
-                "mapping-category": "SDN",\r
-                "required": true\r
-              },\r
-              {\r
-                "name": "region-name",\r
-                "mapping-field": "region",\r
-                "mapping-category": "SDN",\r
-                "required": true\r
-              }\r
-            ],\r
-            "pre-data": {\r
-              "get_input": "get-resource-assignment.config-params"\r
-            },\r
-            "prifix": "get-resource-assignment"\r
-          },\r
-          "outputs": {\r
-            "resource-assignment-status": "success",\r
-            "resource-assignment-params": "{ \"set_value\" : \"get-resource-assignment.config-params"\r
-          }\r
-        }\r
-      }\r
-    }\r
-  }\r
-}\r
-\r
+{
+  "type": "sdnc-component-getResourceAssignment",
+  "interfaces": {
+    "ResourceAssignmentService": {
+      "operations": {
+        "getResourceAssignment": {
+          "inputs": {
+            "assignment-mappings": [
+              {
+                "name": "service-name",
+                "mapping-field": "service",
+                "mapping-category": "SDN",
+                "required": true
+              },
+              {
+                "name": "region-name",
+                "mapping-field": "region",
+                "mapping-category": "SDN",
+                "required": true
+              }
+            ],
+            "pre-data": {
+              "get_input": "get-resource-assignment.config-params"
+            },
+            "prifix": "get-resource-assignment"
+          },
+          "outputs": {
+            "resource-assignment-status": "success",
+            "resource-assignment-params": "{ \"set_value\" : \"get-resource-assignment.config-params"
+          }
+        }
+      }
+    }
+  }
+}
+
@@ -1,16 +1,16 @@
-{\r
-       "default": { "get_input" : "loopback-default" },\r
-       "domain": "ethernet",\r
-       "criteria": [\r
-               {\r
-                       "value": "attga301me1",\r
-                       "type": "complex",\r
-                       "nodeString": "layer3-service-list[].service-data.l3sdn-vnf-fields.vnf-name"\r
-               },\r
-               {\r
-                       "value": { "get_input" : "host-ip-address" },\r
-                       "type": "simple",\r
-                       "nodeString": "layer3-service-list[].service-data.l3sdn-vnf-fields.vnf-name"\r
-               }\r
-       ]\r
-}\r
+{
+       "default": { "get_input" : "loopback-default" },
+       "domain": "ethernet",
+       "criteria": [
+               {
+                       "value": "attga301me1",
+                       "type": "complex",
+                       "nodeString": "layer3-service-list[].service-data.l3sdn-vnf-fields.vnf-name"
+               },
+               {
+                       "value": { "get_input" : "host-ip-address" },
+                       "type": "simple",
+                       "nodeString": "layer3-service-list[].service-data.l3sdn-vnf-fields.vnf-name"
+               }
+       ]
+}
index d175eec..4ae2870 100644 (file)
@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
-            <artifactId>core</artifactId>
+            <artifactId>blueprint-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
index c09d96c..b2f4370 100644 (file)
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
-            <artifactId>core</artifactId>
+            <artifactId>blueprint-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
index 834db24..1ef81ea 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Copyright © 2017-2018 AT&T Intellectual Property.
+  ~  Modifications Copyright © 2018 IBM.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
     <packaging>pom</packaging>
 
     <modules>
-        <module>service</module>
-        <module>blueprint-validation</module>
+        <module>blueprint-core</module>
+        <module>resource-dict</module>
         <module>db-resources</module>
         <module>blueprint-scripts</module>
+        <module>blueprint-validation</module>
+        <module>service</module>
     </modules>
 
     <build>
@@ -1,17 +1,17 @@
-{\r
-  "name" : "aic-cloud-region",\r
-  "tags" : "aic-cloud-region",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "aic-cloud-region",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "input" : {\r
-      "type" : "source-input",\r
-      "properties" : {\r
-        "key" : "aic-cloud-region"\r
-      }\r
-    }\r
-  }\r
+{
+  "name" : "aic-cloud-region",
+  "tags" : "aic-cloud-region",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "aic-cloud-region",
+    "type" : "string"
+  },
+  "sources" : {
+    "input" : {
+      "type" : "source-input",
+      "properties" : {
+        "key" : "aic-cloud-region"
+      }
+    }
+  }
 }
\ No newline at end of file
@@ -1,17 +1,17 @@
-{\r
-  "name" : "aic_clli",\r
-  "tags" : "aic_clli",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "aic_clli",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "input" : {\r
-      "type" : "source-input",\r
-      "properties" : {\r
-        "key" : "aic_clli"\r
-      }\r
-    }\r
-  }\r
+{
+  "name" : "aic_clli",
+  "tags" : "aic_clli",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "aic_clli",
+    "type" : "string"
+  },
+  "sources" : {
+    "input" : {
+      "type" : "source-input",
+      "properties" : {
+        "key" : "aic_clli"
+      }
+    }
+  }
 }
\ No newline at end of file
@@ -1,17 +1,17 @@
-{\r
-  "name" : "availability_zone_0",\r
-  "tags" : "availability_zone_0",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "availability_zone_0",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "input" : {\r
-      "type" : "source-input",\r
-      "properties" : {\r
-        "key" : "availability_zone_0"\r
-      }\r
-    }\r
-  }\r
+{
+  "name" : "availability_zone_0",
+  "tags" : "availability_zone_0",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "availability_zone_0",
+    "type" : "string"
+  },
+  "sources" : {
+    "input" : {
+      "type" : "source-input",
+      "properties" : {
+        "key" : "availability_zone_0"
+      }
+    }
+  }
 }
\ No newline at end of file
@@ -1,16 +1,16 @@
-{\r
-  "tags": "v4-ip-type, tosca.datatypes.Root, data_type, brindasanth@onap.com",\r
-  "name": "default-source",\r
-  "property" :{\r
-    "description": "name of the ",\r
-    "type": "string"\r
-  },\r
-  "updated-by": "brindasanth@onap.com",\r
-  "sources": {\r
-    "default": {\r
-      "type": "source-default",\r
-      "properties": {\r
-      }\r
-    }\r
-  }\r
+{
+  "tags": "v4-ip-type, tosca.datatypes.Root, data_type, brindasanth@onap.com",
+  "name": "default-source",
+  "property" :{
+    "description": "name of the ",
+    "type": "string"
+  },
+  "updated-by": "brindasanth@onap.com",
+  "sources": {
+    "default": {
+      "type": "source-default",
+      "properties": {
+      }
+    }
+  }
 }
\ No newline at end of file
@@ -1,17 +1,17 @@
-{\r
-       "name": "input-source",\r
-       "property" :{\r
-               "description": "name of the ",\r
-               "type": "string"\r
-       },\r
-       "updated-by": "brindasanth@onap.com",\r
-       "tags": null,\r
-       "sources": {\r
-               "input": {\r
-                       "type": "source-input",\r
-                       "properties": {\r
-                               "key": "action-name"\r
-                       }\r
-               }\r
-       }\r
+{
+       "name": "input-source",
+       "property" :{
+               "description": "name of the ",
+               "type": "string"
+       },
+       "updated-by": "brindasanth@onap.com",
+       "tags": null,
+       "sources": {
+               "input": {
+                       "type": "source-input",
+                       "properties": {
+                               "key": "action-name"
+                       }
+               }
+       }
 }
\ No newline at end of file
@@ -1,34 +1,34 @@
-{\r
-  "tags": "oam-local-ipv4-address",\r
-  "name": "mdsal-source",\r
-  "property" :{\r
-    "description": "based on service-instance-id,network-role,v4-ip-type and vm-type get the ipv4-gateway-prefix from the SDN-GC mdsal",\r
-    "type": "string"\r
-  },\r
-  "updated-by": "brindasanth@onap.com",\r
-  "sources": {\r
-    "primary-config-data": {\r
-      "type": "source-rest",\r
-      "properties": {\r
-        "type": "JSON",\r
-        "url-path": "config/L3VNF-API:services/service-list/$service-instance-id/service-data/vnf-topology-information/vnf-assignments/vnf-vms/$vm-type/vm-networks/$network-role/v4-assigned-ip-list/$v4-ip-type",\r
-        "path": "/v4-assigned-ip-list/0/v4-ip-prefix",\r
-        "input-key-mapping": {\r
-          "service-instance-id": "service-instance-id",\r
-          "network-role": "network-role",\r
-          "v4-ip-type": "v4-ip-type",\r
-          "vm-type": "vm-type"\r
-        },\r
-        "output-key-mapping": {\r
-          "oam-local-ipv4-address": "v4-ip-prefix"\r
-        },\r
-        "key-dependencies": [\r
-          "service-instance-id",\r
-          "network-role",\r
-          "v4-ip-type",\r
-          "vm-type"\r
-        ]\r
-      }\r
-    }\r
-  }\r
+{
+  "tags": "oam-local-ipv4-address",
+  "name": "mdsal-source",
+  "property" :{
+    "description": "based on service-instance-id,network-role,v4-ip-type and vm-type get the ipv4-gateway-prefix from the SDN-GC mdsal",
+    "type": "string"
+  },
+  "updated-by": "brindasanth@onap.com",
+  "sources": {
+    "primary-config-data": {
+      "type": "source-rest",
+      "properties": {
+        "type": "JSON",
+        "url-path": "config/L3VNF-API:services/service-list/$service-instance-id/service-data/vnf-topology-information/vnf-assignments/vnf-vms/$vm-type/vm-networks/$network-role/v4-assigned-ip-list/$v4-ip-type",
+        "path": "/v4-assigned-ip-list/0/v4-ip-prefix",
+        "input-key-mapping": {
+          "service-instance-id": "service-instance-id",
+          "network-role": "network-role",
+          "v4-ip-type": "v4-ip-type",
+          "vm-type": "vm-type"
+        },
+        "output-key-mapping": {
+          "oam-local-ipv4-address": "v4-ip-prefix"
+        },
+        "key-dependencies": [
+          "service-instance-id",
+          "network-role",
+          "v4-ip-type",
+          "vm-type"
+        ]
+      }
+    }
+  }
 }
\ No newline at end of file
@@ -1,17 +1,17 @@
-{\r
-  "name" : "name_0",\r
-  "tags" : "name_0",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "name_0",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "input" : {\r
-      "type" : "source-input",\r
-      "properties" : {\r
-        "key" : "name_0"\r
-      }\r
-    }\r
-  }\r
+{
+  "name" : "name_0",
+  "tags" : "name_0",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "name_0",
+    "type" : "string"
+  },
+  "sources" : {
+    "input" : {
+      "type" : "source-input",
+      "properties" : {
+        "key" : "name_0"
+      }
+    }
+  }
 }
\ No newline at end of file
@@ -1,25 +1,25 @@
-{\r
-  "name" : "nf-role",\r
-  "tags" : "nf-role",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "vnf/nf-role",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "primary-db" : {\r
-      "type" : "source-primary-db",\r
-      "properties" : {\r
-        "type" : "SQL",\r
-        "query" : "select sdnctl.VF_MODEL.nf_role as vf_model_role from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnfmodelcustomizationuuid",\r
-        "input-key-mapping" : {\r
-          "vnfmodelcustomizationuuid" : "vnf-model-customization-uuid"\r
-        },\r
-        "output-key-mapping" : {\r
-          "nf-role" : "vf_model_role"\r
-        },\r
-        "key-dependencies" : [ "vnf-model-customization-uuid" ]\r
-      }\r
-    }\r
-  }\r
+{
+  "name" : "nf-role",
+  "tags" : "nf-role",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "vnf/nf-role",
+    "type" : "string"
+  },
+  "sources" : {
+    "primary-db" : {
+      "type" : "source-primary-db",
+      "properties" : {
+        "type" : "SQL",
+        "query" : "select sdnctl.VF_MODEL.nf_role as vf_model_role from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnfmodelcustomizationuuid",
+        "input-key-mapping" : {
+          "vnfmodelcustomizationuuid" : "vnf-model-customization-uuid"
+        },
+        "output-key-mapping" : {
+          "nf-role" : "vf_model_role"
+        },
+        "key-dependencies" : [ "vnf-model-customization-uuid" ]
+      }
+    }
+  }
 }
\ No newline at end of file
@@ -1,25 +1,25 @@
-{\r
-  "name" : "nfc-naming-code",\r
-  "tags" : "nfc-naming-code",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "nfc-naming-code",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "primary-db" : {\r
-      "type" : "source-primary-db",\r
-      "properties" : {\r
-        "type" : "SQL",\r
-        "query" : "select nfc_naming_code as nfc_naming_code from sdnctl.VFC_MODEL where customization_uuid=:vfccustomizationuuid",\r
-        "input-key-mapping" : {\r
-          "vfccustomizationuuid" : "vfccustomizationuuid"\r
-        },\r
-        "output-key-mapping" : {\r
-          "nfc-naming-code" : "nfc_naming_code"\r
-        },\r
-        "key-dependencies" : [ "vfccustomizationuuid" ]\r
-      }\r
-    }\r
-  }\r
+{
+  "name" : "nfc-naming-code",
+  "tags" : "nfc-naming-code",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "nfc-naming-code",
+    "type" : "string"
+  },
+  "sources" : {
+    "primary-db" : {
+      "type" : "source-primary-db",
+      "properties" : {
+        "type" : "SQL",
+        "query" : "select nfc_naming_code as nfc_naming_code from sdnctl.VFC_MODEL where customization_uuid=:vfccustomizationuuid",
+        "input-key-mapping" : {
+          "vfccustomizationuuid" : "vfccustomizationuuid"
+        },
+        "output-key-mapping" : {
+          "nfc-naming-code" : "nfc_naming_code"
+        },
+        "key-dependencies" : [ "vfccustomizationuuid" ]
+      }
+    }
+  }
 }
\ No newline at end of file
@@ -1,21 +1,21 @@
-{\r
-  "name" : "onap_private_net_cidr",\r
-  "tags" : "onap_private_net_cidr",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "onap_private_net_cidr",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "primary-db" : {\r
-      "type" : "source-primary-db",\r
-      "properties" : {\r
-        "type" : "SQL",\r
-        "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = private",\r
-        "output-key-mapping" : {\r
-          "onap_private_net_cidr" : "prefix"\r
-        }\r
-         }\r
-    }\r
-  }\r
+{
+  "name" : "onap_private_net_cidr",
+  "tags" : "onap_private_net_cidr",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "onap_private_net_cidr",
+    "type" : "string"
+  },
+  "sources" : {
+    "primary-db" : {
+      "type" : "source-primary-db",
+      "properties" : {
+        "type" : "SQL",
+        "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = private",
+        "output-key-mapping" : {
+          "onap_private_net_cidr" : "prefix"
+        }
+         }
+    }
+  }
 }
\ No newline at end of file
@@ -1,17 +1,17 @@
-{\r
-  "name" : "onap_private_net_id",\r
-  "tags" : "onap_private_net_id",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "onap_private_net_id",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "input" : {\r
-      "type" : "source-input",\r
-      "properties" : {\r
-        "key" : "onap_private_net_id"\r
-      }\r
-    }\r
-  }\r
+{
+  "name" : "onap_private_net_id",
+  "tags" : "onap_private_net_id",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "onap_private_net_id",
+    "type" : "string"
+  },
+  "sources" : {
+    "input" : {
+      "type" : "source-input",
+      "properties" : {
+        "key" : "onap_private_net_id"
+      }
+    }
+  }
 }
\ No newline at end of file
@@ -1,24 +1,24 @@
-{\r
-  "name": "primary-db-source",\r
-  "property" :{\r
-    "description": "name of the ",\r
-    "type": "string"\r
-  },\r
-  "updated-by": "brindasanth@onap.com",\r
-  "tags": "bundle-id, brindasanth@onap.com",\r
-  "sources": {\r
-    "primary-db": {\r
-      "type": "source-primary-db",\r
-      "properties": {\r
-        "query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",\r
-        "input-key-mapping": {\r
-          "profile_name": "profile_name"\r
-        },\r
-        "output-key-mapping": {\r
-          "db-country": "country",\r
-          "db-state": "state"\r
-        }\r
-      }\r
-    }\r
-  }\r
+{
+  "name": "primary-db-source",
+  "property" :{
+    "description": "name of the ",
+    "type": "string"
+  },
+  "updated-by": "brindasanth@onap.com",
+  "tags": "bundle-id, brindasanth@onap.com",
+  "sources": {
+    "primary-db": {
+      "type": "source-primary-db",
+      "properties": {
+        "query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",
+        "input-key-mapping": {
+          "profile_name": "profile_name"
+        },
+        "output-key-mapping": {
+          "db-country": "country",
+          "db-state": "state"
+        }
+      }
+    }
+  }
 }
\ No newline at end of file
@@ -1,21 +1,21 @@
-{\r
-  "name" : "private-prefix-id",\r
-  "tags" : "private-prefix-id",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "private-prefix-id",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "primary-db" : {\r
-      "type" : "source-primary-db",\r
-      "properties" : {\r
-        "type" : "SQL",\r
-        "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = private",\r
-        "output-key-mapping" : {\r
-          "private-prefix-id" : "prefix_id"\r
-        }\r
-         }\r
-    }\r
-  }\r
+{
+  "name" : "private-prefix-id",
+  "tags" : "private-prefix-id",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "private-prefix-id",
+    "type" : "string"
+  },
+  "sources" : {
+    "primary-db" : {
+      "type" : "source-primary-db",
+      "properties" : {
+        "type" : "SQL",
+        "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = private",
+        "output-key-mapping" : {
+          "private-prefix-id" : "prefix_id"
+        }
+         }
+    }
+  }
 }
\ No newline at end of file
@@ -1,21 +1,21 @@
-{\r
-  "name" : "protected-prefix-id",\r
-  "tags" : "protected-prefix-id",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "protected-prefix-id",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "primary-db" : {\r
-      "type" : "source-primary-db",\r
-      "properties" : {\r
-        "type" : "SQL",\r
-        "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = protected",\r
-        "output-key-mapping" : {\r
-          "protected-prefix-id" : "prefix_id"\r
-        }      \r
-         }\r
-    }\r
-  }\r
+{
+  "name" : "protected-prefix-id",
+  "tags" : "protected-prefix-id",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "protected-prefix-id",
+    "type" : "string"
+  },
+  "sources" : {
+    "primary-db" : {
+      "type" : "source-primary-db",
+      "properties" : {
+        "type" : "SQL",
+        "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = protected",
+        "output-key-mapping" : {
+          "protected-prefix-id" : "prefix_id"
+        }      
+         }
+    }
+  }
 }
\ No newline at end of file
@@ -1,21 +1,21 @@
-{\r
-  "name" : "protected_private_net_cidr",\r
-  "tags" : "protected_private_net_cidr",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "protected_private_net_cidr",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "primary-db" : {\r
-      "type" : "source-primary-db",\r
-      "properties" : {\r
-        "type" : "SQL",\r
-        "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = protected",\r
-        "output-key-mapping" : {\r
-          "protected_private_net_cidr" : "prefix"\r
-        }      \r
-         }\r
-    }\r
-  }\r
+{
+  "name" : "protected_private_net_cidr",
+  "tags" : "protected_private_net_cidr",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "protected_private_net_cidr",
+    "type" : "string"
+  },
+  "sources" : {
+    "primary-db" : {
+      "type" : "source-primary-db",
+      "properties" : {
+        "type" : "SQL",
+        "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = protected",
+        "output-key-mapping" : {
+          "protected_private_net_cidr" : "prefix"
+        }      
+         }
+    }
+  }
 }
\ No newline at end of file
@@ -1,17 +1,17 @@
-{\r
-  "name" : "service-instance-id",\r
-  "tags" : "service-instance-id, tosca.datatypes.Root, data_type",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "To be provided",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "input" : {\r
-      "type" : "source-input",\r
-      "properties" : {\r
-        "key" : "service-instance-id"\r
-      }\r
-    }\r
-  }\r
+{
+  "name" : "service-instance-id",
+  "tags" : "service-instance-id, tosca.datatypes.Root, data_type",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "To be provided",
+    "type" : "string"
+  },
+  "sources" : {
+    "input" : {
+      "type" : "source-input",
+      "properties" : {
+        "key" : "service-instance-id"
+      }
+    }
+  }
 }
\ No newline at end of file
@@ -1,21 +1,21 @@
-{\r
-  "name" : "unprotected-prefix-id",\r
-  "tags" : "unprotected-prefix-id",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "unprotected-prefix-id",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "primary-db" : {\r
-      "type" : "source-primary-db",\r
-      "properties" : {\r
-        "type" : "SQL",\r
-        "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = unprotected",\r
-        "output-key-mapping" : {\r
-          "unprotected-prefix-id" : "prefix_id"\r
-        }      \r
-         }\r
-    }\r
-  }\r
+{
+  "name" : "unprotected-prefix-id",
+  "tags" : "unprotected-prefix-id",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "unprotected-prefix-id",
+    "type" : "string"
+  },
+  "sources" : {
+    "primary-db" : {
+      "type" : "source-primary-db",
+      "properties" : {
+        "type" : "SQL",
+        "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = unprotected",
+        "output-key-mapping" : {
+          "unprotected-prefix-id" : "prefix_id"
+        }      
+         }
+    }
+  }
 }
\ No newline at end of file
@@ -1,17 +1,17 @@
-{\r
-  "name" : "vf-module-id",\r
-  "tags" : "vf-module-id",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "vf-module-id",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "input" : {\r
-      "type" : "source-input",\r
-      "properties" : {\r
-        "key" : "vf-module-id"\r
-      }\r
-    }\r
-  }\r
+{
+  "name" : "vf-module-id",
+  "tags" : "vf-module-id",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "vf-module-id",
+    "type" : "string"
+  },
+  "sources" : {
+    "input" : {
+      "type" : "source-input",
+      "properties" : {
+        "key" : "vf-module-id"
+      }
+    }
+  }
 }
\ No newline at end of file
@@ -1,25 +1,25 @@
-{\r
-  "name" : "vf-module-label",\r
-  "tags" : "vf-module-label",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "vf-module-label",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "primary-db" : {\r
-      "type" : "source-primary-db",\r
-      "properties" : {\r
-        "type" : "SQL",\r
-        "query" : "select sdnctl.VF_MODULE_MODEL.vf_module_label as vf_module_label from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",\r
-        "input-key-mapping" : {\r
-          "customizationid" : "vf-module-model-customization-uuid"\r
-        },\r
-        "output-key-mapping" : {\r
-          "vf-module-label" : "vf_module_label"\r
-        },\r
-        "key-dependencies" : [ "vf-module-model-customization-uuid" ]\r
-      }\r
-    }\r
-  }\r
+{
+  "name" : "vf-module-label",
+  "tags" : "vf-module-label",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "vf-module-label",
+    "type" : "string"
+  },
+  "sources" : {
+    "primary-db" : {
+      "type" : "source-primary-db",
+      "properties" : {
+        "type" : "SQL",
+        "query" : "select sdnctl.VF_MODULE_MODEL.vf_module_label as vf_module_label from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
+        "input-key-mapping" : {
+          "customizationid" : "vf-module-model-customization-uuid"
+        },
+        "output-key-mapping" : {
+          "vf-module-label" : "vf_module_label"
+        },
+        "key-dependencies" : [ "vf-module-model-customization-uuid" ]
+      }
+    }
+  }
 }
\ No newline at end of file
@@ -1,17 +1,17 @@
-{\r
-  "name" : "vf-module-model-customization-uuid",\r
-  "tags" : "vf-module-model-customization-uuid",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "vf-module-model-customization-uuid",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "input" : {\r
-      "type" : "source-input",\r
-      "properties" : {\r
-        "key" : "vf-module-model-customization-uuid"\r
-      }\r
-    }\r
-  }\r
+{
+  "name" : "vf-module-model-customization-uuid",
+  "tags" : "vf-module-model-customization-uuid",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "vf-module-model-customization-uuid",
+    "type" : "string"
+  },
+  "sources" : {
+    "input" : {
+      "type" : "source-input",
+      "properties" : {
+        "key" : "vf-module-model-customization-uuid"
+      }
+    }
+  }
 }
\ No newline at end of file
@@ -1,25 +1,25 @@
-{\r
-  "name" : "vf-module-type",\r
-  "tags" : "vf-module-type",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "vf-module-type",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "primary-db" : {\r
-      "type" : "source-primary-db",\r
-      "properties" : {\r
-        "type" : "SQL",\r
-        "query" : "select vf_module_type as vf_module_type from sdnctl.VF_MODULE_MODEL where customization_uuid=:customizationid",\r
-        "input-key-mapping" : {\r
-          "customizationid" : "vf-module-model-customization-uuid"\r
-        },\r
-        "output-key-mapping" : {\r
-          "vf-module-type" : "vf_module_type"\r
-        },\r
-        "key-dependencies" : [ "vf-module-model-customization-uuid" ]\r
-      }\r
-    }\r
-  }\r
+{
+  "name" : "vf-module-type",
+  "tags" : "vf-module-type",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "vf-module-type",
+    "type" : "string"
+  },
+  "sources" : {
+    "primary-db" : {
+      "type" : "source-primary-db",
+      "properties" : {
+        "type" : "SQL",
+        "query" : "select vf_module_type as vf_module_type from sdnctl.VF_MODULE_MODEL where customization_uuid=:customizationid",
+        "input-key-mapping" : {
+          "customizationid" : "vf-module-model-customization-uuid"
+        },
+        "output-key-mapping" : {
+          "vf-module-type" : "vf_module_type"
+        },
+        "key-dependencies" : [ "vf-module-model-customization-uuid" ]
+      }
+    }
+  }
 }
\ No newline at end of file
@@ -1,25 +1,25 @@
-{\r
-  "name" : "vf-naming-policy",\r
-  "tags" : "vf-naming-policy",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "vf-naming-policy",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "primary-db" : {\r
-      "type" : "source-primary-db",\r
-      "properties" : {\r
-        "type" : "SQL",\r
-        "query" : "select sdnctl.VF_MODEL.naming_policy as vf_naming_policy from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnf_model_customization_uuid",\r
-        "input-key-mapping" : {\r
-          "vnf_model_customization_uuid" : "vnf-model-customization-uuid"\r
-        },\r
-        "output-key-mapping" : {\r
-          "vf-naming-policy" : "vf_naming_policy"\r
-        },\r
-        "key-dependencies" : [ "vnf-model-customization-uuid" ]\r
-      }\r
-    }\r
-  }\r
+{
+  "name" : "vf-naming-policy",
+  "tags" : "vf-naming-policy",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "vf-naming-policy",
+    "type" : "string"
+  },
+  "sources" : {
+    "primary-db" : {
+      "type" : "source-primary-db",
+      "properties" : {
+        "type" : "SQL",
+        "query" : "select sdnctl.VF_MODEL.naming_policy as vf_naming_policy from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnf_model_customization_uuid",
+        "input-key-mapping" : {
+          "vnf_model_customization_uuid" : "vnf-model-customization-uuid"
+        },
+        "output-key-mapping" : {
+          "vf-naming-policy" : "vf_naming_policy"
+        },
+        "key-dependencies" : [ "vnf-model-customization-uuid" ]
+      }
+    }
+  }
 }
\ No newline at end of file
@@ -1,25 +1,25 @@
-{\r
-  "name" : "vf-nf-code",\r
-  "tags" : "vf-nf-code",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "vf-nf-code",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "primary-db" : {\r
-      "type" : "source-primary-db",\r
-      "properties" : {\r
-        "type" : "SQL",\r
-        "query" : "select sdnctl.VF_MODEL.nf_code as vf_nf_code from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:customizationid",\r
-        "input-key-mapping" : {\r
-          "customizationid" : "vnf-model-customization-uuid"\r
-        },\r
-        "output-key-mapping" : {\r
-          "vf-nf-code" : "vf_nf_code"\r
-        },\r
-        "key-dependencies" : [ "vnf-model-customization-uuid" ]\r
-      }\r
-    }\r
-  }\r
+{
+  "name" : "vf-nf-code",
+  "tags" : "vf-nf-code",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "vf-nf-code",
+    "type" : "string"
+  },
+  "sources" : {
+    "primary-db" : {
+      "type" : "source-primary-db",
+      "properties" : {
+        "type" : "SQL",
+        "query" : "select sdnctl.VF_MODEL.nf_code as vf_nf_code from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:customizationid",
+        "input-key-mapping" : {
+          "customizationid" : "vnf-model-customization-uuid"
+        },
+        "output-key-mapping" : {
+          "vf-nf-code" : "vf_nf_code"
+        },
+        "key-dependencies" : [ "vnf-model-customization-uuid" ]
+      }
+    }
+  }
 }
\ No newline at end of file
@@ -1,17 +1,17 @@
-{\r
-  "name" : "vf_module_name",\r
-  "tags" : "vf_module_name",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "vf_module_name",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "input" : {\r
-      "type" : "source-input",\r
-      "properties" : {\r
-        "key" : "vf_module_name"\r
-      }\r
-    }\r
-  }\r
+{
+  "name" : "vf_module_name",
+  "tags" : "vf_module_name",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "vf_module_name",
+    "type" : "string"
+  },
+  "sources" : {
+    "input" : {
+      "type" : "source-input",
+      "properties" : {
+        "key" : "vf_module_name"
+      }
+    }
+  }
 }
\ No newline at end of file
@@ -1,25 +1,25 @@
-{\r
-  "name" : "vfccustomizationuuid",\r
-  "tags" : "vfccustomizationuuid, tosca.datatypes.Root, data_type",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "vfccustomizationuuid",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "primary-db" : {\r
-      "type" : "source-primary-db",\r
-      "properties" : {\r
-        "type" : "SQL",\r
-        "query" : "select sdnctl.VF_MODULE_TO_VFC_MAPPING.vfc_customization_uuid as vnf_customid from sdnctl.VF_MODULE_TO_VFC_MAPPING where vm_count = 1 and sdnctl.VF_MODULE_TO_VFC_MAPPING.vf_module_customization_uuid=:vfmodulecustomizationuuid",\r
-        "input-key-mapping" : {\r
-          "vfmodulecustomizationuuid" : "vf-module-model-customization-uuid"\r
-        },\r
-        "output-key-mapping" : {\r
-          "vfccustomizationuuid" : "vnf_customid"\r
-        },\r
-        "key-dependencies" : [ "vf-module-model-customization-uuid" ]\r
-      }\r
-    }\r
-  }\r
+{
+  "name" : "vfccustomizationuuid",
+  "tags" : "vfccustomizationuuid, tosca.datatypes.Root, data_type",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "vfccustomizationuuid",
+    "type" : "string"
+  },
+  "sources" : {
+    "primary-db" : {
+      "type" : "source-primary-db",
+      "properties" : {
+        "type" : "SQL",
+        "query" : "select sdnctl.VF_MODULE_TO_VFC_MAPPING.vfc_customization_uuid as vnf_customid from sdnctl.VF_MODULE_TO_VFC_MAPPING where vm_count = 1 and sdnctl.VF_MODULE_TO_VFC_MAPPING.vf_module_customization_uuid=:vfmodulecustomizationuuid",
+        "input-key-mapping" : {
+          "vfmodulecustomizationuuid" : "vf-module-model-customization-uuid"
+        },
+        "output-key-mapping" : {
+          "vfccustomizationuuid" : "vnf_customid"
+        },
+        "key-dependencies" : [ "vf-module-model-customization-uuid" ]
+      }
+    }
+  }
 }
\ No newline at end of file
@@ -1,25 +1,25 @@
-{\r
-  "name" : "vm-type",\r
-  "tags" : "vm-type",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "vm-type",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "primary-db" : {\r
-      "type" : "source-primary-db",\r
-      "properties" : {\r
-        "type" : "SQL",\r
-        "query" : "select vfc_model.vm_type as vm_type from VFC_MODEL where customization_uuid=:vfccustomizationuuid",\r
-        "input-key-mapping" : {\r
-          "vfccustomizationuuid" : "vfccustomizationuuid"\r
-        },\r
-        "output-key-mapping" : {\r
-          "vm-type" : "vm_type"\r
-        },\r
-        "key-dependencies" : [ "vfccustomizationuuid" ]\r
-      }\r
-    }\r
-  }\r
+{
+  "name" : "vm-type",
+  "tags" : "vm-type",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "vm-type",
+    "type" : "string"
+  },
+  "sources" : {
+    "primary-db" : {
+      "type" : "source-primary-db",
+      "properties" : {
+        "type" : "SQL",
+        "query" : "select vfc_model.vm_type as vm_type from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
+        "input-key-mapping" : {
+          "vfccustomizationuuid" : "vfccustomizationuuid"
+        },
+        "output-key-mapping" : {
+          "vm-type" : "vm_type"
+        },
+        "key-dependencies" : [ "vfccustomizationuuid" ]
+      }
+    }
+  }
 }
\ No newline at end of file
@@ -1,17 +1,17 @@
-{\r
-  "name" : "vnf-id",\r
-  "tags" : "vnf-id",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "vnf-id",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "input" : {\r
-      "type" : "source-input",\r
-      "properties" : {\r
-        "key" : "vnf-id"\r
-      }\r
-    }\r
-  }\r
+{
+  "name" : "vnf-id",
+  "tags" : "vnf-id",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "vnf-id",
+    "type" : "string"
+  },
+  "sources" : {
+    "input" : {
+      "type" : "source-input",
+      "properties" : {
+        "key" : "vnf-id"
+      }
+    }
+  }
 }
\ No newline at end of file
@@ -1,17 +1,17 @@
-{\r
-  "name" : "vnf-model-customization-uuid",\r
-  "tags" : "vnf-model-customization-uuid",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "vnf-model-customization-uuid",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "input" : {\r
-      "type" : "source-input",\r
-      "properties" : {\r
-        "key" : "vnf-model-customization-uuid"\r
-      }\r
-    }\r
-  }\r
+{
+  "name" : "vnf-model-customization-uuid",
+  "tags" : "vnf-model-customization-uuid",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "vnf-model-customization-uuid",
+    "type" : "string"
+  },
+  "sources" : {
+    "input" : {
+      "type" : "source-input",
+      "properties" : {
+        "key" : "vnf-model-customization-uuid"
+      }
+    }
+  }
 }
\ No newline at end of file
@@ -1,28 +1,28 @@
-{\r
-  "name" : "vnf-name",\r
-  "tags" : "vnf-name, tosca.datatypes.Root, data_type",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "vnf-name",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "primary-config-data" : {\r
-      "type" : "source-rest",\r
-      "properties" : {\r
-        "type" : "JSON",\r
-        "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf_name",\r
-        "path" : "/param/0/value",\r
-        "expression-type" : "JSON_POINTER",\r
-        "input-key-mapping" : {\r
-          "service-instance-id" : "service-instance-id",\r
-          "vnf-id" : "vnf-id"\r
-        },\r
-        "output-key-mapping" : {\r
-          "vnf-name" : "value"\r
-        },\r
-        "key-dependencies" : [ "service-instance-id", "vnf-id" ]\r
-      }\r
-    }\r
-  }\r
+{
+  "name" : "vnf-name",
+  "tags" : "vnf-name, tosca.datatypes.Root, data_type",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "vnf-name",
+    "type" : "string"
+  },
+  "sources" : {
+    "primary-config-data" : {
+      "type" : "source-rest",
+      "properties" : {
+        "type" : "JSON",
+        "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf_name",
+        "path" : "/param/0/value",
+        "expression-type" : "JSON_POINTER",
+        "input-key-mapping" : {
+          "service-instance-id" : "service-instance-id",
+          "vnf-id" : "vnf-id"
+        },
+        "output-key-mapping" : {
+          "vnf-name" : "value"
+        },
+        "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+      }
+    }
+  }
 }
\ No newline at end of file
@@ -1,28 +1,28 @@
-{\r
-  "name" : "vnf_name",\r
-  "tags" : "vnf_name",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "vnf_name",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "primary-config-data" : {\r
-      "type" : "source-rest",\r
-      "properties" : {\r
-        "type" : "JSON",\r
-        "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf_name",\r
-        "path" : "/param/0/value",\r
-        "expression-type" : "JSON_POINTER",\r
-        "input-key-mapping" : {\r
-          "service-instance-id" : "service-instance-id",\r
-          "vnf-id" : "vnf-id"\r
-        },\r
-        "output-key-mapping" : {\r
-          "vnf_name" : "value"\r
-        },\r
-        "key-dependencies" : [ "service-instance-id", "vnf-id" ]\r
-      }\r
-    }\r
-  }\r
+{
+  "name" : "vnf_name",
+  "tags" : "vnf_name",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "vnf_name",
+    "type" : "string"
+  },
+  "sources" : {
+    "primary-config-data" : {
+      "type" : "source-rest",
+      "properties" : {
+        "type" : "JSON",
+        "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf_name",
+        "path" : "/param/0/value",
+        "expression-type" : "JSON_POINTER",
+        "input-key-mapping" : {
+          "service-instance-id" : "service-instance-id",
+          "vnf-id" : "vnf-id"
+        },
+        "output-key-mapping" : {
+          "vnf_name" : "value"
+        },
+        "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+      }
+    }
+  }
 }
\ No newline at end of file
@@ -1,25 +1,25 @@
-{\r
-  "name" : "vnfc-model-invariant-uuid",\r
-  "tags" : "vnfc-model-invariant-uuid",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "vnfc-model-invariant-uuid for vFW template",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "primary-db" : {\r
-      "type" : "source-primary-db",\r
-      "properties" : {\r
-        "type" : "SQL",\r
-        "query" : "select vfc_model.invariant_uuid as vfc_invariant_uuid from VFC_MODEL where customization_uuid=:vfccustomizationuuid",\r
-        "input-key-mapping" : {\r
-          "vfccustomizationuuid" : "vfccustomizationuuid"\r
-        },\r
-        "output-key-mapping" : {\r
-          "vnfc-model-invariant-uuid" : "vfc_invariant_uuid"\r
-        },\r
-        "key-dependencies" : [ "vfccustomizationuuid" ]\r
-      }\r
-    }\r
-  }\r
+{
+  "name" : "vnfc-model-invariant-uuid",
+  "tags" : "vnfc-model-invariant-uuid",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "vnfc-model-invariant-uuid for vFW template",
+    "type" : "string"
+  },
+  "sources" : {
+    "primary-db" : {
+      "type" : "source-primary-db",
+      "properties" : {
+        "type" : "SQL",
+        "query" : "select vfc_model.invariant_uuid as vfc_invariant_uuid from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
+        "input-key-mapping" : {
+          "vfccustomizationuuid" : "vfccustomizationuuid"
+        },
+        "output-key-mapping" : {
+          "vnfc-model-invariant-uuid" : "vfc_invariant_uuid"
+        },
+        "key-dependencies" : [ "vfccustomizationuuid" ]
+      }
+    }
+  }
 }
\ No newline at end of file
@@ -1,25 +1,25 @@
-{\r
-  "name" : "vnfc-model-version",\r
-  "tags" : "vnfc-model-version",\r
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",\r
-  "property" : {\r
-    "description" : "vnfc-model-version for vFW template",\r
-    "type" : "string"\r
-  },\r
-  "sources" : {\r
-    "primary-db" : {\r
-      "type" : "source-primary-db",\r
-      "properties" : {\r
-        "type" : "SQL",\r
-        "query" : "select vfc_model.version as vnfc_model_version from VFC_MODEL where customization_uuid=:vfccustomizationuuid",\r
-        "input-key-mapping" : {\r
-          "vfccustomizationuuid" : "vfccustomizationuuid"\r
-        },\r
-        "output-key-mapping" : {\r
-          "vnfc-model-version" : "vnfc_model_version"\r
-        },\r
-        "key-dependencies" : [ "vfccustomizationuuid" ]\r
-      }\r
-    }\r
-  }\r
+{
+  "name" : "vnfc-model-version",
+  "tags" : "vnfc-model-version",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "vnfc-model-version for vFW template",
+    "type" : "string"
+  },
+  "sources" : {
+    "primary-db" : {
+      "type" : "source-primary-db",
+      "properties" : {
+        "type" : "SQL",
+        "query" : "select vfc_model.version as vnfc_model_version from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
+        "input-key-mapping" : {
+          "vfccustomizationuuid" : "vfccustomizationuuid"
+        },
+        "output-key-mapping" : {
+          "vnfc-model-version" : "vnfc_model_version"
+        },
+        "key-dependencies" : [ "vfccustomizationuuid" ]
+      }
+    }
+  }
 }
\ No newline at end of file
similarity index 85%
rename from components/resource-dict/pom.xml
rename to ms/controllerblueprints/modules/resource-dict/pom.xml
index a3602ac..edffdfb 100644 (file)
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.onap.ccsdk.apps.components</groupId>
-        <artifactId>parent</artifactId>
+        <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
+        <artifactId>modules</artifactId>
         <version>0.4.1-SNAPSHOT</version>
-        <relativePath>../parent</relativePath>
     </parent>
-    <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
     <artifactId>resource-dict</artifactId>
     <name>Controller Blueprints Resource Dictionary</name>
 
     <dependencies>
         <dependency>
             <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
-            <artifactId>core</artifactId>
+            <artifactId>blueprint-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
@@ -1,47 +1,47 @@
-/*\r
- *  Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- *  Licensed under the Apache License, Version 2.0 (the "License");\r
- *  you may not use this file except in compliance with the License.\r
- *  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- *  Unless required by applicable law or agreed to in writing, software\r
- *  distributed under the License is distributed on an "AS IS" BASIS,\r
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- *  See the License for the specific language governing permissions and\r
- *  limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.resource.dict.factory\r
-\r
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException\r
-import org.onap.ccsdk.apps.controllerblueprints.core.format\r
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceSourceMapping\r
-\r
-/**\r
- * ResourceSourceMappingFactory.\r
- *\r
- * @author Brinda Santh\r
- */\r
-object ResourceSourceMappingFactory {\r
-\r
-    private val resourceSourceMappings: MutableMap<String, String> = hashMapOf()\r
-\r
-    fun registerSourceMapping(sourceInstance: String, nodeTypeName: String) {\r
-        resourceSourceMappings[sourceInstance] = nodeTypeName\r
-    }\r
-\r
-    fun getRegisterSourceMapping(sourceInstance: String): String {\r
-        return resourceSourceMappings[sourceInstance]\r
-                ?: throw BluePrintException(format("failed to get source({}) mapping", sourceInstance))\r
-    }\r
-\r
-    fun getRegisterSourceMapping(): ResourceSourceMapping {\r
-        val resourceSourceMapping = ResourceSourceMapping()\r
-        resourceSourceMapping.resourceSourceMappings = resourceSourceMappings\r
-        return resourceSourceMapping\r
-    }\r
-}\r
-\r
+/*
+ *  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.resource.dict.factory
+
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
+import org.onap.ccsdk.apps.controllerblueprints.core.format
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceSourceMapping
+
+/**
+ * ResourceSourceMappingFactory.
+ *
+ * @author Brinda Santh
+ */
+object ResourceSourceMappingFactory {
+
+    private val resourceSourceMappings: MutableMap<String, String> = hashMapOf()
+
+    fun registerSourceMapping(sourceInstance: String, nodeTypeName: String) {
+        resourceSourceMappings[sourceInstance] = nodeTypeName
+    }
+
+    fun getRegisterSourceMapping(sourceInstance: String): String {
+        return resourceSourceMappings[sourceInstance]
+                ?: throw BluePrintException(format("failed to get source({}) mapping", sourceInstance))
+    }
+
+    fun getRegisterSourceMapping(): ResourceSourceMapping {
+        val resourceSourceMapping = ResourceSourceMapping()
+        resourceSourceMapping.resourceSourceMappings = resourceSourceMappings
+        return resourceSourceMapping
+    }
+}
+
-/*\r
- *  Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- *  Licensed under the Apache License, Version 2.0 (the "License");\r
- *  you may not use this file except in compliance with the License.\r
- *  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- *  Unless required by applicable law or agreed to in writing, software\r
- *  distributed under the License is distributed on an "AS IS" BASIS,\r
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- *  See the License for the specific language governing permissions and\r
- *  limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.resource.dict.utils\r
-\r
-import com.att.eelf.configuration.EELFLogger\r
-import org.apache.commons.collections.CollectionUtils\r
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.TopologicalSortingUtils\r
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment\r
-import com.att.eelf.configuration.EELFManager\r
-import java.util.ArrayList\r
-/**\r
- * BulkResourceSequencingUtils.\r
- *\r
- * @author Brinda Santh\r
- */\r
-object BulkResourceSequencingUtils {\r
-    private val log: EELFLogger = EELFManager.getInstance().getLogger(BulkResourceSequencingUtils::class.java)\r
-\r
-    @JvmStatic\r
-    fun process(resourceAssignments: MutableList<ResourceAssignment>): List<List<ResourceAssignment>> {\r
-        val resourceAssignmentMap: MutableMap<String, ResourceAssignment> = hashMapOf()\r
-        val sequenceBatchResourceAssignment = ArrayList<List<ResourceAssignment>>()\r
-        log.info("Assignments ({})", resourceAssignments)\r
-        // Prepare Map\r
-        resourceAssignments.forEach { resourceAssignment ->\r
-            log.trace("Processing Key ({})", resourceAssignment.name)\r
-            resourceAssignmentMap.put(resourceAssignment.name, resourceAssignment)\r
-        }\r
-\r
-        val startResourceAssignment = ResourceAssignment()\r
-        startResourceAssignment.name = "*"\r
-\r
-        // Preepare Sorting Map\r
-        val topologySorting = TopologicalSortingUtils<ResourceAssignment>()\r
-        resourceAssignmentMap.forEach { _, resourceAssignment ->\r
-            if (CollectionUtils.isNotEmpty(resourceAssignment.dependencies)) {\r
-                for (dependency in resourceAssignment.dependencies!!) {\r
-                    topologySorting.add(resourceAssignmentMap[dependency]!!, resourceAssignment)\r
-                }\r
-            } else {\r
-                topologySorting.add(startResourceAssignment, resourceAssignment)\r
-            }\r
-        }\r
-\r
-        val sequencedResourceAssignments: MutableList<ResourceAssignment> = topologySorting.topSort()!! as MutableList<ResourceAssignment>\r
-        log.info("Sorted Sequenced Assignments ({})", sequencedResourceAssignments)\r
-\r
-        var batchResourceAssignment: MutableList<ResourceAssignment>? = null\r
-        var batchAssignmentName: MutableList<String>? = null\r
-\r
-        // Prepare Sorting\r
-        sequencedResourceAssignments.forEachIndexed { index, resourceAssignment ->\r
-\r
-            var previousResourceAssignment: ResourceAssignment? = null\r
-\r
-            if (index > 0) {\r
-                previousResourceAssignment = sequencedResourceAssignments[index - 1]\r
-            }\r
-\r
-            var dependencyPresence = false\r
-            if (batchAssignmentName != null && resourceAssignment.dependencies != null) {\r
-                dependencyPresence = CollectionUtils.containsAny(batchAssignmentName, resourceAssignment.dependencies)\r
-            }\r
-\r
-            log.trace("({}) -> Checking ({}), with ({}), result ({})", resourceAssignment.name,\r
-                    batchAssignmentName, resourceAssignment.dependencies, dependencyPresence)\r
-\r
-            if (previousResourceAssignment != null && resourceAssignment.dictionarySource != null\r
-                    && resourceAssignment.dictionarySource!!.equals(previousResourceAssignment.dictionarySource, true)\r
-                    && !dependencyPresence) {\r
-                batchResourceAssignment!!.add(resourceAssignment)\r
-                batchAssignmentName!!.add(resourceAssignment.name)\r
-            } else {\r
-                if (batchResourceAssignment != null) {\r
-                    sequenceBatchResourceAssignment.add(batchResourceAssignment!!)\r
-                    log.trace("Created old Set ({})", batchAssignmentName)\r
-                }\r
-                batchResourceAssignment = arrayListOf()\r
-                batchResourceAssignment!!.add(resourceAssignment)\r
-\r
-                batchAssignmentName = arrayListOf()\r
-                batchAssignmentName!!.add(resourceAssignment.name)\r
-            }\r
-\r
-            if (index == sequencedResourceAssignments.size - 1) {\r
-                log.trace("Created old Set ({})", batchAssignmentName)\r
-                sequenceBatchResourceAssignment.add(batchResourceAssignment!!)\r
-            }\r
-        }\r
-        log.info("Batched Sequence : ({})", sequenceBatchResourceAssignment)\r
-\r
-        return sequenceBatchResourceAssignment\r
-    }\r
-\r
+/*
+ *  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.resource.dict.utils
+
+import com.att.eelf.configuration.EELFLogger
+import org.apache.commons.collections.CollectionUtils
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.TopologicalSortingUtils
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment
+import com.att.eelf.configuration.EELFManager
+import java.util.ArrayList
+/**
+ * BulkResourceSequencingUtils.
+ *
+ * @author Brinda Santh
+ */
+object BulkResourceSequencingUtils {
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(BulkResourceSequencingUtils::class.java)
+
+    @JvmStatic
+    fun process(resourceAssignments: MutableList<ResourceAssignment>): List<List<ResourceAssignment>> {
+        val resourceAssignmentMap: MutableMap<String, ResourceAssignment> = hashMapOf()
+        val sequenceBatchResourceAssignment = ArrayList<List<ResourceAssignment>>()
+        log.info("Assignments ({})", resourceAssignments)
+        // Prepare Map
+        resourceAssignments.forEach { resourceAssignment ->
+            log.trace("Processing Key ({})", resourceAssignment.name)
+            resourceAssignmentMap.put(resourceAssignment.name, resourceAssignment)
+        }
+
+        val startResourceAssignment = ResourceAssignment()
+        startResourceAssignment.name = "*"
+
+        // Preepare Sorting Map
+        val topologySorting = TopologicalSortingUtils<ResourceAssignment>()
+        resourceAssignmentMap.forEach { _, resourceAssignment ->
+            if (CollectionUtils.isNotEmpty(resourceAssignment.dependencies)) {
+                for (dependency in resourceAssignment.dependencies!!) {
+                    topologySorting.add(resourceAssignmentMap[dependency]!!, resourceAssignment)
+                }
+            } else {
+                topologySorting.add(startResourceAssignment, resourceAssignment)
+            }
+        }
+
+        val sequencedResourceAssignments: MutableList<ResourceAssignment> = topologySorting.topSort()!! as MutableList<ResourceAssignment>
+        log.info("Sorted Sequenced Assignments ({})", sequencedResourceAssignments)
+
+        var batchResourceAssignment: MutableList<ResourceAssignment>? = null
+        var batchAssignmentName: MutableList<String>? = null
+
+        // Prepare Sorting
+        sequencedResourceAssignments.forEachIndexed { index, resourceAssignment ->
+
+            var previousResourceAssignment: ResourceAssignment? = null
+
+            if (index > 0) {
+                previousResourceAssignment = sequencedResourceAssignments[index - 1]
+            }
+
+            var dependencyPresence = false
+            if (batchAssignmentName != null && resourceAssignment.dependencies != null) {
+                dependencyPresence = CollectionUtils.containsAny(batchAssignmentName, resourceAssignment.dependencies)
+            }
+
+            log.trace("({}) -> Checking ({}), with ({}), result ({})", resourceAssignment.name,
+                    batchAssignmentName, resourceAssignment.dependencies, dependencyPresence)
+
+            if (previousResourceAssignment != null && resourceAssignment.dictionarySource != null
+                    && resourceAssignment.dictionarySource!!.equals(previousResourceAssignment.dictionarySource, true)
+                    && !dependencyPresence) {
+                batchResourceAssignment!!.add(resourceAssignment)
+                batchAssignmentName!!.add(resourceAssignment.name)
+            } else {
+                if (batchResourceAssignment != null) {
+                    sequenceBatchResourceAssignment.add(batchResourceAssignment!!)
+                    log.trace("Created old Set ({})", batchAssignmentName)
+                }
+                batchResourceAssignment = arrayListOf()
+                batchResourceAssignment!!.add(resourceAssignment)
+
+                batchAssignmentName = arrayListOf()
+                batchAssignmentName!!.add(resourceAssignment.name)
+            }
+
+            if (index == sequencedResourceAssignments.size - 1) {
+                log.trace("Created old Set ({})", batchAssignmentName)
+                sequenceBatchResourceAssignment.add(batchResourceAssignment!!)
+            }
+        }
+        log.info("Batched Sequence : ({})", sequenceBatchResourceAssignment)
+
+        return sequenceBatchResourceAssignment
+    }
+
 }
\ No newline at end of file
@@ -1,60 +1,60 @@
-/*\r
- *  Copyright © 2017-2018 AT&T Intellectual Property.\r
- *  Modifications Copyright © 2018 IBM.\r
- *\r
- *  Licensed under the Apache License, Version 2.0 (the "License");\r
- *  you may not use this file except in compliance with the License.\r
- *  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- *  Unless required by applicable law or agreed to in writing, software\r
- *  distributed under the License is distributed on an "AS IS" BASIS,\r
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- *  See the License for the specific language governing permissions and\r
- *  limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.resource.dict;\r
-\r
-import org.junit.Assert;\r
-import org.junit.Test;\r
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;\r
-import com.att.eelf.configuration.EELFLogger;\r
-import com.att.eelf.configuration.EELFManager;\r
-\r
-public class ResourceDefinitionTest {\r
-    private EELFLogger log = EELFManager.getInstance().getLogger(ResourceDefinitionTest.class);\r
-    private String basePath = "load/resource_dictionary";\r
-\r
-    @Test\r
-    public void testDictionaryDefinitionInputSource(){\r
-\r
-        String fileName = basePath + "/input-source.json";\r
-        ResourceDefinition resourceDefinition = JacksonUtils.Companion.readValueFromFile(fileName, ResourceDefinition.class);\r
-        Assert.assertNotNull("Failed to populate dictionaryDefinition for input type", resourceDefinition);\r
-    }\r
-\r
-    @Test\r
-    public void testDictionaryDefinitionDefaultSource(){\r
-\r
-        String fileName = basePath + "/default-source.json";\r
-        ResourceDefinition resourceDefinition = JacksonUtils.Companion.readValueFromFile(fileName, ResourceDefinition.class);\r
-        Assert.assertNotNull("Failed to populate dictionaryDefinition for default type", resourceDefinition);\r
-    }\r
-\r
-    @Test\r
-    public void testDictionaryDefinitionDBSource(){\r
-\r
-        String fileName = basePath + "/primary-db-source.json";\r
-        ResourceDefinition resourceDefinition = JacksonUtils.Companion.readValueFromFile(fileName, ResourceDefinition.class);\r
-        Assert.assertNotNull("Failed to populate dictionaryDefinition for primary-db type", resourceDefinition);\r
-    }\r
-\r
-    @Test\r
-    public void testDictionaryDefinitionMDSALSource(){\r
-        String fileName = basePath + "/mdsal-source.json";\r
-        ResourceDefinition resourceDefinition = JacksonUtils.Companion.readValueFromFile(fileName, ResourceDefinition.class);\r
-        Assert.assertNotNull("Failed to populate dictionaryDefinition for mdsal type", resourceDefinition);\r
-    }\r
-}\r
+/*
+ *  Copyright © 2017-2018 AT&T Intellectual Property.
+ *  Modifications Copyright © 2018 IBM.
+ *
+ *  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.resource.dict;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+
+public class ResourceDefinitionTest {
+    private EELFLogger log = EELFManager.getInstance().getLogger(ResourceDefinitionTest.class);
+    private String basePath = "load/resource_dictionary";
+
+    @Test
+    public void testDictionaryDefinitionInputSource(){
+
+        String fileName = basePath + "/input-source.json";
+        ResourceDefinition resourceDefinition = JacksonUtils.Companion.readValueFromFile(fileName, ResourceDefinition.class);
+        Assert.assertNotNull("Failed to populate dictionaryDefinition for input type", resourceDefinition);
+    }
+
+    @Test
+    public void testDictionaryDefinitionDefaultSource(){
+
+        String fileName = basePath + "/default-source.json";
+        ResourceDefinition resourceDefinition = JacksonUtils.Companion.readValueFromFile(fileName, ResourceDefinition.class);
+        Assert.assertNotNull("Failed to populate dictionaryDefinition for default type", resourceDefinition);
+    }
+
+    @Test
+    public void testDictionaryDefinitionDBSource(){
+
+        String fileName = basePath + "/primary-db-source.json";
+        ResourceDefinition resourceDefinition = JacksonUtils.Companion.readValueFromFile(fileName, ResourceDefinition.class);
+        Assert.assertNotNull("Failed to populate dictionaryDefinition for primary-db type", resourceDefinition);
+    }
+
+    @Test
+    public void testDictionaryDefinitionMDSALSource(){
+        String fileName = basePath + "/mdsal-source.json";
+        ResourceDefinition resourceDefinition = JacksonUtils.Companion.readValueFromFile(fileName, ResourceDefinition.class);
+        Assert.assertNotNull("Failed to populate dictionaryDefinition for mdsal type", resourceDefinition);
+    }
+}
@@ -1,42 +1,42 @@
-/*\r
- *  Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- *  Licensed under the Apache License, Version 2.0 (the "License");\r
- *  you may not use this file except in compliance with the License.\r
- *  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- *  Unless required by applicable law or agreed to in writing, software\r
- *  distributed under the License is distributed on an "AS IS" BASIS,\r
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- *  See the License for the specific language governing permissions and\r
- *  limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.resource.dict.factory;\r
-\r
-import org.junit.Test;\r
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceSourceMapping;\r
-import org.springframework.util.Assert;\r
-\r
-public class ResourceSourceMappingFactoryTest {\r
-\r
-    @Test\r
-    public void testRegisterResourceMapping() {\r
-\r
-        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("primary-db", "source-primary-db");\r
-        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("input", "source-input");\r
-        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("default", "source-default");\r
-        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("primary-config-data", "source-rest");\r
-\r
-        String nodeTypeName = ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping("primary-db");\r
-        Assert.notNull(nodeTypeName, "Failed to get primary-db mapping");\r
-\r
-        ResourceSourceMapping resourceSourceMapping = ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping();\r
-        Assert.notNull(resourceSourceMapping, "Failed to get resource source mapping");\r
-        Assert.notNull(resourceSourceMapping.getResourceSourceMappings(), "Failed to get resource source mappings");\r
-\r
-    }\r
-\r
-}\r
+/*
+ *  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.resource.dict.factory;
+
+import org.junit.Test;
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceSourceMapping;
+import org.springframework.util.Assert;
+
+public class ResourceSourceMappingFactoryTest {
+
+    @Test
+    public void testRegisterResourceMapping() {
+
+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("primary-db", "source-primary-db");
+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("input", "source-input");
+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("default", "source-default");
+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("primary-config-data", "source-rest");
+
+        String nodeTypeName = ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping("primary-db");
+        Assert.notNull(nodeTypeName, "Failed to get primary-db mapping");
+
+        ResourceSourceMapping resourceSourceMapping = ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping();
+        Assert.notNull(resourceSourceMapping, "Failed to get resource source mapping");
+        Assert.notNull(resourceSourceMapping.getResourceSourceMappings(), "Failed to get resource source mappings");
+
+    }
+
+}
@@ -1,66 +1,66 @@
-/*\r
- *  Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- *  Licensed under the Apache License, Version 2.0 (the "License");\r
- *  you may not use this file except in compliance with the License.\r
- *  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- *  Unless required by applicable law or agreed to in writing, software\r
- *  distributed under the License is distributed on an "AS IS" BASIS,\r
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- *  See the License for the specific language governing permissions and\r
- *  limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.resource.dict.service\r
-\r
-import com.att.eelf.configuration.EELFLogger\r
-import org.junit.Assert\r
-import org.junit.Test\r
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException\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.EELFManager\r
-import org.junit.Before\r
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.utils.ResourceDictionaryTestUtils\r
-\r
-/**\r
- * ResourceAssignmentValidationServiceTest.\r
- *\r
- * @author Brinda Santh\r
- */\r
-class ResourceAssignmentValidationServiceTest {\r
-    private val log: EELFLogger = EELFManager.getInstance().getLogger(ResourceAssignmentValidationServiceTest::class.java)\r
-    @Before\r
-    fun setUp() {\r
-        // Setup dummy Source Instance Mapping\r
-        ResourceDictionaryTestUtils.setUpResourceSourceMapping()\r
-    }\r
-\r
-    @Test\r
-    fun testValidateSuccess() {\r
-        log.info("**************** testValidateSuccess *****************")\r
-        val assignments = JacksonUtils.getListFromClassPathFile("validation/success.json", ResourceAssignment::class.java)\r
-        val resourceAssignmentValidator = ResourceAssignmentValidationServiceImpl()\r
-        val result = resourceAssignmentValidator.validate(assignments!!)\r
-        Assert.assertTrue("Failed to Validate", result)\r
-    }\r
-\r
-    @Test(expected = BluePrintException::class)\r
-    fun testValidateDuplicate() {\r
-        log.info(" **************** testValidateDuplicate *****************")\r
-        val assignments = JacksonUtils.getListFromClassPathFile("validation/duplicate.json", ResourceAssignment::class.java)\r
-        val resourceAssignmentValidator = ResourceAssignmentValidationServiceImpl()\r
-        resourceAssignmentValidator.validate(assignments!!)\r
-    }\r
-\r
-    @Test(expected = BluePrintException::class)\r
-    fun testValidateCyclic() {\r
-        log.info(" ****************  testValidateCyclic *****************")\r
-        val assignments = JacksonUtils.getListFromClassPathFile("validation/cyclic.json", ResourceAssignment::class.java)\r
-        val resourceAssignmentValidator = ResourceAssignmentValidationServiceImpl()\r
-        resourceAssignmentValidator.validate(assignments!!)\r
-    }\r
+/*
+ *  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.resource.dict.service
+
+import com.att.eelf.configuration.EELFLogger
+import org.junit.Assert
+import org.junit.Test
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment
+import com.att.eelf.configuration.EELFManager
+import org.junit.Before
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.utils.ResourceDictionaryTestUtils
+
+/**
+ * ResourceAssignmentValidationServiceTest.
+ *
+ * @author Brinda Santh
+ */
+class ResourceAssignmentValidationServiceTest {
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(ResourceAssignmentValidationServiceTest::class.java)
+    @Before
+    fun setUp() {
+        // Setup dummy Source Instance Mapping
+        ResourceDictionaryTestUtils.setUpResourceSourceMapping()
+    }
+
+    @Test
+    fun testValidateSuccess() {
+        log.info("**************** testValidateSuccess *****************")
+        val assignments = JacksonUtils.getListFromClassPathFile("validation/success.json", ResourceAssignment::class.java)
+        val resourceAssignmentValidator = ResourceAssignmentValidationServiceImpl()
+        val result = resourceAssignmentValidator.validate(assignments!!)
+        Assert.assertTrue("Failed to Validate", result)
+    }
+
+    @Test(expected = BluePrintException::class)
+    fun testValidateDuplicate() {
+        log.info(" **************** testValidateDuplicate *****************")
+        val assignments = JacksonUtils.getListFromClassPathFile("validation/duplicate.json", ResourceAssignment::class.java)
+        val resourceAssignmentValidator = ResourceAssignmentValidationServiceImpl()
+        resourceAssignmentValidator.validate(assignments!!)
+    }
+
+    @Test(expected = BluePrintException::class)
+    fun testValidateCyclic() {
+        log.info(" ****************  testValidateCyclic *****************")
+        val assignments = JacksonUtils.getListFromClassPathFile("validation/cyclic.json", ResourceAssignment::class.java)
+        val resourceAssignmentValidator = ResourceAssignmentValidationServiceImpl()
+        resourceAssignmentValidator.validate(assignments!!)
+    }
 }
\ No newline at end of file
@@ -1,37 +1,37 @@
-/*\r
- *  Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- *  Licensed under the Apache License, Version 2.0 (the "License");\r
- *  you may not use this file except in compliance with the License.\r
- *  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- *  Unless required by applicable law or agreed to in writing, software\r
- *  distributed under the License is distributed on an "AS IS" BASIS,\r
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- *  See the License for the specific language governing permissions and\r
- *  limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.resource.dict.utils;\r
-\r
-import org.junit.Assert;\r
-import org.junit.Test;\r
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;\r
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment;\r
-import java.util.List;\r
-/**\r
- * BulkResourceSequencingUtils.\r
- *\r
- * @author Brinda Santh\r
- */\r
-public class BulkResourceSequencingUtilsTest {\r
-\r
-    @Test\r
-    public void testProcess(){\r
-        List<ResourceAssignment> assignments = JacksonUtils.Companion.getListFromClassPathFile("validation/success.json", ResourceAssignment.class);\r
-        Assert.assertNotNull("failed to get ResourceAssignment from validation/success.json ", assignments);\r
-        BulkResourceSequencingUtils.process(assignments);\r
-    }\r
+/*
+ *  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.resource.dict.utils;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment;
+import java.util.List;
+/**
+ * BulkResourceSequencingUtils.
+ *
+ * @author Brinda Santh
+ */
+public class BulkResourceSequencingUtilsTest {
+
+    @Test
+    public void testProcess(){
+        List<ResourceAssignment> assignments = JacksonUtils.Companion.getListFromClassPathFile("validation/success.json", ResourceAssignment.class);
+        Assert.assertNotNull("failed to get ResourceAssignment from validation/success.json ", assignments);
+        BulkResourceSequencingUtils.process(assignments);
+    }
 }
\ No newline at end of file
@@ -1,99 +1,99 @@
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- * Modifications Copyright © 2018 IBM.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.resource.dict.utils;\r
-\r
-\r
-import com.fasterxml.jackson.databind.JsonNode;\r
-import org.junit.Assert;\r
-import org.junit.Test;\r
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants;\r
-import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeTemplate;\r
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;\r
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment;\r
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDefinition;\r
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDictionaryConstants;\r
-import com.att.eelf.configuration.EELFLogger;\r
-import com.att.eelf.configuration.EELFManager;\r
-\r
-import java.util.HashMap;\r
-import java.util.Map;\r
-/**\r
- * ResourceDictionaryUtilsTest.\r
- *\r
- * @author Brinda Santh\r
- */\r
-public class ResourceDictionaryUtilsTest {\r
-    private static final EELFLogger log = EELFManager.getInstance().getLogger(ResourceDictionaryUtilsTest.class);\r
-\r
-    @Test\r
-    public void testPopulateSourceMapping() {\r
-\r
-        ResourceAssignment resourceAssignment = new ResourceAssignment();\r
-        resourceAssignment.setName("sample-assignment");\r
-        ResourceDefinition resourceDefinition = new ResourceDefinition();\r
-        Map<String, NodeTemplate> sources = new HashMap<>();\r
-        resourceDefinition.setSources(sources);\r
-        // To Check Empty Source\r
-        ResourceDictionaryUtils.populateSourceMapping(resourceAssignment, resourceDefinition);\r
-        Assert.assertEquals("Expected Empty source Input, but.", ResourceDictionaryConstants.SOURCE_INPUT, resourceAssignment.getDictionarySource());\r
-\r
-        // To Check First Source\r
-        resourceAssignment.setDictionarySource(null);\r
-        sources.put(ResourceDictionaryConstants.SOURCE_DEFAULT, new NodeTemplate());\r
-        ResourceDictionaryUtils.populateSourceMapping(resourceAssignment, resourceDefinition);\r
-        Assert.assertEquals("Expected First source Default, but.", ResourceDictionaryConstants.SOURCE_DEFAULT, resourceAssignment.getDictionarySource());\r
-\r
-        // To Check Assigned Source\r
-        resourceAssignment.setDictionarySource(ResourceDictionaryConstants.SOURCE_PRIMARY_DB);\r
-        ResourceDictionaryUtils.populateSourceMapping(resourceAssignment, resourceDefinition);\r
-        Assert.assertEquals("Expected Assigned source DB, but.", ResourceDictionaryConstants.SOURCE_PRIMARY_DB, resourceAssignment.getDictionarySource());\r
-\r
-    }\r
-\r
-    @Test\r
-    public void testFindFirstSource() {\r
-        //To check if Empty Source\r
-        Map<String, NodeTemplate> sources = new HashMap<>();\r
-        String firstSource = ResourceDictionaryUtils.findFirstSource(sources);\r
-        Assert.assertNull("Source populated, which is not expected.", firstSource);\r
-\r
-        // TO check the first Source\r
-        sources.put(ResourceDictionaryConstants.SOURCE_INPUT, new NodeTemplate());\r
-        String inputFirstSource = ResourceDictionaryUtils.findFirstSource(sources);\r
-        Assert.assertEquals("Expected source Input, but.", ResourceDictionaryConstants.SOURCE_INPUT, inputFirstSource);\r
-\r
-        // TO check the multiple Source\r
-        sources.put(ResourceDictionaryConstants.SOURCE_PRIMARY_DB, new NodeTemplate());\r
-        String multipleFirstSource = ResourceDictionaryUtils.findFirstSource(sources);\r
-        Assert.assertEquals("Expected source Input, but.", ResourceDictionaryConstants.SOURCE_INPUT, multipleFirstSource);\r
-\r
-    }\r
-\r
-    @Test\r
-    public void testAssignInputs() {\r
-        JsonNode data = JacksonUtils.Companion.jsonNodeFromClassPathFile("data/resource-assignment-input.json");\r
-        Map<String, Object> context = new HashMap<>();\r
-        ResourceDictionaryUtils.assignInputs(data, context);\r
-        String path = BluePrintConstants.PATH_INPUTS.concat(BluePrintConstants.PATH_DIVIDER).concat("mapValue");\r
-        log.info("populated context {}", context);\r
-        Assert.assertTrue(String.format("failed to get variable : %s",path),context.containsKey(path));\r
-\r
-    }\r
-\r
-\r
-}\r
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
+ *
+ * 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.resource.dict.utils;
+
+
+import com.fasterxml.jackson.databind.JsonNode;
+import org.junit.Assert;
+import org.junit.Test;
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants;
+import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeTemplate;
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment;
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDefinition;
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDictionaryConstants;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+
+import java.util.HashMap;
+import java.util.Map;
+/**
+ * ResourceDictionaryUtilsTest.
+ *
+ * @author Brinda Santh
+ */
+public class ResourceDictionaryUtilsTest {
+    private static final EELFLogger log = EELFManager.getInstance().getLogger(ResourceDictionaryUtilsTest.class);
+
+    @Test
+    public void testPopulateSourceMapping() {
+
+        ResourceAssignment resourceAssignment = new ResourceAssignment();
+        resourceAssignment.setName("sample-assignment");
+        ResourceDefinition resourceDefinition = new ResourceDefinition();
+        Map<String, NodeTemplate> sources = new HashMap<>();
+        resourceDefinition.setSources(sources);
+        // To Check Empty Source
+        ResourceDictionaryUtils.populateSourceMapping(resourceAssignment, resourceDefinition);
+        Assert.assertEquals("Expected Empty source Input, but.", ResourceDictionaryConstants.SOURCE_INPUT, resourceAssignment.getDictionarySource());
+
+        // To Check First Source
+        resourceAssignment.setDictionarySource(null);
+        sources.put(ResourceDictionaryConstants.SOURCE_DEFAULT, new NodeTemplate());
+        ResourceDictionaryUtils.populateSourceMapping(resourceAssignment, resourceDefinition);
+        Assert.assertEquals("Expected First source Default, but.", ResourceDictionaryConstants.SOURCE_DEFAULT, resourceAssignment.getDictionarySource());
+
+        // To Check Assigned Source
+        resourceAssignment.setDictionarySource(ResourceDictionaryConstants.SOURCE_PRIMARY_DB);
+        ResourceDictionaryUtils.populateSourceMapping(resourceAssignment, resourceDefinition);
+        Assert.assertEquals("Expected Assigned source DB, but.", ResourceDictionaryConstants.SOURCE_PRIMARY_DB, resourceAssignment.getDictionarySource());
+
+    }
+
+    @Test
+    public void testFindFirstSource() {
+        //To check if Empty Source
+        Map<String, NodeTemplate> sources = new HashMap<>();
+        String firstSource = ResourceDictionaryUtils.findFirstSource(sources);
+        Assert.assertNull("Source populated, which is not expected.", firstSource);
+
+        // TO check the first Source
+        sources.put(ResourceDictionaryConstants.SOURCE_INPUT, new NodeTemplate());
+        String inputFirstSource = ResourceDictionaryUtils.findFirstSource(sources);
+        Assert.assertEquals("Expected source Input, but.", ResourceDictionaryConstants.SOURCE_INPUT, inputFirstSource);
+
+        // TO check the multiple Source
+        sources.put(ResourceDictionaryConstants.SOURCE_PRIMARY_DB, new NodeTemplate());
+        String multipleFirstSource = ResourceDictionaryUtils.findFirstSource(sources);
+        Assert.assertEquals("Expected source Input, but.", ResourceDictionaryConstants.SOURCE_INPUT, multipleFirstSource);
+
+    }
+
+    @Test
+    public void testAssignInputs() {
+        JsonNode data = JacksonUtils.Companion.jsonNodeFromClassPathFile("data/resource-assignment-input.json");
+        Map<String, Object> context = new HashMap<>();
+        ResourceDictionaryUtils.assignInputs(data, context);
+        String path = BluePrintConstants.PATH_INPUTS.concat(BluePrintConstants.PATH_DIVIDER).concat("mapValue");
+        log.info("populated context {}", context);
+        Assert.assertTrue(String.format("failed to get variable : %s",path),context.containsKey(path));
+
+    }
+
+
+}
@@ -1,30 +1,30 @@
-/*\r
- *  Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- *  Licensed under the Apache License, Version 2.0 (the "License");\r
- *  you may not use this file except in compliance with the License.\r
- *  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- *  Unless required by applicable law or agreed to in writing, software\r
- *  distributed under the License is distributed on an "AS IS" BASIS,\r
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- *  See the License for the specific language governing permissions and\r
- *  limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.resource.dict.utils\r
-\r
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.factory.ResourceSourceMappingFactory\r
-\r
-object ResourceDictionaryTestUtils {\r
-\r
-    @JvmStatic\r
-    fun setUpResourceSourceMapping() {\r
-        ResourceSourceMappingFactory.registerSourceMapping("primary-db", "source-primary-db")\r
-        ResourceSourceMappingFactory.registerSourceMapping("input", "source-input")\r
-        ResourceSourceMappingFactory.registerSourceMapping("default", "source-default")\r
-        ResourceSourceMappingFactory.registerSourceMapping("primary-config-data", "source-rest")\r
-    }\r
+/*
+ *  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.resource.dict.utils
+
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.factory.ResourceSourceMappingFactory
+
+object ResourceDictionaryTestUtils {
+
+    @JvmStatic
+    fun setUpResourceSourceMapping() {
+        ResourceSourceMappingFactory.registerSourceMapping("primary-db", "source-primary-db")
+        ResourceSourceMappingFactory.registerSourceMapping("input", "source-input")
+        ResourceSourceMappingFactory.registerSourceMapping("default", "source-default")
+        ResourceSourceMappingFactory.registerSourceMapping("primary-config-data", "source-rest")
+    }
 }
\ No newline at end of file
-[\r
-  {\r
-    "name": "vnf-id",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string",\r
-      "required": true\r
-    },\r
-    "dictionary-name": "vnf-id",\r
-    "dictionary-source": "input",\r
-    "dependencies": []\r
-  },\r
-  {\r
-    "name": "service-instance-id",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string",\r
-      "required": true\r
-    },\r
-    "dictionary-name": "service-instance-id",\r
-    "dictionary-source": "input",\r
-    "dependencies": []\r
-  },\r
-  {\r
-    "name": "bundle-id",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string",\r
-      "required": true\r
-    },\r
-    "dictionary-name": "bundle-id",\r
-    "dictionary-source": "primary-config-data",\r
-    "dependencies": [\r
-      "vnf-id"\r
-    ]\r
-  },\r
-  {\r
-    "name": "bundle-ip",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string",\r
-      "required": true\r
-    },\r
-    "dictionary-name": "bundle-ip",\r
-    "dictionary-source": "primary-config-data",\r
-    "dependencies": [\r
-      "vnf-id"\r
-    ]\r
-  },\r
-  {\r
-    "name": "bundle-mac",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string"\r
-    },\r
-    "dictionary-name": "bundle-mac",\r
-    "dictionary-source": "primary-config-data",\r
-    "dependencies": [\r
-      "vnf-id",\r
-      "bundle-id"\r
-    ]\r
-  },\r
-  {\r
-    "name": "managed-ip",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string"\r
-    },\r
-    "dictionary-name": "managed-ip",\r
-    "dictionary-source": "primary-config-data",\r
-    "dependencies": [\r
-      "loopback-ip"\r
-    ]\r
-  },\r
-  {\r
-    "name": "vnf-name",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string",\r
-      "required": true\r
-    },\r
-    "dictionary-name": "vnf-name",\r
-    "dictionary-source": "input",\r
-    "dependencies": []\r
-  },\r
-  {\r
-    "name": "managed-ip1",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string"\r
-    },\r
-    "dictionary-name": "managed-ip1",\r
-    "dictionary-source": "primary-config-data",\r
-    "dependencies": [\r
-      "loopback-ip"\r
-    ]\r
-  },\r
-  {\r
-    "name": "loopback-ip",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string"\r
-    },\r
-    "dictionary-name": "loopback-ip",\r
-    "dictionary-source": "primary-db",\r
-    "dependencies": [\r
-      "bundle-mac",\r
-      "managed-ip1"\r
-    ]\r
-  }\r
-]\r
+[
+  {
+    "name": "vnf-id",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "vnf-id",
+    "dictionary-source": "input",
+    "dependencies": []
+  },
+  {
+    "name": "service-instance-id",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "service-instance-id",
+    "dictionary-source": "input",
+    "dependencies": []
+  },
+  {
+    "name": "bundle-id",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "bundle-id",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "vnf-id"
+    ]
+  },
+  {
+    "name": "bundle-ip",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "bundle-ip",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "vnf-id"
+    ]
+  },
+  {
+    "name": "bundle-mac",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "bundle-mac",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "vnf-id",
+      "bundle-id"
+    ]
+  },
+  {
+    "name": "managed-ip",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "managed-ip",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "loopback-ip"
+    ]
+  },
+  {
+    "name": "vnf-name",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "vnf-name",
+    "dictionary-source": "input",
+    "dependencies": []
+  },
+  {
+    "name": "managed-ip1",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "managed-ip1",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "loopback-ip"
+    ]
+  },
+  {
+    "name": "loopback-ip",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "loopback-ip",
+    "dictionary-source": "primary-db",
+    "dependencies": [
+      "bundle-mac",
+      "managed-ip1"
+    ]
+  }
+]
-[\r
-  {\r
-    "name": "vnf-id",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string",\r
-      "required": true\r
-    },\r
-    "dictionary-name": "vnf-id",\r
-    "dictionary-source": "input",\r
-    "dependencies": []\r
-  },\r
-  {\r
-    "name": "service-instance-id",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string",\r
-      "required": true\r
-    },\r
-    "dictionary-name": "service-instance-id",\r
-    "dictionary-source": "input",\r
-    "dependencies": []\r
-  },\r
-  {\r
-    "name": "bundle-id",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string",\r
-      "required": true\r
-    },\r
-    "dictionary-name": "bundle-id",\r
-    "dictionary-source": "primary-config-data",\r
-    "dependencies": [\r
-      "vnf-id"\r
-    ]\r
-  },\r
-  {\r
-    "name": "bundle-ip",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string",\r
-      "required": true\r
-    },\r
-    "dictionary-name": "bundle-ip",\r
-    "dictionary-source": "primary-config-data",\r
-    "dependencies": [\r
-      "vnf-id"\r
-    ]\r
-  },\r
-  {\r
-    "name": "bundle-mac",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string"\r
-    },\r
-    "dictionary-name": "bundle-mac",\r
-    "dictionary-source": "primary-config-data",\r
-    "dependencies": [\r
-      "vnf-id",\r
-      "bundle-id"\r
-    ]\r
-  },\r
-  {\r
-    "name": "bundle-mac",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string"\r
-    },\r
-    "dictionary-name": "bundle-mac",\r
-    "dictionary-source": "primary-config-data",\r
-    "dependencies": [\r
-      "loopback-ip"\r
-    ]\r
-  },\r
-  {\r
-    "name": "vnf-name",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string",\r
-      "required": true\r
-    },\r
-    "dictionary-name": "vnf-name",\r
-    "dictionary-source": "input",\r
-    "dependencies": []\r
-  },\r
-  {\r
-    "name": "managed-ip1",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string"\r
-    },\r
-    "dictionary-name": "managed-ip1",\r
-    "dictionary-source": "primary-config-data",\r
-    "dependencies": [\r
-      "loopback-ip"\r
-    ]\r
-  },\r
-  {\r
-    "name": "loopback-ip",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string"\r
-    },\r
-    "dictionary-name": "loopback-ip",\r
-    "dictionary-source": "primary-db",\r
-    "dependencies": [\r
-      "bundle-mac"\r
-    ]\r
-  }\r
-]\r
+[
+  {
+    "name": "vnf-id",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "vnf-id",
+    "dictionary-source": "input",
+    "dependencies": []
+  },
+  {
+    "name": "service-instance-id",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "service-instance-id",
+    "dictionary-source": "input",
+    "dependencies": []
+  },
+  {
+    "name": "bundle-id",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "bundle-id",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "vnf-id"
+    ]
+  },
+  {
+    "name": "bundle-ip",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "bundle-ip",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "vnf-id"
+    ]
+  },
+  {
+    "name": "bundle-mac",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "bundle-mac",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "vnf-id",
+      "bundle-id"
+    ]
+  },
+  {
+    "name": "bundle-mac",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "bundle-mac",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "loopback-ip"
+    ]
+  },
+  {
+    "name": "vnf-name",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "vnf-name",
+    "dictionary-source": "input",
+    "dependencies": []
+  },
+  {
+    "name": "managed-ip1",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "managed-ip1",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "loopback-ip"
+    ]
+  },
+  {
+    "name": "loopback-ip",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "loopback-ip",
+    "dictionary-source": "primary-db",
+    "dependencies": [
+      "bundle-mac"
+    ]
+  }
+]
-[\r
-  {\r
-    "name": "vnf-id",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string",\r
-      "required": true\r
-    },\r
-    "dictionary-name": "vnf-id",\r
-    "dictionary-source": "input",\r
-    "dependencies": []\r
-  },\r
-  {\r
-    "name": "service-instance-id",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string",\r
-      "required": true\r
-    },\r
-    "dictionary-name": "service-instance-id",\r
-    "dictionary-source": "input",\r
-    "dependencies": []\r
-  },\r
-  {\r
-    "name": "bundle-id",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string",\r
-      "required": true\r
-    },\r
-    "dictionary-name": "bundle-id",\r
-    "dictionary-source": "primary-config-data",\r
-    "dependencies": [\r
-      "vnf-id"\r
-    ]\r
-  },\r
-  {\r
-    "name": "bundle-ip",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string",\r
-      "required": true\r
-    },\r
-    "dictionary-name": "bundle-ip",\r
-    "dictionary-source": "primary-config-data",\r
-    "dependencies": [\r
-      "vnf-id"\r
-    ]\r
-  },\r
-  {\r
-    "name": "bundle-mac",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string"\r
-    },\r
-    "dictionary-name": "bundle-mac",\r
-    "dictionary-source": "primary-config-data",\r
-    "dependencies": [\r
-      "vnf-id",\r
-      "bundle-id"\r
-    ]\r
-  },\r
-  {\r
-    "name": "managed-ip",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string"\r
-    },\r
-    "dictionary-name": "managed-ip",\r
-    "dictionary-source": "primary-config-data",\r
-    "dependencies": [\r
-      "loopback-ip"\r
-    ]\r
-  },\r
-  {\r
-    "name": "vnf-name",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string",\r
-      "required": true\r
-    },\r
-    "dictionary-name": "vnf-name",\r
-    "dictionary-source": "input",\r
-    "dependencies": []\r
-  },\r
-  {\r
-    "name": "managed-ip1",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string"\r
-    },\r
-    "dictionary-name": "managed-ip1",\r
-    "dictionary-source": "primary-config-data",\r
-    "dependencies": [\r
-      "loopback-ip"\r
-    ]\r
-  },\r
-  {\r
-    "name": "loopback-ip",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string"\r
-    },\r
-    "dictionary-name": "loopback-ip",\r
-    "dictionary-source": "primary-db",\r
-    "dependencies": [\r
-      "bundle-mac"\r
-    ]\r
-  }\r
-]\r
+[
+  {
+    "name": "vnf-id",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "vnf-id",
+    "dictionary-source": "input",
+    "dependencies": []
+  },
+  {
+    "name": "service-instance-id",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "service-instance-id",
+    "dictionary-source": "input",
+    "dependencies": []
+  },
+  {
+    "name": "bundle-id",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "bundle-id",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "vnf-id"
+    ]
+  },
+  {
+    "name": "bundle-ip",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "bundle-ip",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "vnf-id"
+    ]
+  },
+  {
+    "name": "bundle-mac",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "bundle-mac",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "vnf-id",
+      "bundle-id"
+    ]
+  },
+  {
+    "name": "managed-ip",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "managed-ip",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "loopback-ip"
+    ]
+  },
+  {
+    "name": "vnf-name",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "vnf-name",
+    "dictionary-source": "input",
+    "dependencies": []
+  },
+  {
+    "name": "managed-ip1",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "managed-ip1",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "loopback-ip"
+    ]
+  },
+  {
+    "name": "loopback-ip",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "loopback-ip",
+    "dictionary-source": "primary-db",
+    "dependencies": [
+      "bundle-mac"
+    ]
+  }
+]
index 8cbc98e..f29e501 100644 (file)
@@ -16,7 +16,8 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
@@ -41,6 +42,7 @@
         <h2database.version>1.4.197</h2database.version>
         <onap.logger.slf4j>1.2.2</onap.logger.slf4j>
         <powermock.version>1.7.4</powermock.version>
+        <mockk.version>1.9</mockk.version>
     </properties>
     <dependencyManagement>
         <dependencies>
                 <artifactId>commons-io</artifactId>
                 <version>2.6</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-compress</artifactId>
+                <version>1.15</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.velocity</groupId>
                 <artifactId>velocity</artifactId>
                 <version>1.7</version>
             </dependency>
-             <dependency>
+            <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
                 <version>${guava.version}</version>
                 <version>${kotlin.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <artifactId>kotlinx-couroutines-core</artifactId>
+                <groupId>org.jetbrains.kotlinx</groupId>
+                <artifactId>kotlinx-coroutines-core</artifactId>
                 <version>${kotlin.couroutines.version}</version>
             </dependency>
             <dependency>
             <!-- Application Components -->
             <dependency>
                 <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
-                <artifactId>core</artifactId>
+                <artifactId>blueprint-core</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
             </dependency>
 
             <!-- Testing Dependencies -->
+            <dependency>
+                <groupId>io.mockk</groupId>
+                <artifactId>mockk</artifactId>
+                <version>${mockk.version}</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.powermock</groupId>
                 <artifactId>powermock-api-mockito2</artifactId>
                 <version>${kotlin.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlinx</groupId>
+                <artifactId>kotlinx-coroutines-test</artifactId>
+                <version>${kotlin.couroutines.version}</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>io.grpc</groupId>
                 <artifactId>grpc-testing</artifactId>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-         </dependency>
+        </dependency>
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-script-util</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib-jdk8</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlinx</groupId>
+            <artifactId>kotlinx-coroutines-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlinx</groupId>
+            <artifactId>kotlinx-coroutines-reactor</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-kotlin</artifactId>
         </dependency>
+        <!-- GRPC Dependencies -->
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-netty</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-protobuf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-stub</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java-util</artifactId>
+        </dependency>
     </dependencies>
 
     <build>