update vlb cds instantiation and scale out package

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

13 files changed, 2836 insertions, 4239 deletions

diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json
index 43b0f9dd0..62f043d39 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json
@@ -1,409 +1,486 @@
-[
-  {
-    "name": "service-instance-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "service-instance-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-    {
-    "name": "vf-module-name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vf-module-name}"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-name",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-module-label",
-    "property": {
-      "description": "",
-      "required": false,
-      "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": "vf-naming-policy",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-	  },
-    "input-param": false,
-    "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-	  "service-instance-id",
-      "vnf-id"
-	],
-    "version": 0
-  },
-  {
-    "name": "vf-module-type",
-    "property": {
-      "description": "",
-      "required": false,
-      "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": false,
-      "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": false,
-      "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": false,
-      "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": false,
-      "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": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "aic-cloud-region",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vlb_private_net_cidr",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_private_net_cidr",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "pktgen_private_net_cidr",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "pktgen_private_net_cidr",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "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": "sdnc",
-    "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": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-   {
-    "name": "int_pktgen_private_subnet_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${int_pktgen_private_subnet_id}"
-    },
-    "input-param": false,
-    "dictionary-name": "int_pktgen_private_subnet_id",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },  
-  {
-    "name": "int_private_subnet_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${int_private_subnet_id}"
-    },
-    "input-param": false,
-    "dictionary-name": "int_private_subnet_id",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-   {
-    "name": "int_private_net_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${int_private_net_id}"
-    },
-    "input-param": false,
-    "dictionary-name": "int_private_net_id",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "int_pktgen_private_net_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${int_pktgen_private_net_id}"
-    },
-    "input-param": false,
-    "dictionary-name": "int_pktgen_private_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": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  }
+[{
+		"name": "service-instance-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "service-instance-id",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+		{
+		"name": "vf-module-assign",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"metadata": {
+				"transform-template": "${vf-module-assign}_${vnf_name}_${service-instance-id}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-assign",
+		"dictionary-source": "aai-data",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id",
+			"vf-module-name"
+		],
+		"version": 0
+	},
+	{
+		"name": "int_pktgen_private_net_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "int_pktgen_private_net_id",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id",
+			"vnf_name"
+		],
+		"version": 0
+	},
+	{
+		"name": "int_pktgen_private_subnet_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "int_pktgen_private_subnet_id",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id",
+			"vnf_name"
+		],
+		"version": 0
+	},
+	{
+		"name": "int_private_net_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "int_private_net_id",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id",
+			"vnf_name"
+		],
+		"version": 0
+	},
+	{
+		"name": "int_private_subnet_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "int_private_subnet_id",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id",
+			"vnf_name"
+		],
+		"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": "rest",
+		"dependencies": ["vnf_name", "vf-module-label", "vf-module-type", "vf-naming-policy", "vf-module-id"],
+		"version": 0
+	},
+	{
+		"name": "vlb_private_net_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"default": "private1"
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_private_net_id",
+		"dictionary-source": "default",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "pktgen_private_net_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"default": "private2"
+		},
+		"input-param": false,
+		"dictionary-name": "pktgen_private_net_id",
+		"dictionary-source": "default",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vf-module-label",
+		"property": {
+			"description": "",
+			"required": false,
+			"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": "vf-naming-policy",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-naming-policy",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vf-module-type",
+		"property": {
+			"description": "",
+			"required": false,
+			"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": false,
+			"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": false,
+			"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": false,
+			"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": false,
+			"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": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "aic-cloud-region",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vlb_private_net_cidr",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_private_net_cidr",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "pktgen_private_net_cidr",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "pktgen_private_net_cidr",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"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": "sdnc",
+		"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": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vlb_0_int_pktgen_private_port_0_mac",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_0_int_pktgen_private_port_0_mac",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vpg_0_int_pktgen_private_port_0_mac",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vpg_0_int_pktgen_private_port_0_mac",
+		"dictionary-source": "sdnc",
+		"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": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	}
 ]
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-template.vtl
deleted file mode 100644
index 58512be2f..000000000
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-template.vtl
+++ /dev/null
@@ -1,144 +0,0 @@
-{
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "service-instance-id",
-      "param-value": "${service-instance-id}"
-    },
-    {
-      "param-name": "vnf_id",
-      "param-value": "${vnf-id}"
-    },
-    {
-      "param-name": "vnf_name",
-      "param-value": "${vnf_name}"
-    },
-    {
-      "param-name": "vnf_model_customization_uuid",
-      "param-value": "${vnf-model-customization-uuid}"
-    },
-    {
-      "param-name": "vf_module_id",
-      "param-value": "${vf-module-id}"
-    },
-    {
-      "param-name": "vf_module_type",
-      "param-value": "${vf-module-type}"
-    },
-    {
-      "param-name": "vlb_private_net_id",
-      "param-value": "private1"
-    },
-    {
-      "param-name": "pktgen_private_net_id",
-      "param-value": "private2"
-    },
-    {
-      "param-name": "vlb_private_net_cidr",
-      "param-value": "${vlb_private_net_cidr}"
-    },
-    {
-      "param-name": "vlb_0_int_pktgen_private_port_0_mac",
-      "param-value": "fa:16:3e:00:00:10"
-    },
-    {
-      "param-name": "vpg_0_int_pktgen_private_port_0_mac",
-      "param-value": "fa:16:3e:00:00:20"
-    },
-    {
-      "param-name": "pktgen_private_net_cidr",
-      "param-value": "${pktgen_private_net_cidr}"
-    },
-    {
-      "param-name": "int_pktgen_private_net_id",
-      "param-value": "${vnf_name}_private2"
-    },
-    {
-      "param-name": "int_pktgen_private_subnet_id",
-      "param-value": "${vnf_name}_private2_subnet"
-    },
-    {
-      "param-name": "int_private_net_id",
-      "param-value": "${vnf_name}_private1"
-    },
-    {
-      "param-name": "int_private_subnet_id",
-      "param-value": "${vnf_name}_private1_subnet"
-    },
-    {
-      "param-name": "key_name",
-      "param-value": "${key_name}"
-    },
-    {
-      "param-name": "pub_key",
-      "param-value": "${pub_key}"
-    }
-  ],
-  "capability-data": [
-    {
-      "capability-name": "generate-name",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vf-module-name"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vf-module-name}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vf-module-name"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VF-MODULE"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "VF_MODULE_LABEL",
-              "param-value": "${vf-module-label}"
-            },
-            {
-              "param-name": "VF_MODULE_TYPE",
-              "param-value": "${vf-module-type}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vf-module-name",
-              "resource-value": "${vf-module-name}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "aai-vf-module-put",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "vf-module",
-              "param-value": "vf-module"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "aai-vf-module-put",
-              "resource-value": "${status}"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-template.vtl
index 10e448466..e20c21bd0 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-template.vtl
@@ -1,9 +1,9 @@
-<vlb-business-vnf-onap-plugin xmlns="urn:opendaylight:params:xml:ns:yang:vlb-business-vnf-onap-plugin">
-<vdns-instances>
-<vdns-instance>
-<ip-addr>$vdns_int_private_ip_0</ip-addr>
-<oam-ip-addr>$vdns_onap_private_ip_0</oam-ip-addr>
-<enabled>false</enabled>
-</vdns-instance>
-</vdns-instances>
-</vlb-business-vnf-onap-plugin>
+	{
+    "vdns-instance": [
+        {
+            "ip-addr": "$vdns_int_private_ip_0",
+            "oam-ip-addr": "$vdns_onap_private_ip_0",
+            "enabled": true
+        }
+    ]
+}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-template.vtl
index d33625739..e20c21bd0 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-template.vtl
@@ -1,9 +1,9 @@
-<vlb-business-vnf-onap-plugin xmlns="urn:opendaylight:params:xml:ns:yang:vlb-business-vnf-onap-plugin">
-<vdns-instances>
-<vdns-instance>
-<ip-addr>$vdns_int_private_ip_0</ip-addr>
-<oam-ip-addr>$vdns_onap_private_ip_0</oam-ip-addr>
-<enabled>true</enabled>
-</vdns-instance>
-</vdns-instances>
-</vlb-business-vnf-onap-plugin>
+	{
+    "vdns-instance": [
+        {
+            "ip-addr": "$vdns_int_private_ip_0",
+            "oam-ip-addr": "$vdns_onap_private_ip_0",
+            "enabled": true
+        }
+    ]
+}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json
index 9cf71fc59..3efc6fe8b 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json
@@ -39,6 +39,7 @@
     "dependencies": [],
     "version": 0
   },
+
   {
     "name": "ip",
     "property": {
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json
index 2dee19ccb..ba5ed5b9b 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json
@@ -1,817 +1,752 @@
-[
-  {
-    "name": "cloud_env",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "cloud_env",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-    {
-    "name": "create-md-sal-vnf-param",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "create-md-sal-vnf-param",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-       "service-instance-id",
-	  "vnf-id",
-	  "vf-module-id"
-    ],
-    "version": 0
-  },
-     
-  {
-    "name": "private1-prefix-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "private1-prefix-id",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  },
-    {
-    "name": "management-prefix-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "management-prefix-id",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "onap_private_net_cidr",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "onap_private_net_cidr",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vf-module-name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vf-module-name}"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-name",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "install_script_version",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-	
-    },
-    "input-param": false,
-    "dictionary-name": "install_script_version",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-	 "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "keypair",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "vlb_key"
-    },
-    "input-param": false,
-    "dictionary-name": "keypair",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "nb_api_version",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "1.2.0"
-    },
-    "input-param": false,
-    "dictionary-name": "nb_api_version",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "nexus_artifact_repo",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "https://nexus.onap.org"
-    },
-    "input-param": false,
-    "dictionary-name": "nexus_artifact_repo",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "nfc-naming-code",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "nfc-naming-code",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vfccustomizationuuid"
-    ],
-    "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": "sdnc",
-    "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": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "public_net_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "public_net_id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "sec_group",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "sec_group",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "service-instance-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "service-instance-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vdns_flavor_name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "m1.medium"
-    },
-    "input-param": false,
-   "dictionary-name": "flavor_name",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-	  "service-instance-id",
-      "vnf-id"
-	],
-    "version": 0
-  },
-  
-  {
-    "name": "vdns_name_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vdns_name_0}"
-    },
-    "input-param": false,
-    "dictionary-name": "vdns_name_0",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-    {
-    "name": "vdns_int_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vdns_int_private_ip_0}"
-    },
-    "input-param": false,
-    "dictionary-name": "vdns_int_private_ip_0",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vdns_onap_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vdns_onap_private_ip_0}"
-    },
-    "input-param": false,
-    "dictionary-name": "vdns_onap_private_ip_0",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-module-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-module-label",
-    "property": {
-      "description": "",
-      "required": false,
-      "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": "vf-module-model-customization-uuid",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-model-customization-uuid",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-module-type",
-    "property": {
-      "description": "",
-      "required": false,
-      "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-naming-policy",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-	  },
-    "input-param": false,
-    "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-	  "service-instance-id",
-      "vnf-id"
-	],
-    "version": 0
-  },
-  
-  {
-    "name": "vfccustomizationuuid",
-    "property": {
-      "description": "",
-      "required": false,
-      "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": "vlb_int_pktgen_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_int_pktgen_private_ip_0",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vlb_int_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_int_private_ip_0",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vlb_onap_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_onap_private_ip_0",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vlb_private_net_cidr",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_private_net_cidr",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "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": "vnf-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "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": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vnf-model-customization-uuid",
-    "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": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vnfc-model-invariant-uuid",
-    "property": {
-      "description": "",
-      "required": false,
-      "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": "vdns_image_name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-	  },
-    "input-param": false,
-    "dictionary-name": "image_name",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-	  "service-instance-id",
-      "vnf-id"
-	  ],
-    "version": 0
-  },
-  {
-    "name": "vnfc-model-version",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vnfc-model-version",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vfccustomizationuuid"
-    ],
-    "version": 0
-  }
+[{
+		"name": "cloud_env",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "cloud_env",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+		{
+		"name": "vf-module-assign",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+									"metadata": {
+				"transform-template": "${vf-module-assign}_${service-instance-id}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-assign",
+		"dictionary-source": "aai-data",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id",
+			"vf-module-name"
+		],
+		"version": 0
+	},
+	{
+		"name": "create-md-sal-vnf-param",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "create-md-sal-vnf-param",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id",
+			"vf-module-id"
+		],
+		"version": 0
+	},
+
+	{
+		"name": "private1-prefix-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "private1-prefix-id",
+		"dictionary-source": "processor-db",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "management-prefix-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "management-prefix-id",
+		"dictionary-source": "processor-db",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "onap_private_net_cidr",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "onap_private_net_cidr",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"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": "rest",
+		"dependencies": ["vnf_name", "vf-module-label", "vf-module-type", "vf-naming-policy", "vf-module-id"],
+		"version": 0
+	},
+	{
+		"name": "install_script_version",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+
+		},
+		"input-param": false,
+		"dictionary-name": "install_script_version",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+
+	{
+		"name": "nb_api_version",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "nb_api_version",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "nexus_artifact_repo",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "nexus_artifact_repo",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "nfc-naming-code",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "nfc-naming-code",
+		"dictionary-source": "processor-db",
+		"dependencies": [
+			"vfccustomizationuuid"
+		],
+		"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": "sdnc",
+		"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": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "public_net_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "public_net_id",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "sec_group",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "sec_group",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "service-instance-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "service-instance-id",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vdns_flavor_name",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "flavor_name",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+
+	{
+		"name": "vdns_name_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vdns_name_0",
+		"dictionary-source": "rest",
+		"dependencies": ["vf-module-id","vf-module-name", "vf-module-label", "nfc-naming-code", "vf-naming-policy"],
+		"version": 0
+	},
+	{
+		"name": "vdns_int_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"metadata": {
+				"transform-template": "${vdns_int_private_ip_0.replaceAll(\"/.+\", \"\")}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vdns_int_private_ip_0",
+		"dictionary-source": "rest",
+		"dependencies": ["private1-prefix-id"],
+		"version": 0
+	},
+	{
+		"name": "vdns_onap_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"metadata": {
+				"transform-template": "${vdns_onap_private_ip_0.replaceAll(\"/.+\", \"\")}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vdns_onap_private_ip_0",
+		"dictionary-source": "rest",
+		"dependencies": ["management-prefix-id"],
+		"version": 0
+	},
+	{
+		"name": "vf-module-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-id",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vf-module-label",
+		"property": {
+			"description": "",
+			"required": false,
+			"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": "vf-module-model-customization-uuid",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-model-customization-uuid",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vf-module-type",
+		"property": {
+			"description": "",
+			"required": false,
+			"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-naming-policy",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-naming-policy",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+
+	{
+		"name": "vfccustomizationuuid",
+		"property": {
+			"description": "",
+			"required": false,
+			"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": "vlb_int_pktgen_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_int_pktgen_private_ip_0",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vlb_int_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_int_private_ip_0",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vlb_onap_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_onap_private_ip_0",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vlb_private_net_cidr",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_private_net_cidr",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"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": "vnf-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"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": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vnf-model-customization-uuid",
+		"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": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vnfc-model-invariant-uuid",
+		"property": {
+			"description": "",
+			"required": false,
+			"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": "vdns_image_name",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "image_name",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vnfc-model-version",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vnfc-model-version",
+		"dictionary-source": "processor-db",
+		"dependencies": [
+			"vfccustomizationuuid"
+		],
+		"version": 0
+	}
 ]
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-template.vtl
deleted file mode 100644
index 84fab0d63..000000000
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-template.vtl
+++ /dev/null
@@ -1,302 +0,0 @@
-{
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "service-instance-id",
-      "param-value": "${service-instance-id}"
-    },
-    {
-      "param-name": "vnf_id",
-      "param-value": "${vnf-id}"
-    },
-    {
-      "param-name": "vnf_name",
-      "param-value": "${vnf_name}"
-    },
-    {
-      "param-name": "vnf_model_customization_uuid",
-      "param-value": "${vnf-model-customization-uuid}"
-    },
-    {
-      "param-name": "vf_module_id",
-      "param-value": "${vf-module-id}"
-    },
-    {
-      "param-name": "vf_module_type",
-      "param-value": "${vf-module-type}"
-    },
-    {
-      "param-name": "vf_module_customization_uuid",
-      "param-value": "${vf-module-model-customization-uuid}"
-    },
-    {
-      "param-name": "vfc_customization_uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "aic-cloud-region",
-      "param-value": "${aic-cloud-region}"
-    },
-    {
-      "param-name": "vm-type",
-      "param-value": "${vm-type}"
-    },
-    {
-      "param-name": "vnfc-model-customization-uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "vnfc-model-invariant-uuid",
-      "param-value": "${vnfc-model-invariant-uuid}"
-    },
-    {
-      "param-name": "vnfc-model-version",
-      "param-value": "${vnfc-model-version}"
-    },
-    {
-      "param-name": "nfc-function",
-      "param-value": "${nf-role}"
-    },
-    {
-      "param-name": "nfc-naming-code",
-      "param-value": "${nfc-naming-code}"
-    },
-    {
-      "param-name": "cloud_env",
-      "param-value": "openstack"
-    },
-    {
-      "param-name": "nexus_artifact_repo",
-      "param-value": "https://nexus.onap.org"
-    },
-    {
-      "param-name": "vdns_image_name",
-      "param-value": "${vdns_image_name}"
-    },
-    {
-      "param-name": "vdns_flavor_name",
-      "param-value": "m1.medium"
-    },
-	{
-      "param-name": "install_script_version",
-      "param-value": "${install_script_version}"
-    },
-    {
-      "param-name": "key_name",
-      "param-value": "${key_name}"
-    },
-    {
-      "param-name": "pub_key",
-      "param-value": "${pub_key}"
-    },
-    {
-      "param-name": "public_net_id",
-      "param-value": "${public_net_id}"
-    },
-    {
-      "param-name": "vlb_int_private_ip_0",
-      "param-value": "${vlb_int_private_ip_0}"
-    },
-    {
-      "param-name": "vlb_onap_private_ip_0",
-      "param-value": "${vlb_onap_private_ip_0}"
-    },
-    {
-      "param-name": "vlb_int_pktgen_private_ip_0",
-      "param-value": "${vlb_int_pktgen_private_ip_0}"
-    },
-    {
-      "param-name": "vlb_private_net_cidr",
-      "param-value": "${vlb_private_net_cidr}"
-    },
-  
-    
-    {
-      "param-name": "onap_private_net_id",
-      "param-value": "${onap_private_net_id}"
-    },
-    {
-      "param-name": "onap_private_subnet_id",
-      "param-value": "${onap_private_subnet_id}"
-    },
-    {
-      "param-name": "onap_private_net_cidr",
-      "param-value": "${onap_private_net_cidr}"
-    },
-    {
-      "param-name": "pktgen_private_net_cidr",
-      "param-value": "${pktgen_private_net_cidr}"
-    },
-    {
-      "param-name": "sec_group",
-      "param-value": "${sec_group}"
-    },
-    {
-      "param-name": "nb_api_version",
-      "param-value": "1.2.0"
-    }
-    
-  ],
-  "capability-data": [
-    {
-      "capability-name": "generate-name",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vdns_name_0"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vdns_name_0}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vdns_name_0"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VNFC"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "NFC_NAMING_CODE",
-              "param-value": "${nfc-naming-code}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vdns_name_0",
-              "resource-value": "${vdns_name_0}"
-            }
-          ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vf-module-name"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vf-module-name}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vf-module-name"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VF-MODULE"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "VF_MODULE_LABEL",
-              "param-value": "${vf-module-label}"
-            },
-            {
-              "param-name": "VF_MODULE_TYPE",
-              "param-value": "${vf-module-type}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vf-module-name",
-              "resource-value": "${vf-module-name}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "netbox-ip-assign",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${management-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vdns_onap_private_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vdns_onap_private_ip_0",
-              "resource-value": "${vdns_onap_private_ip_0}"
-            }
-          ]
-        },
-		 {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${private1-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vdns_int_private_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vdns_int_private_ip_0",
-              "resource-value": "${vdns_int_private_ip_0}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "aai-vf-module-put",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "vf-module",
-              "param-value": "vf-module"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "aai-vf-module-put",
-              "resource-value": "${status}"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json
index 0104579c3..216d38019 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json
@@ -1,929 +1,857 @@
-[
-  {
-    "name": "cloud_env",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "openstack"
-    },
-    "input-param": false,
-    "dictionary-name": "cloud_env",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-module-name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vf-module-name}"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-name",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "dcae_collector_ip",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-	  "default": "10.0.4.1"
-    },
-    "input-param": false,
-    "dictionary-name": "dcae_collector_ip",
-    "dictionary-source": "default",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vpg_int_pktgen_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vpg_int_pktgen_private_ip_0",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "dcae_collector_port",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-	  "default": "30235"
-    },
-    "input-param": false,
-    "dictionary-name": "dcae_collector_port",
-    "dictionary-source": "default",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "demo_artifacts_version",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "demo_artifacts_version",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "gre_ipaddr",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${gre_ipaddr}"
-    },
-    "input-param": false,
-    "dictionary-name": "gre_ipaddr",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "install_script_version",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "install_script_version",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "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": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "keypair",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "vlb_key"
-    },
-    "input-param": false,
-    "dictionary-name": "keypair",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "nb_api_version",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "1.2.0"
-    },
-    "input-param": false,
-    "dictionary-name": "nb_api_version",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "nexus_artifact_repo",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "https://nexus.onap.org"
-    },
-    "input-param": false,
-    "dictionary-name": "nexus_artifact_repo",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "nfc-naming-code",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "nfc-naming-code",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vfccustomizationuuid"
-    ],
-    "version": 0
-  },
-  {
-    "name": "onap_private_net_cidr",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "onap_private_net_cidr",
-    "dictionary-source": "sdnc",
-    "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": "sdnc",
-    "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": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "pktgen_private_net_cidr",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "pktgen_private_net_cidr",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "public_net_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "public_net_id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "sec_group",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "sec_group",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "service-instance-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "service-instance-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
- 
+[{
+		"name": "cloud_env",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "cloud_env",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vf-module-assign",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+									"metadata": {
+				"transform-template": "${vf-module-assign}_${service-instance-id}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-assign",
+		"dictionary-source": "aai-data",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id",
+			"vf-module-name"
+		],
+		"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": "rest",
+		"dependencies": ["vnf_name", "vf-module-label", "vf-module-type", "vf-naming-policy", "vf-module-id"],
+		"version": 0
+	},
+	{
+		"name": "dcae_collector_ip",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "dcae_collector_ip",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vpg_int_pktgen_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vpg_int_pktgen_private_ip_0",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "dcae_collector_port",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "dcae_collector_port",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "demo_artifacts_version",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "demo_artifacts_version",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "gre_ipaddr",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"metadata": {
+				"transform-template": "${gre_ipaddr.replaceAll(\"/.+\", \"\")}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "gre_ipaddr",
+		"dictionary-source": "rest",
+		"dependencies": ["private1-prefix-id"],
+		"version": 0
+	},
+	{
+		"name": "install_script_version",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "install_script_version",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"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": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
 
-  {
-    "name": "vf-module-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-module-label",
-    "property": {
-      "description": "",
-      "required": false,
-      "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": "vf-module-model-customization-uuid",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-model-customization-uuid",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-module-type",
-    "property": {
-      "description": "",
-      "required": false,
-      "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-naming-policy",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-	  },
-    "input-param": false,
-    "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-	  "service-instance-id",
-      "vnf-id"
-	],
-    "version": 0
-  },
- 
-  {
-    "name": "vfccustomizationuuid",
-    "property": {
-      "description": "",
-      "required": false,
-      "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": "vip",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vip}"
-    },
-    "input-param": false,
-    "dictionary-name": "vip",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vlb_flavor_name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-	  },
-    "input-param": false,
-    "dictionary-name": "flavor_name",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-	  "service-instance-id",
-      "vnf-id"
-	],
-    "version": 0
-  },
-  {
-    "name": "vlb_image_name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-	  },
-    "input-param": false,
-    "dictionary-name": "image_name",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-	  "service-instance-id",
-      "vnf-id"
-	  ],
-    "version": 0
-  },
-  {
-    "name": "vlb_int_pktgen_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_int_pktgen_private_ip_0",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vlb_int_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_int_private_ip_0",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vlb_name_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vlb_name_0}"
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_name_0",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vlb_onap_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_onap_private_ip_0",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vlb_private_net_cidr",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_private_net_cidr",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "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": "vnf-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "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": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vnf-model-customization-uuid",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vnfc-model-invariant-uuid",
-    "property": {
-      "description": "",
-      "required": false,
-      "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": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vnfc-model-version",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vfccustomizationuuid"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vpg_onap_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vpg_onap_private_ip_0",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "private1-prefix-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "private1-prefix-id",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "private2-prefix-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "private2-prefix-id",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  }
+	{
+		"name": "nb_api_version",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+
+		},
+		"input-param": false,
+		"dictionary-name": "nb_api_version",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "nexus_artifact_repo",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "nexus_artifact_repo",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "nfc-naming-code",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "nfc-naming-code",
+		"dictionary-source": "processor-db",
+		"dependencies": [
+			"vfccustomizationuuid"
+		],
+		"version": 0
+	},
+	{
+		"name": "onap_private_net_cidr",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "onap_private_net_cidr",
+		"dictionary-source": "sdnc",
+		"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": "sdnc",
+		"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": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "pktgen_private_net_cidr",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "pktgen_private_net_cidr",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "public_net_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "public_net_id",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "sec_group",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "sec_group",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "service-instance-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "service-instance-id",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+
+
+	{
+		"name": "vf-module-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-id",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vf-module-label",
+		"property": {
+			"description": "",
+			"required": false,
+			"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": "vf-module-model-customization-uuid",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-model-customization-uuid",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vf-module-type",
+		"property": {
+			"description": "",
+			"required": false,
+			"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-naming-policy",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-naming-policy",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+
+	{
+		"name": "vfccustomizationuuid",
+		"property": {
+			"description": "",
+			"required": false,
+			"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": "vip",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"metadata": {
+				"transform-template": "${vip.replaceAll(\"/.+\", \"\")}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vip",
+		"dictionary-source": "rest",
+		"dependencies": ["private2-prefix-id"],
+		"version": 0
+	},
+	{
+		"name": "vlb_flavor_name",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "flavor_name",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vlb_image_name",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "image_name",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vlb_int_pktgen_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_int_pktgen_private_ip_0",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vlb_int_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_int_private_ip_0",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vlb_name_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_name_0",
+		"dictionary-source": "rest",
+		"dependencies": ["vf-module-id", "vf-module-name", "vf-module-label", "nfc-naming-code", "vf-naming-policy"],
+		"version": 0
+	},
+	{
+		"name": "vlb_onap_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_onap_private_ip_0",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vlb_private_net_cidr",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_private_net_cidr",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"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": "vnf-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"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": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vnf-model-customization-uuid",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vnfc-model-invariant-uuid",
+		"property": {
+			"description": "",
+			"required": false,
+			"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": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vnfc-model-version",
+		"dictionary-source": "processor-db",
+		"dependencies": [
+			"vfccustomizationuuid"
+		],
+		"version": 0
+	},
+	{
+		"name": "vpg_onap_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vpg_onap_private_ip_0",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "private1-prefix-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "private1-prefix-id",
+		"dictionary-source": "processor-db",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "private2-prefix-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "private2-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/vLB/Templates/vlb-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-template.vtl
deleted file mode 100644
index 458423e6f..000000000
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-template.vtl
+++ /dev/null
@@ -1,330 +0,0 @@
-{
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "service-instance-id",
-      "param-value": "${service-instance-id}"
-    },
-    {
-      "param-name": "vnf_id",
-      "param-value": "${vnf-id}"
-    },
-    {
-      "param-name": "vnf_name",
-      "param-value": "${vnf_name}"
-    },
-    {
-      "param-name": "vpg_int_pktgen_private_ip_0",
-      "param-value": "${vpg_int_pktgen_private_ip_0}"
-    },
-    {
-      "param-name": "vpg_onap_private_ip_0",
-      "param-value": "${vpg_onap_private_ip_0}"
-    },
-  
-   
-    {
-      "param-name": "vnf_model_customization_uuid",
-      "param-value": "${vnf-model-customization-uuid}"
-    },
-    {
-      "param-name": "vf_module_id",
-      "param-value": "${vf-module-id}"
-    },
-    {
-      "param-name": "vf_module_type",
-      "param-value": "${vf-module-type}"
-    },
-    {
-      "param-name": "vf_module_customization_uuid",
-      "param-value": "${vf-module-model-customization-uuid}"
-    },
-    {
-      "param-name": "vfc_customization_uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "aic-cloud-region",
-      "param-value": "${aic-cloud-region}"
-    },
-    {
-      "param-name": "vm-type",
-      "param-value": "${vm-type}"
-    },
-    {
-      "param-name": "vnfc-model-customization-uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "vnfc-model-invariant-uuid",
-      "param-value": "${vnfc-model-invariant-uuid}"
-    },
-    {
-      "param-name": "vnfc-model-version",
-      "param-value": "${vnfc-model-version}"
-    },
-    {
-      "param-name": "nfc-naming-code",
-      "param-value": "${nfc-naming-code}"
-    },
-    {
-      "param-name": "vip",
-      "param-value": "${vip}"
-    },
-    {
-      "param-name": "cloud_env",
-      "param-value": "openstack"
-    },
-    {
-      "param-name": "repo_url_artifacts",
-      "param-value": "https://nexus.onap.org/content/groups/staging"
-    },
-    {
-      "param-name": "repo_url_blob",
-      "param-value": "https://nexus.onap.org/content/repositories/raw"
-    },
-    {
-      "param-name": "dcae_collector_port",
-      "param-value": "${dcae_collector_port}"
-    },
-    {
-      "param-name": "nb_api_version",
-      "param-value": "${nb_api_version}"
-    },
-    {
-      "param-name": "vlb_image_name",
-      "param-value": "${vlb_image_name}"
-    },
-    {
-      "param-name": "vlb_flavor_name",
-      "param-value": "${vlb_flavor_name}"
-    },
-    {
-      "param-name": "install_script_version",
-      "param-value": "${install_script_version}"
-    },
-    {
-      "param-name": "key_name",
-      "param-value": "${key_name}"
-    },
-    {
-      "param-name": "pub_key",
-      "param-value": "${pub_key}"
-    },
-    {
-      "param-name": "demo_artifacts_version",
-      "param-value": "${demo_artifacts_version}"
-    },
-    {
-      "param-name": "dcae_collector_ip",
-      "param-value": "${dcae_collector_ip}"
-    },
-    {
-      "param-name": "public_net_id",
-      "param-value": "${public_net_id}"
-    },
-    {
-      "param-name": "onap_private_net_id",
-      "param-value": "${onap_private_net_id}"
-    },
-    {
-      "param-name": "onap_private_subnet_id",
-      "param-value": "${onap_private_subnet_id}"
-    },
-    {
-      "param-name": "vlb_int_pktgen_private_ip_0",
-      "param-value": "${vlb_int_pktgen_private_ip_0}"
-    },
-    {
-      "param-name": "vlb_private_net_cidr",
-      "param-value": "${vlb_private_net_cidr}"
-    },
-    {
-      "param-name": "pktgen_private_net_cidr",
-      "param-value": "${pktgen_private_net_cidr}"
-    },
-    {
-      "param-name": "vlb_int_private_ip_0",
-      "param-value": "${vlb_int_private_ip_0}"
-    },
-    {
-      "param-name": "vlb_onap_private_ip_0",
-      "param-value": "${vlb_onap_private_ip_0}"
-    },
-    {
-      "param-name": "onap_private_net_cidr",
-      "param-value": "${onap_private_net_cidr}"
-    },
-    {
-      "param-name": "nexus_artifact_repo",
-      "param-value": "${nexus_artifact_repo}"
-    },
-    {
-      "param-name": "sec_group",
-      "param-value": "${sec_group}"
-    }
-  ],
-  "capability-data": [
-    {
-      "capability-name": "generate-name",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vlb_name_0"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vlb_name_0}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vlb_name_0"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VNFC"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "NFC_NAMING_CODE",
-              "param-value": "${nfc-naming-code}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vlb_name_0",
-              "resource-value": "${vlb_name_0}"
-            }
-          ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vf-module-name"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vf-module-name}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vf-module-name"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VF-MODULE"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "VF_MODULE_LABEL",
-              "param-value": "${vf-module-label}"
-            },
-            {
-              "param-name": "VF_MODULE_TYPE",
-              "param-value": "${vf-module-type}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vf-module-name",
-              "resource-value": "${vf-module-name}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "netbox-ip-assign",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${private2-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vip"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vip",
-              "resource-value": "${vip}"
-            }
-          ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${private1-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-gre_ipaddr"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "gre_ipaddr",
-              "resource-value": "${gre_ipaddr}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "aai-vf-module-put",
-      "key-mapping": [
-        {
-          "output-key-mapping": [
-            {
-              "resource-name": "aai-vf-module-put",
-              "resource-value": "${status}"
-            }
-          ],
-          "payload": [
-            {
-              "param-name": "vf-module",
-              "param-value": "vf-module"
-            }
-          ]
-        }
-      ]
-    }
-	
-  ]
-}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vnf-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vnf-mapping.json
index 82dbe66a2..e353cabb5 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vnf-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vnf-mapping.json
@@ -1,690 +1,669 @@
-[
-  {
-    "name": "cloud_env",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "openstack"
-    },
-    "input-param": true,
-    "dictionary-name": "cloud_env",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "demo_artifacts_version",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "demo_artifacts_version",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-    {
-    "name": "flavor_name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "flavor_name",
-    "dictionary-source": "input",
-    "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": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vpg_int_pktgen_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vpg_int_pktgen_private_ip_0}"
-    },
-    "input-param": false,
-    "dictionary-name": "vpg_int_pktgen_private_ip_0",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "install_script_version",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "install_script_version",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "pub_key",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCs84Cy8+qi/jvucay0BwFtOq3ian0ulTXFGxkZcZCR0N48j88pbHJaEqb9e25MAsrfH+7Etb9Kd5nbBThEL/i0AyHXnDsc80Oq0sqlLcfLo3SGSurkrNoRofHboJ5Hn+N9SlWN5FCQGbTx1w3rjqR4LasAI6XxH9xpXSFyyge6ysVXH0cYaZ8sg98nFZa1fPJR9L8COjZvF+EYudub2RC5HVyV/sx7bliNFo9JwQh6du1abG4G7ZDjTIcYwYp21iq52UzWU28RVcAyY6AQZJu2lHLdsr8fPvyeWZpC5EqGsxI1G609m9G/dURRKwYfez/f2ATzpn5QjEX7LrLWBM8r Generated-by-Nova"
-    },
-    "input-param": false,
-    "dictionary-name": "pub_key",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "int_private_net_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${int_private_net_id}"
-    },
-    "input-param": false,
-    "dictionary-name": "int_private_net_id",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "onap_private_net_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "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": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "pktgen_private_net_cidr",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "pktgen_private_net_cidr",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vdns_int_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vdns_int_private_ip_0}"
-    },
-    "input-param": false,
-    "dictionary-name": "vdns_int_private_ip_0",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vdns_onap_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vdns_onap_private_ip_0}"
-    },
-    "input-param": false,
-    "dictionary-name": "vdns_onap_private_ip_0",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vlb_int_pktgen_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vlb_int_pktgen_private_ip_0}"
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_int_pktgen_private_ip_0",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vlb_onap_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vlb_onap_private_ip_0}"
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_onap_private_ip_0",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vpg_onap_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vpg_onap_private_ip_0}"
-    },
-    "input-param": false,
-    "dictionary-name": "vpg_onap_private_ip_0",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "int_pktgen_private_net_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${int_pktgen_private_net_id}"
-    },
-    "input-param": false,
-    "dictionary-name": "int_pktgen_private_net_id",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "int_pktgen_private_subnet_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${int_pktgen_private_subnet_id}"
-    },
-    "input-param": false,
-    "dictionary-name": "int_pktgen_private_subnet_id",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "int_private_subnet_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${int_private_subnet_id}"
-    },
-    "input-param": false,
-    "dictionary-name": "int_private_subnet_id",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "public_net_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "public_net_id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "onap_private_net_cidr",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "onap_private_net_cidr",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "sec_group",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "sec_group",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "service-instance-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "service-instance-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vlb_int_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vlb_int_private_ip_0}"
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_int_private_ip_0",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vlb_private_net_cidr",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_private_net_cidr",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vnf-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "vnf-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vnf-model-customization-uuid",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "vnf-model-customization-uuid",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-naming-policy",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "SDNC_Policy.Config_MS_ONAP_VNF_NAMING_TIMESTAMP"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vnf_name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vnf_name}"
-    },
-    "input-param": false,
-    "dictionary-name": "vnf_name",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "aic-cloud-region",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "aic-cloud-region",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "management-prefix-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "management-prefix-id",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "private1-prefix-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "private1-prefix-id",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "private2-prefix-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "private2-prefix-id",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  }
+[{
+		"name": "cloud_env",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": true,
+		"dictionary-name": "cloud_env",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "dcae_collector_ip",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "dcae_collector_ip",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+		{
+		"name": "vnf_assign_aai",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vnf_assign_aai",
+		"dictionary-source": "aai-data",
+		"dependencies": [	"vnf-id",
+						"vnf_name"],
+		"version": 0
+	},
+	{
+		"name": "demo_artifacts_version",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "demo_artifacts_version",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "flavor_name",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "flavor_name",
+		"dictionary-source": "input",
+		"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": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vpg_int_pktgen_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"metadata": {
+				"transform-template": "${vpg_int_pktgen_private_ip_0.replaceAll(\"/.+\", \"\")}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vpg_int_pktgen_private_ip_0",
+		"dictionary-source": "rest",
+		"dependencies": ["private2-prefix-id"],
+		"version": 0
+	},
+	{
+		"name": "int_pktgen_private_net_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"default": "private2",
+			"metadata": {
+				"transform-template": "${vnf_name}_${int_pktgen_private_net_id}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "int_pktgen_private_net_id",
+		"dictionary-source": "default",
+		"dependencies": ["vnf_name"],
+		"version": 0
+	},
+	{
+		"name": "int_pktgen_private_subnet_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"default": "private2",
+			"metadata": {
+				"transform-template": "${vnf_name}_${int_pktgen_private_subnet_id}_subnet"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "int_pktgen_private_subnet_id",
+		"dictionary-source": "default",
+		"dependencies": ["vnf_name"],
+		"version": 0
+	},
+	{
+		"name": "int_private_net_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"default": "private1",
+			"metadata": {
+				"transform-template": "${vnf_name}_${int_private_net_id}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "int_private_net_id",
+		"dictionary-source": "default",
+		"dependencies": ["vnf_name"],
+		"version": 0
+	},
+	{
+		"name": "int_private_subnet_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"default": "private1",
+			"metadata": {
+				"transform-template": "${vnf_name}_${int_private_subnet_id}_subnet"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "int_private_subnet_id",
+		"dictionary-source": "default",
+		"dependencies": ["vnf_name"],
+		"version": 0
+	},
+	{
+		"name": "install_script_version",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "install_script_version",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"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": "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": "pktgen_private_net_cidr",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "pktgen_private_net_cidr",
+		"dictionary-source": "processor-db",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vlb_int_pktgen_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"metadata": {
+				"transform-template": "${vlb_int_pktgen_private_ip_0.replaceAll(\"/.+\", \"\")}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_int_pktgen_private_ip_0",
+		"dictionary-source": "rest",
+		"dependencies": ["private2-prefix-id"],
+		"version": 0
+	},
+	{
+		"name": "vlb_onap_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"metadata": {
+				"transform-template": "${vlb_onap_private_ip_0.replaceAll(\"/.+\", \"\")}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_onap_private_ip_0",
+		"dictionary-source": "rest",
+		"dependencies": ["management-prefix-id"],
+		"version": 0
+	},
+	{
+		"name": "vpg_onap_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"metadata": {
+				"transform-template": "${vpg_onap_private_ip_0.replaceAll(\"/.+\", \"\")}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vpg_onap_private_ip_0",
+		"dictionary-source": "rest",
+		"dependencies": ["management-prefix-id"],
+		"version": 0
+	},
+
+	{
+		"name": "public_net_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "public_net_id",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "onap_private_net_cidr",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "onap_private_net_cidr",
+		"dictionary-source": "processor-db",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "sec_group",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "sec_group",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "service-instance-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "service-instance-id",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vlb_int_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"metadata": {
+				"transform-template": "${vlb_int_private_ip_0.replaceAll(\"/.+\", \"\")}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_int_private_ip_0",
+		"dictionary-source": "rest",
+		"dependencies": ["private1-prefix-id"],
+		"version": 0
+	},
+	{
+		"name": "vlb_private_net_cidr",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_private_net_cidr",
+		"dictionary-source": "processor-db",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vnf-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"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": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vnf-model-customization-uuid",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vf-naming-policy",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"default": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP"
+		},
+		"input-param": false,
+		"dictionary-name": "vf-naming-policy",
+		"dictionary-source": "default",
+		"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": "rest",
+		"dependencies": [
+			"aic-cloud-region",
+			"vf-naming-policy",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "aic-cloud-region",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "aic-cloud-region",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "management-prefix-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "management-prefix-id",
+		"dictionary-source": "processor-db",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "private1-prefix-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "private1-prefix-id",
+		"dictionary-source": "processor-db",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "private2-prefix-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "private2-prefix-id",
+		"dictionary-source": "processor-db",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vlb_0_int_pktgen_private_port_0_mac",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_0_int_pktgen_private_port_0_mac",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vpg_0_int_pktgen_private_port_0_mac",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vpg_0_int_pktgen_private_port_0_mac",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	}
 ]
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vnf-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vnf-template.vtl
deleted file mode 100644
index 0080e2b2d..000000000
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vnf-template.vtl
+++ /dev/null
@@ -1,284 +0,0 @@
-{
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "service-instance-id",
-      "param-value": "${service-instance-id}"
-    },
-    {
-      "param-name": "vnf_id",
-      "param-value": "${vnf-id}"
-    },
-	 {
-      "param-name": "vf-naming-policy",
-      "param-value": "${vf-naming-policy}"
-    },
-    {
-      "param-name": "vnf-model-customization-uuid",
-      "param-value": "${vnf-model-customization-uuid}"
-    },
-    {
-      "param-name": "aic-cloud-region",
-      "param-value": "${aic-cloud-region}"
-    },
-    {
-      "param-name": "onap_private_net_id",
-      "param-value": "${onap_private_net_id}"
-    },
-	{
-      "param-name": "image_name",
-      "param-value": "${image_name}"
-    },
-    {
-      "param-name": "onap_private_subnet_id",
-      "param-value": "${onap_private_subnet_id}"
-    },
-    {
-      "param-name": "vfccustomizationuuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "vf-module-model-customization-uuid",
-      "param-value": "${vf-module-model-customization-uuid}"
-    },
-    {
-      "param-name": "cloud_env",
-      "param-value": "${cloud_env}"
-    },
-	   {
-      "param-name": "flavor_name",
-      "param-value": "${flavor_name}"
-    },
-    {
-      "param-name": "install_script_version",
-      "param-value": "${install_script_version}"
-    },
-    {
-      "param-name": "pub_key",
-      "param-value": "${pub_key}"
-    },
-    {
-      "param-name": "sec_group",
-      "param-value": "${sec_group}"
-    },
-    {
-      "param-name": "demo_artifacts_version",
-      "param-value": "${demo_artifacts_version}"
-    },
-    {
-      "param-name": "public_net_id",
-      "param-value": "${public_net_id}"
-    },
-    {
-      "param-name": "onap_private_net_cidr",
-      "param-value": "${onap_private_net_cidr}"
-    },
-    {
-      "param-name": "pktgen_private_net_cidr",
-      "param-value": "${pktgen_private_net_cidr}"
-    },
-    {
-      "param-name": "vlb_private_net_cidr",
-      "param-value": "${vlb_private_net_cidr}"
-    },
-    {
-      "param-name": "key_name",
-      "param-value": "olc-key"
-    }
-  ],
-  "capability-data": [
-    {
-      "capability-name": "generate-name",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vnf_name"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vnf-id}_vnf_name"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VNF"
-            },
-            {
-              "param-name": "AIC_CLOUD_REGION",
-              "param-value": "${aic-cloud-region}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vnf_name",
-              "resource-value": "${vnf_name}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "netbox-ip-assign",
-      "key-mapping": [
-       
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${private1-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vlb_int_private_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vlb_int_private_ip_0",
-              "resource-value": "${vlb_int_private_ip_0}"
-            }
-          ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${private2-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vlb_int_pktgen_private_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vlb_int_pktgen_private_ip_0",
-              "resource-value": "${vlb_int_pktgen_private_ip_0}"
-            }
-          ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${management-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vpg_onap_private_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vpg_onap_private_ip_0",
-              "resource-value": "${vpg_onap_private_ip_0}"
-            }
-          ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${management-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vlb_onap_private_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vlb_onap_private_ip_0",
-              "resource-value": "${vlb_onap_private_ip_0}"
-            }
-          ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${private2-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vpg_int_pktgen_private_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vpg_int_pktgen_private_ip_0",
-              "resource-value": "${vpg_int_pktgen_private_ip_0}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "aai-vnf-put",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "generic-vnf",
-              "param-value": "generic-vnf"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "aai-vnf-put",
-              "resource-value": "${status}"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json
index 25721e299..4b079fdc9 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json
@@ -11,15 +11,42 @@
       ],
       "entry_schema": {
         "type": ""
-      },
-      "default": "openstack"
+      }
     },
     "input-param": false,
     "dictionary-name": "cloud_env",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
+    "dictionary-source": "sdnc",
+    "dependencies": [
+			"service-instance-id",
+			"vnf-id"
+			],
+    "version": 0
+  },
+  	{
+		"name": "vf-module-assign",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+						"metadata": {
+				"transform-template": "${vf-module-assign}_${service-instance-id}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-assign",
+		"dictionary-source": "aai-data",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id",
+			"vf-module-name"
+		],
+		"version": 0
+	},
   {
     "name": "vf-module-name",
     "property": {
@@ -32,13 +59,12 @@
       ],
       "entry_schema": {
         "type": ""
-      },
-      "default": "${vf-module-name}"
+      }
     },
     "input-param": false,
     "dictionary-name": "vf-module-name",
-    "dictionary-source": "default",
-    "dependencies": [],
+    "dictionary-source": "rest",
+	"dependencies": ["vnf_name", "vf-module-label", "vf-module-type", "vf-naming-policy", "vf-module-id"],
     "version": 0
   },
   {
@@ -107,27 +133,7 @@
     "dependencies": [],
     "version": 0
   },
-  {
-    "name": "keypair",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "vlb_key"
-    },
-    "input-param": false,
-    "dictionary-name": "keypair",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
+
   {
     "name": "nb_api_version",
     "property": {
@@ -140,13 +146,15 @@
       ],
       "entry_schema": {
         "type": ""
-      },
-      "default": "1.2.0"
+      }
     },
     "input-param": false,
     "dictionary-name": "nb_api_version",
-    "dictionary-source": "default",
-    "dependencies": [],
+    "dictionary-source": "sdnc",
+    "dependencies": [
+			"service-instance-id",
+			"vnf-id"
+			],
     "version": 0
   },
   {
@@ -161,13 +169,15 @@
       ],
       "entry_schema": {
         "type": ""
-      },
-      "default": "https://nexus.onap.org"
+      }
     },
     "input-param": false,
     "dictionary-name": "nexus_artifact_repo",
-    "dictionary-source": "default",
-    "dependencies": [],
+    "dictionary-source": "sdnc",
+    "dependencies": [
+			"service-instance-id",
+			"vnf-id"
+			],
     "version": 0
   },
   {
@@ -630,13 +640,12 @@
       ],
       "entry_schema": {
         "type": ""
-      },
-      "default": "${vpg_name_0}"
+      }
     },
     "input-param": false,
     "dictionary-name": "vpg_name_0",
-    "dictionary-source": "default",
-    "dependencies": [],
+    "dictionary-source": "rest",
+	"dependencies": ["vf-module-id", "vf-module-name", "vf-module-label", "nfc-naming-code", "vf-naming-policy"],
     "version": 0
   },
   {
@@ -651,8 +660,7 @@
       ],
       "entry_schema": {
         "type": ""
-      },
-      "default": ""
+      }
     },
     "input-param": false,
     "dictionary-name": "private2-prefix-id",
@@ -713,12 +721,14 @@
       "entry_schema": {
         "type": ""
       },
-      "default": "${pg_int}"
+			"metadata": {
+				"transform-template": "${pg_int.replaceAll(\"/.+\", \"\")}"
+			}
     },
     "input-param": false,
     "dictionary-name": "pg_int",
-    "dictionary-source": "default",
-    "dependencies": [],
+    "dictionary-source": "rest",
+    "dependencies": ["private2-prefix-id"],
     "version": 0
   },
   {
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-template.vtl
deleted file mode 100644
index bd745b179..000000000
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-template.vtl
+++ /dev/null
@@ -1,273 +0,0 @@
-{
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "service-instance-id",
-      "param-value": "${service-instance-id}"
-    },
-    {
-      "param-name": "vnf_id",
-      "param-value": "${vnf-id}"
-    },
-    {
-      "param-name": "vnf_name",
-      "param-value": "${vnf_name}"
-    },
-    {
-      "param-name": "vnf_model_customization_uuid",
-      "param-value": "${vnf-model-customization-uuid}"
-    },
-    {
-      "param-name": "vpg_onap_private_ip_0",
-      "param-value": "${vpg_onap_private_ip_0}"
-    },
-    {
-      "param-name": "vf_module_id",
-      "param-value": "${vf-module-id}"
-    },
-    {
-      "param-name": "vf_module_type",
-      "param-value": "${vf-module-type}"
-    },
-    {
-      "param-name": "vf_module_customization_uuid",
-      "param-value": "${vf-module-model-customization-uuid}"
-    },
-    {
-      "param-name": "vfc_customization_uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "aic-cloud-region",
-      "param-value": "${aic-cloud-region}"
-    },
-    {
-      "param-name": "vm-type",
-      "param-value": "${vm-type}"
-    },
-    {
-      "param-name": "vnfc-model-customization-uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "vnfc-model-invariant-uuid",
-      "param-value": "${vnfc-model-invariant-uuid}"
-    },
-    {
-      "param-name": "vnfc-model-version",
-      "param-value": "${vnfc-model-version}"
-    },
-    {
-      "param-name": "nfc-naming-code",
-      "param-value": "${nfc-naming-code}"
-    },
-    {
-      "param-name": "cloud_env",
-      "param-value": "openstack"
-    },
-    {
-      "param-name": "repo_url_artifacts",
-      "param-value": "https://nexus.onap.org/content/groups/staging"
-    },
-    {
-      "param-name": "repo_url_blob",
-      "param-value": "https://nexus.onap.org/content/repositories/raw"
-    },
-    {
-      "param-name": "vpg_image_name",
-      "param-value": "${vpg_image_name}"
-    },
-    {
-      "param-name": "vpg_int_pktgen_private_ip_0",
-      "param-value": "${vpg_int_pktgen_private_ip_0}"
-    },
-    {
-      "param-name": "vpg_flavor_name",
-      "param-value": "${vpg_flavor_name}"
-    },
-    {
-      "param-name": "key_name",
-      "param-value": "${key_name}"
-    },
-    {
-      "param-name": "pub_key",
-      "param-value": "${pub_key}"
-    },
-    {
-      "param-name": "install_script_version",
-      "param-value": "${install_script_version}"
-    },
-    {
-      "param-name": "demo_artifacts_version",
-      "param-value": "${demo_artifacts_version}"
-    },
-    {
-      "param-name": "nb_api_version",
-      "param-value": "1.2.0"
-    },
-    {
-      "param-name": "public_net_id",
-      "param-value": "${public_net_id}"
-    },
-    {
-      "param-name": "onap_private_net_id",
-      "param-value": "${onap_private_net_id}"
-    },
-    {
-      "param-name": "onap_private_subnet_id",
-      "param-value": "${onap_private_subnet_id}"
-    },
-    {
-      "param-name": "onap_private_net_cidr",
-      "param-value": "${onap_private_net_cidr}"
-    },
-    {
-      "param-name": "nexus_artifact_repo",
-      "param-value": "https://nexus.onap.org"
-    },
-    {
-      "param-name": "sec_group",
-      "param-value": "${sec_group}"
-    }
-  ],
-  "capability-data": [
-    {
-      "capability-name": "generate-name",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vpg_name_0"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vpg_name_0}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vpg_name_0"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VNFC"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "NFC_NAMING_CODE",
-              "param-value": "${nfc-naming-code}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vpg_name_0",
-              "resource-value": "${vpg_name_0}"
-            }
-          ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vf-module-name"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vf-module-name}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vf-module-name"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VF-MODULE"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "VF_MODULE_LABEL",
-              "param-value": "${vf-module-label}"
-            },
-            {
-              "param-name": "vlb_int_pktgen_private_ip_0",
-              "param-value": "${vlb_int_pktgen_private_ip_0}"
-            },
-            {
-              "param-name": "VF_MODULE_TYPE",
-              "param-value": "${vf-module-type}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vf-module-name",
-              "resource-value": "${vf-module-name}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "netbox-ip-assign",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${private2-prefix-id}"
-            },
-            {
-              "param-name": "vf-module-id",
-              "param-value": "${vf-module-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vf-module-id}-pg_int"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "pg_int",
-              "resource-value": "${pg_int}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "aai-vf-module-put",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "vf-module",
-              "param-value": "vf-module"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "aai-vf-module-put",
-              "resource-value": "${status}"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file