Controller Design Studio

Upgrade Spring Boot and Kotlin versions.

Change-Id: If0d7d0f476d8cfd23916013ff1ab554b26bc6b7a
Issue-ID: CCSDK-658
Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>

62 files changed, 0 insertions, 1325 deletions

diff --git a/ms/controllerblueprints/application/load/resource_dictionary/address.json b/ms/controllerblueprints/application/load/resource_dictionary/address.json
deleted file mode 100755
index 11f92d76..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/address.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-		"name": "address",
-		"tags": "address",
-		"updated-by" : "Singal, Kapil <ks220y@att.com>",
-		"property": {
-			"description" : "address",
-			"type": "string"
-		},
-		"sources": {
-			"input": {
-				"type": "source-input"
-			}
-		}
-}
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/aic-cloud-region.json b/ms/controllerblueprints/application/load/resource_dictionary/aic-cloud-region.json
deleted file mode 100755
index 1501a9a6..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/aic-cloud-region.json
+++ /dev/null
@@ -1,15 +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" : { }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/aic_clli.json b/ms/controllerblueprints/application/load/resource_dictionary/aic_clli.json
deleted file mode 100755
index ccbbe9d4..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/aic_clli.json
+++ /dev/null
@@ -1,15 +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" : { }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/availability_zone_0.json b/ms/controllerblueprints/application/load/resource_dictionary/availability_zone_0.json
deleted file mode 100755
index b9e07a9f..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/availability_zone_0.json
+++ /dev/null
@@ -1,15 +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" : { }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/db-source.json b/ms/controllerblueprints/application/load/resource_dictionary/db-source.json
deleted file mode 100755
index de46524c..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/db-source.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "name": "db-source",
-  "property" :{
-    "description": "name of the ",
-    "type": "string"
-  },
-  "updated-by": "brindasanth@onap.com",
-  "tags": "bundle-id, brindasanth@onap.com",
-  "sources": {
-    "db": {
-      "type": "source-db",
-      "properties": {
-        "query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",
-        "input-key-mapping": {
-          "profile_name": "profile_name"
-        },
-        "output-key-mapping": {
-          "db-country": "country",
-          "db-state": "state"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/default-source.json b/ms/controllerblueprints/application/load/resource_dictionary/default-source.json
deleted file mode 100755
index 42059ad8..00000000
--- a/ms/controllerblueprints/application/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/application/load/resource_dictionary/image_name.json b/ms/controllerblueprints/application/load/resource_dictionary/image_name.json
deleted file mode 100755
index 37ef5ae1..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/image_name.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "name": "image_name",
-  "tags": "image_name",
-  "updated-by": "Singal, Kapil <ks220y@att.com>",
-  "property": {
-    "type": "string",
-    "description": "image_name"
-  },
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "mdsal": {
-      "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/image_name",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "image_name": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/input-source.json b/ms/controllerblueprints/application/load/resource_dictionary/input-source.json
deleted file mode 100755
index 6c693848..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/input-source.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"name": "input-source",
-	"property" :{
-		"description": "name of the ",
-		"type": "string"
-	},
-	"updated-by": "brindasanth@onap.com",
-	"tags": "input-source",
-	"sources": {
-		"input": {
-			"type": "source-input",
-			"properties": {
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/key_name.json b/ms/controllerblueprints/application/load/resource_dictionary/key_name.json
deleted file mode 100755
index 1f1b3e65..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/key_name.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "name": "key_name",
-  "tags": "key_name",
-  "updated-by": "Singal, Kapil <ks220y@att.com>",
-  "property": {
-    "type": "string",
-    "description": "key_name"
-  },
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "mdsal": {
-      "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/key_name",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "key_name": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/mdsal-source.json b/ms/controllerblueprints/application/load/resource_dictionary/mdsal-source.json
deleted file mode 100755
index 300a71f1..00000000
--- a/ms/controllerblueprints/application/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": {
-    "mdsal": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/L3VNF-API:services/service-list/$service-instance-id/service-data/vnf-topology-information/vnf-assignments/vnf-vms/$vm-type/vm-networks/$network-role/v4-assigned-ip-list/$v4-ip-type",
-        "path": "/v4-assigned-ip-list/0/v4-ip-prefix",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "network-role": "network-role",
-          "v4-ip-type": "v4-ip-type",
-          "vm-type": "vm-type"
-        },
-        "output-key-mapping": {
-          "oam-local-ipv4-address": "v4-ip-prefix"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "network-role",
-          "v4-ip-type",
-          "vm-type"
-        ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/name_0.json b/ms/controllerblueprints/application/load/resource_dictionary/name_0.json
deleted file mode 100755
index 433a3b72..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/name_0.json
+++ /dev/null
@@ -1,15 +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" : { }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/nexus_artifact_repo.json b/ms/controllerblueprints/application/load/resource_dictionary/nexus_artifact_repo.json
deleted file mode 100755
index 6b0a79e0..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/nexus_artifact_repo.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "name" : "nexus_artifact_repo",
-  "tags" : "nexus_artifact_repo",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "nexus_artifact_repo",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/nf-role.json b/ms/controllerblueprints/application/load/resource_dictionary/nf-role.json
deleted file mode 100755
index 819c7e60..00000000
--- a/ms/controllerblueprints/application/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" : {
-    "db" : {
-      "type" : "source-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/application/load/resource_dictionary/nfc-naming-code.json b/ms/controllerblueprints/application/load/resource_dictionary/nfc-naming-code.json
deleted file mode 100755
index b8279187..00000000
--- a/ms/controllerblueprints/application/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" : {
-    "db" : {
-      "type" : "source-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/application/load/resource_dictionary/onap_private_net_cidr.json b/ms/controllerblueprints/application/load/resource_dictionary/onap_private_net_cidr.json
deleted file mode 100755
index cee06015..00000000
--- a/ms/controllerblueprints/application/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" : {
-    "db" : {
-      "type" : "source-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/application/load/resource_dictionary/onap_private_net_id.json b/ms/controllerblueprints/application/load/resource_dictionary/onap_private_net_id.json
deleted file mode 100755
index bb70fe3c..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/onap_private_net_id.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "name": "onap_private_net_id",
-  "tags": "onap_private_net_id",
-  "updated-by": "Singal, Kapil <ks220y@att.com>",
-  "property": {
-    "type": "string",
-    "description": "onap_private_net_id"
-  },
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "mdsal": {
-      "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/onap_private_net_id",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "onap_private_net_id": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/onap_private_subnet_id.json b/ms/controllerblueprints/application/load/resource_dictionary/onap_private_subnet_id.json
deleted file mode 100755
index d38ceb49..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/onap_private_subnet_id.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "name": "onap_private_subnet_id",
-  "tags": "onap_private_subnet_id",
-  "updated-by": "Singal, Kapil <ks220y@att.com>",
-  "property": {
-    "type": "string",
-    "description": "onap_private_subnet_id"
-  },
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "mdsal": {
-      "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/onap_private_subnet_id",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "onap_private_subnet_id": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/private-prefix-id.json b/ms/controllerblueprints/application/load/resource_dictionary/private-prefix-id.json
deleted file mode 100755
index 5dea3e31..00000000
--- a/ms/controllerblueprints/application/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" : {
-    "db" : {
-      "type" : "source-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/application/load/resource_dictionary/protected-prefix-id.json b/ms/controllerblueprints/application/load/resource_dictionary/protected-prefix-id.json
deleted file mode 100755
index fb572741..00000000
--- a/ms/controllerblueprints/application/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" : {
-    "db" : {
-      "type" : "source-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/application/load/resource_dictionary/protected_private_net_cidr.json b/ms/controllerblueprints/application/load/resource_dictionary/protected_private_net_cidr.json
deleted file mode 100755
index 261920fe..00000000
--- a/ms/controllerblueprints/application/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" : {
-    "db" : {
-      "type" : "source-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/application/load/resource_dictionary/protected_private_subnet_id.json b/ms/controllerblueprints/application/load/resource_dictionary/protected_private_subnet_id.json
deleted file mode 100755
index b3daadc4..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/protected_private_subnet_id.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "name" : "protected_private_subnet_id",
-  "tags" : "protected_private_subnet_id",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "protected_private_subnet_id",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/pub_key.json b/ms/controllerblueprints/application/load/resource_dictionary/pub_key.json
deleted file mode 100755
index ce6c2f2a..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/pub_key.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "name": "pub_key",
-  "tags": "pub_key",
-  "updated-by": "Singal, Kapil <ks220y@att.com>",
-  "property": {
-    "type": "string",
-    "description": "pub_key"
-  },
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "mdsal": {
-      "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/pub_key",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "pub_key": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
-
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/public_net_id.json b/ms/controllerblueprints/application/load/resource_dictionary/public_net_id.json
deleted file mode 100755
index 6cc9c2e3..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/public_net_id.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-		"name": "public_net_id",
-		"tags": "public_net_id",
-		"updated-by" : "Singal, Kapil <ks220y@att.com>",
-		"property": {
-			"type": "string",
-			"description" : "public_net_id"
-		},
-		"sources": {
-			"input": {
-				"type": "source-input"
-			}
-		}
-}
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/sample-db-source.json b/ms/controllerblueprints/application/load/resource_dictionary/sample-db-source.json
deleted file mode 100644
index 90775aee..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/sample-db-source.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{

-  "name": "sample-db-source",

-  "property" :{

-    "description": "name of the ",

-    "type": "string"

-  },

-  "updated-by": "brindasanth@onap.com",

-  "tags": "db-source, brindasanth@onap.com",

-  "sources": {

-    "db": {

-      "type": "source-db",

-      "properties": {

-        "query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",

-        "input-key-mapping": {

-          "profile_name": "profile_name"

-        },

-        "output-key-mapping": {

-          "db-country": "country",

-          "db-state": "state"

-        }

-      }

-    }

-  }

-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/sample-default-source.json b/ms/controllerblueprints/application/load/resource_dictionary/sample-default-source.json
deleted file mode 100644
index 395b0ddd..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/sample-default-source.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{

-  "tags": "sample-default-source",

-  "name": "sample-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/application/load/resource_dictionary/sample-input-source.json b/ms/controllerblueprints/application/load/resource_dictionary/sample-input-source.json
deleted file mode 100644
index 73c0d408..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/sample-input-source.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{

-	"name": "sample-input-source",

-	"property" :{

-		"description": "name of the ",

-		"type": "string"

-	},

-	"updated-by": "brindasanth@onap.com",

-	"tags": "sample-input-source",

-	"sources": {

-		"input": {

-			"type": "source-input",

-			"properties": {

-				"key": "input-source"

-			}

-		}

-	}

-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/sample-licenses.json b/ms/controllerblueprints/application/load/resource_dictionary/sample-licenses.json
deleted file mode 100644
index 5834dd49..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/sample-licenses.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{

-  "tags": "sample-licenses",

-  "name": "sample-licenses",

-  "property": {

-    "description" : " Sample Data for licences",

-    "required": true,

-    "type": "list",

-    "entry_schema": {

-      "type": "dt-license-key"

-    }

-  },

-  "updated-by": "brindasanth@onap.com",

-  "sources": {

-    "mdsal": {

-      "type": "source-rest",

-      "properties": {

-        "type": "JSON",

-        "url-path": "config/L3VNF-API:services/service-list/",

-        "path": "/licenses",

-        "input-key-mapping": {

-        },

-        "output-key-mapping": {

-          "licenses": "licenses"

-        },

-        "key-dependencies": []

-      }

-    }

-  }

-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/sample-mdsal-source.json b/ms/controllerblueprints/application/load/resource_dictionary/sample-mdsal-source.json
deleted file mode 100644
index 25464d3f..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/sample-mdsal-source.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{

-  "tags": "sample-mdsal-source",

-  "name": "sample-mdsal-source",

-  "property": {

-    "description": "Sample sample-mdsal-source",

-    "type": "string"

-  },

-  "updated-by": "brindasanth@onap.com",

-  "sources": {

-    "mdsal": {

-      "type": "source-rest",

-      "properties": {

-        "type": "JSON",

-        "url-path": "config/L3VNF-API:services/service-list/$service-instance-id/service-data/vnf-topology-information/vnf-assignments/vnf-vms/$vm-type/vm-networks/$network-role/v4-assigned-ip-list/$v4-ip-type",

-        "path": "/v4-assigned-ip-list/0/v4-ip-prefix",

-        "input-key-mapping": {

-        },

-        "output-key-mapping": {

-          "mdsal-source": "v4-ip-prefix"

-        },

-        "key-dependencies": []

-      }

-    }

-  }

-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/sample-v4-ip-type.json b/ms/controllerblueprints/application/load/resource_dictionary/sample-v4-ip-type.json
deleted file mode 100644
index 055279c1..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/sample-v4-ip-type.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{

-  "name": "sample-v4-ip-type",

-  "property": {

-    "description": "sample-v4-ip-type",

-    "type": "string"

-  },

-  "updated-by": "brindasanth@onap.com",

-  "tags": "sample-v4-ip-type",

-  "sources": {

-    "input": {

-      "type": "source-input",

-      "properties": {

-        "key": "sample-v4-ip-type"

-      }

-    }

-  }

-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/sec_group.json b/ms/controllerblueprints/application/load/resource_dictionary/sec_group.json
deleted file mode 100755
index 017ba984..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/sec_group.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "name" : "sec_group",
-  "tags" : "sec_group",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "sec_group",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/service-instance-id.json b/ms/controllerblueprints/application/load/resource_dictionary/service-instance-id.json
deleted file mode 100755
index 37b98687..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/service-instance-id.json
+++ /dev/null
@@ -1,15 +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" : { }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/status.json b/ms/controllerblueprints/application/load/resource_dictionary/status.json
deleted file mode 100755
index 47a19d09..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/status.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "name" : "status",
-  "tags" : "status",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "status",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/unprotected-prefix-id.json b/ms/controllerblueprints/application/load/resource_dictionary/unprotected-prefix-id.json
deleted file mode 100755
index 3cb73205..00000000
--- a/ms/controllerblueprints/application/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" : {
-    "db" : {
-      "type" : "source-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/application/load/resource_dictionary/unprotected_private_net_cidr.json b/ms/controllerblueprints/application/load/resource_dictionary/unprotected_private_net_cidr.json
deleted file mode 100755
index d2a339e7..00000000
--- a/ms/controllerblueprints/application/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" : {
-    "db" : {
-      "type" : "source-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/application/load/resource_dictionary/unprotected_private_subnet_id.json b/ms/controllerblueprints/application/load/resource_dictionary/unprotected_private_subnet_id.json
deleted file mode 100755
index 760d611a..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/unprotected_private_subnet_id.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "name" : "unprotected_private_subnet_id",
-  "tags" : "unprotected_private_subnet_id",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "unprotected_private_subnet_id",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/vf-module-id.json b/ms/controllerblueprints/application/load/resource_dictionary/vf-module-id.json
deleted file mode 100755
index 74f9310e..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/vf-module-id.json
+++ /dev/null
@@ -1,15 +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" : { }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/vf-module-label.json b/ms/controllerblueprints/application/load/resource_dictionary/vf-module-label.json
deleted file mode 100755
index ac5e21a6..00000000
--- a/ms/controllerblueprints/application/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" : {
-    "db" : {
-      "type" : "source-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/application/load/resource_dictionary/vf-module-model-customization-uuid.json b/ms/controllerblueprints/application/load/resource_dictionary/vf-module-model-customization-uuid.json
deleted file mode 100755
index 6736e4fe..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/vf-module-model-customization-uuid.json
+++ /dev/null
@@ -1,15 +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" : { }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/vf-module-type.json b/ms/controllerblueprints/application/load/resource_dictionary/vf-module-type.json
deleted file mode 100755
index 147425c3..00000000
--- a/ms/controllerblueprints/application/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" : {
-    "db" : {
-      "type" : "source-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/application/load/resource_dictionary/vf-naming-policy.json b/ms/controllerblueprints/application/load/resource_dictionary/vf-naming-policy.json
deleted file mode 100755
index f68cc374..00000000
--- a/ms/controllerblueprints/application/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" : {
-    "db" : {
-      "type" : "source-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/application/load/resource_dictionary/vf-nf-code.json b/ms/controllerblueprints/application/load/resource_dictionary/vf-nf-code.json
deleted file mode 100755
index 1865d47f..00000000
--- a/ms/controllerblueprints/application/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" : {
-    "db" : {
-      "type" : "source-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/application/load/resource_dictionary/vf_module_name.json b/ms/controllerblueprints/application/load/resource_dictionary/vf_module_name.json
deleted file mode 100755
index 20ce458b..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/vf_module_name.json
+++ /dev/null
@@ -1,15 +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" : { }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/vfccustomizationuuid.json b/ms/controllerblueprints/application/load/resource_dictionary/vfccustomizationuuid.json
deleted file mode 100755
index 463f8480..00000000
--- a/ms/controllerblueprints/application/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" : {
-    "db" : {
-      "type" : "source-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/application/load/resource_dictionary/vfw_name_0.json b/ms/controllerblueprints/application/load/resource_dictionary/vfw_name_0.json
deleted file mode 100755
index 96a97585..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/vfw_name_0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name" : "vfw_name_0",
-  "tags" : "vfw_name_0",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vfw_name_0",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : { }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/vfw_private_ip_0.json b/ms/controllerblueprints/application/load/resource_dictionary/vfw_private_ip_0.json
deleted file mode 100755
index 71a4df2c..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/vfw_private_ip_0.json
+++ /dev/null
@@ -1,33 +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" : {
-      }
-    },
-    "mdsal" : {
-      "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/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"
-        },
-        "output-key-mapping" : {
-          "vfw_private_ip_0" : "value"
-        },
-        "key-dependencies" : [ "service-instance-id", "vnf-id" ]
-      }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/vfw_private_ip_1.json b/ms/controllerblueprints/application/load/resource_dictionary/vfw_private_ip_1.json
deleted file mode 100755
index 481edae8..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/vfw_private_ip_1.json
+++ /dev/null
@@ -1,33 +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" : {
-      }
-    },
-    "mdsal" : {
-      "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/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"
-        },
-        "output-key-mapping" : {
-          "vfw_private_ip_1" : "value"
-        },
-        "key-dependencies" : [ "service-instance-id", "vnf-id" ]
-      }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/vfw_private_ip_2.json b/ms/controllerblueprints/application/load/resource_dictionary/vfw_private_ip_2.json
deleted file mode 100755
index f8adf741..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/vfw_private_ip_2.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-		"name": "vfw_private_ip_2",
-		"tags": "vfw_private_ip_2",
-		"updated-by" : "Singal, Kapil <ks220y@att.com>",
-		"property": {
-			"type": "string",
-			"description" : "vfw_private_ip_2"
-		},
-		"sources": {
-			"input": {
-				"type": "source-input"
-			}
-		}
-}
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/vm-type.json b/ms/controllerblueprints/application/load/resource_dictionary/vm-type.json
deleted file mode 100755
index 0204c64b..00000000
--- a/ms/controllerblueprints/application/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" : {
-    "db" : {
-      "type" : "source-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/application/load/resource_dictionary/vnf-id.json b/ms/controllerblueprints/application/load/resource_dictionary/vnf-id.json
deleted file mode 100755
index 7f3a18ff..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/vnf-id.json
+++ /dev/null
@@ -1,15 +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" : { }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/vnf-model-customization-uuid.json b/ms/controllerblueprints/application/load/resource_dictionary/vnf-model-customization-uuid.json
deleted file mode 100755
index 2aa08c40..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/vnf-model-customization-uuid.json
+++ /dev/null
@@ -1,15 +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" : { }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/vnf-name.json b/ms/controllerblueprints/application/load/resource_dictionary/vnf-name.json
deleted file mode 100755
index 89b3dc1c..00000000
--- a/ms/controllerblueprints/application/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" : {
-    "mdsal" : {
-      "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/application/load/resource_dictionary/vnf_name.json b/ms/controllerblueprints/application/load/resource_dictionary/vnf_name.json
deleted file mode 100755
index c55f1c18..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/vnf_name.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "name" : "vnf_name",
-  "tags" : "vnf_name",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vnf_name",
-    "type" : "string"
-  },
-  "sources" : {
-    "mdsal" : {
-      "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",
-        "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" ]
-      }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/vnfc-model-invariant-uuid.json b/ms/controllerblueprints/application/load/resource_dictionary/vnfc-model-invariant-uuid.json
deleted file mode 100755
index c894fb53..00000000
--- a/ms/controllerblueprints/application/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 SRIOV VPE template",
-    "type" : "string"
-  },
-  "sources" : {
-    "db" : {
-      "type" : "source-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/application/load/resource_dictionary/vnfc-model-version.json b/ms/controllerblueprints/application/load/resource_dictionary/vnfc-model-version.json
deleted file mode 100755
index 45eb07f7..00000000
--- a/ms/controllerblueprints/application/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  SRIOV VPE template",
-    "type" : "string"
-  },
-  "sources" : {
-    "db" : {
-      "type" : "source-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/application/load/resource_dictionary/volume-name.json b/ms/controllerblueprints/application/load/resource_dictionary/volume-name.json
deleted file mode 100755
index 3fe5ab30..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/volume-name.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name" : "volume-name",
-  "tags" : "volume-name",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "volume-name",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : { }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/volume_group_name.json b/ms/controllerblueprints/application/load/resource_dictionary/volume_group_name.json
deleted file mode 100755
index 90b36096..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/volume_group_name.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "name" : "volume_group_name",
-  "tags" : "volume_group_name",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "volume_group_name",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/vpg_name_0.json b/ms/controllerblueprints/application/load/resource_dictionary/vpg_name_0.json
deleted file mode 100755
index f158d53c..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/vpg_name_0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name" : "vpg_name_0",
-  "tags" : "vpg_name_0",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vpg_name_0",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : { }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/vpg_private_ip_0.json b/ms/controllerblueprints/application/load/resource_dictionary/vpg_private_ip_0.json
deleted file mode 100755
index 13d89993..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/vpg_private_ip_0.json
+++ /dev/null
@@ -1,33 +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" : {
-      }
-    },
-    "mdsal" : {
-      "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/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"
-        },
-        "output-key-mapping" : {
-          "vpg_private_ip_0" : "value"
-        },
-        "key-dependencies" : [ "service-instance-id", "vnf-id" ]
-      }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/vpg_private_ip_1.json b/ms/controllerblueprints/application/load/resource_dictionary/vpg_private_ip_1.json
deleted file mode 100755
index ff58f8af..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/vpg_private_ip_1.json
+++ /dev/null
@@ -1,16 +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" : {
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/vsn_name_0.json b/ms/controllerblueprints/application/load/resource_dictionary/vsn_name_0.json
deleted file mode 100755
index 7b7ba457..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/vsn_name_0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name" : "vsn_name_0",
-  "tags" : "vsn_name_0",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vsn_name_0",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : { }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/vsn_private_ip_0.json b/ms/controllerblueprints/application/load/resource_dictionary/vsn_private_ip_0.json
deleted file mode 100755
index fcd6d8d5..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/vsn_private_ip_0.json
+++ /dev/null
@@ -1,33 +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" : {
-      }
-    },
-    "mdsal" : {
-      "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/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"
-        },
-        "output-key-mapping" : {
-          "vsn_private_ip_0" : "value"
-        },
-        "key-dependencies" : [ "service-instance-id", "vnf-id" ]
-      }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/application/load/resource_dictionary/vsn_private_ip_1.json b/ms/controllerblueprints/application/load/resource_dictionary/vsn_private_ip_1.json
deleted file mode 100755
index 52de69c6..00000000
--- a/ms/controllerblueprints/application/load/resource_dictionary/vsn_private_ip_1.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-		"name": "vsn_private_ip_1",
-		"tags": "vsn_private_ip_1",
-		"updated-by" : "Singal, Kapil <ks220y@att.com>",
-		"property": {
-			"type": "string",
-			"description" : "vsn_private_ip_1"
-		},
-		"sources": {
-			"input": {
-				"type": "source-input"
-			}
-		}
-}