Fix DDs, blueprint and template for vFW CDS

Change-Id: Ia52b9717df2ef67dd5bf667515c55816b750a199
Issue-ID: CCSDK-601
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

6 files changed, 71 insertions, 40 deletions

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
index 89d0efbd..bb70fe3c 100755
--- a/ms/controllerblueprints/application/load/resource_dictionary/onap_private_net_id.json
+++ b/ms/controllerblueprints/application/load/resource_dictionary/onap_private_net_id.json
@@ -1,15 +1,33 @@
 {
-		"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"
-			}
-		}
-
-}
+  "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
index 0ea5b13d..d38ceb49 100755
--- a/ms/controllerblueprints/application/load/resource_dictionary/onap_private_subnet_id.json
+++ b/ms/controllerblueprints/application/load/resource_dictionary/onap_private_subnet_id.json
@@ -1,15 +1,32 @@
 {
-  "name" : "onap_private_subnet_id",
-  "tags" : "onap_private_subnet_id",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "onap_private_subnet_id",
-    "type" : "string"
+  "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",
-      "properties" : {
+  "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"
+        ]
       }
     }
   }
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
index 38fb34f9..71a4df2c 100755
--- a/ms/controllerblueprints/application/load/resource_dictionary/vfw_private_ip_0.json
+++ b/ms/controllerblueprints/application/load/resource_dictionary/vfw_private_ip_0.json
@@ -16,18 +16,17 @@
       "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/$vf-module-id/vf-module-data/vf-module-topology/vf-module-parameters/param/vfw_private_ip_0",
+        "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",
-          "vf-module-id" : "vf-module-id"
+          "vnf-id" : "vnf-id"
         },
         "output-key-mapping" : {
           "vfw_private_ip_0" : "value"
         },
-        "key-dependencies" : [ "service-instance-id", "vnf-id", "vf-module-id" ]
+        "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
index 4acd10d6..481edae8 100755
--- a/ms/controllerblueprints/application/load/resource_dictionary/vfw_private_ip_1.json
+++ b/ms/controllerblueprints/application/load/resource_dictionary/vfw_private_ip_1.json
@@ -16,18 +16,17 @@
       "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/$vf-module-id/vf-module-data/vf-module-topology/vf-module-parameters/param/vfw_private_ip_1",
+        "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",
-          "vf-module-id" : "vf-module-id"
+          "vnf-id" : "vnf-id"
         },
         "output-key-mapping" : {
           "vfw_private_ip_1" : "value"
         },
-        "key-dependencies" : [ "service-instance-id", "vnf-id", "vf-module-id" ]
+        "key-dependencies" : [ "service-instance-id", "vnf-id" ]
       }
     }
   }
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
index f586a658..13d89993 100755
--- a/ms/controllerblueprints/application/load/resource_dictionary/vpg_private_ip_0.json
+++ b/ms/controllerblueprints/application/load/resource_dictionary/vpg_private_ip_0.json
@@ -16,18 +16,17 @@
       "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/$vf-module-id/vf-module-data/vf-module-topology/vf-module-parameters/param/vpg_private_ip_0",
+        "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",
-          "vf-module-id" : "vf-module-id"
+          "vnf-id" : "vnf-id"
         },
         "output-key-mapping" : {
           "vpg_private_ip_0" : "value"
         },
-        "key-dependencies" : [ "service-instance-id", "vnf-id", "vf-module-id" ]
+        "key-dependencies" : [ "service-instance-id", "vnf-id" ]
       }
     }
   }
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
index b9954553..fcd6d8d5 100755
--- a/ms/controllerblueprints/application/load/resource_dictionary/vsn_private_ip_0.json
+++ b/ms/controllerblueprints/application/load/resource_dictionary/vsn_private_ip_0.json
@@ -16,18 +16,17 @@
       "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/$vf-module-id/vf-module-data/vf-module-topology/vf-module-parameters/param/vsn_private_ip_0",
+        "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",
-          "vf-module-id" : "vf-module-id"
+          "vnf-id" : "vnf-id"
         },
         "output-key-mapping" : {
           "vsn_private_ip_0" : "value"
         },
-        "key-dependencies" : [ "service-instance-id", "vnf-id", "vf-module-id" ]
+        "key-dependencies" : [ "service-instance-id", "vnf-id" ]
       }
     }
   }