Add relationships type files load structure.

Change-Id: I1be3ba493956674b476058094e05d681ce358711
Issue-ID: CCSDK-746
Signed-off-by: Muthuramalingam, Brinda Santh <bs2796@att.com>

18 files changed, 478 insertions, 417 deletions

diff --git a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionService.kt b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionService.kt
index 6a50680e..8caec75f 100644
--- a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionService.kt
+++ b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionService.kt
@@ -16,15 +16,15 @@
 

 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.*

-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils

-import com.att.eelf.configuration.EELFLogger

-import com.att.eelf.configuration.EELFManager

 

 /**

  *

@@ -35,12 +35,6 @@ object BluePrintExpressionService {
     val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())

 

     @JvmStatic

-    fun getExpressionData(propertyAssignment: Any): ExpressionData {

-        val propertyAssignmentNode: JsonNode = JacksonUtils.jsonNodeFromObject(propertyAssignment)

-        return getExpressionData(propertyAssignmentNode)

-    }

-

-    @JvmStatic

     fun getExpressionData(propertyAssignmentNode: JsonNode): ExpressionData {

         log.trace("Assignment Data/Expression : {}", propertyAssignmentNode)

         val expressionData = ExpressionData(valueNode = propertyAssignmentNode)

@@ -53,19 +47,19 @@ object BluePrintExpressionService {
                 expressionData.expressionNode = propertyAssignmentNode

 

                 when (expressionData.command) {

-                    org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants.EXPRESSION_GET_INPUT -> {

+                    BluePrintConstants.EXPRESSION_GET_INPUT -> {

                         expressionData.inputExpression = populateInputExpression(propertyAssignmentNode)

                     }

-                    org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants.EXPRESSION_GET_ATTRIBUTE -> {

+                    BluePrintConstants.EXPRESSION_GET_ATTRIBUTE -> {

                         expressionData.attributeExpression = populateAttributeExpression(propertyAssignmentNode)

                     }

-                    org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants.EXPRESSION_GET_PROPERTY -> {

+                    BluePrintConstants.EXPRESSION_GET_PROPERTY -> {

                         expressionData.propertyExpression = populatePropertyExpression(propertyAssignmentNode)

                     }

-                    org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants.EXPRESSION_GET_OPERATION_OUTPUT -> {

+                    BluePrintConstants.EXPRESSION_GET_OPERATION_OUTPUT -> {

                         expressionData.operationOutputExpression = populateOperationOutputExpression(propertyAssignmentNode)

                     }

-                    org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants.EXPRESSION_GET_ARTIFACT -> {

+                    BluePrintConstants.EXPRESSION_GET_ARTIFACT -> {

                         expressionData.artifactExpression = populateArtifactExpression(propertyAssignmentNode)

                     }

                 }

diff --git a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeService.kt b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeService.kt
index 5540047c..bd19ae47 100644
--- a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeService.kt
+++ b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeService.kt
@@ -67,6 +67,12 @@ interface BluePrintRuntimeService<T> {
    */

     fun resolveNodeTemplateProperties(nodeTemplateName: String): MutableMap<String, JsonNode>

 

+    fun resolveNodeTemplateCapabilityProperties(nodeTemplateName: String, capability: String): MutableMap<String,

+            JsonNode>

+

+    fun resolveNodeTemplateRequirementProperties(nodeTemplateName: String, requirementName: 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>

@@ -193,17 +199,15 @@ open class DefaultBluePrintRuntimeService(private var id: String, private var bl
 

         val nodeTemplate: NodeTemplate = bluePrintContext.nodeTemplateByName(nodeTemplateName)

 

-        val propertyAssignments: MutableMap<String, JsonNode> =

-                nodeTemplate.properties as MutableMap<String, JsonNode>

+        val propertyAssignments: MutableMap<String, JsonNode> = nodeTemplate.properties!!

 

         // Get the Node Type Definitions

-        val nodeTypeProperties: MutableMap<String, PropertyDefinition> =

-                bluePrintContext.nodeTypeChainedProperties(nodeTemplate.type)!!

+        val nodeTypeProperties: MutableMap<String, PropertyDefinition> = bluePrintContext.nodeTypeChainedProperties(nodeTemplate.type)!!

 

         // Iterate Node Type Properties

         nodeTypeProperties.forEach { nodeTypePropertyName, nodeTypeProperty ->

             // Get the Express or Value for the Node Template

-            val propertyAssignment: Any? = propertyAssignments[nodeTypePropertyName]

+            val propertyAssignment: JsonNode? = propertyAssignments[nodeTypePropertyName]

 

             var resolvedValue: JsonNode = NullNode.getInstance()

             if (propertyAssignment != null) {

@@ -223,6 +227,18 @@ open class DefaultBluePrintRuntimeService(private var id: String, private var bl
         return propertyAssignmentValue

     }

 

+    override fun resolveNodeTemplateCapabilityProperties(nodeTemplateName: String, capabilityName: String):

+            MutableMap<String, JsonNode> {

+        log.info("resolveNodeTemplateCapabilityProperties for node template($nodeTemplateName) capability " +

+                "($capabilityName)")

+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.

+    }

+

+    override fun resolveNodeTemplateRequirementProperties(nodeTemplateName: String, requirementName: String): MutableMap<String, JsonNode> {

+        log.info("resolveNodeTemplateRequirementProperties for node template($nodeTemplateName) requirement ($requirementName)")

+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.

+    }

+

     override fun resolveNodeTemplateInterfaceOperationInputs(nodeTemplateName: String,

                                                              interfaceName: String, operationName: String): MutableMap<String, JsonNode> {

         log.info("resolveNodeTemplateInterfaceOperationInputs for node template ({}),interface name ({}), " +

@@ -230,8 +246,8 @@ open class DefaultBluePrintRuntimeService(private var id: String, private var bl
 

         val propertyAssignmentValue: MutableMap<String, JsonNode> = hashMapOf()

 

-        val propertyAssignments: MutableMap<String, Any> =

-                bluePrintContext.nodeTemplateInterfaceOperationInputs(nodeTemplateName, interfaceName, operationName) as? MutableMap<String, Any>

+        val propertyAssignments: MutableMap<String, JsonNode> =

+                bluePrintContext.nodeTemplateInterfaceOperationInputs(nodeTemplateName, interfaceName, operationName)

                         ?: hashMapOf()

 

         val nodeTypeName = bluePrintContext.nodeTemplateByName(nodeTemplateName).type

@@ -245,7 +261,7 @@ open class DefaultBluePrintRuntimeService(private var id: String, private var bl
         // Iterate Node Type Properties

         nodeTypeInterfaceOperationInputs.forEach { nodeTypePropertyName, nodeTypeProperty ->

             // Get the Express or Value for the Node Template

-            val propertyAssignment: Any? = propertyAssignments[nodeTypePropertyName]

+            val propertyAssignment: JsonNode? = propertyAssignments[nodeTypePropertyName]

 

             var resolvedValue: JsonNode = NullNode.getInstance()

             if (propertyAssignment != null) {

@@ -275,8 +291,8 @@ open class DefaultBluePrintRuntimeService(private var id: String, private var bl
 

         val propertyAssignmentValue: MutableMap<String, JsonNode> = hashMapOf()

 

-        val propertyAssignments: MutableMap<String, Any> =

-                bluePrintContext.nodeTemplateInterfaceOperationOutputs(nodeTemplateName, interfaceName, operationName) as? MutableMap<String, Any>

+        val propertyAssignments: MutableMap<String, JsonNode> =

+                bluePrintContext.nodeTemplateInterfaceOperationOutputs(nodeTemplateName, interfaceName, operationName)

                         ?: hashMapOf()

 

         val nodeTypeName = bluePrintContext.nodeTemplateByName(nodeTemplateName).type

@@ -289,7 +305,7 @@ open class DefaultBluePrintRuntimeService(private var id: String, private var bl
         nodeTypeInterfaceOperationOutputs.forEach { nodeTypePropertyName, nodeTypeProperty ->

 

             // Get the Express or Value for the Node Template

-            val propertyAssignment: Any? = propertyAssignments[nodeTypePropertyName]

+            val propertyAssignment: JsonNode? = propertyAssignments[nodeTypePropertyName]

 

             var resolvedValue: JsonNode = NullNode.getInstance()

             if (propertyAssignment != null) {

diff --git a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/PropertyAssignmentService.kt b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/PropertyAssignmentService.kt
index 36c141f5..17380fc0 100644
--- a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/PropertyAssignmentService.kt
+++ b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/PropertyAssignmentService.kt
@@ -47,7 +47,7 @@ If Property Assignment is Expression.
  */

 

     fun resolveAssignmentExpression(nodeTemplateName: String, assignmentName: String,

-                                    assignment: Any): JsonNode {

+                                    assignment: JsonNode): JsonNode {

         val valueNode: JsonNode

         log.trace("Assignment ({})", assignment)

         val expressionData = BluePrintExpressionService.getExpressionData(assignment)

diff --git a/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt b/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt
index 7ecf44b6..1dfb89a5 100644
--- a/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt
+++ b/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt
@@ -56,6 +56,18 @@ class BluePrintRuntimeServiceTest {
     }

 

     @Test

+    fun testResolveNodeTemplateCapabilityProperties() {

+        log.info("************************ testResolveNodeTemplateRequirementProperties **********************")

+        //TODO

+    }

+

+    @Test

+    fun testResolveNodeTemplateRequirementProperties() {

+        log.info("************************ testResolveNodeTemplateRequirementProperties **********************")

+        //TODO

+    }

+

+    @Test

     fun testResolveNodeTemplateInterfaceOperationInputs() {

         log.info("************************ testResolveNodeTemplateInterfaceOperationInputs **********************")

 

@@ -72,7 +84,7 @@ class BluePrintRuntimeServiceTest {
         assertNotNull(inContext, "Failed to populate interface input property values")

         assertEquals(inContext["action-name"], jsonNodeFromObject("sample-action"), "Failed to populate parameter action-name")

         assertEquals(inContext["request-id"], jsonNodeFromObject("12345"), "Failed to populate parameter action-name")

-      }

+    }

 

     @Test

     fun testResolveNodeTemplateInterfaceOperationOutputs() {

diff --git a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/activation-blueprint.json b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/activation-blueprint.json
index 7d3a17a6..6a446355 100644
--- a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/activation-blueprint.json
+++ b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/activation-blueprint.json
@@ -205,6 +205,57 @@
             "file": "Scripts/SamplePythonComponentNode.py"
           }
         }
+      },
+      "activate-netconf": {
+        "type": "component-netconf-executor",
+        "interfaces": {
+          "NetconfExecutorComponent": {
+            "operations": {
+              "process": {
+                "implementation": {
+                  "primary": "component-script"
+                },
+                "inputs": {
+                  "instance-dependencies": [
+                    "json-parser-service",
+                    "netconf-rpc-service"
+                  ]
+                },
+                "outputs": {
+                  "response-data": "",
+                  "status": ""
+                }
+              }
+            }
+          }
+        },
+        "requirements": {
+          "netconf-connection": {
+            "capability": "netconf",
+            "node": "sample-netconf-device",
+            "relationship": "tosca.relationships.ConnectsTo"
+          }
+        },
+        "artifacts": {
+          "component-script": {
+            "type": "artifact-script-jython",
+            "file": "Scripts/SamplePythonComponentNode.py"
+          }
+        }
+      },
+      "sample-netconf-device": {
+        "type": "vnf-netconf-device",
+        "capabilities": {
+          "netconf": {
+            "properties": {
+              "login-key": "sample-key",
+              "login-account": "sample-account",
+              "target-ip-address": "localhost",
+              "port-number": 830,
+              "connection-time-out": 30
+            }
+          }
+        }
       }
     },
     "workflows": {
diff --git a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/node_types.json b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/node_types.json
index 6a156ff1..f7970bfb 100644
--- a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/node_types.json
@@ -29,11 +29,68 @@
       "version": "1.0.0",
       "derived_from": "tosca.nodes.Root"
     },
+    "tosca.nodes.ResourceSource" : {
+      "description" : "TOSCA base type for Resource Sources",
+      "version" : "1.0.0",
+      "derived_from" : "tosca.nodes.Root"
+    },
+    "tosca.nodes.Vnf" : {
+      "description" : "This is VNF Node Type",
+      "version" : "1.0.0",
+      "derived_from" : "tosca.nodes.Root"
+    },
     "tosca.nodes.component.Jython": {
       "description": "This is Resource Assignment Jython Component API",
       "version": "1.0.0",
       "derived_from": "tosca.nodes.Root"
     },
+    "component-netconf-executor": {
+      "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": {
+        "NetconfExecutorComponent": {
+          "operations": {
+            "process": {
+              "inputs": {
+                "instance-dependencies": {
+                  "description": "Instance Names to Inject to Jython Script.",
+                  "required": true,
+                  "type": "list",
+                  "entry_schema": {
+                    "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.Jython"
+    },
     "component-resource-assignment": {
       "description": "This is Resource Assignment Component API",
       "version": "1.0.0",
@@ -131,6 +188,47 @@
         }
       },
       "derived_from": "tosca.nodes.component.Jython"
+    },
+    "vnf-netconf-device": {
+      "description": "This is VNF Device with Netconf  Capability",
+      "version": "1.0.0",
+      "capabilities": {
+        "netconf": {
+          "type": "tosca.capabilities.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"
     }
   }
 }
\ No newline at end of file
diff --git a/components/model-catalog/definition-type/starter-type/node_type/component-netconf-executor.json b/components/model-catalog/definition-type/starter-type/node_type/component-netconf-executor.json
index 7e1d8134..b8ac762e 100644
--- a/components/model-catalog/definition-type/starter-type/node_type/component-netconf-executor.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/component-netconf-executor.json
@@ -18,45 +18,13 @@
       "operations": {

         "process": {

           "inputs": {

-            "request-id": {

-              "description": "Request Id used to store the generated configuration, in the database along with the template-name",

+            "instance-dependencies": {

               "required": true,

-              "type": "string"

-            },

-            "template-name": {

-              "description": "Service Template Name",

-              "required": true,

-              "type": "string"

-            },

-            "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"

+              "description": "Instance Names to Inject to Jython Script.",

+              "type": "list",

+              "entry_schema": {

+                "type": "string"

+              }

             }

           },

           "outputs": {

diff --git a/components/model-catalog/definition-type/starter-type/node_type/vnf-netconf-device.json b/components/model-catalog/definition-type/starter-type/node_type/vnf-netconf-device.json
index 246f1770..c6f512df 100644
--- a/components/model-catalog/definition-type/starter-type/node_type/vnf-netconf-device.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/vnf-netconf-device.json
@@ -38,5 +38,4 @@
 		}

 	},

 	"derived_from": "tosca.nodes.Vnf"

-	

 }

diff --git a/components/model-catalog/definition-type/starter-type/relationship_type/tosca.relationships.ConnectsTo.json b/components/model-catalog/definition-type/starter-type/relationship_type/tosca.relationships.ConnectsTo.json
new file mode 100644
index 00000000..4abb9483
--- /dev/null
+++ b/components/model-catalog/definition-type/starter-type/relationship_type/tosca.relationships.ConnectsTo.json
@@ -0,0 +1,5 @@
+{
+  "description": "Relationship tosca.relationships.ConnectsTo",
+  "version": "1.0.0",
+  "derived_from": "tosca.relationships.Root"
+}
\ No newline at end of file
diff --git a/components/model-catalog/definition-type/starter-type/relationship_type/tosca.relationships.DependsOn.json b/components/model-catalog/definition-type/starter-type/relationship_type/tosca.relationships.DependsOn.json
new file mode 100644
index 00000000..89987ff5
--- /dev/null
+++ b/components/model-catalog/definition-type/starter-type/relationship_type/tosca.relationships.DependsOn.json
@@ -0,0 +1,5 @@
+{
+  "description": "Relationship tosca.relationships.DependsOn",
+  "version": "1.0.0",
+  "derived_from": "tosca.relationships.Root"
+}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/validator/ModelTypeValidator.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/validator/ModelTypeValidator.java
deleted file mode 100644
index 9641f897..00000000
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/validator/ModelTypeValidator.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*

- * 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.service.validator;

-

-import com.fasterxml.jackson.databind.JsonNode;

-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.ArtifactType;

-import org.onap.ccsdk.apps.controllerblueprints.core.data.CapabilityDefinition;

-import org.onap.ccsdk.apps.controllerblueprints.core.data.DataType;

-import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeType;

-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;

-import org.onap.ccsdk.apps.controllerblueprints.service.domain.ModelType;

-

-import java.util.ArrayList;

-import java.util.List;

-

-/**

- * ModelTypeValidation.java Purpose: Provide Validation Service for Model Type ModelTypeValidation

- *

- * @author Brinda Santh

- * @version 1.0

- */

-

-public class ModelTypeValidator {

-

-    private ModelTypeValidator() {

-

-    }

-

-    private static List<String> getValidModelDefinitionType() {

-        List<String> validTypes = new ArrayList<>();

-        validTypes.add(BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE);

-        validTypes.add(BluePrintConstants.MODEL_DEFINITION_TYPE_NODE_TYPE);

-        validTypes.add(BluePrintConstants.MODEL_DEFINITION_TYPE_ARTIFACT_TYPE);

-        validTypes.add(BluePrintConstants.MODEL_DEFINITION_TYPE_CAPABILITY_TYPE);

-        validTypes.add(BluePrintConstants.MODEL_DEFINITION_TYPE_RELATIONSHIP_TYPE);

-        return validTypes;

-    }

-

-    /**

-     * This is a validateModelTypeDefinition

-     * 

-     * @param definitionType definitionType

-     * @param definitionContent definitionContent

-     * @return boolean

-     * @throws BluePrintException BluePrintException

-     */

-    public static boolean validateModelTypeDefinition(String definitionType, JsonNode definitionContent)

-            throws BluePrintException {

-        if (definitionContent != null) {

-            if (BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE.equalsIgnoreCase(definitionType)) {

-                DataType dataType = JacksonUtils.readValue(definitionContent, DataType.class);

-                if (dataType == null) {

-                    throw new BluePrintException(

-                            "Model type definition is not DataType valid content " + definitionContent);

-                }

-            } else if (BluePrintConstants.MODEL_DEFINITION_TYPE_NODE_TYPE.equalsIgnoreCase(definitionType)) {

-                NodeType nodeType = JacksonUtils.readValue(definitionContent, NodeType.class);

-                if (nodeType == null) {

-                    throw new BluePrintException(

-                            "Model type definition is not NodeType valid content " + definitionContent);

-                }

-            } else if (BluePrintConstants.MODEL_DEFINITION_TYPE_ARTIFACT_TYPE.equalsIgnoreCase(definitionType)) {

-                ArtifactType artifactType = JacksonUtils.readValue(definitionContent, ArtifactType.class);

-                if (artifactType == null) {

-                    throw new BluePrintException(

-                            "Model type definition is not ArtifactType valid content " + definitionContent);

-                }

-            }else if (BluePrintConstants.MODEL_DEFINITION_TYPE_CAPABILITY_TYPE.equalsIgnoreCase(definitionType)) {

-                CapabilityDefinition capabilityDefinition =

-                        JacksonUtils.readValue(definitionContent, CapabilityDefinition.class);

-                if (capabilityDefinition == null) {

-                    throw new BluePrintException(

-                            "Model type definition is not CapabilityDefinition valid content " + definitionContent);

-                }

-            }

-

-        }

-        return true;

-    }

-

-    /**

-     * This is a validateModelType method

-     * 

-     * @param modelType modelType

-     * @return boolean

-     * @throws BluePrintException BluePrintException

-     */

-    public static boolean validateModelType(ModelType modelType) throws BluePrintException {

-        if (modelType != null) {

-

-            if (StringUtils.isBlank(modelType.getModelName())) {

-                throw new BluePrintException("Model Name Information is missing.");

-            }

-

-            if (StringUtils.isBlank(modelType.getDefinitionType())) {

-                throw new BluePrintException("Model Root Type Information is missing.");

-            }

-            if (StringUtils.isBlank(modelType.getDerivedFrom())) {

-                throw new BluePrintException("Model Type Information is missing.");

-            }

-

-            if (modelType.getDefinition() == null) {

-                throw new BluePrintException("Model Definition Information is missing.");

-            }

-            if (StringUtils.isBlank(modelType.getDescription())) {

-                throw new BluePrintException("Model Description Information is missing.");

-            }

-

-            if (StringUtils.isBlank(modelType.getVersion())) {

-                throw new BluePrintException("Model Version Information is missing.");

-            }

-

-            if (StringUtils.isBlank(modelType.getUpdatedBy())) {

-                throw new BluePrintException("Model Updated By Information is missing.");

-            }

-

-            List<String> validRootTypes = getValidModelDefinitionType();

-            if (!validRootTypes.contains(modelType.getDefinitionType())) {

-                throw new BluePrintException("Not Valid Model Root Type(" + modelType.getDefinitionType()

-                        + "), It should be " + validRootTypes);

-            }

-

-            validateModelTypeDefinition(modelType.getDefinitionType(), modelType.getDefinition());

-

-        } else {

-            throw new BluePrintException("Model Type Information is missing.");

-        }

-

-        return true;

-

-    }

-

-}

diff --git a/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/load/BluePrintDatabaseLoadService.kt b/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/load/BluePrintDatabaseLoadService.kt
index 8b6e54af..8144a1e7 100644
--- a/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/load/BluePrintDatabaseLoadService.kt
+++ b/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/load/BluePrintDatabaseLoadService.kt
@@ -17,6 +17,7 @@
 package org.onap.ccsdk.apps.controllerblueprints.service.load
 
 import com.att.eelf.configuration.EELFManager
+import kotlinx.coroutines.runBlocking
 import org.onap.ccsdk.apps.controllerblueprints.core.config.BluePrintLoadConfiguration
 import org.springframework.boot.context.event.ApplicationReadyEvent
 import org.springframework.context.event.EventListener
@@ -49,7 +50,9 @@ open class BluePrintDatabaseLoadService(private val bluePrintLoadConfiguration:
         if (bluePrintLoadConfiguration.loadModelType) {
             val paths = bluePrintLoadConfiguration.loadModeTypePaths?.split(",")
             paths?.let {
-                modelTypeLoadService.loadPathsModelType(paths)
+                runBlocking {
+                    modelTypeLoadService.loadPathsModelType(paths)
+                }
             }
         }
     }
diff --git a/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/load/ModelTypeLoadService.kt b/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/load/ModelTypeLoadService.kt
index 51bbca7d..061ef88e 100644
--- a/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/load/ModelTypeLoadService.kt
+++ b/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/load/ModelTypeLoadService.kt
@@ -21,9 +21,8 @@ import kotlinx.coroutines.*
 import org.apache.commons.io.FilenameUtils
 import org.apache.commons.lang3.text.StrBuilder
 import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
-import org.onap.ccsdk.apps.controllerblueprints.core.data.ArtifactType
-import org.onap.ccsdk.apps.controllerblueprints.core.data.DataType
-import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeType
+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
 import org.onap.ccsdk.apps.controllerblueprints.service.domain.ModelType
 import org.onap.ccsdk.apps.controllerblueprints.service.handler.ModelTypeHandler
@@ -37,11 +36,14 @@ open class ModelTypeLoadService(private val modelTypeHandler: ModelTypeHandler)
     private val log = EELFManager.getInstance().getLogger(ModelTypeLoadService::class.java)
     private val updateBySystem = "System"
 
-    open fun loadPathsModelType(modelTypePaths: List<String>) {
-        modelTypePaths.forEach { loadPathModelType(it) }
+    open suspend fun loadPathsModelType(modelTypePaths: List<String>) {
+        modelTypePaths.forEach { runBlocking { loadPathModelType(it) } }
     }
 
-    open fun loadPathModelType(modelTypePath: String) = runBlocking {
+    /**
+     * Load the Model Type file content from the defined path, Load of sequencing should be maintained.
+     */
+    open suspend fun loadPathModelType(modelTypePath: String) = runBlocking {
         log.info(" *************************** loadModelType **********************")
         try {
             val errorBuilder = StrBuilder()
@@ -51,17 +53,35 @@ open class ModelTypeLoadService(private val modelTypeHandler: ModelTypeHandler)
 
                 val deferredResults = mutableListOf<Deferred<Unit>>()
 
-                for (file in dataTypeFiles) deferredResults += async { loadDataType(file, errorBuilder) }
+                for (file in dataTypeFiles) deferredResults += async {
+                    loadModelType(file, DataType::class.java, errorBuilder)
+                }
 
                 deferredResults.awaitAll()
             }
 
             coroutineScope {
-                val artifactTypefiles = File("$modelTypePath/artifact_type").listFiles()
+                val artifactTypeFiles = File("$modelTypePath/artifact_type").listFiles()
 
                 val deferredResults = mutableListOf<Deferred<Unit>>()
 
-                for (file in artifactTypefiles) deferredResults += async { loadArtifactType(file, errorBuilder) }
+                for (file in artifactTypeFiles) deferredResults += async {
+                    loadModelType(file,
+                            ArtifactType::class.java, errorBuilder)
+                }
+
+                deferredResults.awaitAll()
+            }
+
+            coroutineScope {
+                val relationshipTypeFiles = File("$modelTypePath/relationship_type").listFiles()
+
+                val deferredResults = mutableListOf<Deferred<Unit>>()
+
+                for (file in relationshipTypeFiles) deferredResults += async {
+                    loadModelType(file,
+                            RelationshipType::class.java, errorBuilder)
+                }
 
                 deferredResults.awaitAll()
             }
@@ -71,7 +91,10 @@ open class ModelTypeLoadService(private val modelTypeHandler: ModelTypeHandler)
 
                 val deferredResults = mutableListOf<Deferred<Unit>>()
 
-                for (file in nodeTypeFiles) deferredResults += async { loadNodeType(file, errorBuilder) }
+                for (file in nodeTypeFiles) deferredResults += async {
+                    loadModelType(file,
+                            NodeType::class.java, errorBuilder)
+                }
                 deferredResults.awaitAll()
             }
 
@@ -83,76 +106,45 @@ open class ModelTypeLoadService(private val modelTypeHandler: ModelTypeHandler)
         }
     }
 
-    private fun loadDataType(file: File, errorBuilder: StrBuilder) {
-        try {
-            log.trace("Loading DataType(${file.name}")
-            val dataKey = FilenameUtils.getBaseName(file.name)
-            val definitionContent = file.readText(Charset.defaultCharset())
-            val dataType = JacksonUtils.readValue(definitionContent, DataType::class.java)
-            checkNotNull(dataType) { "failed to get data type from file : ${file.name}" }
-
-            val modelType = ModelType()
-            modelType.definitionType = BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE
-            modelType.derivedFrom = dataType.derivedFrom
-            modelType.description = dataType.description
-            modelType.definition = JacksonUtils.jsonNode(definitionContent)
-            modelType.modelName = dataKey
-            modelType.version = dataType.version
-            modelType.updatedBy = updateBySystem
-            modelType.tags = (dataKey + "," + dataType.derivedFrom + "," + BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE)
-            modelTypeHandler.saveModel(modelType)
-            log.trace("DataType(${file.name}) loaded successfully ")
-        } catch (e: Exception) {
-            errorBuilder.appendln("Couldn't load DataType(${file.name}: ${e.message}")
-        }
-    }
-
-    private fun loadArtifactType(file: File, errorBuilder: StrBuilder) {
+    private inline fun <reified T> loadModelType(file: File, classType: Class<T>, errorBuilder: StrBuilder) {
         try {
-            log.trace("Loading ArtifactType(${file.name}")
+            log.trace("Loading ${classType.name} (${file.name})")
             val dataKey = FilenameUtils.getBaseName(file.name)
             val definitionContent = file.readText(Charset.defaultCharset())
-            val artifactType = JacksonUtils.readValue(definitionContent, ArtifactType::class.java)
-            checkNotNull(artifactType) { "failed to get artifact type from file : ${file.name}" }
+            val definition = JacksonUtils.readValue(definitionContent, classType) as EntityType
+            //checkNotNull(definition) { "failed to get data type from file : ${file.name}" }
 
             val modelType = ModelType()
-            modelType.definitionType = BluePrintConstants.MODEL_DEFINITION_TYPE_ARTIFACT_TYPE
-            modelType.derivedFrom = artifactType.derivedFrom
-            modelType.description = artifactType.description
+            val definitionType: String?
+            when (T::class) {
+                DataType::class -> {
+                    definitionType = BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE
+                }
+                RelationshipType::class -> {
+                    definitionType = BluePrintConstants.MODEL_DEFINITION_TYPE_RELATIONSHIP_TYPE
+                }
+                ArtifactType::class -> {
+                    definitionType = BluePrintConstants.MODEL_DEFINITION_TYPE_ARTIFACT_TYPE
+                }
+                NodeType::class -> {
+                    definitionType = BluePrintConstants.MODEL_DEFINITION_TYPE_NODE_TYPE
+                }
+                else -> {
+                    throw BluePrintException("couldn't process model type($classType) definition")
+                }
+            }
+            modelType.definitionType = definitionType
+            modelType.derivedFrom = definition.derivedFrom
+            modelType.description = definition.description
             modelType.definition = JacksonUtils.jsonNode(definitionContent)
             modelType.modelName = dataKey
-            modelType.version = artifactType.version
+            modelType.version = definition.version
             modelType.updatedBy = updateBySystem
-            modelType.tags = (dataKey + "," + artifactType.derivedFrom + "," + BluePrintConstants.MODEL_DEFINITION_TYPE_ARTIFACT_TYPE)
+            modelType.tags = (dataKey + "," + definition.derivedFrom + "," + definitionType)
             modelTypeHandler.saveModel(modelType)
-            log.trace("ArtifactType(${file.name}) loaded successfully ")
+            log.trace("${classType.name}(${file.name}) loaded successfully ")
         } catch (e: Exception) {
-            errorBuilder.appendln("Couldn't load ArtifactType(${file.name}: ${e.message}")
+            errorBuilder.appendln("Couldn't load ${classType.name}(${file.name}: ${e.message}")
         }
     }
-
-    private fun loadNodeType(file: File, errorBuilder: StrBuilder) {
-        try {
-            log.trace("Loading NodeType(${file.name}")
-            val nodeKey = FilenameUtils.getBaseName(file.name)
-            val definitionContent = file.readText(Charset.defaultCharset())
-            val nodeType = JacksonUtils.readValue(definitionContent, NodeType::class.java)
-            checkNotNull(nodeType) { "failed to get node type from file : ${file.name}" }
-
-            val modelType = ModelType()
-            modelType.definitionType = BluePrintConstants.MODEL_DEFINITION_TYPE_NODE_TYPE
-            modelType.derivedFrom = nodeType.derivedFrom
-            modelType.description = nodeType.description
-            modelType.definition = JacksonUtils.jsonNode(definitionContent)
-            modelType.modelName = nodeKey
-            modelType.version = nodeType.version
-            modelType.updatedBy = updateBySystem
-            modelType.tags = (nodeKey + "," + BluePrintConstants.MODEL_DEFINITION_TYPE_NODE_TYPE + "," + nodeType.derivedFrom)
-            modelTypeHandler.saveModel(modelType)
-            log.trace("NodeType(${file.name}) loaded successfully ")
-        } catch (e: Exception) {
-            errorBuilder.appendln("Couldn't load NodeType(${file.name}: ${e.message}")
-        }
-    }
-
 }
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/validator/ModelTypeValidator.kt b/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/validator/ModelTypeValidator.kt
new file mode 100644
index 00000000..1428c81d
--- /dev/null
+++ b/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/validator/ModelTypeValidator.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.service.validator
+
+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.BluePrintTypes
+import org.onap.ccsdk.apps.controllerblueprints.core.data.*
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
+import org.onap.ccsdk.apps.controllerblueprints.service.domain.ModelType
+
+class ModelTypeValidator {
+    companion object {
+        /**
+         * This is a validateModelTypeDefinition
+         *
+         * @param definitionType definitionType
+         * @param definitionContent definitionContent
+         * @return boolean
+         */
+        fun validateModelTypeDefinition(definitionType: String, definitionContent: JsonNode): Boolean {
+
+            when (definitionType) {
+                BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE -> {
+                    JacksonUtils.readValue(definitionContent, DataType::class.java)
+                            ?: throw BluePrintException("Model type definition is not DataType valid content $definitionContent")
+                }
+                BluePrintConstants.MODEL_DEFINITION_TYPE_NODE_TYPE -> {
+                    JacksonUtils.readValue(definitionContent, NodeType::class.java)
+                            ?: throw BluePrintException("Model type definition is not NodeType valid content $definitionContent")
+                }
+                BluePrintConstants.MODEL_DEFINITION_TYPE_ARTIFACT_TYPE -> {
+                    JacksonUtils.readValue(definitionContent, ArtifactType::class.java)
+                            ?: throw BluePrintException("Model type definition is not ArtifactType valid content $definitionContent")
+                }
+                BluePrintConstants.MODEL_DEFINITION_TYPE_CAPABILITY_TYPE -> {
+                    JacksonUtils.readValue(definitionContent, CapabilityDefinition::class.java)
+                            ?: throw BluePrintException("Model type definition is not CapabilityDefinition valid content $definitionContent")
+                }
+                BluePrintConstants.MODEL_DEFINITION_TYPE_RELATIONSHIP_TYPE -> {
+                    JacksonUtils.readValue(definitionContent, RelationshipType::class.java)
+                            ?: throw BluePrintException("Model type definition is not RelationshipType valid content $definitionContent")
+                }
+            }
+            return true
+        }
+
+        /**
+         * This is a validateModelType method
+         *
+         * @param modelType modelType
+         * @return boolean
+         */
+        fun validateModelType(modelType: ModelType?): Boolean {
+            checkNotNull(modelType) { "Model Type Information is missing." }
+
+            val validRootTypes = BluePrintTypes.validModelTypes()
+
+            check(validRootTypes.contains(modelType.definitionType)) {
+                "Not Valid Model Root Type(${modelType.definitionType}), It should be $validRootTypes"
+            }
+
+            validateModelTypeDefinition(modelType.definitionType, modelType.definition)
+            return true
+        }
+    }
+
+}
diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.java
deleted file mode 100644
index 23e5294f..00000000
--- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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.service.enhancer;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.ccsdk.apps.controllerblueprints.TestApplication;
-import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintEnhancerService;
-import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintValidatorService;
-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext;
-import org.onap.ccsdk.apps.controllerblueprints.service.load.ModelTypeLoadService;
-import org.onap.ccsdk.apps.controllerblueprints.service.load.ResourceDictionaryLoadService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.nio.file.Paths;
-
-@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = {TestApplication.class})
-@TestPropertySource(locations = {"classpath:application.properties"})
-public class BluePrintEnhancerServiceImplTest {
-
-    @Autowired
-    private ModelTypeLoadService modelTypeLoadService;
-
-    @Autowired
-    private ResourceDictionaryLoadService resourceDictionaryLoadService;
-
-    @Autowired
-    private BluePrintEnhancerService bluePrintEnhancerService;
-
-    @Autowired
-    private BluePrintValidatorService bluePrintValidatorService;
-
-    @Before
-    public void init() {
-        modelTypeLoadService.loadPathModelType("./../../../../components/model-catalog/definition-type/starter-type");
-        resourceDictionaryLoadService.loadPathResourceDictionary("./../../../../components/model-catalog/resource-dictionary/starter-dictionary");
-    }
-
-    @Test
-    public void testEnhancementAndValidation() throws Exception {
-
-        String basePath = "./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration";
-
-        String targetPath = Paths.get("target", "bp-enhance").toUri().getPath();
-
-        BluePrintContext bluePrintContext = bluePrintEnhancerService.enhance(basePath, targetPath);
-        Assert.assertNotNull("failed to get blueprintContext ", bluePrintContext);
-
-        // Validate the Generated BluePrints
-        Boolean valid = bluePrintValidatorService.validateBluePrints(targetPath);
-        Assert.assertTrue("blueprint validation failed ", valid);
-    }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/validator/ModelTypeValidatorTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/validator/ModelTypeValidatorTest.java
deleted file mode 100644
index 16b2bc81..00000000
--- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/validator/ModelTypeValidatorTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.service.validator;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException;
-import org.onap.ccsdk.apps.controllerblueprints.service.domain.ModelType;
-
-public class ModelTypeValidatorTest {
-
-    @Before
-    public void setup(){
-        ModelTypeValidator modelTypeValidator;
-    }
-
-    @Test
-    public void testGetValidModelDefinitionType_definitionContentNULL() throws Exception{
-        String definitionType=null;
-        JsonNode definitionContent=null;
-        boolean valid= ModelTypeValidator.validateModelTypeDefinition(definitionType, definitionContent);
-        Assert.assertTrue(valid);
-
-    }
-
-    @Test(expected=BluePrintException.class)
-    public void testvalidateModelType() throws Exception{
-        ModelType modelType = new ModelType();
-        modelType.setDefinitionType("");
-        modelType.setDerivedFrom("");
-        modelType.setDescription("");
-        JsonNode definitionContent=null;
-        modelType.setDefinition(definitionContent);
-        modelType.setModelName("");
-        modelType.setVersion("");
-        modelType.setTags("");
-        modelType.setUpdatedBy("");
-        ModelTypeValidator.validateModelType(modelType);
-    }
-}
diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt
new file mode 100644
index 00000000..4ab67084
--- /dev/null
+++ b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt
@@ -0,0 +1,75 @@
+/*
+ * 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.service.enhancer
+
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.onap.ccsdk.apps.controllerblueprints.TestApplication
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintEnhancerService
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintValidatorService
+import org.onap.ccsdk.apps.controllerblueprints.service.load.ModelTypeLoadService
+import org.onap.ccsdk.apps.controllerblueprints.service.load.ResourceDictionaryLoadService
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.test.context.ContextConfiguration
+import org.springframework.test.context.TestPropertySource
+import org.springframework.test.context.junit4.SpringRunner
+import java.nio.file.Paths
+
+@RunWith(SpringRunner::class)
+@ContextConfiguration(classes = arrayOf(TestApplication::class))
+@TestPropertySource(locations = arrayOf("classpath:application.properties"))
+class BluePrintEnhancerServiceImplTest {
+
+    @Autowired
+    private val modelTypeLoadService: ModelTypeLoadService? = null
+
+    @Autowired
+    private val resourceDictionaryLoadService: ResourceDictionaryLoadService? = null
+
+    @Autowired
+    private val bluePrintEnhancerService: BluePrintEnhancerService? = null
+
+    @Autowired
+    private val bluePrintValidatorService: BluePrintValidatorService? = null
+
+    @Before
+    fun init() {
+        runBlocking {
+            modelTypeLoadService!!.loadPathModelType("./../../../../components/model-catalog/definition-type/starter-type")
+            resourceDictionaryLoadService!!.loadPathResourceDictionary("./../../../../components/model-catalog/resource-dictionary/starter-dictionary")
+        }
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun testEnhancementAndValidation() {
+
+        val basePath = "./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration"
+
+        val targetPath = Paths.get("target", "bp-enhance").toUri().path
+
+        val bluePrintContext = bluePrintEnhancerService!!.enhance(basePath, targetPath)
+        Assert.assertNotNull("failed to get blueprintContext ", bluePrintContext)
+
+        // Validate the Generated BluePrints
+        val valid = bluePrintValidatorService!!.validateBluePrints(targetPath)
+        Assert.assertTrue("blueprint validation failed ", valid)
+    }
+}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/validator/ModelTypeValidatorTest.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/validator/ModelTypeValidatorTest.kt
new file mode 100644
index 00000000..db4ee5c9
--- /dev/null
+++ b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/validator/ModelTypeValidatorTest.kt
@@ -0,0 +1,40 @@
+/*
+ * 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.service.validator
+
+import com.fasterxml.jackson.databind.JsonNode
+import org.junit.Test
+import org.onap.ccsdk.apps.controllerblueprints.service.domain.ModelType
+
+class ModelTypeValidatorTest {
+
+    @Test(expected = IllegalStateException::class)
+    @Throws(Exception::class)
+    fun testvalidateModelType() {
+        val modelType = ModelType()
+        modelType.definitionType = ""
+        modelType.derivedFrom = ""
+        modelType.description = ""
+        val definitionContent: JsonNode? = null
+        modelType.definition = definitionContent
+        modelType.modelName = ""
+        modelType.version = ""
+        modelType.tags = ""
+        modelType.updatedBy = ""
+        ModelTypeValidator.validateModelType(modelType)
+    }
+}