Refactor components core and resource dict modules

Change-Id: I04e9e723d68a38ecefe48206e67fddbe43c55854 Issue-ID: CCSDK-1047 Signed-off-by: Muthuramalingam, Brinda Santh <brindasanth@in.ibm.com>
author: Muthuramalingam, Brinda Santh <brindasanth@in.ibm.com> 2019-02-07 14:51:50 -0500
committer: Muthuramalingam, Brinda Santh <brindasanth@in.ibm.com> 2019-02-07 14:51:50 -0500
commit: 4937f56d90371c7a7b5b6c52314c28df716f41ae (patch)
tree: eb1064d9679bcfe9ada8156c83f563beff093ec3 /ms
parent: 9a4387cf89f95ecdce9d135677a4b4c4c94a8b94 (diff)
176 files changed, 11275 insertions, 20 deletions
diff --git a/ms/blueprintsprocessor/application/pom.xml b/ms/blueprintsprocessor/application/pom.xml
index 06752b79..9ad2ccbf 100755
--- a/ms/blueprintsprocessor/application/pom.xml
+++ b/ms/blueprintsprocessor/application/pom.xml
@@ -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>
diff --git a/ms/blueprintsprocessor/functions/python-executor/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/ComponentJythonExecutorTest.kt b/ms/blueprintsprocessor/functions/python-executor/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/ComponentJythonExecutorTest.kt
index 83cf59c2..96d683cc 100644
--- a/ms/blueprintsprocessor/functions/python-executor/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/ComponentJythonExecutorTest.kt
+++ b/ms/blueprintsprocessor/functions/python-executor/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/ComponentJythonExecutorTest.kt
@@ -17,11 +17,8 @@
 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
diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/db-lib/pom.xml
index 590c87f0..7c5aecb7 100644
--- a/ms/blueprintsprocessor/modules/commons/db-lib/pom.xml
+++ b/ms/blueprintsprocessor/modules/commons/db-lib/pom.xml
@@ -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>
diff --git a/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml
index 773746b4..f1d97896 100644
--- a/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml
+++ b/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml
@@ -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>
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml
index 818adf9d..4a305358 100755
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml
@@ -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>
diff --git a/ms/blueprintsprocessor/modules/services/execution-service/pom.xml b/ms/blueprintsprocessor/modules/services/execution-service/pom.xml
index 96bb09f2..19685b52 100644
--- a/ms/blueprintsprocessor/modules/services/execution-service/pom.xml
+++ b/ms/blueprintsprocessor/modules/services/execution-service/pom.xml
@@ -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>
diff --git a/ms/blueprintsprocessor/modules/services/workflow-service/pom.xml b/ms/blueprintsprocessor/modules/services/workflow-service/pom.xml
index cc2a0e66..4f929064 100644
--- a/ms/blueprintsprocessor/modules/services/workflow-service/pom.xml
+++ b/ms/blueprintsprocessor/modules/services/workflow-service/pom.xml
@@ -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>
diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml
index 0de4b429..685cf41d 100755
--- a/ms/blueprintsprocessor/parent/pom.xml
+++ b/ms/blueprintsprocessor/parent/pom.xml
@@ -324,7 +324,7 @@
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
-                <artifactId>core</artifactId>
+                <artifactId>blueprint-core</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-bpmn-camunda.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-bpmn-camunda.json
new file mode 100644
index 00000000..cae06c18
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-bpmn-camunda.json
@@ -0,0 +1,8 @@
+{
+  "description": " Camunda BPM File",
+  "version": "1.0.0",
+  "file_ext": [
+    "bpmn"
+  ],
+  "derived_from": "tosca.artifacts.Implementation"
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-directed-graph.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-directed-graph.json
new file mode 100644
index 00000000..10bf7d2c
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-directed-graph.json
@@ -0,0 +1,9 @@
+{
+  "description": "Directed Graph File",
+  "version": "1.0.0",
+  "file_ext": [
+    "json",
+    "xml"
+  ],
+  "derived_from": "tosca.artifacts.Implementation"
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-mapping-resource.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-mapping-resource.json
new file mode 100644
index 00000000..9123efd1
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-mapping-resource.json
@@ -0,0 +1,8 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-script-python.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-script-python.json
new file mode 100644
index 00000000..22af3b0a
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-script-python.json
@@ -0,0 +1,8 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-template-velocity.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-template-velocity.json
new file mode 100644
index 00000000..20f94c94
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-template-velocity.json
@@ -0,0 +1,8 @@
+{
+  "description": " Velocity Template used for Configuration",
+  "version": "1.0.0",
+  "file_ext": [
+    "vtl"
+  ],
+  "derived_from": "tosca.artifacts.Implementation"
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/tosca.artifacts.Implementation.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/tosca.artifacts.Implementation.json
new file mode 100644
index 00000000..d75f3376
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/tosca.artifacts.Implementation.json
@@ -0,0 +1,5 @@
+{
+  "description": "TOSCA base type for implementation artifacts",
+  "version": "1.0.0",
+  "derived_from": "tosca.artifacts.Root"
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/datatype-property.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/datatype-property.json
new file mode 100644
index 00000000..d3ecffd1
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/datatype-property.json
@@ -0,0 +1,27 @@
+{
+	"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
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/datatype-resource-assignment.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/datatype-resource-assignment.json
new file mode 100644
index 00000000..8fa595a1
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/datatype-resource-assignment.json
@@ -0,0 +1,46 @@
+{
+	"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
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/dt-license-key.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/dt-license-key.json
new file mode 100644
index 00000000..27e25fe1
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/dt-license-key.json
@@ -0,0 +1,11 @@
+{
+	"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
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/dt-v4-aggregate.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/dt-v4-aggregate.json
new file mode 100644
index 00000000..4f7be2db
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/dt-v4-aggregate.json
@@ -0,0 +1,15 @@
+{
+	"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
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/tosca.datatypes.Credential.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/tosca.datatypes.Credential.json
new file mode 100644
index 00000000..68d91652
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/tosca.datatypes.Credential.json
@@ -0,0 +1,31 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/artifact-config-template.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/artifact-config-template.json
new file mode 100644
index 00000000..057038fd
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/artifact-config-template.json
@@ -0,0 +1,37 @@
+{
+	"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
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/component-config-generator.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/component-config-generator.json
new file mode 100644
index 00000000..05bf7fe2
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/component-config-generator.json
@@ -0,0 +1,72 @@
+{
+	"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
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/component-netconf-executor.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/component-netconf-executor.json
new file mode 100644
index 00000000..22f5c9b3
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/component-netconf-executor.json
@@ -0,0 +1,79 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/component-resource-assignment.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/component-resource-assignment.json
new file mode 100644
index 00000000..e009f858
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/component-resource-assignment.json
@@ -0,0 +1,68 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-activate-netconf.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-activate-netconf.json
new file mode 100644
index 00000000..57667de9
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-activate-netconf.json
@@ -0,0 +1,52 @@
+{
+	"description": "This is Download 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": {
+		"component-dependency": {
+			"capability": "component-node",
+			"node": "component-netconf-executor",
+			"relationship": "tosca.relationships.DependsOn"
+		}
+	},
+	"interfaces": {
+		"CONFIG": {
+			"operations": {
+				"ActivateNetconf": {
+					"inputs": {
+						"params": {
+							"required": false,
+							"type": "list",
+							"entry_schema": {
+								"type": "datatype-property"
+							}
+						}
+					}
+				}
+			}
+		}
+	},
+	
+	"derived_from": "tosca.nodes.DG"
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-config-generator.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-config-generator.json
new file mode 100644
index 00000000..679c4641
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-config-generator.json
@@ -0,0 +1,51 @@
+{
+	"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
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assign-activate.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assign-activate.json
new file mode 100644
index 00000000..87b052b6
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assign-activate.json
@@ -0,0 +1,56 @@
+{
+	"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
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assignment.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assignment.json
new file mode 100644
index 00000000..9de599b0
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assignment.json
@@ -0,0 +1,51 @@
+{
+	"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
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.Artifact.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.Artifact.json
new file mode 100644
index 00000000..4db3f73c
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.Artifact.json
@@ -0,0 +1,5 @@
+{
+  "description": "This is Deprecated Artifact Node Type.",
+  "version": "1.0.0",
+  "derived_from": "tosca.nodes.Root"
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.Component.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.Component.json
new file mode 100644
index 00000000..d559216a
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.Component.json
@@ -0,0 +1,5 @@
+{
+  "description": "This is default Component Node",
+  "version": "1.0.0",
+  "derived_from": "tosca.nodes.Root"
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.DG.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.DG.json
new file mode 100644
index 00000000..eb8cac0a
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.DG.json
@@ -0,0 +1,5 @@
+{
+  "description": "This is Directed Graph Node Type",
+  "version": "1.0.0",
+  "derived_from": "tosca.nodes.Root"
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.Vnf.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.Vnf.json
new file mode 100644
index 00000000..c2f5b868
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.Vnf.json
@@ -0,0 +1,5 @@
+{
+  "description": "This is VNF Node Type",
+  "version": "1.0.0",
+  "derived_from": "tosca.nodes.Root"
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.component.Python.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.component.Python.json
new file mode 100644
index 00000000..908e5682
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.component.Python.json
@@ -0,0 +1,5 @@
+{
+  "description": "This is Python Component",
+  "version": "1.0.0",
+  "derived_from": "tosca.nodes.Root"
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/vnf-netconf-device.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/vnf-netconf-device.json
new file mode 100644
index 00000000..b226a0cf
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/vnf-netconf-device.json
@@ -0,0 +1,42 @@
+{
+	"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"
+	
+}
diff --git a/ms/controllerblueprints/modules/blueprint-core/pom.xml b/ms/controllerblueprints/modules/blueprint-core/pom.xml
new file mode 100644
index 00000000..9461b2ca
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/pom.xml
@@ -0,0 +1,76 @@
+<?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.
+  ~ 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.
+  -->
+
+<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">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
+        <artifactId>modules</artifactId>
+        <version>0.4.1-SNAPSHOT</version>
+    </parent>
+    <artifactId>blueprint-core</artifactId>
+    <name>Controller Blueprints Core</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jsonSchema</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+        </dependency>
+        <!--Testing dependencies-->
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test-junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.mockk</groupId>
+            <artifactId>mockk</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlinx</groupId>
+            <artifactId>kotlinx-coroutines-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
+
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintConstants.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintConstants.kt
new file mode 100644
index 00000000..c50218bf
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintConstants.kt
@@ -0,0 +1,176 @@
+/*
+ * 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
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintError.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintError.kt
new file mode 100644
index 00000000..ea5bda42
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintError.kt
@@ -0,0 +1,29 @@
+/*
+ * 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
+
+class BluePrintError {
+    var errors: MutableList<String> = arrayListOf()
+
+    fun addError(type: String, name: String, error: String) {
+        this.errors.add("$type : $name : $error")
+    }
+
+    fun addError(error: String) {
+        this.errors.add(error)
+    }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintException.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintException.kt
new file mode 100644
index 00000000..5acdf8e4
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintException.kt
@@ -0,0 +1,49 @@
+/*
+ * 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
+    }
+}
+
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintProcessorException.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintProcessorException.kt
new file mode 100644
index 00000000..6ebabb7a
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintProcessorException.kt
@@ -0,0 +1,50 @@
+/*
+ * 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
+    }
+}
+
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintTypes.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintTypes.kt
new file mode 100644
index 00000000..4509cccf
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintTypes.kt
@@ -0,0 +1,164 @@
+/*
+ * 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
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/ConfigModelConstant.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/ConfigModelConstant.kt
new file mode 100644
index 00000000..68858dc5
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/ConfigModelConstant.kt
@@ -0,0 +1,30 @@
+/*
+ * 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"
+}
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/CustomFunctions.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/CustomFunctions.kt
new file mode 100644
index 00000000..0b9c142b
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/CustomFunctions.kt
@@ -0,0 +1,151 @@
+/*
+ * 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
+}
+
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/common/ApplicationConstants.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/common/ApplicationConstants.kt
new file mode 100644
index 00000000..994ea5b7
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/common/ApplicationConstants.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright © 2019 Bell Canada
+ *
+ * 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.common
+
+object ApplicationConstants {
+    const val ACTIVE_Y = "Y"
+    const val ACTIVE_N = "N"
+    const val ASDC_ARTIFACT_TYPE_SDNC_MODEL = "SDNC_MODEL"
+}
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/config/BluePrintLoadConfiguration.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/config/BluePrintLoadConfiguration.kt
new file mode 100644
index 00000000..235cfd56
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/config/BluePrintLoadConfiguration.kt
@@ -0,0 +1,34 @@
+/*
+ * 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.config
+
+open class BluePrintLoadConfiguration {
+
+    lateinit var blueprintDeployPath: String
+    lateinit var blueprintArchivePath: String
+    lateinit var blueprintEnrichmentPath: String
+
+    var loadInitialData: Boolean = false
+    var loadBluePrint: Boolean = false
+    var loadBluePrintPaths: String? = null
+
+    var loadModelType: Boolean = false
+    var loadModeTypePaths: String? = null
+
+    var loadResourceDictionary: Boolean = false
+    var loadResourceDictionaryPaths: String? = null
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/data/BluePrintExpressionData.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/data/BluePrintExpressionData.kt
new file mode 100644
index 00000000..96f549db
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/data/BluePrintExpressionData.kt
@@ -0,0 +1,70 @@
+/*
+ * 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
+)
+
+
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/data/BluePrintModel.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/data/BluePrintModel.kt
new file mode 100644
index 00000000..c4376d5e
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/data/BluePrintModel.kt
@@ -0,0 +1,622 @@
+/*
+ * 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
+    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
+}
+
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/data/BlueprintErrorCode.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/data/BlueprintErrorCode.kt
new file mode 100644
index 00000000..bef174b9
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/data/BlueprintErrorCode.kt
@@ -0,0 +1,97 @@
+/*
+ * Copyright © 2018-2019 Bell Canada 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 java.util.HashMap
+
+/**
+ * ErrorCode.java Purpose: Maintain a list of HTTP status codes
+ *
+ * @author Steve Siani
+ * @version 1.0
+ */
+enum class ErrorCode (val value: Int, val httpCode: Int) {
+
+    /// TODO: Add more attribute for each needed application protocol
+    // TODO: Example: INVALID_FILE_EXTENSION(2, 415, 25)
+    GENERIC_FAILURE(1, 500) {
+        override fun message(detailMsg: String): String {
+            return "Generic failure. Details : {$detailMsg}"
+        }
+    },
+    INVALID_FILE_EXTENSION(2, 415) {
+        override fun message(detailMsg: String): String {
+            return "Unexpected file extension. Details : {$detailMsg}"
+        }
+    },
+    BLUEPRINT_PATH_MISSING(3, 503) {
+        override fun message(detailMsg: String): String {
+            return "Blueprint path missing or wrong. Details : {$detailMsg}"
+        }
+    },
+    BLUEPRINT_WRITING_FAIL(4, 503) {
+        override fun message(detailMsg: String): String {
+            return "Fail to write blueprint files. Details : {$detailMsg}"
+        }
+    },
+    IO_FILE_INTERRUPT(5, 503) {
+        override fun message(detailMsg: String): String {
+            return "IO file system interruption. Details : {$detailMsg}"
+        }
+    },
+    INVALID_REQUEST_FORMAT(6, 400) {
+        override fun message(detailMsg: String): String {
+            return "Bad request. Details : {$detailMsg}"
+        }
+    },
+    UNAUTHORIZED_REQUEST(7, 401) {
+        override fun message(detailMsg: String): String {
+            return "The request requires user authentication. Details : {$detailMsg}"
+        }
+    },
+    REQUEST_NOT_FOUND(8, 404) {
+        override fun message(detailMsg: String): String {
+            return "Request mapping doesn't exist. Details : {$detailMsg}"
+        }
+    },
+    RESOURCE_NOT_FOUND(9, 404) {
+        override fun message(detailMsg: String): String {
+            return "No response was found for this request in the server. Details : {$detailMsg}"
+        }
+    },
+    CONFLICT_ADDING_RESOURCE(10, 409) {
+        override fun message(detailMsg: String): String {
+            return "Duplicated entry while saving Blueprint. Details : {$detailMsg}"
+        }
+    };
+
+    abstract fun message(detailMsg: String): String
+
+    companion object {
+
+        private val map = HashMap<Int, ErrorCode>()
+
+        init {
+            for (errorCode in ErrorCode.values()) {
+                map[errorCode.value] = errorCode
+            }
+        }
+
+        fun valueOf(value: Int): ErrorCode? {
+            return if (map.containsKey(value)) map[value] else map[1]
+        }
+    }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/factory/BluePrintValidatorFactory.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/factory/BluePrintValidatorFactory.kt
new file mode 100644
index 00000000..687b86cd
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/factory/BluePrintValidatorFactory.kt
@@ -0,0 +1,45 @@
+/*
+ * 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
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BluePrintCatalogService.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BluePrintCatalogService.kt
new file mode 100755
index 00000000..c99cdf74
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BluePrintCatalogService.kt
@@ -0,0 +1,59 @@
+/*
+ * 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.interfaces
+
+import org.jetbrains.annotations.NotNull
+import org.jetbrains.annotations.Nullable
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
+import java.io.File
+import java.nio.file.Path
+
+interface BluePrintCatalogService {
+
+    /**
+     * Save the CBA to database.
+     * @param blueprintFile Either a directory, or an archive
+     * @param validate whether to validate blueprint content. Default true.
+     * @return The unique blueprint identifier
+     * @throws BluePrintException if process failed
+     */
+    @NotNull
+    @Throws(BluePrintException::class)
+    fun saveToDatabase(@NotNull blueprintFile: File, @Nullable validate: Boolean = true): String
+
+    /**
+     * Retrieve the CBA from database either archived or extracted.
+     * @param name Name of the blueprint
+     * @param version Version of the blueprint
+     * @param extract true to extract the content, false for archived content. Default to true
+     * @return Path where CBA is located
+     * @throws BluePrintException if process failed
+     */
+    @NotNull
+    @Throws(BluePrintException::class)
+    fun getFromDatabase(@NotNull name: String, @NotNull version: String, @Nullable extract: Boolean = true): Path
+
+    /**
+     * Delete the CBA from database.
+     * @param name Name of the blueprint
+     * @param version Version of the blueprint
+     * @throws BluePrintException if process failed
+     */
+    @NotNull
+    @Throws(BluePrintException::class)
+    fun deleteFromDatabase(@NotNull name: String, @NotNull version: String)
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BluePrintEnhancer.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BluePrintEnhancer.kt
new file mode 100644
index 00000000..f01f1262
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BluePrintEnhancer.kt
@@ -0,0 +1,141 @@
+/*
+ * 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.interfaces
+
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
+import org.onap.ccsdk.apps.controllerblueprints.core.data.*
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRuntimeService
+
+interface BluePrintEnhancer<T> {
+    fun enhance(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, type: T)
+}
+
+interface BluePrintServiceTemplateEnhancer : BluePrintEnhancer<ServiceTemplate>
+
+interface BluePrintTopologyTemplateEnhancer : BluePrintEnhancer<TopologyTemplate>
+
+interface BluePrintWorkflowEnhancer : BluePrintEnhancer<Workflow>
+
+interface BluePrintNodeTemplateEnhancer : BluePrintEnhancer<NodeTemplate>
+
+interface BluePrintNodeTypeEnhancer : BluePrintEnhancer<NodeType>
+
+interface BluePrintArtifactDefinitionEnhancer : BluePrintEnhancer<ArtifactDefinition>
+
+interface BluePrintPolicyTypeEnhancer : BluePrintEnhancer<PolicyType>
+
+interface BluePrintPropertyDefinitionEnhancer : BluePrintEnhancer<PropertyDefinition>
+
+interface BluePrintAttributeDefinitionEnhancer : BluePrintEnhancer<AttributeDefinition>
+
+
+interface BluePrintEnhancerService {
+
+    @Throws(BluePrintException::class)
+    fun enhance(basePath: String, enrichedBasePath: String): BluePrintContext
+
+    @Throws(BluePrintException::class)
+    fun enhance(basePath: String): BluePrintContext
+}
+
+interface BluePrintTypeEnhancerService {
+
+    fun getServiceTemplateEnhancers(): List<BluePrintServiceTemplateEnhancer>
+
+    fun getTopologyTemplateEnhancers(): List<BluePrintTopologyTemplateEnhancer>
+
+    fun getWorkflowEnhancers(): List<BluePrintWorkflowEnhancer>
+
+    fun getNodeTemplateEnhancers(): List<BluePrintNodeTemplateEnhancer>
+
+    fun getNodeTypeEnhancers(): List<BluePrintNodeTypeEnhancer>
+
+    fun getArtifactDefinitionEnhancers(): List<BluePrintArtifactDefinitionEnhancer>
+
+    fun getPolicyTypeEnhancers(): List<BluePrintPolicyTypeEnhancer>
+
+    fun getPropertyDefinitionEnhancers(): List<BluePrintPropertyDefinitionEnhancer>
+
+    fun getAttributeDefinitionEnhancers(): List<BluePrintAttributeDefinitionEnhancer>
+
+    fun enhanceServiceTemplate(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, serviceTemplate: ServiceTemplate) {
+        val enhancers = getServiceTemplateEnhancers()
+        doEnhancement(bluePrintRuntimeService, name, serviceTemplate, enhancers)
+    }
+
+    fun enhanceTopologyTemplate(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, topologyTemplate: TopologyTemplate) {
+        val enhancers = getTopologyTemplateEnhancers()
+        doEnhancement(bluePrintRuntimeService, name, topologyTemplate, enhancers)
+    }
+
+    fun enhanceWorkflow(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, workflow: Workflow) {
+        val enhancers = getWorkflowEnhancers()
+        doEnhancement(bluePrintRuntimeService, name, workflow, enhancers)
+    }
+
+    fun enhanceNodeTemplate(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, nodeTemplate: NodeTemplate) {
+        val enhancers = getNodeTemplateEnhancers()
+        doEnhancement(bluePrintRuntimeService, name, nodeTemplate, enhancers)
+    }
+
+    fun enhanceNodeType(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, nodeType: NodeType) {
+        val enhancers = getNodeTypeEnhancers()
+        doEnhancement(bluePrintRuntimeService, name, nodeType, enhancers)
+    }
+
+    fun enhanceArtifactDefinition(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, artifactDefinition: ArtifactDefinition) {
+        val enhancers = getArtifactDefinitionEnhancers()
+        doEnhancement(bluePrintRuntimeService, name, artifactDefinition, enhancers)
+    }
+
+    fun enhancePolicyType(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, policyType: PolicyType) {
+        val enhancers = getPolicyTypeEnhancers()
+        doEnhancement(bluePrintRuntimeService, name, policyType, enhancers)
+    }
+
+    fun enhancePropertyDefinitions(bluePrintRuntimeService: BluePrintRuntimeService<*>, properties: MutableMap<String, PropertyDefinition>) {
+        properties.forEach { propertyName, propertyDefinition ->
+            enhancePropertyDefinition(bluePrintRuntimeService, propertyName, propertyDefinition)
+        }
+    }
+
+    fun enhancePropertyDefinition(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, propertyDefinition: PropertyDefinition) {
+        val enhancers = getPropertyDefinitionEnhancers()
+        doEnhancement(bluePrintRuntimeService, name, propertyDefinition, enhancers)
+    }
+
+    fun enhanceAttributeDefinitions(bluePrintRuntimeService: BluePrintRuntimeService<*>, attributes: MutableMap<String, AttributeDefinition>) {
+        attributes.forEach { attributeName, attributeDefinition ->
+            enhanceAttributeDefinition(bluePrintRuntimeService, attributeName, attributeDefinition)
+        }
+    }
+
+    fun enhanceAttributeDefinition(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, attributeDefinition: AttributeDefinition) {
+        val enhancers = getAttributeDefinitionEnhancers()
+        doEnhancement(bluePrintRuntimeService, name, attributeDefinition, enhancers)
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    private fun <T> doEnhancement(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, definition: Any, enhancers: List<BluePrintEnhancer<T>>) {
+        if (enhancers.isNotEmpty()) {
+            enhancers.forEach {
+                it.enhance(bluePrintRuntimeService, name, definition as T)
+            }
+        }
+    }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BluePrintRepoService.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BluePrintRepoService.kt
new file mode 100644
index 00000000..e5ba6f4c
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BluePrintRepoService.kt
@@ -0,0 +1,47 @@
+/*
+ * 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
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BluePrintScriptsService.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BluePrintScriptsService.kt
new file mode 100644
index 00000000..124c167a
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BluePrintScriptsService.kt
@@ -0,0 +1,25 @@
+/*
+ * 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.interfaces
+
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext
+
+interface BluePrintScriptsService{
+
+    fun <T> scriptInstance(blueprintContext: BluePrintContext, scriptClassName: String,
+                           reCompile: Boolean): T
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BlueprintFunctionNode.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BlueprintFunctionNode.kt
new file mode 100644
index 00000000..0b9f1f18
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BlueprintFunctionNode.kt
@@ -0,0 +1,39 @@
+/*
+ * 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.interfaces
+
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintProcessorException
+import java.util.function.Function
+
+
+interface BlueprintFunctionNode<T, R> : Function<T, R> {
+
+    fun getName(): String
+
+    @Throws(BluePrintProcessorException::class)
+    fun prepareRequest(executionRequest: T): T
+
+    @Throws(BluePrintProcessorException::class)
+    fun process(executionRequest: T)
+
+    @Throws(BluePrintProcessorException::class)
+    fun recover(runtimeException: RuntimeException, executionRequest: T)
+
+    @Throws(BluePrintProcessorException::class)
+    fun prepareResponse(): R
+
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BlueprintValidator.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BlueprintValidator.kt
new file mode 100644
index 00000000..bea790fd
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BlueprintValidator.kt
@@ -0,0 +1,132 @@
+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 org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRuntimeService
+
+
+interface BluePrintValidator<T> {
+
+    fun validate(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, type: T)
+
+}
+
+
+interface BluePrintServiceTemplateValidator : BluePrintValidator<ServiceTemplate>
+
+interface BluePrintTopologyTemplateValidator : BluePrintValidator<TopologyTemplate>
+
+interface BluePrintArtifactTypeValidator : BluePrintValidator<ArtifactType>
+
+interface BluePrintDataTypeValidator : BluePrintValidator<DataType>
+
+interface BluePrintNodeTypeValidator : BluePrintValidator<NodeType>
+
+interface BluePrintNodeTemplateValidator : BluePrintValidator<NodeTemplate>
+
+interface BluePrintWorkflowValidator : BluePrintValidator<Workflow>
+
+interface BluePrintPropertyDefinitionValidator : BluePrintValidator<PropertyDefinition>
+
+interface BluePrintAttributeDefinitionValidator : BluePrintValidator<AttributeDefinition>
+
+/**
+ * Blueprint Validation Interface.
+ */
+interface BluePrintValidatorService {
+
+    @Throws(BluePrintException::class)
+    fun validateBluePrints(basePath: String): Boolean
+
+    @Throws(BluePrintException::class)
+    fun validateBluePrints(bluePrintRuntimeService: BluePrintRuntimeService<*>): Boolean
+}
+
+
+interface BluePrintTypeValidatorService {
+
+    fun getServiceTemplateValidators(): List<BluePrintServiceTemplateValidator>
+
+    fun getDataTypeValidators(): List<BluePrintDataTypeValidator>
+
+    fun getArtifactTypeValidators(): List<BluePrintArtifactTypeValidator>
+
+    fun getNodeTypeValidators(): List<BluePrintNodeTypeValidator>
+
+    fun getTopologyTemplateValidators(): List<BluePrintTopologyTemplateValidator>
+
+    fun getNodeTemplateValidators(): List<BluePrintNodeTemplateValidator>
+
+    fun getWorkflowValidators(): List<BluePrintWorkflowValidator>
+
+    fun getPropertyDefinitionValidators(): List<BluePrintPropertyDefinitionValidator>
+
+    fun getAttributeDefinitionValidators(): List<BluePrintAttributeDefinitionValidator>
+
+    fun validateServiceTemplate(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, serviceTemplate: ServiceTemplate) {
+        val validators = getServiceTemplateValidators()
+        doValidation(bluePrintRuntimeService, name, serviceTemplate, validators)
+    }
+
+    fun validateArtifactType(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, artifactType: ArtifactType) {
+        val validators = getArtifactTypeValidators()
+        doValidation(bluePrintRuntimeService, name, artifactType, validators)
+    }
+
+    fun validateDataType(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, dataType: DataType) {
+        val validators = getDataTypeValidators()
+        doValidation(bluePrintRuntimeService, name, dataType, validators)
+    }
+
+    fun validateNodeType(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, nodeType: NodeType) {
+        val validators = getNodeTypeValidators()
+        doValidation(bluePrintRuntimeService, name, nodeType, validators)
+    }
+
+    fun validateTopologyTemplate(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, topologyTemplate: TopologyTemplate) {
+        val validators = getTopologyTemplateValidators()
+        doValidation(bluePrintRuntimeService, name, topologyTemplate, validators)
+    }
+
+    fun validateNodeTemplate(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, nodeTemplate: NodeTemplate) {
+        val validators = getNodeTemplateValidators()
+        doValidation(bluePrintRuntimeService, name, nodeTemplate, validators)
+    }
+
+    fun validateWorkflow(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, workflow: Workflow) {
+        val validators = getWorkflowValidators()
+        doValidation(bluePrintRuntimeService, name, workflow, validators)
+    }
+
+    fun validatePropertyDefinitions(bluePrintRuntimeService: BluePrintRuntimeService<*>, properties: MutableMap<String, PropertyDefinition>) {
+        properties.forEach { propertyName, propertyDefinition ->
+            validatePropertyDefinition(bluePrintRuntimeService, propertyName, propertyDefinition)
+        }
+    }
+
+    fun validatePropertyDefinition(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, propertyDefinition: PropertyDefinition) {
+        val validators = getPropertyDefinitionValidators()
+        doValidation(bluePrintRuntimeService, name, propertyDefinition, validators)
+    }
+
+    fun validateAttributeDefinitions(bluePrintRuntimeService: BluePrintRuntimeService<*>, attributes: MutableMap<String, AttributeDefinition>) {
+        attributes.forEach { attributeName, attributeDefinition ->
+            validateAttributeDefinition(bluePrintRuntimeService, attributeName, attributeDefinition)
+        }
+    }
+
+    fun validateAttributeDefinition(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, attributeDefinition: AttributeDefinition) {
+        val validators = getAttributeDefinitionValidators()
+        doValidation(bluePrintRuntimeService, name, attributeDefinition, validators)
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    private fun <T> doValidation(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, definition: Any, validators: List<BluePrintValidator<T>>) {
+        validators.forEach {
+            it.validate(bluePrintRuntimeService, name, definition as T)
+        }
+    }
+}
+
+
+
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintChainedService.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintChainedService.kt
new file mode 100644
index 00000000..3c637bde
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintChainedService.kt
@@ -0,0 +1,117 @@
+/*
+ * 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
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContext.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContext.kt
new file mode 100644
index 00000000..a0bf054b
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContext.kt
@@ -0,0 +1,254 @@
+/*
+ * 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
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionService.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionService.kt
new file mode 100644
index 00000000..caa02dbc
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionService.kt
@@ -0,0 +1,173 @@
+/*
+ * 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
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintImportService.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintImportService.kt
new file mode 100644
index 00000000..26eb19de
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintImportService.kt
@@ -0,0 +1,96 @@
+/*
+ * 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.BluePrintException
+import org.onap.ccsdk.apps.controllerblueprints.core.data.ImportDefinition
+import org.onap.ccsdk.apps.controllerblueprints.core.data.ServiceTemplate
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.ServiceTemplateUtils
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import java.io.File
+import java.net.URL
+import java.net.URLDecoder
+import java.nio.charset.Charset
+
+class BluePrintImportService(private val parentServiceTemplate: ServiceTemplate, private val blueprintBasePath: String) {
+    companion object {
+        private const val PARENT_SERVICE_TEMPLATE: String = "parent"
+    }
+
+    private val log: Logger = LoggerFactory.getLogger(this::class.toString())
+
+    private var importServiceTemplateMap: MutableMap<String, ServiceTemplate> = hashMapOf()
+
+
+    fun getImportResolvedServiceTemplate(): ServiceTemplate {
+        // Populate Imported Service Templates
+        traverseSchema(PARENT_SERVICE_TEMPLATE, parentServiceTemplate)
+
+        importServiceTemplateMap.forEach { key, serviceTemplate ->
+            ServiceTemplateUtils.merge(parentServiceTemplate, serviceTemplate)
+            log.debug("merged service template $key")
+        }
+        return parentServiceTemplate
+    }
+
+    private fun traverseSchema(key: String, serviceTemplate: ServiceTemplate) {
+        if (key != PARENT_SERVICE_TEMPLATE) {
+            importServiceTemplateMap[key] = serviceTemplate
+        }
+        val imports: List<ImportDefinition>? = serviceTemplate.imports
+
+        imports?.let {
+            serviceTemplate.imports?.forEach { importDefinition ->
+                val childServiceTemplate = resolveImportDefinition(importDefinition)
+                val keyName: String = importDefinition.file
+                traverseSchema(keyName, childServiceTemplate)
+            }
+        }
+    }
+
+    private fun resolveImportDefinition(importDefinition: ImportDefinition): ServiceTemplate {
+        var serviceTemplate: ServiceTemplate? = null
+        val file: String = importDefinition.file
+        val decodedSystemId: String = URLDecoder.decode(file, Charset.defaultCharset().toString())
+        log.trace("file ({}), decodedSystemId ({}) ", file, decodedSystemId)
+        try {
+            if (decodedSystemId.startsWith("http", true)
+                    || decodedSystemId.startsWith("https", true)) {
+                val givenUrl: String = URL(decodedSystemId).toString()
+                val systemUrl: String = File(".").toURI().toURL().toString()
+                log.trace("givenUrl ({}), systemUrl ({}) ", givenUrl, systemUrl)
+                if (givenUrl.startsWith(systemUrl)) {
+
+                }
+            } else {
+                if (!decodedSystemId.startsWith("/")) {
+                    importDefinition.file = StringBuilder().append(blueprintBasePath).append(File.separator).append(file).toString()
+                }
+                serviceTemplate = ServiceTemplateUtils.getServiceTemplate(importDefinition.file)
+            }
+        } catch (e: Exception) {
+            throw BluePrintException("failed to populate service template for ${importDefinition.file}", e)
+        }
+        if (serviceTemplate == null) {
+            throw BluePrintException("failed to populate service template for :  ${importDefinition.file}")
+        }
+        return serviceTemplate
+    }
+
+
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintParserService.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintParserService.kt
new file mode 100644
index 00000000..b1d67ece
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintParserService.kt
@@ -0,0 +1,62 @@
+/*
+ * 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)
+    }
+
+
+}
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRepoFileService.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRepoFileService.kt
new file mode 100644
index 00000000..5d6ca757
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRepoFileService.kt
@@ -0,0 +1,71 @@
+/*
+ * 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
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeService.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeService.kt
new file mode 100644
index 00000000..5c10f80c
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeService.kt
@@ -0,0 +1,501 @@
+/*
+ * 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
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintTemplateService.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintTemplateService.kt
new file mode 100644
index 00000000..d175fdde
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintTemplateService.kt
@@ -0,0 +1,94 @@
+/*
+ * 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.core.io.CharTypes
+import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.databind.node.JsonNodeFactory
+import com.fasterxml.jackson.databind.node.TextNode
+import org.apache.commons.lang3.BooleanUtils
+import org.apache.commons.lang3.StringUtils
+import org.apache.velocity.VelocityContext
+import org.apache.velocity.app.Velocity
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintProcessorException
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
+import java.io.StringWriter
+
+open class BluePrintTemplateService {
+
+    companion object {
+
+        /**
+         * Generate Content from Velocity Template and JSON Content.
+         */
+        fun generateContent(template: String, json: String,
+                            ignoreJsonNull: Boolean = false,
+                            additionalContext: MutableMap<String, Any> = hashMapOf()): String {
+            Velocity.init()
+            val mapper = ObjectMapper()
+            val nodeFactory = BluePrintJsonNodeFactory()
+            mapper.setNodeFactory(nodeFactory)
+
+            val jsonNode = mapper.readValue<JsonNode>(json, JsonNode::class.java)
+                    ?: throw BluePrintProcessorException("couldn't get json node from json")
+
+            if (ignoreJsonNull)
+                JacksonUtils.removeJsonNullNode(jsonNode)
+
+            val velocityContext = VelocityContext()
+            velocityContext.put("StringUtils", StringUtils::class.java)
+            velocityContext.put("BooleanUtils", BooleanUtils::class.java)
+            /**
+             * Add the Custom Velocity Context API
+             */
+            additionalContext.forEach { name, value -> velocityContext.put(name, value) }
+            /**
+             * Add the JSON Data to the context
+             */
+            jsonNode.fields().forEach { entry ->
+                velocityContext.put(entry.key, entry.value)
+            }
+
+            val stringWriter = StringWriter()
+            Velocity.evaluate(velocityContext, stringWriter, "TemplateData", template)
+            stringWriter.flush()
+            return stringWriter.toString()
+        }
+    }
+}
+
+/**
+ * Customise JsonNodeFactory adn TextNode, Since it introduces quotes for string data.
+ */
+open class BluePrintJsonNodeFactory : JsonNodeFactory() {
+    override fun textNode(text: String): TextNode {
+        return BluePrintTextNode(text)
+    }
+}
+
+open class BluePrintTextNode(v: String) : TextNode(v) {
+    override fun toString(): String {
+        var len = this._value.length
+        len = len + 2 + (len shr 4)
+        val sb = StringBuilder(len)
+        CharTypes.appendQuoted(sb, this._value)
+        return sb.toString()
+    }
+
+}
+
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorService.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorService.kt
new file mode 100644
index 00000000..9ee53146
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorService.kt
@@ -0,0 +1,607 @@
+/*
+ * 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
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/PropertyAssignmentService.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/PropertyAssignmentService.kt
new file mode 100644
index 00000000..81b7acb5
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/PropertyAssignmentService.kt
@@ -0,0 +1,210 @@
+/*
+ * 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 ""
+    }
+}
+
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintArchiveUtils.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintArchiveUtils.kt
new file mode 100755
index 00000000..fe7929e8
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintArchiveUtils.kt
@@ -0,0 +1,147 @@
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2019 Bell Canada.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onap.ccsdk.apps.controllerblueprints.core.utils
+
+import kotlinx.coroutines.async
+import kotlinx.coroutines.runBlocking
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry
+import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream
+import org.apache.commons.io.IOUtils
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintProcessorException
+import org.slf4j.LoggerFactory
+import java.io.BufferedInputStream
+import java.io.File
+import java.io.FileInputStream
+import java.io.IOException
+import java.nio.charset.Charset
+import java.util.zip.ZipFile
+
+class BluePrintArchiveUtils {
+
+    companion object {
+        private val log = LoggerFactory.getLogger(BluePrintArchiveUtils::class.java)
+
+        fun getFileContent(fileName: String): String = runBlocking {
+            async {
+                try {
+                    File(fileName).readText(Charsets.UTF_8)
+                } catch (e: Exception) {
+                    throw BluePrintException("couldn't find file($fileName)")
+                }
+            }.await()
+        }
+
+        fun compress(source: String, destination: String, absolute: Boolean): Boolean {
+            val rootDir = File(source)
+            val saveFile = File(destination)
+            return compress(rootDir, saveFile, absolute)
+        }
+
+        /**
+         * Create a new Zip from a root directory
+         *
+         * @param source the base directory
+         * @param destination the output filename
+         * @param absolute store absolute filepath (from directory) or only filename
+         * @return True if OK
+         */
+        fun compress(source: File, destination: File, absolute: Boolean): Boolean {
+            try {
+                ZipArchiveOutputStream(destination).use {
+                    recurseFiles(source, source, it, absolute)
+                }
+            } catch (e: Exception) {
+                log.error("Fail to compress folder(:$source) to path(${destination.path}", e)
+                return false
+            }
+            return true
+        }
+
+        /**
+         * Recursive traversal to add files
+         *
+         * @param root
+         * @param file
+         * @param zaos
+         * @param absolute
+         * @throws IOException
+         */
+        @Throws(IOException::class)
+        private fun recurseFiles(root: File, file: File, zaos: ZipArchiveOutputStream,
+                                 absolute: Boolean) {
+            if (file.isDirectory) {
+                // recursive call
+                val files = file.listFiles()
+                for (fileChild in files!!) {
+                    recurseFiles(root, fileChild, zaos, absolute)
+                }
+            } else if (!file.name.endsWith(".zip") && !file.name.endsWith(".ZIP")) {
+                val filename = if (absolute) {
+                    file.absolutePath.substring(root.absolutePath.length)
+                } else {
+                    file.name
+                }
+                val zae = ZipArchiveEntry(filename)
+                zae.size = file.length()
+                zaos.putArchiveEntry(zae)
+                FileInputStream(file).use { IOUtils.copy(it, zaos) }
+                zaos.closeArchiveEntry()
+            }
+        }
+
+
+        fun deCompress(zipFile: File, targetPath: String): File {
+            val zip = ZipFile(zipFile, Charset.defaultCharset())
+            val enumeration = zip.entries()
+            while (enumeration.hasMoreElements()) {
+                val entry = enumeration.nextElement()
+                val destFilePath = File(targetPath, entry.name)
+                destFilePath.parentFile.mkdirs()
+
+                if (entry.isDirectory)
+                    continue
+
+                val bufferedIs = BufferedInputStream(zip.getInputStream(entry))
+                bufferedIs.use {
+                    destFilePath.outputStream().buffered(1024).use { bos ->
+                        bufferedIs.copyTo(bos)
+                    }
+                }
+            }
+
+            val destinationDir = File(targetPath)
+            check(destinationDir.isDirectory && destinationDir.exists()) {
+                throw BluePrintProcessorException("failed to decompress blueprint(${zipFile.absolutePath}) to ($targetPath) ")
+            }
+
+            return destinationDir
+        }
+
+        /**
+         * Get the first item in directory
+         *
+         * @param zipFile
+         * @return string
+         */
+        fun getFirstItemInDirectory(dir: File): String {
+            return dir.walk().map { it.name }.elementAt(1)
+        }
+    }
+
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintFileUtils.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintFileUtils.kt
new file mode 100755
index 00000000..9746bf57
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintFileUtils.kt
@@ -0,0 +1,253 @@
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2019 Bell Canada.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onap.ccsdk.apps.controllerblueprints.core.utils
+
+import com.att.eelf.configuration.EELFLogger
+import com.att.eelf.configuration.EELFManager
+import kotlinx.coroutines.runBlocking
+import org.apache.commons.io.FileUtils
+import org.apache.commons.lang3.StringUtils
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
+import org.onap.ccsdk.apps.controllerblueprints.core.data.ErrorCode
+import org.onap.ccsdk.apps.controllerblueprints.core.data.ImportDefinition
+import org.onap.ccsdk.apps.controllerblueprints.core.data.ServiceTemplate
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext
+import java.io.File
+import java.io.FileFilter
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.Paths
+import java.nio.file.StandardOpenOption
+
+
+class BluePrintFileUtils {
+    companion object {
+
+        private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())
+
+        fun createEmptyBluePrint(basePath: String) {
+
+            val blueprintDir = File(basePath)
+            FileUtils.deleteDirectory(blueprintDir)
+
+            Files.createDirectories(blueprintDir.toPath())
+
+            val metaDataDir = File(blueprintDir.absolutePath.plus(File.separator).plus(BluePrintConstants.TOSCA_METADATA_DIR))
+            Files.createDirectories(metaDataDir.toPath())
+
+            val metaFile = File(blueprintDir.absolutePath.plus(File.separator).plus(BluePrintConstants
+                    .TOSCA_METADATA_ENTRY_DEFINITION_FILE))
+            Files.write(metaFile.toPath(), getMetaDataContent().toByteArray(), StandardOpenOption.CREATE_NEW)
+
+            val definitionsDir = File(blueprintDir.absolutePath.plus(File.separator).plus(BluePrintConstants.TOSCA_DEFINITIONS_DIR))
+            Files.createDirectories(definitionsDir.toPath())
+
+            val scriptsDir = File(blueprintDir.absolutePath.plus(File.separator).plus(BluePrintConstants.TOSCA_SCRIPTS_DIR))
+            Files.createDirectories(scriptsDir.toPath())
+
+            val plansDir = File(blueprintDir.absolutePath.plus(File.separator).plus(BluePrintConstants.TOSCA_PLANS_DIR))
+            Files.createDirectories(plansDir.toPath())
+
+            val templatesDir = File(blueprintDir.absolutePath.plus(File.separator).plus(BluePrintConstants.TOSCA_TEMPLATES_DIR))
+            Files.createDirectories(templatesDir.toPath())
+
+        }
+
+        fun copyBluePrint(sourcePath: String, targetPath: String) {
+            val sourceFile = File(sourcePath)
+            val targetFile = File(targetPath)
+            sourceFile.copyRecursively(targetFile, true)
+        }
+
+        fun deleteBluePrintTypes(basePath: String) {
+            val definitionPath = basePath.plus(File.separator).plus(BluePrintConstants.TOSCA_DEFINITIONS_DIR)
+            log.info("deleting definition types under : $definitionPath")
+
+            val definitionDir = File(definitionPath)
+            // Find the Type Definitions
+            val fileFilter = FileFilter { pathname -> pathname.absolutePath.endsWith("_types.json") }
+            // Delete the Type Files
+            definitionDir.listFiles(fileFilter).forEach {
+                Files.deleteIfExists(it.toPath())
+            }
+        }
+
+        fun writeEnhancedBluePrint(blueprintContext: BluePrintContext) {
+
+            // Write Blueprint Types
+            writeBluePrintTypes(blueprintContext)
+            // Re Populate the Imports
+            populateDefaultImports(blueprintContext)
+            // Rewrite the Entry Definition Files
+            writeEntryDefinitionFile(blueprintContext)
+
+        }
+
+        fun writeBluePrintTypes(blueprintContext: BluePrintContext) {
+
+            val basePath = blueprintContext.rootPath
+            val definitionPath = basePath.plus(File.separator).plus(BluePrintConstants.TOSCA_DEFINITIONS_DIR)
+            val definitionDir = File(definitionPath)
+
+            check(definitionDir.exists()) {
+                throw BluePrintException(ErrorCode.BLUEPRINT_PATH_MISSING.value, "couldn't get definition file under " +
+                        "path(${definitionDir.absolutePath})")
+            }
+
+            blueprintContext.serviceTemplate.dataTypes?.let {
+                val dataTypesContent = JacksonUtils.getWrappedJson(BluePrintConstants.PATH_DATA_TYPES, it.toSortedMap(), true)
+                writeTypeFile(definitionDir.absolutePath, BluePrintConstants.PATH_DATA_TYPES, dataTypesContent)
+            }
+
+            blueprintContext.serviceTemplate.relationshipTypes?.let {
+                val nodeTypesContent = JacksonUtils.getWrappedJson(BluePrintConstants.PATH_RELATIONSHIP_TYPES, it.toSortedMap(), true)
+                writeTypeFile(definitionDir.absolutePath, BluePrintConstants.PATH_RELATIONSHIP_TYPES, nodeTypesContent)
+            }
+
+            blueprintContext.serviceTemplate.artifactTypes?.let {
+                val artifactTypesContent = JacksonUtils.getWrappedJson(BluePrintConstants.PATH_ARTIFACT_TYPES, it.toSortedMap(), true)
+                writeTypeFile(definitionDir.absolutePath, BluePrintConstants.PATH_ARTIFACT_TYPES, artifactTypesContent)
+            }
+
+            blueprintContext.serviceTemplate.nodeTypes?.let {
+                val nodeTypesContent = JacksonUtils.getWrappedJson(BluePrintConstants.PATH_NODE_TYPES, it.toSortedMap(), true)
+                writeTypeFile(definitionDir.absolutePath, BluePrintConstants.PATH_NODE_TYPES, nodeTypesContent)
+            }
+
+            blueprintContext.serviceTemplate.policyTypes?.let {
+                val nodeTypesContent = JacksonUtils.getWrappedJson(BluePrintConstants.PATH_POLICY_TYPES, it.toSortedMap(), true)
+                writeTypeFile(definitionDir.absolutePath, BluePrintConstants.PATH_POLICY_TYPES, nodeTypesContent)
+            }
+        }
+
+        private fun populateDefaultImports(blueprintContext: BluePrintContext) {
+            // Get the Default Types
+            val types = arrayListOf(BluePrintConstants.PATH_DATA_TYPES, BluePrintConstants.PATH_RELATIONSHIP_TYPES,
+                    BluePrintConstants.PATH_ARTIFACT_TYPES, BluePrintConstants.PATH_NODE_TYPES,
+                    BluePrintConstants.PATH_POLICY_TYPES)
+
+            // Clean Type Imports
+            cleanImportTypes(blueprintContext.serviceTemplate)
+
+            val imports = mutableListOf<ImportDefinition>()
+            types.forEach { typeName ->
+                val import = ImportDefinition()
+                import.file = BluePrintConstants.TOSCA_DEFINITIONS_DIR.plus("/$typeName.json")
+                imports.add(import)
+            }
+
+            blueprintContext.serviceTemplate.imports = imports
+        }
+
+        fun cleanImportTypes(serviceTemplate: ServiceTemplate) {
+            // Clean the Type imports
+            val toDeleteTypes = serviceTemplate.imports?.filter {
+                it.file.endsWith("_types.json")
+            }
+
+            if (toDeleteTypes != null && toDeleteTypes.isNotEmpty()) {
+                serviceTemplate.imports?.removeAll(toDeleteTypes)
+            }
+        }
+
+        /**
+         * Re Generate the Blueprint Service Template Definition file based on BluePrint Context.
+         */
+        private fun writeEntryDefinitionFile(blueprintContext: BluePrintContext) {
+
+            val absoluteEntryDefinitionFile = blueprintContext.rootPath.plus(File.separator).plus(blueprintContext.entryDefinition)
+
+            val serviceTemplate = blueprintContext.serviceTemplate
+
+            // Clone the Service Template
+            val writeServiceTemplate = serviceTemplate.clone()
+            writeServiceTemplate.dataTypes = null
+            writeServiceTemplate.artifactTypes = null
+            writeServiceTemplate.policyTypes = null
+            writeServiceTemplate.relationshipTypes = null
+            writeServiceTemplate.nodeTypes = null
+
+            // Write the Service Template
+            writeDefinitionFile(absoluteEntryDefinitionFile, JacksonUtils.getJson(writeServiceTemplate, true))
+        }
+
+        fun writeDefinitionFile(definitionFileName: String, content: String) = runBlocking {
+            val definitionFile = File(definitionFileName)
+            // Delete the File If exists
+            Files.deleteIfExists(definitionFile.toPath())
+
+            Files.write(definitionFile.toPath(), content.toByteArray(), StandardOpenOption.CREATE_NEW)
+            check(definitionFile.exists()) {
+                throw BluePrintException(ErrorCode.BLUEPRINT_WRITING_FAIL.value, "couldn't write definition file under " +
+                        "path(${definitionFile.absolutePath})")
+            }
+        }
+
+        private fun writeTypeFile(definitionPath: String, type: String, content: String) = runBlocking {
+            val typeFile = File(definitionPath.plus(File.separator).plus("$type.json"))
+
+            Files.write(typeFile.toPath(), content.toByteArray(), StandardOpenOption.CREATE_NEW)
+            check(typeFile.exists()) {
+                throw BluePrintException(ErrorCode.BLUEPRINT_WRITING_FAIL.value, "couldn't write $type.json file under " +
+                        "path(${typeFile.absolutePath})")
+            }
+        }
+
+        private fun getMetaDataContent(): String {
+            return "TOSCA-Meta-File-Version: 1.0.0" +
+                    "\nCSAR-Version: <VERSION>" +
+                    "\nCreated-By: <AUTHOR NAME>" +
+                    "\nEntry-Definitions: Definitions/<BLUEPRINT_NAME>.json" +
+                    "\nTemplate-Tags: <TAGS>"
+        }
+
+       
+        fun getBluePrintFile(fileName: String, targetPath: Path) : File {
+            val filePath = targetPath.resolve(fileName).toString()
+            val file = File(filePath)
+            check(file.exists()) {
+                throw BluePrintException(ErrorCode.BLUEPRINT_PATH_MISSING.value, "couldn't get definition file under " +
+                        "path(${file.absolutePath})")
+            }
+            return file
+        }
+
+        fun getCbaStorageDirectory(path: String): Path {
+            check(StringUtils.isNotBlank(path)) {
+                throw BluePrintException(ErrorCode.BLUEPRINT_PATH_MISSING.value, "couldn't get " +
+                        "Blueprint folder under path($path)")
+            }
+
+            val fileStorageLocation = Paths.get(path).toAbsolutePath().normalize()
+
+            if (!Files.exists(fileStorageLocation))
+                Files.createDirectories(fileStorageLocation)
+
+            return fileStorageLocation
+        }
+
+        fun stripFileExtension(fileName: String): String {
+            val dotIndexe = fileName.lastIndexOf('.')
+
+            // In case dot is in first position, we are dealing with a hidden file rather than an extension
+            return if (dotIndexe > 0) fileName.substring(0, dotIndexe) else fileName
+        }
+
+    }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintMetadataUtils.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintMetadataUtils.kt
new file mode 100644
index 00000000..7764bc19
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintMetadataUtils.kt
@@ -0,0 +1,144 @@
+/*
+ * 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
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintRuntimeUtils.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintRuntimeUtils.kt
new file mode 100644
index 00000000..c37d8eea
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintRuntimeUtils.kt
@@ -0,0 +1,61 @@
+/*
+ * 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
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/JacksonReactorUtils.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/JacksonReactorUtils.kt
new file mode 100644
index 00000000..0522e1f5
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/JacksonReactorUtils.kt
@@ -0,0 +1,109 @@
+/*
+ *  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
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/JacksonUtils.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/JacksonUtils.kt
new file mode 100644
index 00000000..75310ee8
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/JacksonUtils.kt
@@ -0,0 +1,287 @@
+/*
+ * 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
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/ResourceResolverUtils.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/ResourceResolverUtils.kt
new file mode 100644
index 00000000..965e965c
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/ResourceResolverUtils.kt
@@ -0,0 +1,62 @@
+/*
+ * 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
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/ServiceTemplateUtils.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/ServiceTemplateUtils.kt
new file mode 100644
index 00000000..93316132
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/ServiceTemplateUtils.kt
@@ -0,0 +1,110 @@
+/*
+ * 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
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/TopologicalSortingUtils.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/TopologicalSortingUtils.kt
new file mode 100644
index 00000000..b3adab08
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/TopologicalSortingUtils.kt
@@ -0,0 +1,131 @@
+/*
+ * 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
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintArtifactTypeValidatorImpl.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintArtifactTypeValidatorImpl.kt
new file mode 100644
index 00000000..e383588e
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintArtifactTypeValidatorImpl.kt
@@ -0,0 +1,33 @@
+/*
+ * 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.validation
+
+import org.onap.ccsdk.apps.controllerblueprints.core.data.ArtifactType
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintArtifactTypeValidator
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRuntimeService
+
+open class BluePrintArtifactTypeValidatorImpl(private val bluePrintTypeValidatorService: BluePrintTypeValidatorService) : BluePrintArtifactTypeValidator {
+
+    override fun validate(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, artifactType: ArtifactType) {
+
+        artifactType.properties?.let {
+            bluePrintTypeValidatorService.validatePropertyDefinitions(bluePrintRuntimeService, artifactType.properties!!)
+        }
+        // TODO ("Files Present ")
+    }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintAttributeDefinitionValidatorImpl.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintAttributeDefinitionValidatorImpl.kt
new file mode 100644
index 00000000..53a27b53
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintAttributeDefinitionValidatorImpl.kt
@@ -0,0 +1,29 @@
+/*
+ * 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.validation
+
+import org.onap.ccsdk.apps.controllerblueprints.core.data.AttributeDefinition
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintAttributeDefinitionValidator
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRuntimeService
+
+open class BluePrintAttributeDefinitionValidatorImpl(private val bluePrintTypeValidatorService: BluePrintTypeValidatorService) : BluePrintAttributeDefinitionValidator {
+
+    override fun validate(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, type: AttributeDefinition) {
+        //TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintDataTypeValidatorImpl.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintDataTypeValidatorImpl.kt
new file mode 100644
index 00000000..980302bf
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintDataTypeValidatorImpl.kt
@@ -0,0 +1,37 @@
+/*
+ * 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.validation
+
+import com.att.eelf.configuration.EELFLogger
+import com.att.eelf.configuration.EELFManager
+import org.onap.ccsdk.apps.controllerblueprints.core.data.DataType
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintDataTypeValidator
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRuntimeService
+
+open class BluePrintDataTypeValidatorImpl(private val bluePrintTypeValidatorService: BluePrintTypeValidatorService) : BluePrintDataTypeValidator {
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(BluePrintDataTypeValidatorImpl::class.toString())
+
+    override fun validate(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, dataType: DataType) {
+        log.trace("Validating DataType($name)")
+
+        dataType.properties?.let {
+
+            bluePrintTypeValidatorService.validatePropertyDefinitions(bluePrintRuntimeService, dataType.properties!!)
+        }
+    }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintNodeTemplateValidatorImpl.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintNodeTemplateValidatorImpl.kt
new file mode 100644
index 00000000..0ed87f81
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintNodeTemplateValidatorImpl.kt
@@ -0,0 +1,298 @@
+/*
+ * 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.validation
+
+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.BluePrintException
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintTypes
+import org.onap.ccsdk.apps.controllerblueprints.core.data.*
+import org.onap.ccsdk.apps.controllerblueprints.core.format
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintNodeTemplateValidator
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintExpressionService
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRuntimeService
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
+
+
+open class BluePrintNodeTemplateValidatorImpl(private val bluePrintTypeValidatorService: BluePrintTypeValidatorService) : BluePrintNodeTemplateValidator {
+
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(BluePrintNodeTemplateValidatorImpl::class.toString())
+
+    lateinit var bluePrintRuntimeService: BluePrintRuntimeService<*>
+    lateinit var bluePrintContext: BluePrintContext
+    var paths: MutableList<String> = arrayListOf()
+
+    override fun validate(bluePrintRuntimeService: BluePrintRuntimeService<*>, nodeTemplateName: String, nodeTemplate: NodeTemplate) {
+        log.info("Validating NodeTemplate($nodeTemplateName)")
+
+        this.bluePrintRuntimeService = bluePrintRuntimeService
+        this.bluePrintContext = bluePrintRuntimeService.bluePrintContext()
+
+        paths.add(nodeTemplateName)
+
+        val type: String = nodeTemplate.type
+
+        val nodeType: NodeType = bluePrintContext.serviceTemplate.nodeTypes?.get(type)
+                ?: throw BluePrintException("Failed to get NodeType($type) definition for NodeTemplate($nodeTemplateName)")
+
+        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) }
+        nodeTemplate.artifacts?.let { validateArtifactDefinitions(nodeTemplate.artifacts!!) }
+
+        paths.removeAt(paths.lastIndex)
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateArtifactDefinitions(artifacts: MutableMap<String, ArtifactDefinition>) {
+        paths.add("artifacts")
+        artifacts.forEach { artifactDefinitionName, artifactDefinition ->
+            paths.add(artifactDefinitionName)
+            val type: String = artifactDefinition.type
+                    ?: throw BluePrintException("type is missing for ArtifactDefinition$artifactDefinitionName)")
+            // Check Artifact Type
+            checkValidArtifactType(artifactDefinitionName, type)
+
+            val file: String = artifactDefinition.file
+                    ?: throw BluePrintException("file is missing for ArtifactDefinition($artifactDefinitionName)")
+
+            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("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("Failed to get NodeTemplate($nodeTemplateName) capability definition ($capabilityName) " +
+                            "from NodeType(${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("Failed to get NodeTemplate($nodeTemplateName) requirement definition ($requirementName) from" +
+                            " NodeType(${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("Failed to get relationship type ($relationship) for NodeTemplate($nodeTemplateName)'s requirement($requirementAssignmentName)")
+        }
+
+        val relationShipNodeTemplate = bluePrintContext.serviceTemplate.topologyTemplate?.nodeTemplates?.get(requirementNodeTemplateName)
+                ?: throw BluePrintException("Failed to get requirement NodeTemplate($requirementNodeTemplateName)'s " +
+                        "for NodeTemplate($nodeTemplateName) requirement($requirementAssignmentName)")
+
+        relationShipNodeTemplate.capabilities?.get(capabilityName)
+                ?: throw BluePrintException("Failed to get requirement NodeTemplate($requirementNodeTemplateName)'s " +
+                        "capability($capabilityName) for NodeTemplate ($nodeTemplateName)'s requirement($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("Failed to get NodeTemplate($nodeTemplateName) interface definition ($interfaceAssignmentName) from" +
+                            " NodeType(${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("Failed to get NodeTemplate($nodeTemplateName) operation definition ($operationAssignmentName)")
+
+                log.info("Validation NodeTemplate($nodeTemplateName) Interface($interfaceAssignmentName) Operation ($operationAssignmentName)")
+
+                val inputs = operationAssignments.inputs
+                val outputs = operationAssignments.outputs
+
+                inputs?.forEach { propertyName, propertyAssignment ->
+                    val propertyDefinition = operationDefinition.inputs?.get(propertyName)
+                            ?: throw BluePrintException("Failed to get NodeTemplate($nodeTemplateName) operation " +
+                                    "definition ($operationAssignmentName) property definition($propertyName)")
+                    // Check the property values with property definition
+                    validatePropertyAssignment(propertyName, propertyDefinition, propertyAssignment)
+                }
+
+                outputs?.forEach { propertyName, propertyAssignment ->
+                    val propertyDefinition = operationDefinition.outputs?.get(propertyName)
+                            ?: throw BluePrintException("Failed to get NodeTemplate($nodeTemplateName) operation definition ($operationAssignmentName) " +
+                                    "output property definition($propertyName)")
+                    // Check the property values with property definition
+                    validatePropertyAssignment(propertyName, propertyDefinition, propertyAssignment)
+                }
+
+            }
+        }
+
+    }
+
+    open fun checkValidArtifactType(artifactDefinitionName: String, artifactTypeName: String) {
+
+        val artifactType = bluePrintContext.serviceTemplate.artifactTypes?.get(artifactTypeName)
+                ?: throw BluePrintException("failed to get 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")
+        }
+    }
+
+    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("property(propertyName) defined of type(propertyType) is not comptable with the value (propertyAssignment)")
+        }
+    }
+
+    private fun checkPropertyDataType(dataTypeName: String, propertyName: String) {
+
+        val dataType = bluePrintContext.serviceTemplate.dataTypes?.get(dataTypeName)
+                ?: throw BluePrintException("DataType ($dataTypeName) for the property ($propertyName) not found")
+
+        checkValidDataTypeDerivedFrom(propertyName, dataType.derivedFrom)
+
+    }
+
+    private fun checkValidDataTypeDerivedFrom(dataTypeName: String, derivedFrom: String) {
+        check(BluePrintTypes.validDataTypeDerivedFroms.contains(derivedFrom)) {
+            throw BluePrintException("Failed to get DataType($dataTypeName)'s  derivedFrom($derivedFrom) definition ")
+        }
+    }
+
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintNodeTypeValidatorImpl.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintNodeTypeValidatorImpl.kt
new file mode 100644
index 00000000..1077f347
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintNodeTypeValidatorImpl.kt
@@ -0,0 +1,155 @@
+/*
+ * 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.validation
+
+import com.att.eelf.configuration.EELFLogger
+import com.att.eelf.configuration.EELFManager
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintTypes
+import org.onap.ccsdk.apps.controllerblueprints.core.checkNotEmptyOrThrow
+import org.onap.ccsdk.apps.controllerblueprints.core.data.*
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintNodeTypeValidator
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRuntimeService
+
+
+open class BluePrintNodeTypeValidatorImpl(private val bluePrintTypeValidatorService: BluePrintTypeValidatorService) : BluePrintNodeTypeValidator {
+
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(BluePrintServiceTemplateValidatorImpl::class.toString())
+
+    lateinit var bluePrintRuntimeService: BluePrintRuntimeService<*>
+    lateinit var bluePrintContext: BluePrintContext
+    var paths: MutableList<String> = arrayListOf()
+
+    override fun validate(bluePrintRuntimeService: BluePrintRuntimeService<*>, nodeTypeName: String, nodeType: NodeType) {
+        log.trace("Validating NodeType($nodeTypeName)")
+        this.bluePrintRuntimeService = bluePrintRuntimeService
+        this.bluePrintContext = bluePrintRuntimeService.bluePrintContext()
+
+        paths.add(nodeTypeName)
+
+        val derivedFrom: String = nodeType.derivedFrom
+        //Check Derived From
+        checkValidNodeTypesDerivedFrom(nodeTypeName, derivedFrom)
+
+        if (!BluePrintTypes.rootNodeTypes().contains(derivedFrom)) {
+            bluePrintContext.serviceTemplate.nodeTypes?.get(derivedFrom)
+                    ?: throw BluePrintException("Failed to get derivedFrom NodeType($derivedFrom)'s for NodeType($nodeTypeName)")
+        }
+
+        nodeType.properties?.let { bluePrintTypeValidatorService.validatePropertyDefinitions(bluePrintRuntimeService, nodeType.properties!!) }
+        nodeType.capabilities?.let { validateCapabilityDefinitions(nodeTypeName, nodeType) }
+        nodeType.requirements?.let { validateRequirementDefinitions(nodeTypeName, nodeType) }
+        nodeType.interfaces?.let { validateInterfaceDefinitions(nodeType.interfaces!!) }
+
+        paths.removeAt(paths.lastIndex)
+    }
+
+    fun checkValidNodeTypesDerivedFrom(nodeTypeName: String, derivedFrom: String) {
+        check(BluePrintTypes.validNodeTypeDerivedFroms.contains(derivedFrom)) {
+            throw BluePrintException("Failed to get node type ($nodeTypeName)'s  derivedFrom($derivedFrom) definition ")
+        }
+    }
+
+    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)
+    }
+
+    open fun validateCapabilityDefinition(nodeTypeName: String, nodeType: NodeType, capabilityName: String,
+                                          capabilityDefinition: CapabilityDefinition) {
+        val capabilityType = capabilityDefinition.type
+        check(BluePrintTypes.validCapabilityTypes.contains(capabilityType)) {
+            throw BluePrintException("failed to get CapabilityType($capabilityType) for NodeType($nodeTypeName)")
+        }
+    }
+
+    open fun validateRequirementDefinitions(nodeName: String, nodeType: NodeType) {
+        paths.add("requirements")
+        val requirements = nodeType.requirements
+
+        requirements?.forEach { requirementDefinitionName, requirementDefinition ->
+            paths.add(requirementDefinitionName)
+            validateRequirementDefinition(nodeName, nodeType, requirementDefinitionName, requirementDefinition)
+            paths.removeAt(paths.lastIndex)
+        }
+        paths.removeAt(paths.lastIndex)
+    }
+
+    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("failed to get relationship($relationship) for NodeType($nodeTypeName)'s requirement($requirementDefinitionName)")
+        }
+
+        val relationShipNodeType = bluePrintContext.serviceTemplate.nodeTypes?.get(requirementNodeTypeName)
+                ?: throw BluePrintException("failed to get requirement NodeType($requirementNodeTypeName)'s for requirement($requirementDefinitionName) ")
+
+        relationShipNodeType.capabilities?.get(capabilityName)
+                ?: throw BluePrintException("failed to get requirement NodeType($requirementNodeTypeName)'s " +
+                        "capability($nodeTypeName) for NodeType ($capabilityName)'s requirement($requirementDefinitionName) ")
+
+    }
+
+    open fun validateInterfaceDefinitions(interfaces: MutableMap<String, InterfaceDefinition>) {
+        paths.add("interfaces")
+        interfaces.forEach { interfaceName, interfaceDefinition ->
+            paths.add(interfaceName)
+            interfaceDefinition.operations?.let { validateOperationDefinitions(interfaceDefinition.operations!!) }
+            paths.removeAt(paths.lastIndex)
+        }
+        paths.removeAt(paths.lastIndex)
+    }
+
+    open fun validateOperationDefinitions(operations: MutableMap<String, OperationDefinition>) {
+        paths.add("operations")
+        operations.forEach { opertaionName, operationDefinition ->
+            paths.add(opertaionName)
+            operationDefinition.implementation?.let { validateImplementation(operationDefinition.implementation!!) }
+
+            operationDefinition.inputs?.let {
+                bluePrintTypeValidatorService.validatePropertyDefinitions(bluePrintRuntimeService, operationDefinition.inputs!!)
+            }
+
+            operationDefinition.outputs?.let {
+                bluePrintTypeValidatorService.validatePropertyDefinitions(bluePrintRuntimeService, operationDefinition.outputs!!)
+            }
+            paths.removeAt(paths.lastIndex)
+        }
+        paths.removeAt(paths.lastIndex)
+    }
+
+    open fun validateImplementation(implementation: Implementation) {
+        checkNotEmptyOrThrow(implementation.primary)
+    }
+
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintPropertyDefinitionValidatorImpl.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintPropertyDefinitionValidatorImpl.kt
new file mode 100644
index 00000000..ca156190
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintPropertyDefinitionValidatorImpl.kt
@@ -0,0 +1,83 @@
+/*
+ * 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.validation
+
+import com.att.eelf.configuration.EELFLogger
+import com.att.eelf.configuration.EELFManager
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintTypes
+import org.onap.ccsdk.apps.controllerblueprints.core.data.PropertyDefinition
+import org.onap.ccsdk.apps.controllerblueprints.core.format
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintPropertyDefinitionValidator
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRuntimeService
+
+open class BluePrintPropertyDefinitionValidatorImpl(private val bluePrintTypeValidatorService: BluePrintTypeValidatorService) : BluePrintPropertyDefinitionValidator {
+
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(BluePrintServiceTemplateValidatorImpl::class.toString())
+
+    lateinit var bluePrintRuntimeService: BluePrintRuntimeService<*>
+
+
+    override fun validate(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, propertyDefinition: PropertyDefinition) {
+        this.bluePrintRuntimeService = bluePrintRuntimeService
+
+
+        log.trace("Validating PropertyDefinition($name)")
+
+        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, name))
+                checkPrimitiveOrComplex(entrySchemaType, name)
+            }
+            else -> checkPropertyDataType(dataType, name)
+        }
+    }
+
+
+    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 checkPropertyDataType(dataTypeName: String, propertyName: String) {
+
+        val dataType = bluePrintRuntimeService.bluePrintContext().serviceTemplate.dataTypes?.get(dataTypeName)
+                ?: throw BluePrintException(format("DataType ({}) for the property ({}) not found", dataTypeName, propertyName))
+
+        checkValidDataTypeDerivedFrom(propertyName, dataType.derivedFrom)
+    }
+
+    private fun checkDataType(key: String): Boolean {
+        return bluePrintRuntimeService.bluePrintContext().serviceTemplate.dataTypes?.containsKey(key) ?: false
+    }
+
+    open fun checkValidDataTypeDerivedFrom(dataTypeName: String, derivedFrom: String) {
+        check(BluePrintTypes.validDataTypeDerivedFroms.contains(derivedFrom)) {
+            throw BluePrintException(format("Failed to get DataType({})'s  derivedFrom({}) definition ", dataTypeName, derivedFrom))
+        }
+    }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintServiceTemplateValidatorImpl.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintServiceTemplateValidatorImpl.kt
new file mode 100644
index 00000000..61159cf8
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintServiceTemplateValidatorImpl.kt
@@ -0,0 +1,107 @@
+/*
+ * 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.validation
+
+import com.att.eelf.configuration.EELFLogger
+import com.att.eelf.configuration.EELFManager
+import com.google.common.base.Preconditions
+import org.apache.commons.lang3.StringUtils
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintError
+import org.onap.ccsdk.apps.controllerblueprints.core.data.*
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintServiceTemplateValidator
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRuntimeService
+
+open class BluePrintServiceTemplateValidatorImpl(private val bluePrintTypeValidatorService: BluePrintTypeValidatorService) : BluePrintServiceTemplateValidator {
+
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(BluePrintServiceTemplateValidatorImpl::class.toString())
+
+    lateinit var bluePrintRuntimeService: BluePrintRuntimeService<*>
+    lateinit var error: BluePrintError
+
+    var paths: MutableList<String> = arrayListOf()
+
+    override fun validate(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, serviceTemplate: ServiceTemplate) {
+        log.trace("Validating Service Template..")
+        try {
+            this.bluePrintRuntimeService = bluePrintRuntimeService
+            this.error = bluePrintRuntimeService.getBluePrintError()
+
+            serviceTemplate.metadata?.let { validateMetadata(serviceTemplate.metadata!!) }
+            serviceTemplate.dataTypes?.let { validateDataTypes(serviceTemplate.dataTypes!!) }
+            serviceTemplate.artifactTypes?.let { validateArtifactTypes(serviceTemplate.artifactTypes!!) }
+            serviceTemplate.nodeTypes?.let { validateNodeTypes(serviceTemplate.nodeTypes!!) }
+            serviceTemplate.topologyTemplate?.let { validateTopologyTemplate(serviceTemplate.topologyTemplate!!) }
+        } catch (e: Exception) {
+            log.error("failed in blueprint service template validation", e)
+            error.addError(BluePrintConstants.PATH_SERVICE_TEMPLATE, paths.joinToString(BluePrintConstants.PATH_DIVIDER), e.message!!)
+        }
+    }
+
+    fun validateMetadata(metaDataMap: MutableMap<String, String>) {
+
+        paths.add(BluePrintConstants.PATH_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)
+    }
+
+
+    fun validateDataTypes(dataTypes: MutableMap<String, DataType>) {
+
+        paths.add(BluePrintConstants.PATH_DATA_TYPES)
+        dataTypes.forEach { dataTypeName, dataType ->
+            // Validate Single Data Type
+            bluePrintTypeValidatorService.validateDataType(bluePrintRuntimeService, dataTypeName, dataType)
+        }
+        paths.removeAt(paths.lastIndex)
+    }
+
+    fun validateArtifactTypes(artifactTypes: MutableMap<String, ArtifactType>) {
+        paths.add(BluePrintConstants.PATH_ARTIFACT_TYPES)
+        artifactTypes.forEach { artifactName, artifactType ->
+            // Validate Single Artifact Type
+            bluePrintTypeValidatorService.validateArtifactType(bluePrintRuntimeService, artifactName, artifactType)
+        }
+        paths.removeAt(paths.lastIndex)
+    }
+
+    fun validateNodeTypes(nodeTypes: MutableMap<String, NodeType>) {
+        paths.add(BluePrintConstants.PATH_NODE_TYPES)
+        nodeTypes.forEach { nodeTypeName, nodeType ->
+            // Validate Single Node Type
+            bluePrintTypeValidatorService.validateNodeType(bluePrintRuntimeService, nodeTypeName, nodeType)
+        }
+        paths.removeAt(paths.lastIndex)
+    }
+
+    fun validateTopologyTemplate(topologyTemplate: TopologyTemplate) {
+        paths.add(BluePrintConstants.PATH_TOPOLOGY_TEMPLATE)
+        bluePrintTypeValidatorService.validateTopologyTemplate(bluePrintRuntimeService, "topologyTemplate", topologyTemplate)
+        paths.removeAt(paths.lastIndex)
+    }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintTopologyTemplateValidatorImpl.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintTopologyTemplateValidatorImpl.kt
new file mode 100644
index 00000000..b87666d2
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintTopologyTemplateValidatorImpl.kt
@@ -0,0 +1,72 @@
+/*
+ * 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.validation
+
+import com.att.eelf.configuration.EELFLogger
+import com.att.eelf.configuration.EELFManager
+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.PropertyDefinition
+import org.onap.ccsdk.apps.controllerblueprints.core.data.TopologyTemplate
+import org.onap.ccsdk.apps.controllerblueprints.core.data.Workflow
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintTopologyTemplateValidator
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRuntimeService
+
+open class BluePrintTopologyTemplateValidatorImpl(private val bluePrintTypeValidatorService: BluePrintTypeValidatorService) : BluePrintTopologyTemplateValidator {
+
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(BluePrintServiceTemplateValidatorImpl::class.toString())
+
+    lateinit var bluePrintRuntimeService: BluePrintRuntimeService<*>
+
+    override fun validate(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, topologyTemplate: TopologyTemplate) {
+        log.trace("Validating Topology Template..")
+        this.bluePrintRuntimeService = bluePrintRuntimeService
+
+        // Validate Inputs
+        topologyTemplate.inputs?.let { validateInputs(topologyTemplate.inputs!!) }
+        // Validate Node Templates
+        topologyTemplate.nodeTemplates?.let { validateNodeTemplates(topologyTemplate.nodeTemplates!!) }
+        // Validate Workflow
+        topologyTemplate.workflows?.let { validateWorkflows(topologyTemplate.workflows!!) }
+    }
+
+    @Throws(BluePrintException::class)
+    fun validateInputs(inputs: MutableMap<String, PropertyDefinition>) {
+        bluePrintTypeValidatorService.validatePropertyDefinitions(bluePrintRuntimeService, inputs)
+    }
+
+
+    @Throws(BluePrintException::class)
+    fun validateNodeTemplates(nodeTemplates: MutableMap<String, NodeTemplate>) {
+
+        nodeTemplates.forEach { nodeTemplateName, nodeTemplate ->
+            // Validate Single Node Template
+            bluePrintTypeValidatorService.validateNodeTemplate(bluePrintRuntimeService, nodeTemplateName, nodeTemplate)
+        }
+    }
+
+    @Throws(BluePrintException::class)
+    open fun validateWorkflows(workflows: MutableMap<String, Workflow>) {
+
+        workflows.forEach { workflowName, workflow ->
+            // Validate Single workflow
+            bluePrintTypeValidatorService.validateWorkflow(bluePrintRuntimeService, workflowName, workflow)
+        }
+    }
+
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintValidatorServiceImpl.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintValidatorServiceImpl.kt
new file mode 100644
index 00000000..4f68342e
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintValidatorServiceImpl.kt
@@ -0,0 +1,48 @@
+/*
+ * 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.validation
+
+import com.att.eelf.configuration.EELFLogger
+import com.att.eelf.configuration.EELFManager
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintValidatorService
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRuntimeService
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.BluePrintMetadataUtils
+import java.util.*
+
+
+open class BluePrintValidatorServiceImpl(private val bluePrintTypeValidatorService: BluePrintTypeValidatorService) : BluePrintValidatorService {
+
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(BluePrintValidatorServiceImpl::class.toString())
+
+    override fun validateBluePrints(basePath: String): Boolean {
+
+        val bluePrintRuntimeService = BluePrintMetadataUtils.getBluePrintRuntime(UUID.randomUUID().toString(), basePath)
+        return validateBluePrints(bluePrintRuntimeService)
+    }
+
+    override fun validateBluePrints(bluePrintRuntimeService: BluePrintRuntimeService<*>): Boolean {
+
+        bluePrintTypeValidatorService.validateServiceTemplate(bluePrintRuntimeService, "service_template",
+                bluePrintRuntimeService.bluePrintContext().serviceTemplate)
+        if (bluePrintRuntimeService.getBluePrintError().errors.size > 0) {
+            throw BluePrintException("failed in blueprint validation : ${bluePrintRuntimeService.getBluePrintError().errors.joinToString("\n")}")
+        }
+        return true
+    }
+}
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintWorkflowValidatorImpl.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintWorkflowValidatorImpl.kt
new file mode 100644
index 00000000..61918fbc
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintWorkflowValidatorImpl.kt
@@ -0,0 +1,76 @@
+/*
+ * 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.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.data.Workflow
+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
+
+open class BluePrintWorkflowValidatorImpl(private val bluePrintTypeValidatorService: BluePrintTypeValidatorService) : BluePrintWorkflowValidator {
+
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(BluePrintServiceTemplateValidatorImpl::class.toString())
+    lateinit var bluePrintRuntimeService: BluePrintRuntimeService<*>
+
+    var paths: MutableList<String> = arrayListOf()
+
+    override fun validate(bluePrintRuntimeService: BluePrintRuntimeService<*>, workflowName: String, workflow: Workflow) {
+        log.info("Validating Workflow($workflowName)")
+
+        this.bluePrintRuntimeService = bluePrintRuntimeService
+
+
+        paths.add(workflowName)
+        paths.joinToString(BluePrintConstants.PATH_DIVIDER)
+
+        // Step Validation Start
+        paths.add("steps")
+        workflow.steps?.forEach { stepName, step ->
+            paths.add(stepName)
+            paths.joinToString(BluePrintConstants.PATH_DIVIDER)
+
+            // Validate target
+            step.target?.let {
+                try {
+                    val nodeTemplate = bluePrintRuntimeService.bluePrintContext().nodeTemplateByName(it)
+
+                    val nodeTypeDerivedFrom = bluePrintRuntimeService.bluePrintContext().nodeTemplateNodeType(it).derivedFrom
+
+                    check(nodeTypeDerivedFrom == BluePrintConstants.MODEL_TYPE_NODE_DG) {
+                        "NodeType(${nodeTemplate.type}) derived from is '$nodeTypeDerivedFrom', Expected is " +
+                                "'${BluePrintConstants.MODEL_TYPE_NODE_DG}'"
+                    }
+                } catch (e: Exception) {
+                    bluePrintRuntimeService.getBluePrintError()
+                            .addError("Failed to validate Workflow($workflowName)'s step($stepName)'s " +
+                                    "definition", paths.joinToString(BluePrintConstants.PATH_DIVIDER), e.message!!)
+                }
+            }
+            paths.removeAt(paths.lastIndex)
+        }
+        paths.removeAt(paths.lastIndex)
+        // Step Validation Ends
+        paths.removeAt(paths.lastIndex)
+
+        workflow.inputs?.let {
+            bluePrintTypeValidatorService.validatePropertyDefinitions(bluePrintRuntimeService, workflow.inputs!!)
+        }
+    }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory b/ms/controllerblueprints/modules/blueprint-core/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
new file mode 100644
index 00000000..89838f44
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
@@ -0,0 +1,17 @@
+#
+# 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.
+#
+
+org.jetbrains.kotlin.script.jsr223.KotlinJsr223JvmLocalScriptEngineFactory
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/CustomFunctionsTest.kt b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/CustomFunctionsTest.kt
new file mode 100644
index 00000000..1b315a21
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/CustomFunctionsTest.kt
@@ -0,0 +1,35 @@
+/*
+ * 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
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/mock/MockBluePrintTypeValidatorService.kt b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/mock/MockBluePrintTypeValidatorService.kt
new file mode 100644
index 00000000..4c174f92
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/mock/MockBluePrintTypeValidatorService.kt
@@ -0,0 +1,59 @@
+/*
+ * 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.mock
+
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.*
+import org.onap.ccsdk.apps.controllerblueprints.core.validation.*
+
+class MockBluePrintTypeValidatorService : BluePrintTypeValidatorService {
+
+    override fun getServiceTemplateValidators(): List<BluePrintServiceTemplateValidator> {
+        return listOf(BluePrintServiceTemplateValidatorImpl(this))
+    }
+
+    override fun getDataTypeValidators(): List<BluePrintDataTypeValidator> {
+        return listOf(BluePrintDataTypeValidatorImpl(this))
+    }
+
+    override fun getArtifactTypeValidators(): List<BluePrintArtifactTypeValidator> {
+        return listOf(BluePrintArtifactTypeValidatorImpl(this))
+    }
+
+    override fun getNodeTypeValidators(): List<BluePrintNodeTypeValidator> {
+        return listOf(BluePrintNodeTypeValidatorImpl(this))
+    }
+
+    override fun getTopologyTemplateValidators(): List<BluePrintTopologyTemplateValidator> {
+        return listOf(BluePrintTopologyTemplateValidatorImpl(this))
+    }
+
+    override fun getNodeTemplateValidators(): List<BluePrintNodeTemplateValidator> {
+        return listOf(BluePrintNodeTemplateValidatorImpl(this))
+    }
+
+    override fun getWorkflowValidators(): List<BluePrintWorkflowValidator> {
+        return listOf(BluePrintWorkflowValidatorImpl(this))
+    }
+
+    override fun getPropertyDefinitionValidators(): List<BluePrintPropertyDefinitionValidator> {
+        return listOf(BluePrintPropertyDefinitionValidatorImpl(this))
+    }
+
+    override fun getAttributeDefinitionValidators(): List<BluePrintAttributeDefinitionValidator> {
+        return listOf(BluePrintAttributeDefinitionValidatorImpl(this))
+    }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContextTest.kt b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContextTest.kt
new file mode 100644
index 00000000..0c4d94f3
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContextTest.kt
@@ -0,0 +1,54 @@
+/*
+ * 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))
+    }
+
+
+}
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionServiceTest.kt b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionServiceTest.kt
new file mode 100644
index 00000000..d68892fc
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionServiceTest.kt
@@ -0,0 +1,117 @@
+/*
+ * 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
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRepoFileServiceTest.kt b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRepoFileServiceTest.kt
new file mode 100644
index 00000000..6f942a36
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRepoFileServiceTest.kt
@@ -0,0 +1,57 @@
+/*
+ * 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
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt
new file mode 100644
index 00000000..7a178758
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt
@@ -0,0 +1,144 @@
+/*
+ * 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
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintTemplateServiceTest.kt b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintTemplateServiceTest.kt
new file mode 100644
index 00000000..663a3751
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintTemplateServiceTest.kt
@@ -0,0 +1,35 @@
+/*
+ * 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.junit.Test
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
+import kotlin.test.assertNotNull
+
+class BluePrintTemplateServiceTest {
+
+    @Test
+    fun testGenerateContent() {
+
+        val template = JacksonUtils.getClassPathFileContent("templates/base-config-template.vtl")
+        val json = JacksonUtils.getClassPathFileContent("templates/base-config-data.json")
+
+        val content = BluePrintTemplateService.generateContent(template, json)
+        assertNotNull(content, "failed to generate content for velocity template")
+
+    }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorDefaultServiceTest.kt b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorDefaultServiceTest.kt
new file mode 100644
index 00000000..861f7d09
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorDefaultServiceTest.kt
@@ -0,0 +1,50 @@
+/*
+ * 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
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintFileUtilsTest.kt b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintFileUtilsTest.kt
new file mode 100644
index 00000000..528f2c6f
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintFileUtilsTest.kt
@@ -0,0 +1,60 @@
+/*
+ * 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 kotlinx.coroutines.runBlocking
+import org.junit.Test
+import java.io.File
+import java.nio.file.Paths
+import kotlin.test.assertTrue
+
+
+class BluePrintFileUtilsTest {
+
+    @Test
+    fun testNewBlueprint() = runBlocking {
+        val targetPath: String = Paths.get("target").toUri().toURL().path.plus("/bp-new-test")
+        BluePrintFileUtils.createEmptyBluePrint(targetPath)
+
+    }
+
+    @Test
+    fun testBlueprintCopy() = runBlocking {
+        val sourcePath: String = "./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration"
+
+        val targetPath: String = Paths.get("target").toUri().toURL().path.plus("/bp-copy-test")
+
+        val targetDir = File(targetPath)
+        targetDir.deleteOnExit()
+        // Copy the BP file
+        BluePrintFileUtils.copyBluePrint(sourcePath, targetDir.absolutePath)
+
+        assertTrue(targetDir.exists(), "faield to copy blueprint to ${targetDir.absolutePath}")
+
+        // Delete Type Files
+        BluePrintFileUtils.deleteBluePrintTypes(targetDir.absolutePath)
+
+        // Generate the Type Files
+        val bluePrintContext = BluePrintMetadataUtils.getBluePrintContext(sourcePath)
+        bluePrintContext.rootPath = targetDir.absolutePath
+
+        BluePrintFileUtils.writeBluePrintTypes(bluePrintContext)
+
+
+    }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintMetadataUtilsTest.kt b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintMetadataUtilsTest.kt
new file mode 100644
index 00000000..80daad5d
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintMetadataUtilsTest.kt
@@ -0,0 +1,41 @@
+/*
+ * 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
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/JacksonUtilsTest.kt b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/JacksonUtilsTest.kt
new file mode 100644
index 00000000..12156d65
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/JacksonUtilsTest.kt
@@ -0,0 +1,78 @@
+/*
+ * 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
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/TopologicalSortingUtilsTest.kt b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/TopologicalSortingUtilsTest.kt
new file mode 100644
index 00000000..5999dbfa
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/TopologicalSortingUtilsTest.kt
@@ -0,0 +1,36 @@
+/*
+ * 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
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintValidatorServiceImplTest.kt b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintValidatorServiceImplTest.kt
new file mode 100644
index 00000000..cfcbd9b2
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/validation/BluePrintValidatorServiceImplTest.kt
@@ -0,0 +1,100 @@
+/*
+ * 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.validation
+
+import io.mockk.every
+import io.mockk.mockk
+import org.junit.Test
+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
+import org.onap.ccsdk.apps.controllerblueprints.core.data.Step
+import org.onap.ccsdk.apps.controllerblueprints.core.data.Workflow
+import org.onap.ccsdk.apps.controllerblueprints.core.mock.MockBluePrintTypeValidatorService
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext
+import org.onap.ccsdk.apps.controllerblueprints.core.service.DefaultBluePrintRuntimeService
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.BluePrintMetadataUtils
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+class BluePrintValidatorServiceImplTest {
+
+    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)
+    private val workflowValidator = BluePrintWorkflowValidatorImpl(mockBluePrintTypeValidatorService)
+
+    @Test
+    fun testValidateOfType() {
+        val valid = defaultBluePrintValidatorService.validateBluePrints(bluePrintRuntime)
+        assertTrue(valid, "failed in blueprint Validation")
+    }
+
+    @Test
+    fun testValidateWorkflowFailToFoundNodeTemplate() {
+        val workflowName = "resource-assignment"
+
+        val step = Step()
+        step.target = "TestCaseFailNoNodeTemplate"
+        val workflow = Workflow()
+        workflow.steps = mutableMapOf("test" to step)
+        workflowValidator.validate(bluePrintRuntime, workflowName, workflow)
+
+        assertEquals(1, bluePrintRuntime.getBluePrintError().errors.size)
+        assertEquals("Failed to validate Workflow(resource-assignment)'s step(test)'s definition : resource-assignment/steps/test : could't get node template for the name(TestCaseFailNoNodeTemplate)", bluePrintRuntime.getBluePrintError().errors[0])
+    }
+
+    @Test
+    fun testValidateWorkflowFailNodeTemplateNotDgGeneric() {
+        val workflowName = "resource-assignment"
+        val nodeTemplateName = "resource-assignment-process"
+
+        val nodeTemplate = mockk<NodeTemplate>()
+        every { nodeTemplate.type } returns "TestNodeType"
+
+        val nodeType = mockk<NodeType>()
+        every { nodeType.derivedFrom } returns "tosca.nodes.TEST"
+
+        val blueprintContext = mockk<BluePrintContext>()
+        every { blueprintContext.nodeTemplateByName(nodeTemplateName) } returns nodeTemplate
+        every { blueprintContext.nodeTemplateNodeType(nodeTemplateName) } returns nodeType
+
+        val bluePrintRuntime = mockk<DefaultBluePrintRuntimeService>("1234")
+
+        every { bluePrintRuntime.getBluePrintError() } returns BluePrintError()
+        every { bluePrintRuntime.bluePrintContext() } returns blueprintContext
+
+        val step = Step()
+        step.target = nodeTemplateName
+        val workflow = Workflow()
+        workflow.steps = mutableMapOf("test" to step)
+        workflowValidator.validate(bluePrintRuntime, workflowName, workflow)
+
+        assertEquals(1, bluePrintRuntime.getBluePrintError().errors.size)
+        assertEquals("Failed to validate Workflow(resource-assignment)'s step(test)'s definition : resource-assignment/steps/test : NodeType(TestNodeType) derived from is 'tosca.nodes.TEST', Expected is 'tosca.nodes.DG'", bluePrintRuntime.getBluePrintError().errors[0])
+    }
+
+    @Test
+    fun testValidateWorkflowSuccess() {
+        val workflowName = "resource-assignment"
+        workflowValidator.validate(bluePrintRuntime, workflowName, bluePrintRuntime.bluePrintContext().workflowByName(workflowName))
+    }
+
+}
+
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/resources/componentnode/default.json b/ms/controllerblueprints/modules/blueprint-core/src/test/resources/componentnode/default.json
new file mode 100644
index 00000000..a1982631
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/resources/componentnode/default.json
@@ -0,0 +1,100 @@
+{
+	"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"
+		}
+	}
+}
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/resources/data/alltype-data.json b/ms/controllerblueprints/modules/blueprint-core/src/test/resources/data/alltype-data.json
new file mode 100644
index 00000000..055b0965
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/resources/data/alltype-data.json
@@ -0,0 +1,10 @@
+{
+  "intValue" : 1,
+  "floatValue" : 1.34,
+  "booleanValue" : true,
+  "stringValue" : "sample-String",
+  "timeValue" : "2018-09-29",
+  "arrayStringValue" : ["one", "two"],
+  "mapValue" : {"profile_name1":"profile_name1",
+                "profile_name2":"profile_name2"}
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/resources/data/default-context.json b/ms/controllerblueprints/modules/blueprint-core/src/test/resources/data/default-context.json
new file mode 100644
index 00000000..3968626b
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/resources/data/default-context.json
@@ -0,0 +1,7 @@
+{
+  "request-id" : "12345",
+  "hostname" : "localhost",
+  "template_name": "baseconfiguration",
+  "template_version": "1.0.0",
+  "action-name" : "sample-action"
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/resources/dictionary/dictionary_schema.json b/ms/controllerblueprints/modules/blueprint-core/src/test/resources/dictionary/dictionary_schema.json
new file mode 100644
index 00000000..cac8770a
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/resources/dictionary/dictionary_schema.json
@@ -0,0 +1,261 @@
+{
+	"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"
+		}
+	}
+}
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/resources/properties/convert.json b/ms/controllerblueprints/modules/blueprint-core/src/test/resources/properties/convert.json
new file mode 100644
index 00000000..f7893ce5
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/resources/properties/convert.json
@@ -0,0 +1,36 @@
+{
+  "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"
+          }
+        }
+      }
+    }
+  }
+}
+
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/resources/properties/default.json b/ms/controllerblueprints/modules/blueprint-core/src/test/resources/properties/default.json
new file mode 100644
index 00000000..9f17574e
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/resources/properties/default.json
@@ -0,0 +1,16 @@
+{
+	"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"
+		}
+	]
+}
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/resources/scripts/SampleBlueprintFunctionNode.kts b/ms/controllerblueprints/modules/blueprint-core/src/test/resources/scripts/SampleBlueprintFunctionNode.kts
new file mode 100644
index 00000000..44cc957d
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/resources/scripts/SampleBlueprintFunctionNode.kts
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BlueprintFunctionNode
+
+open class SampleBlueprintFunctionNode : BlueprintFunctionNode<String, String>{
+
+    override fun getName(): String {
+        return "Kotlin-Script-Function-Node"
+    }
+
+    override fun prepareRequest(executionRequest: String): String {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun process(executionRequest: String) {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun recover(runtimeException: RuntimeException, executionRequest: String) {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun prepareResponse(): String {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun apply(t: String): String {
+        return "$t-status"
+    }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/resources/templates/base-config-data.json b/ms/controllerblueprints/modules/blueprint-core/src/test/resources/templates/base-config-data.json
new file mode 100755
index 00000000..2acc6fcd
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/resources/templates/base-config-data.json
@@ -0,0 +1,36 @@
+{
+	"node0_hostname": "sdnc-host",
+	"node0_backup_router_address": "2001:1890:1253::192:168:100:1",
+	"servers": [
+		"Server1",
+		"Server2",
+		"Server3"
+	],
+	"tacplus-servers": [
+		{
+			"tacplus-server-name": "tacplus-server-name1",
+			"tacplus-server-source-address": "enc-dsdsasa1"
+		},
+		{
+			"tacplus-server-name": "tacplus-server-name2",
+			"tacplus-server-source-address": "enc-dsdsasa2"
+		}
+	],
+	"classes": [
+		{
+			"name": "superuser-class",
+			"idle-timeout": 5,
+			"permissions": "all"
+		},
+		{
+			"name": "tacacs-adv-class",
+			"idle-timeout": 5
+		},
+		{
+			"name": "tacacs-base-class",
+			"idle-timeout": 5
+		}
+	],
+	"system-password": "teamops-system-password",
+	"root-password": "teamops-root-password"
+}
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/resources/templates/base-config-template.vtl b/ms/controllerblueprints/modules/blueprint-core/src/test/resources/templates/base-config-template.vtl
new file mode 100755
index 00000000..f7b1269b
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/resources/templates/base-config-template.vtl
@@ -0,0 +1,61 @@
+<configuration xmlns="http://xml.juniper.net/xnm/1.1/xnm"
+xmlns:a="http://xml.juniper.net/junos/15.1X49/junos">
+	<version>15.1X49-D50.3</version>	
+	<groups>
+		<name>node0</name>
+		<system>
+		#foreach($server in ${servers})
+			<server-host-name>$StringUtils.upperCase("$server")</server-host-name>
+		#end
+		</system>
+		<system>
+			<host-name>${node0_hostname}</host-name>
+			<backup-router>
+				<address>${node0_backup_router_address}</address>
+				<destination>$node0_backup_router_address</destination>
+			</backup-router>
+			#foreach($tacplus-server in ${tacplus-servers})
+			<tacplus-server>
+				<name>$tacplus-server.tacplus-server-name</name>
+				<source-address>$tacplus-server.tacplus-server-source-address</source-address>
+			</tacplus-server>
+			#end
+			<login>
+				<message>ONAP information assets</message>
+				#foreach($class in ${classes})
+				<class>
+					<name>$class.name</name>
+					<idle-timeout>$class.idle-timeout</idle-timeout>
+					#if ($class.permissions)
+					<permissions>$class.permissions</permissions>
+					#end
+				</class>
+				#end	
+				<user>
+					<name>readonly</name>
+					<full-name>Read Only Account Access</full-name>
+					<uid>1001</uid>
+					<class>tacacs-base-class</class>
+				</user>
+				<user>
+					<name>readwrite</name>
+					<full-name>Read - Write Account Access</full-name>
+					<uid>1002</uid>
+					<class>tacacs-adv-class</class>
+					<authentication>
+						<encrypted-password>${system-password}</encrypted-password>
+					</authentication>
+				</user>
+				<user>
+					<name>readwrite</name>
+					<full-name>Emergency Access Only</full-name>
+					<uid>1000</uid>
+					<class>superuser-class</class>
+					<authentication>
+						<encrypted-password>${root-password}</encrypted-password>
+					</authentication>
+				</user>
+			</login>
+		</system>		
+	</groups>	
+</configuration>
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-validation/pom.xml b/ms/controllerblueprints/modules/blueprint-validation/pom.xml
index d175eecf..4ae2870e 100644
--- a/ms/controllerblueprints/modules/blueprint-validation/pom.xml
+++ b/ms/controllerblueprints/modules/blueprint-validation/pom.xml
@@ -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>
diff --git a/ms/controllerblueprints/modules/db-resources/pom.xml b/ms/controllerblueprints/modules/db-resources/pom.xml
index c09d96c1..b2f4370b 100644
--- a/ms/controllerblueprints/modules/db-resources/pom.xml
+++ b/ms/controllerblueprints/modules/db-resources/pom.xml
@@ -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>
diff --git a/ms/controllerblueprints/modules/pom.xml b/ms/controllerblueprints/modules/pom.xml
index 834db24e..1ef81ea4 100644
--- a/ms/controllerblueprints/modules/pom.xml
+++ b/ms/controllerblueprints/modules/pom.xml
@@ -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.
@@ -27,10 +28,12 @@
     <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>
diff --git a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-component-java.json b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-component-java.json
new file mode 100644
index 00000000..95a9801d
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-component-java.json
@@ -0,0 +1,31 @@
+{
+  "description": "This is Custom Java Component Resource Source Node Type",
+  "version": "1.0.0",
+  "properties": {
+    "type": {
+      "required": false,
+      "type": "string",
+      "default" : "DYNAMIC",
+      "constraints": [
+        {
+          "validValues": [
+            "DYNAMIC"
+          ]
+        }
+      ]
+    },
+    "class-name": {
+      "required": true,
+      "type": "string",
+      "description" : "Fully Qualified Class Name ( <Package Name> + . + <Class Name> )"
+    },
+    "key-dependencies": {
+      "required": false,
+      "type": "list",
+      "entry_schema": {
+        "type": "string"
+      }
+    }
+  },
+  "derived_from": "tosca.nodes.ResourceSource"
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-default.json b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-default.json
new file mode 100644
index 00000000..13e234e1
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-default.json
@@ -0,0 +1,18 @@
+{
+  "description": "This is Default Resource Source Node Type",
+  "version": "1.0.0",
+  "properties": {
+    "key": {
+      "required": false,
+      "type": "string"
+    },
+    "key-dependencies": {
+      "required": true,
+      "type": "list",
+      "entry_schema": {
+        "type": "string"
+      }
+    }
+  },
+  "derived_from": "tosca.nodes.ResourceSource"
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-input.json b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-input.json
new file mode 100644
index 00000000..126ea30b
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-input.json
@@ -0,0 +1,18 @@
+{
+  "description": "This is Input Resource Source Node Type",
+  "version": "1.0.0",
+  "properties": {
+    "key": {
+      "required": false,
+      "type": "string"
+    },
+    "key-dependencies": {
+      "required": true,
+      "type": "list",
+      "entry_schema": {
+        "type": "string"
+      }
+    }
+  },
+  "derived_from": "tosca.nodes.ResourceSource"
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-primary-db.json b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-primary-db.json
new file mode 100644
index 00000000..661a9503
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-primary-db.json
@@ -0,0 +1,44 @@
+{
+  "description": "This is Database Resource Source Node Type",
+  "version": "1.0.0",
+  "properties": {
+    "type": {
+      "required": true,
+      "type": "string",
+      "constraints": [
+        {
+          "valid_values": [
+            "SQL",
+            "PLSQL"
+          ]
+        }
+      ]
+    },
+    "query": {
+      "required": true,
+      "type": "string"
+    },
+    "input-key-mapping": {
+      "required": false,
+      "type": "map",
+      "entry_schema": {
+        "type": "string"
+      }
+    },
+    "output-key-mapping": {
+      "required": false,
+      "type": "map",
+      "entry_schema": {
+        "type": "string"
+      }
+    },
+    "key-dependencies": {
+      "required": true,
+      "type": "list",
+      "entry_schema": {
+        "type": "string"
+      }
+    }
+  },
+  "derived_from": "tosca.nodes.ResourceSource"
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-rest.json b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-rest.json
new file mode 100644
index 00000000..f8dd8b6f
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-rest.json
@@ -0,0 +1,61 @@
+{
+  "description": "This is Rest Resource Source Node Type",
+  "version": "1.0.0",
+  "properties": {
+    "type": {
+      "required": false,
+      "type": "string",
+      "default": "JSON",
+      "constraints": [
+        {
+          "valid_values": [
+            "JSON"
+          ]
+        }
+      ]
+    },
+    "url-path": {
+      "required": true,
+      "type": "string"
+    },
+    "path": {
+      "required": true,
+      "type": "string"
+    },
+    "expression-type": {
+      "required": false,
+      "type": "string",
+      "default": "JSON_PATH",
+      "constraints": [
+        {
+          "valid_values": [
+            "JSON_PATH",
+            "JSON_POINTER"
+          ]
+        }
+      ]
+    },
+    "input-key-mapping": {
+      "required": false,
+      "type": "map",
+      "entry_schema": {
+        "type": "string"
+      }
+    },
+    "output-key-mapping": {
+      "required": false,
+      "type": "map",
+      "entry_schema": {
+        "type": "string"
+      }
+    },
+    "key-dependencies": {
+      "required": true,
+      "type": "list",
+      "entry_schema": {
+        "type": "string"
+      }
+    }
+  },
+  "derived_from": "tosca.nodes.ResourceSource"
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/tosca.nodes.ResourceSource.json b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/tosca.nodes.ResourceSource.json
new file mode 100644
index 00000000..2ef553e2
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/tosca.nodes.ResourceSource.json
@@ -0,0 +1,5 @@
+{
+  "description": "TOSCA base type for Resource Sources",
+  "version": "1.0.0",
+  "derived_from": "tosca.nodes.Root"
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/address.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/address.json
new file mode 100644
index 00000000..e999938c
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/address.json
@@ -0,0 +1,17 @@
+{
+  "name" : "address",
+  "tags" : "address",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "address",
+    "type" : "string"
+  },
+  "sources" : {
+    "input" : {
+      "type" : "source-input",
+      "properties" : {
+        "key" : "address"
+      }
+    }
+  }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/aic-cloud-region.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/aic-cloud-region.json
new file mode 100644
index 00000000..2528fc7f
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/aic-cloud-region.json
@@ -0,0 +1,17 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/aic_clli.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/aic_clli.json
new file mode 100644
index 00000000..9e5a6d52
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/aic_clli.json
@@ -0,0 +1,17 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/availability_zone_0.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/availability_zone_0.json
new file mode 100644
index 00000000..fc88ced6
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/availability_zone_0.json
@@ -0,0 +1,17 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/default-source.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/default-source.json
new file mode 100644
index 00000000..42059ad8
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/default-source.json
@@ -0,0 +1,16 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/input-source.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/input-source.json
new file mode 100644
index 00000000..e876c537
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/input-source.json
@@ -0,0 +1,17 @@
+{
+	"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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json
new file mode 100644
index 00000000..67661ecd
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json
@@ -0,0 +1,34 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/name_0.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/name_0.json
new file mode 100644
index 00000000..6be5bc18
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/name_0.json
@@ -0,0 +1,17 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nf-role.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nf-role.json
new file mode 100644
index 00000000..6da5ea22
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nf-role.json
@@ -0,0 +1,25 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nfc-naming-code.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nfc-naming-code.json
new file mode 100644
index 00000000..4e1ba2b0
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nfc-naming-code.json
@@ -0,0 +1,25 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_cidr.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_cidr.json
new file mode 100644
index 00000000..b359320b
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_cidr.json
@@ -0,0 +1,21 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_id.json
new file mode 100644
index 00000000..75cc6963
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_id.json
@@ -0,0 +1,17 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/primary-db-source.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/primary-db-source.json
new file mode 100644
index 00000000..26e62e85
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/primary-db-source.json
@@ -0,0 +1,24 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/private-prefix-id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/private-prefix-id.json
new file mode 100644
index 00000000..4f4868d9
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/private-prefix-id.json
@@ -0,0 +1,21 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected-prefix-id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected-prefix-id.json
new file mode 100644
index 00000000..dd418d55
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected-prefix-id.json
@@ -0,0 +1,21 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected_private_net_cidr.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected_private_net_cidr.json
new file mode 100644
index 00000000..dcd32c7c
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected_private_net_cidr.json
@@ -0,0 +1,21 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/public_net_id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/public_net_id.json
new file mode 100644
index 00000000..17ad96bd
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/public_net_id.json
@@ -0,0 +1,17 @@
+{
+  "name" : "public_net_id",
+  "tags" : "public_net_id",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "public_net_id",
+    "type" : "string"
+  },
+  "sources" : {
+    "input" : {
+      "type" : "source-input",
+      "properties" : {
+        "key" : "public_net_id"
+      }
+    }
+  }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/service-instance-id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/service-instance-id.json
new file mode 100644
index 00000000..db089f0d
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/service-instance-id.json
@@ -0,0 +1,17 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected-prefix-id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected-prefix-id.json
new file mode 100644
index 00000000..1e4cd7bd
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected-prefix-id.json
@@ -0,0 +1,21 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected_private_net_cidr.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected_private_net_cidr.json
new file mode 100644
index 00000000..241147c3
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected_private_net_cidr.json
@@ -0,0 +1,21 @@
+{
+  "name" : "unprotected_private_net_cidr",
+  "tags" : "unprotected_private_net_cidr",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "unprotected_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 = unprotected",
+        "output-key-mapping" : {
+          "unprotected_private_net_cidr" : "prefix"
+        }      
+	  }
+    }
+  }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-id.json
new file mode 100644
index 00000000..5203bb30
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-id.json
@@ -0,0 +1,17 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-label.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-label.json
new file mode 100644
index 00000000..faa7ea49
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-label.json
@@ -0,0 +1,25 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-model-customization-uuid.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-model-customization-uuid.json
new file mode 100644
index 00000000..dd479187
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-model-customization-uuid.json
@@ -0,0 +1,17 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-type.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-type.json
new file mode 100644
index 00000000..dbd51bbd
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-type.json
@@ -0,0 +1,25 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-naming-policy.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-naming-policy.json
new file mode 100644
index 00000000..70792f86
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-naming-policy.json
@@ -0,0 +1,25 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-nf-code.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-nf-code.json
new file mode 100644
index 00000000..a21982c0
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-nf-code.json
@@ -0,0 +1,25 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf_module_name.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf_module_name.json
new file mode 100644
index 00000000..3d958919
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf_module_name.json
@@ -0,0 +1,17 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfccustomizationuuid.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfccustomizationuuid.json
new file mode 100644
index 00000000..9f3e7cf1
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfccustomizationuuid.json
@@ -0,0 +1,25 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_0.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_0.json
new file mode 100644
index 00000000..59f51516
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_0.json
@@ -0,0 +1,35 @@
+{
+  "name" : "vfw_private_ip_0",
+  "tags" : "vfw_private_ip_0",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "vfw_private_ip_0",
+    "type" : "string"
+  },
+  "sources" : {
+    "input" : {
+      "type" : "source-input",
+      "properties" : {
+        "key" : "vfw_private_ip_0"
+      }
+    },
+    "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/vf-modules/$vf-module-id/vf-module-data/vf-module-topology/vf-module-parameters/param/vfw_private_ip_0",
+        "path" : "/param/0/value",
+        "expression-type" : "JSON_POINTER",
+        "input-key-mapping" : {
+          "service-instance-id" : "service-instance-id",
+          "vnf-id" : "vnf-id",
+          "vf-module-id" : "vf-module-id"
+        },
+        "output-key-mapping" : {
+          "vfw_private_ip_0" : "value"
+        },
+        "key-dependencies" : [ "service-instance-id", "vnf-id", "vf-module-id" ]
+      }
+    }
+  }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_1.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_1.json
new file mode 100644
index 00000000..6dda72f7
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_1.json
@@ -0,0 +1,35 @@
+{
+  "name" : "vfw_private_ip_1",
+  "tags" : "vfw_private_ip_1",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "vfw_private_ip_1",
+    "type" : "string"
+  },
+  "sources" : {
+    "input" : {
+      "type" : "source-input",
+      "properties" : {
+        "key" : "vfw_private_ip_1"
+      }
+    },
+    "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/vf-modules/$vf-module-id/vf-module-data/vf-module-topology/vf-module-parameters/param/vfw_private_ip_1",
+        "path" : "/param/0/value",
+        "expression-type" : "JSON_POINTER",
+        "input-key-mapping" : {
+          "service-instance-id" : "service-instance-id",
+          "vnf-id" : "vnf-id",
+          "vf-module-id" : "vf-module-id"
+        },
+        "output-key-mapping" : {
+          "vfw_private_ip_1" : "value"
+        },
+        "key-dependencies" : [ "service-instance-id", "vnf-id", "vf-module-id" ]
+      }
+    }
+  }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_2.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_2.json
new file mode 100644
index 00000000..9e510647
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_2.json
@@ -0,0 +1,17 @@
+{
+  "name" : "vfw_private_ip_2",
+  "tags" : "vfw_private_ip_2",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "vfw_private_ip_2",
+    "type" : "string"
+  },
+  "sources" : {
+    "input" : {
+      "type" : "source-input",
+      "properties" : {
+        "key" : "vfw_private_ip_2"
+      }
+    }
+  }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vm-type.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vm-type.json
new file mode 100644
index 00000000..dabb2381
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vm-type.json
@@ -0,0 +1,25 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-id.json
new file mode 100644
index 00000000..5ea0fbcf
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-id.json
@@ -0,0 +1,17 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-model-customization-uuid.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-model-customization-uuid.json
new file mode 100644
index 00000000..d36fe740
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-model-customization-uuid.json
@@ -0,0 +1,17 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json
new file mode 100644
index 00000000..4c0320ac
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json
@@ -0,0 +1,28 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf_name.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf_name.json
new file mode 100644
index 00000000..c90f5b8a
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf_name.json
@@ -0,0 +1,28 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-invariant-uuid.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-invariant-uuid.json
new file mode 100644
index 00000000..8ce692cc
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-invariant-uuid.json
@@ -0,0 +1,25 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-version.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-version.json
new file mode 100644
index 00000000..d74a6bae
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-version.json
@@ -0,0 +1,25 @@
+{
+  "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
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_0.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_0.json
new file mode 100644
index 00000000..9bef3c79
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_0.json
@@ -0,0 +1,35 @@
+{
+  "name" : "vpg_private_ip_0",
+  "tags" : "vpg_private_ip_0",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "vpg_private_ip_0",
+    "type" : "string"
+  },
+  "sources" : {
+    "input" : {
+      "type" : "source-input",
+      "properties" : {
+        "key" : "vpg_private_ip_0"
+      }
+    },
+    "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/vf-modules/$vf-module-id/vf-module-data/vf-module-topology/vf-module-parameters/param/vpg_private_ip_0",
+        "path" : "/param/0/value",
+        "expression-type" : "JSON_POINTER",
+        "input-key-mapping" : {
+          "service-instance-id" : "service-instance-id",
+          "vnf-id" : "vnf-id",
+          "vf-module-id" : "vf-module-id"
+        },
+        "output-key-mapping" : {
+          "vpg_private_ip_0" : "value"
+        },
+        "key-dependencies" : [ "service-instance-id", "vnf-id", "vf-module-id" ]
+      }
+    }
+  }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_1.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_1.json
new file mode 100644
index 00000000..23c42e0c
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_1.json
@@ -0,0 +1,17 @@
+{
+  "name" : "vpg_private_ip_1",
+  "tags" : "vpg_private_ip_1",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "vpg_private_ip_1",
+    "type" : "string"
+  },
+  "sources" : {
+    "input" : {
+      "type" : "source-input",
+      "properties" : {
+        "key" : "vpg_private_ip_1"
+      }
+    }
+  }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_0.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_0.json
new file mode 100644
index 00000000..52a4542c
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_0.json
@@ -0,0 +1,35 @@
+{
+  "name" : "vsn_private_ip_0",
+  "tags" : "vsn_private_ip_0",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "vsn_private_ip_0",
+    "type" : "string"
+  },
+  "sources" : {
+    "input" : {
+      "type" : "source-input",
+      "properties" : {
+        "key" : "vsn_private_ip_0"
+      }
+    },
+    "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/vf-modules/$vf-module-id/vf-module-data/vf-module-topology/vf-module-parameters/param/vsn_private_ip_0",
+        "path" : "/param/0/value",
+        "expression-type" : "JSON_POINTER",
+        "input-key-mapping" : {
+          "service-instance-id" : "service-instance-id",
+          "vnf-id" : "vnf-id",
+          "vf-module-id" : "vf-module-id"
+        },
+        "output-key-mapping" : {
+          "vsn_private_ip_0" : "value"
+        },
+        "key-dependencies" : [ "service-instance-id", "vnf-id", "vf-module-id" ]
+      }
+    }
+  }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_1.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_1.json
new file mode 100644
index 00000000..88750b25
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_1.json
@@ -0,0 +1,17 @@
+{
+  "name" : "vsn_private_ip_1",
+  "tags" : "vsn_private_ip_1",
+  "updated-by" : "Singal, Kapil <ks220y@att.com>",
+  "property" : {
+    "description" : "vsn_private_ip_1",
+    "type" : "string"
+  },
+  "sources" : {
+    "input" : {
+      "type" : "source-input",
+      "properties" : {
+        "key" : "vsn_private_ip_1"
+      }
+    }
+  }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/pom.xml b/ms/controllerblueprints/modules/resource-dict/pom.xml
new file mode 100644
index 00000000..edffdfb6
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/pom.xml
@@ -0,0 +1,42 @@
+<?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.
+  ~ 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.
+  -->
+<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.controllerblueprints</groupId>
+        <artifactId>modules</artifactId>
+        <version>0.4.1-SNAPSHOT</version>
+    </parent>
+    <artifactId>resource-dict</artifactId>
+    <name>Controller Blueprints Resource Dictionary</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
+            <artifactId>blueprint-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test-junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+
+</project>
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt
new file mode 100644
index 00000000..d141ed0c
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt
@@ -0,0 +1,100 @@
+/*
+ *  Copyright © 2018 IBM.
+ *  Modifications 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
+
+import com.fasterxml.jackson.annotation.JsonFormat
+import com.fasterxml.jackson.annotation.JsonProperty
+import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeTemplate
+import org.onap.ccsdk.apps.controllerblueprints.core.data.PropertyDefinition
+import java.io.Serializable
+import java.util.*
+
+open class ResourceDefinition {
+
+    @JsonProperty(value = "name", required = true)
+    lateinit var name: String
+
+    @JsonProperty(value = "property", required = true)
+    lateinit var property: PropertyDefinition
+
+    var tags: String? = null
+
+    @JsonProperty(value = "updated-by")
+    lateinit var updatedBy: String
+
+    @JsonProperty(value = "sources", required = true)
+    lateinit var sources: MutableMap<String, NodeTemplate>
+}
+
+open class ResourceAssignment {
+
+    @JsonProperty(value = "name", required = true)
+    lateinit var name: String
+
+    @JsonProperty(value = "property")
+    var property: PropertyDefinition? = null
+
+    @JsonProperty("input-param")
+    var inputParameter: Boolean = false
+
+    @JsonProperty("dictionary-name")
+    var dictionaryName: String? = null
+
+    @JsonProperty("dictionary-source")
+    var dictionarySource: String? = null
+
+    @JsonProperty("dependencies")
+    var dependencies: MutableList<String>? = null
+
+    @JsonProperty("version")
+    var version: Int = 0
+
+    @JsonProperty("status")
+    var status: String? = null
+
+    @JsonProperty("message")
+    var message: String? = null
+
+    @JsonProperty("updated-date")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
+    var updatedDate: Date? = null
+
+    @JsonProperty("updated-by")
+    var updatedBy: String? = null
+
+    override fun toString(): String {
+        return StringBuilder()
+                .append("[")
+                .append("name=", name)
+                .append(", dictionaryName=", dictionaryName)
+                .append(", dictionarySource=", dictionarySource)
+                .append("]")
+                .toString()
+    }
+}
+
+/**
+ * Interface for Source Definitions (ex Input Source,
+ * Default Source, Database Source, Rest Sources, etc)
+ */
+interface ResourceSource : Serializable
+
+
+open class ResourceSourceMapping {
+    lateinit var resourceSourceMappings: MutableMap<String, String>
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt
new file mode 100644
index 00000000..aa06c9da
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt
@@ -0,0 +1,38 @@
+/*
+ *  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
+
+/**
+ * ResourceDictionaryConstants
+ *
+ * @author Brinda Santh
+ */
+object ResourceDictionaryConstants {
+    const val SOURCE_INPUT = "input"
+    const val SOURCE_DEFAULT = "default"
+    const val SOURCE_PRIMARY_CONFIG_DATA = "primary-config-data"
+    const val SOURCE_PRIMARY_DB = "primary-db"
+
+    const val MODEL_DIR_RESOURCE_DEFINITION: String = "resource_dictionary"
+
+    const val PROPERTY_TYPE = "type"
+    const val PROPERTY_INPUT_KEY_MAPPING = "input-key-mapping"
+    const val PROPERTY_OUTPUT_KEY_MAPPING = "output-key-mapping"
+    const val PROPERTY_KEY_DEPENDENCIES = "key-dependencies"
+
+    const val PATH_RESOURCE_DEFINITION_TYPE = "resource_definition_types"
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactory.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactory.kt
new file mode 100644
index 00000000..876aca9f
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactory.kt
@@ -0,0 +1,47 @@
+/*
+ *  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
+    }
+}
+
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationService.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationService.kt
new file mode 100644
index 00000000..d71fbbf8
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationService.kt
@@ -0,0 +1,163 @@
+/*
+ *  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.service
+
+import com.att.eelf.configuration.EELFLogger
+import com.att.eelf.configuration.EELFManager
+import org.apache.commons.collections.CollectionUtils
+import org.apache.commons.lang3.StringUtils
+import org.apache.commons.lang3.text.StrBuilder
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
+import org.onap.ccsdk.apps.controllerblueprints.core.format
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.TopologicalSortingUtils
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.factory.ResourceSourceMappingFactory
+import java.io.Serializable
+
+/**
+ * ResourceAssignmentValidationService.
+ *
+ * @author Brinda Santh
+ */
+interface ResourceAssignmentValidationService : Serializable {
+
+    @Throws(BluePrintException::class)
+    fun validate(resourceAssignments: List<ResourceAssignment>): Boolean
+}
+
+/**
+ * ResourceAssignmentValidationServiceImpl.
+ *
+ * @author Brinda Santh
+ */
+open class ResourceAssignmentValidationServiceImpl : ResourceAssignmentValidationService {
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(ResourceAssignmentValidationServiceImpl::class.java)
+
+    open var resourceAssignmentMap: Map<String, ResourceAssignment> = hashMapOf()
+    open val validationMessage = StrBuilder()
+
+    override fun validate(resourceAssignments: List<ResourceAssignment>): Boolean {
+        try {
+            validateSources(resourceAssignments)
+            validateTemplateNDictionaryKeys(resourceAssignments)
+            validateCyclicDependency(resourceAssignments)
+            if (StringUtils.isNotBlank(validationMessage)) {
+                throw BluePrintException("Resource Assignment Validation Failure")
+            }
+        } catch (e: Exception) {
+            throw BluePrintException("Resource Assignment Validation :" + validationMessage.toString(), e)
+        }
+        return true
+    }
+
+    open fun validateSources(resourceAssignments: List<ResourceAssignment>) {
+        log.info("validating resource assignment sources")
+        // Check the Resource Assignment Source(Dynamic Instance) is valid.
+        resourceAssignments.forEach { resourceAssignment ->
+            try {
+                ResourceSourceMappingFactory.getRegisterSourceMapping(resourceAssignment.dictionarySource!!)
+            } catch (e: BluePrintException) {
+                validationMessage.appendln(e.message + format(" for resource assignment({})", resourceAssignment.name))
+            }
+        }
+    }
+
+    open fun validateTemplateNDictionaryKeys(resourceAssignments: List<ResourceAssignment>) {
+
+        resourceAssignmentMap = resourceAssignments.map { it.name to it }.toMap()
+
+        // Check the Resource Assignment has Duplicate Key Names
+        val duplicateKeyNames = resourceAssignments.groupBy { it.name }
+                .filter { it.value.size > 1 }
+                .map { it.key }
+
+        if (duplicateKeyNames.isNotEmpty()) {
+            validationMessage.appendln(String.format("Duplicate Assignment Template Keys (%s) is Present", duplicateKeyNames))
+        }
+
+        // Check the Resource Assignment has Duplicate Dictionary Names
+        val duplicateDictionaryKeyNames = resourceAssignments.groupBy { it.dictionaryName }
+                .filter { it.value.size > 1 }
+                .map { it.key }
+        if (duplicateDictionaryKeyNames.isNotEmpty()) {
+            validationMessage.appendln(String.format("Duplicate Assignment Dictionary Keys (%s) is Present", duplicateDictionaryKeyNames))
+        }
+
+        // Collect all the dependencies as a single list
+        val dependenciesNames = resourceAssignments.mapNotNull { it.dependencies }.flatten()
+
+        // Check all the dependencies keys have Resource Assignment mappings.
+        val notPresentDictionaries = dependenciesNames.filter { !resourceAssignmentMap.containsKey(it) }.distinct()
+        if (notPresentDictionaries.isNotEmpty()) {
+            validationMessage.appendln(String.format("No assignments for Dictionary Keys (%s)", notPresentDictionaries))
+        }
+
+        if (StringUtils.isNotBlank(validationMessage)) {
+            throw BluePrintException("Resource Assignment Validation Failure")
+        }
+    }
+
+    open fun validateCyclicDependency(resourceAssignments: List<ResourceAssignment>) {
+        val startResourceAssignment = ResourceAssignment()
+        startResourceAssignment.name = "*"
+
+        val topologySorting = TopologicalSortingUtils<ResourceAssignment>()
+
+        resourceAssignmentMap.map { it.value }.map { resourceAssignment ->
+            if (CollectionUtils.isNotEmpty(resourceAssignment.dependencies)) {
+                resourceAssignment.dependencies!!.map {
+                    log.info("Topological Graph link from {} to {}", it, resourceAssignment.name)
+                    topologySorting.add(resourceAssignmentMap[it]!!, resourceAssignment)
+                }
+            } else {
+                topologySorting.add(startResourceAssignment, resourceAssignment)
+            }
+        }
+
+        if (!topologySorting.isDag) {
+            val graph = getTopologicalGraph(topologySorting)
+            validationMessage.appendln("Cyclic Dependency :$graph")
+        }
+    }
+
+    open fun getTopologicalGraph(topologySorting: TopologicalSortingUtils<ResourceAssignment>): String {
+        val s = StringBuilder()
+        val neighbors = topologySorting.getNeighbors()
+
+        neighbors.forEach { v, vs ->
+            if (v.name == "*") {
+                s.append("\n    * -> [")
+                for (resourceAssignment in vs) {
+                    s.append("(" + resourceAssignment.dictionaryName + ":" + resourceAssignment.name
+                            + "),")
+                }
+                s.append("]")
+            } else {
+                s.append("\n    (" + v.dictionaryName + ":" + v.name + ") -> [")
+                for (resourceAssignment in vs) {
+                    s.append("(" + resourceAssignment.dictionaryName + ":" + resourceAssignment.name
+                            + "),")
+                }
+                s.append("]")
+            }
+        }
+        return s.toString()
+    }
+
+
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionValidationService.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionValidationService.kt
new file mode 100644
index 00000000..9541a7b8
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionValidationService.kt
@@ -0,0 +1,113 @@
+/*
+ *  Copyright © 2018 IBM.
+ *  Modifications 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 com.att.eelf.configuration.EELFManager
+import com.fasterxml.jackson.databind.JsonNode
+import com.google.common.base.Preconditions
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintTypes
+import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeTemplate
+import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeType
+import org.onap.ccsdk.apps.controllerblueprints.core.data.PropertyDefinition
+import org.onap.ccsdk.apps.controllerblueprints.core.format
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintRepoService
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintExpressionService
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDefinition
+import java.io.Serializable
+
+/**
+ * ResourceDefinitionValidationService.
+ *
+ * @author Brinda Santh
+ */
+interface ResourceDefinitionValidationService : Serializable {
+
+    @Throws(BluePrintException::class)
+    fun validate(resourceDefinition: ResourceDefinition)
+
+}
+
+/**
+ * ResourceDefinitionValidationService.
+ *
+ * @author Brinda Santh
+ */
+open class ResourceDefinitionValidationServiceImpl(private val bluePrintRepoService: BluePrintRepoService) : ResourceDefinitionValidationService {
+
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(ResourceDefinitionValidationService::class.java)
+
+    override fun validate(resourceDefinition: ResourceDefinition) {
+        Preconditions.checkNotNull(resourceDefinition, "Failed to get Resource Definition")
+        log.trace("Validating Resource Dictionary Definition {}", resourceDefinition.name)
+
+        resourceDefinition.sources.forEach { name, nodeTemplate ->
+            val sourceType = nodeTemplate.type
+
+            val sourceNodeType = bluePrintRepoService.getNodeType(sourceType)
+
+            // Validate Property Name, expression, values and Data Type
+            validateNodeTemplateProperties(nodeTemplate, sourceNodeType)
+        }
+    }
+
+
+    open fun validateNodeTemplateProperties(nodeTemplate: NodeTemplate, nodeType: NodeType) {
+        nodeTemplate.properties?.let { validatePropertyAssignments(nodeType.properties!!, nodeTemplate.properties!!) }
+    }
+
+
+    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))
+            // Check and Validate if Expression Node
+            val expressionData = BluePrintExpressionService.getExpressionData(propertyAssignment)
+            if (!expressionData.isExpression) {
+                checkPropertyValue(propertyDefinition, propertyName, propertyAssignment)
+            } else {
+                throw BluePrintException(format("property({}) of expression ({}) is not supported",
+                        propertyName, propertyAssignment))
+            }
+        }
+    }
+
+    open fun checkPropertyValue(propertyDefinition: PropertyDefinition, propertyName: String, 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)) {
+
+            isValid = JacksonUtils.checkJsonNodeValueOfCollectionType(propertyType, propertyAssignment)
+        } else {
+            bluePrintRepoService.getDataType(propertyType)
+            isValid = true
+        }
+
+        check(isValid) {
+            throw BluePrintException(format("property({}) defined of type({}) is not compatable with the value ({})",
+                    propertyName, propertyType, propertyAssignment))
+        }
+    }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/BulkResourceSequencingUtils.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/BulkResourceSequencingUtils.kt
new file mode 100644
index 00000000..cd92f42c
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/BulkResourceSequencingUtils.kt
@@ -0,0 +1,109 @@
+/*
+ *  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
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtils.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtils.kt
new file mode 100644
index 00000000..1aeda0ba
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtils.kt
@@ -0,0 +1,94 @@
+/*
+ *  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.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.apache.commons.collections.MapUtils
+import org.apache.commons.lang3.StringUtils
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintProcessorException
+import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeTemplate
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.BluePrintFileUtils
+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 java.io.File
+
+
+object ResourceDictionaryUtils {
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(ResourceDictionaryUtils::class.java)
+
+    @JvmStatic
+    fun populateSourceMapping(resourceAssignment: ResourceAssignment,
+                              resourceDefinition: ResourceDefinition) {
+
+        if (StringUtils.isBlank(resourceAssignment.dictionarySource)) {
+
+            if (MapUtils.isNotEmpty(resourceDefinition.sources)) {
+                val source = findFirstSource(resourceDefinition.sources)
+
+                // Populate and Assign First Source
+                if (StringUtils.isNotBlank(source)) {
+                    // Set Dictionary Source
+                    resourceAssignment.dictionarySource = source
+                } else {
+                    resourceAssignment.dictionarySource = ResourceDictionaryConstants.SOURCE_INPUT
+                }
+                log.info("auto map resourceAssignment : {}", resourceAssignment)
+            } else {
+                resourceAssignment.dictionarySource = ResourceDictionaryConstants.SOURCE_INPUT
+            }
+        }
+    }
+
+    @JvmStatic
+    fun findFirstSource(sources: Map<String, NodeTemplate>): String? {
+        var source: String? = null
+        if (MapUtils.isNotEmpty(sources)) {
+            source = sources.keys.stream().findFirst().get()
+        }
+        return source
+    }
+
+    @JvmStatic
+    fun assignInputs(data: JsonNode, context: MutableMap<String, Any>) {
+        log.trace("assignInputs from input JSON ({})", data.toString())
+        data.fields().forEach { field ->
+            val valueNode: JsonNode = data.at("/".plus(field.key)) ?: NullNode.getInstance()
+
+            val path = BluePrintConstants.PATH_INPUTS.plus(BluePrintConstants.PATH_DIVIDER).plus(field.key)
+            log.trace("setting path ({}), values ({})", path, valueNode)
+            context[path] = valueNode
+        }
+    }
+
+    fun getResourceAssignmentFromFile(filePath: String): List<ResourceAssignment> {
+        return JacksonUtils.getListFromFile(filePath, ResourceAssignment::class.java)
+                ?: throw BluePrintProcessorException("couldn't get ResourceAssignment definitions for the file($filePath)")
+    }
+
+    fun writeResourceDefinitionTypes(basePath: String, resourceDefinitionMap: Map<String, ResourceDefinition>) {
+        val typePath = basePath.plus(File.separator).plus(BluePrintConstants.TOSCA_DEFINITIONS_DIR)
+                .plus(File.separator).plus("${ResourceDictionaryConstants.PATH_RESOURCE_DEFINITION_TYPE}.json")
+        val resourceDefinitionContent = JacksonUtils.getJson(resourceDefinitionMap.toSortedMap(), true)
+        BluePrintFileUtils.writeDefinitionFile(typePath, resourceDefinitionContent)
+    }
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinitionTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinitionTest.java
new file mode 100644
index 00000000..d059d1ba
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinitionTest.java
@@ -0,0 +1,60 @@
+/*
+ *  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);
+    }
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java
new file mode 100644
index 00000000..3950ae36
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java
@@ -0,0 +1,42 @@
+/*
+ *  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");
+
+    }
+
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationServiceTest.kt b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationServiceTest.kt
new file mode 100644
index 00000000..8905dab6
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationServiceTest.kt
@@ -0,0 +1,66 @@
+/*
+ *  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
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionValidationServiceTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionValidationServiceTest.java
new file mode 100644
index 00000000..7f040b2e
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionValidationServiceTest.java
@@ -0,0 +1,56 @@
+/*
+ *  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.service;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRepoFileService;
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDefinition;
+
+public class ResourceDefinitionValidationServiceTest {
+    private String basePath = "load/model_type";
+    private String dictionaryPath = "load/resource_dictionary";
+    private BluePrintRepoFileService bluePrintRepoFileService = new BluePrintRepoFileService(basePath);
+
+    @Test
+    public void testValidateSource() throws Exception {
+
+        String inputFileName = dictionaryPath + "/input-source.json";
+        testValidate(inputFileName);
+
+        String dbFileName = dictionaryPath + "/primary-db-source.json";
+        testValidate(dbFileName);
+
+        String defaultFileName = dictionaryPath + "/default-source.json";
+        testValidate(defaultFileName);
+
+        String restFileName = dictionaryPath + "/mdsal-source.json";
+        testValidate(restFileName);
+    }
+
+    private void testValidate(String fileName) throws Exception {
+
+        ResourceDefinition resourceDefinition = JacksonUtils.Companion.readValueFromFile(fileName, ResourceDefinition.class);
+        Assert.assertNotNull("Failed to populate dictionaryDefinition for  type", resourceDefinition);
+
+        ResourceDefinitionValidationService resourceDictionaryValidationService =
+                new ResourceDefinitionValidationServiceImpl(bluePrintRepoFileService);
+        resourceDictionaryValidationService.validate(resourceDefinition);
+        Assert.assertNotNull(String.format("Failed to populate dictionaryDefinition for : %s", fileName), resourceDefinition);
+    }
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/BulkResourceSequencingUtilsTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/BulkResourceSequencingUtilsTest.java
new file mode 100644
index 00000000..c1b9f500
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/BulkResourceSequencingUtilsTest.java
@@ -0,0 +1,37 @@
+/*
+ *  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
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java
new file mode 100644
index 00000000..e4ddac13
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java
@@ -0,0 +1,99 @@
+/*
+ * 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));
+
+    }
+
+
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt b/ms/controllerblueprints/modules/resource-dict/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt
new file mode 100644
index 00000000..ed2bfc0a
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt
@@ -0,0 +1,30 @@
+/*
+ *  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
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/resources/data/resource-assignment-input.json b/ms/controllerblueprints/modules/resource-dict/src/test/resources/data/resource-assignment-input.json
new file mode 100644
index 00000000..d79c9068
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/resources/data/resource-assignment-input.json
@@ -0,0 +1,10 @@
+{
+  "intValue" : 1,
+  "floatValue" : 1.34,
+  "booleanValue" : true,
+  "stringValue" : "sample-String",
+  "timeValue" : "2018-09-29",
+  "arrayStringValue" : ["one", "two"],
+  "mapValue" : {"profile_name1":"profile_name1",
+    "profile_name2":"profile_name2"}
+}
+\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/cyclic.json b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/cyclic.json
new file mode 100644
index 00000000..3bfa4167
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/cyclic.json
@@ -0,0 +1,111 @@
+[
+  {
+    "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"
+    ]
+  }
+]
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json
new file mode 100644
index 00000000..473920d6
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json
@@ -0,0 +1,110 @@
+[
+  {
+    "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"
+    ]
+  }
+]
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json
new file mode 100644
index 00000000..f8fe623f
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json
@@ -0,0 +1,110 @@
+[
+  {
+    "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"
+    ]
+  }
+]
diff --git a/ms/controllerblueprints/parent/pom.xml b/ms/controllerblueprints/parent/pom.xml
index 8cbc98e0..f29e5014 100644
--- a/ms/controllerblueprints/parent/pom.xml
+++ b/ms/controllerblueprints/parent/pom.xml
@@ -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>
@@ -92,11 +94,16 @@
                 <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>
@@ -142,8 +149,8 @@
                 <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>
@@ -205,7 +212,7 @@
             <!-- Application Components -->
             <dependency>
                 <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
-                <artifactId>core</artifactId>
+                <artifactId>blueprint-core</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -241,6 +248,12 @@
 
             <!-- 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>${powermock.version}</version>
@@ -253,6 +266,12 @@
                 <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>
                 <version>${grpc.version}</version>
@@ -273,7 +292,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-         </dependency>
+        </dependency>
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
@@ -283,6 +302,10 @@
             <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>
         </dependency>
@@ -304,12 +327,41 @@
         </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>
author	Muthuramalingam, Brinda Santh <brindasanth@in.ibm.com>	2019-02-07 14:51:50 -0500
committer	Muthuramalingam, Brinda Santh <brindasanth@in.ibm.com>	2019-02-07 14:51:50 -0500
commit	4937f56d90371c7a7b5b6c52314c28df716f41ae (patch)
tree	eb1064d9679bcfe9ada8156c83f563beff093ec3 /ms
parent	9a4387cf89f95ecdce9d135677a4b4c4c94a8b94 (diff)