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>

11 files changed, 496 insertions, 451 deletions

diff --git a/ms/controllerblueprints/application/load/blueprints/vFW/Definitions/vFW_spinup.json b/ms/controllerblueprints/application/load/blueprints/vFW/Definitions/vFW_spinup.json
index b8bfc0f64..3cfa6f779 100644
--- a/ms/controllerblueprints/application/load/blueprints/vFW/Definitions/vFW_spinup.json
+++ b/ms/controllerblueprints/application/load/blueprints/vFW/Definitions/vFW_spinup.json
@@ -221,6 +221,53 @@
                     
                   ],
                   "version": 0
+                },{
+                  "name": "onap_private_net_id",
+                  "property": {
+                    "description": "",
+                    "required": false,
+                    "type": "string",
+                    "status": "",
+                    "constraints": [
+                      {
+                        
+                      }
+                    ],
+                    "entry_schema": {
+                      "type": ""
+                    }
+                  },
+                  "input-param": false,
+                  "dictionary-name": "onap_private_net_id",
+                  "dictionary-source": "input",
+                  "dependencies": [
+                    
+                  ],
+                  "version": 0
+                },
+                {
+                  "name": "onap_private_subnet_id",
+                  "property": {
+                    "description": "",
+                    "required": false,
+                    "type": "string",
+                    "status": "",
+                    "constraints": [
+                      {
+                        
+                      }
+                    ],
+                    "entry_schema": {
+                      "type": ""
+                    }
+                  },
+                  "input-param": false,
+                  "dictionary-name": "onap_private_subnet_id",
+                  "dictionary-source": "input",
+                  "dependencies": [
+                    
+                  ],
+                  "version": 0
                 },
                 {
                   "name": "vnf_name",
@@ -296,6 +343,150 @@
                   "version": 0
                 },
                 {
+                  "name": "vfw_private_ip_1",
+                  "property": {
+                    "description": "",
+                    "required": false,
+                    "type": "string",
+                    "status": "",
+                    "constraints": [
+                      {
+                        
+                      }
+                    ],
+                    "entry_schema": {
+                      "type": ""
+                    }
+                  },
+                  "input-param": false,
+                  "dictionary-name": "vfw_private_ip_1",
+                  "dictionary-source": "input",
+                  "dependencies": [
+                    
+                  ],
+                  "version": 0
+                },
+                {
+                  "name": "vfw_private_ip_0",
+                  "property": {
+                    "description": "",
+                    "required": false,
+                    "type": "string",
+                    "status": "",
+                    "constraints": [
+                      {
+                        
+                      }
+                    ],
+                    "entry_schema": {
+                      "type": ""
+                    }
+                  },
+                  "input-param": false,
+                  "dictionary-name": "vfw_private_ip_0",
+                  "dictionary-source": "input",
+                  "dependencies": [
+                    
+                  ],
+                  "version": 0
+                },
+                {
+                  "name": "vpg_private_ip_0",
+                  "property": {
+                    "description": "",
+                    "required": false,
+                    "type": "string",
+                    "status": "",
+                    "constraints": [
+                      {
+                        
+                      }
+                    ],
+                    "entry_schema": {
+                      "type": ""
+                    }
+                  },
+                  "input-param": false,
+                  "dictionary-name": "vpg_private_ip_0",
+                  "dictionary-source": "input",
+                  "dependencies": [
+                    
+                  ],
+                  "version": 0
+                },
+                {
+                  "name": "vsn_private_ip_0",
+                  "property": {
+                    "description": "",
+                    "required": false,
+                    "type": "string",
+                    "status": "",
+                    "constraints": [
+                      {
+                        
+                      }
+                    ],
+                    "entry_schema": {
+                      "type": ""
+                    }
+                  },
+                  "input-param": false,
+                  "dictionary-name": "vsn_private_ip_0",
+                  "dictionary-source": "input",
+                  "dependencies": [
+                    
+                  ],
+                  "version": 0
+                },
+                {
+                  "name": "protected-prefix-id",
+                  "property": {
+                    "description": "",
+                    "required": false,
+                    "type": "integer",
+                    "status": "",
+                    "constraints": [
+                      {
+                        
+                      }
+                    ],
+                    "entry_schema": {
+                      "type": ""
+                    }
+                  },
+                  "input-param": false,
+                  "dictionary-name": "protected-prefix-id",
+                  "dictionary-source": "db",
+                  "dependencies": [
+                    
+                  ],
+                  "version": 0
+                },
+                {
+                  "name": "unprotected-prefix-id",
+                  "property": {
+                    "description": "",
+                    "required": false,
+                    "type": "integer",
+                    "status": "",
+                    "constraints": [
+                      {
+                        
+                      }
+                    ],
+                    "entry_schema": {
+                      "type": ""
+                    }
+                  },
+                  "input-param": false,
+                  "dictionary-name": "unprotected-prefix-id",
+                  "dictionary-source": "db",
+                  "dependencies": [
+                    
+                  ],
+                  "version": 0
+                },
+                {
                   "name": "vf-nf-code",
                   "property": {
                     "description": "",
@@ -553,30 +744,6 @@
                   "version": 0
                 },
                 {
-                  "name": "availability_zone_0",
-                  "property": {
-                    "description": "",
-                    "required": false,
-                    "type": "string",
-                    "status": "",
-                    "constraints": [
-                      {
-                        
-                      }
-                    ],
-                    "entry_schema": {
-                      "type": ""
-                    }
-                  },
-                  "input-param": false,
-                  "dictionary-name": "availability_zone_0",
-                  "dictionary-source": "input",
-                  "dependencies": [
-                    
-                  ],
-                  "version": 0
-                },
-                {
                   "name": "vm-type",
                   "property": {
                     "description": "",
@@ -594,7 +761,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "vm-type",
-                  "dictionary-source": "input",
+                  "dictionary-source": "db",
                   "dependencies": [
                     
                   ],
@@ -693,7 +860,7 @@
                   "dictionary-name": "nfc-naming-code",
                   "dictionary-source": "db",
                   "dependencies": [
-                    "vf-module-model-customization-uuid"
+                    "vfccustomizationuuid"
                   ],
                   "version": 0
                 },
@@ -736,15 +903,14 @@
                     ],
                     "entry_schema": {
                       "type": ""
-                    },
-                    "value": "",
-                    "default": "onap_private_net_id"
+                    }
                   },
                   "input-param": false,
                   "dictionary-name": "onap_private_net_id",
-                  "dictionary-source": "default",
+                  "dictionary-source": "mdsal",
                   "dependencies": [
-                    
+                      "service-instance-id",
+                      "vnf-id"
                   ],
                   "version": 0
                 },
@@ -752,7 +918,7 @@
                   "name": "onap_private_subnet_id",
                   "property": {
                     "description": "",
-                    "required": true,
+                    "required": false,
                     "type": "string",
                     "status": "",
                     "constraints": [
@@ -762,15 +928,14 @@
                     ],
                     "entry_schema": {
                       "type": ""
-                    },
-                    "value": "Oam_Network_Puhf",
-                    "default": "Oam_Network_Puhf"
+                    }
                   },
                   "input-param": false,
                   "dictionary-name": "onap_private_subnet_id",
-                  "dictionary-source": "default",
+                  "dictionary-source": "mdsal",
                   "dependencies": [
-                    
+                      "service-instance-id",
+                      "vnf-id"
                   ],
                   "version": 0
                 },
@@ -1042,126 +1207,6 @@
                   "version": 0
                 },
                 {
-                  "name": "protected-prefix-id",
-                  "property": {
-                    "description": "",
-                    "required": false,
-                    "type": "integer",
-                    "status": "",
-                    "constraints": [
-                      {
-                        
-                      }
-                    ],
-                    "entry_schema": {
-                      "type": ""
-                    }
-                  },
-                  "input-param": false,
-                  "dictionary-name": "protected-prefix-id",
-                  "dictionary-source": "db",
-                  "dependencies": [
-                    
-                  ],
-                  "version": 0
-                },
-                {
-                  "name": "vfw_private_ip_1",
-                  "property": {
-                    "description": "",
-                    "required": false,
-                    "type": "string",
-                    "status": "",
-                    "constraints": [
-                      {
-                        
-                      }
-                    ],
-                    "entry_schema": {
-                      "type": ""
-                    }
-                  },
-                  "input-param": false,
-                  "dictionary-name": "vfw_private_ip_1",
-                  "dictionary-source": "input",
-                  "dependencies": [
-                    
-                  ],
-                  "version": 0
-                },
-                {
-                  "name": "unprotected-prefix-id",
-                  "property": {
-                    "description": "",
-                    "required": false,
-                    "type": "integer",
-                    "status": "",
-                    "constraints": [
-                      {
-                        
-                      }
-                    ],
-                    "entry_schema": {
-                      "type": ""
-                    }
-                  },
-                  "input-param": false,
-                  "dictionary-name": "unprotected-prefix-id",
-                  "dictionary-source": "db",
-                  "dependencies": [
-                    
-                  ],
-                  "version": 0
-                },
-                {
-                  "name": "vfw_private_ip_0",
-                  "property": {
-                    "description": "",
-                    "required": false,
-                    "type": "string",
-                    "status": "",
-                    "constraints": [
-                      {
-                        
-                      }
-                    ],
-                    "entry_schema": {
-                      "type": ""
-                    }
-                  },
-                  "input-param": false,
-                  "dictionary-name": "vfw_private_ip_0",
-                  "dictionary-source": "input",
-                  "dependencies": [
-                    
-                  ],
-                  "version": 0
-                },
-                {
-                  "name": "vpg_private_ip_0",
-                  "property": {
-                    "description": "",
-                    "required": false,
-                    "type": "string",
-                    "status": "",
-                    "constraints": [
-                      {
-                        
-                      }
-                    ],
-                    "entry_schema": {
-                      "type": ""
-                    }
-                  },
-                  "input-param": false,
-                  "dictionary-name": "vpg_private_ip_0",
-                  "dictionary-source": "input",
-                  "dependencies": [
-                    
-                  ],
-                  "version": 0
-                },
-                {
                   "name": "vnf_name",
                   "property": {
                     "description": "",
@@ -1419,30 +1464,6 @@
                   "version": 0
                 },
                 {
-                  "name": "availability_zone_0",
-                  "property": {
-                    "description": "",
-                    "required": false,
-                    "type": "string",
-                    "status": "",
-                    "constraints": [
-                      {
-                        
-                      }
-                    ],
-                    "entry_schema": {
-                      "type": ""
-                    }
-                  },
-                  "input-param": false,
-                  "dictionary-name": "availability_zone_0",
-                  "dictionary-source": "input",
-                  "dependencies": [
-                    
-                  ],
-                  "version": 0
-                },
-                {
                   "name": "vm-type",
                   "property": {
                     "description": "",
@@ -1460,7 +1481,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "vm-type",
-                  "dictionary-source": "input",
+                  "dictionary-source": "db",
                   "dependencies": [
                     
                   ],
@@ -1559,7 +1580,7 @@
                   "dictionary-name": "nfc-naming-code",
                   "dictionary-source": "db",
                   "dependencies": [
-                    "vf-module-model-customization-uuid"
+                    "vfccustomizationuuid"
                   ],
                   "version": 0
                 },
@@ -1602,14 +1623,14 @@
                     ],
                     "entry_schema": {
                       "type": ""
-                    },
-                    "default": "onap_private_net_id"
+                    }
                   },
                   "input-param": false,
                   "dictionary-name": "onap_private_net_id",
-                  "dictionary-source": "default",
+                  "dictionary-source": "mdsal",
                   "dependencies": [
-                    
+                      "service-instance-id",
+                      "vnf-id"
                   ],
                   "version": 0
                 },
@@ -1617,7 +1638,7 @@
                   "name": "onap_private_subnet_id",
                   "property": {
                     "description": "",
-                    "required": true,
+                    "required": false,
                     "type": "string",
                     "status": "",
                     "constraints": [
@@ -1627,14 +1648,14 @@
                     ],
                     "entry_schema": {
                       "type": ""
-                    },
-                    "default": "Oam_Network_Puhf"
+                    }
                   },
                   "input-param": false,
                   "dictionary-name": "onap_private_subnet_id",
-                  "dictionary-source": "default",
+                  "dictionary-source": "mdsal",
                   "dependencies": [
-                    
+                      "service-instance-id",
+                      "vnf-id"
                   ],
                   "version": 0
                 },
@@ -1707,8 +1728,7 @@
                   "dictionary-source": "mdsal",
                   "dependencies": [
                     "service-instance-id",
-                    "vnf-id",
-                    "vf-module-id"
+                    "vnf-id"
                   ],
                   "version": 0
                 },
@@ -1733,8 +1753,7 @@
                   "dictionary-source": "mdsal",
                   "dependencies": [
                     "service-instance-id",
-                    "vnf-id",
-                    "vf-module-id"
+                    "vnf-id"
                   ],
                   "version": 0
                 },
@@ -1809,8 +1828,7 @@
                   "dictionary-source": "mdsal",
                   "dependencies": [
                     "service-instance-id",
-                    "vnf-id",
-                    "vf-module-id"
+                    "vnf-id"
                   ],
                   "version": 0
                 },
@@ -1929,7 +1947,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "private-prefix-id",
-                  "dictionary-source": "input",
+                  "dictionary-source": "db",
                   "dependencies": [
                     
                   ],
@@ -2193,54 +2211,6 @@
                   "version": 0
                 },
                 {
-                  "name": "aic_clli",
-                  "property": {
-                    "description": "",
-                    "required": false,
-                    "type": "string",
-                    "status": "",
-                    "constraints": [
-                      {
-                        
-                      }
-                    ],
-                    "entry_schema": {
-                      "type": ""
-                    }
-                  },
-                  "input-param": false,
-                  "dictionary-name": "aic_clli",
-                  "dictionary-source": "input",
-                  "dependencies": [
-                    
-                  ],
-                  "version": 0
-                },
-                {
-                  "name": "availability_zone_0",
-                  "property": {
-                    "description": "",
-                    "required": false,
-                    "type": "string",
-                    "status": "",
-                    "constraints": [
-                      {
-                        
-                      }
-                    ],
-                    "entry_schema": {
-                      "type": ""
-                    }
-                  },
-                  "input-param": false,
-                  "dictionary-name": "availability_zone_0",
-                  "dictionary-source": "input",
-                  "dependencies": [
-                    
-                  ],
-                  "version": 0
-                },
-                {
                   "name": "vm-type",
                   "property": {
                     "description": "",
@@ -2258,7 +2228,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "vm-type",
-                  "dictionary-source": "input",
+                  "dictionary-source": "db",
                   "dependencies": [
                     
                   ],
@@ -2357,7 +2327,7 @@
                   "dictionary-name": "nfc-naming-code",
                   "dictionary-source": "db",
                   "dependencies": [
-                    "vf-module-model-customization-uuid"
+                    "vfccustomizationuuid"
                   ],
                   "version": 0
                 },
@@ -2405,9 +2375,10 @@
                   },
                   "input-param": false,
                   "dictionary-name": "onap_private_net_id",
-                  "dictionary-source": "default",
+                  "dictionary-source": "mdsal",
                   "dependencies": [
-                    
+                      "service-instance-id",
+                      "vnf-id"
                   ],
                   "version": 0
                 },
@@ -2415,7 +2386,7 @@
                   "name": "onap_private_subnet_id",
                   "property": {
                     "description": "",
-                    "required": true,
+                    "required": false,
                     "type": "string",
                     "status": "",
                     "constraints": [
@@ -2425,14 +2396,14 @@
                     ],
                     "entry_schema": {
                       "type": ""
-                    },
-                    "default": "Oam_Network_Puhf"
+                    }
                   },
                   "input-param": false,
                   "dictionary-name": "onap_private_subnet_id",
-                  "dictionary-source": "default",
+                  "dictionary-source": "mdsal",
                   "dependencies": [
-                    
+                      "service-instance-id",
+                      "vnf-id"
                   ],
                   "version": 0
                 },
@@ -2580,8 +2551,7 @@
                   "dictionary-source": "mdsal",
                   "dependencies": [
                     "service-instance-id",
-                    "vnf-id",
-                    "vf-module-id"
+                    "vnf-id"
                   ],
                   "version": 0
                 },
@@ -2700,7 +2670,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "private-prefix-id",
-                  "dictionary-source": "input",
+                  "dictionary-source": "db",
                   "dependencies": [
                     
                   ],
@@ -2753,12 +2723,28 @@
                     
                   ],
                   "version": 0
-                },
+                }
+              ]
+            }
+          }
+        }
+      },
+      "base_template": {
+        "type": "artifact-config-template",
+        "capabilities": {
+          "content": {
+            "properties": {
+              "content": "base_template"
+            }
+          },
+          "mapping": {
+            "properties": {
+              "mapping": [
                 {
-                  "name": "vsn_private_ip_0",
+                  "name": "service-instance-id",
                   "property": {
                     "description": "",
-                    "required": false,
+                    "required": true,
                     "type": "string",
                     "status": "",
                     "constraints": [
@@ -2771,31 +2757,15 @@
                     }
                   },
                   "input-param": false,
-                  "dictionary-name": "vsn_private_ip_0",
+                  "dictionary-name": "service-instance-id",
                   "dictionary-source": "input",
                   "dependencies": [
                     
                   ],
                   "version": 0
-                }
-              ]
-            }
-          }
-        }
-      },
-      "base_template": {
-        "type": "artifact-config-template",
-        "capabilities": {
-          "content": {
-            "properties": {
-              "content": "base_template"
-            }
-          },
-          "mapping": {
-            "properties": {
-              "mapping": [
+                },
                 {
-                  "name": "service-instance-id",
+                  "name": "vf-module-type",
                   "property": {
                     "description": "",
                     "required": true,
@@ -2811,7 +2781,31 @@
                     }
                   },
                   "input-param": false,
-                  "dictionary-name": "service-instance-id",
+                  "dictionary-name": "vf-module-type",
+                  "dictionary-source": "db",
+                  "dependencies": [
+                    "vf-module-model-customization-uuid"
+                  ],
+                  "version": 0
+                },
+                {
+                  "name": "vf-module-model-customization-uuid",
+                  "property": {
+                    "description": "",
+                    "required": true,
+                    "type": "string",
+                    "status": "",
+                    "constraints": [
+                      {
+                        
+                      }
+                    ],
+                    "entry_schema": {
+                      "type": ""
+                    }
+                  },
+                  "input-param": false,
+                  "dictionary-name": "vf-module-model-customization-uuid",
                   "dictionary-source": "input",
                   "dependencies": [
                     
@@ -2843,6 +2837,30 @@
                   "version": 0
                 },
                 {
+                  "name": "vf-module-id",
+                  "property": {
+                    "description": "",
+                    "required": true,
+                    "type": "string",
+                    "status": "",
+                    "constraints": [
+                      {
+                        
+                      }
+                    ],
+                    "entry_schema": {
+                      "type": ""
+                    }
+                  },
+                  "input-param": false,
+                  "dictionary-name": "vf-module-id",
+                  "dictionary-source": "input",
+                  "dependencies": [
+                    
+                  ],
+                  "version": 0
+                },
+                {
                   "name": "vnf-model-customization-uuid",
                   "property": {
                     "description": "",
diff --git a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vFW_vNF_Artifact.vtl b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vFW_vNF_Artifact.vtl
index b61ef63c1..f25e95608 100644
--- a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vFW_vNF_Artifact.vtl
+++ b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vFW_vNF_Artifact.vtl
@@ -15,6 +15,14 @@
     {
       "param-name": "aic-cloud-region",
       "param-value": "${aic-cloud-region}"
+    },
+    {
+      "param-name": "onap_private_net_id",
+      "param-value": "${onap_private_net_id}"
+    },
+    {
+      "param-name": "onap_private_subnet_id",
+      "param-value": "${onap_private_net_id}_sub"
     }
   ],
   "capability-data": [
@@ -33,7 +41,7 @@
             },
             {
               "param-name": "external-key",
-              "param-value": "${vnf-id}"
+              "param-value": "${vnf-id}_vnf_name"
             },
             {
               "param-name": "policy-instance-name",
@@ -60,6 +68,114 @@
           ]
         }
       ]
+    },
+    {
+      "capability-name": "netbox-ip-assign",
+      "key-mapping": [
+        {
+          "payload": [
+            {
+              "param-name": "service-instance-id",
+              "param-value": "${service-instance-id}"
+            },
+            {
+              "param-name": "prefix-id",
+              "param-value": "${protected-prefix-id}"
+            },
+            {
+              "param-name": "vnf-id",
+              "param-value": "${vnf-id}"
+            },
+            {
+              "param-name": "external_key",
+              "param-value": "${vnf-id}-vfw_private_ip_1"
+            }
+          ],
+          "output-key-mapping": [
+            {
+              "resource-name": "vfw_private_ip_1",
+              "resource-value": "${vfw_private_ip_1}"
+            }
+          ]
+        },
+        {
+          "payload": [
+            {
+              "param-name": "service-instance-id",
+              "param-value": "${service-instance-id}"
+            },
+            {
+              "param-name": "prefix-id",
+              "param-value": "${unprotected-prefix-id}"
+            },
+            {
+              "param-name": "vnf-id",
+              "param-value": "${vnf-id}"
+            },
+            {
+              "param-name": "external_key",
+              "param-value": "${vnf-id}-vfw_private_ip_0"
+            }
+          ],
+          "output-key-mapping": [
+            {
+              "resource-name": "vfw_private_ip_0",
+              "resource-value": "${vfw_private_ip_0}"
+            }
+          ]
+        },
+        {
+          "payload": [
+            {
+              "param-name": "service-instance-id",
+              "param-value": "${service-instance-id}"
+            },
+            {
+              "param-name": "prefix-id",
+              "param-value": "${unprotected-prefix-id}"
+            },
+            {
+              "param-name": "vnf-id",
+              "param-value": "${vnf-id}"
+            },
+            {
+              "param-name": "external_key",
+              "param-value": "${vnf-id}-vpg_private_ip_0"
+            }
+          ],
+          "output-key-mapping": [
+            {
+              "resource-name": "vpg_private_ip_0",
+              "resource-value": "${vpg_private_ip_0}"
+            }
+          ]
+        },{
+          "payload": [
+            {
+              "param-name": "service-instance-id",
+              "param-value": "${service-instance-id}"
+            },
+            {
+              "param-name": "prefix-id",
+              "param-value": "${protected-prefix-id}"
+            },
+            {
+              "param-name": "vnf-id",
+              "param-value": "${vnf-id}"
+            },
+            {
+              "param-name": "external_key",
+              "param-value": "${vnf-id}-vsn_private_ip_0"
+            }
+          ],
+          "output-key-mapping": [
+            {
+              "resource-name": "vsn_private_ip_0",
+              "resource-value": "${vsn_private_ip_0}"
+            }
+          ]
+        }
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vfw.vtl b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vfw.vtl
index 3397a3cdd..0e11b4bf3 100644
--- a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vfw.vtl
+++ b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vfw.vtl
@@ -18,7 +18,7 @@
     },
     {
       "param-name": "vf_module_id",
-      "param-value": "${vf-module-id}"
+      "param-value": "${vnf-id}"
     },
     {
       "param-name": "vf_module_type",
@@ -37,10 +37,6 @@
       "param-value": "${aic-cloud-region}"
     },
     {
-      "param-name": "availability_zone_0",
-      "param-value": "${availability_zone_0}"
-    },
-    {
       "param-name": "vm-type",
       "param-value": "${vm-type}"
     },
@@ -219,7 +215,7 @@
             },
             {
               "param-name": "external-key",
-              "param-value": "${vf-module-id}"
+              "param-value": "${vf-module-id}_vf_module_name"
             },
             {
               "param-name": "policy-instance-name",
@@ -283,84 +279,6 @@
               "resource-value": "${vfw_private_ip_2}"
             }
           ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${protected-prefix-id}"
-            },
-            {
-              "param-name": "vf-module-id",
-              "param-value": "${vf-module-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vf-module-id}-vfw_private_ip_1"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vfw_private_ip_1",
-              "resource-value": "${vfw_private_ip_1}"
-            }
-          ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${unprotected-prefix-id}"
-            },
-            {
-              "param-name": "vf-module-id",
-              "param-value": "${vf-module-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vf-module-id}-vfw_private_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vfw_private_ip_0",
-              "resource-value": "${vfw_private_ip_0}"
-            }
-          ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${unprotected-prefix-id}"
-            },
-            {
-              "param-name": "vf-module-id",
-              "param-value": "${vf-module-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vf-module-id}-vpg_private_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vpg_private_ip_0",
-              "resource-value": "${vpg_private_ip_0}"
-            }
-          ]
         }
       ]
     },
diff --git a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vpg.vtl b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vpg.vtl
index 0927a54da..c69aeb5f9 100644
--- a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vpg.vtl
+++ b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vpg.vtl
@@ -37,10 +37,6 @@
       "param-value": "${aic-cloud-region}"
     },
     {
-      "param-name": "availability_zone_0",
-      "param-value": "${availability_zone_0}"
-    },
-    {
       "param-name": "vm-type",
       "param-value": "${vm-type}"
     },
@@ -130,7 +126,7 @@
     },
     {
       "param-name": "unprotected_private_subnet_id",
-      "param-value": "{vnf-name}_unprotected_sub"
+      "param-value": "${vnf-name}_unprotected_sub"
     },
     {
       "param-name": "unprotected_private_net_cidr",
@@ -227,7 +223,7 @@
             },
             {
               "param-name": "external-key",
-              "param-value": "${vf-module-id}"
+              "param-value": "${vf-module-id}_vf_module_name"
             },
             {
               "param-name": "policy-instance-name",
@@ -246,7 +242,7 @@
               "param-value": "${vnf-name}"
             },
             {
-              "param-name": "VF_MODULE_LABLE",
+              "param-name": "VF_MODULE_LABEL",
               "param-value": "${vf-module-label}"
             },
             {
diff --git a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vsn.vtl b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vsn.vtl
index 4336f40a4..c681de5f8 100644
--- a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vsn.vtl
+++ b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vsn.vtl
@@ -37,14 +37,6 @@
       "param-value": "${aic-cloud-region}"
     },
     {
-      "param-name": "aic_clli",
-      "param-value": "${aic_clli}"
-    },
-    {
-      "param-name": "availability_zone_0",
-      "param-value": "${availability_zone_0}"
-    },
-    {
       "param-name": "vm-type",
       "param-value": "${vm-type}"
     },
@@ -177,7 +169,7 @@
             },
             {
               "param-name": "external-key",
-              "param-value": "${vf-module-id}_vnfc_name"
+              "param-value": "${vf-module-id}_vsn_name_0"
             },
             {
               "param-name": "policy-instance-name",
@@ -219,7 +211,7 @@
             },
             {
               "param-name": "external-key",
-              "param-value": "${vf-module-id}"
+              "param-value": "${vf-module-id}_vf_module_name"
             },
             {
               "param-name": "policy-instance-name",
@@ -238,7 +230,7 @@
               "param-value": "${vnf-name}"
             },
             {
-              "param-name": "VF_MODULE_LABLE",
+              "param-name": "VF_MODULE_LABEL",
               "param-value": "${vf-module-label}"
             },
             {
@@ -283,32 +275,6 @@
               "resource-value": "${vsn_private_ip_1}"
             }
           ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${protected-prefix-id}"
-            },
-            {
-              "param-name": "vf-module-id",
-              "param-value": "${vf-module-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vf-module-id}-vsn_private_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vsn_private_ip_0",
-              "resource-value": "${vsn_private_ip_0}"
-            }
-          ]
         }
       ]
     },
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 89d0efbd9..bb70fe3c4 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 0ea5b13df..d38ceb49c 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 38fb34f95..71a4df2c4 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 4acd10d6e..481edae8c 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 f586a6581..13d89993b 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 b9954553c..fcd6d8d55 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" ]
       }
     }
   }