Update vFW CBA for Dublin

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

10 files changed, 3125 insertions, 0 deletions

diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-mapping.json
new file mode 100644
index 000000000..258174882
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-mapping.json
@@ -0,0 +1,267 @@
+[
+  {
+    "name": "service-instance-id",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "service-instance-id",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vf-module-type",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vf-module-type",
+    "dictionary-source": "processor-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": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vnf-id",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vnf-id",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "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": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vnf-model-customization-uuid",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "aic-cloud-region",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "aic-cloud-region",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "nf-role",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "nf-role",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      "vnf-model-customization-uuid"
+    ],
+    "version": 0
+  },
+  {
+    "name": "vnf-name",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vnf-name",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ],
+    "version": 0
+  },
+  {
+    "name": "unprotected_private_net_cidr",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "unprotected_private_net_cidr",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "protected_private_net_cidr",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "protected_private_net_cidr",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  }
+]
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-template.vtl
index 271c50738..271c50738 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-template.vtl
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json
new file mode 100644
index 000000000..c07007cbc
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json
@@ -0,0 +1,781 @@
+[
+  {
+    "name": "service-instance-id",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "service-instance-id",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vnf-id",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vnf-id",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vnf-name",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vnf-name",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ],
+    "version": 0
+  },
+  {
+    "name": "vnf-model-customization-uuid",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vnf-model-customization-uuid",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "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": "vf-module-type",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vf-module-type",
+    "dictionary-source": "processor-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": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vfccustomizationuuid",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vfccustomizationuuid",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      "vf-module-model-customization-uuid"
+    ],
+    "version": 0
+  },
+  {
+    "name": "aic-cloud-region",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "aic-cloud-region",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vm-type",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vm-type",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vnfc-model-invariant-uuid",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vnfc-model-invariant-uuid",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      "vfccustomizationuuid"
+    ],
+    "version": 0
+  },
+  {
+    "name": "vnfc-model-version",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vnfc-model-version",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      "vfccustomizationuuid"
+    ],
+    "version": 0
+  },
+  {
+    "name": "nf-role",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      },
+      "default": "vFW"
+    },
+    "input-param": false,
+    "dictionary-name": "nf-role",
+    "dictionary-source": "default",
+    "dependencies": [
+      "vnf-model-customization-uuid"
+    ],
+    "version": 0
+  },
+  {
+    "name": "nfc-naming-code",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "nfc-naming-code",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      "vfccustomizationuuid"
+    ],
+    "version": 0
+  },
+  {
+    "name": "public_net_id",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      },
+      "default": "public_net_id"
+    },
+    "input-param": false,
+    "dictionary-name": "public_net_id",
+    "dictionary-source": "default",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "image_name",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "image_name",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ],
+    "version": 0
+  },
+  {
+    "name": "key_name",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "key_name",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ],
+    "version": 0
+  },
+  {
+    "name": "pub_key",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "pub_key",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ],
+    "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": "primary-config-data",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ],
+    "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": "primary-config-data",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ],
+    "version": 0
+  },
+  {
+    "name": "unprotected_private_net_cidr",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "unprotected_private_net_cidr",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "protected_private_net_cidr",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "protected_private_net_cidr",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "nexus_artifact_repo",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      },
+      "default": "nexus_artifact_repo"
+    },
+    "input-param": false,
+    "dictionary-name": "nexus_artifact_repo",
+    "dictionary-source": "default",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "sec_group",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      },
+      "default": "onap_sg_PUhf"
+    },
+    "input-param": false,
+    "dictionary-name": "sec_group",
+    "dictionary-source": "default",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "onap_private_net_cidr",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "onap_private_net_cidr",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vfw_name_0",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vfw_name_0",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vf-naming-policy",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      },
+      "default": "SDNC_Policy.Config_MS_ONAP_VFW_NAMING_TIMESTAMP"
+    },
+    "input-param": false,
+    "dictionary-name": "vf-naming-policy",
+    "dictionary-source": "default",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vf_module_name",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vf_module_name",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vf-module-label",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vf-module-label",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      "vf-module-model-customization-uuid"
+    ],
+    "version": 0
+  },
+  {
+    "name": "private-prefix-id",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "integer",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "private-prefix-id",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vfw_private_ip_2",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vfw_private_ip_2",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vnf_name",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vnf_name",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  }
+]
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-template.vtl
index 6864a36fe..6864a36fe 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-template.vtl
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-vnf-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-vnf-mapping.json
new file mode 100644
index 000000000..d764572e4
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-vnf-mapping.json
@@ -0,0 +1,461 @@
+[
+  {
+    "name": "service-instance-id",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "service-instance-id",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vnf-id",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vnf-id",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vnf-model-customization-uuid",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vnf-model-customization-uuid",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "aic-cloud-region",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "aic-cloud-region",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "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": "key_name",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "key_name",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "image_name",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      },
+      "default": "Ubuntu 14.04 LTS Generic"
+    },
+    "input-param": false,
+    "dictionary-name": "image_name",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "pub_key",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      },
+      "default": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh"
+    },
+    "input-param": false,
+    "dictionary-name": "pub_key",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vnf_name",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vnf_name",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vf-naming-policy",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      },
+      "default": "SDNC_Policy.Config_MS_ONAP_VFW_NAMING_TIMESTAMP"
+    },
+    "input-param": false,
+    "dictionary-name": "vf-naming-policy",
+    "dictionary-source": "default",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "nf-role",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "nf-role",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      "vnf-model-customization-uuid"
+    ],
+    "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": "processor-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": "processor-db",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vf-nf-code",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vf-nf-code",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      "vnf-model-customization-uuid"
+    ],
+    "version": 0
+  }
+]
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vFW_vNF_Artifact.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-vnf-template.vtl
index f7947ef8f..f7947ef8f 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vFW_vNF_Artifact.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-vnf-template.vtl
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-mapping.json
new file mode 100644
index 000000000..d3cfdebf8
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-mapping.json
@@ -0,0 +1,808 @@
+[
+  {
+    "name": "service-instance-id",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "service-instance-id",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vnf-id",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vnf-id",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vnf-name",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vnf-name",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ],
+    "version": 0
+  },
+  {
+    "name": "vnf-model-customization-uuid",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vnf-model-customization-uuid",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "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": "vf-module-type",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vf-module-type",
+    "dictionary-source": "processor-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": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vfccustomizationuuid",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vfccustomizationuuid",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      "vf-module-model-customization-uuid"
+    ],
+    "version": 0
+  },
+  {
+    "name": "aic-cloud-region",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "aic-cloud-region",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vm-type",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vm-type",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vnfc-model-invariant-uuid",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vnfc-model-invariant-uuid",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      "vfccustomizationuuid"
+    ],
+    "version": 0
+  },
+  {
+    "name": "vnfc-model-version",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vnfc-model-version",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      "vfccustomizationuuid"
+    ],
+    "version": 0
+  },
+  {
+    "name": "nf-role",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      },
+      "default": "vPG"
+    },
+    "input-param": false,
+    "dictionary-name": "nf-role",
+    "dictionary-source": "default",
+    "dependencies": [
+      "vnf-model-customization-uuid"
+    ],
+    "version": 0
+  },
+  {
+    "name": "nfc-naming-code",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "nfc-naming-code",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      "vfccustomizationuuid"
+    ],
+    "version": 0
+  },
+  {
+    "name": "public_net_id",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      },
+      "default": "public_net_id"
+    },
+    "input-param": false,
+    "dictionary-name": "public_net_id",
+    "dictionary-source": "default",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "image_name",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "image_name",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ],
+    "version": 0
+  },
+  {
+    "name": "key_name",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "key_name",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ],
+    "version": 0
+  },
+  {
+    "name": "pub_key",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "pub_key",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ],
+    "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": "primary-config-data",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ],
+    "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": "primary-config-data",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ],
+    "version": 0
+  },
+  {
+    "name": "unprotected_private_net_cidr",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "unprotected_private_net_cidr",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "onap_private_net_cidr",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "onap_private_net_cidr",
+    "dictionary-source": "processor-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": "primary-config-data",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ],
+    "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": "primary-config-data",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ],
+    "version": 0
+  },
+  {
+    "name": "nexus_artifact_repo",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      },
+      "default": "nexus_artifact_repo"
+    },
+    "input-param": false,
+    "dictionary-name": "nexus_artifact_repo",
+    "dictionary-source": "default",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "sec_group",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      },
+      "default": "onap_sg_PUhf"
+    },
+    "input-param": false,
+    "dictionary-name": "sec_group",
+    "dictionary-source": "default",
+    "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": "primary-config-data",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ],
+    "version": 0
+  },
+  {
+    "name": "vpg_name_0",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vpg_name_0",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vf-naming-policy",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      },
+      "default": "SDNC_Policy.Config_MS_ONAP_VPG_NAMING_TIMESTAMP"
+    },
+    "input-param": false,
+    "dictionary-name": "vf-naming-policy",
+    "dictionary-source": "default",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vf_module_name",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vf_module_name",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vf-module-label",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vf-module-label",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      "vf-module-model-customization-uuid"
+    ],
+    "version": 0
+  },
+  {
+    "name": "private-prefix-id",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "integer",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "private-prefix-id",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vpg_private_ip_1",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vpg_private_ip_1",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  }
+]
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-template.vtl
index 2ff6596ee..2ff6596ee 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-template.vtl
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-mapping.json
new file mode 100644
index 000000000..84bc73185
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-mapping.json
@@ -0,0 +1,808 @@
+[
+  {
+    "name": "service-instance-id",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "service-instance-id",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vnf-id",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vnf-id",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vnf-name",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vnf-name",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ],
+    "version": 0
+  },
+  {
+    "name": "vnf-model-customization-uuid",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vnf-model-customization-uuid",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "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": "vf-module-type",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vf-module-type",
+    "dictionary-source": "processor-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": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vfccustomizationuuid",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vfccustomizationuuid",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      "vf-module-model-customization-uuid"
+    ],
+    "version": 0
+  },
+  {
+    "name": "aic-cloud-region",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "aic-cloud-region",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vm-type",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vm-type",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vnfc-model-invariant-uuid",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vnfc-model-invariant-uuid",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      "vfccustomizationuuid"
+    ],
+    "version": 0
+  },
+  {
+    "name": "vnfc-model-version",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vnfc-model-version",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      "vfccustomizationuuid"
+    ],
+    "version": 0
+  },
+  {
+    "name": "nf-role",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      },
+      "default": "vSN"
+    },
+    "input-param": false,
+    "dictionary-name": "nf-role",
+    "dictionary-source": "default",
+    "dependencies": [
+      "vnf-model-customization-uuid"
+    ],
+    "version": 0
+  },
+  {
+    "name": "nfc-naming-code",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "nfc-naming-code",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      "vfccustomizationuuid"
+    ],
+    "version": 0
+  },
+  {
+    "name": "image_name",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "image_name",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ],
+    "version": 0
+  },
+  {
+    "name": "public_net_id",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      },
+      "value": "public_net_id",
+      "default": "public_net_id"
+    },
+    "input-param": false,
+    "dictionary-name": "public_net_id",
+    "dictionary-source": "default",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "key_name",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "key_name",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ],
+    "version": 0
+  },
+  {
+    "name": "pub_key",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "pub_key",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ],
+    "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": "primary-config-data",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ],
+    "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": "primary-config-data",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ],
+    "version": 0
+  },
+  {
+    "name": "unprotected_private_net_cidr",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "unprotected_private_net_cidr",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "protected_private_net_cidr",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "protected_private_net_cidr",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "onap_private_net_cidr",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "onap_private_net_cidr",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "nexus_artifact_repo",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      },
+      "value": "nexus_artifact_repo",
+      "default": "nexus_artifact_repo"
+    },
+    "input-param": false,
+    "dictionary-name": "nexus_artifact_repo",
+    "dictionary-source": "default",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "sec_group",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      },
+      "default": "onap_sg_PUhf"
+    },
+    "input-param": false,
+    "dictionary-name": "sec_group",
+    "dictionary-source": "default",
+    "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": "primary-config-data",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ],
+    "version": 0
+  },
+  {
+    "name": "vsn_name_0",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vsn_name_0",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vf-naming-policy",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      },
+      "default": "SDNC_Policy.Config_MS_ONAP_VSN_NAMING_TIMESTAMP"
+    },
+    "input-param": false,
+    "dictionary-name": "vf-naming-policy",
+    "dictionary-source": "default",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vf_module_name",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vf_module_name",
+    "dictionary-source": "input",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vf-module-label",
+    "property": {
+      "description": "",
+      "required": true,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vf-module-label",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      "vf-module-model-customization-uuid"
+    ],
+    "version": 0
+  },
+  {
+    "name": "private-prefix-id",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "integer",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "private-prefix-id",
+    "dictionary-source": "processor-db",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  },
+  {
+    "name": "vsn_private_ip_1",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {
+          
+        }
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vsn_private_ip_1",
+    "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": "processor-db",
+    "dependencies": [
+      
+    ],
+    "version": 0
+  }
+]
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-template.vtl
index 11fcea9fd..11fcea9fd 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-template.vtl