Controller Blueprints Microservice

Refactor controller blueprint core and resource dictionary modules to components module. Change-Id: If5ba5e35e9c95bc19bc78fb10bd62d6551ba7aca Issue-ID: CCSDK-514 Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>
author: Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com> 2018-09-04 20:24:35 +0000
committer: Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com> 2018-09-04 20:47:03 +0000
commit: 594b5e1c919089c110e6aa9b9d1c00b96a9e96f9 (patch)
tree: aeb353f21da3ee3982e5a0d1d1842b13bb490c3c /ms/controllerblueprints/modules/resource-dict
parent: 9abed7f23417e24039d463f84156c1d9fef672f7 (diff)
32 files changed, 0 insertions, 1861 deletions
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
deleted file mode 100644
index 95a9801d..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-component-java.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "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-db.json b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-db.json
deleted file mode 100644
index 661a9503..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-db.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "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-default.json b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-default.json
deleted file mode 100644
index 13e234e1..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-default.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "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
deleted file mode 100644
index 126ea30b..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-input.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "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-rest.json b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-rest.json
deleted file mode 100644
index f8dd8b6f..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-rest.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "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
deleted file mode 100644
index 2ef553e2..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/tosca.nodes.ResourceSource.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "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/db-source.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/db-source.json
deleted file mode 100644
index 92b16a21..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/db-source.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "name": "db-source",
-  "property" :{
-    "description": "name of the ",
-    "type": "string"
-  },
-  "resource-type": "ONAP",
-  "resource-path": "vnf/bundle-id",
-  "updated-by": "brindasanth@onap.com",
-  "tags": "bundle-id, brindasanth@onap.com",
-  "sources": {
-    "db": {
-      "type": "source-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/default-source.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/default-source.json
deleted file mode 100644
index 1c47f37b..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/default-source.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "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",
-  "resource-type": "ONAP",
-  "resource-path": "vnf/v4-ip-type",
-  "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
deleted file mode 100644
index 676d92f8..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/input-source.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"name": "input-source",
-	"property" :{
-		"description": "name of the ",
-		"type": "string"
-	},
-	"resource-path": "action-name",
-	"resource-type": "ONAP",
-	"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
deleted file mode 100644
index b49146a0..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "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",
-  "resource-type": "ATT",
-  "resource-path": "vnf/oam-local-ipv4-address",
-  "sources": {
-    "mdsal": {
-      "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/pom.xml b/ms/controllerblueprints/modules/resource-dict/pom.xml
deleted file mode 100644
index dbc920fd..00000000
--- a/ms/controllerblueprints/modules/resource-dict/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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.3.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>resource-dict</artifactId>
-    <name>Controller Blueprints Resource Dictionary</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
-            <artifactId>core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-test</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/ResourceAssignmentProcessor.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceAssignmentProcessor.kt
deleted file mode 100644
index a6802f67..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceAssignmentProcessor.kt
+++ /dev/null
@@ -1,34 +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.resource.dict
-
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintProcessorException
-
-interface ResourceAssignmentProcessor {
-
-    @Throws(BluePrintProcessorException::class)
-    fun validate(resourceAssignment: ResourceAssignment, context : MutableMap<String, Any>)
-
-    @Throws(BluePrintProcessorException::class)
-    fun process(resourceAssignment: ResourceAssignment, context : MutableMap<String, Any>)
-
-    @Throws(BluePrintProcessorException::class)
-    fun errorHandle(resourceAssignment: ResourceAssignment, context : MutableMap<String, Any>)
-
-    @Throws(BluePrintProcessorException::class)
-    fun reTrigger(resourceAssignment: ResourceAssignment, context : MutableMap<String, Any>)
-}
-\ No newline at end of file
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
deleted file mode 100644
index 0808073f..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt
+++ /dev/null
@@ -1,100 +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.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 = "resource-type", required = true)
-    lateinit var resourceType: String
-
-    @JsonProperty(value = "resource-path", required = true)
-    lateinit var resourcePath: 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
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
deleted file mode 100644
index aa6a9fb6..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt
+++ /dev/null
@@ -1,34 +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.resource.dict
-/**
- * ResourceDictionaryConstants
- *
- * @author Brinda Santh
- */
-object ResourceDictionaryConstants {
-    const val SOURCE_INPUT = "input"
-    const val SOURCE_DEFAULT = "default"
-    const val SOURCE_DB = "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"
-}
-\ 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/ResourceAssignmentEnhancerService.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentEnhancerService.kt
deleted file mode 100644
index c5a78a9c..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentEnhancerService.kt
+++ /dev/null
@@ -1,86 +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.resource.dict.service
-
-import com.att.eelf.configuration.EELFLogger
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
-import org.onap.ccsdk.apps.controllerblueprints.core.data.ServiceTemplate
-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintEnhancerDefaultService
-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintEnhancerService
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDefinition
-import com.att.eelf.configuration.EELFManager
-
-/**
- * ResourceAssignmentEnhancerService.
- *
- * @author Brinda Santh
- */
-interface ResourceAssignmentEnhancerService {
-
-    @Throws(BluePrintException::class)
-    fun enhanceBluePrint(bluePrintEnhancerService: BluePrintEnhancerService,
-                         resourceAssignments: List<ResourceAssignment>)
-
-    @Throws(BluePrintException::class)
-    fun enhanceBluePrint(resourceAssignments: List<ResourceAssignment>): ServiceTemplate
-}
-
-/**
- * ResourceAssignmentEnhancerDefaultService.
- *
- * @author Brinda Santh
- */
-open class ResourceAssignmentEnhancerDefaultService(private val resourceDefinitionRepoService: ResourceDefinitionRepoService)
-    : ResourceAssignmentEnhancerService {
-    private val log: EELFLogger = EELFManager.getInstance().getLogger(ResourceAssignmentValidationDefaultService::class.java)
-
-    /**
-     * Get the defined source instance from the ResourceAssignment,
-     * then get the NodeType of the Sources assigned
-     */
-    override fun enhanceBluePrint(bluePrintEnhancerService: BluePrintEnhancerService,
-                                  resourceAssignments: List<ResourceAssignment>) {
-
-        // Iterate the Resource Assignment and
-        resourceAssignments.map { resourceAssignment ->
-            val dictionaryName = resourceAssignment.dictionaryName!!
-            val dictionarySource = resourceAssignment.dictionarySource!!
-            log.info("Enriching Assignment name({}), dictionary name({}), source({})", resourceAssignment.name,
-                    dictionaryName, dictionarySource)
-            // Get the Resource Definition from Repo
-            val resourceDefinition: ResourceDefinition = getResourceDefinition(dictionaryName)
-
-            val sourceNodeTemplate = resourceDefinition.sources.get(dictionarySource)
-
-            // Enrich as NodeTemplate
-            bluePrintEnhancerService.enrichNodeTemplate(dictionarySource, sourceNodeTemplate!!)
-        }
-    }
-
-    override fun enhanceBluePrint(resourceAssignments: List<ResourceAssignment>): ServiceTemplate {
-        val bluePrintEnhancerService = BluePrintEnhancerDefaultService(resourceDefinitionRepoService)
-        bluePrintEnhancerService.serviceTemplate = ServiceTemplate()
-        bluePrintEnhancerService.initialCleanUp()
-        enhanceBluePrint(bluePrintEnhancerService, resourceAssignments)
-        return bluePrintEnhancerService.serviceTemplate
-    }
-
-    private fun getResourceDefinition(name: String): ResourceDefinition {
-        return resourceDefinitionRepoService.getResourceDefinition(name)!!.block()!!
-    }
-}
-\ 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/ResourceAssignmentValidationService.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationService.kt
deleted file mode 100644
index 228b39e2..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationService.kt
+++ /dev/null
@@ -1,151 +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.resource.dict.service
-
-import com.att.eelf.configuration.EELFLogger
-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.utils.TopologicalSortingUtils
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment
-import com.att.eelf.configuration.EELFManager
-import java.io.Serializable
-
-/**
- * ResourceAssignmentValidationService.
- *
- * @author Brinda Santh
- */
-interface ResourceAssignmentValidationService : Serializable {
-
-    @Throws(BluePrintException::class)
-    fun validate(resourceAssignments: List<ResourceAssignment>): Boolean
-}
-
-/**
- * ResourceAssignmentValidationDefaultService.
- *
- * @author Brinda Santh
- */
-open class ResourceAssignmentValidationDefaultService : ResourceAssignmentValidationService {
-    private val log: EELFLogger = EELFManager.getInstance().getLogger(ResourceAssignmentValidationDefaultService::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")
-    }
-
-    open fun validateTemplateNDictionaryKeys(resourceAssignments: List<ResourceAssignment>) {
-
-        resourceAssignmentMap = resourceAssignments.map { it.name to it }.toMap()
-
-        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))
-        }
-
-        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))
-        }
-
-        val dependenciesNames = resourceAssignments.mapNotNull { it.dependencies }.flatten()
-
-        log.info("Resource assignment definitions : {}", resourceAssignmentMap.keys)
-        log.info("Resource assignment Dictionary dependencies : {}", dependenciesNames)
-
-        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/ResourceDefinitionRepoService.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoService.kt
deleted file mode 100644
index d51338ca..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoService.kt
+++ /dev/null
@@ -1,61 +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.resource.dict.service
-
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRepoFileService
-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRepoService
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonReactorUtils
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDefinition
-import reactor.core.publisher.Mono
-/**
- * ResourceDefinitionRepoService.
- *
- * @author Brinda Santh
- */
-interface ResourceDefinitionRepoService : BluePrintRepoService {
-
-    fun getResourceDefinition(resourceDefinitionName: String): Mono<ResourceDefinition>?
-}
-
-/**
- * ResourceDefinitionFileRepoService.
- *
- * @author Brinda Santh
- */
-open class ResourceDefinitionFileRepoService : BluePrintRepoFileService,
-        ResourceDefinitionRepoService {
-
-    private var resourceDefinitionPath: String
-    private val extension = ".json"
-
-    constructor(basePath: String) : this(basePath,
-            basePath.plus(BluePrintConstants.PATH_DIVIDER)
-                    .plus(BluePrintConstants.MODEL_DIR_MODEL_TYPE))
-
-    constructor(basePath: String, modelTypePath: String) : super(modelTypePath) {
-        resourceDefinitionPath = basePath.plus("/resource_dictionary")
-    }
-
-    override fun getResourceDefinition(resourceDefinitionName: String): Mono<ResourceDefinition>? {
-
-        val fileName = resourceDefinitionPath.plus(BluePrintConstants.PATH_DIVIDER)
-                .plus(resourceDefinitionName).plus(extension)
-
-        return JacksonReactorUtils.readValueFromFile(fileName, ResourceDefinition::class.java)
-    }
-}
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
deleted file mode 100644
index 14855d4b..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionValidationService.kt
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- *  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.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.service.BluePrintExpressionService
-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRepoService
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDefinition
-import com.att.eelf.configuration.EELFManager
-import java.io.Serializable
-/**
- * ResourceDefinitionValidationService.
- *
- * @author Brinda Santh
- */
-interface ResourceDefinitionValidationService : Serializable {
-
-    @Throws(BluePrintException::class)
-    fun validate(resourceDefinition: ResourceDefinition)
-
-}
-/**
- * ResourceDefinitionValidationService.
- *
- * @author Brinda Santh
- */
-open class ResourceDefinitionDefaultValidationService(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)?.block()
-                    ?: throw BluePrintException(format("Failed to get source({}) node type definition({})", name, 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)
-                    ?: throw BluePrintException(format("property({}) defined of data type({}) is not in repository",
-                            propertyName, 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
deleted file mode 100644
index 747639c8..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/BulkResourceSequencingUtils.kt
+++ /dev/null
@@ -1,109 +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.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
deleted file mode 100644
index a3456cd4..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtils.kt
+++ /dev/null
@@ -1,78 +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.resource.dict.utils
-
-import com.att.eelf.configuration.EELFLogger
-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.data.NodeTemplate
-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.EELFManager
-
-
-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
-        }
-    }
-}
-\ 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
deleted file mode 100644
index fde80005..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinitionTest.java
+++ /dev/null
@@ -1,60 +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.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.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.readValueFromFile(fileName, ResourceDefinition.class);
-        Assert.assertNotNull("Failed to populate dictionaryDefinition for default type", resourceDefinition);
-    }
-
-    @Test
-    public void testDictionaryDefinitionDBSource(){
-
-        String fileName = basePath + "/db-source.json";
-        ResourceDefinition resourceDefinition = JacksonUtils.readValueFromFile(fileName, ResourceDefinition.class);
-        Assert.assertNotNull("Failed to populate dictionaryDefinition for db type", resourceDefinition);
-    }
-
-    @Test
-    public void testDictionaryDefinitionMDSALSource(){
-        String fileName = basePath + "/mdsal-source.json";
-        ResourceDefinition resourceDefinition = JacksonUtils.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/service/ResourceAssignmentEnhancerServiceTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentEnhancerServiceTest.java
deleted file mode 100644
index 57c8509d..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentEnhancerServiceTest.java
+++ /dev/null
@@ -1,48 +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.resource.dict.service;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException;
-import org.onap.ccsdk.apps.controllerblueprints.core.data.ServiceTemplate;
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonReactorUtils;
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment;
-
-import java.util.List;
-
-/**
- * ResourceAssignmentEnhancerService.
- *
- * @author Brinda Santh
- */
-public class ResourceAssignmentEnhancerServiceTest {
-
-    @Test
-    public void testEnhanceBluePrint() throws BluePrintException {
-
-        List<ResourceAssignment> resourceAssignments = JacksonReactorUtils
-                .getListFromClassPathFile("enrich/simple-enrich.json", ResourceAssignment.class).block();
-        Assert.assertNotNull("Failed to get Resource Assignment", resourceAssignments);
-        ResourceDefinitionRepoService resourceDefinitionRepoService = new ResourceDefinitionFileRepoService("load");
-        ResourceAssignmentEnhancerService resourceAssignmentEnhancerService =
-                new ResourceAssignmentEnhancerDefaultService(resourceDefinitionRepoService);
-        ServiceTemplate serviceTemplate = resourceAssignmentEnhancerService.enhanceBluePrint(resourceAssignments);
-        Assert.assertNotNull("Failed to get Enriched service Template", serviceTemplate);
-    }
-}
-
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
deleted file mode 100644
index 6216d5bf..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationServiceTest.kt
+++ /dev/null
@@ -1,57 +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.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
-/**
- * ResourceAssignmentValidationServiceTest.
- *
- * @author Brinda Santh
- */
-class ResourceAssignmentValidationServiceTest {
-    private val log: EELFLogger = EELFManager.getInstance().getLogger(ResourceAssignmentValidationServiceTest::class.java)
-    @Test
-    fun testValidateSuccess() {
-        log.info("**************** testValidateSuccess *****************")
-        val assignments = JacksonUtils.getListFromClassPathFile("validation/success.json", ResourceAssignment::class.java)
-        val resourceAssignmentValidator = ResourceAssignmentValidationDefaultService()
-        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 = ResourceAssignmentValidationDefaultService()
-        resourceAssignmentValidator.validate(assignments!!)
-    }
-
-    @Test(expected = BluePrintException::class)
-    fun testValidateCyclic() {
-        log.info(" ****************  testValidateCyclic *****************")
-        val assignments = JacksonUtils.getListFromClassPathFile("validation/cyclic.json", ResourceAssignment::class.java)
-        val resourceAssignmentValidator = ResourceAssignmentValidationDefaultService()
-        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/ResourceDefinitionRepoServiceTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoServiceTest.java
deleted file mode 100644
index 1772277d..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoServiceTest.java
+++ /dev/null
@@ -1,36 +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.resource.dict.service;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeType;
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDefinition;
-
-public class ResourceDefinitionRepoServiceTest {
-
-    @Test
-    public void testGetResourceDefinition() throws Exception{
-        ResourceDefinitionRepoService resourceDefinitionRepoService = new ResourceDefinitionFileRepoService("load");
-        ResourceDefinition resourceDefinition = resourceDefinitionRepoService
-                .getResourceDefinition("db-source").block();
-        Assert.assertNotNull("Failed to get Resource Definition db-source", resourceDefinition);
-
-        NodeType nodeType = resourceDefinitionRepoService.getNodeType("source-db").block();
-        Assert.assertNotNull("Failed to get Node Type source-db", resourceDefinition);
-    }
-}
-\ 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
deleted file mode 100644
index ef305627..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionValidationServiceTest.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.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 + "/db-source.json";
-        testValidate(inputFileName);
-
-        String dbFileName = dictionaryPath + "/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.readValueFromFile(fileName, ResourceDefinition.class);
-        Assert.assertNotNull("Failed to populate dictionaryDefinition for  type", resourceDefinition);
-
-        ResourceDefinitionValidationService resourceDictionaryValidationService =
-                new ResourceDefinitionDefaultValidationService(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
deleted file mode 100644
index c7444dba..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/BulkResourceSequencingUtilsTest.java
+++ /dev/null
@@ -1,37 +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.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.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
deleted file mode 100644
index 13bf8195..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java
+++ /dev/null
@@ -1,99 +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.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_DB);
-        ResourceDictionaryUtils.populateSourceMapping(resourceAssignment, resourceDefinition);
-        Assert.assertEquals("Expected Assigned source DB, but.", ResourceDictionaryConstants.SOURCE_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_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.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/resources/data/resource-assignment-input.json b/ms/controllerblueprints/modules/resource-dict/src/test/resources/data/resource-assignment-input.json
deleted file mode 100644
index d79c9068..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/test/resources/data/resource-assignment-input.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "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/enrich/simple-enrich.json b/ms/controllerblueprints/modules/resource-dict/src/test/resources/enrich/simple-enrich.json
deleted file mode 100644
index 641da80a..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/test/resources/enrich/simple-enrich.json
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-  {
-    "name": "rs-db-source",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "required": true
-    },
-    "dictionary-name": "db-source",
-    "dictionary-source": "db",
-    "dependencies": [
-      "input-source"
-    ]
-  },
-  {
-    "name": "ra-default-source",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "required": true
-    },
-    "dictionary-name": "default-source",
-    "dictionary-source": "default",
-    "dependencies": []
-  },
-  {
-    "name": "ra-input-source",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "required": true
-    },
-    "dictionary-name": "input-source",
-    "dictionary-source": "input",
-    "dependencies": []
-  }
-]
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
deleted file mode 100644
index d837dc5d..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/cyclic.json
+++ /dev/null
@@ -1,111 +0,0 @@
-[
-  {
-    "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": "mdsal",
-    "dependencies": [
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "bundle-ip",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "required": true
-    },
-    "dictionary-name": "bundle-ip",
-    "dictionary-source": "mdsal",
-    "dependencies": [
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "bundle-mac",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "bundle-mac",
-    "dictionary-source": "mdsal",
-    "dependencies": [
-      "vnf-id",
-      "bundle-id"
-    ]
-  },
-  {
-    "name": "managed-ip",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "managed-ip",
-    "dictionary-source": "mdsal",
-    "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": "mdsal",
-    "dependencies": [
-      "loopback-ip"
-    ]
-  },
-  {
-    "name": "loopback-ip",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "loopback-ip",
-    "dictionary-source": "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
deleted file mode 100644
index 330324cd..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json
+++ /dev/null
@@ -1,110 +0,0 @@
-[
-  {
-    "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": "mdsal",
-    "dependencies": [
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "bundle-ip",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "required": true
-    },
-    "dictionary-name": "bundle-ip",
-    "dictionary-source": "mdsal",
-    "dependencies": [
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "bundle-mac",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "bundle-mac",
-    "dictionary-source": "mdsal",
-    "dependencies": [
-      "vnf-id",
-      "bundle-id"
-    ]
-  },
-  {
-    "name": "bundle-mac",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "bundle-mac",
-    "dictionary-source": "mdsal",
-    "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": "mdsal",
-    "dependencies": [
-      "loopback-ip"
-    ]
-  },
-  {
-    "name": "loopback-ip",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "loopback-ip",
-    "dictionary-source": "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
deleted file mode 100644
index 3215d06d..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json
+++ /dev/null
@@ -1,110 +0,0 @@
-[
-  {
-    "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": "mdsal",
-    "dependencies": [
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "bundle-ip",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "required": true
-    },
-    "dictionary-name": "bundle-ip",
-    "dictionary-source": "mdsal",
-    "dependencies": [
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "bundle-mac",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "bundle-mac",
-    "dictionary-source": "mdsal",
-    "dependencies": [
-      "vnf-id",
-      "bundle-id"
-    ]
-  },
-  {
-    "name": "managed-ip",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "managed-ip",
-    "dictionary-source": "mdsal",
-    "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": "mdsal",
-    "dependencies": [
-      "loopback-ip"
-    ]
-  },
-  {
-    "name": "loopback-ip",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "loopback-ip",
-    "dictionary-source": "db",
-    "dependencies": [
-      "bundle-mac"
-    ]
-  }
-]
author	Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>	2018-09-04 20:24:35 +0000
committer	Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>	2018-09-04 20:47:03 +0000
commit	594b5e1c919089c110e6aa9b9d1c00b96a9e96f9 (patch)
tree	aeb353f21da3ee3982e5a0d1d1842b13bb490c3c /ms/controllerblueprints/modules/resource-dict
parent	9abed7f23417e24039d463f84156c1d9fef672f7 (diff)