Update vFW_CDS packages

Issue-ID: CCSDK-1825
Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
Change-Id: I53668b3df0cf13ceaa78cbffc92df05db23fe642
Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>

2 files changed, 73 insertions, 69 deletions

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json
index 72304692e..93f86129a 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json
@@ -1,56 +1,38 @@
 {
-  "tags": "vnf-name",
-  "name": "vnf-name",
-  "group":"default",
-  "property": {
-    "description": "vnf-name",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "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"
-        ]
-      }
-    },
-    "aai-data": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "verb": "GET",
-        "url-path": "/aai/v14/network/generic-vnfs/generic-vnf/$vnf-id",
-        "path": "",
-        "input-key-mapping": {
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "vnf-name": "vnf-name"
-        },
-        "key-dependencies": [
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "vnf-name",
+	"name": "vnf-name",
+	"property": {
+		"description": "vnf-name",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/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"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_name_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_name_0.json
index cd6bb42e7..72a2db395 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_name_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_name_0.json
@@ -1,16 +1,38 @@
 {
-  "name" : "vpg_name_0",
-  "tags" : "vpg_name_0",
-  "group":"default",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vpg_name_0",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : { }
-    }
-  }
+	"tags": "vpg_name_0",
+	"name": "vpg_name_0",
+	"property": {
+		"description": "vpg_name_0",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_name_0",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vpg_name_0": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
 }