Refactor components core and resource dict modules

Change-Id: I04e9e723d68a38ecefe48206e67fddbe43c55854
Issue-ID: CCSDK-1047
Signed-off-by: Muthuramalingam, Brinda Santh <brindasanth@in.ibm.com>

42 files changed, 0 insertions, 935 deletions

diff --git a/components/resource-dict/load/resource_dictionary/address.json b/components/resource-dict/load/resource_dictionary/address.json
deleted file mode 100644
index e999938c..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/aic-cloud-region.json b/components/resource-dict/load/resource_dictionary/aic-cloud-region.json
deleted file mode 100644
index da2c7440..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/aic_clli.json b/components/resource-dict/load/resource_dictionary/aic_clli.json
deleted file mode 100644
index 182d7061..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/availability_zone_0.json b/components/resource-dict/load/resource_dictionary/availability_zone_0.json
deleted file mode 100644
index f1cebdb7..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/default-source.json b/components/resource-dict/load/resource_dictionary/default-source.json
deleted file mode 100644
index 64bfa0cc..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/input-source.json b/components/resource-dict/load/resource_dictionary/input-source.json
deleted file mode 100644
index 152a5eef..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/mdsal-source.json b/components/resource-dict/load/resource_dictionary/mdsal-source.json
deleted file mode 100644
index fa72e5dc..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/name_0.json b/components/resource-dict/load/resource_dictionary/name_0.json
deleted file mode 100644
index 2392c3dc..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/nf-role.json b/components/resource-dict/load/resource_dictionary/nf-role.json
deleted file mode 100644
index df6b5df4..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/nfc-naming-code.json b/components/resource-dict/load/resource_dictionary/nfc-naming-code.json
deleted file mode 100644
index 7c521a7c..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/onap_private_net_cidr.json b/components/resource-dict/load/resource_dictionary/onap_private_net_cidr.json
deleted file mode 100644
index f2067a19..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/onap_private_net_id.json b/components/resource-dict/load/resource_dictionary/onap_private_net_id.json
deleted file mode 100644
index 4e430f46..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/primary-db-source.json b/components/resource-dict/load/resource_dictionary/primary-db-source.json
deleted file mode 100644
index dfac66ae..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/private-prefix-id.json b/components/resource-dict/load/resource_dictionary/private-prefix-id.json
deleted file mode 100644
index 309647d7..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/protected-prefix-id.json b/components/resource-dict/load/resource_dictionary/protected-prefix-id.json
deleted file mode 100644
index 816405b4..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/protected_private_net_cidr.json b/components/resource-dict/load/resource_dictionary/protected_private_net_cidr.json
deleted file mode 100644
index bf46fb3a..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/public_net_id.json b/components/resource-dict/load/resource_dictionary/public_net_id.json
deleted file mode 100644
index 17ad96bd..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/service-instance-id.json b/components/resource-dict/load/resource_dictionary/service-instance-id.json
deleted file mode 100644
index ed583be7..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/unprotected-prefix-id.json b/components/resource-dict/load/resource_dictionary/unprotected-prefix-id.json
deleted file mode 100644
index 8a09b149..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/unprotected_private_net_cidr.json b/components/resource-dict/load/resource_dictionary/unprotected_private_net_cidr.json
deleted file mode 100644
index 241147c3..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/vf-module-id.json b/components/resource-dict/load/resource_dictionary/vf-module-id.json
deleted file mode 100644
index 0e1d771f..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/vf-module-label.json b/components/resource-dict/load/resource_dictionary/vf-module-label.json
deleted file mode 100644
index 01355c20..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/vf-module-model-customization-uuid.json b/components/resource-dict/load/resource_dictionary/vf-module-model-customization-uuid.json
deleted file mode 100644
index f41c781c..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/vf-module-type.json b/components/resource-dict/load/resource_dictionary/vf-module-type.json
deleted file mode 100644
index ead69d46..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/vf-naming-policy.json b/components/resource-dict/load/resource_dictionary/vf-naming-policy.json
deleted file mode 100644
index cde861f8..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/vf-nf-code.json b/components/resource-dict/load/resource_dictionary/vf-nf-code.json
deleted file mode 100644
index adbd22af..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/vf_module_name.json b/components/resource-dict/load/resource_dictionary/vf_module_name.json
deleted file mode 100644
index b416f529..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/vfccustomizationuuid.json b/components/resource-dict/load/resource_dictionary/vfccustomizationuuid.json
deleted file mode 100644
index b3485791..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/vfw_private_ip_0.json b/components/resource-dict/load/resource_dictionary/vfw_private_ip_0.json
deleted file mode 100644
index 59f51516..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/vfw_private_ip_1.json b/components/resource-dict/load/resource_dictionary/vfw_private_ip_1.json
deleted file mode 100644
index 6dda72f7..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/vfw_private_ip_2.json b/components/resource-dict/load/resource_dictionary/vfw_private_ip_2.json
deleted file mode 100644
index 9e510647..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/vm-type.json b/components/resource-dict/load/resource_dictionary/vm-type.json
deleted file mode 100644
index e559f9b5..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/vnf-id.json b/components/resource-dict/load/resource_dictionary/vnf-id.json
deleted file mode 100644
index 55c24b5f..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/vnf-model-customization-uuid.json b/components/resource-dict/load/resource_dictionary/vnf-model-customization-uuid.json
deleted file mode 100644
index f6c3b814..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/vnf-name.json b/components/resource-dict/load/resource_dictionary/vnf-name.json
deleted file mode 100644
index 708030ee..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/vnf_name.json b/components/resource-dict/load/resource_dictionary/vnf_name.json
deleted file mode 100644
index 3164367c..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/vnfc-model-invariant-uuid.json b/components/resource-dict/load/resource_dictionary/vnfc-model-invariant-uuid.json
deleted file mode 100644
index 9eb94cff..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/vnfc-model-version.json b/components/resource-dict/load/resource_dictionary/vnfc-model-version.json
deleted file mode 100644
index e4e66229..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/vpg_private_ip_0.json b/components/resource-dict/load/resource_dictionary/vpg_private_ip_0.json
deleted file mode 100644
index 9bef3c79..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/vpg_private_ip_1.json b/components/resource-dict/load/resource_dictionary/vpg_private_ip_1.json
deleted file mode 100644
index 23c42e0c..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/vsn_private_ip_0.json b/components/resource-dict/load/resource_dictionary/vsn_private_ip_0.json
deleted file mode 100644
index 52a4542c..00000000
--- a/components/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/components/resource-dict/load/resource_dictionary/vsn_private_ip_1.json b/components/resource-dict/load/resource_dictionary/vsn_private_ip_1.json
deleted file mode 100644
index 88750b25..00000000
--- a/components/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