aboutsummaryrefslogtreecommitdiffstats
path: root/ms/controllerblueprints/modules/resource-dict
diff options
context:
space:
mode:
Diffstat (limited to 'ms/controllerblueprints/modules/resource-dict')
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-component-java.json31
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-default.json18
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-input.json18
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-primary-db.json44
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-rest.json61
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/tosca.nodes.ResourceSource.json5
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/address.json17
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/aic-cloud-region.json17
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/aic_clli.json17
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/availability_zone_0.json17
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/default-source.json16
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/input-source.json17
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json34
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/name_0.json17
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nf-role.json25
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nfc-naming-code.json25
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_cidr.json21
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_id.json17
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/primary-db-source.json24
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/private-prefix-id.json21
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected-prefix-id.json21
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected_private_net_cidr.json21
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/public_net_id.json17
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/service-instance-id.json17
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected-prefix-id.json21
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected_private_net_cidr.json21
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-id.json17
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-label.json25
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-model-customization-uuid.json17
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-type.json25
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-naming-policy.json25
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-nf-code.json25
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf_module_name.json17
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfccustomizationuuid.json25
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_0.json35
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_1.json35
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_2.json17
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vm-type.json25
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-id.json17
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-model-customization-uuid.json17
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json28
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf_name.json28
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-invariant-uuid.json25
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-version.json25
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_0.json35
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_1.json17
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_0.json35
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_1.json17
-rw-r--r--ms/controllerblueprints/modules/resource-dict/pom.xml42
-rw-r--r--ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt100
-rw-r--r--ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt40
-rw-r--r--ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactory.kt47
-rw-r--r--ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationService.kt141
-rw-r--r--ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/BulkResourceSequencingUtils.kt109
-rw-r--r--ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtils.kt100
-rw-r--r--ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinitionTest.java60
-rw-r--r--ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java42
-rw-r--r--ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationServiceTest.kt66
-rw-r--r--ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/BulkResourceSequencingUtilsTest.java37
-rw-r--r--ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java99
-rw-r--r--ms/controllerblueprints/modules/resource-dict/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt30
-rw-r--r--ms/controllerblueprints/modules/resource-dict/src/test/resources/data/resource-assignment-input.json10
-rw-r--r--ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/cyclic.json111
-rw-r--r--ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json110
-rw-r--r--ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json110
65 files changed, 0 insertions, 2366 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-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-primary-db.json b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-primary-db.json
deleted file mode 100644
index 661a9503..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-primary-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-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/address.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/address.json
deleted file mode 100644
index e999938c..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/address.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name" : "address",
- "tags" : "address",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "address",
- "type" : "string"
- },
- "sources" : {
- "input" : {
- "type" : "source-input",
- "properties" : {
- "key" : "address"
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/aic-cloud-region.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/aic-cloud-region.json
deleted file mode 100644
index 2528fc7f..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/aic-cloud-region.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name" : "aic-cloud-region",
- "tags" : "aic-cloud-region",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "aic-cloud-region",
- "type" : "string"
- },
- "sources" : {
- "input" : {
- "type" : "source-input",
- "properties" : {
- "key" : "aic-cloud-region"
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/aic_clli.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/aic_clli.json
deleted file mode 100644
index 9e5a6d52..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/aic_clli.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name" : "aic_clli",
- "tags" : "aic_clli",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "aic_clli",
- "type" : "string"
- },
- "sources" : {
- "input" : {
- "type" : "source-input",
- "properties" : {
- "key" : "aic_clli"
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/availability_zone_0.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/availability_zone_0.json
deleted file mode 100644
index fc88ced6..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/availability_zone_0.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name" : "availability_zone_0",
- "tags" : "availability_zone_0",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "availability_zone_0",
- "type" : "string"
- },
- "sources" : {
- "input" : {
- "type" : "source-input",
- "properties" : {
- "key" : "availability_zone_0"
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/default-source.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/default-source.json
deleted file mode 100644
index 42059ad8..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/default-source.json
+++ /dev/null
@@ -1,16 +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",
- "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 e876c537..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/input-source.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name": "input-source",
- "property" :{
- "description": "name of the ",
- "type": "string"
- },
- "updated-by": "brindasanth@onap.com",
- "tags": null,
- "sources": {
- "input": {
- "type": "source-input",
- "properties": {
- "key": "action-name"
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json
deleted file mode 100644
index 67661ecd..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json
+++ /dev/null
@@ -1,34 +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",
- "sources": {
- "primary-config-data": {
- "type": "source-rest",
- "properties": {
- "type": "JSON",
- "url-path": "config/L3VNF-API:services/service-list/$service-instance-id/service-data/vnf-topology-information/vnf-assignments/vnf-vms/$vm-type/vm-networks/$network-role/v4-assigned-ip-list/$v4-ip-type",
- "path": "/v4-assigned-ip-list/0/v4-ip-prefix",
- "input-key-mapping": {
- "service-instance-id": "service-instance-id",
- "network-role": "network-role",
- "v4-ip-type": "v4-ip-type",
- "vm-type": "vm-type"
- },
- "output-key-mapping": {
- "oam-local-ipv4-address": "v4-ip-prefix"
- },
- "key-dependencies": [
- "service-instance-id",
- "network-role",
- "v4-ip-type",
- "vm-type"
- ]
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/name_0.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/name_0.json
deleted file mode 100644
index 6be5bc18..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/name_0.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name" : "name_0",
- "tags" : "name_0",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "name_0",
- "type" : "string"
- },
- "sources" : {
- "input" : {
- "type" : "source-input",
- "properties" : {
- "key" : "name_0"
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nf-role.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nf-role.json
deleted file mode 100644
index 6da5ea22..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nf-role.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "name" : "nf-role",
- "tags" : "nf-role",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "vnf/nf-role",
- "type" : "string"
- },
- "sources" : {
- "primary-db" : {
- "type" : "source-primary-db",
- "properties" : {
- "type" : "SQL",
- "query" : "select sdnctl.VF_MODEL.nf_role as vf_model_role from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnfmodelcustomizationuuid",
- "input-key-mapping" : {
- "vnfmodelcustomizationuuid" : "vnf-model-customization-uuid"
- },
- "output-key-mapping" : {
- "nf-role" : "vf_model_role"
- },
- "key-dependencies" : [ "vnf-model-customization-uuid" ]
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nfc-naming-code.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nfc-naming-code.json
deleted file mode 100644
index 4e1ba2b0..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nfc-naming-code.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "name" : "nfc-naming-code",
- "tags" : "nfc-naming-code",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "nfc-naming-code",
- "type" : "string"
- },
- "sources" : {
- "primary-db" : {
- "type" : "source-primary-db",
- "properties" : {
- "type" : "SQL",
- "query" : "select nfc_naming_code as nfc_naming_code from sdnctl.VFC_MODEL where customization_uuid=:vfccustomizationuuid",
- "input-key-mapping" : {
- "vfccustomizationuuid" : "vfccustomizationuuid"
- },
- "output-key-mapping" : {
- "nfc-naming-code" : "nfc_naming_code"
- },
- "key-dependencies" : [ "vfccustomizationuuid" ]
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_cidr.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_cidr.json
deleted file mode 100644
index b359320b..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_cidr.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "name" : "onap_private_net_cidr",
- "tags" : "onap_private_net_cidr",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "onap_private_net_cidr",
- "type" : "string"
- },
- "sources" : {
- "primary-db" : {
- "type" : "source-primary-db",
- "properties" : {
- "type" : "SQL",
- "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = private",
- "output-key-mapping" : {
- "onap_private_net_cidr" : "prefix"
- }
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_id.json
deleted file mode 100644
index 75cc6963..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_id.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name" : "onap_private_net_id",
- "tags" : "onap_private_net_id",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "onap_private_net_id",
- "type" : "string"
- },
- "sources" : {
- "input" : {
- "type" : "source-input",
- "properties" : {
- "key" : "onap_private_net_id"
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/primary-db-source.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/primary-db-source.json
deleted file mode 100644
index 26e62e85..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/primary-db-source.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "name": "primary-db-source",
- "property" :{
- "description": "name of the ",
- "type": "string"
- },
- "updated-by": "brindasanth@onap.com",
- "tags": "bundle-id, brindasanth@onap.com",
- "sources": {
- "primary-db": {
- "type": "source-primary-db",
- "properties": {
- "query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",
- "input-key-mapping": {
- "profile_name": "profile_name"
- },
- "output-key-mapping": {
- "db-country": "country",
- "db-state": "state"
- }
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/private-prefix-id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/private-prefix-id.json
deleted file mode 100644
index 4f4868d9..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/private-prefix-id.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "name" : "private-prefix-id",
- "tags" : "private-prefix-id",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "private-prefix-id",
- "type" : "string"
- },
- "sources" : {
- "primary-db" : {
- "type" : "source-primary-db",
- "properties" : {
- "type" : "SQL",
- "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = private",
- "output-key-mapping" : {
- "private-prefix-id" : "prefix_id"
- }
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected-prefix-id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected-prefix-id.json
deleted file mode 100644
index dd418d55..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected-prefix-id.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "name" : "protected-prefix-id",
- "tags" : "protected-prefix-id",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "protected-prefix-id",
- "type" : "string"
- },
- "sources" : {
- "primary-db" : {
- "type" : "source-primary-db",
- "properties" : {
- "type" : "SQL",
- "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = protected",
- "output-key-mapping" : {
- "protected-prefix-id" : "prefix_id"
- }
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected_private_net_cidr.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected_private_net_cidr.json
deleted file mode 100644
index dcd32c7c..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected_private_net_cidr.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "name" : "protected_private_net_cidr",
- "tags" : "protected_private_net_cidr",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "protected_private_net_cidr",
- "type" : "string"
- },
- "sources" : {
- "primary-db" : {
- "type" : "source-primary-db",
- "properties" : {
- "type" : "SQL",
- "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = protected",
- "output-key-mapping" : {
- "protected_private_net_cidr" : "prefix"
- }
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/public_net_id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/public_net_id.json
deleted file mode 100644
index 17ad96bd..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/public_net_id.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name" : "public_net_id",
- "tags" : "public_net_id",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "public_net_id",
- "type" : "string"
- },
- "sources" : {
- "input" : {
- "type" : "source-input",
- "properties" : {
- "key" : "public_net_id"
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/service-instance-id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/service-instance-id.json
deleted file mode 100644
index db089f0d..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/service-instance-id.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name" : "service-instance-id",
- "tags" : "service-instance-id, tosca.datatypes.Root, data_type",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "To be provided",
- "type" : "string"
- },
- "sources" : {
- "input" : {
- "type" : "source-input",
- "properties" : {
- "key" : "service-instance-id"
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected-prefix-id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected-prefix-id.json
deleted file mode 100644
index 1e4cd7bd..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected-prefix-id.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "name" : "unprotected-prefix-id",
- "tags" : "unprotected-prefix-id",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "unprotected-prefix-id",
- "type" : "string"
- },
- "sources" : {
- "primary-db" : {
- "type" : "source-primary-db",
- "properties" : {
- "type" : "SQL",
- "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = unprotected",
- "output-key-mapping" : {
- "unprotected-prefix-id" : "prefix_id"
- }
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected_private_net_cidr.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected_private_net_cidr.json
deleted file mode 100644
index 241147c3..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected_private_net_cidr.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "name" : "unprotected_private_net_cidr",
- "tags" : "unprotected_private_net_cidr",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "unprotected_private_net_cidr",
- "type" : "string"
- },
- "sources" : {
- "primary-db" : {
- "type" : "source-primary-db",
- "properties" : {
- "type" : "SQL",
- "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = unprotected",
- "output-key-mapping" : {
- "unprotected_private_net_cidr" : "prefix"
- }
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-id.json
deleted file mode 100644
index 5203bb30..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-id.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name" : "vf-module-id",
- "tags" : "vf-module-id",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "vf-module-id",
- "type" : "string"
- },
- "sources" : {
- "input" : {
- "type" : "source-input",
- "properties" : {
- "key" : "vf-module-id"
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-label.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-label.json
deleted file mode 100644
index faa7ea49..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-label.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "name" : "vf-module-label",
- "tags" : "vf-module-label",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "vf-module-label",
- "type" : "string"
- },
- "sources" : {
- "primary-db" : {
- "type" : "source-primary-db",
- "properties" : {
- "type" : "SQL",
- "query" : "select sdnctl.VF_MODULE_MODEL.vf_module_label as vf_module_label from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
- "input-key-mapping" : {
- "customizationid" : "vf-module-model-customization-uuid"
- },
- "output-key-mapping" : {
- "vf-module-label" : "vf_module_label"
- },
- "key-dependencies" : [ "vf-module-model-customization-uuid" ]
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-model-customization-uuid.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-model-customization-uuid.json
deleted file mode 100644
index dd479187..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-model-customization-uuid.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name" : "vf-module-model-customization-uuid",
- "tags" : "vf-module-model-customization-uuid",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "vf-module-model-customization-uuid",
- "type" : "string"
- },
- "sources" : {
- "input" : {
- "type" : "source-input",
- "properties" : {
- "key" : "vf-module-model-customization-uuid"
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-type.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-type.json
deleted file mode 100644
index dbd51bbd..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-type.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "name" : "vf-module-type",
- "tags" : "vf-module-type",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "vf-module-type",
- "type" : "string"
- },
- "sources" : {
- "primary-db" : {
- "type" : "source-primary-db",
- "properties" : {
- "type" : "SQL",
- "query" : "select vf_module_type as vf_module_type from sdnctl.VF_MODULE_MODEL where customization_uuid=:customizationid",
- "input-key-mapping" : {
- "customizationid" : "vf-module-model-customization-uuid"
- },
- "output-key-mapping" : {
- "vf-module-type" : "vf_module_type"
- },
- "key-dependencies" : [ "vf-module-model-customization-uuid" ]
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-naming-policy.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-naming-policy.json
deleted file mode 100644
index 70792f86..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-naming-policy.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "name" : "vf-naming-policy",
- "tags" : "vf-naming-policy",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "vf-naming-policy",
- "type" : "string"
- },
- "sources" : {
- "primary-db" : {
- "type" : "source-primary-db",
- "properties" : {
- "type" : "SQL",
- "query" : "select sdnctl.VF_MODEL.naming_policy as vf_naming_policy from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnf_model_customization_uuid",
- "input-key-mapping" : {
- "vnf_model_customization_uuid" : "vnf-model-customization-uuid"
- },
- "output-key-mapping" : {
- "vf-naming-policy" : "vf_naming_policy"
- },
- "key-dependencies" : [ "vnf-model-customization-uuid" ]
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-nf-code.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-nf-code.json
deleted file mode 100644
index a21982c0..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-nf-code.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "name" : "vf-nf-code",
- "tags" : "vf-nf-code",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "vf-nf-code",
- "type" : "string"
- },
- "sources" : {
- "primary-db" : {
- "type" : "source-primary-db",
- "properties" : {
- "type" : "SQL",
- "query" : "select sdnctl.VF_MODEL.nf_code as vf_nf_code from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:customizationid",
- "input-key-mapping" : {
- "customizationid" : "vnf-model-customization-uuid"
- },
- "output-key-mapping" : {
- "vf-nf-code" : "vf_nf_code"
- },
- "key-dependencies" : [ "vnf-model-customization-uuid" ]
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf_module_name.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf_module_name.json
deleted file mode 100644
index 3d958919..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf_module_name.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name" : "vf_module_name",
- "tags" : "vf_module_name",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "vf_module_name",
- "type" : "string"
- },
- "sources" : {
- "input" : {
- "type" : "source-input",
- "properties" : {
- "key" : "vf_module_name"
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfccustomizationuuid.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfccustomizationuuid.json
deleted file mode 100644
index 9f3e7cf1..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfccustomizationuuid.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "name" : "vfccustomizationuuid",
- "tags" : "vfccustomizationuuid, tosca.datatypes.Root, data_type",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "vfccustomizationuuid",
- "type" : "string"
- },
- "sources" : {
- "primary-db" : {
- "type" : "source-primary-db",
- "properties" : {
- "type" : "SQL",
- "query" : "select sdnctl.VF_MODULE_TO_VFC_MAPPING.vfc_customization_uuid as vnf_customid from sdnctl.VF_MODULE_TO_VFC_MAPPING where vm_count = 1 and sdnctl.VF_MODULE_TO_VFC_MAPPING.vf_module_customization_uuid=:vfmodulecustomizationuuid",
- "input-key-mapping" : {
- "vfmodulecustomizationuuid" : "vf-module-model-customization-uuid"
- },
- "output-key-mapping" : {
- "vfccustomizationuuid" : "vnf_customid"
- },
- "key-dependencies" : [ "vf-module-model-customization-uuid" ]
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_0.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_0.json
deleted file mode 100644
index 59f51516..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_0.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "name" : "vfw_private_ip_0",
- "tags" : "vfw_private_ip_0",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "vfw_private_ip_0",
- "type" : "string"
- },
- "sources" : {
- "input" : {
- "type" : "source-input",
- "properties" : {
- "key" : "vfw_private_ip_0"
- }
- },
- "primary-config-data" : {
- "type" : "source-rest",
- "properties" : {
- "type" : "JSON",
- "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules/$vf-module-id/vf-module-data/vf-module-topology/vf-module-parameters/param/vfw_private_ip_0",
- "path" : "/param/0/value",
- "expression-type" : "JSON_POINTER",
- "input-key-mapping" : {
- "service-instance-id" : "service-instance-id",
- "vnf-id" : "vnf-id",
- "vf-module-id" : "vf-module-id"
- },
- "output-key-mapping" : {
- "vfw_private_ip_0" : "value"
- },
- "key-dependencies" : [ "service-instance-id", "vnf-id", "vf-module-id" ]
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_1.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_1.json
deleted file mode 100644
index 6dda72f7..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_1.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "name" : "vfw_private_ip_1",
- "tags" : "vfw_private_ip_1",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "vfw_private_ip_1",
- "type" : "string"
- },
- "sources" : {
- "input" : {
- "type" : "source-input",
- "properties" : {
- "key" : "vfw_private_ip_1"
- }
- },
- "primary-config-data" : {
- "type" : "source-rest",
- "properties" : {
- "type" : "JSON",
- "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules/$vf-module-id/vf-module-data/vf-module-topology/vf-module-parameters/param/vfw_private_ip_1",
- "path" : "/param/0/value",
- "expression-type" : "JSON_POINTER",
- "input-key-mapping" : {
- "service-instance-id" : "service-instance-id",
- "vnf-id" : "vnf-id",
- "vf-module-id" : "vf-module-id"
- },
- "output-key-mapping" : {
- "vfw_private_ip_1" : "value"
- },
- "key-dependencies" : [ "service-instance-id", "vnf-id", "vf-module-id" ]
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_2.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_2.json
deleted file mode 100644
index 9e510647..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_2.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name" : "vfw_private_ip_2",
- "tags" : "vfw_private_ip_2",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "vfw_private_ip_2",
- "type" : "string"
- },
- "sources" : {
- "input" : {
- "type" : "source-input",
- "properties" : {
- "key" : "vfw_private_ip_2"
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vm-type.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vm-type.json
deleted file mode 100644
index dabb2381..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vm-type.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "name" : "vm-type",
- "tags" : "vm-type",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "vm-type",
- "type" : "string"
- },
- "sources" : {
- "primary-db" : {
- "type" : "source-primary-db",
- "properties" : {
- "type" : "SQL",
- "query" : "select vfc_model.vm_type as vm_type from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
- "input-key-mapping" : {
- "vfccustomizationuuid" : "vfccustomizationuuid"
- },
- "output-key-mapping" : {
- "vm-type" : "vm_type"
- },
- "key-dependencies" : [ "vfccustomizationuuid" ]
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-id.json
deleted file mode 100644
index 5ea0fbcf..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-id.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name" : "vnf-id",
- "tags" : "vnf-id",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "vnf-id",
- "type" : "string"
- },
- "sources" : {
- "input" : {
- "type" : "source-input",
- "properties" : {
- "key" : "vnf-id"
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-model-customization-uuid.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-model-customization-uuid.json
deleted file mode 100644
index d36fe740..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-model-customization-uuid.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name" : "vnf-model-customization-uuid",
- "tags" : "vnf-model-customization-uuid",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "vnf-model-customization-uuid",
- "type" : "string"
- },
- "sources" : {
- "input" : {
- "type" : "source-input",
- "properties" : {
- "key" : "vnf-model-customization-uuid"
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json
deleted file mode 100644
index 4c0320ac..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "name" : "vnf-name",
- "tags" : "vnf-name, tosca.datatypes.Root, data_type",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "vnf-name",
- "type" : "string"
- },
- "sources" : {
- "primary-config-data" : {
- "type" : "source-rest",
- "properties" : {
- "type" : "JSON",
- "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf_name",
- "path" : "/param/0/value",
- "expression-type" : "JSON_POINTER",
- "input-key-mapping" : {
- "service-instance-id" : "service-instance-id",
- "vnf-id" : "vnf-id"
- },
- "output-key-mapping" : {
- "vnf-name" : "value"
- },
- "key-dependencies" : [ "service-instance-id", "vnf-id" ]
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf_name.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf_name.json
deleted file mode 100644
index c90f5b8a..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf_name.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "name" : "vnf_name",
- "tags" : "vnf_name",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "vnf_name",
- "type" : "string"
- },
- "sources" : {
- "primary-config-data" : {
- "type" : "source-rest",
- "properties" : {
- "type" : "JSON",
- "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf_name",
- "path" : "/param/0/value",
- "expression-type" : "JSON_POINTER",
- "input-key-mapping" : {
- "service-instance-id" : "service-instance-id",
- "vnf-id" : "vnf-id"
- },
- "output-key-mapping" : {
- "vnf_name" : "value"
- },
- "key-dependencies" : [ "service-instance-id", "vnf-id" ]
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-invariant-uuid.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-invariant-uuid.json
deleted file mode 100644
index 8ce692cc..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-invariant-uuid.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "name" : "vnfc-model-invariant-uuid",
- "tags" : "vnfc-model-invariant-uuid",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "vnfc-model-invariant-uuid for vFW template",
- "type" : "string"
- },
- "sources" : {
- "primary-db" : {
- "type" : "source-primary-db",
- "properties" : {
- "type" : "SQL",
- "query" : "select vfc_model.invariant_uuid as vfc_invariant_uuid from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
- "input-key-mapping" : {
- "vfccustomizationuuid" : "vfccustomizationuuid"
- },
- "output-key-mapping" : {
- "vnfc-model-invariant-uuid" : "vfc_invariant_uuid"
- },
- "key-dependencies" : [ "vfccustomizationuuid" ]
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-version.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-version.json
deleted file mode 100644
index d74a6bae..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-version.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "name" : "vnfc-model-version",
- "tags" : "vnfc-model-version",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "vnfc-model-version for vFW template",
- "type" : "string"
- },
- "sources" : {
- "primary-db" : {
- "type" : "source-primary-db",
- "properties" : {
- "type" : "SQL",
- "query" : "select vfc_model.version as vnfc_model_version from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
- "input-key-mapping" : {
- "vfccustomizationuuid" : "vfccustomizationuuid"
- },
- "output-key-mapping" : {
- "vnfc-model-version" : "vnfc_model_version"
- },
- "key-dependencies" : [ "vfccustomizationuuid" ]
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_0.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_0.json
deleted file mode 100644
index 9bef3c79..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_0.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "name" : "vpg_private_ip_0",
- "tags" : "vpg_private_ip_0",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "vpg_private_ip_0",
- "type" : "string"
- },
- "sources" : {
- "input" : {
- "type" : "source-input",
- "properties" : {
- "key" : "vpg_private_ip_0"
- }
- },
- "primary-config-data" : {
- "type" : "source-rest",
- "properties" : {
- "type" : "JSON",
- "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules/$vf-module-id/vf-module-data/vf-module-topology/vf-module-parameters/param/vpg_private_ip_0",
- "path" : "/param/0/value",
- "expression-type" : "JSON_POINTER",
- "input-key-mapping" : {
- "service-instance-id" : "service-instance-id",
- "vnf-id" : "vnf-id",
- "vf-module-id" : "vf-module-id"
- },
- "output-key-mapping" : {
- "vpg_private_ip_0" : "value"
- },
- "key-dependencies" : [ "service-instance-id", "vnf-id", "vf-module-id" ]
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_1.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_1.json
deleted file mode 100644
index 23c42e0c..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_1.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name" : "vpg_private_ip_1",
- "tags" : "vpg_private_ip_1",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "vpg_private_ip_1",
- "type" : "string"
- },
- "sources" : {
- "input" : {
- "type" : "source-input",
- "properties" : {
- "key" : "vpg_private_ip_1"
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_0.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_0.json
deleted file mode 100644
index 52a4542c..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_0.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "name" : "vsn_private_ip_0",
- "tags" : "vsn_private_ip_0",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "vsn_private_ip_0",
- "type" : "string"
- },
- "sources" : {
- "input" : {
- "type" : "source-input",
- "properties" : {
- "key" : "vsn_private_ip_0"
- }
- },
- "primary-config-data" : {
- "type" : "source-rest",
- "properties" : {
- "type" : "JSON",
- "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules/$vf-module-id/vf-module-data/vf-module-topology/vf-module-parameters/param/vsn_private_ip_0",
- "path" : "/param/0/value",
- "expression-type" : "JSON_POINTER",
- "input-key-mapping" : {
- "service-instance-id" : "service-instance-id",
- "vnf-id" : "vnf-id",
- "vf-module-id" : "vf-module-id"
- },
- "output-key-mapping" : {
- "vsn_private_ip_0" : "value"
- },
- "key-dependencies" : [ "service-instance-id", "vnf-id", "vf-module-id" ]
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_1.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_1.json
deleted file mode 100644
index 88750b25..00000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_1.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name" : "vsn_private_ip_1",
- "tags" : "vsn_private_ip_1",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "vsn_private_ip_1",
- "type" : "string"
- },
- "sources" : {
- "input" : {
- "type" : "source-input",
- "properties" : {
- "key" : "vsn_private_ip_1"
- }
- }
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/pom.xml b/ms/controllerblueprints/modules/resource-dict/pom.xml
deleted file mode 100644
index 22533dbe..00000000
--- a/ms/controllerblueprints/modules/resource-dict/pom.xml
+++ /dev/null
@@ -1,42 +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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
- <artifactId>modules</artifactId>
- <version>0.4.2-SNAPSHOT</version>
- </parent>
- <artifactId>resource-dict</artifactId>
- <name>Controller Blueprints Resource Dictionary</name>
-
- <dependencies>
- <dependency>
- <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
- <artifactId>blueprint-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-test-junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-
-</project>
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt
deleted file mode 100644
index d141ed0c..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.
- * Modifications Copyright © 2017-2018 AT&T Intellectual Property.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.ccsdk.apps.controllerblueprints.resource.dict
-
-import com.fasterxml.jackson.annotation.JsonFormat
-import com.fasterxml.jackson.annotation.JsonProperty
-import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeTemplate
-import org.onap.ccsdk.apps.controllerblueprints.core.data.PropertyDefinition
-import java.io.Serializable
-import java.util.*
-
-open class ResourceDefinition {
-
- @JsonProperty(value = "name", required = true)
- lateinit var name: String
-
- @JsonProperty(value = "property", required = true)
- lateinit var property: PropertyDefinition
-
- var tags: String? = null
-
- @JsonProperty(value = "updated-by")
- lateinit var updatedBy: String
-
- @JsonProperty(value = "sources", required = true)
- lateinit var sources: MutableMap<String, NodeTemplate>
-}
-
-open class ResourceAssignment {
-
- @JsonProperty(value = "name", required = true)
- lateinit var name: String
-
- @JsonProperty(value = "property")
- var property: PropertyDefinition? = null
-
- @JsonProperty("input-param")
- var inputParameter: Boolean = false
-
- @JsonProperty("dictionary-name")
- var dictionaryName: String? = null
-
- @JsonProperty("dictionary-source")
- var dictionarySource: String? = null
-
- @JsonProperty("dependencies")
- var dependencies: MutableList<String>? = null
-
- @JsonProperty("version")
- var version: Int = 0
-
- @JsonProperty("status")
- var status: String? = null
-
- @JsonProperty("message")
- var message: String? = null
-
- @JsonProperty("updated-date")
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
- var updatedDate: Date? = null
-
- @JsonProperty("updated-by")
- var updatedBy: String? = null
-
- override fun toString(): String {
- return StringBuilder()
- .append("[")
- .append("name=", name)
- .append(", dictionaryName=", dictionaryName)
- .append(", dictionarySource=", dictionarySource)
- .append("]")
- .toString()
- }
-}
-
-/**
- * Interface for Source Definitions (ex Input Source,
- * Default Source, Database Source, Rest Sources, etc)
- */
-interface ResourceSource : Serializable
-
-
-open class ResourceSourceMapping {
- lateinit var resourceSourceMappings: MutableMap<String, String>
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt
deleted file mode 100644
index 75368684..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt
+++ /dev/null
@@ -1,40 +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_PRIMARY_CONFIG_DATA = "rest"
- const val SOURCE_PROCESSOR_DB = "processor-db"
- const val SOURCE_PRIMARY_CONFIG_DATA = "primary-config-data"
- const val SOURCE_PRIMARY_DB = "primary-db"
-
- const val MODEL_DIR_RESOURCE_DEFINITION: String = "resource_dictionary"
-
- const val PROPERTY_TYPE = "type"
- const val PROPERTY_INPUT_KEY_MAPPING = "input-key-mapping"
- const val PROPERTY_OUTPUT_KEY_MAPPING = "output-key-mapping"
- const val PROPERTY_KEY_DEPENDENCIES = "key-dependencies"
-
- const val PATH_RESOURCE_DEFINITION_TYPE = "resources_definition_types"
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactory.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactory.kt
deleted file mode 100644
index 876aca9f..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactory.kt
+++ /dev/null
@@ -1,47 +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.factory
-
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
-import org.onap.ccsdk.apps.controllerblueprints.core.format
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceSourceMapping
-
-/**
- * ResourceSourceMappingFactory.
- *
- * @author Brinda Santh
- */
-object ResourceSourceMappingFactory {
-
- private val resourceSourceMappings: MutableMap<String, String> = hashMapOf()
-
- fun registerSourceMapping(sourceInstance: String, nodeTypeName: String) {
- resourceSourceMappings[sourceInstance] = nodeTypeName
- }
-
- fun getRegisterSourceMapping(sourceInstance: String): String {
- return resourceSourceMappings[sourceInstance]
- ?: throw BluePrintException(format("failed to get source({}) mapping", sourceInstance))
- }
-
- fun getRegisterSourceMapping(): ResourceSourceMapping {
- val resourceSourceMapping = ResourceSourceMapping()
- resourceSourceMapping.resourceSourceMappings = resourceSourceMappings
- return resourceSourceMapping
- }
-}
-
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationService.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationService.kt
deleted file mode 100644
index cd1dd431..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationService.kt
+++ /dev/null
@@ -1,141 +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.service
-
-import com.att.eelf.configuration.EELFLogger
-import com.att.eelf.configuration.EELFManager
-import org.apache.commons.collections.CollectionUtils
-import org.apache.commons.lang3.StringUtils
-import org.apache.commons.lang3.text.StrBuilder
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.TopologicalSortingUtils
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment
-import java.io.Serializable
-
-/**
- * ResourceAssignmentValidationService.
- *
- * @author Brinda Santh
- */
-interface ResourceAssignmentValidationService : Serializable {
-
- @Throws(BluePrintException::class)
- fun validate(resourceAssignments: List<ResourceAssignment>): Boolean
-}
-
-/**
- * ResourceAssignmentValidationServiceImpl.
- *
- * @author Brinda Santh
- */
-open class ResourceAssignmentValidationServiceImpl : ResourceAssignmentValidationService {
- private val log: EELFLogger = EELFManager.getInstance().getLogger(ResourceAssignmentValidationServiceImpl::class.java)
-
- open var resourceAssignmentMap: Map<String, ResourceAssignment> = hashMapOf()
- open val validationMessage = StrBuilder()
-
- override fun validate(resourceAssignments: List<ResourceAssignment>): Boolean {
- try {
- 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 validateTemplateNDictionaryKeys(resourceAssignments: List<ResourceAssignment>) {
-
- resourceAssignmentMap = resourceAssignments.map { it.name to it }.toMap()
-
- // Check the Resource Assignment has Duplicate Key Names
- val duplicateKeyNames = resourceAssignments.groupBy { it.name }
- .filter { it.value.size > 1 }
- .map { it.key }
-
- if (duplicateKeyNames.isNotEmpty()) {
- validationMessage.appendln(String.format("Duplicate Assignment Template Keys (%s) is Present", duplicateKeyNames))
- }
-
- // Collect all the dependencies as a single list
- val dependenciesNames = resourceAssignments.mapNotNull { it.dependencies }.flatten()
-
- // Check all the dependencies keys have Resource Assignment mappings.
- val notPresentDictionaries = dependenciesNames.filter { !resourceAssignmentMap.containsKey(it) }.distinct()
- if (notPresentDictionaries.isNotEmpty()) {
- validationMessage.appendln(String.format("No assignments for Dictionary Keys (%s)", notPresentDictionaries))
- }
-
- if (StringUtils.isNotBlank(validationMessage)) {
- throw BluePrintException("Resource Assignment Validation Failure")
- }
- }
-
- open fun validateCyclicDependency(resourceAssignments: List<ResourceAssignment>) {
- val startResourceAssignment = ResourceAssignment()
- startResourceAssignment.name = "*"
-
- val topologySorting = TopologicalSortingUtils<ResourceAssignment>()
-
- resourceAssignmentMap.map { it.value }.map { resourceAssignment ->
- if (CollectionUtils.isNotEmpty(resourceAssignment.dependencies)) {
- resourceAssignment.dependencies!!.map {
- log.trace("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/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 cd92f42c..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 69ee1cfd..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtils.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.utils
-
-import com.att.eelf.configuration.EELFLogger
-import com.att.eelf.configuration.EELFManager
-import com.fasterxml.jackson.databind.JsonNode
-import com.fasterxml.jackson.databind.node.NullNode
-import org.apache.commons.collections.MapUtils
-import org.apache.commons.lang3.StringUtils
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintProcessorException
-import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeTemplate
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.BluePrintFileUtils
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDefinition
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDictionaryConstants
-import java.io.File
-
-
-object ResourceDictionaryUtils {
- private val log: EELFLogger = EELFManager.getInstance().getLogger(ResourceDictionaryUtils::class.java)
-
- @JvmStatic
- fun populateSourceMapping(resourceAssignment: ResourceAssignment,
- resourceDefinition: ResourceDefinition) {
-
- if (StringUtils.isBlank(resourceAssignment.dictionarySource)) {
-
- if (MapUtils.isNotEmpty(resourceDefinition.sources)) {
- val source = findFirstSource(resourceDefinition.sources)
-
- // Populate and Assign First Source
- if (StringUtils.isNotBlank(source)) {
- // Set Dictionary Source
- resourceAssignment.dictionarySource = source
- } else {
- resourceAssignment.dictionarySource = ResourceDictionaryConstants.SOURCE_INPUT
- }
- log.info("auto map resourceAssignment : {}", resourceAssignment)
- } else {
- resourceAssignment.dictionarySource = ResourceDictionaryConstants.SOURCE_INPUT
- }
- }
- }
-
- @JvmStatic
- fun findFirstSource(sources: Map<String, NodeTemplate>): String? {
- var source: String? = null
- if (MapUtils.isNotEmpty(sources)) {
- source = sources.keys.stream().findFirst().get()
- }
- return source
- }
-
- @JvmStatic
- fun assignInputs(data: JsonNode, context: MutableMap<String, Any>) {
- log.trace("assignInputs from input JSON ({})", data.toString())
- data.fields().forEach { field ->
- val valueNode: JsonNode = data.at("/".plus(field.key)) ?: NullNode.getInstance()
-
- val path = BluePrintConstants.PATH_INPUTS.plus(BluePrintConstants.PATH_DIVIDER).plus(field.key)
- log.trace("setting path ({}), values ({})", path, valueNode)
- context[path] = valueNode
- }
- }
-
- fun getResourceAssignmentFromFile(filePath: String): List<ResourceAssignment> {
- return JacksonUtils.getListFromFile(filePath, ResourceAssignment::class.java)
- ?: throw BluePrintProcessorException("couldn't get ResourceAssignment definitions for the file($filePath)")
- }
-
- fun writeResourceDefinitionTypes(basePath: String, resourceDefinitions: List<ResourceDefinition>) {
- val resourceDefinitionMap = resourceDefinitions.map { it.name to it }.toMap()
- writeResourceDefinitionTypes(basePath, resourceDefinitionMap)
-
- }
-
- fun writeResourceDefinitionTypes(basePath: String, resourceDefinitionMap: Map<String, ResourceDefinition>) {
- val typePath = basePath.plus(File.separator).plus(BluePrintConstants.TOSCA_DEFINITIONS_DIR)
- .plus(File.separator).plus("${ResourceDictionaryConstants.PATH_RESOURCE_DEFINITION_TYPE}.json")
- val resourceDefinitionContent = JacksonUtils.getJson(resourceDefinitionMap.toSortedMap(), true)
- BluePrintFileUtils.writeDefinitionFile(typePath, resourceDefinitionContent)
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinitionTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinitionTest.java
deleted file mode 100644
index d059d1ba..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.Companion.readValueFromFile(fileName, ResourceDefinition.class);
- Assert.assertNotNull("Failed to populate dictionaryDefinition for input type", resourceDefinition);
- }
-
- @Test
- public void testDictionaryDefinitionDefaultSource(){
-
- String fileName = basePath + "/default-source.json";
- ResourceDefinition resourceDefinition = JacksonUtils.Companion.readValueFromFile(fileName, ResourceDefinition.class);
- Assert.assertNotNull("Failed to populate dictionaryDefinition for default type", resourceDefinition);
- }
-
- @Test
- public void testDictionaryDefinitionDBSource(){
-
- String fileName = basePath + "/primary-db-source.json";
- ResourceDefinition resourceDefinition = JacksonUtils.Companion.readValueFromFile(fileName, ResourceDefinition.class);
- Assert.assertNotNull("Failed to populate dictionaryDefinition for primary-db type", resourceDefinition);
- }
-
- @Test
- public void testDictionaryDefinitionMDSALSource(){
- String fileName = basePath + "/mdsal-source.json";
- ResourceDefinition resourceDefinition = JacksonUtils.Companion.readValueFromFile(fileName, ResourceDefinition.class);
- Assert.assertNotNull("Failed to populate dictionaryDefinition for mdsal type", resourceDefinition);
- }
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java
deleted file mode 100644
index 3950ae36..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java
+++ /dev/null
@@ -1,42 +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.factory;
-
-import org.junit.Test;
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceSourceMapping;
-import org.springframework.util.Assert;
-
-public class ResourceSourceMappingFactoryTest {
-
- @Test
- public void testRegisterResourceMapping() {
-
- ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("primary-db", "source-primary-db");
- ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("input", "source-input");
- ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("default", "source-default");
- ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("primary-config-data", "source-rest");
-
- String nodeTypeName = ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping("primary-db");
- Assert.notNull(nodeTypeName, "Failed to get primary-db mapping");
-
- ResourceSourceMapping resourceSourceMapping = ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping();
- Assert.notNull(resourceSourceMapping, "Failed to get resource source mapping");
- Assert.notNull(resourceSourceMapping.getResourceSourceMappings(), "Failed to get resource source mappings");
-
- }
-
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationServiceTest.kt b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationServiceTest.kt
deleted file mode 100644
index 8905dab6..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationServiceTest.kt
+++ /dev/null
@@ -1,66 +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
-import org.junit.Before
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.utils.ResourceDictionaryTestUtils
-
-/**
- * ResourceAssignmentValidationServiceTest.
- *
- * @author Brinda Santh
- */
-class ResourceAssignmentValidationServiceTest {
- private val log: EELFLogger = EELFManager.getInstance().getLogger(ResourceAssignmentValidationServiceTest::class.java)
- @Before
- fun setUp() {
- // Setup dummy Source Instance Mapping
- ResourceDictionaryTestUtils.setUpResourceSourceMapping()
- }
-
- @Test
- fun testValidateSuccess() {
- log.info("**************** testValidateSuccess *****************")
- val assignments = JacksonUtils.getListFromClassPathFile("validation/success.json", ResourceAssignment::class.java)
- val resourceAssignmentValidator = ResourceAssignmentValidationServiceImpl()
- val result = resourceAssignmentValidator.validate(assignments!!)
- Assert.assertTrue("Failed to Validate", result)
- }
-
- @Test(expected = BluePrintException::class)
- fun testValidateDuplicate() {
- log.info(" **************** testValidateDuplicate *****************")
- val assignments = JacksonUtils.getListFromClassPathFile("validation/duplicate.json", ResourceAssignment::class.java)
- val resourceAssignmentValidator = ResourceAssignmentValidationServiceImpl()
- resourceAssignmentValidator.validate(assignments!!)
- }
-
- @Test(expected = BluePrintException::class)
- fun testValidateCyclic() {
- log.info(" **************** testValidateCyclic *****************")
- val assignments = JacksonUtils.getListFromClassPathFile("validation/cyclic.json", ResourceAssignment::class.java)
- val resourceAssignmentValidator = ResourceAssignmentValidationServiceImpl()
- resourceAssignmentValidator.validate(assignments!!)
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/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 c1b9f500..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.Companion.getListFromClassPathFile("validation/success.json", ResourceAssignment.class);
- Assert.assertNotNull("failed to get ResourceAssignment from validation/success.json ", assignments);
- BulkResourceSequencingUtils.process(assignments);
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java
deleted file mode 100644
index 45fc739d..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_PROCESSOR_DB);
- ResourceDictionaryUtils.populateSourceMapping(resourceAssignment, resourceDefinition);
- Assert.assertEquals("Expected Assigned source DB, but.", ResourceDictionaryConstants.SOURCE_PROCESSOR_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_PROCESSOR_DB, new NodeTemplate());
- String multipleFirstSource = ResourceDictionaryUtils.findFirstSource(sources);
- Assert.assertEquals("Expected source Input, but.", ResourceDictionaryConstants.SOURCE_INPUT, multipleFirstSource);
-
- }
-
- @Test
- public void testAssignInputs() {
- JsonNode data = JacksonUtils.Companion.jsonNodeFromClassPathFile("data/resource-assignment-input.json");
- Map<String, Object> context = new HashMap<>();
- ResourceDictionaryUtils.assignInputs(data, context);
- String path = BluePrintConstants.PATH_INPUTS.concat(BluePrintConstants.PATH_DIVIDER).concat("mapValue");
- log.info("populated context {}", context);
- Assert.assertTrue(String.format("failed to get variable : %s",path),context.containsKey(path));
-
- }
-
-
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt b/ms/controllerblueprints/modules/resource-dict/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt
deleted file mode 100644
index ed2bfc0a..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt
+++ /dev/null
@@ -1,30 +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.onap.ccsdk.apps.controllerblueprints.resource.dict.factory.ResourceSourceMappingFactory
-
-object ResourceDictionaryTestUtils {
-
- @JvmStatic
- fun setUpResourceSourceMapping() {
- ResourceSourceMappingFactory.registerSourceMapping("primary-db", "source-primary-db")
- ResourceSourceMappingFactory.registerSourceMapping("input", "source-input")
- ResourceSourceMappingFactory.registerSourceMapping("default", "source-default")
- ResourceSourceMappingFactory.registerSourceMapping("primary-config-data", "source-rest")
- }
-} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/resources/data/resource-assignment-input.json b/ms/controllerblueprints/modules/resource-dict/src/test/resources/data/resource-assignment-input.json
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/validation/cyclic.json b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/cyclic.json
deleted file mode 100644
index 3bfa4167..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": "primary-config-data",
- "dependencies": [
- "vnf-id"
- ]
- },
- {
- "name": "bundle-ip",
- "input-param": true,
- "property": {
- "type": "string",
- "required": true
- },
- "dictionary-name": "bundle-ip",
- "dictionary-source": "primary-config-data",
- "dependencies": [
- "vnf-id"
- ]
- },
- {
- "name": "bundle-mac",
- "input-param": true,
- "property": {
- "type": "string"
- },
- "dictionary-name": "bundle-mac",
- "dictionary-source": "primary-config-data",
- "dependencies": [
- "vnf-id",
- "bundle-id"
- ]
- },
- {
- "name": "managed-ip",
- "input-param": true,
- "property": {
- "type": "string"
- },
- "dictionary-name": "managed-ip",
- "dictionary-source": "primary-config-data",
- "dependencies": [
- "loopback-ip"
- ]
- },
- {
- "name": "vnf-name",
- "input-param": true,
- "property": {
- "type": "string",
- "required": true
- },
- "dictionary-name": "vnf-name",
- "dictionary-source": "input",
- "dependencies": []
- },
- {
- "name": "managed-ip1",
- "input-param": true,
- "property": {
- "type": "string"
- },
- "dictionary-name": "managed-ip1",
- "dictionary-source": "primary-config-data",
- "dependencies": [
- "loopback-ip"
- ]
- },
- {
- "name": "loopback-ip",
- "input-param": true,
- "property": {
- "type": "string"
- },
- "dictionary-name": "loopback-ip",
- "dictionary-source": "primary-db",
- "dependencies": [
- "bundle-mac",
- "managed-ip1"
- ]
- }
-]
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json
deleted file mode 100644
index 473920d6..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": "primary-config-data",
- "dependencies": [
- "vnf-id"
- ]
- },
- {
- "name": "bundle-ip",
- "input-param": true,
- "property": {
- "type": "string",
- "required": true
- },
- "dictionary-name": "bundle-ip",
- "dictionary-source": "primary-config-data",
- "dependencies": [
- "vnf-id"
- ]
- },
- {
- "name": "bundle-mac",
- "input-param": true,
- "property": {
- "type": "string"
- },
- "dictionary-name": "bundle-mac",
- "dictionary-source": "primary-config-data",
- "dependencies": [
- "vnf-id",
- "bundle-id"
- ]
- },
- {
- "name": "bundle-mac",
- "input-param": true,
- "property": {
- "type": "string"
- },
- "dictionary-name": "bundle-mac",
- "dictionary-source": "primary-config-data",
- "dependencies": [
- "loopback-ip"
- ]
- },
- {
- "name": "vnf-name",
- "input-param": true,
- "property": {
- "type": "string",
- "required": true
- },
- "dictionary-name": "vnf-name",
- "dictionary-source": "input",
- "dependencies": []
- },
- {
- "name": "managed-ip1",
- "input-param": true,
- "property": {
- "type": "string"
- },
- "dictionary-name": "managed-ip1",
- "dictionary-source": "primary-config-data",
- "dependencies": [
- "loopback-ip"
- ]
- },
- {
- "name": "loopback-ip",
- "input-param": true,
- "property": {
- "type": "string"
- },
- "dictionary-name": "loopback-ip",
- "dictionary-source": "primary-db",
- "dependencies": [
- "bundle-mac"
- ]
- }
-]
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json
deleted file mode 100644
index f8fe623f..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": "primary-config-data",
- "dependencies": [
- "vnf-id"
- ]
- },
- {
- "name": "bundle-ip",
- "input-param": true,
- "property": {
- "type": "string",
- "required": true
- },
- "dictionary-name": "bundle-ip",
- "dictionary-source": "primary-config-data",
- "dependencies": [
- "vnf-id"
- ]
- },
- {
- "name": "bundle-mac",
- "input-param": true,
- "property": {
- "type": "string"
- },
- "dictionary-name": "bundle-mac",
- "dictionary-source": "primary-config-data",
- "dependencies": [
- "vnf-id",
- "bundle-id"
- ]
- },
- {
- "name": "managed-ip",
- "input-param": true,
- "property": {
- "type": "string"
- },
- "dictionary-name": "managed-ip",
- "dictionary-source": "primary-config-data",
- "dependencies": [
- "loopback-ip"
- ]
- },
- {
- "name": "vnf-name",
- "input-param": true,
- "property": {
- "type": "string",
- "required": true
- },
- "dictionary-name": "vnf-name",
- "dictionary-source": "input",
- "dependencies": []
- },
- {
- "name": "managed-ip1",
- "input-param": true,
- "property": {
- "type": "string"
- },
- "dictionary-name": "managed-ip1",
- "dictionary-source": "primary-config-data",
- "dependencies": [
- "loopback-ip"
- ]
- },
- {
- "name": "loopback-ip",
- "input-param": true,
- "property": {
- "type": "string"
- },
- "dictionary-name": "loopback-ip",
- "dictionary-source": "primary-db",
- "dependencies": [
- "bundle-mac"
- ]
- }
-]