Merge "Update vFW CBA for Dublin"

41 files changed, 4561 insertions, 3630 deletions

diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/artifact_types.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/artifact_types.json
new file mode 100644
index 000000000..da498e35e
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/artifact_types.json
@@ -0,0 +1,16 @@
+{
+  "artifact_types" : {
+    "artifact-mapping-resource" : {
+      "description" : "Resource Mapping File used along with Configuration template",
+      "version" : "1.0.0",
+      "derived_from" : "tosca.artifacts.Implementation",
+      "file_ext" : [ "json" ]
+    },
+    "artifact-template-velocity" : {
+      "description" : " Velocity Template used for Configuration",
+      "version" : "1.0.0",
+      "derived_from" : "tosca.artifacts.Implementation",
+      "file_ext" : [ "vtl" ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/data_types.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/data_types.json
new file mode 100644
index 000000000..8c304c40b
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/data_types.json
@@ -0,0 +1,3 @@
+{
+  "data_types" : { }
+}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/node_types.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/node_types.json
new file mode 100644
index 000000000..f94214ada
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/node_types.json
@@ -0,0 +1,253 @@
+{
+  "node_types" : {
+    "component-resource-resolution" : {
+      "description" : "This is Resource Assignment Component API",
+      "version" : "1.0.0",
+      "attributes" : {
+        "assignment-params" : {
+          "required" : true,
+          "type" : "string"
+        }
+      },
+      "capabilities" : {
+        "component-node" : {
+          "type" : "tosca.capabilities.Node"
+        }
+      },
+      "interfaces" : {
+        "ResourceResolutionComponent" : {
+          "operations" : {
+            "process" : {
+              "inputs" : {
+                "resolution-key" : {
+                  "description" : "Key for service instance related correlation.",
+                  "required" : false,
+                  "type" : "string"
+                },
+                "store-result" : {
+                  "description" : "Whether or not to store the output.",
+                  "required" : false,
+                  "type" : "boolean"
+                },
+                "resource-type" : {
+                  "description" : "Request type.",
+                  "required" : false,
+                  "type" : "string"
+                },
+                "artifact-prefix-names" : {
+                  "description" : "Template , Resource Assignment Artifact Prefix names",
+                  "required" : true,
+                  "type" : "list",
+                  "entry_schema" : {
+                    "type" : "string"
+                  }
+                },
+                "request-id" : {
+                  "description" : "Request Id, Unique Id for the request.",
+                  "required" : true,
+                  "type" : "string"
+                },
+                "resource-id" : {
+                  "description" : "Resource Id.",
+                  "required" : false,
+                  "type" : "string"
+                },
+                "action-name" : {
+                  "description" : "Action Name of the process",
+                  "required" : false,
+                  "type" : "string"
+                },
+                "dynamic-properties" : {
+                  "description" : "Dynamic Json Content or DSL Json reference.",
+                  "required" : false,
+                  "type" : "json"
+                }
+              },
+              "outputs" : {
+                "resource-assignment-params" : {
+                  "required" : true,
+                  "type" : "string"
+                },
+                "status" : {
+                  "required" : true,
+                  "type" : "string"
+                }
+              }
+            }
+          }
+        }
+      },
+      "derived_from" : "tosca.nodes.Component"
+    },
+    "source-capability" : {
+      "description" : "This is Component Resource Source Node Type",
+      "version" : "1.0.0",
+      "properties" : {
+        "script-type" : {
+          "required" : true,
+          "type" : "string",
+          "constraints" : [ {
+            "valid_values" : [ "kotlin", "internal", "jython" ]
+          } ],
+          "default" : "kotlin"
+        },
+        "script-class-reference" : {
+          "description" : "Capability reference name for internal and kotlin, for jython script file path",
+          "required" : true,
+          "type" : "string"
+        },
+        "instance-dependencies" : {
+          "description" : "Instance dependency Names to Inject to Kotlin / Jython Script.",
+          "required" : false,
+          "type" : "list",
+          "entry_schema" : {
+            "type" : "string"
+          }
+        },
+        "key-dependencies" : {
+          "description" : "Resource Resolution dependency dictionary names.",
+          "required" : true,
+          "type" : "list",
+          "entry_schema" : {
+            "type" : "string"
+          }
+        }
+      },
+      "derived_from" : "tosca.nodes.ResourceSource"
+    },
+    "source-default" : {
+      "description" : "This is Default Resource Source Node Type",
+      "version" : "1.0.0",
+      "properties" : { },
+      "derived_from" : "tosca.nodes.ResourceSource"
+    },
+    "source-input" : {
+      "description" : "This is Input Resource Source Node Type",
+      "version" : "1.0.0",
+      "properties" : { },
+      "derived_from" : "tosca.nodes.ResourceSource"
+    },
+    "source-processor-db" : {
+      "description" : "This is Database Resource Source Node Type",
+      "version" : "1.0.0",
+      "properties" : {
+        "type" : {
+          "required" : true,
+          "type" : "string",
+          "constraints" : [ {
+            "valid_values" : [ "SQL", "PLSQL" ]
+          } ]
+        },
+        "endpoint-selector" : {
+          "required" : false,
+          "type" : "string"
+        },
+        "query" : {
+          "required" : true,
+          "type" : "string"
+        },
+        "input-key-mapping" : {
+          "required" : false,
+          "type" : "map",
+          "entry_schema" : {
+            "type" : "string"
+          }
+        },
+        "output-key-mapping" : {
+          "required" : false,
+          "type" : "map",
+          "entry_schema" : {
+            "type" : "string"
+          }
+        },
+        "key-dependencies" : {
+          "required" : true,
+          "type" : "list",
+          "entry_schema" : {
+            "type" : "string"
+          }
+        }
+      },
+      "derived_from" : "tosca.nodes.ResourceSource"
+    },
+    "source-rest" : {
+      "description" : "This is Rest Resource Source Node Type",
+      "version" : "1.0.0",
+      "properties" : {
+        "type" : {
+          "required" : true,
+          "type" : "string",
+          "constraints" : [ {
+            "valid_values" : [ "JSON" ]
+          } ],
+          "default" : "JSON"
+        },
+        "verb" : {
+          "required" : true,
+          "type" : "string",
+          "constraints" : [ {
+            "valid_values" : [ "GET", "POST", "DELETE", "PUT" ]
+          } ],
+          "default" : "GET"
+        },
+        "payload" : {
+          "required" : false,
+          "type" : "string",
+          "default" : ""
+        },
+        "endpoint-selector" : {
+          "required" : false,
+          "type" : "string"
+        },
+        "url-path" : {
+          "required" : true,
+          "type" : "string"
+        },
+        "path" : {
+          "required" : true,
+          "type" : "string"
+        },
+        "expression-type" : {
+          "required" : false,
+          "type" : "string",
+          "constraints" : [ {
+            "valid_values" : [ "JSON_PATH", "JSON_POINTER" ]
+          } ],
+          "default" : "JSON_PATH"
+        },
+        "input-key-mapping" : {
+          "required" : false,
+          "type" : "map",
+          "entry_schema" : {
+            "type" : "string"
+          }
+        },
+        "output-key-mapping" : {
+          "required" : false,
+          "type" : "map",
+          "entry_schema" : {
+            "type" : "string"
+          }
+        },
+        "key-dependencies" : {
+          "required" : true,
+          "type" : "list",
+          "entry_schema" : {
+            "type" : "string"
+          }
+        }
+      },
+      "derived_from" : "tosca.nodes.ResourceSource"
+    },
+    "tosca.nodes.Component" : {
+      "description" : "This is default Component Node",
+      "version" : "1.0.0",
+      "derived_from" : "tosca.nodes.Root"
+    },
+    "tosca.nodes.ResourceSource" : {
+      "description" : "TOSCA base type for Resource Sources",
+      "version" : "1.0.0",
+      "derived_from" : "tosca.nodes.Root"
+    }
+  }
+}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/policy_types.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/policy_types.json
new file mode 100644
index 000000000..1e44cc70a
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/policy_types.json
@@ -0,0 +1,3 @@
+{
+  "policy_types" : { }
+}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/relationship_types.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/relationship_types.json
new file mode 100644
index 000000000..4ddd7a57c
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/relationship_types.json
@@ -0,0 +1,3 @@
+{
+  "relationship_types" : { }
+}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json
new file mode 100644
index 000000000..18d0acb4f
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json
@@ -0,0 +1,1004 @@
+{
+  "aic-cloud-region" : {
+    "tags" : "aic-cloud-region",
+    "name" : "aic-cloud-region",
+    "property" : {
+      "description" : "aic-cloud-region",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "input" : {
+        "type" : "source-input",
+        "properties" : { }
+      }
+    }
+  },
+  "image_name" : {
+    "tags" : "image_name",
+    "name" : "image_name",
+    "property" : {
+      "description" : "image_name",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "input" : {
+        "type" : "source-input"
+      },
+      "primary-config-data" : {
+        "type" : "source-rest",
+        "properties" : {
+          "type" : "JSON",
+          "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/image_name",
+          "path" : "/param/0/value",
+          "input-key-mapping" : {
+            "service-instance-id" : "service-instance-id",
+            "vnf-id" : "vnf-id"
+          },
+          "output-key-mapping" : {
+            "image_name" : "value"
+          },
+          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+        }
+      }
+    }
+  },
+  "key_name" : {
+    "tags" : "key_name",
+    "name" : "key_name",
+    "property" : {
+      "description" : "key_name",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "input" : {
+        "type" : "source-input"
+      },
+      "primary-config-data" : {
+        "type" : "source-rest",
+        "properties" : {
+          "type" : "JSON",
+          "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/key_name",
+          "path" : "/param/0/value",
+          "input-key-mapping" : {
+            "service-instance-id" : "service-instance-id",
+            "vnf-id" : "vnf-id"
+          },
+          "output-key-mapping" : {
+            "key_name" : "value"
+          },
+          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+        }
+      }
+    }
+  },
+  "nexus_artifact_repo" : {
+    "tags" : "nexus_artifact_repo",
+    "name" : "nexus_artifact_repo",
+    "property" : {
+      "description" : "nexus_artifact_repo",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "default" : {
+        "type" : "source-default",
+        "properties" : { }
+      },
+      "input" : {
+        "type" : "source-input",
+        "properties" : { }
+      }
+    }
+  },
+  "nf-role" : {
+    "tags" : "nf-role",
+    "name" : "nf-role",
+    "property" : {
+      "description" : "vnf/nf-role",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "default" : {
+        "type" : "source-default",
+        "properties" : { }
+      },
+      "processor-db" : {
+        "type" : "source-processor-db",
+        "properties" : {
+          "type" : "SQL",
+          "query" : "select sdnctl.VF_MODEL.nf_role as vf_model_role from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnfmodelcustomizationuuid",
+          "input-key-mapping" : {
+            "vnfmodelcustomizationuuid" : "vnf-model-customization-uuid"
+          },
+          "output-key-mapping" : {
+            "nf-role" : "vf_model_role"
+          },
+          "key-dependencies" : [ "vnf-model-customization-uuid" ]
+        }
+      }
+    }
+  },
+  "nfc-naming-code" : {
+    "tags" : "nfc-naming-code",
+    "name" : "nfc-naming-code",
+    "property" : {
+      "description" : "nfc-naming-code",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "processor-db" : {
+        "type" : "source-processor-db",
+        "properties" : {
+          "type" : "SQL",
+          "query" : "select nfc_naming_code as nfc_naming_code from sdnctl.VFC_MODEL where customization_uuid=:vfccustomizationuuid",
+          "input-key-mapping" : {
+            "vfccustomizationuuid" : "vfccustomizationuuid"
+          },
+          "output-key-mapping" : {
+            "nfc-naming-code" : "nfc_naming_code"
+          },
+          "key-dependencies" : [ "vfccustomizationuuid" ]
+        }
+      }
+    }
+  },
+  "onap_private_net_cidr" : {
+    "tags" : "onap_private_net_cidr",
+    "name" : "onap_private_net_cidr",
+    "property" : {
+      "description" : "onap_private_net_cidr",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "processor-db" : {
+        "type" : "source-processor-db",
+        "properties" : {
+          "type" : "SQL",
+          "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private\"",
+          "output-key-mapping" : {
+            "onap_private_net_cidr" : "prefix"
+          }
+        }
+      }
+    }
+  },
+  "onap_private_net_id" : {
+    "tags" : "onap_private_net_id",
+    "name" : "onap_private_net_id",
+    "property" : {
+      "description" : "onap_private_net_id",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "input" : {
+        "type" : "source-input"
+      },
+      "primary-config-data" : {
+        "type" : "source-rest",
+        "properties" : {
+          "type" : "JSON",
+          "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/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" ]
+        }
+      }
+    }
+  },
+  "onap_private_subnet_id" : {
+    "tags" : "onap_private_subnet_id",
+    "name" : "onap_private_subnet_id",
+    "property" : {
+      "description" : "onap_private_subnet_id",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "input" : {
+        "type" : "source-input"
+      },
+      "primary-config-data" : {
+        "type" : "source-rest",
+        "properties" : {
+          "type" : "JSON",
+          "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/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" ]
+        }
+      }
+    }
+  },
+  "private-prefix-id" : {
+    "tags" : "private-prefix-id",
+    "name" : "private-prefix-id",
+    "property" : {
+      "description" : "private-prefix-id",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "processor-db" : {
+        "type" : "source-processor-db",
+        "properties" : {
+          "type" : "SQL",
+          "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private\"",
+          "output-key-mapping" : {
+            "private-prefix-id" : "prefix_id"
+          }
+        }
+      }
+    }
+  },
+  "protected-prefix-id" : {
+    "tags" : "protected-prefix-id",
+    "name" : "protected-prefix-id",
+    "property" : {
+      "description" : "protected-prefix-id",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "processor-db" : {
+        "type" : "source-processor-db",
+        "properties" : {
+          "type" : "SQL",
+          "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"protected\"",
+          "output-key-mapping" : {
+            "protected-prefix-id" : "prefix_id"
+          }
+        }
+      }
+    }
+  },
+  "protected_private_net_cidr" : {
+    "tags" : "protected_private_net_cidr",
+    "name" : "protected_private_net_cidr",
+    "property" : {
+      "description" : "protected_private_net_cidr",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "processor-db" : {
+        "type" : "source-processor-db",
+        "properties" : {
+          "type" : "SQL",
+          "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"protected\"",
+          "output-key-mapping" : {
+            "protected_private_net_cidr" : "prefix"
+          }
+        }
+      }
+    }
+  },
+  "pub_key" : {
+    "tags" : "pub_key",
+    "name" : "pub_key",
+    "property" : {
+      "description" : "pub_key",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "input" : {
+        "type" : "source-input"
+      },
+      "primary-config-data" : {
+        "type" : "source-rest",
+        "properties" : {
+          "type" : "JSON",
+          "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/pub_key",
+          "path" : "/param/0/value",
+          "input-key-mapping" : {
+            "service-instance-id" : "service-instance-id",
+            "vnf-id" : "vnf-id"
+          },
+          "output-key-mapping" : {
+            "pub_key" : "value"
+          },
+          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+        }
+      }
+    }
+  },
+  "public_net_id" : {
+    "tags" : "public_net_id",
+    "name" : "public_net_id",
+    "property" : {
+      "description" : "public_net_id",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "default" : {
+        "type" : "source-default",
+        "properties" : { }
+      },
+      "input" : {
+        "type" : "source-input"
+      }
+    }
+  },
+  "sec_group" : {
+    "tags" : "sec_group",
+    "name" : "sec_group",
+    "property" : {
+      "description" : "sec_group",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "default" : {
+        "type" : "source-default",
+        "properties" : { }
+      },
+      "input" : {
+        "type" : "source-input",
+        "properties" : { }
+      }
+    }
+  },
+  "service-instance-id" : {
+    "tags" : "service-instance-id, tosca.datatypes.Root, data_type",
+    "name" : "service-instance-id",
+    "property" : {
+      "description" : "To be provided",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "input" : {
+        "type" : "source-input",
+        "properties" : { }
+      },
+      "any-db" : {
+        "type" : "source-processor-db",
+        "properties" : {
+          "query" : "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
+          "input-key-mapping" : { },
+          "output-key-mapping" : {
+            "service-instance-id" : "artifact_name"
+          }
+        }
+      },
+      "processor-db" : {
+        "type" : "source-processor-db",
+        "properties" : {
+          "query" : "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
+          "input-key-mapping" : { },
+          "output-key-mapping" : {
+            "service-instance-id" : "artifact_name"
+          }
+        }
+      },
+      "capability" : {
+        "type" : "source-capability",
+        "properties" : {
+          "script-type" : "jython",
+          "script-class-reference" : "SampleRAProcessor",
+          "instance-dependencies" : [ ]
+        }
+      }
+    }
+  },
+  "unprotected-prefix-id" : {
+    "tags" : "unprotected-prefix-id",
+    "name" : "unprotected-prefix-id",
+    "property" : {
+      "description" : "unprotected-prefix-id",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "processor-db" : {
+        "type" : "source-processor-db",
+        "properties" : {
+          "type" : "SQL",
+          "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"unprotected\"",
+          "output-key-mapping" : {
+            "unprotected-prefix-id" : "prefix_id"
+          }
+        }
+      }
+    }
+  },
+  "unprotected_private_net_cidr" : {
+    "tags" : "unprotected_private_net_cidr",
+    "name" : "unprotected_private_net_cidr",
+    "property" : {
+      "description" : "unprotected_private_net_cidr",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "processor-db" : {
+        "type" : "source-processor-db",
+        "properties" : {
+          "type" : "SQL",
+          "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"unprotected\"",
+          "output-key-mapping" : {
+            "unprotected_private_net_cidr" : "prefix"
+          }
+        }
+      }
+    }
+  },
+  "vf-module-id" : {
+    "tags" : "vf-module-id",
+    "name" : "vf-module-id",
+    "property" : {
+      "description" : "vf-module-id",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "input" : {
+        "type" : "source-input",
+        "properties" : { }
+      }
+    }
+  },
+  "vf-module-label" : {
+    "tags" : "vf-module-label",
+    "name" : "vf-module-label",
+    "property" : {
+      "description" : "vf-module-label",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "processor-db" : {
+        "type" : "source-processor-db",
+        "properties" : {
+          "type" : "SQL",
+          "query" : "select sdnctl.VF_MODULE_MODEL.vf_module_label as vf_module_label from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
+          "input-key-mapping" : {
+            "customizationid" : "vf-module-model-customization-uuid"
+          },
+          "output-key-mapping" : {
+            "vf-module-label" : "vf_module_label"
+          },
+          "key-dependencies" : [ "vf-module-model-customization-uuid" ]
+        }
+      }
+    }
+  },
+  "vf-module-model-customization-uuid" : {
+    "tags" : "vf-module-model-customization-uuid",
+    "name" : "vf-module-model-customization-uuid",
+    "property" : {
+      "description" : "vf-module-model-customization-uuid",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "input" : {
+        "type" : "source-input",
+        "properties" : { }
+      }
+    }
+  },
+  "vf-module-type" : {
+    "tags" : "vf-module-type",
+    "name" : "vf-module-type",
+    "property" : {
+      "description" : "vf-module-type",
+      "type" : "string"
+    },
+    "updated-by" : "adetalhouet",
+    "sources" : {
+      "processor-db" : {
+        "type" : "source-processor-db",
+        "properties" : {
+          "type" : "SQL",
+          "query" : "select sdnctl.demo.value as value from sdnctl.demo where sdnctl.demo.id=:vfmoduleid",
+          "input-key-mapping" : {
+            "vfmoduleid" : "vf-module-number"
+          },
+          "output-key-mapping" : {
+            "vf-module-type" : "value"
+          },
+          "key-dependencies" : [ "vf-module-number" ]
+        }
+      }
+    }
+  },
+  "vf-naming-policy" : {
+    "tags" : "vf-naming-policy",
+    "name" : "vf-naming-policy",
+    "property" : {
+      "description" : "vf-naming-policy",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "default" : {
+        "type" : "source-default",
+        "properties" : { }
+      },
+      "processor-db" : {
+        "type" : "source-processor-db",
+        "properties" : {
+          "type" : "SQL",
+          "query" : "select sdnctl.VF_MODEL.naming_policy as vf_naming_policy from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnf_model_customization_uuid",
+          "input-key-mapping" : {
+            "vnf_model_customization_uuid" : "vnf-model-customization-uuid"
+          },
+          "output-key-mapping" : {
+            "vf-naming-policy" : "vf_naming_policy"
+          },
+          "key-dependencies" : [ "vnf-model-customization-uuid" ]
+        }
+      }
+    }
+  },
+  "vf-nf-code" : {
+    "tags" : "vf-nf-code",
+    "name" : "vf-nf-code",
+    "property" : {
+      "description" : "vf-nf-code",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "processor-db" : {
+        "type" : "source-processor-db",
+        "properties" : {
+          "type" : "SQL",
+          "query" : "select sdnctl.VF_MODEL.nf_code as vf_nf_code from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:customizationid",
+          "input-key-mapping" : {
+            "customizationid" : "vnf-model-customization-uuid"
+          },
+          "output-key-mapping" : {
+            "vf-nf-code" : "vf_nf_code"
+          },
+          "key-dependencies" : [ "vnf-model-customization-uuid" ]
+        }
+      }
+    }
+  },
+  "vf_module_name" : {
+    "tags" : "vf_module_name",
+    "name" : "vf_module_name",
+    "property" : {
+      "description" : "vf_module_name",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "input" : {
+        "type" : "source-input",
+        "properties" : { }
+      }
+    }
+  },
+  "vfccustomizationuuid" : {
+    "tags" : "vfccustomizationuuid, tosca.datatypes.Root, data_type",
+    "name" : "vfccustomizationuuid",
+    "property" : {
+      "description" : "vfccustomizationuuid",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "processor-db" : {
+        "type" : "source-processor-db",
+        "properties" : {
+          "type" : "SQL",
+          "query" : "select sdnctl.VF_MODULE_TO_VFC_MAPPING.vfc_customization_uuid as vnf_customid from sdnctl.VF_MODULE_TO_VFC_MAPPING where vm_count = 1 and sdnctl.VF_MODULE_TO_VFC_MAPPING.vf_module_customization_uuid=:vfmodulecustomizationuuid",
+          "input-key-mapping" : {
+            "vfmodulecustomizationuuid" : "vf-module-model-customization-uuid"
+          },
+          "output-key-mapping" : {
+            "vfccustomizationuuid" : "vnf_customid"
+          },
+          "key-dependencies" : [ "vf-module-model-customization-uuid" ]
+        }
+      }
+    }
+  },
+  "vfw_name_0" : {
+    "tags" : "vfw_name_0",
+    "name" : "vfw_name_0",
+    "property" : {
+      "description" : "vfw_name_0",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "input" : {
+        "type" : "source-input",
+        "properties" : { }
+      }
+    }
+  },
+  "vfw_private_ip_0" : {
+    "tags" : "vfw_private_ip_0",
+    "name" : "vfw_private_ip_0",
+    "property" : {
+      "description" : "vfw_private_ip_0",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "input" : {
+        "type" : "source-input",
+        "properties" : { }
+      },
+      "primary-config-data" : {
+        "type" : "source-rest",
+        "properties" : {
+          "type" : "JSON",
+          "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/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"
+          },
+          "output-key-mapping" : {
+            "vfw_private_ip_0" : "value"
+          },
+          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+        }
+      }
+    }
+  },
+  "vfw_private_ip_1" : {
+    "tags" : "vfw_private_ip_1",
+    "name" : "vfw_private_ip_1",
+    "property" : {
+      "description" : "vfw_private_ip_1",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "input" : {
+        "type" : "source-input",
+        "properties" : { }
+      },
+      "primary-config-data" : {
+        "type" : "source-rest",
+        "properties" : {
+          "type" : "JSON",
+          "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/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"
+          },
+          "output-key-mapping" : {
+            "vfw_private_ip_1" : "value"
+          },
+          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+        }
+      }
+    }
+  },
+  "vfw_private_ip_2" : {
+    "tags" : "vfw_private_ip_2",
+    "name" : "vfw_private_ip_2",
+    "property" : {
+      "description" : "vfw_private_ip_2",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "input" : {
+        "type" : "source-input"
+      }
+    }
+  },
+  "vm-type" : {
+    "tags" : "vm-type",
+    "name" : "vm-type",
+    "property" : {
+      "description" : "vm-type",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "processor-db" : {
+        "type" : "source-processor-db",
+        "properties" : {
+          "type" : "SQL",
+          "query" : "select VFC_MODEL.vm_type as vm_type from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
+          "input-key-mapping" : {
+            "vfccustomizationuuid" : "vfccustomizationuuid"
+          },
+          "output-key-mapping" : {
+            "vm-type" : "vm_type"
+          },
+          "key-dependencies" : [ "vfccustomizationuuid" ]
+        }
+      }
+    }
+  },
+  "vnf-id" : {
+    "tags" : "vnf-id",
+    "name" : "vnf-id",
+    "property" : {
+      "description" : "vnf-id",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "input" : {
+        "type" : "source-input",
+        "properties" : { }
+      }
+    }
+  },
+  "vnf-model-customization-uuid" : {
+    "tags" : "vnf-model-customization-uuid",
+    "name" : "vnf-model-customization-uuid",
+    "property" : {
+      "description" : "vnf-model-customization-uuid",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "input" : {
+        "type" : "source-input",
+        "properties" : { }
+      }
+    }
+  },
+  "vnf-name" : {
+    "tags" : "vnf-name, tosca.datatypes.Root, data_type",
+    "name" : "vnf-name",
+    "property" : {
+      "description" : "vnf-name",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "primary-config-data" : {
+        "type" : "source-rest",
+        "properties" : {
+          "type" : "JSON",
+          "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf_name",
+          "path" : "/param/0/value",
+          "expression-type" : "JSON_POINTER",
+          "input-key-mapping" : {
+            "service-instance-id" : "service-instance-id",
+            "vnf-id" : "vnf-id"
+          },
+          "output-key-mapping" : {
+            "vnf-name" : "value"
+          },
+          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+        }
+      }
+    }
+  },
+  "vnf_name" : {
+    "tags" : "vnf_name",
+    "name" : "vnf_name",
+    "property" : {
+      "description" : "vnf_name",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "default" : {
+        "type" : "source-default",
+        "properties" : { }
+      },
+      "input" : {
+        "type" : "source-input",
+        "properties" : { }
+      },
+      "primary-config-data" : {
+        "type" : "source-rest",
+        "properties" : {
+          "type" : "JSON",
+          "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf_name",
+          "path" : "/param/0/value",
+          "input-key-mapping" : {
+            "service-instance-id" : "service-instance-id",
+            "vnf-id" : "vnf-id"
+          },
+          "output-key-mapping" : {
+            "vnf_name" : "value"
+          },
+          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+        }
+      }
+    }
+  },
+  "vnfc-model-invariant-uuid" : {
+    "tags" : "vnfc-model-invariant-uuid",
+    "name" : "vnfc-model-invariant-uuid",
+    "property" : {
+      "description" : "vnfc-model-invariant-uuid for SRIOV VPE template",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "processor-db" : {
+        "type" : "source-processor-db",
+        "properties" : {
+          "type" : "SQL",
+          "query" : "select VFC_MODEL.invariant_uuid as vfc_invariant_uuid from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
+          "input-key-mapping" : {
+            "vfccustomizationuuid" : "vfccustomizationuuid"
+          },
+          "output-key-mapping" : {
+            "vnfc-model-invariant-uuid" : "vfc_invariant_uuid"
+          },
+          "key-dependencies" : [ "vfccustomizationuuid" ]
+        }
+      }
+    }
+  },
+  "vnfc-model-version" : {
+    "tags" : "vnfc-model-version",
+    "name" : "vnfc-model-version",
+    "property" : {
+      "description" : "vnfc-model-version for  SRIOV VPE template",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "processor-db" : {
+        "type" : "source-processor-db",
+        "properties" : {
+          "type" : "SQL",
+          "query" : "select VFC_MODEL.version as vnfc_model_version from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
+          "input-key-mapping" : {
+            "vfccustomizationuuid" : "vfccustomizationuuid"
+          },
+          "output-key-mapping" : {
+            "vnfc-model-version" : "vnfc_model_version"
+          },
+          "key-dependencies" : [ "vfccustomizationuuid" ]
+        }
+      }
+    }
+  },
+  "vpg_name_0" : {
+    "tags" : "vpg_name_0",
+    "name" : "vpg_name_0",
+    "property" : {
+      "description" : "vpg_name_0",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "input" : {
+        "type" : "source-input",
+        "properties" : { }
+      }
+    }
+  },
+  "vpg_private_ip_0" : {
+    "tags" : "vpg_private_ip_0",
+    "name" : "vpg_private_ip_0",
+    "property" : {
+      "description" : "vpg_private_ip_0",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "input" : {
+        "type" : "source-input",
+        "properties" : { }
+      },
+      "primary-config-data" : {
+        "type" : "source-rest",
+        "properties" : {
+          "type" : "JSON",
+          "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/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"
+          },
+          "output-key-mapping" : {
+            "vpg_private_ip_0" : "value"
+          },
+          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+        }
+      }
+    }
+  },
+  "vpg_private_ip_1" : {
+    "tags" : "vpg_private_ip_1",
+    "name" : "vpg_private_ip_1",
+    "property" : {
+      "description" : "vpg_private_ip_1",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "input" : {
+        "type" : "source-input",
+        "properties" : { }
+      }
+    }
+  },
+  "vsn_name_0" : {
+    "tags" : "vsn_name_0",
+    "name" : "vsn_name_0",
+    "property" : {
+      "description" : "vsn_name_0",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "input" : {
+        "type" : "source-input",
+        "properties" : { }
+      }
+    }
+  },
+  "vsn_private_ip_0" : {
+    "tags" : "vsn_private_ip_0",
+    "name" : "vsn_private_ip_0",
+    "property" : {
+      "description" : "vsn_private_ip_0",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "input" : {
+        "type" : "source-input",
+        "properties" : { }
+      },
+      "primary-config-data" : {
+        "type" : "source-rest",
+        "properties" : {
+          "type" : "JSON",
+          "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/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"
+          },
+          "output-key-mapping" : {
+            "vsn_private_ip_0" : "value"
+          },
+          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+        }
+      }
+    }
+  },
+  "vsn_private_ip_1" : {
+    "tags" : "vsn_private_ip_1",
+    "name" : "vsn_private_ip_1",
+    "property" : {
+      "description" : "vsn_private_ip_1",
+      "type" : "string"
+    },
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
+    "sources" : {
+      "input" : {
+        "type" : "source-input"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_spinup.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_spinup.json
index e1d9be006..a4d90adfe 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_spinup.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_spinup.json
@@ -1,3613 +1,102 @@
 {
   "metadata": {
-    "template_author": "aa0419",
+    "template_author": "Alexis de Talhouët",
+    "author-email": "adetalhouet89@gmail.com",
+    "user-groups": "ADMIN, OPERATION",
     "template_name": "vFW_spinup",
     "template_version": "1.0.0",
-    "service-type": "vFW",
-    "template_tags": "vFW, ONAP",
-    "release": "1810",
-    "vnf-type": "VFW"
+    "template_tags": "vFW"
   },
   "topology_template": {
-    "inputs": {
-      "request-id": {
-        "required": true,
-        "type": "string"
-      },
-      "service-instance-id": {
-        "required": true,
-        "type": "string"
-      },
-      "scope-type": {
-        "required": true,
-        "type": "string"
-      },
-      "action-name": {
-        "required": true,
-        "type": "string"
-      },
-      "hostname": {
-        "required": true,
-        "type": "string"
-      },
-      "resource-assignment-request": {
-        "description": "This is Dynamic Data type for the receipe resource-assignment-action.",
-        "required": false,
-        "type": "dt-resource-assignment-request"
-      }
-    },
-    "node_templates": {
-      "resource-assignment-ra-component": {
-        "type": "component-resource-assignment",
-        "interfaces": {
-          "ResourceAssignmentComponent": {
-            "operations": {
-              "process": {
-                "inputs": {
-                  "action-name": "{ \"get_input\" : \"action-name\" }",
-                  "service-template-name": "{ \"get_attribute\" : \"service-template-name\" }",
-                  "template-names": [
-                    "vFW_vNF_Artifact",
-                    "base_template",
-                    "vfw",
-                    "vsn",
-                    "vpg"
-                  ],
-                  "service-template-version": "{ \"get_attribute\" : \"service-template-version\" }",
-                  "resource-type": "vnf-type",
-                  "request-id": "{ \"get_input\" : \"request-id\" }",
-                  "resource-id": "{ \"get_input\" : \"hostname\" }"
-                },
-                "outputs": {
-                  "resource-assignment-params": "Success",
-                  "status": "status"
-                }
-              }
+    "workflows": {
+      "resource-assignment": {
+        "steps": {
+          "resource-assignment": {
+            "description": "Resource Assign Workflow",
+            "target": "resource-assignment"
+          }
+        },
+        "inputs" : {
+          "template-prefix" : {
+            "required" : true,
+            "type" : "list",
+            "entry_schema" : {
+              "type" : "string"
+            }
+          }
+        },
+        "outputs": {
+          "meshed-template": {
+            "type": "json",
+            "value": {
+              "get_attribute": [
+                "resource-assignment",
+                "assignment-params"
+              ]
             }
           }
-        },
-        "capabilities": {
-          "component-node": {
-            
-          }
         }
-      },
-      "resource-assignment-action": {
-        "type": "dg-resource-assignment",
-        "properties": {
-          "mode": "sync",
-          "version": "LATEST",
-          "is-start-flow": false
-        },
-        "interfaces": {
-          "CONFIG": {
-            "operations": {
-              "ResourceAssignment": {
-                "inputs": {
-                  "params": [
-                    
-                  ]
+      }
+    },
+    "node_templates": {
+      "resource-assignment" : {
+        "type" : "component-resource-resolution",
+        "interfaces" : {
+          "ResourceResolutionComponent" : {
+            "operations" : {
+              "process" : {
+                "inputs" : {
+                  "artifact-prefix-names" : {
+                    "get_input" : "artifact-name"
+                  }
                 }
               }
             }
           }
         },
-        "capabilities": {
-          "dg-node": {
-            
+        "artifacts": {
+          "base-template": {
+            "type": "artifact-template-velocity",
+            "file": "Templates/base-template.vtl"
           },
-          "content": {
-            "properties": {
-              "type": "json"
-            }
-          }
-        },
-        "requirements": {
-          "component-dependency": {
-            "capability": "component-node",
-            "node": "resource-assignment-ra-component",
-            "relationship": "tosca.relationships.DependsOn"
-          }
-        }
-      },
-      "vFW_vNF_Artifact": {
-        "type": "artifact-config-template",
-        "properties": {
-          "action-names": [
-            "resource-assignment-action"
-          ]
-        },
-        "capabilities": {
-          "content": {
-            "properties": {
-              "content": "vFW_vNF_Artifact"
-            }
+          "base-mapping": {
+            "type": "artifact-mapping-resource",
+            "file": "Templates/base-mapping.json"
           },
-          "mapping": {
-            "properties": {
-              "mapping": [
-                {
-                  "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": "primary-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": "primary-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": "primary-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": "primary-db",
-                  "dependencies": [
-                    "vnf-model-customization-uuid"
-                  ],
-                  "version": 0
-                }
-              ]
-            }
-          }
-        }
-      },
-      "vfw": {
-        "type": "artifact-config-template",
-        "capabilities": {
-          "content": {
-            "properties": {
-              "content": "vfw"
-            }
+          "vfw-template": {
+            "type": "artifact-template-velocity",
+            "file": "Templates/vfw-template.vtl"
           },
-          "mapping": {
-            "properties": {
-              "mapping": [
-                {
-                  "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": "primary-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": "primary-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": "primary-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": "primary-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": "primary-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": "primary-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": "primary-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": "primary-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": "primary-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": "primary-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": "primary-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
-                }
-              ]
-            }
-          }
-        }
-      },
-      "vpg": {
-        "type": "artifact-config-template",
-        "capabilities": {
-          "content": {
-            "properties": {
-              "content": "vpg"
-            }
+          "vfw-mapping": {
+            "type": "artifact-mapping-resource",
+            "file": "Templates/vfw-mapping.json"
           },
-          "mapping": {
-            "properties": {
-              "mapping": [
-                {
-                  "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": "primary-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": "primary-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": "primary-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": "primary-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": "primary-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": "primary-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": "primary-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": "primary-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": "primary-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": "primary-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
-                }
-              ]
-            }
-          }
-        }
-      },
-      "vsn": {
-        "type": "artifact-config-template",
-        "capabilities": {
-          "content": {
-            "properties": {
-              "content": "vsn"
-            }
+          "vfw-vnf-template": {
+            "type": "artifact-template-velocity",
+            "file": "Templates/vfw-vnf-template.vtl"
           },
-          "mapping": {
-            "properties": {
-              "mapping": [
-                {
-                  "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": "primary-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": "primary-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": "primary-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": "primary-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": "primary-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": "primary-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": "primary-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": "primary-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": "primary-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": "primary-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": "primary-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": "primary-db",
-                  "dependencies": [
-                    
-                  ],
-                  "version": 0
-                }
-              ]
-            }
-          }
-        }
-      },
-      "base_template": {
-        "type": "artifact-config-template",
-        "capabilities": {
-          "content": {
-            "properties": {
-              "content": "base_template"
-            }
+          "vfw-vnf-mapping": {
+            "type": "artifact-mapping-resource",
+            "file": "Templates/vfw-vnf-mapping.json"
           },
-          "mapping": {
-            "properties": {
-              "mapping": [
-                {
-                  "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": "primary-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": "primary-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": "primary-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": "primary-db",
-                  "dependencies": [
-                    
-                  ],
-                  "version": 0
-                }
-              ]
-            }
+          "vpg-template": {
+            "type": "artifact-template-velocity",
+            "file": "Templates/vpg-template.vtl"
+          },
+          "vpg-mapping": {
+            "type": "artifact-mapping-resource",
+            "file": "Templates/vpg-mapping.json"
+          },
+          "vsn-template": {
+            "type": "artifact-template-velocity",
+            "file": "Templates/vsn-template.vtl"
+          },
+          "vsn-mapping": {
+            "type": "artifact-mapping-resource",
+            "file": "Templates/vsn-mapping.json"
           }
         }
       }
     }
-  },
-  "node_types": {
-    "tosca.nodes.Component": {
-      "description": "This is default Component Node",
-      "version": "1.0.0",
-      "derived_from": "tosca.nodes.Root"
-    },
-    "tosca.nodes.Workflow": {
-      "description": "This is Directed Graph Node Type",
-      "version": "1.0.0",
-      "derived_from": "tosca.nodes.Root"
-    },
-    "tosca.nodes.Artifact": {
-      "description": "This is Deprecated Artifact Node Type.",
-      "version": "1.0.0",
-      "derived_from": "tosca.nodes.Root"
-    },
-    "component-resource-assignment": {
-      "description": "This is Resource Assignment Component API",
-      "version": "1.0.0",
-      "capabilities": {
-        "component-node": {
-          "type": "tosca.capabilities.Node"
-        }
-      },
-      "interfaces": {
-        "ResourceAssignmentComponent": {
-          "operations": {
-            "process": {
-              "inputs": {
-                "action-name": {
-                  "description": "Action Name of the process",
-                  "required": true,
-                  "type": "string"
-                },
-                "service-template-name": {
-                  "description": "Service Template Name.",
-                  "required": true,
-                  "type": "string"
-                },
-                "service-template-version": {
-                  "description": "Service Template Version.",
-                  "required": true,
-                  "type": "string"
-                },
-                "resource-type": {
-                  "description": "Request type.",
-                  "required": true,
-                  "type": "string"
-                },
-                "template-names": {
-                  "description": "Name of the artifact Node Templates, to get the template Content.",
-                  "required": true,
-                  "type": "list",
-                  "entry_schema": {
-                    "type": "string"
-                  }
-                },
-                "request-id": {
-                  "description": "Request Id, Unique Id for the request.",
-                  "required": true,
-                  "type": "string"
-                },
-                "resource-id": {
-                  "description": "Resource Id.",
-                  "required": true,
-                  "type": "string"
-                }
-              },
-              "outputs": {
-                "resource-assignment-params": {
-                  "required": true,
-                  "type": "string"
-                },
-                "status": {
-                  "required": true,
-                  "type": "string"
-                }
-              }
-            }
-          }
-        }
-      },
-      "derived_from": "tosca.nodes.Component"
-    },
-    "dg-resource-assignment": {
-      "description": "This is Resource Assignment Directed Graph",
-      "version": "1.0.0",
-      "properties": {
-        "mode": {
-          "required": false,
-          "type": "string",
-          "default": "sync"
-        },
-        "version": {
-          "required": false,
-          "type": "string",
-          "default": "LATEST"
-        },
-        "is-start-flow": {
-          "required": false,
-          "type": "boolean",
-          "default": "false"
-        }
-      },
-      "capabilities": {
-        "dg-node": {
-          "type": "tosca.capabilities.Node"
-        },
-        "content": {
-          "type": "tosca.capabilities.Content",
-          "properties": {
-            "type": {
-              "required": false,
-              "type": "string",
-              "default": "json"
-            },
-            "content": {
-              "required": false,
-              "type": "string"
-            }
-          }
-        }
-      },
-      "requirements": {
-        "component-dependency": {
-          "capability": "component-node",
-          "node": "component-resource-assignment",
-          "relationship": "tosca.relationships.DependsOn"
-        }
-      },
-      "interfaces": {
-        "CONFIG": {
-          "operations": {
-            "ResourceAssignment": {
-              "inputs": {
-                "params": {
-                  "required": false,
-                  "type": "list",
-                  "entry_schema": {
-                    "type": "datatype-property"
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "derived_from": "tosca.nodes.Workflow"
-    },
-    "artifact-config-template": {
-      "description": "This is Configuration Velocity Template",
-      "version": "1.0.0",
-      "properties": {
-        "action-names": {
-          "required": true,
-          "type": "list",
-          "entry_schema": {
-            "type": "string"
-          }
-        }
-      },
-      "capabilities": {
-        "content": {
-          "type": "tosca.capabilities.Content",
-          "properties": {
-            "content": {
-              "required": true,
-              "type": "string"
-            }
-          }
-        },
-        "mapping": {
-          "type": "tosca.capabilities.Mapping",
-          "properties": {
-            "mapping": {
-              "required": false,
-              "type": "list",
-              "entry_schema": {
-                "type": "datatype-resource-assignment"
-              }
-            }
-          }
-        }
-      },
-      "derived_from": "tosca.nodes.Artifact"
-    }
-  },
-  "data_types": {
-    "datatype-property": {
-      "version": "1.0.0",
-      "description": "This is Entry point Input Data Type, which is dynamic datatype, The parameter names will be populated during the Design time for each inputs",
-      "properties": {
-        "type": {
-          "required": true,
-          "type": "string"
-        },
-        "description": {
-          "required": false,
-          "type": "string"
-        },
-        "required": {
-          "required": false,
-          "type": "boolean"
-        },
-        "default": {
-          "required": false,
-          "type": "string"
-        },
-        "entry_schema": {
-          "required": false,
-          "type": "string"
-        }
-      },
-      "derived_from": "tosca.datatypes.Root"
-    },
-    "datatype-resource-assignment": {
-      "version": "1.0.0",
-      "description": "This is Resource Assignment Data Type",
-      "properties": {
-        "property": {
-          "required": true,
-          "type": "datatype-property"
-        },
-        "input-param": {
-          "required": true,
-          "type": "boolean"
-        },
-        "dictionary-name": {
-          "required": false,
-          "type": "string"
-        },
-        "dictionary-source": {
-          "required": false,
-          "type": "string"
-        },
-        "dependencies": {
-          "required": true,
-          "type": "list",
-          "entry_schema": {
-            "type": "string"
-          }
-        },
-        "status": {
-          "required": false,
-          "type": "string"
-        },
-        "message": {
-          "required": false,
-          "type": "string"
-        },
-        "updated-date": {
-          "required": false,
-          "type": "string"
-        },
-        "updated-by": {
-          "required": false,
-          "type": "string"
-        }
-      },
-      "derived_from": "tosca.datatypes.Root"
-    },
-    "dt-resource-assignment-request": {
-      "version": "1.0.0",
-      "description": "This is Dynamic Data type definition generated from resource mapping for the config template name activate-template.",
-      "properties": {
-        "password-user-ftap-nsm": {
-          "required": true,
-          "type": "string",
-          "default": "password-user-ftap"
-        },
-        "reservation-id": {
-          "required": true,
-          "type": "string",
-          "value": "123"
-        },
-        "security-manager-resource-key": {
-          "required": true,
-          "type": "string",
-          "value": "sdnc"
-        },
-        "password-user-ftap": {
-          "description": "",
-          "required": true,
-          "type": "string",
-          "status": "",
-          "constraints": [
-            {
-              
-            }
-          ],
-          "entry_schema": {
-            "type": ""
-          }
-        }
-      },
-      "derived_from": "tosca.datatypes.Dynamic"
-    }
   }
 }
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/TOSCA-Metadata/TOSCA.meta b/components/model-catalog/blueprint-model/service-blueprint/vFW/TOSCA-Metadata/TOSCA.meta
index 7918c1159..edbb54e2d 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/TOSCA-Metadata/TOSCA.meta
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/TOSCA-Metadata/TOSCA.meta
@@ -1,6 +1,6 @@
 TOSCA-Meta-File-Version: 1.0.0
 CSAR-Version: 1.0
-Created-By: ONAP
+Created-By: Alexis de Talhouët
 Entry-Definitions: Definitions/vFW_spinup.json
-Template-Tags: ONAP, vFW
+Template-Tags: test
 Content-Type: application/vnd.oasis.bpmn
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
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/nexus_artifact_repo.json b/components/model-catalog/resource-dictionary/starter-dictionary/nexus_artifact_repo.json
index 6b0a79e03..8b8884200 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/nexus_artifact_repo.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/nexus_artifact_repo.json
@@ -7,6 +7,11 @@
     "type" : "string"
   },
   "sources" : {
+    "default": {
+      "type": "source-default",
+      "properties": {
+      }
+    },
     "input" : {
       "type" : "source-input",
       "properties" : {
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/nf-role.json b/components/model-catalog/resource-dictionary/starter-dictionary/nf-role.json
index 6da5ea22f..a26b82ff2 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/nf-role.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/nf-role.json
@@ -7,8 +7,13 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-primary-db",
+    "default": {
+      "type": "source-default",
+      "properties": {
+      }
+    },
+    "processor-db" : {
+      "type" : "source-processor-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.VF_MODEL.nf_role as vf_model_role from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnfmodelcustomizationuuid",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json b/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json
index 4e1ba2b0a..710042d5f 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-primary-db",
+    "processor-db" : {
+      "type" : "source-processor-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select nfc_naming_code as nfc_naming_code from sdnctl.VFC_MODEL where customization_uuid=:vfccustomizationuuid",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json
index 42765ee94..559ec3e81 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-primary-db",
+    "processor-db" : {
+      "type" : "source-processor-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private\"",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/primary-db-source.json b/components/model-catalog/resource-dictionary/starter-dictionary/primary-db-source.json
index 26e62e85d..adba4ce3a 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/primary-db-source.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/primary-db-source.json
@@ -1,5 +1,5 @@
 {
-  "name": "primary-db-source",
+  "name": "processor-db-source",
   "property" :{
     "description": "name of the ",
     "type": "string"
@@ -7,8 +7,8 @@
   "updated-by": "brindasanth@onap.com",
   "tags": "bundle-id, brindasanth@onap.com",
   "sources": {
-    "primary-db": {
-      "type": "source-primary-db",
+    "processor-db": {
+      "type": "source-processor-db",
       "properties": {
         "query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",
         "input-key-mapping": {
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/private-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/private-prefix-id.json
index 0685401d3..3365d6685 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/private-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/private-prefix-id.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-primary-db",
+    "processor-db" : {
+      "type" : "source-processor-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private\"",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/protected-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/protected-prefix-id.json
index f6120f3fd..8ddf98737 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/protected-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/protected-prefix-id.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-primary-db",
+    "processor-db" : {
+      "type" : "source-processor-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"protected\"",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/protected_private_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/protected_private_net_cidr.json
index bb477dcb6..ac12ad28f 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/protected_private_net_cidr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/protected_private_net_cidr.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-primary-db",
+    "processor-db" : {
+      "type" : "source-processor-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"protected\"",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/public_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/public_net_id.json
index 6cc9c2e38..a4fbc9573 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/public_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/public_net_id.json
@@ -7,6 +7,11 @@
 			"description" : "public_net_id"
 		},
 		"sources": {
+			"default": {
+				"type": "source-default",
+				"properties": {
+				}
+			},
 			"input": {
 				"type": "source-input"
 			}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/sample-primary-db-source.json b/components/model-catalog/resource-dictionary/starter-dictionary/sample-primary-db-source.json
index 656841f2e..c9544edad 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/sample-primary-db-source.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/sample-primary-db-source.json
@@ -5,10 +5,10 @@
     "type": "string"

   },

   "updated-by": "brindasanth@onap.com",

-  "tags": "primary-db-source, brindasanth@onap.com",

+  "tags": "processor-db-source, brindasanth@onap.com",

   "sources": {

-    "primary-db": {

-      "type": "source-primary-db",

+    "processor-db": {

+      "type": "source-processor-db",

       "properties": {

         "query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",

         "input-key-mapping": {

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/sec_group.json b/components/model-catalog/resource-dictionary/starter-dictionary/sec_group.json
index 017ba984d..38f07e85d 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/sec_group.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/sec_group.json
@@ -7,6 +7,11 @@
     "type" : "string"
   },
   "sources" : {
+    "default": {
+      "type": "source-default",
+      "properties": {
+      }
+    },
     "input" : {
       "type" : "source-input",
       "properties" : {
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json
index 737c7577b..4aa022379 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json
@@ -12,7 +12,7 @@
       "properties" : { }
     },
     "any-db": {
-      "type": "source-primary-db",
+      "type": "source-processor-db",
       "properties": {
         "query": "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
         "input-key-mapping": {
@@ -22,8 +22,8 @@
         }
       }
     },
-    "primary-db": {
-      "type": "source-primary-db",
+    "processor-db": {
+      "type": "source-processor-db",
       "properties": {
         "query": "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
         "input-key-mapping": {
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/unprotected-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/unprotected-prefix-id.json
index c1fc541bd..7d3475d8c 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/unprotected-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/unprotected-prefix-id.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-primary-db",
+    "processor-db" : {
+      "type" : "source-processor-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"unprotected\"",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/unprotected_private_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/unprotected_private_net_cidr.json
index 604875500..60b846d7b 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/unprotected_private_net_cidr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/unprotected_private_net_cidr.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-primary-db",
+    "processor-db" : {
+      "type" : "source-processor-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"unprotected\"",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json
index faa7ea49e..e17de2bd9 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-primary-db",
+    "processor-db" : {
+      "type" : "source-processor-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.VF_MODULE_MODEL.vf_module_label as vf_module_label from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json
index dbd51bbd9..abbe8172e 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-primary-db",
+    "processor-db" : {
+      "type" : "source-processor-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select vf_module_type as vf_module_type from sdnctl.VF_MODULE_MODEL where customization_uuid=:customizationid",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-naming-policy.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-naming-policy.json
index 70792f86f..cae11172c 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-naming-policy.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-naming-policy.json
@@ -7,8 +7,13 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-primary-db",
+    "default": {
+      "type": "source-default",
+      "properties": {
+      }
+    },
+    "processor-db" : {
+      "type" : "source-processor-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.VF_MODEL.naming_policy as vf_naming_policy from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnf_model_customization_uuid",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-nf-code.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-nf-code.json
index a21982c0c..2f839ac88 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-nf-code.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-nf-code.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-primary-db",
+    "processor-db" : {
+      "type" : "source-processor-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.VF_MODEL.nf_code as vf_nf_code from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:customizationid",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json
index 9f3e7cf17..7ed76745d 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-primary-db",
+    "processor-db" : {
+      "type" : "source-processor-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.VF_MODULE_TO_VFC_MAPPING.vfc_customization_uuid as vnf_customid from sdnctl.VF_MODULE_TO_VFC_MAPPING where vm_count = 1 and sdnctl.VF_MODULE_TO_VFC_MAPPING.vf_module_customization_uuid=:vfmodulecustomizationuuid",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vm-type.json b/components/model-catalog/resource-dictionary/starter-dictionary/vm-type.json
index 9744316c0..a0bb60743 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vm-type.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vm-type.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-primary-db",
+    "processor-db" : {
+      "type" : "source-processor-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select VFC_MODEL.vm_type as vm_type from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json
index e9d8a3b48..2174914e8 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json
@@ -7,6 +7,16 @@
     "type" : "string"
   },
   "sources" : {
+    "default": {
+      "type": "source-default",
+      "properties": {
+      }
+    },
+    "input": {
+      "type": "source-input",
+      "properties": {
+      }
+    },
     "primary-config-data" : {
       "type" : "source-rest",
       "properties" : {
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-invariant-uuid.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-invariant-uuid.json
index 3d89d9dd2..40604ccdd 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-invariant-uuid.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-invariant-uuid.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-primary-db",
+    "processor-db" : {
+      "type" : "source-processor-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select VFC_MODEL.invariant_uuid as vfc_invariant_uuid from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json
index d7fb50169..75bb2e5d2 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-primary-db",
+    "processor-db" : {
+      "type" : "source-processor-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select VFC_MODEL.version as vnfc_model_version from VFC_MODEL where customization_uuid=:vfccustomizationuuid",