Merge "Modified vf-module-name"

93 files changed, 3193 insertions, 2251 deletions

diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/data_types.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/data_types.json
index b3d719faa..71e5fa63d 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/data_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/data_types.json
@@ -773,4 +773,4 @@
       "derived_from" : "tosca.datatypes.Dynamic"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json
index f7da40904..7172e3a05 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json
@@ -63,7 +63,7 @@
         "properties" : {
           "type" : "JSON",
           "verb" : "PUT",
-          "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$vnf-id/service-data/vnfs/vnf/$service-instance-id/vnf-data/vnf-topology/vnf-parameters-data/param/vdns_vf_module_id",
+          "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vdns_vf_module_id",
           "path" : "",
           "payload" : "{\n\"GENERIC-RESOURCE-API:param\": [\n{\n\"GENERIC-RESOURCE-API:name\": \"vdns_vf_module_id\",\n\"GENERIC-RESOURCE-API:value\": \"$vf-module-id\"\n}\n]\n}",
           "input-key-mapping" : {
@@ -1263,7 +1263,7 @@
         "properties" : {
           "verb" : "GET",
           "type" : "JSON",
-          "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$vnf-id/service-data/vnfs/vnf/$service-instance-id/vnf-data/vnf-topology/vnf-parameters-data/param/vdns_vf_module_id",
+          "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vdns_vf_module_id",
           "path" : "/param/0/value",
           "input-key-mapping" : {
             "service-instance-id" : "service-instance-id",
@@ -1439,11 +1439,11 @@
       }
     }
   },
-  "vf-module-name" : {
-    "tags" : "vf-module-name",
-    "name" : "vf-module-name",
+  "vf_module_name" : {
+    "tags" : "vf_module_name",
+    "name" : "vf_module_name",
     "property" : {
-      "description" : "vf-module-name",
+      "description" : "vf_module_name",
       "type" : "string"
     },
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/python/ConfigDeploy.py b/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/python/ConfigDeploy.py
index 34fd1404d..388c63ffb 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/python/ConfigDeploy.py
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/python/ConfigDeploy.py
@@ -40,11 +40,11 @@ class ConfigDeploy(NetconfComponentFunction):
       #if not response.isSuccess():

       #  og.error(response.errorMessage)

       nc.discard_change()

-      nc.edit_config(message_content=payloadInterface, edit_default_peration="none")

-      nc.edit_config(message_content=payloadHostname, edit_default_peration="none")

-      nc.validate()

+      nc.edit_config(message_content=payloadInterface, edit_default_peration="merge") 

+      nc.edit_config(message_content=payloadHostname, edit_default_peration="merge")  

+      #nc.validate()

       nc.commit()

-      #nc.commit(confirmed = True, confirm_timeout=15)

+      nc.get_config()				#nc.commit(confirmed = True, confirm_timeout=15)

       nc.unlock()

       nc.disconnect()

 

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 9e73a318e..10e448466 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 @@
-	{
-    "vdns-instance": [
-        {
-            "ip-addr": "$vdns_int_private_ip_0",
-            "oam-ip-addr": "$vdns_onap_private_ip_0",
-            "enabled": false
-        }
-    ]
-}
\ No newline at end of file
+<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>
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 7ec446f30..d33625739 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 @@
-{
-    "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
+<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>
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/active-streams.json b/components/model-catalog/resource-dictionary/starter-dictionary/active-streams.json
new file mode 100644
index 000000000..d136fbf8d
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/active-streams.json
@@ -0,0 +1,18 @@
+{
+  "tags": "active-streams",
+  "name": "active-streams",
+  "property": {
+    "description": "active-streams",
+    "type": "string"
+  },
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+  "sources": {
+    "input": {
+      "type": "source-input"
+    },
+    "default": {
+      "type": "source-default",
+      "properties": {}
+    }
+  }
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/cloud_env.json b/components/model-catalog/resource-dictionary/starter-dictionary/cloud_env.json
index 1877c1253..28cac3bb5 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/cloud_env.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/cloud_env.json
@@ -1,37 +1,38 @@
 {
-  "tags": "cloud_env",
-  "name": "cloud_env",
-  "property": {
-    "description": "cloud_env",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/cloud_env",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "cloud_env": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "cloud_env",
+	"name": "cloud_env",
+	"property": {
+		"description": "cloud_env",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/cloud_env",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"cloud_env": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/create-md-sal-vnf-param.json b/components/model-catalog/resource-dictionary/starter-dictionary/create-md-sal-vnf-param.json
new file mode 100644
index 000000000..e19e67c05
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/create-md-sal-vnf-param.json
@@ -0,0 +1,49 @@
+{
+	"tags": "create-md-sal-vnf-param",
+	"name": "create-md-sal-vnf-param",
+	"property": {
+		"description": "create-md-sal-vnf-param",
+		"type": "string"
+	},
+	"updated-by": "Singal, Kapil <ks220y@att.com>",
+	"sources": {
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"type": "JSON",
+				"verb": "PUT",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vdns_vf_module_id",
+				"path": "",
+				"payload": "{\n\"GENERIC-RESOURCE-API:param\": [\n{\n\"GENERIC-RESOURCE-API:name\": \"vdns_vf_module_id\",\n\"GENERIC-RESOURCE-API:value\": \"$vf-module-id\"\n}\n]\n}",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id",
+					"vf-module-id": "vf-module-id"
+				},
+				"output-key-mapping": {},
+				"key-dependencies": [
+					"vf-module-id",
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		},
+		"aai-data": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "PATCH",
+				"type": "JSON",
+				"url-path": "/aai/v14/network/generic-vnfs/generic-vnf/$vnf-id/nm-profile-name",
+				"payload": "{\"nm-profile-name\":\"$vf-module-id\"}",
+				"path": "",
+				"input-key-mapping": {
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {},
+				"key-dependencies": [
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_ip.json b/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_ip.json
index c0d42dfd0..9339cd263 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_ip.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_ip.json
@@ -1,37 +1,38 @@
 {
-  "tags": "dcae_collector_ip",
-  "name": "dcae_collector_ip",
-  "property": {
-    "description": "dcae_collector_ip",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/dcae_collector_ip",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "dcae_collector_ip": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "dcae_collector_ip",
+	"name": "dcae_collector_ip",
+	"property": {
+		"description": "dcae_collector_ip",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/dcae_collector_ip",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"dcae_collector_ip": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_port.json b/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_port.json
index 1191d800b..85b561e41 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_port.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_port.json
@@ -1,37 +1,38 @@
 {
-  "tags": "dcae_collector_port",
-  "name": "dcae_collector_port",
-  "property": {
-    "description": "dcae_collector_port",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/dcae_collector_port",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "dcae_collector_port": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "dcae_collector_port",
+	"name": "dcae_collector_port",
+	"property": {
+		"description": "dcae_collector_port",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/dcae_collector_port",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"dcae_collector_port": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/demo_artifacts_version.json b/components/model-catalog/resource-dictionary/starter-dictionary/demo_artifacts_version.json
index 3884e1e53..63f8a3563 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/demo_artifacts_version.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/demo_artifacts_version.json
@@ -1,37 +1,38 @@
 {
-  "tags": "demo_artifacts_version",
-  "name": "demo_artifacts_version",
-  "property": {
-    "description": "demo_artifacts_version",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/demo_artifacts_version",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "demo_artifacts_version": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "demo_artifacts_version",
+	"name": "demo_artifacts_version",
+	"property": {
+		"description": "demo_artifacts_version",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/demo_artifacts_version",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"demo_artifacts_version": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/flavor_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/flavor_name.json
new file mode 100644
index 000000000..ad7f3a706
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/flavor_name.json
@@ -0,0 +1,38 @@
+{
+	"tags": "flavor_name",
+	"name": "flavor_name",
+	"property": {
+		"description": "flavor_name",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/flavor_name",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"flavor_name": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/gre_ipaddr.json b/components/model-catalog/resource-dictionary/starter-dictionary/gre_ipaddr.json
index 92f7abe6e..a917350cf 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/gre_ipaddr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/gre_ipaddr.json
@@ -1,37 +1,38 @@
 {
-  "tags": "gre_ipaddr",
-  "name": "gre_ipaddr",
-  "property": {
-    "description": "gre_ipaddr",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/gre_ipaddr",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "gre_ipaddr": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "gre_ipaddr",
+	"name": "gre_ipaddr",
+	"property": {
+		"description": "gre_ipaddr",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/gre_ipaddr",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"gre_ipaddr": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/image_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/image_name.json
index f8816b15a..9891caa2f 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/image_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/image_name.json
@@ -1,33 +1,38 @@
 {
-  "name": "image_name",
-  "tags": "image_name",
-  "updated-by": "Singal, Kapil <ks220y@att.com>",
-  "property": {
-    "type": "string",
-    "description": "image_name"
-  },
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/image_name",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "image_name": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "image_name",
+	"name": "image_name",
+	"property": {
+		"description": "image_name",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/image_name",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"image_name": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/install_script_version.json b/components/model-catalog/resource-dictionary/starter-dictionary/install_script_version.json
index 39bbb1880..1f5f79eb1 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/install_script_version.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/install_script_version.json
@@ -1,37 +1,38 @@
 {
-  "tags": "install_script_version",
-  "name": "install_script_version",
-  "property": {
-    "description": "install_script_version",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/install_script_version",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "install_script_version": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "install_script_version",
+	"name": "install_script_version",
+	"property": {
+		"description": "install_script_version",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/install_script_version",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"install_script_version": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_net_id.json
index acde1255f..2c2c18b66 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_net_id.json
@@ -1,37 +1,38 @@
 {
-  "tags": "int_pktgen_private_net_id",
-  "name": "int_pktgen_private_net_id",
-  "property": {
-    "description": "int_pktgen_private_net_id",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_pktgen_private_net_id",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "int_pktgen_private_net_id": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "int_pktgen_private_net_id",
+	"name": "int_pktgen_private_net_id",
+	"property": {
+		"description": "int_pktgen_private_net_id",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_pktgen_private_net_id",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"int_pktgen_private_net_id": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_subnet_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_subnet_id.json
index c30bef838..6f2203f53 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_subnet_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_subnet_id.json
@@ -1,37 +1,38 @@
 {
-  "tags": "int_pktgen_private_subnet_id",
-  "name": "int_pktgen_private_subnet_id",
-  "property": {
-    "description": "int_pktgen_private_subnet_id",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_pktgen_private_subnet_id",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "int_pktgen_private_subnet_id": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "int_pktgen_private_subnet_id",
+	"name": "int_pktgen_private_subnet_id",
+	"property": {
+		"description": "int_pktgen_private_subnet_id",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_pktgen_private_subnet_id",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"int_pktgen_private_subnet_id": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_private1_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_private1_net_cidr.json
new file mode 100644
index 000000000..f450143c5
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_private1_net_cidr.json
@@ -0,0 +1,50 @@
+{
+	"tags": "int_private1_net_cidr",
+	"name": "int_private1_net_cidr",
+	"property": {
+		"description": "int_private1_net_cidr",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private1_net_cidr",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"int_private1_net_cidr": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		},
+		"processor-db": {
+			"type": "source-db",
+			"properties": {
+				
+				"type": "SQL",
+				"query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private1\"",
+				"input-key-mapping": {},
+				"output-key-mapping": {
+					"int_private1_net_cidr": "prefix"
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_private1_subnet_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_private1_subnet_id.json
new file mode 100644
index 000000000..938f51a7e
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_private1_subnet_id.json
@@ -0,0 +1,15 @@
+{
+	"tags": "int_private1_subnet_id",
+	"name": "int_private1_subnet_id",
+	"property": {
+		"description": "int_private1_subnet_id",
+		"type": "string"
+	},
+	"updated-by": "Singal, Kapil <ks220y@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input",
+			"properties": {}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_private2_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_private2_net_cidr.json
new file mode 100644
index 000000000..e018614ea
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_private2_net_cidr.json
@@ -0,0 +1,50 @@
+{
+	"tags": "int_private2_net_cidr",
+	"name": "int_private2_net_cidr",
+	"property": {
+		"description": "int_private2_net_cidr",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"processor-db": {
+			"type": "source-db",
+			"properties": {
+				"type": "SQL",
+				"query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private2\"",
+				"output-key-mapping": {
+					"int_private2_net_cidr": "prefix"
+				},
+				
+				"input-key-mapping": {}
+			}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private2_net_cidr",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"int_private2_net_cidr": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_private2_subnet_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_private2_subnet_id.json
new file mode 100644
index 000000000..1ec9eb30a
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_private2_subnet_id.json
@@ -0,0 +1,15 @@
+{
+	"tags": "int_private2_subnet_id",
+	"name": "int_private2_subnet_id",
+	"property": {
+		"description": "int_private2_subnet_id",
+		"type": "string"
+	},
+	"updated-by": "Singal, Kapil <ks220y@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input",
+			"properties": {}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_private_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_private_net_id.json
index 4aa07f3cb..f424da218 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/int_private_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_private_net_id.json
@@ -1,37 +1,38 @@
 {
-  "tags": "int_private_net_id",
-  "name": "int_private_net_id",
-  "property": {
-    "description": "int_private_net_id",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private_net_id",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "int_private_net_id": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "int_private_net_id",
+	"name": "int_private_net_id",
+	"property": {
+		"description": "int_private_net_id",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private_net_id",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"int_private_net_id": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_private_subnet_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_private_subnet_id.json
index d9e02b546..be6f87701 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/int_private_subnet_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_private_subnet_id.json
@@ -1,37 +1,38 @@
 {
-  "tags": "int_private_subnet_id",
-  "name": "int_private_subnet_id",
-  "property": {
-    "description": "int_private_subnet_id",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private_subnet_id",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "int_private_subnet_id": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "int_private_subnet_id",
+	"name": "int_private_subnet_id",
+	"property": {
+		"description": "int_private_subnet_id",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private_subnet_id",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"int_private_subnet_id": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/key_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/key_name.json
index 2633f1d41..909cffb38 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/key_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/key_name.json
@@ -1,33 +1,38 @@
 {
-  "name": "key_name",
-  "tags": "key_name",
-  "updated-by": "Singal, Kapil <ks220y@att.com>",
-  "property": {
-    "type": "string",
-    "description": "key_name"
-  },
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/key_name",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "key_name": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "key_name",
+	"name": "key_name",
+	"property": {
+		"description": "key_name",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/key_name",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"key_name": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/keypair.json b/components/model-catalog/resource-dictionary/starter-dictionary/keypair.json
index 2b464a8d7..5a7fb2194 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/keypair.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/keypair.json
@@ -1,37 +1,38 @@
 {
-  "tags": "keypair",
-  "name": "keypair",
-  "property": {
-    "description": "keypair",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/keypair",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "keypair": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "keypair",
+	"name": "keypair",
+	"property": {
+		"description": "keypair",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/keypair",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"keypair": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json
index 279ca92c9..0050bb60d 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json
@@ -1,49 +1,50 @@
 {
-  "tags": "management-prefix-id",
-  "name": "management-prefix-id",
-  "property": {
-    "description": "management-prefix-id",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/management-prefix-id",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "management-prefix-id": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    },
-    "processor-db": {
-      "type": "source-db",
-      "properties": {
-        "endpoint-selector": "dynamic-db-source",
-        "type": "SQL",
-        "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"management\"",
-        "input-key-mapping": {},
-        "output-key-mapping": {
-          "management-prefix-id": "prefix_id"
-        }
-      }
-    }
-  }
-}
+	"tags": "management-prefix-id",
+	"name": "management-prefix-id",
+	"property": {
+		"description": "management-prefix-id",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/management-prefix-id",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"management-prefix-id": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		},
+		"processor-db": {
+			"type": "source-db",
+			"properties": {
+				
+				"type": "SQL",
+				"query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"management\"",
+				"input-key-mapping": {},
+				"output-key-mapping": {
+					"management-prefix-id": "prefix_id"
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/name_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/name_0.json
index 433a3b724..59d8f9511 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/name_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/name_0.json
@@ -1,15 +1,15 @@
 {
-  "name" : "name_0",
-  "tags" : "name_0",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "name_0",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : { }
-    }
-  }
+	"tags": "name_0",
+	"name": "name_0",
+	"property": {
+		"description": "name_0",
+		"type": "string"
+	},
+	"updated-by": "Singal, Kapil <ks220y@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input",
+			"properties": {}
+		}
+	}
 }
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/nb_api_version.json b/components/model-catalog/resource-dictionary/starter-dictionary/nb_api_version.json
index 55784fec5..c089dea9c 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/nb_api_version.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/nb_api_version.json
@@ -1,37 +1,38 @@
 {
-  "tags": "nb_api_version",
-  "name": "nb_api_version",
-  "property": {
-    "description": "nb_api_version",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/nb_api_version",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "nb_api_version": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "nb_api_version",
+	"name": "nb_api_version",
+	"property": {
+		"description": "nb_api_version",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/nb_api_version",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"nb_api_version": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/nexus_artifact_repo.json b/components/model-catalog/resource-dictionary/starter-dictionary/nexus_artifact_repo.json
index f1173e4a2..1cb2224b7 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/nexus_artifact_repo.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/nexus_artifact_repo.json
@@ -1,37 +1,38 @@
 {
-  "tags": "nexus_artifact_repo",
-  "name": "nexus_artifact_repo",
-  "property": {
-    "description": "nexus_artifact_repo",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/nexus_artifact_repo",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "nexus_artifact_repo": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "nexus_artifact_repo",
+	"name": "nexus_artifact_repo",
+	"property": {
+		"description": "nexus_artifact_repo",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/nexus_artifact_repo",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"nexus_artifact_repo": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/nf-role.json b/components/model-catalog/resource-dictionary/starter-dictionary/nf-role.json
index 90f5b4943..f666cf42d 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/nf-role.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/nf-role.json
@@ -1,30 +1,31 @@
 {
-  "name" : "nf-role",
-  "tags" : "nf-role",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vnf/nf-role",
-    "type" : "string"
-  },
-  "sources" : {
-    "default": {
-      "type": "source-default",
-      "properties": {
-      }
-    },
-    "processor-db" : {
-      "type" : "source-db",
-      "properties" : {
-        "type" : "SQL",
-        "query" : "select sdnctl.VF_MODEL.nf_role as vf_model_role from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnfmodelcustomizationuuid",
-        "input-key-mapping" : {
-          "vnfmodelcustomizationuuid" : "vnf-model-customization-uuid"
-        },
-        "output-key-mapping" : {
-          "nf-role" : "vf_model_role"
-        },
-        "key-dependencies" : [ "vnf-model-customization-uuid" ]
-      }
-    }
-  }
-}
+	"tags": "nf-role",
+	"name": "nf-role",
+	"property": {
+		"description": "vnf/nf-role",
+		"type": "string"
+	},
+	"updated-by": "Singal, Kapil <ks220y@att.com>",
+	"sources": {
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"processor-db": {
+			"type": "source-db",
+			"properties": {
+				"type": "SQL",
+				"query": "select sdnctl.VF_MODEL.nf_role as vf_model_role from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnfmodelcustomizationuuid",
+				"input-key-mapping": {
+					"vnfmodelcustomizationuuid": "vnf-model-customization-uuid"
+				},
+				"output-key-mapping": {
+					"nf-role": "vf_model_role"
+				},
+				"key-dependencies": [
+					"vnf-model-customization-uuid"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json b/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json
index 55d81776d..0a578c9cf 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json
@@ -1,35 +1,35 @@
 {
-  "tags": "nfc-naming-code",
-  "name": "nfc-naming-code",
-  "property": {
-    "description": "nfc-naming-code",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "processor-db": {
-      "type": "source-db",
-      "properties": {
-        "endpoint-selector": "dynamic-db-source",
-        "type": "SQL",
-        "query": "select nfc_naming_code as nfc_naming_code from sdnctl.VFC_MODEL where customization_uuid=:vfccustomizationuuid",
-        "input-key-mapping": {
-          "vfccustomizationuuid": "vfccustomizationuuid"
-        },
-        "output-key-mapping": {
-          "nfc-naming-code": "nfc_naming_code"
-        },
-        "key-dependencies": [
-          "vfccustomizationuuid"
-        ]
-      }
-    }
-  }
-}
+	"tags": "nfc-naming-code",
+	"name": "nfc-naming-code",
+	"property": {
+		"description": "nfc-naming-code",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"processor-db": {
+			"type": "source-db",
+			"properties": {
+				"type": "SQL",
+				"query": "select nfc_naming_code as nfc_naming_code from sdnctl.VFC_MODEL where customization_uuid=:vfccustomizationuuid",
+				"input-key-mapping": {
+					"vfccustomizationuuid": "vfccustomizationuuid"
+				},
+				"output-key-mapping": {
+					"nfc-naming-code": "nfc_naming_code"
+				},
+				"key-dependencies": [
+					"vfccustomizationuuid"
+				],
+				"endpoint-selector": "dynamic-db-source"
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json
index 83144eb41..9c9d677a7 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json
@@ -1,49 +1,50 @@
 {
-  "tags": "onap_private_net_cidr",
-  "name": "onap_private_net_cidr",
-  "property": {
-    "description": "onap_private_net_cidr",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_net_cidr",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "onap_private_net_cidr": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    },
-    "processor-db": {
-      "type": "source-db",
-      "properties": {
-        "endpoint-selector": "dynamic-db-source",
-        "type": "SQL",
-        "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"management\"",
-        "input-key-mapping": {},
-        "output-key-mapping": {
-          "onap_private_net_cidr": "prefix"
-        }
-      }
-    }
-  }
-}
+	"tags": "onap_private_net_cidr",
+	"name": "onap_private_net_cidr",
+	"property": {
+		"description": "onap_private_net_cidr",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"processor-db": {
+			"type": "source-db",
+			"properties": {
+				
+				"type": "SQL",
+				"query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"management\"",
+				"input-key-mapping": {},
+				"output-key-mapping": {
+					"onap_private_net_cidr": "prefix"
+				}
+			}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_net_cidr",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"onap_private_net_cidr": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_id.json
index f2bcb9a11..8c98843e1 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_id.json
@@ -1,38 +1,38 @@
 {
-      "tags": "onap_private_net_id",
-      "name": "onap_private_net_id",
-      "property": {
-        "description": "onap_private_net_id",
-        "type": "string"
-      },
-      "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-      "sources": {
-        "input": {
-          "type": "source-input"
-        },
-        "default": {
-          "type": "source-default",
-          "properties": {}
-        },
-        "sdnc": {
-          "type": "source-rest",
-          "properties": {
-            "type": "JSON",
-            "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_net_id",
-            "path": "/param/0/value",
-            "input-key-mapping": {
-              "service-instance-id": "service-instance-id",
-              "vnf-id": "vnf-id"
-            },
-            "output-key-mapping": {
-              "onap_private_net_id": "value"
-            },
-            "key-dependencies": [
-              "service-instance-id",
-              "vnf-id"
-            ]
-          }
-        }
-      }
-    
-  }
+	"tags": "onap_private_net_id",
+	"name": "onap_private_net_id",
+	"property": {
+		"description": "onap_private_net_id",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_net_id",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"onap_private_net_id": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_subnet_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_subnet_id.json
index 034899342..e55b0bdef 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_subnet_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_subnet_id.json
@@ -1,37 +1,38 @@
 {
-  "tags": "onap_private_subnet_id",
-  "name": "onap_private_subnet_id",
-  "property": {
-    "description": "onap_private_subnet_id",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_subnet_id",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "onap_private_subnet_id": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "onap_private_subnet_id",
+	"name": "onap_private_subnet_id",
+	"property": {
+		"description": "onap_private_subnet_id",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_subnet_id",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"onap_private_subnet_id": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pg_int.json b/components/model-catalog/resource-dictionary/starter-dictionary/pg_int.json
index 2747b689d..f7ba07655 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/pg_int.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pg_int.json
@@ -1,37 +1,38 @@
 {
-  "tags": "pg_int",
-  "name": "pg_int",
-  "property": {
-    "description": "pg_int",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/pg_int",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "pg_int": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "pg_int",
+	"name": "pg_int",
+	"property": {
+		"description": "pg_int",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/pg_int",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"pg_int": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_cidr.json
index dc86efa1a..0eaaf9b36 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_cidr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_cidr.json
@@ -1,50 +1,50 @@
- {
-      "tags": "pktgen_private_net_cidr",
-      "name": "pktgen_private_net_cidr",
-      "property": {
-        "description": "pktgen_private_net_cidr",
-        "type": "string"
-      },
-      "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-      "sources": {
-        "input": {
-          "type": "source-input"
-        },
-        "default": {
-          "type": "source-default",
-          "properties": {}
-        },
-        "sdnc": {
-          "type": "source-rest",
-          "properties": {
-            "type": "JSON",
-            "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/pktgen_private_net_cidr",
-            "path": "/param/0/value",
-            "input-key-mapping": {
-              "service-instance-id": "service-instance-id",
-              "vnf-id": "vnf-id"
-            },
-            "output-key-mapping": {
-              "pktgen_private_net_cidr": "value"
-            },
-            "key-dependencies": [
-              "service-instance-id",
-              "vnf-id"
-            ]
-          }
-        },
-      
-      "processor-db": {
-        "type": "source-db",
-        "properties": {
-          "endpoint-selector": "dynamic-db-source",
-          "type": "SQL",
-          "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private2\"",
-          "input-key-mapping": {},
-          "output-key-mapping": {
-            "onap_private_net_cidr": "prefix"
-          }
-        }
-      }
-    }
-  }
+{
+	"tags": "pktgen_private_net_cidr",
+	"name": "pktgen_private_net_cidr",
+	"property": {
+		"description": "pktgen_private_net_cidr",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"processor-db": {
+			"type": "source-db",
+			"properties": {
+				"type": "SQL",
+				"query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private2\"",
+				"output-key-mapping": {
+					"pktgen_private_net_cidr": "prefix"
+				},
+				
+				"input-key-mapping": {}
+			}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/pktgen_private_net_cidr",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"pktgen_private_net_cidr": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_id.json
index 9c8c61080..c72117ffe 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_id.json
@@ -1,37 +1,38 @@
-  {
-      "tags": "pktgen_private_net_id",
-      "name": "pktgen_private_net_id",
-      "property": {
-        "description": "pktgen_private_net_id",
-        "type": "string"
-      },
-      "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-      "sources": {
-        "input": {
-          "type": "source-input"
-        },
-        "default": {
-          "type": "source-default",
-          "properties": {}
-        },
-        "sdnc": {
-          "type": "source-rest",
-          "properties": {
-            "type": "JSON",
-            "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/pktgen_private_net_id",
-            "path": "/param/0/value",
-            "input-key-mapping": {
-              "service-instance-id": "service-instance-id",
-              "vnf-id": "vnf-id"
-            },
-            "output-key-mapping": {
-              "pktgen_private_net_id": "value"
-            },
-            "key-dependencies": [
-              "service-instance-id",
-              "vnf-id"
-            ]
-          }
-        }
-      }
-    }
+{
+	"tags": "pktgen_private_net_id",
+	"name": "pktgen_private_net_id",
+	"property": {
+		"description": "pktgen_private_net_id",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/pktgen_private_net_id",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"pktgen_private_net_id": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json
index 53f43a8fa..b3b9412d6 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json
@@ -1,49 +1,50 @@
 {
-  "tags": "private1-prefix-id",
-  "name": "private1-prefix-id",
-  "property": {
-    "description": "private1-prefix-id",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/private1-prefix-id",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "private1-prefix-id": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    },
-    "processor-db": {
-      "type": "source-db",
-      "properties": {
-        "endpoint-selector": "dynamic-db-source",
-        "type": "SQL",
-        "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private1\"",
-        "input-key-mapping": {},
-        "output-key-mapping": {
-          "private1-prefix-id": "prefix_id"
-        }
-      }
-    }
-  }
-}
+	"tags": "private1-prefix-id",
+	"name": "private1-prefix-id",
+	"property": {
+		"description": "private1-prefix-id",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/private1-prefix-id",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"private1-prefix-id": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		},
+		"processor-db": {
+			"type": "source-db",
+			"properties": {
+				
+				"type": "SQL",
+				"query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private1\"",
+				"input-key-mapping": {},
+				"output-key-mapping": {
+					"private1-prefix-id": "prefix_id"
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json
index 8498dd372..02dade7c4 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json
@@ -1,49 +1,50 @@
 {
-  "tags": "private2-prefix-id",
-  "name": "private2-prefix-id",
-  "property": {
-    "description": "private2-prefix-id",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/private2-prefix-id",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "private2-prefix-id": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    },
-    "processor-db": {
-      "type": "source-db",
-      "properties": {
-        "endpoint-selector": "dynamic-db-source",
-        "type": "SQL",
-        "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private2\"",
-        "input-key-mapping": {},
-        "output-key-mapping": {
-          "private2-prefix-id": "prefix_id"
-        }
-      }
-    }
-  }
-}
+	"tags": "private2-prefix-id",
+	"name": "private2-prefix-id",
+	"property": {
+		"description": "private2-prefix-id",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/private2-prefix-id",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"private2-prefix-id": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		},
+		"processor-db": {
+			"type": "source-db",
+			"properties": {
+				
+				"type": "SQL",
+				"query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private2\"",
+				"input-key-mapping": {},
+				"output-key-mapping": {
+					"private2-prefix-id": "prefix_id"
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pub_key.json b/components/model-catalog/resource-dictionary/starter-dictionary/pub_key.json
index b7c1da775..cb25ed47c 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/pub_key.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pub_key.json
@@ -1,37 +1,38 @@
 {
-  "tags": "pub_key",
-  "name": "pub_key",
-  "property": {
-    "description": "pub_key",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/pub_key",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "pub_key": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "pub_key",
+	"name": "pub_key",
+	"property": {
+		"description": "pub_key",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/pub_key",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"pub_key": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/public_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/public_net_id.json
index 34c37677b..66e7aeeec 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/public_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/public_net_id.json
@@ -1,38 +1,38 @@
-  {
-      "tags": "public_net_id",
-      "name": "public_net_id",
-      "property": {
-        "description": "public_net_id",
-        "type": "string"
-      },
-      "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-      "sources": {
-        "input": {
-          "type": "source-input"
-        },
-        "default": {
-          "type": "source-default",
-          "properties": {}
-        },
-        "sdnc": {
-          "type": "source-rest",
-          "properties": {
-            "type": "JSON",
-            "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/public_net_id",
-            "path": "/param/0/value",
-            "input-key-mapping": {
-              "service-instance-id": "service-instance-id",
-              "vnf-id": "vnf-id"
-            },
-            "output-key-mapping": {
-              "public_net_id": "value"
-            },
-            "key-dependencies": [
-              "service-instance-id",
-              "vnf-id"
-            ]
-          }
-        }
-      }
-    
-  }
+{
+	"tags": "public_net_id",
+	"name": "public_net_id",
+	"property": {
+		"description": "public_net_id",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/public_net_id",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"public_net_id": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/put-active-streams.json b/components/model-catalog/resource-dictionary/starter-dictionary/put-active-streams.json
new file mode 100644
index 000000000..56237d815
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/put-active-streams.json
@@ -0,0 +1,40 @@
+{
+  "name": "put-active-streams",
+  "tags": "put-active-streams",
+  "property": {
+    "description": "put-active-streams",
+    "type": "string"
+  },
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+  "sources": {
+    "input": {
+      "type": "source-input"
+    },
+    "default": {
+      "type": "source-default",
+      "properties": {}
+    },
+    "sdnc": {
+      "type": "source-rest",
+      "properties": {
+        "verb": "PUT",
+        "type": "JSON",
+        "url-path": "$vpg_onap_private_ip_0:8183/restconf/config/stream-count:stream-count/streams",
+        "path": "/param/0/value",
+        "input-key-mapping": {
+          "vpg_onap_private_ip_0": "vpg_onap_private_ip_0",
+          "active-streams": "active-streams"
+        },
+        "output-key-mapping": {
+    
+        },
+        "key-dependencies": [
+          "vpg_onap_private_ip_0",
+          "active-streams"
+        ],
+        "endpoint-selector": "vpkg-rest-api",
+        "payload": "{\"streams\": {\"active-streams\": $active-streams}}"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/sec_group.json b/components/model-catalog/resource-dictionary/starter-dictionary/sec_group.json
index 0dca85995..deb0a59b9 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/sec_group.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/sec_group.json
@@ -1,38 +1,38 @@
-  {
-      "tags": "sec_group",
-      "name": "sec_group",
-      "property": {
-        "description": "sec_group",
-        "type": "string"
-      },
-      "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-      "sources": {
-        "input": {
-          "type": "source-input"
-        },
-        "default": {
-          "type": "source-default",
-          "properties": {}
-        },
-        "sdnc": {
-          "type": "source-rest",
-          "properties": {
-            "type": "JSON",
-            "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/sec_group",
-            "path": "/param/0/value",
-            "input-key-mapping": {
-              "service-instance-id": "service-instance-id",
-              "vnf-id": "vnf-id"
-            },
-            "output-key-mapping": {
-              "sec_group": "value"
-            },
-            "key-dependencies": [
-              "service-instance-id",
-              "vnf-id"
-            ]
-          }
-        }
-      }
-    
-  }
+{
+	"tags": "sec_group",
+	"name": "sec_group",
+	"property": {
+		"description": "sec_group",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/sec_group",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"sec_group": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json
index 4b1f4f38f..533b8042a 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json
@@ -1,45 +1,43 @@
 {
-  "name" : "service-instance-id",
-  "tags" : "service-instance-id, tosca.datatypes.Root, data_type",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "To be provided",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : { }
-    },
-    "any-db": {
-      "type": "source-db",
-      "properties": {
-        "query": "SELECT artifact_name FROM BLUEPRINT_MODEL where artifact_version=\"1.0.0\"",
-        "input-key-mapping": {
-        },
-        "output-key-mapping": {
-          "service-instance-id": "artifact_name"
-        }
-      }
-    },
-    "processor-db": {
-      "type": "source-db",
-      "properties": {
-        "query": "SELECT artifact_name FROM BLUEPRINT_MODEL where artifact_version=\"1.0.0\"",
-        "input-key-mapping": {
-        },
-        "output-key-mapping": {
-          "service-instance-id": "artifact_name"
-        }
-      }
-    },
-    "capability": {
-      "type": "source-capability",
-      "properties": {
-          "script-type": "jython",
-          "script-class-reference": "SampleRAProcessor",
-          "instance-dependencies": []
-      }
-    }
-  }
-}
+	"tags": "service-instance-id, tosca.datatypes.Root, data_type",
+	"name": "service-instance-id",
+	"property": {
+		"description": "To be provided",
+		"type": "string"
+	},
+	"updated-by": "Singal, Kapil <ks220y@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input",
+			"properties": {}
+		},
+		"any-db": {
+			"type": "source-db",
+			"properties": {
+				"query": "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
+				"input-key-mapping": {},
+				"output-key-mapping": {
+					"service-instance-id": "artifact_name"
+				}
+			}
+		},
+		"processor-db": {
+			"type": "source-db",
+			"properties": {
+				"query": "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
+				"input-key-mapping": {},
+				"output-key-mapping": {
+					"service-instance-id": "artifact_name"
+				}
+			}
+		},
+		"capability": {
+			"type": "source-capability",
+			"properties": {
+				"script-type": "jython",
+				"script-class-reference": "SampleRAProcessor",
+				"instance-dependencies": []
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_flavor_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_flavor_name.json
index 445bc4732..31f55b32d 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_flavor_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_flavor_name.json
@@ -1,39 +1,38 @@
-  {
-  
-      "tags": "vdns_flavor_name",
-      "name": "vdns_flavor_name",
-      "property": {
-        "description": "vdns_flavor_name",
-        "type": "string"
-      },
-      "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-      "sources": {
-        "input": {
-          "type": "source-input"
-        },
-        "default": {
-          "type": "source-default",
-          "properties": {}
-        },
-        "sdnc": {
-          "type": "source-rest",
-          "properties": {
-            "type": "JSON",
-            "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vdns_flavor_name",
-            "path": "/param/0/value",
-            "input-key-mapping": {
-              "service-instance-id": "service-instance-id",
-              "vnf-id": "vnf-id"
-            },
-            "output-key-mapping": {
-              "vdns_flavor_name": "value"
-            },
-            "key-dependencies": [
-              "service-instance-id",
-              "vnf-id"
-            ]
-          }
-        }
-      }
-    
-  }
+{
+	"tags": "vdns_flavor_name",
+	"name": "vdns_flavor_name",
+	"property": {
+		"description": "vdns_flavor_name",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vdns_flavor_name",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vdns_flavor_name": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_image_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_image_name.json
index d1d9d0604..7ba8f2706 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_image_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_image_name.json
@@ -1,37 +1,38 @@
 {
-  "tags": "vdns_image_name",
-  "name": "vdns_image_name",
-  "property": {
-    "description": "vdns_image_name",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vdns_image_name",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "vdns_image_name": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "vdns_image_name",
+	"name": "vdns_image_name",
+	"property": {
+		"description": "vdns_image_name",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vdns_image_name",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vdns_image_name": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_int_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_int_private_ip_0.json
index 902cd27aa..6c3f7f473 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_int_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_int_private_ip_0.json
@@ -1,37 +1,40 @@
 {
-  "tags": "vdns_int_private_ip_0",
-  "name": "vdns_int_private_ip_0",
-  "property": {
-    "description": "vdns_int_private_ip_0",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vdns_int_private_ip_0",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "vdns_int_private_ip_0": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "vdns_int_private_ip_0",
+	"name": "vdns_int_private_ip_0",
+	"property": {
+		"description": "vdns_int_private_ip_0",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules/vf-module/$vdns_vf_module_id/vf-module-data/vf-module-topology/vf-module-parameters/param/vdns_int_private_ip_0",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id",
+					"vdns_vf_module_id": "vdns_vf_module_id"
+				},
+				"output-key-mapping": {
+					"vdns_int_private_ip_0": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id",
+					"vdns_vf_module_id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_name_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_name_0.json
index efc741897..693d7f15f 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_name_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_name_0.json
@@ -1,38 +1,38 @@
- {
-      "tags": "vdns_name_0",
-      "name": "vdns_name_0",
-      "property": {
-        "description": "vdns_name_0",
-        "type": "string"
-      },
-      "updated-by": "Singal, Kapil <ks220y@att.com>",
-      "sources": {
-        "input": {
-          "type": "source-input"
-        },
-        "default": {
-          "type": "source-default",
-          "properties": {}
-        },
-        "sdnc": {
-          "type": "source-rest",
-          "properties": {
-            "type": "JSON",
-            "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vdns_name_0",
-            "path": "/param/0/value",
-            "input-key-mapping": {
-              "service-instance-id": "service-instance-id",
-              "vnf-id": "vnf-id"
-            },
-            "output-key-mapping": {
-              "vdns_name_0": "value"
-            },
-            "key-dependencies": [
-              "service-instance-id",
-              "vnf-id"
-            ]
-          }
-        }
-      }
-    
-  }
+{
+	"tags": "vdns_name_0",
+	"name": "vdns_name_0",
+	"property": {
+		"description": "vdns_name_0",
+		"type": "string"
+	},
+	"updated-by": "Singal, Kapil <ks220y@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vdns_name_0",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vdns_name_0": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_onap_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_onap_private_ip_0.json
index d6f1e37e7..96aa4e81a 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_onap_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_onap_private_ip_0.json
@@ -1,37 +1,40 @@
 {
-  "tags": "vdns_onap_private_ip_0",
-  "name": "vdns_onap_private_ip_0",
-  "property": {
-    "description": "vdns_onap_private_ip_0",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vdns_onap_private_ip_0",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "vdns_onap_private_ip_0": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "vdns_onap_private_ip_0",
+	"name": "vdns_onap_private_ip_0",
+	"property": {
+		"description": "vdns_onap_private_ip_0",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules/vf-module/$vdns_vf_module_id/vf-module-data/vf-module-topology/vf-module-parameters/param/vdns_onap_private_ip_0",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id",
+					"vdns_vf_module_id": "vdns_vf_module_id"
+				},
+				"output-key-mapping": {
+					"vdns_onap_private_ip_0": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id",
+					"vdns_vf_module_id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_vf_module_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_vf_module_id.json
new file mode 100644
index 000000000..d428268b6
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_vf_module_id.json
@@ -0,0 +1,53 @@
+{
+	"tags": "vdns_vf_module_id",
+	"name": "vdns_vf_module_id",
+	"property": {
+		"description": "vdns_vf_module_id",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vdns_vf_module_id",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vdns_vf_module_id": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		},
+		"aai-data": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/aai/v14/network/generic-vnfs/generic-vnf/$vnf-id",
+				"path": "",
+				"input-key-mapping": {
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vdns_vf_module_id": "nm-profile-name"
+				},
+				"key-dependencies": [
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json
index 55526b12b..7e52d0801 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json
@@ -1,34 +1,35 @@
 {
-  "tags": "vf-module-label",
-  "name": "vf-module-label",
-  "property": {
-    "description": "vf-module-label",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "processor-db": {
-      "type": "source-db",
-      "properties": {
-        "type": "SQL",
-        "query": "select sdnctl.VF_MODULE_MODEL.vf_module_label as vf_module_label from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
-        "input-key-mapping": {
-          "customizationid": "vf-module-model-customization-uuid"
-        },
-        "output-key-mapping": {
-          "vf-module-label": "vf_module_label"
-        },
-        "key-dependencies": [
-          "vf-module-model-customization-uuid"
-        ]
-      }
-    }
-  }
-}
+	"tags": "vf-module-label",
+	"name": "vf-module-label",
+	"property": {
+		"description": "vf-module-label",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"processor-db": {
+			"type": "source-db",
+			"properties": {
+				"type": "SQL",
+				"query": "select sdnctl.VF_MODULE_MODEL.vf_module_label as vf_module_label from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
+				"input-key-mapping": {
+					"customizationid": "vf-module-model-customization-uuid"
+				},
+				"output-key-mapping": {
+					"vf-module-label": "vf_module_label"
+				},
+				"key-dependencies": [
+					"vf-module-model-customization-uuid"
+				],
+				"endpoint-selector": "dynamic-db-source"
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-model-customization-uuid.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-model-customization-uuid.json
index 232d6580b..6443235c8 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-model-customization-uuid.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-model-customization-uuid.json
@@ -1,18 +1,18 @@
 {
-  "tags": "vf-module-model-customization-uuid",
-  "name": "vf-module-model-customization-uuid",
-  "property": {
-    "description": "vf-module-model-customization-uuid",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    }
-  }
+	"tags": "vf-module-model-customization-uuid",
+	"name": "vf-module-model-customization-uuid",
+	"property": {
+		"description": "vf-module-model-customization-uuid",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		}
+	}
 }
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-name.json
new file mode 100644
index 000000000..0cd9da12a
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-name.json
@@ -0,0 +1,18 @@
+{
+	"tags": "vf-module-name",
+	"name": "vf-module-name",
+	"property": {
+		"description": "vf_module_name",
+		"type": "string"
+	},
+	"updated-by": "Singal, Kapil <ks220y@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json
index dcef02774..06f36104a 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json
@@ -1,34 +1,35 @@
 {
-  "tags": "vf-module-type",
-  "name": "vf-module-type",
-  "property": {
-    "description": "vf-module-type",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "processor-db": {
-      "type": "source-db",
-      "properties": {
-        "type": "SQL",
-        "query": "select vf_module_type as vf_module_type from sdnctl.VF_MODULE_MODEL where customization_uuid=:customizationid",
-        "input-key-mapping": {
-          "customizationid": "vf-module-model-customization-uuid"
-        },
-        "output-key-mapping": {
-          "vf-module-type": "vf_module_type"
-        },
-        "key-dependencies": [
-          "vf-module-model-customization-uuid"
-        ]
-      }
-    }
-  }
-}
+	"tags": "vf-module-type",
+	"name": "vf-module-type",
+	"property": {
+		"description": "vf-module-type",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"processor-db": {
+			"type": "source-db",
+			"properties": {
+				"type": "SQL",
+				"query": "select vf_module_type as vf_module_type from sdnctl.VF_MODULE_MODEL where customization_uuid=:customizationid",
+				"output-key-mapping": {
+					"vf-module-type": "vf_module_type"
+				},
+				
+				"input-key-mapping": {
+					"customizationid": "vf-module-model-customization-uuid"
+				},
+				"key-dependencies": [
+					"vf-module-model-customization-uuid"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-naming-policy.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-naming-policy.json
index 6c9639cae..7af89e193 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-naming-policy.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-naming-policy.json
@@ -1,30 +1,52 @@
 {
-  "name" : "vf-naming-policy",
-  "tags" : "vf-naming-policy",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vf-naming-policy",
-    "type" : "string"
-  },
-  "sources" : {
-    "default": {
-      "type": "source-default",
-      "properties": {
-      }
-    },
-    "processor-db" : {
-      "type" : "source-db",
-      "properties" : {
-        "type" : "SQL",
-        "query" : "select sdnctl.VF_MODEL.naming_policy as vf_naming_policy from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnf_model_customization_uuid",
-        "input-key-mapping" : {
-          "vnf_model_customization_uuid" : "vnf-model-customization-uuid"
-        },
-        "output-key-mapping" : {
-          "vf-naming-policy" : "vf_naming_policy"
-        },
-        "key-dependencies" : [ "vnf-model-customization-uuid" ]
-      }
-    }
-  }
-}
+	"tags": "vf-naming-policy",
+	"name": "vf-naming-policy",
+	"property": {
+		"description": "vf-naming-policy",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vf-naming-policy",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vf-naming-policy": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		},
+		"processor-db": {
+			"type": "source-db",
+			"properties": {
+				
+				"type": "SQL",
+				"query": "select sdnctl.VF_MODEL.naming_policy as vf_naming_policy from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnf_model_customization_uuid",
+				"input-key-mapping": {
+					"vnf_model_customization_uuid": "vnf-model-customization-uuid"
+				},
+				"output-key-mapping": {
+					"vf-naming-policy": "vf_naming_policy"
+				},
+				"key-dependencies": [
+					"vnf-model-customization-uuid"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-nf-code.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-nf-code.json
index 1bf36ef39..e4d4e6d5a 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-nf-code.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-nf-code.json
@@ -1,25 +1,27 @@
 {
-  "name" : "vf-nf-code",
-  "tags" : "vf-nf-code",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vf-nf-code",
-    "type" : "string"
-  },
-  "sources" : {
-    "processor-db" : {
-      "type" : "source-db",
-      "properties" : {
-        "type" : "SQL",
-        "query" : "select sdnctl.VF_MODEL.nf_code as vf_nf_code from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:customizationid",
-        "input-key-mapping" : {
-          "customizationid" : "vnf-model-customization-uuid"
-        },
-        "output-key-mapping" : {
-          "vf-nf-code" : "vf_nf_code"
-        },
-        "key-dependencies" : [ "vnf-model-customization-uuid" ]
-      }
-    }
-  }
-}
+	"tags": "vf-nf-code",
+	"name": "vf-nf-code",
+	"property": {
+		"description": "vf-nf-code",
+		"type": "string"
+	},
+	"updated-by": "Singal, Kapil <ks220y@att.com>",
+	"sources": {
+		"processor-db": {
+			"type": "source-db",
+			"properties": {
+				"type": "SQL",
+				"query": "select sdnctl.VF_MODEL.nf_code as vf_nf_code from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:customizationid",
+				"input-key-mapping": {
+					"customizationid": "vnf-model-customization-uuid"
+				},
+				"output-key-mapping": {
+					"vf-nf-code": "vf_nf_code"
+				},
+				"key-dependencies": [
+					"vnf-model-customization-uuid"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf_module_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf_module_id.json
index ff0c59773..231d2c5a5 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf_module_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf_module_id.json
@@ -1,19 +1,18 @@
-  {
-      "tags": "vf_module_id",
-      "name": "vf_module_id",
-      "property": {
-        "description": "vf_module_id",
-        "type": "string"
-      },
-      "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-      "sources": {
-        "input": {
-          "type": "source-input"
-        },
-        "default": {
-          "type": "source-default",
-          "properties": {}
-        }
-      }
-    
-  }
\ No newline at end of file
+{
+	"tags": "vf_module_id",
+	"name": "vf_module_id",
+	"property": {
+		"description": "vf_module_id",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"input": {
+			"type": "source-input"
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json
index bd8f5e123..694f0e733 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json
@@ -1,35 +1,35 @@
 {
-  "tags": "vfccustomizationuuid",
-  "name": "vfccustomizationuuid",
-  "property": {
-    "description": "vfccustomizationuuid",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "processor-db": {
-      "type": "source-db",
-      "properties": {
-        "endpoint-selector": "dynamic-db-source",
-        "type": "SQL",
-        "query": "select sdnctl.VF_MODULE_TO_VFC_MAPPING.vfc_customization_uuid as vnf_customid from sdnctl.VF_MODULE_TO_VFC_MAPPING where vm_count = 1 and sdnctl.VF_MODULE_TO_VFC_MAPPING.vf_module_customization_uuid=:vfmodulecustomizationuuid",
-        "input-key-mapping": {
-          "vfmodulecustomizationuuid": "vf-module-model-customization-uuid"
-        },
-        "output-key-mapping": {
-          "vfccustomizationuuid": "vnf_customid"
-        },
-        "key-dependencies": [
-          "vf-module-model-customization-uuid"
-        ]
-      }
-    }
-  }
-}
+	"tags": "vfccustomizationuuid",
+	"name": "vfccustomizationuuid",
+	"property": {
+		"description": "vfccustomizationuuid",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"processor-db": {
+			"type": "source-db",
+			"properties": {
+				
+				"type": "SQL",
+				"query": "select sdnctl.VF_MODULE_TO_VFC_MAPPING.vfc_customization_uuid as vnf_customid from sdnctl.VF_MODULE_TO_VFC_MAPPING where vm_count = 1 and sdnctl.VF_MODULE_TO_VFC_MAPPING.vf_module_customization_uuid=:vfmodulecustomizationuuid",
+				"input-key-mapping": {
+					"vfmodulecustomizationuuid": "vf-module-model-customization-uuid"
+				},
+				"output-key-mapping": {
+					"vfccustomizationuuid": "vnf_customid"
+				},
+				"key-dependencies": [
+					"vf-module-model-customization-uuid"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_flavor_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_flavor_name.json
new file mode 100644
index 000000000..bd539cde5
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_flavor_name.json
@@ -0,0 +1,38 @@
+{
+	"tags": "vfw_flavor_name",
+	"name": "vfw_flavor_name",
+	"property": {
+		"description": "vfw_flavor_name",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_flavor_name",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vfw_flavor_name": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_image_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_image_name.json
new file mode 100644
index 000000000..4878d572f
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_image_name.json
@@ -0,0 +1,38 @@
+{
+	"tags": "vfw_image_name",
+	"name": "vfw_image_name",
+	"property": {
+		"description": "vfw_image_name",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_image_name",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vfw_image_name": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_int_private1_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_int_private1_ip_0.json
new file mode 100644
index 000000000..7374f6fb9
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_int_private1_ip_0.json
@@ -0,0 +1,38 @@
+{
+	"tags": "vfw_int_private1_ip_0",
+	"name": "vfw_int_private1_ip_0",
+	"property": {
+		"description": "vfw_int_private1_ip_0",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_int_private1_ip_0",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vfw_int_private1_ip_0": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_int_private2_floating_ip.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_int_private2_floating_ip.json
new file mode 100644
index 000000000..d6ef22116
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_int_private2_floating_ip.json
@@ -0,0 +1,38 @@
+{
+	"tags": "vfw_int_private2_floating_ip",
+	"name": "vfw_int_private2_floating_ip",
+	"property": {
+		"description": "vfw_int_private2_floating_ip",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_int_private2_floating_ip",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vfw_int_private2_floating_ip": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_int_private2_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_int_private2_ip_0.json
new file mode 100644
index 000000000..c45e549bb
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_int_private2_ip_0.json
@@ -0,0 +1,38 @@
+{
+	"tags": "vfw_int_private2_ip_0",
+	"name": "vfw_int_private2_ip_0",
+	"property": {
+		"description": "vfw_int_private2_ip_0",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_int_private2_ip_0",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vfw_int_private2_ip_0": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_name_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_name_0.json
index 96a975859..6f774bf65 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_name_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_name_0.json
@@ -1,15 +1,38 @@
 {
-  "name" : "vfw_name_0",
-  "tags" : "vfw_name_0",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vfw_name_0",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : { }
-    }
-  }
+	"tags": "vfw_name_0",
+	"name": "vfw_name_0",
+	"property": {
+		"description": "vfw_name_0",
+		"type": "string"
+	},
+	"updated-by": "Singal, Kapil <ks220y@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_name_0",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vfw_name_0": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_onap_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_onap_private_ip_0.json
new file mode 100644
index 000000000..da65a00eb
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_onap_private_ip_0.json
@@ -0,0 +1,38 @@
+{
+	"tags": "vfw_onap_private_ip_0",
+	"name": "vfw_onap_private_ip_0",
+	"property": {
+		"description": "vfw_onap_private_ip_0",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_onap_private_ip_0",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vfw_onap_private_ip_0": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vip.json b/components/model-catalog/resource-dictionary/starter-dictionary/vip.json
index 289ab1994..5c649dfc7 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vip.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vip.json
@@ -1,37 +1,38 @@
 {
-  "tags": "vip",
-  "name": "vip",
-  "property": {
-    "description": "vip",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vip",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "vip": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "vip",
+	"name": "vip",
+	"property": {
+		"description": "vip",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vip",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vip": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_0_int_pktgen_private_port_0_mac.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_0_int_pktgen_private_port_0_mac.json
index 7640aa21f..0ab9a5319 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_0_int_pktgen_private_port_0_mac.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_0_int_pktgen_private_port_0_mac.json
@@ -1,37 +1,38 @@
 {
-  "tags": "vlb_0_int_pktgen_private_port_0_mac",
-  "name": "vlb_0_int_pktgen_private_port_0_mac",
-  "property": {
-    "description": "vlb_0_int_pktgen_private_port_0_mac",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_0_int_pktgen_private_port_0_mac",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "vlb_0_int_pktgen_private_port_0_mac": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "vlb_0_int_pktgen_private_port_0_mac",
+	"name": "vlb_0_int_pktgen_private_port_0_mac",
+	"property": {
+		"description": "vlb_0_int_pktgen_private_port_0_mac",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_0_int_pktgen_private_port_0_mac",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vlb_0_int_pktgen_private_port_0_mac": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_flavor_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_flavor_name.json
index 3ba34ee37..157170837 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_flavor_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_flavor_name.json
@@ -1,37 +1,38 @@
 {
-  "tags": "vlb_flavor_name",
-  "name": "vlb_flavor_name",
-  "property": {
-    "description": "vlb_flavor_name",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_flavor_name",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "vlb_flavor_name": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "vlb_flavor_name",
+	"name": "vlb_flavor_name",
+	"property": {
+		"description": "vlb_flavor_name",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_flavor_name",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vlb_flavor_name": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_image_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_image_name.json
index 0db006b55..76c7e67af 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_image_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_image_name.json
@@ -1,37 +1,38 @@
 {
-  "tags": "vlb_image_name",
-  "name": "vlb_image_name",
-  "property": {
-    "description": "vlb_image_name",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_image_name",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "vlb_image_name": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "vlb_image_name",
+	"name": "vlb_image_name",
+	"property": {
+		"description": "vlb_image_name",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_image_name",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vlb_image_name": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_pktgen_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_pktgen_private_ip_0.json
index 04604eb2b..af55cd741 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_pktgen_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_pktgen_private_ip_0.json
@@ -1,37 +1,38 @@
-  {
-      "tags": "vlb_int_pktgen_private_ip_0",
-      "name": "vlb_int_pktgen_private_ip_0",
-      "property": {
-        "description": "vlb_int_pktgen_private_ip_0",
-        "type": "string"
-      },
-      "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-      "sources": {
-        "input": {
-          "type": "source-input"
-        },
-        "default": {
-          "type": "source-default",
-          "properties": {}
-        },
-        "sdnc": {
-          "type": "source-rest",
-          "properties": {
-            "type": "JSON",
-            "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_int_pktgen_private_ip_0",
-            "path": "/param/0/value",
-            "input-key-mapping": {
-              "service-instance-id": "service-instance-id",
-              "vnf-id": "vnf-id"
-            },
-            "output-key-mapping": {
-              "vlb_int_pktgen_private_ip_0": "value"
-            },
-            "key-dependencies": [
-              "service-instance-id",
-              "vnf-id"
-            ]
-          }
-        }
-      }
-    }
+{
+	"tags": "vlb_int_pktgen_private_ip_0",
+	"name": "vlb_int_pktgen_private_ip_0",
+	"property": {
+		"description": "vlb_int_pktgen_private_ip_0",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_int_pktgen_private_ip_0",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vlb_int_pktgen_private_ip_0": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_private_ip_0.json
index 4ca8e70cb..1ac5e1950 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_private_ip_0.json
@@ -1,38 +1,38 @@
- {
-      "tags": "vlb_int_private_ip_0",
-      "name": "vlb_int_private_ip_0",
-      "property": {
-        "description": "vlb_int_private_ip_0",
-        "type": "string"
-      },
-      "updated-by": "Singal, Kapil <ks220y@att.com>",
-      "sources": {
-        "input": {
-          "type": "source-input"
-        },
-        "default": {
-          "type": "source-default",
-          "properties": {}
-        },
-        "sdnc": {
-          "type": "source-rest",
-          "properties": {
-            "type": "JSON",
-            "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_int_private_ip_0",
-            "path": "/param/0/value",
-            "input-key-mapping": {
-              "service-instance-id": "service-instance-id",
-              "vnf-id": "vnf-id"
-            },
-            "output-key-mapping": {
-              "vlb_int_private_ip_0": "value"
-            },
-            "key-dependencies": [
-              "service-instance-id",
-              "vnf-id"
-            ]
-          }
-        }
-      }
-    
-  }
+{
+	"tags": "vlb_int_private_ip_0",
+	"name": "vlb_int_private_ip_0",
+	"property": {
+		"description": "vlb_int_private_ip_0",
+		"type": "string"
+	},
+	"updated-by": "Singal, Kapil <ks220y@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_int_private_ip_0",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vlb_int_private_ip_0": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_name_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_name_0.json
index f8e7f31de..acf34949d 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_name_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_name_0.json
@@ -1,37 +1,38 @@
 {
-  "tags": "vlb_name_0",
-  "name": "vlb_name_0",
-  "property": {
-    "description": "vlb_name_0",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_name_0",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "vlb_name_0": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "vlb_name_0",
+	"name": "vlb_name_0",
+	"property": {
+		"description": "vlb_name_0",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_name_0",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vlb_name_0": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_onap_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_onap_private_ip_0.json
index b78cc9fca..6279e446f 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_onap_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_onap_private_ip_0.json
@@ -1,37 +1,38 @@
 {
-  "tags": "vlb_onap_private_ip_0",
-  "name": "vlb_onap_private_ip_0",
-  "property": {
-    "description": "vlb_onap_private_ip_0",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_onap_private_ip_0",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "private2-prefix-id": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "vlb_onap_private_ip_0",
+	"name": "vlb_onap_private_ip_0",
+	"property": {
+		"description": "vlb_onap_private_ip_0",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_onap_private_ip_0",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"private2-prefix-id": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_cidr.json
index 419ef2255..cf782cc9d 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_cidr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_cidr.json
@@ -1,49 +1,50 @@
 {
-  "tags": "vlb_private_net_cidr",
-  "name": "vlb_private_net_cidr",
-  "property": {
-    "description": "vlb_private_net_cidr",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_private_net_cidr",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "vlb_private_net_cidr": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    },
-    "processor-db": {
-      "type": "source-db",
-      "properties": {
-        "endpoint-selector": "dynamic-db-source",
-        "type": "SQL",
-        "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private1\"",
-        "input-key-mapping": {},
-        "output-key-mapping": {
-          "vlb_private_net_cidr": "prefix"
-        }
-      }
-    }
-  }
-}
+	"tags": "vlb_private_net_cidr",
+	"name": "vlb_private_net_cidr",
+	"property": {
+		"description": "vlb_private_net_cidr",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"processor-db": {
+			"type": "source-db",
+			"properties": {
+				
+				"type": "SQL",
+				"query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private1\"",
+				"input-key-mapping": {},
+				"output-key-mapping": {
+					"vlb_private_net_cidr": "prefix"
+				}
+			}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_private_net_cidr",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vlb_private_net_cidr": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_id.json
index 38f33a263..5e832206e 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_id.json
@@ -1,37 +1,38 @@
 {
-  "tags": "vlb_private_net_id",
-  "name": "vlb_private_net_id",
-  "property": {
-    "description": "vlb_private_net_id",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_private_net_id",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "vlb_private_net_id": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "vlb_private_net_id",
+	"name": "vlb_private_net_id",
+	"property": {
+		"description": "vlb_private_net_id",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_private_net_id",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vlb_private_net_id": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vm-type.json b/components/model-catalog/resource-dictionary/starter-dictionary/vm-type.json
index d24478d96..a514592b5 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vm-type.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vm-type.json
@@ -1,35 +1,35 @@
 {
-  "tags": "vm-type",
-  "name": "vm-type",
-  "property": {
-    "description": "vm-type",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "processor-db": {
-      "type": "source-db",
-      "properties": {
-        "endpoint-selector": "dynamic-db-source",
-        "type": "SQL",
-        "query": "select VFC_MODEL.vm_type as vm_type from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
-        "input-key-mapping": {
-          "vfccustomizationuuid": "vfccustomizationuuid"
-        },
-        "output-key-mapping": {
-          "vm-type": "vm_type"
-        },
-        "key-dependencies": [
-          "vfccustomizationuuid"
-        ]
-      }
-    }
-  }
-}
+	"tags": "vm-type",
+	"name": "vm-type",
+	"property": {
+		"description": "vm-type",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"processor-db": {
+			"type": "source-db",
+			"properties": {
+				"type": "SQL",
+				"query": "select VFC_MODEL.vm_type as vm_type from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
+				"output-key-mapping": {
+					"vm-type": "vm_type"
+				},
+				
+				"input-key-mapping": {
+					"vfccustomizationuuid": "vfccustomizationuuid"
+				},
+				"key-dependencies": [
+					"vfccustomizationuuid"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json
index a71bef975..7b170a622 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json
@@ -13,6 +13,26 @@
         "default": {
           "type": "source-default",
           "properties": {}
+        },
+        "sdnc": {
+          "type": "source-rest",
+          "properties": {
+            "verb": "GET",   "type": "JSON",
+            "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf-id",
+            "path": "/param/0/value",
+            "input-key-mapping": {
+              "service-instance-id": "service-instance-id",
+              "vnf-id": "vnf-id"
+            },
+            "output-key-mapping": {
+              "vnf-id": "value"
+            },
+            "key-dependencies": [
+              "service-instance-id",
+              "vnf-id"
+            ]
+          }
         }
       }
     }
+  
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-model-customization-uuid.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-model-customization-uuid.json
index 2aa08c40f..e598f6a4d 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-model-customization-uuid.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-model-customization-uuid.json
@@ -1,15 +1,15 @@
 {
-  "name" : "vnf-model-customization-uuid",
-  "tags" : "vnf-model-customization-uuid",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vnf-model-customization-uuid",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : { }
-    }
-  }
+	"tags": "vnf-model-customization-uuid",
+	"name": "vnf-model-customization-uuid",
+	"property": {
+		"description": "vnf-model-customization-uuid",
+		"type": "string"
+	},
+	"updated-by": "Singal, Kapil <ks220y@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input",
+			"properties": {}
+		}
+	}
 }
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json
index 7d6511935..7d6511935 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json
index b8649bfbe..1794b6a83 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json
@@ -1,37 +1,37 @@
-{
-  "name" : "vnf_name",
-  "tags" : "vnf_name",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vnf_name",
-    "type" : "string"
-  },
-  "sources" : {
-    "default": {
-      "type": "source-default",
-      "properties": {
-      }
-    },
-    "input": {
-      "type": "source-input",
-      "properties": {
-      }
-    },
-    "sdnc" : {
-      "type" : "source-rest",
-      "properties" : {
-        "type" : "JSON",
-        "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf_name",
-        "path" : "/param/0/value",
-        "input-key-mapping" : {
-          "service-instance-id" : "service-instance-id",
-          "vnf-id" : "vnf-id"
-        },
-        "output-key-mapping" : {
-          "vnf_name" : "value"
-        },
-        "key-dependencies" : [ "service-instance-id", "vnf-id" ]
-      }
-    }
-  }
-}
+{

+  "tags": "vnf_name",

+  "name": "vnf_name",

+  "property": {

+    "description": "vnf_name",

+    "type": "string"

+  },

+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",

+  "sources": {

+    "input": {

+      "type": "source-input"

+    },

+    "default": {

+      "type": "source-default",

+      "properties": {}

+    },

+    "sdnc": {

+      "type": "source-rest",

+      "properties": {

+        "verb": "GET",   "type": "JSON",

+        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf_name",

+        "path": "/param/0/value",

+        "input-key-mapping": {

+          "service-instance-id": "service-instance-id",

+          "vnf-id": "vnf-id"

+        },

+        "output-key-mapping": {

+          "vnf_name": "value"

+        },

+        "key-dependencies": [

+          "service-instance-id",

+          "vnf-id"

+        ]

+      }

+    }

+  }

+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-invariant-uuid.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-invariant-uuid.json
index 2150b5009..d78ee0d29 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-invariant-uuid.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-invariant-uuid.json
@@ -1,35 +1,35 @@
 {
-  "tags": "vnfc-model-invariant-uuid",
-  "name": "vnfc-model-invariant-uuid",
-  "property": {
-    "description": "vnfc-model-invariant-uuid",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "processor-db": {
-      "type": "source-db",
-      "properties": {
-        "endpoint-selector": "dynamic-db-source",
-        "type": "SQL",
-        "query": "select VFC_MODEL.invariant_uuid as vfc_invariant_uuid from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
-        "input-key-mapping": {
-          "vfccustomizationuuid": "vfccustomizationuuid"
-        },
-        "output-key-mapping": {
-          "vnfc-model-invariant-uuid": "vfc_invariant_uuid"
-        },
-        "key-dependencies": [
-          "vfccustomizationuuid"
-        ]
-      }
-    }
-  }
-}
+	"tags": "vnfc-model-invariant-uuid",
+	"name": "vnfc-model-invariant-uuid",
+	"property": {
+		"description": "vnfc-model-invariant-uuid",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"processor-db": {
+			"type": "source-db",
+			"properties": {
+				"type": "SQL",
+				"query": "select VFC_MODEL.invariant_uuid as vfc_invariant_uuid from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
+				"output-key-mapping": {
+					"vnfc-model-invariant-uuid": "vfc_invariant_uuid"
+				},
+				
+				"input-key-mapping": {
+					"vfccustomizationuuid": "vfccustomizationuuid"
+				},
+				"key-dependencies": [
+					"vfccustomizationuuid"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json
index 4673a61e2..cc9eb62ce 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json
@@ -1,35 +1,35 @@
 {
-  "tags": "vnfc-model-version",
-  "name": "vnfc-model-version",
-  "property": {
-    "description": "vnfc-model-version",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "processor-db": {
-      "type": "source-db",
-      "properties": {
-        "endpoint-selector": "dynamic-db-source",
-        "type": "SQL",
-        "query": "select VFC_MODEL.version as vnfc_model_version from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
-        "input-key-mapping": {
-          "vfccustomizationuuid": "vfccustomizationuuid"
-        },
-        "output-key-mapping": {
-          "vnfc-model-version": "vnfc_model_version"
-        },
-        "key-dependencies": [
-          "vfccustomizationuuid"
-        ]
-      }
-    }
-  }
-}
+	"tags": "vnfc-model-version",
+	"name": "vnfc-model-version",
+	"property": {
+		"description": "vnfc-model-version",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"processor-db": {
+			"type": "source-db",
+			"properties": {
+				
+				"type": "SQL",
+				"query": "select VFC_MODEL.version as vnfc_model_version from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
+				"input-key-mapping": {
+					"vfccustomizationuuid": "vfccustomizationuuid"
+				},
+				"output-key-mapping": {
+					"vnfc-model-version": "vnfc_model_version"
+				},
+				"key-dependencies": [
+					"vfccustomizationuuid"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_flavor_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_flavor_name.json
index ae2152849..faeccf79b 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_flavor_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_flavor_name.json
@@ -1,37 +1,38 @@
 {
-  "tags": "vpg_flavor_name",
-  "name": "vpg_flavor_name",
-  "property": {
-    "description": "vpg_flavor_name",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_flavor_name",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "vpg_flavor_name": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "vpg_flavor_name",
+	"name": "vpg_flavor_name",
+	"property": {
+		"description": "vpg_flavor_name",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_flavor_name",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vpg_flavor_name": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_image_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_image_name.json
index 3fd99a693..1bee33cb3 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_image_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_image_name.json
@@ -1,37 +1,38 @@
 {
-  "tags": "vpg_image_name",
-  "name": "vpg_image_name",
-  "property": {
-    "description": "vpg_image_name",
-    "type": "string"
-  },
-  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_image_name",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "vpg_image_name": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "vpg_image_name",
+	"name": "vpg_image_name",
+	"property": {
+		"description": "vpg_image_name",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_image_name",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vpg_image_name": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_pktgen_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_pktgen_private_ip_0.json
index 88e9720dc..42aeed601 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_pktgen_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_pktgen_private_ip_0.json
@@ -1,37 +1,38 @@
 {
-  "tags": "vpg_int_pktgen_private_ip_0",
-  "name": "vpg_int_pktgen_private_ip_0",
-  "property": {
-    "description": "vpg_int_pktgen_private_ip_0",
-    "type": "string"
-  },
-  "updated-by": "Singal, Kapil <ks220y@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_int_pktgen_private_ip_0",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "vpg_int_pktgen_private_ip_0": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "vpg_int_pktgen_private_ip_0",
+	"name": "vpg_int_pktgen_private_ip_0",
+	"property": {
+		"description": "vpg_int_pktgen_private_ip_0",
+		"type": "string"
+	},
+	"updated-by": "Singal, Kapil <ks220y@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_int_pktgen_private_ip_0",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vpg_int_pktgen_private_ip_0": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_private1_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_private1_ip_0.json
new file mode 100644
index 000000000..c54ab2023
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_private1_ip_0.json
@@ -0,0 +1,38 @@
+{
+	"tags": "vpg_int_private1_ip_0",
+	"name": "vpg_int_private1_ip_0",
+	"property": {
+		"description": "vpg_int_private1_ip_0",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_int_private1_ip_0",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vpg_int_private1_ip_0": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_name_0 .json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_name_0 .json
new file mode 100644
index 000000000..65f54f677
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_name_0 .json
@@ -0,0 +1,38 @@
+{
+	"tags": "vpg_name_0",
+	"name": "vpg_name_0",
+	"property": {
+		"description": "vlb_name_0",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_name_0",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vpg_name_0": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_onap_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_onap_private_ip_0.json
index cfdf8b928..bfb12b8b4 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_onap_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_onap_private_ip_0.json
@@ -1,37 +1,38 @@
 {
-  "tags": "vpg_onap_private_ip_0",
-  "name": "vpg_onap_private_ip_0",
-  "property": {
-    "description": "vpg_onap_private_ip_0",
-    "type": "string"
-  },
-  "updated-by": "Singal, Kapil <ks220y@att.com>",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "default": {
-      "type": "source-default",
-      "properties": {}
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_onap_private_ip_0",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "vpg_onap_private_ip_0": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
+	"tags": "vpg_onap_private_ip_0",
+	"name": "vpg_onap_private_ip_0",
+	"property": {
+		"description": "vpg_onap_private_ip_0",
+		"type": "string"
+	},
+	"updated-by": "Singal, Kapil <ks220y@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_onap_private_ip_0",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vpg_onap_private_ip_0": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vsn_flavor_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_flavor_name.json
new file mode 100644
index 000000000..89bd9c4ec
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_flavor_name.json
@@ -0,0 +1,38 @@
+{
+	"tags": "vsn_flavor_name",
+	"name": "vsn_flavor_name",
+	"property": {
+		"description": "vsn_flavor_name",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vsn_flavor_name",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vsn_flavor_name": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vsn_image_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_image_name.json
new file mode 100644
index 000000000..8edeb565d
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_image_name.json
@@ -0,0 +1,38 @@
+{
+	"tags": "vsn_image_name",
+	"name": "vsn_image_name",
+	"property": {
+		"description": "vsn_image_name",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vsn_image_name",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vsn_image_name": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vsn_int_private2_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_int_private2_ip_0.json
new file mode 100644
index 000000000..c0015a682
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_int_private2_ip_0.json
@@ -0,0 +1,38 @@
+{
+	"tags": "vsn_int_private2_ip_0",
+	"name": "vsn_int_private2_ip_0",
+	"property": {
+		"description": "vsn_int_private2_ip_0",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vsn_int_private2_ip_0",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vsn_int_private2_ip_0": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vsn_name_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_name_0.json
index 7b7ba4574..1ad25b3f9 100755..100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vsn_name_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_name_0.json
@@ -1,15 +1,38 @@
 {
-  "name" : "vsn_name_0",
-  "tags" : "vsn_name_0",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vsn_name_0",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : { }
-    }
-  }
+	"tags": "vsn_name_0",
+	"name": "vsn_name_0",
+	"property": {
+		"description": "vsn_name_0",
+		"type": "string"
+	},
+	"updated-by": "Singal, Kapil <ks220y@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vsn_name_0",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vsn_name_0": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vsn_onap_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_onap_private_ip_0.json
new file mode 100644
index 000000000..b769bc6ee
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_onap_private_ip_0.json
@@ -0,0 +1,38 @@
+{
+	"tags": "vsn_onap_private_ip_0",
+	"name": "vsn_onap_private_ip_0",
+	"property": {
+		"description": "vsn_onap_private_ip_0",
+		"type": "string"
+	},
+	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+	"sources": {
+		"input": {
+			"type": "source-input"
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc": {
+			"type": "source-rest",
+			"properties": {
+				"verb": "GET",
+				"type": "JSON",
+				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vsn_onap_private_ip_0",
+				"path": "/param/0/value",
+				"input-key-mapping": {
+					"service-instance-id": "service-instance-id",
+					"vnf-id": "vnf-id"
+				},
+				"output-key-mapping": {
+					"vsn_onap_private_ip_0": "value"
+				},
+				"key-dependencies": [
+					"service-instance-id",
+					"vnf-id"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file