diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.html
index 86243eb..a549d54 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.html
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.html
@@ -8,7 +8,7 @@
                     <ul class="breadcrumb-header">
                         <li><a routerLink="/packages">CBA Packages</a></li>
                         <i class="fa fa-angle-right ml-2 mr-2"></i>
-                        <li>Package Name</li>
+                        <li>{{viewedPackage.artifactName}}</li> 
                     </ul>
                 </h2>
                 <div class="col">
@@ -222,7 +222,7 @@
                                                             <div class="form-group text-center">
                                                                 <input type="text" class="form-control customAction"
                                                                     placeholder="Type Action Name" autofocus>
-                                                                <button type="button" class="btn submit">Start</button>
+                                                                <button type="button" (click)="goToDesignerMode(viewedPackage.id)" class="btn submit">Start</button>
                                                             </div>
 
                                                         </div>
@@ -392,7 +392,7 @@
                                                                 <div class="row">
                                                                     <div class="col text-center">
                                                                         <p class="selectedActions">0 selected</p>
-                                                                        <button type="button"
+                                                                        <button type="button" (click)="goToDesignerMode(viewedPackage.id)"
                                                                             class="btn submit">Start</button>
                                                                     </div>
                                                                 </div>
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts
index 6de76f9..0578b10 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts
@@ -206,7 +206,7 @@
         this.router.navigate(['/packages']);
     }
 
-    goToDesignerMode() {
-        this.router.navigate(['/packages/designer']);
-    }
+    goToDesignerMode(id) {
+        this.router.navigate(['/packages/designer', id]);
+     }
 }
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.html
index 6e072b1..3e3528c 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.html
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.html
@@ -10,7 +10,7 @@
                     </li>
                     <i class="fa fa-angle-right ml-2 mr-2"></i>
                     <li class="breadcrumb-item">
-                        <a href="#">Package Name</a>
+                        <a href="/package/{{viewedPackage.id}}">{{viewedPackage.artifactName}}</a>
                         <button type="button" class="btn package-info-btn" data-toggle="modal"
                             data-target="#exampleModalLong">
                             <i class="icon-info" aria-hidden="true"></i>
@@ -102,7 +102,7 @@
 <div class="source-button editBar">
     <div class="btn-group viewBtns" role="group">
         <button type="button" class="btn btn-secondary topologySource active">Designer</button>
-        <button [routerLink]="['/designer/source']" type="button"
+        <button [routerLink]="['/designer/source', viewedPackage.id]" type="button"
             class="btn btn-secondary topologyView">Scripting</button>
     </div>
 </div>
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.ts
index 5adce7e..fa3a99b 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.ts
@@ -3,6 +3,8 @@
 ===================================================================
 Copyright (C) 2019 Orange. All rights reserved.
 ===================================================================
+Modification Copyright (c) 2020 IBM
+===================================================================
 
 Unless otherwise specified, all software contained herein is licensed
 under the Apache License, Version 2.0 (the License);
@@ -34,6 +36,9 @@
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { distinctUntilChanged } from 'rxjs/operators';
+import { BluePrintDetailModel } from '../model/BluePrint.detail.model';
+import { ActivatedRoute } from '@angular/router';
+import { DesignerService } from './designer.service';
 
 
 @Component({
@@ -46,6 +51,7 @@
 
   private controllerSideBar: boolean;
   private attributesSideBar: boolean;
+  viewedPackage: BluePrintDetailModel = new BluePrintDetailModel();
 
   boardGraph: joint.dia.Graph;
   boardPaper: joint.dia.Paper;
@@ -58,7 +64,9 @@
   constructor(private designerStore: DesignerStore,
               private functionStore: FunctionsStore,
               private graphUtil: GraphUtil,
-              private graphGenerator: GraphGenerator) {
+              private graphGenerator: GraphGenerator,
+              private route: ActivatedRoute,
+              private designerService: DesignerService) {
     this.controllerSideBar = true;
     this.attributesSideBar = false;
 
@@ -88,6 +96,14 @@
     this.initializePalette();
     this.stencilPaperEventListeners();
 
+    const id = this.route.snapshot.paramMap.get('id');
+    this.designerService.getPagedPackages(id).subscribe(
+      (bluePrintDetailModels) => {
+        if (bluePrintDetailModels) {
+          this.viewedPackage = bluePrintDetailModels[0];
+        }
+      });
+
     /**
      * the code to retrieve from server is commented
      */
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.service.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.service.ts
index aa3a6a6..771c44b 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.service.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.service.ts
@@ -3,6 +3,8 @@
 ===================================================================
 Copyright (C) 2019 Orange. All rights reserved.
 ===================================================================
+Modification Copyright (c) 2020 IBM
+===================================================================
 
 Unless otherwise specified, all software contained herein is licensed
 under the Apache License, Version 2.0 (the License);
@@ -22,8 +24,9 @@
 import {Injectable} from '@angular/core';
 import {Observable} from 'rxjs';
 import {ApiService} from '../../../../common/core/services/api.typed.service';
-import {ResourceDictionaryURLs} from '../../../../common/constants/app-constants';
+import {ResourceDictionaryURLs, BlueprintURLs} from '../../../../common/constants/app-constants';
 import {ModelType} from './model/ModelType.model';
+import { BluePrintDetailModel } from '../model/BluePrint.detail.model';
 
 
 @Injectable({
@@ -31,11 +34,20 @@
 })
 export class DesignerService {
 
-    constructor(private api: ApiService<ModelType>) {
+    constructor(private api: ApiService<ModelType>,
+                private api2: ApiService<BluePrintDetailModel>) {
     }
 
     getFunctions(modelDefinitionType: string): Observable<ModelType[]> {
         return this.api.get(ResourceDictionaryURLs.getResourceDictionary + '/' + modelDefinitionType);
     }
 
+    private getBluePrintModel(id: string): Observable<BluePrintDetailModel> {
+        return this.api2.getOne(BlueprintURLs.getOneBlueprint + '/' + id);
+    }
+
+    getPagedPackages(id: string) {
+        return this.getBluePrintModel(id);
+    }
+
 }
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.html
index 2a55851..05f6eeb 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.html
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.html
@@ -8,7 +8,7 @@
                         <a href="#">CBA Packages</a>
                     </li>
                     <li class="breadcrumb-item">
-                        <a href="#">Package Name</a>
+                        <a href="/package/{{viewedPackage.id}}">{{viewedPackage.artifactName}}</a>
                     </li>
                     <li class="breadcrumb-item active" aria-current="page">
                         <p class="mb-0">Topology View</p>
@@ -56,7 +56,7 @@
 </header>
 <div class="source-button editBar">
     <div class="btn-group viewBtns" role="group">
-        <button (click)="convertAndOpenInDesingerView()" type="button" class="btn btn-secondary topologySource">Designer</button>
+        <button (click)="convertAndOpenInDesingerView(viewedPackage.id)" type="button" class="btn btn-secondary topologySource">Designer</button>
         <button type="button"
             class="btn btn-secondary topologyView active">Scripting</button>
     </div>
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.ts
index 34194e4..e70d98d 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.ts
@@ -1,8 +1,11 @@
 import { Component, OnInit, OnDestroy } from '@angular/core';
 import { DesignerStore } from '../designer.store';
 import { PackageCreationUtils } from '../../package-creation/package-creation.utils';
-import { RouterLink, Router } from '@angular/router';
+import { RouterLink, Router, ActivatedRoute } from '@angular/router';
 import { Subject } from 'rxjs';
+import { BluePrintDetailModel } from '../../model/BluePrint.detail.model';
+import { viewClassName } from '@angular/compiler';
+import { SourceViewService } from './source-view.service';
 
 @Component({
     selector: 'app-designer-source-view',
@@ -15,10 +18,13 @@
     lang = 'json';
     private controllerSideBar: boolean;
     private ngUnsubscribe = new Subject();
+    viewedPackage: BluePrintDetailModel = new BluePrintDetailModel();
 
     constructor(private store: DesignerStore,
                 private packageCreationUtils: PackageCreationUtils,
-                private router: Router) {
+                private router: Router,
+                private route: ActivatedRoute,
+                private sourceViewService: SourceViewService) {
         this.controllerSideBar = true;
     }
 
@@ -29,13 +35,20 @@
                 this.content = this.packageCreationUtils.transformToJson(state.template);
             });
 
+        const id = this.route.snapshot.paramMap.get('id');
+        this.sourceViewService.getPagedPackages(id).subscribe(
+            (bluePrintDetailModels) => {
+                if (bluePrintDetailModels) {
+                    this.viewedPackage = bluePrintDetailModels[0];
+                }
+            });
     }
 
-    convertAndOpenInDesingerView() {
+    convertAndOpenInDesingerView(id) {
         // TODO validate json against scheme
         console.log('convertAndOpenInDesingerView ...', this.content);
         this.store.saveSourceContent(this.content);
-        this.router.navigateByUrl('/packages/designer');
+        this.router.navigate(['/packages/designer', id]);
     }
 
     ngOnDestroy() {
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.service.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.service.ts
new file mode 100644
index 0000000..7589522
--- /dev/null
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.service.ts
@@ -0,0 +1,26 @@
+import {Injectable} from '@angular/core';
+import {Observable} from 'rxjs';
+import { ApiService } from 'src/app/common/core/services/api.typed.service';
+import { BluePrintDetailModel } from '../../model/BluePrint.detail.model';
+import { ModelType } from '../model/ModelType.model';
+import { ResourceDictionaryURLs, BlueprintURLs } from 'src/app/common/constants/app-constants';
+
+
+
+@Injectable({
+    providedIn: 'root'
+})
+export class SourceViewService {
+
+    constructor(private api1: ApiService<BluePrintDetailModel>) {
+    }
+
+
+    private getBluePrintModel(id: string): Observable<BluePrintDetailModel> {
+        return this.api1.getOne(BlueprintURLs.getOneBlueprint + '/' + id);
+    }
+    getPagedPackages(id: string) {
+        return this.getBluePrintModel(id);
+    }
+
+}
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages.routing.module.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages.routing.module.ts
index ad06cf1..f357bc1 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages.routing.module.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages.routing.module.ts
@@ -12,10 +12,10 @@
         path: '',
         component: PackagesDashboardComponent
     },
-    {path: 'designer', component: DesignerComponent},
-    { path: 'designer/source', component: DesignerSourceViewComponent },
+    {path: 'designer/:id', component: DesignerComponent},
+    {path: 'designer/source/:id', component: DesignerSourceViewComponent},
     {path: 'package/:id', component: ConfigurationDashboardComponent},
-    {path: 'createPackage', component: PackageCreationComponent},
+    {path: 'createPackage', component: PackageCreationComponent}
 ];
 
 @NgModule({
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/artifact_types.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/artifact_types.json
index 6ec3b41..da498e3 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/artifact_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/artifact_types.json
@@ -1,11 +1,5 @@
 {
   "artifact_types" : {
-    "artifact-directed-graph" : {
-      "description" : "Directed Graph File",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.artifacts.Implementation",
-      "file_ext" : [ "json", "xml" ]
-    },
     "artifact-mapping-resource" : {
       "description" : "Resource Mapping File used along with Configuration template",
       "version" : "1.0.0",
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 71e5fa6..9f7aa9d 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
@@ -1,776 +1,1157 @@
 {
-  "data_types" : {
-    "dt-config-assign-properties" : {
-      "description" : "Dynamic DataType definition for workflow(config-assign).",
-      "version" : "1.0.0",
-      "properties" : {
-        "vdns_int_private_ip_0" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vnf-id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vdns_vf_module_id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "service-instance-id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vdns_onap_private_ip_0" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        }
+   "data_types": {
+      "dt-config-assign-properties": {
+         "description": "Dynamic DataType definition for workflow(config-assign).",
+         "version": "1.0.0",
+         "properties": {
+            "vdns_int_private_ip_0": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vnf-id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vdns_vf_module_id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "service-instance-id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vdns_onap_private_ip_0": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            }
+         },
+         "derived_from": "tosca.datatypes.Dynamic"
       },
-      "derived_from" : "tosca.datatypes.Dynamic"
-    },
-    "dt-config-deploy-properties" : {
-      "description" : "Dynamic DataType definition for workflow(config-deploy).",
-      "version" : "1.0.0",
-      "properties" : {
-        "vdns_int_private_ip_0" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vnf-id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vdns_vf_module_id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "service-instance-id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vdns_onap_private_ip_0" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "ip" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        }
+      "dt-config-deploy-properties": {
+         "description": "Dynamic DataType definition for workflow(config-deploy).",
+         "version": "1.0.0",
+         "properties": {
+            "vnf-id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "service-instance-id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "ip": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            }
+         },
+         "derived_from": "tosca.datatypes.Dynamic"
       },
-      "derived_from" : "tosca.datatypes.Dynamic"
-    },
-    "dt-resource-assignment-properties" : {
-      "description" : "Dynamic DataType definition for workflow(resource-assignment).",
-      "version" : "1.0.0",
-      "properties" : {
-        "vlb_int_pktgen_private_ip_0" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "private1-prefix-id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vnf-id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vlb_private_net_cidr" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vdns_onap_private_ip_0" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "default" : "${vdns_onap_private_ip_0}",
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vdns_image_name" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "public_net_id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "sec_group" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "nfc-naming-code" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vnfc-model-invariant-uuid" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "nexus_artifact_repo" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "default" : "https://nexus.onap.org",
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "onap_private_net_cidr" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vpg_onap_private_ip_0" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vdns_name_0" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "default" : "${vdns_name_0}",
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vdns_int_private_ip_0" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "default" : "${vdns_int_private_ip_0}",
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "image_name" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "flavor_name" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "dcae_collector_ip" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "default" : "10.0.4.1",
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vpg_name_0" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "default" : "${vpg_name_0}",
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vip" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "default" : "${vip}",
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vf-naming-policy" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "int_private_net_id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "default" : "${int_private_net_id}",
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vfccustomizationuuid" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "onap_private_net_id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "demo_artifacts_version" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vlb_int_private_ip_0" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vnf-model-customization-uuid" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "int_private_subnet_id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "default" : "${int_private_subnet_id}",
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "key_name" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vlb_name_0" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "default" : "${vlb_name_0}",
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "install_script_version" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "int_pktgen_private_net_id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "default" : "${int_pktgen_private_net_id}",
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vm-type" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vnf_name" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "keypair" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "default" : "vlb_key",
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "onap_private_subnet_id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "aic-cloud-region" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "gre_ipaddr" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "default" : "${gre_ipaddr}",
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vf-module-model-customization-uuid" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vf-module-name" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "default" : "${vf-module-name}",
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "pg_int" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "default" : "${pg_int}",
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vpg_flavor_name" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vf-module-id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "dcae_collector_port" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "default" : "30235",
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vf-module-label" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vlb_flavor_name" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "pktgen_private_net_cidr" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vpg_image_name" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "private2-prefix-id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vdns_flavor_name" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "default" : "m1.medium",
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vnfc-model-version" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "service-instance-id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "nb_api_version" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "default" : "1.2.0",
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vpg_int_pktgen_private_ip_0" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vf-module-type" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "pub_key" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "default" : "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCs84Cy8+qi/jvucay0BwFtOq3ian0ulTXFGxkZcZCR0N48j88pbHJaEqb9e25MAsrfH+7Etb9Kd5nbBThEL/i0AyHXnDsc80Oq0sqlLcfLo3SGSurkrNoRofHboJ5Hn+N9SlWN5FCQGbTx1w3rjqR4LasAI6XxH9xpXSFyyge6ysVXH0cYaZ8sg98nFZa1fPJR9L8COjZvF+EYudub2RC5HVyV/sx7bliNFo9JwQh6du1abG4G7ZDjTIcYwYp21iq52UzWU28RVcAyY6AQZJu2lHLdsr8fPvyeWZpC5EqGsxI1G609m9G/dURRKwYfez/f2ATzpn5QjEX7LrLWBM8r Generated-by-Nova",
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "management-prefix-id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "int_pktgen_private_subnet_id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "default" : "${int_pktgen_private_subnet_id}",
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "create-md-sal-vnf-param" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vlb_onap_private_ip_0" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "cloud_env" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "default" : "openstack",
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
-        "vlb_image_name" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        }
+      "dt-HealthCheck-properties": {
+         "description": "Dynamic DataType definition for workflow(config-deploy).",
+         "version": "1.0.0",
+         "properties": {
+            "vnf-id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "service-instance-id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "ip": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            }
+         },
+         "derived_from": "tosca.datatypes.Dynamic"
       },
-      "derived_from" : "tosca.datatypes.Dynamic"
-    }
-  }
-}
+      "dt-ScaleOutReconfiguration-properties": {
+         "description": "Dynamic DataType definition for workflow(config-deploy).",
+         "version": "1.0.0",
+         "properties": {
+            "vnf-id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+			          "vf-module-id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "service-instance-id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "ip": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vdns_int_private_ip_0": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vdns_vf_module_id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vdns_onap_private_ip_0": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            }
+         },
+         "derived_from": "tosca.datatypes.Dynamic"
+      },
+      "dt-vf-config-assign-properties": {
+         "description": "Dynamic DataType definition for workflow(config-assign).",
+         "version": "1.0.0",
+         "properties": {
+            "vdns_int_private_ip_0": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vnf-id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vdns_vf_module_id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "service-instance-id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vdns_onap_private_ip_0": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            }
+         },
+         "derived_from": "tosca.datatypes.Dynamic"
+      },
+      "dt-vf-config-deploy-properties": {
+         "description": "Dynamic DataType definition for workflow(config-deploy).",
+         "version": "1.0.0",
+         "properties": {
+            "vnf-id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "service-instance-id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "ip": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            }
+         },
+         "derived_from": "tosca.datatypes.Dynamic"
+      },
+      "dt-resource-assignment-properties": {
+         "description": "Dynamic DataType definition for workflow(resource-assignment).",
+         "version": "1.0.0",
+         "properties": {
+            "vlb_int_pktgen_private_ip_0": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vlb_0_int_pktgen_private_port_0_mac": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vf-module-assign": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vnf_assign_aai": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vpg_0_int_pktgen_private_port_0_mac": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vf-module-name": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "private1-prefix-id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vnf-id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vlb_private_net_cidr": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vdns_onap_private_ip_0": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vdns_image_name": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "public_net_id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "sec_group": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "nfc-naming-code": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vnfc-model-invariant-uuid": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "nexus_artifact_repo": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "onap_private_net_cidr": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vpg_onap_private_ip_0": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vdns_name_0": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vdns_int_private_ip_0": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "image_name": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "flavor_name": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "dcae_collector_ip": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vpg_name_0": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vip": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vf-naming-policy": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "int_private_net_id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vfccustomizationuuid": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "onap_private_net_id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "demo_artifacts_version": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vlb_int_private_ip_0": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vnf-model-customization-uuid": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "int_private_subnet_id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "key_name": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vlb_name_0": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "install_script_version": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "int_pktgen_private_net_id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vm-type": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vnf_name": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "keypair": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "onap_private_subnet_id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "aic-cloud-region": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "gre_ipaddr": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vf-module-model-customization-uuid": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "pg_int": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vpg_flavor_name": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vf-module-id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "dcae_collector_port": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vf-module-label": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vlb_flavor_name": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "pktgen_private_net_cidr": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vpg_image_name": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "private2-prefix-id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vdns_flavor_name": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vnfc-model-version": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "service-instance-id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "nb_api_version": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vpg_int_pktgen_private_ip_0": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vf-module-type": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "pub_key": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "management-prefix-id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "int_pktgen_private_subnet_id": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "create-md-sal-vnf-param": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vlb_onap_private_ip_0": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "cloud_env": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            },
+            "vlb_image_name": {
+               "description": "",
+               "required": false,
+               "type": "string",
+               "status": "",
+               "constraints": [
+                  {}
+               ],
+               "entry_schema": {
+                  "type": ""
+               }
+            }
+         },
+         "derived_from": "tosca.datatypes.Dynamic"
+      }
+   }
+}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/node_types.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/node_types.json
index e3f915e..16d3395 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/node_types.json
@@ -1,402 +1,442 @@
 {
-  "node_types" : {
-    "component-netconf-executor" : {
-      "description" : "This is Netconf Transaction Configuration Component API",
-      "version" : "1.0.0",
-      "attributes" : {
-        "response-data" : {
-          "required" : false,
-          "type" : "json"
-        }
-      },
-      "capabilities" : {
-        "component-node" : {
-          "type" : "tosca.capabilities.Node"
-        }
-      },
-      "requirements" : {
-        "netconf-connection" : {
-          "capability" : "netconf",
-          "node" : "vnf-netconf-device",
-          "relationship" : "tosca.relationships.ConnectsTo"
-        }
-      },
-      "interfaces" : {
-        "ComponentNetconfExecutor" : {
-          "operations" : {
-            "process" : {
-              "inputs" : {
-                "script-type" : {
-                  "description" : "Script type, kotlin type is supported",
-                  "required" : true,
-                  "type" : "string",
-                  "constraints" : [ {
-                    "valid_values" : [ "kotlin", "jython", "internal" ]
-                  } ],
-                  "default" : "internal"
-                },
-                "script-class-reference" : {
-                  "description" : "Kotlin Script class name or jython script name.",
-                  "required" : true,
-                  "type" : "string"
-                },
-                "instance-dependencies" : {
-                  "description" : "Instance names to inject to Jython or Kotlin Script.",
-                  "required" : true,
-                  "type" : "list",
-                  "entry_schema" : {
-                    "type" : "string"
+   "node_types": {
+      "component-resource-resolution": {
+         "description": "This is Resource Assignment Component API",
+         "version": "1.0.0",
+         "attributes": {
+            "assignment-params": {
+               "required": true,
+               "type": "string"
+            }
+         },
+         "capabilities": {
+            "component-node": {
+               "type": "tosca.capabilities.Node"
+            }
+         },
+         "interfaces": {
+            "ResourceResolutionComponent": {
+               "operations": {
+                  "process": {
+                     "inputs": {
+                        "resolution-key": {
+                           "description": "Key for service instance related correlation.",
+                           "required": false,
+                           "type": "string"
+                        },
+                        "occurrence": {
+                           "description": "Number of time to perform the resolution.",
+                           "required": false,
+                           "type": "integer",
+                           "default": 1
+                        },
+                        "store-result": {
+                           "description": "Whether or not to store the output.",
+                           "required": false,
+                           "type": "boolean"
+                        },
+                        "resource-type": {
+                           "description": "Request type.",
+                           "required": false,
+                           "type": "string"
+                        },
+                        "resolution-summary": {
+                           "description": "Enable output list of ResourcesAssignmentData",
+                           "required": false,
+                           "type": "boolean"
+                        },
+                        "artifact-prefix-names": {
+                           "description": "Template , Resource Assignment Artifact Prefix names",
+                           "required": true,
+                           "type": "list",
+                           "entry_schema": {
+                              "type": "string"
+                           }
+                        },
+                        "request-id": {
+                           "description": "Request Id, Unique Id for the request.",
+                           "required": true,
+                           "type": "string"
+                        },
+                        "resource-id": {
+                           "description": "Resource Id.",
+                           "required": false,
+                           "type": "string"
+                        },
+                        "action-name": {
+                           "description": "Action Name of the process",
+                           "required": false,
+                           "type": "string"
+                        },
+                        "dynamic-properties": {
+                           "description": "Dynamic Json Content or DSL Json reference.",
+                           "required": false,
+                           "type": "json"
+                        }
+                     },
+                     "outputs": {
+                        "resource-assignment-params": {
+                           "required": true,
+                           "type": "string"
+                        },
+                        "status": {
+                           "required": true,
+                           "type": "string"
+                        }
+                     }
                   }
-                },
-                "dynamic-properties" : {
-                  "description" : "Dynamic Json Content or DSL Json reference.",
-                  "required" : false,
-                  "type" : "json"
-                }
-              },
-              "outputs" : {
-                "response-data" : {
-                  "description" : "Execution Response Data in JSON format.",
-                  "required" : false,
-                  "type" : "string"
-                },
-                "status" : {
-                  "description" : "Status of the Component Execution ( success or failure )",
-                  "required" : true,
-                  "type" : "string"
-                }
-              }
+               }
             }
-          }
-        }
+         },
+         "derived_from": "tosca.nodes.Component"
       },
-      "derived_from" : "tosca.nodes.Component"
-    },
-    "component-resource-resolution" : {
-      "description" : "This is Resource Assignment Component API",
-      "version" : "1.0.0",
-      "attributes" : {
-        "assignment-params" : {
-          "required" : true,
-          "type" : "string"
-        }
-      },
-      "capabilities" : {
-        "component-node" : {
-          "type" : "tosca.capabilities.Node"
-        }
-      },
-      "interfaces" : {
-        "ResourceResolutionComponent" : {
-          "operations" : {
-            "process" : {
-              "inputs" : {
-                "resolution-key" : {
-                  "description" : "Key for service instance related correlation.",
-                  "required" : false,
-                  "type" : "string"
-                },
-                "occurrence" : {
-                  "description" : "Number of time to perform the resolution.",
-                  "required" : false,
-                  "type" : "integer",
-                  "default" : 1
-                },
-                "store-result" : {
-                  "description" : "Whether or not to store the output.",
-                  "required" : false,
-                  "type" : "boolean"
-                },
-                "resource-type" : {
-                  "description" : "Request type.",
-                  "required" : false,
-                  "type" : "string"
-                },
-                "artifact-prefix-names" : {
-                  "description" : "Template , Resource Assignment Artifact Prefix names",
-                  "required" : true,
-                  "type" : "list",
-                  "entry_schema" : {
-                    "type" : "string"
+      "component-script-executor": {
+         "description": "This is CLI Transaction Configuration Component API",
+         "version": "1.0.0",
+         "attributes": {
+            "response-data": {
+               "required": false,
+               "type": "json"
+            }
+         },
+         "capabilities": {
+            "component-node": {
+               "type": "tosca.capabilities.Node"
+            }
+         },
+         "interfaces": {
+            "ComponentScriptExecutor": {
+               "operations": {
+                  "process": {
+                     "inputs": {
+                        "script-type": {
+                           "description": "Script type, kotlin type is supported",
+                           "required": true,
+                           "type": "string",
+                           "constraints": [
+                              {
+                                 "valid_values": [
+                                    "kotlin",
+                                    "jython",
+                                    "internal"
+                                 ]
+                              }
+                           ],
+                           "default": "internal"
+                        },
+                        "script-class-reference": {
+                           "description": "Kotlin Script class name or jython script name.",
+                           "required": true,
+                           "type": "string"
+                        },
+                        "dynamic-properties": {
+                           "description": "Dynamic Json Content or DSL Json reference.",
+                           "required": false,
+                           "type": "json"
+                        }
+                     },
+                     "outputs": {
+                        "response-data": {
+                           "description": "Execution Response Data.",
+                           "required": false,
+                           "type": "string"
+                        },
+                        "status": {
+                           "description": "Status of the Component Execution ( success or failure )",
+                           "required": true,
+                           "type": "string"
+                        }
+                     }
                   }
-                },
-                "request-id" : {
-                  "description" : "Request Id, Unique Id for the request.",
-                  "required" : true,
-                  "type" : "string"
-                },
-                "resource-id" : {
-                  "description" : "Resource Id.",
-                  "required" : false,
-                  "type" : "string"
-                },
-                "action-name" : {
-                  "description" : "Action Name of the process",
-                  "required" : false,
-                  "type" : "string"
-                },
-                "dynamic-properties" : {
-                  "description" : "Dynamic Json Content or DSL Json reference.",
-                  "required" : false,
-                  "type" : "json"
-                }
-              },
-              "outputs" : {
-                "resource-assignment-params" : {
-                  "required" : true,
-                  "type" : "string"
-                },
-                "status" : {
-                  "required" : true,
-                  "type" : "string"
-                }
-              }
+               }
             }
-          }
-        }
+         },
+         "derived_from": "tosca.nodes.Component"
       },
-      "derived_from" : "tosca.nodes.Component"
-    },
-    "dg-generic" : {
-      "description" : "This is Generic Directed Graph Type",
-      "version" : "1.0.0",
-      "properties" : {
-        "content" : {
-          "required" : true,
-          "type" : "string"
-        },
-        "dependency-node-templates" : {
-          "description" : "Dependent Step Components NodeTemplate name.",
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.Workflow"
-    },
-    "source-capability" : {
-      "description" : "This is Component Resource Source Node Type",
-      "version" : "1.0.0",
-      "properties" : {
-        "script-type" : {
-          "required" : true,
-          "type" : "string",
-          "constraints" : [ {
-            "valid_values" : [ "kotlin", "internal", "jython" ]
-          } ],
-          "default" : "kotlin"
-        },
-        "script-class-reference" : {
-          "description" : "Capability reference name for internal and kotlin, for jython script file path",
-          "required" : true,
-          "type" : "string"
-        },
-        "instance-dependencies" : {
-          "description" : "Instance dependency Names to Inject to Kotlin / Jython Script.",
-          "required" : false,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        },
-        "key-dependencies" : {
-          "description" : "Resource Resolution dependency dictionary names.",
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.ResourceSource"
-    },
-    "source-db" : {
-      "description" : "This is Database Resource Source Node Type",
-      "version" : "1.0.0",
-      "properties" : {
-        "type" : {
-          "required" : true,
-          "type" : "string",
-          "constraints" : [ {
-            "valid_values" : [ "SQL", "PLSQL" ]
-          } ],
-          "default" : "SQL"
-        },
-        "endpoint-selector" : {
-          "required" : false,
-          "type" : "string"
-        },
-        "query" : {
-          "required" : true,
-          "type" : "string"
-        },
-        "input-key-mapping" : {
-          "required" : false,
-          "type" : "map",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        },
-        "output-key-mapping" : {
-          "required" : false,
-          "type" : "map",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        },
-        "key-dependencies" : {
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.ResourceSource"
-    },
-    "source-default" : {
-      "description" : "This is Default Resource Source Node Type",
-      "version" : "1.0.0",
-      "properties" : { },
-      "derived_from" : "tosca.nodes.ResourceSource"
-    },
-    "source-input" : {
-      "description" : "This is Input Resource Source Node Type",
-      "version" : "1.0.0",
-      "properties" : { },
-      "derived_from" : "tosca.nodes.ResourceSource"
-    },
-    "source-rest" : {
-      "description" : "This is Rest Resource Source Node Type",
-      "version" : "1.0.0",
-      "properties" : {
-        "type" : {
-          "required" : true,
-          "type" : "string",
-          "constraints" : [ {
-            "valid_values" : [ "JSON" ]
-          } ],
-          "default" : "JSON"
-        },
-        "verb" : {
-          "required" : true,
-          "type" : "string",
-          "constraints" : [ {
-            "valid_values" : [ "GET", "POST", "DELETE", "PUT" ]
-          } ],
-          "default" : "GET"
-        },
-        "payload" : {
-          "required" : false,
-          "type" : "string",
-          "default" : ""
-        },
-        "endpoint-selector" : {
-          "required" : false,
-          "type" : "string"
-        },
-        "url-path" : {
-          "required" : true,
-          "type" : "string"
-        },
-        "path" : {
-          "required" : true,
-          "type" : "string"
-        },
-        "expression-type" : {
-          "required" : false,
-          "type" : "string",
-          "constraints" : [ {
-            "valid_values" : [ "JSON_PATH", "JSON_POINTER" ]
-          } ],
-          "default" : "JSON_PATH"
-        },
-        "input-key-mapping" : {
-          "required" : false,
-          "type" : "map",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        },
-        "output-key-mapping" : {
-          "required" : false,
-          "type" : "map",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        },
-        "key-dependencies" : {
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.ResourceSource"
-    },
-    "tosca.nodes.Component" : {
-      "description" : "This is default Component Node",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.nodes.Root"
-    },
-    "tosca.nodes.ResourceSource" : {
-      "description" : "TOSCA base type for Resource Sources",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.nodes.Root"
-    },
-    "tosca.nodes.Vnf" : {
-      "description" : "This is VNF Node Type",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.nodes.Root"
-    },
-    "tosca.nodes.Workflow" : {
-      "description" : "This is Directed Graph Node Type",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.nodes.Root"
-    },
-    "vnf-netconf-device" : {
-      "description" : "This is VNF Device with Netconf  Capability",
-      "version" : "1.0.0",
-      "capabilities" : {
-        "netconf" : {
-          "type" : "tosca.capabilities.Netconf",
-          "properties" : {
-            "login-key" : {
-              "required" : true,
-              "type" : "string",
-              "default" : "sdnc"
+      "source-capability": {
+         "description": "This is Component Resource Source Node Type",
+         "version": "1.0.0",
+         "properties": {
+            "script-type": {
+               "required": true,
+               "type": "string",
+               "constraints": [
+                  {
+                     "valid_values": [
+                        "kotlin",
+                        "internal",
+                        "jython"
+                     ]
+                  }
+               ],
+               "default": "kotlin"
             },
-            "login-account" : {
-              "required" : true,
-              "type" : "string",
-              "default" : "sdnc-tacacs"
+            "script-class-reference": {
+               "description": "Capability reference name for internal and kotlin, for jython script file path",
+               "required": true,
+               "type": "string"
             },
-            "source" : {
-              "required" : false,
-              "type" : "string",
-              "default" : "npm"
+            "instance-dependencies": {
+               "description": "Instance dependency Names to Inject to Kotlin / Jython Script.",
+               "required": false,
+               "type": "list",
+               "entry_schema": {
+                  "type": "string"
+               }
             },
-            "target-ip-address" : {
-              "required" : true,
-              "type" : "string"
-            },
-            "port-number" : {
-              "required" : true,
-              "type" : "integer",
-              "default" : 830
-            },
-            "connection-time-out" : {
-              "required" : false,
-              "type" : "integer",
-              "default" : 30
+            "key-dependencies": {
+               "description": "Resource Resolution dependency dictionary names.",
+               "required": true,
+               "type": "list",
+               "entry_schema": {
+                  "type": "string"
+               }
             }
-          }
-        }
+         },
+         "derived_from": "tosca.nodes.ResourceSource"
       },
-      "derived_from" : "tosca.nodes.Vnf"
-    }
-  }
+      "source-db": {
+         "description": "This is Database Resource Source Node Type",
+         "version": "1.0.0",
+         "properties": {
+            "type": {
+               "required": true,
+               "type": "string",
+               "constraints": [
+                  {
+                     "valid_values": [
+                        "SQL",
+                        "PLSQL"
+                     ]
+                  }
+               ],
+               "default": "SQL"
+            },
+            "endpoint-selector": {
+               "required": false,
+               "type": "string"
+            },
+            "query": {
+               "required": true,
+               "type": "string"
+            },
+            "input-key-mapping": {
+               "required": false,
+               "type": "map",
+               "entry_schema": {
+                  "type": "string"
+               }
+            },
+            "output-key-mapping": {
+               "required": false,
+               "type": "map",
+               "entry_schema": {
+                  "type": "string"
+               }
+            },
+            "key-dependencies": {
+               "required": true,
+               "type": "list",
+               "entry_schema": {
+                  "type": "string"
+               }
+            }
+         },
+         "derived_from": "tosca.nodes.ResourceSource"
+      },
+      "source-default": {
+         "description": "This is Default Resource Source Node Type",
+         "version": "1.0.0",
+         "properties": {},
+         "derived_from": "tosca.nodes.ResourceSource"
+      },
+      "source-input": {
+         "description": "This is Input Resource Source Node Type",
+         "version": "1.0.0",
+         "properties": {},
+         "derived_from": "tosca.nodes.ResourceSource"
+      },
+      "source-rest": {
+         "description": "This is Rest Resource Source Node Type",
+         "version": "1.0.0",
+         "properties": {
+            "type": {
+               "required": true,
+               "type": "string",
+               "constraints": [
+                  {
+                     "valid_values": [
+                        "JSON"
+                     ]
+                  }
+               ],
+               "default": "JSON"
+            },
+            "headers": {
+               "required": false,
+               "type": "map",
+               "entry_schema": {
+                  "type": "string"
+               }
+            },
+            "verb": {
+               "required": true,
+               "type": "string",
+               "constraints": [
+                  {
+                     "valid_values": [
+                        "GET",
+                        "POST",
+                        "DELETE",
+                        "PUT"
+                     ]
+                  }
+               ],
+               "default": "GET"
+            },
+            "payload": {
+               "required": false,
+               "type": "string",
+               "default": ""
+            },
+            "endpoint-selector": {
+               "required": false,
+               "type": "string"
+            },
+            "url-path": {
+               "required": true,
+               "type": "string"
+            },
+            "path": {
+               "required": true,
+               "type": "string"
+            },
+            "expression-type": {
+               "required": false,
+               "type": "string",
+               "constraints": [
+                  {
+                     "valid_values": [
+                        "JSON_PATH",
+                        "JSON_POINTER"
+                     ]
+                  }
+               ],
+               "default": "JSON_PATH"
+            },
+            "input-key-mapping": {
+               "required": false,
+               "type": "map",
+               "entry_schema": {
+                  "type": "string"
+               }
+            },
+            "output-key-mapping": {
+               "required": false,
+               "type": "map",
+               "entry_schema": {
+                  "type": "string"
+               }
+            },
+            "key-dependencies": {
+               "required": true,
+               "type": "list",
+               "entry_schema": {
+                  "type": "string"
+               }
+            }
+         },
+         "derived_from": "tosca.nodes.ResourceSource"
+      },
+      "tosca.nodes.Component": {
+         "description": "This is default Component Node",
+         "version": "1.0.0",
+         "derived_from": "tosca.nodes.Root"
+      },
+      "tosca.nodes.ResourceSource": {
+         "description": "TOSCA base type for Resource Sources",
+         "version": "1.0.0",
+         "derived_from": "tosca.nodes.Root"
+      },
+      "tosca.nodes.Vnf": {
+         "description": "This is VNF Node Type",
+         "version": "1.0.0",
+         "derived_from": "tosca.nodes.Root"
+      },
+      "vnf-netconf-device": {
+         "description": "This is VNF Device with Netconf  Capability",
+         "version": "1.0.0",
+         "capabilities": {
+            "netconf": {
+               "type": "tosca.capabilities.Netconf",
+               "properties": {
+                  "login-key": {
+                     "required": true,
+                     "type": "string",
+                     "default": "sdnc"
+                  },
+                  "login-account": {
+                     "required": true,
+                     "type": "string",
+                     "default": "sdnc-tacacs"
+                  },
+                  "source": {
+                     "required": false,
+                     "type": "string",
+                     "default": "npm"
+                  },
+                  "target-ip-address": {
+                     "required": true,
+                     "type": "string"
+                  },
+                  "port-number": {
+                     "required": true,
+                     "type": "integer",
+                     "default": 830
+                  },
+                  "connection-time-out": {
+                     "required": false,
+                     "type": "integer",
+                     "default": 30
+                  }
+               }
+            },
+            "restconf": {
+               "type": "tosca.capabilities.Netconf",
+               "properties": {
+                  "login-key": {
+                     "required": true,
+                     "type": "string",
+                     "default": "sdnc"
+                  },
+                  "login-account": {
+                     "required": true,
+                     "type": "string",
+                     "default": "sdnc-tacacs"
+                  },
+                  "source": {
+                     "required": false,
+                     "type": "string",
+                     "default": "npm"
+                  },
+                  "target-ip-address": {
+                     "required": true,
+                     "type": "string"
+                  },
+                  "port-number": {
+                     "required": true,
+                     "type": "integer",
+                     "default": 830
+                  },
+                  "connection-time-out": {
+                     "required": false,
+                     "type": "integer",
+                     "default": 30
+                  }
+               }
+            }
+         },
+         "derived_from": "tosca.nodes.Vnf"
+      }
+   }
 }
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/relationship_types.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/relationship_types.json
index 027bfc0..4ddd7a5 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/relationship_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/relationship_types.json
@@ -1,9 +1,3 @@
 {
-  "relationship_types" : {
-    "tosca.relationships.ConnectsTo" : {
-      "description" : "Relationship tosca.relationships.ConnectsTo",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.relationships.Root"
-    }
-  }
+  "relationship_types" : { }
 }
\ 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 7172e3a..60612a7 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
@@ -1,1987 +1,2820 @@
 {
-  "aic-cloud-region" : {
-    "tags" : "aic-cloud-region",
-    "name" : "aic-cloud-region",
-    "property" : {
-      "description" : "aic-cloud-region",
-      "type" : "string"
-    },
-    "updated-by" : "Singal, Kapil <ks220y@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input",
-        "properties" : { }
-      }
-    }
-  },
-  "cloud_env" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "create-md-sal-vnf-param" : {
-    "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" ]
-        }
-      },
-      "primary-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" ]
-        }
-      }
-    }
-  },
-  "dcae_collector_ip" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "dcae_collector_port" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "demo_artifacts_version" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "flavor_name" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "gre_ipaddr" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "image_name" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "install_script_version" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "int_pktgen_private_net_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" ]
-        }
-      }
-    }
-  },
-  "int_pktgen_private_subnet_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" ]
-        }
-      }
-    }
-  },
-  "int_private_net_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" ]
-        }
-      }
-    }
-  },
-  "int_private_subnet_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" ]
-        }
-      }
-    }
-  },
-  "key_name" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "keypair" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "management-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" : {
-          "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"
-          }
-        }
-      }
-    }
-  },
-  "nb_api_version" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "nexus_artifact_repo" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "nfc-naming-code" : {
-    "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"
-        }
-      }
-    }
-  },
-  "onap_private_net_cidr" : {
-    "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" : {
-          "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"
-          }
-        }
-      },
-      "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" ]
-        }
-      }
-    }
-  },
-  "onap_private_net_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" ]
-        }
-      }
-    }
-  },
-  "onap_private_subnet_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" ]
-        }
-      }
-    }
-  },
-  "pg_int" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "pktgen_private_net_cidr" : {
-    "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"
-          },
-          "endpoint-selector" : "dynamic-db-source",
-          "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" ]
-        }
-      }
-    }
-  },
-  "private1-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" : {
-          "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"
-          }
-        }
-      }
-    }
-  },
-  "private2-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" : {
-          "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"
-          }
-        }
-      }
-    }
-  },
-  "pub_key" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "public_net_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" ]
-        }
-      }
-    }
-  },
-  "sec_group" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "service-instance-id" : {
-    "tags" : "service-instance-id, tosca.datatypes.Root, data_type",
-    "name" : "service-instance-id",
-    "property" : {
-      "description" : "To be provided",
-      "type" : "string"
-    },
-    "updated-by" : "Singal, Kapil <ks220y@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input",
-        "properties" : { }
-      },
-      "any-db" : {
-        "type" : "source-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" : [ ]
-        }
-      }
-    }
-  },
-  "vdns_int_private_ip_0" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "vdns_name_0" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "vdns_onap_private_ip_0" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "vdns_vf_module_id" : {
-    "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" ]
-        }
-      },
-      "primary-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" ]
-        }
-      }
-    }
-  },
-  "vf-module-id" : {
-    "tags" : "vf-module-id",
-    "name" : "vf-module-id",
-    "property" : {
-      "description" : "vf-module-id",
-      "type" : "string"
-    },
-    "updated-by" : "Singal, Kapil <ks220y@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input",
-        "properties" : { }
-      }
-    }
-  },
-  "vf-module-label" : {
-    "tags" : "vf-module-label",
-    "name" : "vf-module-label",
-    "property" : {
-      "description" : "vf-module-label",
-      "type" : "string"
-    },
-    "updated-by" : "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"
-        }
-      }
-    }
-  },
-  "vf-module-model-customization-uuid" : {
-    "tags" : "vf-module-model-customization-uuid",
-    "name" : "vf-module-model-customization-uuid",
-    "property" : {
-      "description" : "vf-module-model-customization-uuid",
-      "type" : "string"
-    },
-    "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input"
-      },
-      "default" : {
-        "type" : "source-default",
-        "properties" : { }
-      }
-    }
-  },
-  "vf-module-type" : {
-    "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"
-          },
-          "endpoint-selector" : "dynamic-db-source",
-          "input-key-mapping" : {
-            "customizationid" : "vf-module-model-customization-uuid"
-          },
-          "key-dependencies" : [ "vf-module-model-customization-uuid" ]
-        }
-      }
-    }
-  },
-  "vf-naming-policy" : {
-    "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" : {
-          "endpoint-selector" : "dynamic-db-source",
-          "type" : "SQL",
-          "query" : "select sdnctl.VF_MODEL.naming_policy as vf_naming_policy from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnf_model_customization_uuid",
-          "input-key-mapping" : {
-            "vnf_model_customization_uuid" : "vnf-model-customization-uuid"
-          },
-          "output-key-mapping" : {
-            "vf-naming-policy" : "vf_naming_policy"
-          },
-          "key-dependencies" : [ "vnf-model-customization-uuid" ]
-        }
-      }
-    }
-  },
-  "vf_module_name" : {
-    "tags" : "vf_module_name",
-    "name" : "vf_module_name",
-    "property" : {
-      "description" : "vf_module_name",
-      "type" : "string"
-    },
-    "updated-by" : "Singal, Kapil <ks220y@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input"
-      },
-      "default" : {
-        "type" : "source-default",
-        "properties" : { }
-      }
-    }
-  },
-  "vfccustomizationuuid" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "vip" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "vlb_int_pktgen_private_ip_0" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "vlb_int_private_ip_0" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "vlb_name_0" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "vlb_onap_private_ip_0" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "vlb_private_net_cidr" : {
-    "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" : {
-          "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" ]
-        }
-      },
-      "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"
-          }
-        }
-      }
-    }
-  },
-  "vm-type" : {
-    "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"
-          },
-          "endpoint-selector" : "dynamic-db-source",
-          "input-key-mapping" : {
-            "vfccustomizationuuid" : "vfccustomizationuuid"
-          },
-          "key-dependencies" : [ "vfccustomizationuuid" ]
-        }
-      }
-    }
-  },
-  "vnf-id" : {
-    "tags" : "vnf-id",
-    "name" : "vnf-id",
-    "property" : {
-      "description" : "vnf-id",
-      "type" : "string"
-    },
-    "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input"
-      },
-      "default" : {
-        "type" : "source-default",
-        "properties" : { }
-      }
-    }
-  },
-  "vnf-model-customization-uuid" : {
-    "tags" : "vnf-model-customization-uuid",
-    "name" : "vnf-model-customization-uuid",
-    "property" : {
-      "description" : "vnf-model-customization-uuid",
-      "type" : "string"
-    },
-    "updated-by" : "Singal, Kapil <ks220y@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input",
-        "properties" : { }
-      }
-    }
-  },
-  "vnf_name" : {
-    "tags" : "vnf_name",
-    "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" : "/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_name",
-          "path" : "/param/0/value",
-          "input-key-mapping" : {
-            "service-instance-id" : "service-instance-id",
-            "vnf-id" : "vnf-id"
-          },
-          "output-key-mapping" : {
-            "vnf_name" : "value"
-          },
-          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
-        }
-      }
-    }
-  },
-  "vnfc-model-invariant-uuid" : {
-    "tags" : "vnfc-model-invariant-uuid",
-    "name" : "vnfc-model-invariant-uuid",
-    "property" : {
-      "description" : "vnfc-model-invariant-uuid",
-      "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"
-          },
-          "endpoint-selector" : "dynamic-db-source",
-          "input-key-mapping" : {
-            "vfccustomizationuuid" : "vfccustomizationuuid"
-          },
-          "key-dependencies" : [ "vfccustomizationuuid" ]
-        }
-      }
-    }
-  },
-  "vnfc-model-version" : {
-    "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",
-          "output-key-mapping" : {
-            "vnfc-model-version" : "vnfc_model_version"
-          },
-          "endpoint-selector" : "dynamic-db-source",
-          "input-key-mapping" : {
-            "vfccustomizationuuid" : "vfccustomizationuuid"
-          },
-          "key-dependencies" : [ "vfccustomizationuuid" ]
-        }
-      }
-    }
-  },
-  "vpg_int_pktgen_private_ip_0" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "vpg_name_0" : {
-    "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" ]
-        }
-      }
-    }
-  },
-  "vpg_onap_private_ip_0" : {
-    "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" ]
-        }
-      }
-    }
-  }
+	"aic-cloud-region": {
+		"tags": "aic-cloud-region",
+		"name": "aic-cloud-region",
+		"property": {
+			"description": "aic-cloud-region",
+			"type": "string"
+		},
+		"updated-by": "Singal, Kapil <ks220y@att.com>",
+		"sources": {
+			"input": {
+				"type": "source-input",
+				"properties": {}
+			}
+		}
+	},
+	"vlb_0_int_pktgen_private_port_0_mac": {
+		"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"
+					]
+				}
+			}
+		}
+	},
+	"vpg_0_int_pktgen_private_port_0_mac": {
+		"tags": "vpg_0_int_pktgen_private_port_0_mac",
+		"name": "vpg_0_int_pktgen_private_port_0_mac",
+		"property": {
+			"description": "vpg_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/vpg_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": {
+						"vpg_0_int_pktgen_private_port_0_mac": "value"
+					},
+					"key-dependencies": [
+						"service-instance-id",
+						"vnf-id"
+					]
+				}
+			}
+		}
+	},
+	"cloud_env": {
+		"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"
+					]
+				}
+			}
+		}
+	},
+	"create-md-sal-vnf-param": {
+		"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",
+					"headers": {
+						"Accept": "application/json",
+						"Content-Type": "application/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"
+					]
+				}
+			}
+		}
+	},
+	"dcae_collector_ip": {
+		"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"
+					]
+				}
+			}
+		}
+	},
+	"dcae_collector_port": {
+		"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"
+					]
+				}
+			}
+		}
+	},
+	"demo_artifacts_version": {
+		"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"
+					]
+				}
+			}
+		}
+	},
+	"flavor_name": {
+		"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"
+					]
+				}
+			}
+		}
+	},
+	"gre_ipaddr": {
+		"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"
+					]
+				}
+			},
+			"rest": {
+				"type": "source-rest",
+				"properties": {
+					"endpoint-selector": "ipam-1",
+					"type": "JSON",
+					"verb": "POST",
+					"url-path": "/api/ipam/prefixes/$prefix-id/available-ips/",
+					"path": "",
+					"input-key-mapping": {
+						"prefix-id": "private1-prefix-id"
+					},
+					"output-key-mapping": {
+						"gre_ipaddr": "address",
+						"id": "id"
+					},
+					"key-dependencies": [
+						"private1-prefix-id"
+					]
+				}
+			}
+		}
+	},
+	"image_name": {
+		"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"
+					]
+				}
+			}
+		}
+	},
+	"install_script_version": {
+		"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"
+					]
+				}
+			}
+		}
+	},
+	"int_pktgen_private_net_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"
+					]
+				}
+			}
+		}
+	},
+	"int_pktgen_private_subnet_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"
+					]
+				}
+			}
+		}
+	},
+	"int_private_net_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"
+					]
+				}
+			}
+		}
+	},
+	"int_private_subnet_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"
+					]
+				}
+			}
+		}
+	},
+	"key_name": {
+		"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"
+					]
+				}
+			}
+		}
+	},
+	"keypair": {
+		"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"
+					]
+				}
+			}
+		}
+	},
+	"management-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"
+					}
+				}
+			}
+		}
+	},
+	"nb_api_version": {
+		"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"
+					]
+				}
+			}
+		}
+	},
+	"nexus_artifact_repo": {
+		"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"
+					]
+				}
+			}
+		}
+	},
+	"nfc-naming-code": {
+		"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"
+					]
+				}
+			}
+		}
+	},
+	"onap_private_net_cidr": {
+		"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"
+					]
+				}
+			}
+		}
+	},
+	"onap_private_net_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"
+					]
+				}
+			}
+		}
+	},
+	"onap_private_subnet_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"
+					]
+				}
+			}
+		}
+	},
+	"pg_int": {
+		"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"
+					]
+				}
+			},
+			"rest": {
+				"type": "source-rest",
+				"properties": {
+					"endpoint-selector": "ipam-1",
+					"type": "JSON",
+					"verb": "POST",
+					"url-path": "/api/ipam/prefixes/$prefix-id/available-ips/",
+					"path": "",
+					"input-key-mapping": {
+						"prefix-id": "private2-prefix-id"
+					},
+					"output-key-mapping": {
+						"pg_int": "address",
+						"id": "id"
+					},
+					"key-dependencies": [
+						"private2-prefix-id"
+					]
+				}
+			}
+		}
+	},
+	"pktgen_private_net_cidr": {
+		"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"
+					]
+				}
+			}
+		}
+	},
+	"private1-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"
+					}
+				}
+			}
+		}
+	},
+	"private2-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"
+					}
+				}
+			}
+		}
+	},
+	"pub_key": {
+		"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"
+					]
+				}
+			}
+		}
+	},
+	"public_net_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"
+					]
+				}
+			}
+		}
+	},
+	"sec_group": {
+		"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"
+					]
+				}
+			}
+		}
+	},
+	"service-instance-id": {
+		"tags": "service-instance-id, tosca.datatypes.Root, data_type",
+		"name": "service-instance-id",
+		"property": {
+			"description": "To be provided",
+			"type": "string"
+		},
+		"updated-by": "Singal, Kapil <ks220y@att.com>",
+		"sources": {
+			"input": {
+				"type": "source-input",
+				"properties": {}
+			},
+			"any-db": {
+				"type": "source-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-key-dependencies": []
+				}
+			}
+		}
+	},
+	"vdns_int_private_ip_0": {
+		"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"
+					]
+				}
+			},
+			"rest": {
+				"type": "source-rest",
+				"properties": {
+					"endpoint-selector": "ipam-1",
+					"type": "JSON",
+					"verb": "POST",
+					"url-path": "/api/ipam/prefixes/$prefix-id/available-ips/",
+					"path": "",
+					"input-key-mapping": {
+						"prefix-id": "private1-prefix-id"
+					},
+					"output-key-mapping": {
+						"vdns_int_private_ip_0": "address",
+						"id": "id"
+					},
+					"key-dependencies": [
+						"private1-prefix-id"
+					]
+				}
+			}
+		}
+	},
+	"vdns_name_0": {
+		"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"
+					]
+				}
+			},
+			"rest": {
+				"type": "source-rest",
+				"properties": {
+					"endpoint-selector": "naming-resolution",
+					"verb": "POST",
+					"type": "JSON",
+					"headers": {
+						"Accept": "application/json",
+						"Content-Type": "application/json"
+					},
+					"url-path": "/v1/genNetworkElementName",
+					"payload": "{\r\n\t\"elements\": [{\r\n\t\t\"resource-name\": \"vdns_name_0\",\r\n\t\t\"resource-value\": \"${vdns_name_0}\",\r\n\t\t\"external-key\": \"${vf-module-id}_vdns_name_0\",\r\n\t\t\"policy-instance-name\": \"${vf-naming-policy}\",\r\n\t\t\"naming-type\": \"VNFC\",\r\n\t\t\"VNF_NAME\": \"${vnf_name}\",\r\n\t\t\"NFC_NAMING_CODE\": \"${nfc-naming-code}\"\r\n\t}]\r\n}",
+					"path": "/elements/0/resource-value",
+					"input-key-mapping": {
+						"vf-naming-policy": "vf-naming-policy",
+						"nfc-naming-code": "nfc-naming-code",
+						"vnf_name": "vnf_name",
+						"vf-module-id": "vf-module-id"
+
+					},
+					"output-key-mapping": {
+						"vdns_name_0": "resource-value"
+					},
+					"key-dependencies": [
+						"vf-naming-policy",
+						"nfc-naming-code",
+						"vnf_name",
+						"vf-module-id"
+
+					]
+				}
+			}
+		}
+	},
+	"vdns_onap_private_ip_0": {
+		"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"
+					]
+				}
+			},
+			"rest": {
+				"type": "source-rest",
+				"properties": {
+					"endpoint-selector": "ipam-1",
+					"type": "JSON",
+					"verb": "POST",
+					"url-path": "/api/ipam/prefixes/$prefix-id/available-ips/",
+					"path": "",
+					"input-key-mapping": {
+						"prefix-id": "management-prefix-id"
+					},
+					"output-key-mapping": {
+						"vdns_onap_private_ip_0": "address",
+						"id": "id"
+					},
+					"key-dependencies": [
+						"management-prefix-id"
+					]
+				}
+			}
+		}
+	},
+	"vdns_vf_module_id": {
+		"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"
+					]
+				}
+			},
+			"rest": {
+				"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"
+					]
+				}
+			}
+		}
+	},
+	"vf-module-id": {
+		"tags": "vf-module-id",
+		"name": "vf-module-id",
+		"property": {
+			"description": "vf-module-id",
+			"type": "string"
+		},
+		"updated-by": "Singal, Kapil <ks220y@att.com>",
+		"sources": {
+			"input": {
+				"type": "source-input",
+				"properties": {}
+			}
+		}
+	},
+	"vf-module-label": {
+		"tags": "vf-module-label",
+		"name": "vf-module-label",
+		"property": {
+			"description": "vf-module-label",
+			"type": "string"
+		},
+		"updated-by": "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"
+					]
+				}
+			}
+		}
+	},
+	"vf-module-model-customization-uuid": {
+		"tags": "vf-module-model-customization-uuid",
+		"name": "vf-module-model-customization-uuid",
+		"property": {
+			"description": "vf-module-model-customization-uuid",
+			"type": "string"
+		},
+		"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+		"sources": {
+			"input": {
+				"type": "source-input"
+			},
+			"default": {
+				"type": "source-default",
+				"properties": {}
+			}
+		}
+	},
+	"vnf_assign_aai": {
+
+		"tags": "vnf_assign_aai",
+		"name": "vnf_assign_aai",
+		"property": {
+			"description": "vnf_assign_aai",
+			"type": "string"
+		},
+		"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+		"sources": {
+			"aai-data": {
+				"type": "source-rest",
+				"properties": {
+					"verb": "PATCH",
+					"type": "JSON",
+					"headers": {
+					
+						"Content-Type": "application/merge-patch+json"
+										
+					},
+					"url-path": "/aai/v14/network/generic-vnfs/generic-vnf/$vnf-id",
+					"payload": "{\r\n\"vnf-name\":\"${vnf_name}\", \r\n \"selflink\": \"restconf\/config\/GENERIC-RESOURCE-API:services\/service\/${service-instance-id}\/service-data\/vnfs\/vnf\/${vnf-id}\/vnf-data\/vnf-topology\/\"\r\n}",
+					"path": "",
+					"input-key-mapping": {
+						"service-instance-id":"service-instance-id",
+						"vnf-id": "vnf-id",
+						"vnf_name": "vnf_name"
+					},
+					"output-key-mapping": {},
+					"key-dependencies": [
+						"service-instance-id",
+						"vnf-id",
+						"vnf_name"
+					]
+				}
+			}
+		}
+	},
+
+	"vf-module-assign": {
+
+		"tags": "vf-module-assign",
+		"name": "vf-module-assign",
+		"property": {
+			"description": "vf-module-assign",
+			"type": "string"
+		},
+		"updated-by": "Singal, Kapil <ks220y@att.com>",
+		"sources": {
+
+			"aai-data": {
+				"type": "source-rest",
+				"properties": {
+					"verb": "PATCH",
+					"type": "JSON",
+					"headers": {
+					
+						"Content-Type": "application/merge-patch+json"
+						
+					},
+					"url-path": "/aai/v14/network/generic-vnfs/generic-vnf/$vnf-id/vf-modules/vf-module/$vf-module-id",
+					"payload": "{\r\n\"vf-module-name\":\"${vf-module-name}\", \r\n\"selflink\": \"restconf\/config\/GENERIC-RESOURCE-API:services\/service\/${service-instance-id}\/service-data\/vnfs\/vnf\/${vnf-id}\/vnf-data\/vf-modules\/vf-module\/${vf-module-id}\/vf-module-data\/vf-module-topology\/\"\r\n  \r\n}",
+					"path": "",
+					"input-key-mapping": {
+					    "service-instance-id":"service-instance-id",
+						"vnf-id": "vnf-id",
+						"vf-module-id": "vf-module-id",
+						"vf-module-name": "vf-module-name"
+					},
+					"output-key-mapping": {},
+					"key-dependencies": [
+						"service-instance-id",
+						"vnf-id",
+						"vf-module-id",
+						"vf-module-name"
+					]
+				}
+			}
+		}
+	},
+
+	"vf-module-name": {
+		"tags": "vf-module-name",
+		"name": "vf-module-name",
+		"property": {
+			"description": "vf_module_name",
+			"type": "string"
+		},
+		"updated-by": "Singal, Kapil <ks220y@att.com>",
+		"sources": {
+			"input": {
+				"type": "source-input"
+			},
+			"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/$vf_module_id/vf-module-data/vf-module-topology/vf-module-parameters/param/vf-module-name",
+					"path": "/param/0/value",
+					"input-key-mapping": {
+						"service-instance-id": "service-instance-id",
+						"vnf-id": "vnf-id"
+					},
+					"output-key-mapping": {
+						"vf-module-name": "value"
+					},
+					"key-dependencies": [
+						"service-instance-id",
+						"vnf-id",
+						"vf_module_id"
+					]
+				}
+			},
+			"rest": {
+				"type": "source-rest",
+				"properties": {
+					"endpoint-selector": "naming-resolution",
+					"verb": "POST",
+					"type": "JSON",
+					"headers": {
+						"Accept": "application/json",
+						"Content-Type": "application/json"
+					},
+					"url-path": "/v1/genNetworkElementName",
+					"payload": "{\r\n  \"elements\": [\r\n    {\r\n      \"resource-name\": \"vf-module-name\",\r\n      \"resource-value\": \"${vf-module-name}\",\r\n      \"external-key\": \"${vf-module-id}\",\r\n      \"policy-instance-name\": \"${vf-naming-policy}\",\r\n      \"naming-type\": \"VF-MODULE\",\r\n      \"VNF_NAME\": \"${vnf_name}\",\r\n      \"VF_MODULE_LABEL\":\"${vf-module-label}\",\r\n      \"VF_MODULE_TYPE\":\"${vf-module-type}\"\r\n    }\r\n  ]\r\n}",
+					"path": "/elements/0/resource-value",
+					"input-key-mapping": {
+						"vf-naming-policy": "vf-naming-policy",
+						"vnf_name": "vnf_name",
+						"vf-module-label": "vf-module-label",
+						"vf-module-type": "vf-module-type",
+						"vf-module-id": "vf-module-id"
+
+					},
+					"output-key-mapping": {
+						"vf-module-name": "resource-value"
+					},
+					"key-dependencies": [
+						"vf-naming-policy",
+						"vnf_name",
+						"vf-module-label",
+						"vf-module-type",
+						"vf-module-id"
+					]
+				}
+			}
+		}
+	},
+	"vf-module-type": {
+		"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"
+					]
+				}
+			}
+		}
+	},
+	"vf-naming-policy": {
+		"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"
+					]
+				}
+			}
+		}
+	},
+	"vfccustomizationuuid": {
+		"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"
+					]
+				}
+			}
+		}
+	},
+	"vip": {
+		"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"
+					]
+				}
+			},
+			"rest": {
+				"type": "source-rest",
+				"properties": {
+					"endpoint-selector": "ipam-1",
+					"type": "JSON",
+					"verb": "POST",
+					"url-path": "/api/ipam/prefixes/$prefix-id/available-ips/",
+					"path": "",
+					"input-key-mapping": {
+						"prefix-id": "private2-prefix-id"
+					},
+					"output-key-mapping": {
+						"vip": "address",
+						"id": "id"
+					},
+					"key-dependencies": [
+						"private2-prefix-id"
+					]
+				}
+			}
+		}
+	},
+	"vlb_int_pktgen_private_ip_0": {
+		"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"
+					]
+				}
+			},
+			"rest": {
+				"type": "source-rest",
+				"properties": {
+					"endpoint-selector": "ipam-1",
+					"type": "JSON",
+					"verb": "POST",
+					"url-path": "/api/ipam/prefixes/$prefix-id/available-ips/",
+					"path": "",
+					"input-key-mapping": {
+						"prefix-id": "private2-prefix-id"
+					},
+					"output-key-mapping": {
+						"vlb_int_pktgen_private_ip_0": "address",
+						"id": "id"
+					},
+					"key-dependencies": [
+						"private2-prefix-id"
+					]
+				}
+			}
+		}
+	},
+	"vlb_int_private_ip_0": {
+		"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"
+					]
+				}
+			},
+			"rest": {
+				"type": "source-rest",
+				"properties": {
+					"endpoint-selector": "ipam-1",
+					"type": "JSON",
+					"verb": "POST",
+					"url-path": "/api/ipam/prefixes/$prefix-id/available-ips/",
+					"path": "",
+					"input-key-mapping": {
+						"prefix-id": "private1-prefix-id"
+					},
+					"output-key-mapping": {
+						"vlb_int_private_ip_0": "address",
+						"id": "id"
+					},
+					"key-dependencies": [
+						"private1-prefix-id"
+					]
+				}
+			}
+		}
+	},
+	"vlb_name_0": {
+		"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"
+					]
+				}
+			},
+			"rest": {
+				"type": "source-rest",
+				"properties": {
+					"endpoint-selector": "naming-resolution",
+					"verb": "POST",
+					"type": "JSON",
+					"headers": {
+						"Accept": "application/json",
+						"Content-Type": "application/json"
+					},
+					"url-path": "/v1/genNetworkElementName",
+					"payload": "{\r\n\t\"elements\": [{\r\n\t\t\"resource-name\": \"vlb_name_0\",\r\n\t\t\"resource-value\": \"${vlb_name_0}\",\r\n\t\t\"external-key\": \"${vf-module-id}_vlb_name_0\",\r\n\t\t\"policy-instance-name\": \"${vf-naming-policy}\",\r\n\t\t\"naming-type\": \"VNFC\",\r\n\t\t\"VNF_NAME\": \"${vnf_name}\",\r\n\t\t\"NFC_NAMING_CODE\": \"${nfc-naming-code}\"\r\n\t}]\r\n}",
+					"path": "/elements/0/resource-value",
+					"input-key-mapping": {
+						"vf-naming-policy": "vf-naming-policy",
+						"nfc-naming-code": "nfc-naming-code",
+						"vnf_name": "vnf_name",
+						"vf-module-id": "vf-module-id"
+					},
+					"output-key-mapping": {
+						"vlb_name_0": "resource-value"
+					},
+					"key-dependencies": [
+						"vf-naming-policy",
+						"nfc-naming-code",
+						"vnf_name",
+						"vf-module-id"
+					]
+				}
+			}
+		}
+	},
+	"vlb_onap_private_ip_0": {
+		"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": {
+						"vlb_onap_private_ip_0": "value"
+					},
+					"key-dependencies": [
+						"service-instance-id",
+						"vnf-id"
+					]
+				}
+			},
+			"rest": {
+				"type": "source-rest",
+				"properties": {
+					"endpoint-selector": "ipam-1",
+					"type": "JSON",
+					"verb": "POST",
+					"url-path": "/api/ipam/prefixes/$prefix-id/available-ips/",
+					"path": "",
+					"input-key-mapping": {
+						"prefix-id": "management-prefix-id"
+					},
+					"output-key-mapping": {
+						"vlb_onap_private_ip_0": "address",
+						"id": "id"
+					},
+					"key-dependencies": [
+						"management-prefix-id"
+					]
+				}
+			}
+		}
+	},
+	"vlb_private_net_cidr": {
+		"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": {
+					"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"
+					]
+				}
+			},
+			"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"
+					}
+				}
+			}
+		}
+	},
+	"vm-type": {
+		"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"
+					]
+				}
+			}
+		}
+	},
+	"vnf-id": {
+		"tags": "vnf-id",
+		"name": "vnf-id",
+		"property": {
+			"description": "vnf-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/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"
+					]
+				}
+			}
+		}
+	},
+	"vnf-model-customization-uuid": {
+		"tags": "vnf-model-customization-uuid",
+		"name": "vnf-model-customization-uuid",
+		"property": {
+			"description": "vnf-model-customization-uuid",
+			"type": "string"
+		},
+		"updated-by": "Singal, Kapil <ks220y@att.com>",
+		"sources": {
+			"input": {
+				"type": "source-input",
+				"properties": {}
+			}
+		}
+	},
+	"vnf_name": {
+		"tags": "vnf_name",
+		"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": "/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_name",
+					"path": "/param/0/value",
+					"headers": {
+						"Accept": "application/json",
+						"Content-Type": "application/json"
+					},
+					"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"
+					]
+				}
+			},
+			"rest": {
+				"type": "source-rest",
+				"properties": {
+					"endpoint-selector": "naming-resolution",
+					"verb": "POST",
+					"type": "JSON",
+					"headers": {
+						"Accept": "application/json",
+						"Content-Type": "application/json"
+					},
+					"url-path": "/v1/genNetworkElementName",
+					"payload": "{\r\n  \"elements\": [\r\n    {\r\n      \"resource-name\": \"vnf_name\",\r\n      \"resource-value\": \"${vnf_name}\",\r\n      \"external-key\": \"${vnf-id}\",\r\n      \"policy-instance-name\": \"${vf-naming-policy}\",\r\n      \"naming-type\": \"VNF\",\r\n      \"AIC_CLOUD_REGION\": \"${aic-cloud-region}\"\r\n    }\r\n  ]\r\n}",
+					"path": "/elements/0/resource-value",
+					"input-key-mapping": {
+						"vnf-id": "vnf-id",
+						"aic-cloud-region": "aic-cloud-region",
+						"vf-naming-policy": "vf-naming-policy"
+					},
+					"output-key-mapping": {
+						"vnf_name": "resource-value"
+					},
+					"key-dependencies": [
+						"vnf-id",
+						"aic-cloud-region",
+						"vf-naming-policy"
+					]
+				}
+			}
+		}
+	},
+	"repo_url_blob": {
+		"tags": "repo_url_blob",
+		"name": "repo_url_blob",
+		"property": {
+			"description": "repo_url_blob",
+			"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/repo_url_blob",
+					"path": "/param/0/value",
+					"input-key-mapping": {
+						"service-instance-id": "service-instance-id",
+						"vnf-id": "vnf-id"
+					},
+					"output-key-mapping": {
+						"repo_url_blob": "value"
+					},
+					"key-dependencies": [
+						"service-instance-id",
+						"vnf-id"
+					]
+				}
+			}
+		}
+	},
+	"repo_url_artifacts": {
+		"tags": "repo_url_artifacts",
+		"name": "repo_url_artifacts",
+		"property": {
+			"description": "repo_url_artifacts",
+			"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/repo_url_artifacts",
+					"path": "/param/0/value",
+					"input-key-mapping": {
+						"service-instance-id": "service-instance-id",
+						"vnf-id": "vnf-id"
+					},
+					"output-key-mapping": {
+						"repo_url_artifacts": "value"
+					},
+					"key-dependencies": [
+						"service-instance-id",
+						"vnf-id"
+					]
+				}
+			}
+		}
+	},
+	"vnfc-model-invariant-uuid": {
+		"tags": "vnfc-model-invariant-uuid",
+		"name": "vnfc-model-invariant-uuid",
+		"property": {
+			"description": "vnfc-model-invariant-uuid",
+			"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"
+					]
+				}
+			}
+		}
+	},
+	"vnfc-model-version": {
+		"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",
+					"output-key-mapping": {
+						"vnfc-model-version": "vnfc_model_version"
+					},
+					"input-key-mapping": {
+						"vfccustomizationuuid": "vfccustomizationuuid"
+					},
+					"key-dependencies": [
+						"vfccustomizationuuid"
+					]
+				}
+			}
+		}
+	},
+	"vpg_int_private1_ip_0": {
+		"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"
+					]
+				}
+			},
+			"rest": {
+				"type": "source-rest",
+				"properties": {
+					"endpoint-selector": "ipam-1",
+					"type": "JSON",
+					"verb": "POST",
+					"url-path": "/api/ipam/prefixes/$prefix-id/available-ips/",
+					"path": "",
+					"input-key-mapping": {
+						"prefix-id": "management-prefix-id"
+					},
+					"output-key-mapping": {
+						"vpg_int_private1_ip_0": "address",
+						"id": "id"
+					},
+					"key-dependencies": [
+						"management-prefix-id"
+					]
+				}
+			}
+		}
+	},
+	"vpg_int_pktgen_private_ip_0": {
+		"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"
+					]
+				}
+			},
+			"rest": {
+				"type": "source-rest",
+				"properties": {
+					"endpoint-selector": "ipam-1",
+					"type": "JSON",
+					"verb": "POST",
+					"url-path": "/api/ipam/prefixes/$prefix-id/available-ips/",
+					"path": "",
+					"input-key-mapping": {
+						"prefix-id": "private2-prefix-id"
+					},
+					"output-key-mapping": {
+						"vpg_int_pktgen_private_ip_0": "address",
+						"id": "id"
+					},
+					"key-dependencies": [
+						"private2-prefix-id"
+					]
+				}
+			}
+		}
+	},
+	"vpg_name_0": {
+		"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"
+					]
+				}
+			},
+			"rest": {
+				"type": "source-rest",
+				"properties": {
+					"endpoint-selector": "naming-resolution",
+					"verb": "POST",
+					"type": "JSON",
+					"headers": {
+						"Accept": "application/json",
+						"Content-Type": "application/json"
+					},
+					"url-path": "/v1/genNetworkElementName",
+					"payload": "{\r\n\t\"elements\": [{\r\n\t\t\"resource-name\": \"vpg_name_0\",\r\n\t\t\"resource-value\": \"${vpg_name_0}\",\r\n\t\t\"external-key\": \"${vf-module-id}_vpg_name_0\",\r\n\t\t\"policy-instance-name\": \"${vf-naming-policy}\",\r\n\t\t\"naming-type\": \"VNFC\",\r\n\t\t\"VNF_NAME\": \"${vnf_name}\",\r\n\t\t\"NFC_NAMING_CODE\": \"${nfc-naming-code}\"\r\n\t}]\r\n}",
+					"path": "/elements/0/resource-value",
+					"input-key-mapping": {
+						"vf-naming-policy": "vf-naming-policy",
+						"nfc-naming-code": "nfc-naming-code",
+						"vnf_name": "vnf_name",
+						"vf-module-id": "vf-module-id"
+
+					},
+					"output-key-mapping": {
+						"vpg_name_0": "resource-value"
+					},
+					"key-dependencies": [
+						"vf-naming-policy",
+						"nfc-naming-code",
+						"vnf_name",
+						"vf-module-id"
+
+					]
+				}
+			}
+		}
+	},
+	"vpg_onap_private_ip_0": {
+		"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"
+					]
+				}
+			},
+			"rest": {
+				"type": "source-rest",
+				"properties": {
+					"endpoint-selector": "ipam-1",
+					"type": "JSON",
+					"verb": "POST",
+					"url-path": "/api/ipam/prefixes/$prefix-id/available-ips/",
+					"path": "",
+					"input-key-mapping": {
+						"prefix-id": "management-prefix-id"
+					},
+					"output-key-mapping": {
+						"vpg_onap_private_ip_0": "address",
+						"id": "id"
+					},
+					"key-dependencies": [
+						"management-prefix-id"
+					]
+				}
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/vLB_CDS.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/vLB_CDS.json
index 9b03a5e..2db4fea 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/vLB_CDS.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/vLB_CDS.json
@@ -1,323 +1,566 @@
 {
-  "tosca_definitions_version" : "controller_blueprint_1_0_0",
-  "metadata" : {
-    "template_author" : "Abdelmuhaimen Seaudi",
-    "author-email" : "abdelmuhaimen.seaudi@orange.com",
-    "user-groups" : "ADMIN, OPERATION",
-    "template_name" : "vLB_CDS",
-    "template_version" : "1.0.0",
-    "template_tags" : "test, vDNS-CDS, SCALE-OUT, MARCO"
-  },
-  "imports" : [ {
-    "file" : "Definitions/data_types.json"
-  }, {
-    "file" : "Definitions/relationship_types.json"
-  }, {
-    "file" : "Definitions/artifact_types.json"
-  }, {
-    "file" : "Definitions/node_types.json"
-  }, {
-    "file" : "Definitions/policy_types.json"
-  } ],
-  "dsl_definitions" : {
-    "ipam-1" : {
-      "type" : "token-auth",
-      "url" : "http://netbox-nginx:8080",
-      "token" : "Token 0123456789abcdef0123456789abcdef01234567"
-    },
-    "config-deploy-properties" : {
-      "resolution-key" : {
-        "get_input" : "resolution-key"
-      }
-    },
-    "dynamic-db-source" : {
-      "type" : "maria-db",
-      "url" : "jdbc:mysql://mariadb-galera:3306/sdnctl",
-      "username" : "root",
-      "password" : "secretpassword"
-    }
-  },
-  "topology_template" : {
-    "workflows" : {
-      "resource-assignment" : {
-        "steps" : {
-          "resource-assignment" : {
-            "description" : "Resource Assign Workflow",
-            "target" : "resource-assignment"
-          }
-        },
-        "inputs" : {
-          "template-prefix" : {
-            "required" : true,
-            "type" : "list",
-            "entry_schema" : {
-              "type" : "string"
-            }
-          },
-          "resource-assignment-properties" : {
-            "description" : "Dynamic PropertyDefinition for workflow(resource-assignment).",
-            "required" : true,
-            "type" : "dt-resource-assignment-properties"
-          }
-        },
-        "outputs" : {
-          "meshed-template" : {
-            "type" : "json",
-            "value" : {
-              "get_attribute" : [ "resource-assignment", "assignment-params" ]
-            }
-          }
-        }
+   "tosca_definitions_version": "controller_blueprint_1_0_0",
+   "metadata": {
+      "template_author": "Abdelmuhaimen Seaudi",
+      "author-email": "abdelmuhaimen.seaudi@orange.com",
+      "user-groups": "ADMIN, OPERATION",
+      "template_name": "vLB_CDS",
+      "template_version": "1.0.0",
+      "template_tags": "vLB, CDS, RESTONF, IMPERATIVE"
+   },
+   "imports": [
+      {
+         "file": "Definitions/data_types.json"
       },
-      "config-assign" : {
-        "steps" : {
-          "config-assign" : {
-            "description" : "Config Assign Workflow",
-            "target" : "config-assign",
-            "activities" : [ {
-              "call_operation" : ""
-            } ]
-          }
-        },
-        "inputs" : {
-          "resolution-key" : {
-            "required" : true,
-            "type" : "string"
-          },
-          "config-assign-properties" : {
-            "description" : "Dynamic PropertyDefinition for workflow(config-assign).",
-            "required" : true,
-            "type" : "dt-config-assign-properties"
-          }
-        },
-        "outputs" : {
-          "dry-run" : {
-            "type" : "json",
-            "value" : {
-              "get_attribuxte" : [ "config-assign", "assignment-params" ]
-            }
-          }
-        }
+      {
+         "file": "Definitions/relationship_types.json"
       },
-      "config-deploy" : {
-        "steps" : {
-          "config-deploy" : {
-            "description" : "Resource Assign and Python Netconf Activation Workflow",
-            "target" : "config-deploy-process",
-            "activities" : [ {
-              "call_operation" : ""
-            } ]
-          }
-        },
-        "inputs" : {
-          "resolution-key" : {
-            "required" : false,
-            "type" : "string"
-          },
-          "service-instance-id" : {
-            "required" : false,
-            "type" : "string"
-          },
-          "config-deploy-properties" : {
-            "description" : "Dynamic PropertyDefinition for workflow(config-deploy).",
-            "required" : true,
-            "type" : "dt-config-deploy-properties"
-          }
-        }
+      {
+         "file": "Definitions/artifact_types.json"
+      },
+      {
+         "file": "Definitions/node_types.json"
+      },
+      {
+         "file": "Definitions/policy_types.json"
       }
-    },
-    "node_templates" : {
-      "resource-assignment" : {
-        "type" : "component-resource-resolution",
-        "interfaces" : {
-          "ResourceResolutionComponent" : {
-            "operations" : {
-              "process" : {
-                "inputs" : {
-                  "artifact-prefix-names" : {
-                    "get_input" : "template-prefix"
+   ],
+   "dsl_definitions": {
+      "ipam-1": {
+         "type": "token-auth",
+         "url": "http://netbox-nginx:8080",
+         "token": "Token 0123456789abcdef0123456789abcdef01234567"
+      },
+      "naming-resolution": {
+         "type": "basic-auth",
+         "url": "http://neng-serv:8080/web/service",
+         "username": "ccsdkapps",
+         "password": "ccsdkapps"
+      },
+      "config-deploy-properties": {
+         "resolution-key": {
+            "get_input": "resolution-key"
+         }
+      },
+      "HealthCheck-properties": {
+         "resolution-key": {
+            "get_input": "resolution-key"
+         }
+      },
+      "ScaleOutReconfiguration-properties": {
+         "resolution-key": {
+            "get_input": "resolution-key"
+         }
+      }
+   },
+   "topology_template": {
+      "workflows": {
+         "resource-assignment": {
+            "steps": {
+               "resource-assignment": {
+                  "description": "Resource Assign Workflow",
+                  "target": "resource-assignment"
+               }
+            },
+            "inputs": {
+               "template-prefix": {
+                  "required": true,
+                  "type": "list",
+                  "entry_schema": {
+                     "type": "string"
                   }
-                }
-              }
+               },
+               "resource-assignment-properties": {
+                  "description": "Dynamic PropertyDefinition for workflow(resource-assignment).",
+                  "required": true,
+                  "type": "dt-resource-assignment-properties"
+               }
+            },
+            "outputs": {
+               "resolved-data": {
+                  "type": "json",
+                  "value": {
+                     "get_attribute": [
+                        "resource-assignment",
+                        "assignment-params"
+                     ]
+                  }
+               }
             }
-          }
-        },
-        "artifacts" : {
-          "base_template-template" : {
-            "type" : "artifact-template-velocity",
-            "file" : "Templates/base_template-template.vtl"
-          },
-          "base_template-mapping" : {
-            "type" : "artifact-mapping-resource",
-            "file" : "Templates/base_template-mapping.json"
-          },
-          "vpkg-template" : {
-            "type" : "artifact-template-velocity",
-            "file" : "Templates/vpkg-template.vtl"
-          },
-          "vpkg-mapping" : {
-            "type" : "artifact-mapping-resource",
-            "file" : "Templates/vpkg-mapping.json"
-          },
-          "vdns-template" : {
-            "type" : "artifact-template-velocity",
-            "file" : "Templates/vdns-template.vtl"
-          },
-          "vdns-mapping" : {
-            "type" : "artifact-mapping-resource",
-            "file" : "Templates/vdns-mapping.json"
-          },
-          "vnf-template" : {
-            "type" : "artifact-template-velocity",
-            "file" : "Templates/vnf-template.vtl"
-          },
-          "vnf-mapping" : {
-            "type" : "artifact-mapping-resource",
-            "file" : "Templates/vnf-mapping.json"
-          },
-          "vlb-template" : {
-            "type" : "artifact-template-velocity",
-            "file" : "Templates/vlb-template.vtl"
-          },
-          "vlb-mapping" : {
-            "type" : "artifact-mapping-resource",
-            "file" : "Templates/vlb-mapping.json"
-          }
-        }
-      },
-      "config-assign" : {
-        "type" : "component-resource-resolution",
-        "interfaces" : {
-          "ResourceResolutionComponent" : {
-            "operations" : {
-              "process" : {
-                "inputs" : {
-                  "resolution-key" : {
-                    "get_input" : "resolution-key"
-                  },
-                  "store-result" : true,
-                  "artifact-prefix-names" : [ "baseconfig", "incremental-config" ]
-                }
-              }
+         },
+         "config-assign": {
+            "steps": {
+               "config-assign": {
+                  "description": "Config Assign Workflow",
+                  "target": "config-assign",
+                  "activities": [
+                     {
+                        "call_operation": ""
+                     }
+                  ]
+               }
+            },
+            "inputs": {
+               "resolution-key": {
+                  "required": true,
+                  "type": "string"
+               },
+               "config-assign-properties": {
+                  "description": "Dynamic PropertyDefinition for workflow(config-assign).",
+                  "required": true,
+                  "type": "dt-config-assign-properties"
+               }
+            },
+            "outputs": {
+               "dry-run": {
+                  "type": "json",
+                  "value": {
+                     "get_attribuxte": [
+                        "config-assign",
+                        "assignment-params"
+                     ]
+                  }
+               }
             }
-          }
-        },
-        "artifacts" : {
-          "baseconfig-template" : {
-            "type" : "artifact-template-velocity",
-            "file" : "Templates/baseconfig-template.vtl"
-          },
-          "baseconfig-mapping" : {
-            "type" : "artifact-mapping-resource",
-            "file" : "Templates/baseconfig-mapping.json"
-          },
-          "incremental-config-template" : {
-            "type" : "artifact-template-velocity",
-            "file" : "Templates/incremental-config-template.vtl"
-          },
-          "incremental-config-mapping" : {
-            "type" : "artifact-mapping-resource",
-            "file" : "Templates/incremental-config-mapping.json"
-          }
-        }
-      },
-      "netconf-device" : {
-        "type" : "vnf-netconf-device",
-        "capabilities" : {
-          "netconf" : {
-            "properties" : {
-              "login-key" : "admin",
-              "login-account" : "admin",
-              "target-ip-address" : {
-                "get_attribute" : [ "nf-account-collection", "", "assignment-params", "nf-params" ]
-              },
-              "port-number" : 2831,
-              "connection-time-out" : 5
+         },
+         "config-deploy": {
+            "steps": {
+               "imperative-workflow-step-1": {
+                  "description": "resolve ip for vlb",
+                  "target": "nf-account-collection",
+                  "activities": [
+                     {
+                        "call_operation": "ResourceResolutionComponent.process"
+                     }
+                  ],
+                  "on_success": [
+                     "imperative-workflow-step-2"
+                  ]
+               },
+               "imperative-workflow-step-2": {
+                  "description": "execute restconf",
+                  "target": "execute",
+                  "activities": [
+                     {
+                        "call_operation": "ComponentScriptExecutor.process"
+                     }
+                  ]
+               }
+            },
+            "inputs": {
+               "resolution-key": {
+                  "required": false,
+                  "type": "string"
+               },
+               "service-instance-id": {
+                  "required": false,
+                  "type": "string"
+               },
+               "config-deploy-properties": {
+                  "description": "Dynamic PropertyDefinition for workflow(config-deploy).",
+                  "required": true,
+                  "type": "dt-config-deploy-properties"
+               }
             }
-          }
-        }
-      },
-      "config-deploy-process" : {
-        "type" : "dg-generic",
-        "properties" : {
-          "content" : {
-            "get_artifact" : [ "SELF", "dg-config-deploy-process" ]
-          },
-          "dependency-node-templates" : [ "nf-account-collection", "execute" ]
-        },
-        "artifacts" : {
-          "dg-config-deploy-process" : {
-            "type" : "artifact-directed-graph",
-            "file" : "Plans/CONFIG_ConfigDeploy.xml"
-          }
-        }
-      },
-      "nf-account-collection" : {
-        "type" : "component-resource-resolution",
-        "interfaces" : {
-          "ResourceResolutionComponent" : {
-            "operations" : {
-              "process" : {
-                "inputs" : {
-                  "artifact-prefix-names" : [ "nf-params" ]
-                }
-              }
+         },
+         "HealthCheck": {
+            "steps": {
+               "imperative-workflow-step-1": {
+                  "description": "resolve ip for vlb",
+                  "target": "nf-account-collection",
+                  "activities": [
+                     {
+                        "call_operation": "ResourceResolutionComponent.process"
+                     }
+                  ],
+                  "on_success": [
+                     "imperative-workflow-step-2"
+                  ]
+               },
+               "imperative-workflow-step-2": {
+                  "description": "execute restconf",
+                  "target": "executeHealthCheck",
+                  "activities": [
+                     {
+                        "call_operation": "ComponentScriptExecutor.process"
+                     }
+                  ]
+               }
+            },
+            "inputs": {
+               "resolution-key": {
+                  "required": false,
+                  "type": "string"
+               },
+               "service-instance-id": {
+                  "required": false,
+                  "type": "string"
+               },
+               "HealthCheck-properties": {
+                  "description": "Dynamic PropertyDefinition for workflow(config-deploy).",
+                  "required": true,
+                  "type": "dt-HealthCheck-properties"
+               }
+            },
+            "outputs": {
+               "response-data": {
+                  "description": "Execution Response Data.",
+                  "required": false,
+                  "type": "json",
+                  "value": {
+                     "get_attribute": [
+                        "executeHealthCheck",
+                        "response-data"
+                     ]
+                  }
+               },
+               "status": {
+                  "description": "Status of the Component Execution ( success or failure )",
+                  "required": true,
+                  "type": "string"
+               }
             }
-          }
-        },
-        "artifacts" : {
-          "nf-params-template" : {
-            "type" : "artifact-template-velocity",
-            "file" : "Templates/nf-params-template.vtl"
-          },
-          "nf-params-mapping" : {
-            "type" : "artifact-mapping-resource",
-            "file" : "Templates/nf-params-mapping.json"
-          }
-        }
-      },
-      "execute" : {
-        "type" : "component-netconf-executor",
-        "requirements" : {
-          "netconf-connection" : {
-            "capability" : "netconf",
-            "node" : "netconf-device",
-            "relationship" : "tosca.relationships.ConnectsTo"
-          }
-        },
-        "interfaces" : {
-          "ComponentNetconfExecutor" : {
-            "operations" : {
-              "process" : {
-                "inputs" : {
-                  "script-type" : "jython",
-                  "script-class-reference" : "Scripts/python/ConfigDeploy.py",
-                  "instance-dependencies" : [ ],
-                  "dynamic-properties" : "*config-deploy-properties"
-                }
-              }
+         },
+         "ScaleOutReconfiguration": {
+            "steps": {
+         
+               "imperative-workflow-step-0": {
+                  "description": "Config Assign Workflow",
+                  "target": "ScaleOutReconfiguration",
+                  "activities": [
+                     {
+                        "call_operation": "ResourceResolutionComponent.process"
+                     }
+                  ],
+                  "on_success": [
+                     "imperative-workflow-step-1"
+                  ]
+               },
+			         "imperative-workflow-step-1": {
+                  "description": "resolve ip for vlb",
+                  "target": "nf-account-collection",
+                  "activities": [
+                     {
+                        "call_operation": "ResourceResolutionComponent.process"
+                     }
+                  ],
+                  "on_success": [
+                     "imperative-workflow-step-2"
+                  ]
+               },
+               "imperative-workflow-step-2": {
+                  "description": "execute restconf",
+                  "target": "execute",
+                  "activities": [
+                     {
+                        "call_operation": "ComponentScriptExecutor.process"
+                     }
+                  ]
+               }
+            },
+            "inputs": {
+               "resolution-key": {
+                  "required": false,
+                  "type": "string"
+               },
+               "service-instance-id": {
+                  "required": false,
+                  "type": "string"
+               },
+               "ScaleOutReconfiguration-properties": {
+                  "description": "Dynamic PropertyDefinition for workflow(ScaleOutReconfiguration).",
+                  "required": true,
+                  "type": "dt-ScaleOutReconfiguration-properties"
+               }
             }
-          }
-        },
-        "artifacts" : {
-          "baseconfig-template" : {
-            "type" : "artifact-template-velocity",
-            "file" : "Templates/baseconfig-template.vtl"
-          },
-          "baseconfig-mapping" : {
-            "type" : "artifact-mapping-resource",
-            "file" : "Templates/baseconfig-mapping.json"
-          },
-          "incremental-config-template" : {
-            "type" : "artifact-template-velocity",
-            "file" : "Templates/incremental-config-template.vtl"
-          },
-          "incremental-config-mapping" : {
-            "type" : "artifact-mapping-resource",
-            "file" : "Templates/incremental-config-mapping.json"
-          }
-        }
+         },
+         "vf-config-assign": {
+            "steps": {
+               "config-assign": {
+                  "description": "Config Assign Workflow",
+                  "target": "config-assign",
+                  "activities": [
+                     {
+                        "call_operation": ""
+                     }
+                  ]
+               }
+            },
+            "inputs": {
+               "resolution-key": {
+                  "required": true,
+                  "type": "string"
+               },
+               "config-assign-properties": {
+                  "description": "Dynamic PropertyDefinition for workflow(config-assign).",
+                  "required": true,
+                  "type": "dt-config-assign-properties"
+               }
+            },
+            "outputs": {
+               "dry-run": {
+                  "type": "json",
+                  "value": {
+                     "get_attribuxte": [
+                        "config-assign",
+                        "assignment-params"
+                     ]
+                  }
+               }
+            }
+         },
+         "vf-config-deploy": {
+            "steps": {
+               "imperative-workflow-step-1": {
+                  "description": "resolve ip for vlb",
+                  "target": "nf-account-collection",
+                  "activities": [
+                     {
+                        "call_operation": "ResourceResolutionComponent.process"
+                     }
+                  ],
+                  "on_success": [
+                     "imperative-workflow-step-2"
+                  ]
+               },
+               "imperative-workflow-step-2": {
+                  "description": "execute restconf",
+                  "target": "execute",
+                  "activities": [
+                     {
+                        "call_operation": "ComponentScriptExecutor.process"
+                     }
+                  ]
+               }
+            },
+            "inputs": {
+               "resolution-key": {
+                  "required": false,
+                  "type": "string"
+               },
+               "service-instance-id": {
+                  "required": false,
+                  "type": "string"
+               },
+               "config-deploy-properties": {
+                  "description": "Dynamic PropertyDefinition for workflow(config-deploy).",
+                  "required": true,
+                  "type": "dt-config-deploy-properties"
+               }
+            }
+         }
+      },
+      "node_templates": {
+         "resource-assignment": {
+            "type": "component-resource-resolution",
+            "interfaces": {
+               "ResourceResolutionComponent": {
+                  "operations": {
+                     "process": {
+                        "inputs": {
+                           "resolution-summary": true,
+                           "artifact-prefix-names": {
+                              "get_input": "template-prefix"
+                           }
+                        }
+                     }
+                  }
+               }
+            },
+            "artifacts": {
+               "base_template-mapping": {
+                  "type": "artifact-mapping-resource",
+                  "file": "Templates/base_template-mapping.json"
+               },
+               "vpkg-mapping": {
+                  "type": "artifact-mapping-resource",
+                  "file": "Templates/vpkg-mapping.json"
+               },
+               "vdns-mapping": {
+                  "type": "artifact-mapping-resource",
+                  "file": "Templates/vdns-mapping.json"
+               },
+               "vnf-mapping": {
+                  "type": "artifact-mapping-resource",
+                  "file": "Templates/vnf-mapping.json"
+               },
+               "vlb-mapping": {
+                  "type": "artifact-mapping-resource",
+                  "file": "Templates/vlb-mapping.json"
+               }
+            }
+         },
+         "config-assign": {
+            "type": "component-resource-resolution",
+            "interfaces": {
+               "ResourceResolutionComponent": {
+                  "operations": {
+                     "process": {
+                        "inputs": {
+                           "resolution-key": {
+                              "get_input": "resolution-key"
+                           },
+                           "store-result": true,
+                           "artifact-prefix-names": [
+                              "baseconfig"
+                           ]
+                        }
+                     }
+                  }
+               }
+            },
+            "artifacts": {
+               "baseconfig-template": {
+                  "type": "artifact-template-velocity",
+                  "file": "Templates/baseconfig-template.vtl"
+               },
+               "baseconfig-mapping": {
+                  "type": "artifact-mapping-resource",
+                  "file": "Templates/baseconfig-mapping.json"
+               }
+            }
+         },
+         "ScaleOutReconfiguration": {
+            "type": "component-resource-resolution",
+            "interfaces": {
+               "ResourceResolutionComponent": {
+                  "operations": {
+                     "process": {
+                        "inputs": {
+                           "resolution-key": {
+                              "get_input": "resolution-key"
+							  },
+                           "store-result": true,
+                           "artifact-prefix-names": [
+                              "baseconfig"
+                           ]
+                        }
+                     }
+                  }
+               }
+            },
+            "artifacts": {
+               "baseconfig-template": {
+                  "type": "artifact-template-velocity",
+                  "file": "Templates/baseconfig-template.vtl"
+               },
+               "baseconfig-mapping": {
+                  "type": "artifact-mapping-resource",
+                  "file": "Templates/baseconfig-mapping.json"
+               }
+            }
+         },
+         "netconf-device": {
+            "type": "vnf-netconf-device",
+            "capabilities": {
+               "netconf": {
+                  "properties": {
+                     "login-key": "admin",
+                     "login-account": "admin",
+                     "target-ip-address": {
+                        "get_attribute": [
+                           "nf-account-collection",
+                           "",
+                           "assignment-params",
+                           "nf-params"
+                        ]
+                     },
+                     "port-number": 2831,
+                     "connection-time-out": 5
+                  }
+               },
+               "restconf": {
+                  "properties": {
+                     "login-key": "admin",
+                     "login-account": "admin",
+                     "target-ip-address": {
+                        "get_attribute": [
+                           "nf-account-collection",
+                           "",
+                           "assignment-params",
+                           "nf-params"
+                        ]
+                     },
+                     "port-number": 8183,
+                     "connection-time-out": 5
+                  }
+               }
+            }
+         },
+         "nf-account-collection": {
+            "type": "component-resource-resolution",
+            "interfaces": {
+               "ResourceResolutionComponent": {
+                  "operations": {
+                     "process": {
+                        "inputs": {
+                           "artifact-prefix-names": [
+                              "nf-params"
+                           ]
+                        }
+                     }
+                  }
+               }
+            },
+            "artifacts": {
+               "nf-params-template": {
+                  "type": "artifact-template-velocity",
+                  "file": "Templates/nf-params-template.vtl"
+               },
+               "nf-params-mapping": {
+                  "type": "artifact-mapping-resource",
+                  "file": "Templates/nf-params-mapping.json"
+               }
+            }
+         },
+         "execute": {
+            "type": "component-script-executor",
+            "requirements": {
+               "restconf-connection": {
+                  "capability": "restconf",
+                  "node": "netconf-device",
+                  "relationship": "tosca.relationships.ConnectsTo"
+               }
+            },
+            "interfaces": {
+               "ComponentScriptExecutor": {
+                  "operations": {
+                     "process": {
+                        "inputs": {
+                           "script-type": "kotlin",
+                           "script-class-reference": "org.onap.ccsdk.cds.blueprintsprocessor.services.execution.scripts.ConfigDeploy",
+                           "instance-dependencies": [],
+                           "dynamic-properties": "*config-deploy-properties"
+                        }
+                     }
+                  }
+               }
+            }
+         },
+         "executeHealthCheck": {
+            "type": "component-script-executor",
+            "requirements": {
+               "restconf-connection": {
+                  "capability": "restconf",
+                  "node": "netconf-device",
+                  "relationship": "tosca.relationships.ConnectsTo"
+               }
+            },
+            "interfaces": {
+               "ComponentScriptExecutor": {
+                  "operations": {
+                     "process": {
+                        "inputs": {
+                           "script-type": "kotlin",
+                           "script-class-reference": "org.onap.ccsdk.cds.blueprintsprocessor.services.execution.scripts.HealthCheck",
+                           "instance-dependencies": [],
+                           "dynamic-properties": "*HealthCheck-properties"
+                        }
+                     }
+                  }
+               }
+            }
+         }
       }
-    }
-  }
+   }
 }
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/ConfigDeploy.kt b/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/ConfigDeploy.kt
new file mode 100644
index 0000000..fe660f5
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/ConfigDeploy.kt
@@ -0,0 +1,126 @@
+/*
+ * Copyright © 2019 IBM, Bell Canada, Orange
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onap.ccsdk.cds.blueprintsprocessor.services.execution.scripts
+
+import com.fasterxml.jackson.databind.node.ObjectNode
+import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceInput
+import org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.storedContentFromResolvedArtifactNB
+import org.onap.ccsdk.cds.blueprintsprocessor.rest.BasicAuthRestClientProperties
+import org.onap.ccsdk.cds.blueprintsprocessor.rest.RestClientProperties
+import org.onap.ccsdk.cds.blueprintsprocessor.rest.service.BasicAuthRestClientService
+import org.onap.ccsdk.cds.blueprintsprocessor.rest.service.BlueprintWebClientService
+import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.AbstractScriptComponentFunction
+import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
+import org.slf4j.LoggerFactory
+import org.springframework.http.HttpMethod
+import org.springframework.web.client.RestTemplate
+import com.fasterxml.jackson.annotation.JsonIgnore
+import com.fasterxml.jackson.annotation.JsonProperty
+import org.apache.http.client.ClientProtocolException
+import java.io.IOException
+import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException
+
+open class ConfigDeploy : AbstractScriptComponentFunction() {
+
+    private val log = LoggerFactory.getLogger(ConfigDeploy::class.java)!!
+
+    override fun getName(): String {
+        return "Check"
+    }
+
+    override suspend fun processNB(executionRequest: ExecutionServiceInput) {
+        log.info("executing script")
+        val resolution_key = getDynamicProperties("resolution-key").asText()
+        log.info("resolution_key: $resolution_key")
+
+        val payload = storedContentFromResolvedArtifactNB(resolution_key, "baseconfig")
+        log.info("configuration: $payload")
+
+        val payloadObject = JacksonUtils.jsonNode(payload) as ObjectNode
+        val vdns_ip: String = payloadObject.get("vdns-instance")[0].get("ip-addr").asText()
+
+
+        val blueprintContext = bluePrintRuntimeService.bluePrintContext()
+        val requirement = blueprintContext.nodeTemplateRequirement(nodeTemplateName, "restconf-connection")
+        val capabilityProperties = bluePrintRuntimeService.resolveNodeTemplateCapabilityProperties(requirement.node!!, requirement.capability!!)
+        val netconfDeviceInfo = JacksonUtils.getInstanceFromMap(capabilityProperties, NetconfDeviceInfo::class.java)
+        log.info("Waiting for 2 minutes until vLB intializes ...")
+        //Thread.sleep(120000)
+        val uri = "http://${netconfDeviceInfo.ipAddress}:8183/restconf/config/vlb-business-vnf-onap-plugin:vlb-business-vnf-onap-plugin/vdns-instances/vdns-instance/$vdns_ip"
+        val restTemplate = RestTemplate()
+        val mapOfHeaders = hashMapOf<String, String>()
+        mapOfHeaders.put("Accept", "application/json")
+        mapOfHeaders.put("Content-Type", "application/json")
+        mapOfHeaders.put("cache-control", " no-cache")
+        mapOfHeaders.put("Accept", "application/json")
+        val basicAuthRestClientProperties: BasicAuthRestClientProperties = BasicAuthRestClientProperties()
+        basicAuthRestClientProperties.username = "admin"
+        basicAuthRestClientProperties.password = "admin"
+        basicAuthRestClientProperties.url = uri
+        basicAuthRestClientProperties.additionalHeaders =mapOfHeaders
+        val basicAuthRestClientService: BasicAuthRestClientService= BasicAuthRestClientService(basicAuthRestClientProperties)
+        try {
+            val result: BlueprintWebClientService.WebClientResponse<String> = basicAuthRestClientService.exchangeResource(HttpMethod.PUT.name, "", payload)
+            print(result)
+            basicAuthRestClientProperties.url = "http://${netconfDeviceInfo.ipAddress}:8183/restconf/config/vlb-business-vnf-onap-plugin:vlb-business-vnf-onap-plugin/vdns-instances"
+            val resultOfGet: BlueprintWebClientService.WebClientResponse<String> = basicAuthRestClientService.exchangeResource(HttpMethod.GET.name, "", "")
+            print(resultOfGet)
+        }
+        catch (e: Exception) {
+            log.info("Caught exception trying to connect to vLB!!")
+            throw BluePrintProcessorException("${e.message}")
+        }
+    }
+
+    override suspend fun recoverNB(runtimeException: RuntimeException, executionRequest: ExecutionServiceInput) {
+        log.info("Executing Recovery")
+        bluePrintRuntimeService.getBluePrintError().addError("${runtimeException.message}")
+    }
+}
+
+class NetconfDeviceInfo {
+    @get:JsonProperty("login-account")
+    var username: String? = null
+    @get:JsonProperty("login-key")
+    var password: String? = null
+    @get:JsonProperty("target-ip-address")
+    var ipAddress: String? = null
+    @get:JsonProperty("port-number")
+    var port: Int = 0
+    @get:JsonProperty("connection-time-out")
+    var connectTimeout: Long = 5
+    @get:JsonIgnore
+    var source: String? = null
+    @get:JsonIgnore
+    var replyTimeout: Int = 5
+    @get:JsonIgnore
+    var idleTimeout: Int = 99999
+
+    override fun toString(): String {
+        return "$ipAddress:$port"
+    }
+    //TODO: should this be a data class instead? Is anything using the JSON serdes?
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return javaClass.hashCode()
+    }
+}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/HealthCheck.kt b/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/HealthCheck.kt
new file mode 100644
index 0000000..b09a432
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/HealthCheck.kt
@@ -0,0 +1,136 @@
+package org.onap.ccsdk.cds.blueprintsprocessor.services.execution.scripts
+
+/*
+ * Copyright © 2019 IBM, Bell Canada, Orange
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import com.fasterxml.jackson.databind.node.ObjectNode
+import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceInput
+import org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.storedContentFromResolvedArtifactNB
+import org.onap.ccsdk.cds.blueprintsprocessor.rest.BasicAuthRestClientProperties
+import org.onap.ccsdk.cds.blueprintsprocessor.rest.RestClientProperties
+import org.onap.ccsdk.cds.blueprintsprocessor.rest.service.BasicAuthRestClientService
+import org.onap.ccsdk.cds.blueprintsprocessor.rest.service.BlueprintWebClientService
+import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.AbstractScriptComponentFunction
+import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
+import org.slf4j.LoggerFactory
+import org.springframework.http.HttpMethod
+import org.springframework.web.client.RestTemplate
+import com.fasterxml.jackson.annotation.JsonIgnore
+import com.fasterxml.jackson.annotation.JsonProperty
+import org.apache.http.client.ClientProtocolException
+import org.onap.ccsdk.cds.blueprintsprocessor.core.utils.PayloadUtils
+import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.ComponentRemoteScriptExecutor
+import java.io.IOException
+import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException
+
+open class HealthCheck : AbstractScriptComponentFunction() {
+
+    private val log = LoggerFactory.getLogger(HealthCheck::class.java)!!
+
+    override fun getName(): String {
+        return "HealthCheck"
+    }
+
+    override suspend fun processNB(executionRequest: ExecutionServiceInput) {
+        log.info("executing script")
+        val resolution_key = getDynamicProperties("resolution-key").asText()
+        log.info("resolution_key: $resolution_key")
+
+        //val payload = storedContentFromResolvedArtifactNB(resolution_key, "baseconfig")
+        //log.info("configuration: $payload")
+
+        //val payloadObject = JacksonUtils.jsonNode(payload) as ObjectNode
+        //val vdns_ip: String = payloadObject.get("vdns-instance")[0].get("ip-addr").asText()
+
+
+        val blueprintContext = bluePrintRuntimeService.bluePrintContext()
+        val requirement = blueprintContext.nodeTemplateRequirement(nodeTemplateName, "restconf-connection")
+        val capabilityProperties = bluePrintRuntimeService.resolveNodeTemplateCapabilityProperties(requirement.node!!, requirement.capability!!)
+        val netconfDeviceInfo = JacksonUtils.getInstanceFromMap(capabilityProperties, NetconfDeviceInfo2::class.java)
+        //log.info("Waiting for 2 minutes until vLB intializes ...")
+        //Thread.sleep(120000)
+        val uri = "http://${netconfDeviceInfo.ipAddress}:8183/restconf/operational/health-vnf-onap-plugin:health-vnf-onap-plugin-state/health-check"
+        val restTemplate = RestTemplate()
+        val mapOfHeaders = hashMapOf<String, String>()
+        mapOfHeaders.put("Accept", "application/json")
+        mapOfHeaders.put("Content-Type", "application/json")
+        //mapOfHeaders.put("cache-control", " no-cache")
+        //mapOfHeaders.put("Accept", "application/json")
+        val basicAuthRestClientProperties: BasicAuthRestClientProperties = BasicAuthRestClientProperties()
+        basicAuthRestClientProperties.username = "admin"
+        basicAuthRestClientProperties.password = "admin"
+        basicAuthRestClientProperties.url = uri
+        basicAuthRestClientProperties.additionalHeaders =mapOfHeaders
+        val basicAuthRestClientService: BasicAuthRestClientService= BasicAuthRestClientService(basicAuthRestClientProperties)
+        try {
+            val result: BlueprintWebClientService.WebClientResponse<String> = basicAuthRestClientService.exchangeResource(HttpMethod.GET.name, "", "")
+            log.info(result.body)
+            val resultJson = JacksonUtils.jsonNode(result.body) as ObjectNode
+            val health: String = resultJson.get("health-check").get("state").asText()
+			super.setAttribute("response-data", resultJson) 
+            if (health != "healthy") {
+                throw Exception("VNF is not healty!!")
+            }
+			
+            //basicAuthRestClientProperties.url = //"http://${netconfDeviceInfo.ipAddress}:8183/restconf/config/vlb-business-vnf-onap-plugin:vlb-business-vnf-onap-plugin/vdns-instances"
+            //val resultOfGet: BlueprintWebClientService.WebClientResponse<String> = basicAuthRestClientService.exchangeResource(HttpMethod.GET.name, "", "")
+            //print(resultOfGet)
+        }
+        catch (e: Exception) {
+            log.info("Caught exception trying to connect to vLB!!")
+            throw BluePrintProcessorException("${e.message}")
+        }
+    }
+
+    override suspend fun recoverNB(runtimeException: RuntimeException, executionRequest: ExecutionServiceInput) {
+        log.info("Executing Recovery")
+        bluePrintRuntimeService.getBluePrintError().addError("${runtimeException.message}")
+    }
+}
+
+class NetconfDeviceInfo2 {
+    @get:JsonProperty("login-account")
+    var username: String? = null
+    @get:JsonProperty("login-key")
+    var password: String? = null
+    @get:JsonProperty("target-ip-address")
+    var ipAddress: String? = null
+    @get:JsonProperty("port-number")
+    var port: Int = 0
+    @get:JsonProperty("connection-time-out")
+    var connectTimeout: Long = 5
+    @get:JsonIgnore
+    var source: String? = null
+    @get:JsonIgnore
+    var replyTimeout: Int = 5
+    @get:JsonIgnore
+    var idleTimeout: Int = 99999
+
+    override fun toString(): String {
+        return "$ipAddress:$port"
+    }
+    //TODO: should this be a data class instead? Is anything using the JSON serdes?
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return javaClass.hashCode()
+    }
+}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/README.md b/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/README.md
new file mode 100644
index 0000000..29b7978
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/README.md
@@ -0,0 +1 @@
+kotlin Folder
\ No newline at end of file
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
deleted file mode 100644
index 388c63f..0000000
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/python/ConfigDeploy.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#  Copyright (c) 2019 Bell Canada.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-import netconf_constant
-from common import ResolutionHelper
-from time import sleep 
-from netconfclient import NetconfClient
-from org.onap.ccsdk.cds.blueprintsprocessor.functions.netconf.executor import \
-  NetconfComponentFunction
-
-
-class ConfigDeploy(NetconfComponentFunction):
-
-  def process(self, execution_request):      
-      log = globals()[netconf_constant.SERVICE_LOG]	  
-      print(globals())
-#      print("Waiting 4 minutes until NETCONF server is UP on vLB ...")
-#     sleep (240)
-      nc = NetconfClient(log, self, "netconf-connection")
-      rr = ResolutionHelper(self)
-
-      # Get meshed template from DB
-      resolution_key = self.getDynamicProperties("resolution-key").asText()
-      payloadHostname = rr.retrieve_resolved_template_from_database(resolution_key, "baseconfig")
-      payloadInterface = rr.retrieve_resolved_template_from_database(resolution_key, "incremental-config")
-
-      nc.connect()
-      nc.lock()
-      #if not response.isSuccess():
-      #  og.error(response.errorMessage)
-      nc.discard_change()
-      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.get_config()				#nc.commit(confirmed = True, confirm_timeout=15)
-      nc.unlock()
-      nc.disconnect()
-
-  def recover(self, runtime_exception, execution_request):
-        log.error("Exception in the script {}", runtime_exception)
-        print self.addError(runtime_exception.cause.message)
-        return None
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/TOSCA-Metadata/TOSCA.meta b/components/model-catalog/blueprint-model/service-blueprint/vLB/TOSCA-Metadata/TOSCA.meta
index 37c59ee..c78b66b 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/TOSCA-Metadata/TOSCA.meta
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/TOSCA-Metadata/TOSCA.meta
@@ -1,6 +1,8 @@
 TOSCA-Meta-File-Version: 1.0.0
 CSAR-Version: 1.0
-Created-By: PLATANIA, MARCO <platania@research.att.com>
+Created-By: Seaudi, Abdelmuhaimen <abdelmuhaimen.seaudi@orange.com>
 Entry-Definitions: Definitions/vLB_CDS.json
-Template-Tags: vDNS-CDS-test1
-Content-Type: application/vnd.oasis.bpmn
\ No newline at end of file
+Template-Tags: vLB_CDS
+Template-Name: vLB_CDS
+Template-Version: 1.0.0
+Template-Type: DEFAULT
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json
index 43b0f9d..62f043d 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json
@@ -1,409 +1,486 @@
-[
-  {
-    "name": "service-instance-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "service-instance-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-    {
-    "name": "vf-module-name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vf-module-name}"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-name",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-module-label",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-label",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vf-module-model-customization-uuid"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vf-naming-policy",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-	  },
-    "input-param": false,
-    "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-	  "service-instance-id",
-      "vnf-id"
-	],
-    "version": 0
-  },
-  {
-    "name": "vf-module-type",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-type",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vf-module-model-customization-uuid"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vf-module-model-customization-uuid",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-model-customization-uuid",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vnf-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vnf-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-module-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vnf-model-customization-uuid",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vnf-model-customization-uuid",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "aic-cloud-region",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "aic-cloud-region",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vlb_private_net_cidr",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_private_net_cidr",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "pktgen_private_net_cidr",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "pktgen_private_net_cidr",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vnf_name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vnf_name",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "pub_key",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "pub_key",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-   {
-    "name": "int_pktgen_private_subnet_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${int_pktgen_private_subnet_id}"
-    },
-    "input-param": false,
-    "dictionary-name": "int_pktgen_private_subnet_id",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },  
-  {
-    "name": "int_private_subnet_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${int_private_subnet_id}"
-    },
-    "input-param": false,
-    "dictionary-name": "int_private_subnet_id",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-   {
-    "name": "int_private_net_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${int_private_net_id}"
-    },
-    "input-param": false,
-    "dictionary-name": "int_private_net_id",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "int_pktgen_private_net_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${int_pktgen_private_net_id}"
-    },
-    "input-param": false,
-    "dictionary-name": "int_pktgen_private_net_id",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-    {
-    "name": "key_name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "key_name",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  }
+[{
+		"name": "service-instance-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "service-instance-id",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+		{
+		"name": "vf-module-assign",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"metadata": {
+				"transform-template": "${vf-module-assign}_${vnf_name}_${service-instance-id}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-assign",
+		"dictionary-source": "aai-data",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id",
+			"vf-module-name"
+		],
+		"version": 0
+	},
+	{
+		"name": "int_pktgen_private_net_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "int_pktgen_private_net_id",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id",
+			"vnf_name"
+		],
+		"version": 0
+	},
+	{
+		"name": "int_pktgen_private_subnet_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "int_pktgen_private_subnet_id",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id",
+			"vnf_name"
+		],
+		"version": 0
+	},
+	{
+		"name": "int_private_net_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "int_private_net_id",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id",
+			"vnf_name"
+		],
+		"version": 0
+	},
+	{
+		"name": "int_private_subnet_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "int_private_subnet_id",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id",
+			"vnf_name"
+		],
+		"version": 0
+	},
+	{
+		"name": "vf-module-name",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-name",
+		"dictionary-source": "rest",
+		"dependencies": ["vnf_name", "vf-module-label", "vf-module-type", "vf-naming-policy", "vf-module-id"],
+		"version": 0
+	},
+	{
+		"name": "vlb_private_net_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"default": "private1"
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_private_net_id",
+		"dictionary-source": "default",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "pktgen_private_net_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"default": "private2"
+		},
+		"input-param": false,
+		"dictionary-name": "pktgen_private_net_id",
+		"dictionary-source": "default",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vf-module-label",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-label",
+		"dictionary-source": "processor-db",
+		"dependencies": [
+			"vf-module-model-customization-uuid"
+		],
+		"version": 0
+	},
+	{
+		"name": "vf-naming-policy",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-naming-policy",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vf-module-type",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-type",
+		"dictionary-source": "processor-db",
+		"dependencies": [
+			"vf-module-model-customization-uuid"
+		],
+		"version": 0
+	},
+	{
+		"name": "vf-module-model-customization-uuid",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-model-customization-uuid",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vnf-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vnf-id",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vf-module-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-id",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vnf-model-customization-uuid",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vnf-model-customization-uuid",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "aic-cloud-region",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "aic-cloud-region",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vlb_private_net_cidr",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_private_net_cidr",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "pktgen_private_net_cidr",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "pktgen_private_net_cidr",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vnf_name",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vnf_name",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "pub_key",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "pub_key",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vlb_0_int_pktgen_private_port_0_mac",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_0_int_pktgen_private_port_0_mac",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vpg_0_int_pktgen_private_port_0_mac",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vpg_0_int_pktgen_private_port_0_mac",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "key_name",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "key_name",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	}
 ]
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-template.vtl
deleted file mode 100644
index 58512be..0000000
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-template.vtl
+++ /dev/null
@@ -1,144 +0,0 @@
-{
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "service-instance-id",
-      "param-value": "${service-instance-id}"
-    },
-    {
-      "param-name": "vnf_id",
-      "param-value": "${vnf-id}"
-    },
-    {
-      "param-name": "vnf_name",
-      "param-value": "${vnf_name}"
-    },
-    {
-      "param-name": "vnf_model_customization_uuid",
-      "param-value": "${vnf-model-customization-uuid}"
-    },
-    {
-      "param-name": "vf_module_id",
-      "param-value": "${vf-module-id}"
-    },
-    {
-      "param-name": "vf_module_type",
-      "param-value": "${vf-module-type}"
-    },
-    {
-      "param-name": "vlb_private_net_id",
-      "param-value": "private1"
-    },
-    {
-      "param-name": "pktgen_private_net_id",
-      "param-value": "private2"
-    },
-    {
-      "param-name": "vlb_private_net_cidr",
-      "param-value": "${vlb_private_net_cidr}"
-    },
-    {
-      "param-name": "vlb_0_int_pktgen_private_port_0_mac",
-      "param-value": "fa:16:3e:00:00:10"
-    },
-    {
-      "param-name": "vpg_0_int_pktgen_private_port_0_mac",
-      "param-value": "fa:16:3e:00:00:20"
-    },
-    {
-      "param-name": "pktgen_private_net_cidr",
-      "param-value": "${pktgen_private_net_cidr}"
-    },
-    {
-      "param-name": "int_pktgen_private_net_id",
-      "param-value": "${vnf_name}_private2"
-    },
-    {
-      "param-name": "int_pktgen_private_subnet_id",
-      "param-value": "${vnf_name}_private2_subnet"
-    },
-    {
-      "param-name": "int_private_net_id",
-      "param-value": "${vnf_name}_private1"
-    },
-    {
-      "param-name": "int_private_subnet_id",
-      "param-value": "${vnf_name}_private1_subnet"
-    },
-    {
-      "param-name": "key_name",
-      "param-value": "${key_name}"
-    },
-    {
-      "param-name": "pub_key",
-      "param-value": "${pub_key}"
-    }
-  ],
-  "capability-data": [
-    {
-      "capability-name": "generate-name",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vf-module-name"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vf-module-name}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vf-module-name"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VF-MODULE"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "VF_MODULE_LABEL",
-              "param-value": "${vf-module-label}"
-            },
-            {
-              "param-name": "VF_MODULE_TYPE",
-              "param-value": "${vf-module-type}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vf-module-name",
-              "resource-value": "${vf-module-name}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "aai-vf-module-put",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "vf-module",
-              "param-value": "vf-module"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "aai-vf-module-put",
-              "resource-value": "${status}"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-template.vtl
index 10e4484..e20c21b 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-template.vtl
@@ -1,9 +1,9 @@
-<vlb-business-vnf-onap-plugin xmlns="urn:opendaylight:params:xml:ns:yang:vlb-business-vnf-onap-plugin">
-<vdns-instances>
-<vdns-instance>
-<ip-addr>$vdns_int_private_ip_0</ip-addr>
-<oam-ip-addr>$vdns_onap_private_ip_0</oam-ip-addr>
-<enabled>false</enabled>
-</vdns-instance>
-</vdns-instances>
-</vlb-business-vnf-onap-plugin>
+	{
+    "vdns-instance": [
+        {
+            "ip-addr": "$vdns_int_private_ip_0",
+            "oam-ip-addr": "$vdns_onap_private_ip_0",
+            "enabled": true
+        }
+    ]
+}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-template.vtl
index d336257..e20c21b 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-template.vtl
@@ -1,9 +1,9 @@
-<vlb-business-vnf-onap-plugin xmlns="urn:opendaylight:params:xml:ns:yang:vlb-business-vnf-onap-plugin">
-<vdns-instances>
-<vdns-instance>
-<ip-addr>$vdns_int_private_ip_0</ip-addr>
-<oam-ip-addr>$vdns_onap_private_ip_0</oam-ip-addr>
-<enabled>true</enabled>
-</vdns-instance>
-</vdns-instances>
-</vlb-business-vnf-onap-plugin>
+	{
+    "vdns-instance": [
+        {
+            "ip-addr": "$vdns_int_private_ip_0",
+            "oam-ip-addr": "$vdns_onap_private_ip_0",
+            "enabled": true
+        }
+    ]
+}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json
index 9cf71fc..3efc6fe 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json
@@ -39,6 +39,7 @@
     "dependencies": [],
     "version": 0
   },
+
   {
     "name": "ip",
     "property": {
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json
index 2dee19c..ba5ed5b 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json
@@ -1,817 +1,752 @@
-[
-  {
-    "name": "cloud_env",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "cloud_env",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-    {
-    "name": "create-md-sal-vnf-param",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "create-md-sal-vnf-param",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-       "service-instance-id",
-	  "vnf-id",
-	  "vf-module-id"
-    ],
-    "version": 0
-  },
-     
-  {
-    "name": "private1-prefix-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "private1-prefix-id",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  },
-    {
-    "name": "management-prefix-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "management-prefix-id",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "onap_private_net_cidr",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "onap_private_net_cidr",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vf-module-name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vf-module-name}"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-name",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "install_script_version",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-	
-    },
-    "input-param": false,
-    "dictionary-name": "install_script_version",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-	 "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "keypair",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "vlb_key"
-    },
-    "input-param": false,
-    "dictionary-name": "keypair",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "nb_api_version",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "1.2.0"
-    },
-    "input-param": false,
-    "dictionary-name": "nb_api_version",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "nexus_artifact_repo",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "https://nexus.onap.org"
-    },
-    "input-param": false,
-    "dictionary-name": "nexus_artifact_repo",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "nfc-naming-code",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "nfc-naming-code",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vfccustomizationuuid"
-    ],
-    "version": 0
-  },
-  {
-    "name": "onap_private_net_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "onap_private_subnet_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "public_net_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "public_net_id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "sec_group",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "sec_group",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "service-instance-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "service-instance-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vdns_flavor_name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "m1.medium"
-    },
-    "input-param": false,
-   "dictionary-name": "flavor_name",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-	  "service-instance-id",
-      "vnf-id"
-	],
-    "version": 0
-  },
-  
-  {
-    "name": "vdns_name_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vdns_name_0}"
-    },
-    "input-param": false,
-    "dictionary-name": "vdns_name_0",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-    {
-    "name": "vdns_int_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vdns_int_private_ip_0}"
-    },
-    "input-param": false,
-    "dictionary-name": "vdns_int_private_ip_0",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vdns_onap_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vdns_onap_private_ip_0}"
-    },
-    "input-param": false,
-    "dictionary-name": "vdns_onap_private_ip_0",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-module-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-module-label",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-label",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vf-module-model-customization-uuid"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vf-module-model-customization-uuid",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-model-customization-uuid",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-module-type",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-type",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vf-module-model-customization-uuid"
-    ],
-    "version": 0
-  },
-    {
-    "name": "vf-naming-policy",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-	  },
-    "input-param": false,
-    "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-	  "service-instance-id",
-      "vnf-id"
-	],
-    "version": 0
-  },
-  
-  {
-    "name": "vfccustomizationuuid",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vfccustomizationuuid",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vf-module-model-customization-uuid"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vlb_int_pktgen_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_int_pktgen_private_ip_0",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vlb_int_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_int_private_ip_0",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vlb_onap_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_onap_private_ip_0",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vlb_private_net_cidr",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_private_net_cidr",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vm-type",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vm-type",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vnf-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vnf-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vnf-model-customization-uuid",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vnf-model-customization-uuid",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vnf_name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vnf_name",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vnfc-model-invariant-uuid",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vnfc-model-invariant-uuid",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vfccustomizationuuid"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vdns_image_name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-	  },
-    "input-param": false,
-    "dictionary-name": "image_name",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-	  "service-instance-id",
-      "vnf-id"
-	  ],
-    "version": 0
-  },
-  {
-    "name": "vnfc-model-version",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vnfc-model-version",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vfccustomizationuuid"
-    ],
-    "version": 0
-  }
+[{
+		"name": "cloud_env",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "cloud_env",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+		{
+		"name": "vf-module-assign",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+									"metadata": {
+				"transform-template": "${vf-module-assign}_${service-instance-id}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-assign",
+		"dictionary-source": "aai-data",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id",
+			"vf-module-name"
+		],
+		"version": 0
+	},
+	{
+		"name": "create-md-sal-vnf-param",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "create-md-sal-vnf-param",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id",
+			"vf-module-id"
+		],
+		"version": 0
+	},
+
+	{
+		"name": "private1-prefix-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "private1-prefix-id",
+		"dictionary-source": "processor-db",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "management-prefix-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "management-prefix-id",
+		"dictionary-source": "processor-db",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "onap_private_net_cidr",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "onap_private_net_cidr",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vf-module-name",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-name",
+		"dictionary-source": "rest",
+		"dependencies": ["vnf_name", "vf-module-label", "vf-module-type", "vf-naming-policy", "vf-module-id"],
+		"version": 0
+	},
+	{
+		"name": "install_script_version",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+
+		},
+		"input-param": false,
+		"dictionary-name": "install_script_version",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+
+	{
+		"name": "nb_api_version",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "nb_api_version",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "nexus_artifact_repo",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "nexus_artifact_repo",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "nfc-naming-code",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "nfc-naming-code",
+		"dictionary-source": "processor-db",
+		"dependencies": [
+			"vfccustomizationuuid"
+		],
+		"version": 0
+	},
+	{
+		"name": "onap_private_net_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "onap_private_net_id",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "onap_private_subnet_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "onap_private_subnet_id",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "public_net_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "public_net_id",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "sec_group",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "sec_group",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "service-instance-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "service-instance-id",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vdns_flavor_name",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "flavor_name",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+
+	{
+		"name": "vdns_name_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vdns_name_0",
+		"dictionary-source": "rest",
+		"dependencies": ["vf-module-id","vf-module-name", "vf-module-label", "nfc-naming-code", "vf-naming-policy"],
+		"version": 0
+	},
+	{
+		"name": "vdns_int_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"metadata": {
+				"transform-template": "${vdns_int_private_ip_0.replaceAll(\"/.+\", \"\")}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vdns_int_private_ip_0",
+		"dictionary-source": "rest",
+		"dependencies": ["private1-prefix-id"],
+		"version": 0
+	},
+	{
+		"name": "vdns_onap_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"metadata": {
+				"transform-template": "${vdns_onap_private_ip_0.replaceAll(\"/.+\", \"\")}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vdns_onap_private_ip_0",
+		"dictionary-source": "rest",
+		"dependencies": ["management-prefix-id"],
+		"version": 0
+	},
+	{
+		"name": "vf-module-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-id",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vf-module-label",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-label",
+		"dictionary-source": "processor-db",
+		"dependencies": [
+			"vf-module-model-customization-uuid"
+		],
+		"version": 0
+	},
+	{
+		"name": "vf-module-model-customization-uuid",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-model-customization-uuid",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vf-module-type",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-type",
+		"dictionary-source": "processor-db",
+		"dependencies": [
+			"vf-module-model-customization-uuid"
+		],
+		"version": 0
+	},
+	{
+		"name": "vf-naming-policy",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-naming-policy",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+
+	{
+		"name": "vfccustomizationuuid",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vfccustomizationuuid",
+		"dictionary-source": "processor-db",
+		"dependencies": [
+			"vf-module-model-customization-uuid"
+		],
+		"version": 0
+	},
+	{
+		"name": "vlb_int_pktgen_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_int_pktgen_private_ip_0",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vlb_int_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_int_private_ip_0",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vlb_onap_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_onap_private_ip_0",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vlb_private_net_cidr",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_private_net_cidr",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vm-type",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vm-type",
+		"dictionary-source": "processor-db",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vnf-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vnf-id",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vnf-model-customization-uuid",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vnf-model-customization-uuid",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vnf_name",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vnf_name",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vnfc-model-invariant-uuid",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vnfc-model-invariant-uuid",
+		"dictionary-source": "processor-db",
+		"dependencies": [
+			"vfccustomizationuuid"
+		],
+		"version": 0
+	},
+	{
+		"name": "vdns_image_name",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "image_name",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vnfc-model-version",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vnfc-model-version",
+		"dictionary-source": "processor-db",
+		"dependencies": [
+			"vfccustomizationuuid"
+		],
+		"version": 0
+	}
 ]
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-template.vtl
deleted file mode 100644
index 84fab0d..0000000
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-template.vtl
+++ /dev/null
@@ -1,302 +0,0 @@
-{
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "service-instance-id",
-      "param-value": "${service-instance-id}"
-    },
-    {
-      "param-name": "vnf_id",
-      "param-value": "${vnf-id}"
-    },
-    {
-      "param-name": "vnf_name",
-      "param-value": "${vnf_name}"
-    },
-    {
-      "param-name": "vnf_model_customization_uuid",
-      "param-value": "${vnf-model-customization-uuid}"
-    },
-    {
-      "param-name": "vf_module_id",
-      "param-value": "${vf-module-id}"
-    },
-    {
-      "param-name": "vf_module_type",
-      "param-value": "${vf-module-type}"
-    },
-    {
-      "param-name": "vf_module_customization_uuid",
-      "param-value": "${vf-module-model-customization-uuid}"
-    },
-    {
-      "param-name": "vfc_customization_uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "aic-cloud-region",
-      "param-value": "${aic-cloud-region}"
-    },
-    {
-      "param-name": "vm-type",
-      "param-value": "${vm-type}"
-    },
-    {
-      "param-name": "vnfc-model-customization-uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "vnfc-model-invariant-uuid",
-      "param-value": "${vnfc-model-invariant-uuid}"
-    },
-    {
-      "param-name": "vnfc-model-version",
-      "param-value": "${vnfc-model-version}"
-    },
-    {
-      "param-name": "nfc-function",
-      "param-value": "${nf-role}"
-    },
-    {
-      "param-name": "nfc-naming-code",
-      "param-value": "${nfc-naming-code}"
-    },
-    {
-      "param-name": "cloud_env",
-      "param-value": "openstack"
-    },
-    {
-      "param-name": "nexus_artifact_repo",
-      "param-value": "https://nexus.onap.org"
-    },
-    {
-      "param-name": "vdns_image_name",
-      "param-value": "${vdns_image_name}"
-    },
-    {
-      "param-name": "vdns_flavor_name",
-      "param-value": "m1.medium"
-    },
-	{
-      "param-name": "install_script_version",
-      "param-value": "${install_script_version}"
-    },
-    {
-      "param-name": "key_name",
-      "param-value": "${key_name}"
-    },
-    {
-      "param-name": "pub_key",
-      "param-value": "${pub_key}"
-    },
-    {
-      "param-name": "public_net_id",
-      "param-value": "${public_net_id}"
-    },
-    {
-      "param-name": "vlb_int_private_ip_0",
-      "param-value": "${vlb_int_private_ip_0}"
-    },
-    {
-      "param-name": "vlb_onap_private_ip_0",
-      "param-value": "${vlb_onap_private_ip_0}"
-    },
-    {
-      "param-name": "vlb_int_pktgen_private_ip_0",
-      "param-value": "${vlb_int_pktgen_private_ip_0}"
-    },
-    {
-      "param-name": "vlb_private_net_cidr",
-      "param-value": "${vlb_private_net_cidr}"
-    },
-  
-    
-    {
-      "param-name": "onap_private_net_id",
-      "param-value": "${onap_private_net_id}"
-    },
-    {
-      "param-name": "onap_private_subnet_id",
-      "param-value": "${onap_private_subnet_id}"
-    },
-    {
-      "param-name": "onap_private_net_cidr",
-      "param-value": "${onap_private_net_cidr}"
-    },
-    {
-      "param-name": "pktgen_private_net_cidr",
-      "param-value": "${pktgen_private_net_cidr}"
-    },
-    {
-      "param-name": "sec_group",
-      "param-value": "${sec_group}"
-    },
-    {
-      "param-name": "nb_api_version",
-      "param-value": "1.2.0"
-    }
-    
-  ],
-  "capability-data": [
-    {
-      "capability-name": "generate-name",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vdns_name_0"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vdns_name_0}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vdns_name_0"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VNFC"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "NFC_NAMING_CODE",
-              "param-value": "${nfc-naming-code}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vdns_name_0",
-              "resource-value": "${vdns_name_0}"
-            }
-          ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vf-module-name"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vf-module-name}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vf-module-name"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VF-MODULE"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "VF_MODULE_LABEL",
-              "param-value": "${vf-module-label}"
-            },
-            {
-              "param-name": "VF_MODULE_TYPE",
-              "param-value": "${vf-module-type}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vf-module-name",
-              "resource-value": "${vf-module-name}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "netbox-ip-assign",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${management-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vdns_onap_private_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vdns_onap_private_ip_0",
-              "resource-value": "${vdns_onap_private_ip_0}"
-            }
-          ]
-        },
-		 {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${private1-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vdns_int_private_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vdns_int_private_ip_0",
-              "resource-value": "${vdns_int_private_ip_0}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "aai-vf-module-put",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "vf-module",
-              "param-value": "vf-module"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "aai-vf-module-put",
-              "resource-value": "${status}"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json
index 0104579..216d380 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json
@@ -1,929 +1,857 @@
-[
-  {
-    "name": "cloud_env",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "openstack"
-    },
-    "input-param": false,
-    "dictionary-name": "cloud_env",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-module-name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vf-module-name}"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-name",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "dcae_collector_ip",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-	  "default": "10.0.4.1"
-    },
-    "input-param": false,
-    "dictionary-name": "dcae_collector_ip",
-    "dictionary-source": "default",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vpg_int_pktgen_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vpg_int_pktgen_private_ip_0",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "dcae_collector_port",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-	  "default": "30235"
-    },
-    "input-param": false,
-    "dictionary-name": "dcae_collector_port",
-    "dictionary-source": "default",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "demo_artifacts_version",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "demo_artifacts_version",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "gre_ipaddr",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${gre_ipaddr}"
-    },
-    "input-param": false,
-    "dictionary-name": "gre_ipaddr",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "install_script_version",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "install_script_version",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vnf_name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vnf_name",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "keypair",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "vlb_key"
-    },
-    "input-param": false,
-    "dictionary-name": "keypair",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "nb_api_version",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "1.2.0"
-    },
-    "input-param": false,
-    "dictionary-name": "nb_api_version",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "nexus_artifact_repo",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "https://nexus.onap.org"
-    },
-    "input-param": false,
-    "dictionary-name": "nexus_artifact_repo",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "nfc-naming-code",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "nfc-naming-code",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vfccustomizationuuid"
-    ],
-    "version": 0
-  },
-  {
-    "name": "onap_private_net_cidr",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "onap_private_net_cidr",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "onap_private_net_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "onap_private_subnet_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "pktgen_private_net_cidr",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "pktgen_private_net_cidr",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "public_net_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "public_net_id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "sec_group",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "sec_group",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "service-instance-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "service-instance-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
- 
+[{
+		"name": "cloud_env",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "cloud_env",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vf-module-assign",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+									"metadata": {
+				"transform-template": "${vf-module-assign}_${service-instance-id}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-assign",
+		"dictionary-source": "aai-data",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id",
+			"vf-module-name"
+		],
+		"version": 0
+	},
+	
+	{
+		"name": "vf-module-name",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-name",
+		"dictionary-source": "rest",
+		"dependencies": ["vnf_name", "vf-module-label", "vf-module-type", "vf-naming-policy", "vf-module-id"],
+		"version": 0
+	},
+	{
+		"name": "dcae_collector_ip",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "dcae_collector_ip",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vpg_int_pktgen_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vpg_int_pktgen_private_ip_0",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "dcae_collector_port",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "dcae_collector_port",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "demo_artifacts_version",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "demo_artifacts_version",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "gre_ipaddr",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"metadata": {
+				"transform-template": "${gre_ipaddr.replaceAll(\"/.+\", \"\")}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "gre_ipaddr",
+		"dictionary-source": "rest",
+		"dependencies": ["private1-prefix-id"],
+		"version": 0
+	},
+	{
+		"name": "install_script_version",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "install_script_version",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vnf_name",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vnf_name",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
 
-  {
-    "name": "vf-module-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-module-label",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-label",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vf-module-model-customization-uuid"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vf-module-model-customization-uuid",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-model-customization-uuid",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-module-type",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-type",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vf-module-model-customization-uuid"
-    ],
-    "version": 0
-  },
-   {
-    "name": "vf-naming-policy",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-	  },
-    "input-param": false,
-    "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-	  "service-instance-id",
-      "vnf-id"
-	],
-    "version": 0
-  },
- 
-  {
-    "name": "vfccustomizationuuid",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vfccustomizationuuid",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vf-module-model-customization-uuid"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vip",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vip}"
-    },
-    "input-param": false,
-    "dictionary-name": "vip",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vlb_flavor_name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-	  },
-    "input-param": false,
-    "dictionary-name": "flavor_name",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-	  "service-instance-id",
-      "vnf-id"
-	],
-    "version": 0
-  },
-  {
-    "name": "vlb_image_name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-	  },
-    "input-param": false,
-    "dictionary-name": "image_name",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-	  "service-instance-id",
-      "vnf-id"
-	  ],
-    "version": 0
-  },
-  {
-    "name": "vlb_int_pktgen_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_int_pktgen_private_ip_0",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vlb_int_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_int_private_ip_0",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vlb_name_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vlb_name_0}"
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_name_0",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vlb_onap_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_onap_private_ip_0",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vlb_private_net_cidr",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_private_net_cidr",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vm-type",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vm-type",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vnf-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vnf-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vnf-model-customization-uuid",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vnf-model-customization-uuid",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vnfc-model-invariant-uuid",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vnfc-model-invariant-uuid",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vfccustomizationuuid"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vnfc-model-version",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vnfc-model-version",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vfccustomizationuuid"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vpg_onap_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vpg_onap_private_ip_0",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "private1-prefix-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "private1-prefix-id",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "private2-prefix-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "private2-prefix-id",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  }
+	{
+		"name": "nb_api_version",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+
+		},
+		"input-param": false,
+		"dictionary-name": "nb_api_version",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "nexus_artifact_repo",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "nexus_artifact_repo",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "nfc-naming-code",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "nfc-naming-code",
+		"dictionary-source": "processor-db",
+		"dependencies": [
+			"vfccustomizationuuid"
+		],
+		"version": 0
+	},
+	{
+		"name": "onap_private_net_cidr",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "onap_private_net_cidr",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "onap_private_net_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "onap_private_net_id",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "onap_private_subnet_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "onap_private_subnet_id",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "pktgen_private_net_cidr",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "pktgen_private_net_cidr",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "public_net_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "public_net_id",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "sec_group",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "sec_group",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "service-instance-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "service-instance-id",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+
+
+	{
+		"name": "vf-module-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-id",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vf-module-label",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-label",
+		"dictionary-source": "processor-db",
+		"dependencies": [
+			"vf-module-model-customization-uuid"
+		],
+		"version": 0
+	},
+	{
+		"name": "vf-module-model-customization-uuid",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-model-customization-uuid",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vf-module-type",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-type",
+		"dictionary-source": "processor-db",
+		"dependencies": [
+			"vf-module-model-customization-uuid"
+		],
+		"version": 0
+	},
+	{
+		"name": "vf-naming-policy",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-naming-policy",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+
+	{
+		"name": "vfccustomizationuuid",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vfccustomizationuuid",
+		"dictionary-source": "processor-db",
+		"dependencies": [
+			"vf-module-model-customization-uuid"
+		],
+		"version": 0
+	},
+	{
+		"name": "vip",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"metadata": {
+				"transform-template": "${vip.replaceAll(\"/.+\", \"\")}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vip",
+		"dictionary-source": "rest",
+		"dependencies": ["private2-prefix-id"],
+		"version": 0
+	},
+	{
+		"name": "vlb_flavor_name",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "flavor_name",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vlb_image_name",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "image_name",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vlb_int_pktgen_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_int_pktgen_private_ip_0",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vlb_int_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_int_private_ip_0",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vlb_name_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_name_0",
+		"dictionary-source": "rest",
+		"dependencies": ["vf-module-id", "vf-module-name", "vf-module-label", "nfc-naming-code", "vf-naming-policy"],
+		"version": 0
+	},
+	{
+		"name": "vlb_onap_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_onap_private_ip_0",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vlb_private_net_cidr",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_private_net_cidr",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "vm-type",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vm-type",
+		"dictionary-source": "processor-db",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vnf-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vnf-id",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vnf-model-customization-uuid",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vnf-model-customization-uuid",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vnfc-model-invariant-uuid",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vnfc-model-invariant-uuid",
+		"dictionary-source": "processor-db",
+		"dependencies": [
+			"vfccustomizationuuid"
+		],
+		"version": 0
+	},
+	{
+		"name": "vnfc-model-version",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vnfc-model-version",
+		"dictionary-source": "processor-db",
+		"dependencies": [
+			"vfccustomizationuuid"
+		],
+		"version": 0
+	},
+	{
+		"name": "vpg_onap_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vpg_onap_private_ip_0",
+		"dictionary-source": "sdnc",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "private1-prefix-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "private1-prefix-id",
+		"dictionary-source": "processor-db",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "private2-prefix-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "private2-prefix-id",
+		"dictionary-source": "processor-db",
+		"dependencies": [],
+		"version": 0
+	}
 ]
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-template.vtl
deleted file mode 100644
index 458423e..0000000
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-template.vtl
+++ /dev/null
@@ -1,330 +0,0 @@
-{
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "service-instance-id",
-      "param-value": "${service-instance-id}"
-    },
-    {
-      "param-name": "vnf_id",
-      "param-value": "${vnf-id}"
-    },
-    {
-      "param-name": "vnf_name",
-      "param-value": "${vnf_name}"
-    },
-    {
-      "param-name": "vpg_int_pktgen_private_ip_0",
-      "param-value": "${vpg_int_pktgen_private_ip_0}"
-    },
-    {
-      "param-name": "vpg_onap_private_ip_0",
-      "param-value": "${vpg_onap_private_ip_0}"
-    },
-  
-   
-    {
-      "param-name": "vnf_model_customization_uuid",
-      "param-value": "${vnf-model-customization-uuid}"
-    },
-    {
-      "param-name": "vf_module_id",
-      "param-value": "${vf-module-id}"
-    },
-    {
-      "param-name": "vf_module_type",
-      "param-value": "${vf-module-type}"
-    },
-    {
-      "param-name": "vf_module_customization_uuid",
-      "param-value": "${vf-module-model-customization-uuid}"
-    },
-    {
-      "param-name": "vfc_customization_uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "aic-cloud-region",
-      "param-value": "${aic-cloud-region}"
-    },
-    {
-      "param-name": "vm-type",
-      "param-value": "${vm-type}"
-    },
-    {
-      "param-name": "vnfc-model-customization-uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "vnfc-model-invariant-uuid",
-      "param-value": "${vnfc-model-invariant-uuid}"
-    },
-    {
-      "param-name": "vnfc-model-version",
-      "param-value": "${vnfc-model-version}"
-    },
-    {
-      "param-name": "nfc-naming-code",
-      "param-value": "${nfc-naming-code}"
-    },
-    {
-      "param-name": "vip",
-      "param-value": "${vip}"
-    },
-    {
-      "param-name": "cloud_env",
-      "param-value": "openstack"
-    },
-    {
-      "param-name": "repo_url_artifacts",
-      "param-value": "https://nexus.onap.org/content/groups/staging"
-    },
-    {
-      "param-name": "repo_url_blob",
-      "param-value": "https://nexus.onap.org/content/repositories/raw"
-    },
-    {
-      "param-name": "dcae_collector_port",
-      "param-value": "${dcae_collector_port}"
-    },
-    {
-      "param-name": "nb_api_version",
-      "param-value": "${nb_api_version}"
-    },
-    {
-      "param-name": "vlb_image_name",
-      "param-value": "${vlb_image_name}"
-    },
-    {
-      "param-name": "vlb_flavor_name",
-      "param-value": "${vlb_flavor_name}"
-    },
-    {
-      "param-name": "install_script_version",
-      "param-value": "${install_script_version}"
-    },
-    {
-      "param-name": "key_name",
-      "param-value": "${key_name}"
-    },
-    {
-      "param-name": "pub_key",
-      "param-value": "${pub_key}"
-    },
-    {
-      "param-name": "demo_artifacts_version",
-      "param-value": "${demo_artifacts_version}"
-    },
-    {
-      "param-name": "dcae_collector_ip",
-      "param-value": "${dcae_collector_ip}"
-    },
-    {
-      "param-name": "public_net_id",
-      "param-value": "${public_net_id}"
-    },
-    {
-      "param-name": "onap_private_net_id",
-      "param-value": "${onap_private_net_id}"
-    },
-    {
-      "param-name": "onap_private_subnet_id",
-      "param-value": "${onap_private_subnet_id}"
-    },
-    {
-      "param-name": "vlb_int_pktgen_private_ip_0",
-      "param-value": "${vlb_int_pktgen_private_ip_0}"
-    },
-    {
-      "param-name": "vlb_private_net_cidr",
-      "param-value": "${vlb_private_net_cidr}"
-    },
-    {
-      "param-name": "pktgen_private_net_cidr",
-      "param-value": "${pktgen_private_net_cidr}"
-    },
-    {
-      "param-name": "vlb_int_private_ip_0",
-      "param-value": "${vlb_int_private_ip_0}"
-    },
-    {
-      "param-name": "vlb_onap_private_ip_0",
-      "param-value": "${vlb_onap_private_ip_0}"
-    },
-    {
-      "param-name": "onap_private_net_cidr",
-      "param-value": "${onap_private_net_cidr}"
-    },
-    {
-      "param-name": "nexus_artifact_repo",
-      "param-value": "${nexus_artifact_repo}"
-    },
-    {
-      "param-name": "sec_group",
-      "param-value": "${sec_group}"
-    }
-  ],
-  "capability-data": [
-    {
-      "capability-name": "generate-name",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vlb_name_0"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vlb_name_0}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vlb_name_0"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VNFC"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "NFC_NAMING_CODE",
-              "param-value": "${nfc-naming-code}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vlb_name_0",
-              "resource-value": "${vlb_name_0}"
-            }
-          ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vf-module-name"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vf-module-name}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vf-module-name"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VF-MODULE"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "VF_MODULE_LABEL",
-              "param-value": "${vf-module-label}"
-            },
-            {
-              "param-name": "VF_MODULE_TYPE",
-              "param-value": "${vf-module-type}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vf-module-name",
-              "resource-value": "${vf-module-name}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "netbox-ip-assign",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${private2-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vip"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vip",
-              "resource-value": "${vip}"
-            }
-          ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${private1-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-gre_ipaddr"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "gre_ipaddr",
-              "resource-value": "${gre_ipaddr}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "aai-vf-module-put",
-      "key-mapping": [
-        {
-          "output-key-mapping": [
-            {
-              "resource-name": "aai-vf-module-put",
-              "resource-value": "${status}"
-            }
-          ],
-          "payload": [
-            {
-              "param-name": "vf-module",
-              "param-value": "vf-module"
-            }
-          ]
-        }
-      ]
-    }
-	
-  ]
-}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vnf-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vnf-mapping.json
index 82dbe66..e353cab 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vnf-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vnf-mapping.json
@@ -1,690 +1,669 @@
-[
-  {
-    "name": "cloud_env",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "openstack"
-    },
-    "input-param": true,
-    "dictionary-name": "cloud_env",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "demo_artifacts_version",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "demo_artifacts_version",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-    {
-    "name": "flavor_name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "flavor_name",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "image_name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "image_name",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vpg_int_pktgen_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vpg_int_pktgen_private_ip_0}"
-    },
-    "input-param": false,
-    "dictionary-name": "vpg_int_pktgen_private_ip_0",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "install_script_version",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "install_script_version",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "pub_key",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCs84Cy8+qi/jvucay0BwFtOq3ian0ulTXFGxkZcZCR0N48j88pbHJaEqb9e25MAsrfH+7Etb9Kd5nbBThEL/i0AyHXnDsc80Oq0sqlLcfLo3SGSurkrNoRofHboJ5Hn+N9SlWN5FCQGbTx1w3rjqR4LasAI6XxH9xpXSFyyge6ysVXH0cYaZ8sg98nFZa1fPJR9L8COjZvF+EYudub2RC5HVyV/sx7bliNFo9JwQh6du1abG4G7ZDjTIcYwYp21iq52UzWU28RVcAyY6AQZJu2lHLdsr8fPvyeWZpC5EqGsxI1G609m9G/dURRKwYfez/f2ATzpn5QjEX7LrLWBM8r Generated-by-Nova"
-    },
-    "input-param": false,
-    "dictionary-name": "pub_key",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "int_private_net_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${int_private_net_id}"
-    },
-    "input-param": false,
-    "dictionary-name": "int_private_net_id",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "onap_private_net_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "onap_private_subnet_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "pktgen_private_net_cidr",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "pktgen_private_net_cidr",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vdns_int_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vdns_int_private_ip_0}"
-    },
-    "input-param": false,
-    "dictionary-name": "vdns_int_private_ip_0",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vdns_onap_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vdns_onap_private_ip_0}"
-    },
-    "input-param": false,
-    "dictionary-name": "vdns_onap_private_ip_0",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vlb_int_pktgen_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vlb_int_pktgen_private_ip_0}"
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_int_pktgen_private_ip_0",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vlb_onap_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vlb_onap_private_ip_0}"
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_onap_private_ip_0",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vpg_onap_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vpg_onap_private_ip_0}"
-    },
-    "input-param": false,
-    "dictionary-name": "vpg_onap_private_ip_0",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "int_pktgen_private_net_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${int_pktgen_private_net_id}"
-    },
-    "input-param": false,
-    "dictionary-name": "int_pktgen_private_net_id",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "int_pktgen_private_subnet_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${int_pktgen_private_subnet_id}"
-    },
-    "input-param": false,
-    "dictionary-name": "int_pktgen_private_subnet_id",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "int_private_subnet_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${int_private_subnet_id}"
-    },
-    "input-param": false,
-    "dictionary-name": "int_private_subnet_id",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "public_net_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "public_net_id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "onap_private_net_cidr",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "onap_private_net_cidr",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "sec_group",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "sec_group",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "service-instance-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "service-instance-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vlb_int_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vlb_int_private_ip_0}"
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_int_private_ip_0",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vlb_private_net_cidr",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "vlb_private_net_cidr",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vnf-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "vnf-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vnf-model-customization-uuid",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "vnf-model-customization-uuid",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-naming-policy",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "SDNC_Policy.Config_MS_ONAP_VNF_NAMING_TIMESTAMP"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vnf_name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vnf_name}"
-    },
-    "input-param": false,
-    "dictionary-name": "vnf_name",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "aic-cloud-region",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "aic-cloud-region",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "management-prefix-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "management-prefix-id",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "private1-prefix-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "private1-prefix-id",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "private2-prefix-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": ""
-    },
-    "input-param": false,
-    "dictionary-name": "private2-prefix-id",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  }
+[{
+		"name": "cloud_env",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": true,
+		"dictionary-name": "cloud_env",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "dcae_collector_ip",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "dcae_collector_ip",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+		{
+		"name": "vnf_assign_aai",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vnf_assign_aai",
+		"dictionary-source": "aai-data",
+		"dependencies": [	"vnf-id",
+						"vnf_name"],
+		"version": 0
+	},
+	{
+		"name": "demo_artifacts_version",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "demo_artifacts_version",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "flavor_name",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "flavor_name",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "image_name",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "image_name",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vpg_int_pktgen_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"metadata": {
+				"transform-template": "${vpg_int_pktgen_private_ip_0.replaceAll(\"/.+\", \"\")}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vpg_int_pktgen_private_ip_0",
+		"dictionary-source": "rest",
+		"dependencies": ["private2-prefix-id"],
+		"version": 0
+	},
+	{
+		"name": "int_pktgen_private_net_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"default": "private2",
+			"metadata": {
+				"transform-template": "${vnf_name}_${int_pktgen_private_net_id}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "int_pktgen_private_net_id",
+		"dictionary-source": "default",
+		"dependencies": ["vnf_name"],
+		"version": 0
+	},
+	{
+		"name": "int_pktgen_private_subnet_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"default": "private2",
+			"metadata": {
+				"transform-template": "${vnf_name}_${int_pktgen_private_subnet_id}_subnet"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "int_pktgen_private_subnet_id",
+		"dictionary-source": "default",
+		"dependencies": ["vnf_name"],
+		"version": 0
+	},
+	{
+		"name": "int_private_net_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"default": "private1",
+			"metadata": {
+				"transform-template": "${vnf_name}_${int_private_net_id}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "int_private_net_id",
+		"dictionary-source": "default",
+		"dependencies": ["vnf_name"],
+		"version": 0
+	},
+	{
+		"name": "int_private_subnet_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"default": "private1",
+			"metadata": {
+				"transform-template": "${vnf_name}_${int_private_subnet_id}_subnet"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "int_private_subnet_id",
+		"dictionary-source": "default",
+		"dependencies": ["vnf_name"],
+		"version": 0
+	},
+	{
+		"name": "install_script_version",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "install_script_version",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "pub_key",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "pub_key",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "onap_private_net_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "onap_private_net_id",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "onap_private_subnet_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "onap_private_subnet_id",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "pktgen_private_net_cidr",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "pktgen_private_net_cidr",
+		"dictionary-source": "processor-db",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vlb_int_pktgen_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"metadata": {
+				"transform-template": "${vlb_int_pktgen_private_ip_0.replaceAll(\"/.+\", \"\")}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_int_pktgen_private_ip_0",
+		"dictionary-source": "rest",
+		"dependencies": ["private2-prefix-id"],
+		"version": 0
+	},
+	{
+		"name": "vlb_onap_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"metadata": {
+				"transform-template": "${vlb_onap_private_ip_0.replaceAll(\"/.+\", \"\")}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_onap_private_ip_0",
+		"dictionary-source": "rest",
+		"dependencies": ["management-prefix-id"],
+		"version": 0
+	},
+	{
+		"name": "vpg_onap_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"metadata": {
+				"transform-template": "${vpg_onap_private_ip_0.replaceAll(\"/.+\", \"\")}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vpg_onap_private_ip_0",
+		"dictionary-source": "rest",
+		"dependencies": ["management-prefix-id"],
+		"version": 0
+	},
+
+	{
+		"name": "public_net_id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "public_net_id",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "onap_private_net_cidr",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "onap_private_net_cidr",
+		"dictionary-source": "processor-db",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "sec_group",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "sec_group",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "service-instance-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "service-instance-id",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vlb_int_private_ip_0",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"metadata": {
+				"transform-template": "${vlb_int_private_ip_0.replaceAll(\"/.+\", \"\")}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_int_private_ip_0",
+		"dictionary-source": "rest",
+		"dependencies": ["private1-prefix-id"],
+		"version": 0
+	},
+	{
+		"name": "vlb_private_net_cidr",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_private_net_cidr",
+		"dictionary-source": "processor-db",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vnf-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vnf-id",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vnf-model-customization-uuid",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vnf-model-customization-uuid",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vf-naming-policy",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+			"default": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP"
+		},
+		"input-param": false,
+		"dictionary-name": "vf-naming-policy",
+		"dictionary-source": "default",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vnf_name",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vnf_name",
+		"dictionary-source": "rest",
+		"dependencies": [
+			"aic-cloud-region",
+			"vf-naming-policy",
+			"vnf-id"
+		],
+		"version": 0
+	},
+	{
+		"name": "aic-cloud-region",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "aic-cloud-region",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "management-prefix-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "management-prefix-id",
+		"dictionary-source": "processor-db",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "private1-prefix-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "private1-prefix-id",
+		"dictionary-source": "processor-db",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "private2-prefix-id",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "private2-prefix-id",
+		"dictionary-source": "processor-db",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vlb_0_int_pktgen_private_port_0_mac",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vlb_0_int_pktgen_private_port_0_mac",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	},
+	{
+		"name": "vpg_0_int_pktgen_private_port_0_mac",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vpg_0_int_pktgen_private_port_0_mac",
+		"dictionary-source": "input",
+		"dependencies": [],
+		"version": 0
+	}
 ]
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vnf-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vnf-template.vtl
deleted file mode 100644
index 0080e2b..0000000
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vnf-template.vtl
+++ /dev/null
@@ -1,284 +0,0 @@
-{
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "service-instance-id",
-      "param-value": "${service-instance-id}"
-    },
-    {
-      "param-name": "vnf_id",
-      "param-value": "${vnf-id}"
-    },
-	 {
-      "param-name": "vf-naming-policy",
-      "param-value": "${vf-naming-policy}"
-    },
-    {
-      "param-name": "vnf-model-customization-uuid",
-      "param-value": "${vnf-model-customization-uuid}"
-    },
-    {
-      "param-name": "aic-cloud-region",
-      "param-value": "${aic-cloud-region}"
-    },
-    {
-      "param-name": "onap_private_net_id",
-      "param-value": "${onap_private_net_id}"
-    },
-	{
-      "param-name": "image_name",
-      "param-value": "${image_name}"
-    },
-    {
-      "param-name": "onap_private_subnet_id",
-      "param-value": "${onap_private_subnet_id}"
-    },
-    {
-      "param-name": "vfccustomizationuuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "vf-module-model-customization-uuid",
-      "param-value": "${vf-module-model-customization-uuid}"
-    },
-    {
-      "param-name": "cloud_env",
-      "param-value": "${cloud_env}"
-    },
-	   {
-      "param-name": "flavor_name",
-      "param-value": "${flavor_name}"
-    },
-    {
-      "param-name": "install_script_version",
-      "param-value": "${install_script_version}"
-    },
-    {
-      "param-name": "pub_key",
-      "param-value": "${pub_key}"
-    },
-    {
-      "param-name": "sec_group",
-      "param-value": "${sec_group}"
-    },
-    {
-      "param-name": "demo_artifacts_version",
-      "param-value": "${demo_artifacts_version}"
-    },
-    {
-      "param-name": "public_net_id",
-      "param-value": "${public_net_id}"
-    },
-    {
-      "param-name": "onap_private_net_cidr",
-      "param-value": "${onap_private_net_cidr}"
-    },
-    {
-      "param-name": "pktgen_private_net_cidr",
-      "param-value": "${pktgen_private_net_cidr}"
-    },
-    {
-      "param-name": "vlb_private_net_cidr",
-      "param-value": "${vlb_private_net_cidr}"
-    },
-    {
-      "param-name": "key_name",
-      "param-value": "olc-key"
-    }
-  ],
-  "capability-data": [
-    {
-      "capability-name": "generate-name",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vnf_name"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vnf-id}_vnf_name"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VNF"
-            },
-            {
-              "param-name": "AIC_CLOUD_REGION",
-              "param-value": "${aic-cloud-region}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vnf_name",
-              "resource-value": "${vnf_name}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "netbox-ip-assign",
-      "key-mapping": [
-       
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${private1-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vlb_int_private_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vlb_int_private_ip_0",
-              "resource-value": "${vlb_int_private_ip_0}"
-            }
-          ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${private2-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vlb_int_pktgen_private_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vlb_int_pktgen_private_ip_0",
-              "resource-value": "${vlb_int_pktgen_private_ip_0}"
-            }
-          ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${management-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vpg_onap_private_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vpg_onap_private_ip_0",
-              "resource-value": "${vpg_onap_private_ip_0}"
-            }
-          ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${management-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vlb_onap_private_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vlb_onap_private_ip_0",
-              "resource-value": "${vlb_onap_private_ip_0}"
-            }
-          ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${private2-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vpg_int_pktgen_private_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vpg_int_pktgen_private_ip_0",
-              "resource-value": "${vpg_int_pktgen_private_ip_0}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "aai-vnf-put",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "generic-vnf",
-              "param-value": "generic-vnf"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "aai-vnf-put",
-              "resource-value": "${status}"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json
index 25721e2..4b079fd 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json
@@ -11,15 +11,42 @@
       ],
       "entry_schema": {
         "type": ""
-      },
-      "default": "openstack"
+      }
     },
     "input-param": false,
     "dictionary-name": "cloud_env",
-    "dictionary-source": "default",
-    "dependencies": [],
+    "dictionary-source": "sdnc",
+    "dependencies": [
+			"service-instance-id",
+			"vnf-id"
+			],
     "version": 0
   },
+  	{
+		"name": "vf-module-assign",
+		"property": {
+			"description": "",
+			"required": false,
+			"type": "string",
+			"status": "",
+			"constraints": [{}],
+			"entry_schema": {
+				"type": ""
+			},
+						"metadata": {
+				"transform-template": "${vf-module-assign}_${service-instance-id}"
+			}
+		},
+		"input-param": false,
+		"dictionary-name": "vf-module-assign",
+		"dictionary-source": "aai-data",
+		"dependencies": [
+			"service-instance-id",
+			"vnf-id",
+			"vf-module-name"
+		],
+		"version": 0
+	},
   {
     "name": "vf-module-name",
     "property": {
@@ -32,13 +59,12 @@
       ],
       "entry_schema": {
         "type": ""
-      },
-      "default": "${vf-module-name}"
+      }
     },
     "input-param": false,
     "dictionary-name": "vf-module-name",
-    "dictionary-source": "default",
-    "dependencies": [],
+    "dictionary-source": "rest",
+	"dependencies": ["vnf_name", "vf-module-label", "vf-module-type", "vf-naming-policy", "vf-module-id"],
     "version": 0
   },
   {
@@ -107,27 +133,7 @@
     "dependencies": [],
     "version": 0
   },
-  {
-    "name": "keypair",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "vlb_key"
-    },
-    "input-param": false,
-    "dictionary-name": "keypair",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
+
   {
     "name": "nb_api_version",
     "property": {
@@ -140,13 +146,15 @@
       ],
       "entry_schema": {
         "type": ""
-      },
-      "default": "1.2.0"
+      }
     },
     "input-param": false,
     "dictionary-name": "nb_api_version",
-    "dictionary-source": "default",
-    "dependencies": [],
+    "dictionary-source": "sdnc",
+    "dependencies": [
+			"service-instance-id",
+			"vnf-id"
+			],
     "version": 0
   },
   {
@@ -161,13 +169,15 @@
       ],
       "entry_schema": {
         "type": ""
-      },
-      "default": "https://nexus.onap.org"
+      }
     },
     "input-param": false,
     "dictionary-name": "nexus_artifact_repo",
-    "dictionary-source": "default",
-    "dependencies": [],
+    "dictionary-source": "sdnc",
+    "dependencies": [
+			"service-instance-id",
+			"vnf-id"
+			],
     "version": 0
   },
   {
@@ -630,13 +640,12 @@
       ],
       "entry_schema": {
         "type": ""
-      },
-      "default": "${vpg_name_0}"
+      }
     },
     "input-param": false,
     "dictionary-name": "vpg_name_0",
-    "dictionary-source": "default",
-    "dependencies": [],
+    "dictionary-source": "rest",
+	"dependencies": ["vf-module-id", "vf-module-name", "vf-module-label", "nfc-naming-code", "vf-naming-policy"],
     "version": 0
   },
   {
@@ -651,8 +660,7 @@
       ],
       "entry_schema": {
         "type": ""
-      },
-      "default": ""
+      }
     },
     "input-param": false,
     "dictionary-name": "private2-prefix-id",
@@ -713,12 +721,14 @@
       "entry_schema": {
         "type": ""
       },
-      "default": "${pg_int}"
+			"metadata": {
+				"transform-template": "${pg_int.replaceAll(\"/.+\", \"\")}"
+			}
     },
     "input-param": false,
     "dictionary-name": "pg_int",
-    "dictionary-source": "default",
-    "dependencies": [],
+    "dictionary-source": "rest",
+    "dependencies": ["private2-prefix-id"],
     "version": 0
   },
   {
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-template.vtl
deleted file mode 100644
index bd745b1..0000000
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-template.vtl
+++ /dev/null
@@ -1,273 +0,0 @@
-{
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "service-instance-id",
-      "param-value": "${service-instance-id}"
-    },
-    {
-      "param-name": "vnf_id",
-      "param-value": "${vnf-id}"
-    },
-    {
-      "param-name": "vnf_name",
-      "param-value": "${vnf_name}"
-    },
-    {
-      "param-name": "vnf_model_customization_uuid",
-      "param-value": "${vnf-model-customization-uuid}"
-    },
-    {
-      "param-name": "vpg_onap_private_ip_0",
-      "param-value": "${vpg_onap_private_ip_0}"
-    },
-    {
-      "param-name": "vf_module_id",
-      "param-value": "${vf-module-id}"
-    },
-    {
-      "param-name": "vf_module_type",
-      "param-value": "${vf-module-type}"
-    },
-    {
-      "param-name": "vf_module_customization_uuid",
-      "param-value": "${vf-module-model-customization-uuid}"
-    },
-    {
-      "param-name": "vfc_customization_uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "aic-cloud-region",
-      "param-value": "${aic-cloud-region}"
-    },
-    {
-      "param-name": "vm-type",
-      "param-value": "${vm-type}"
-    },
-    {
-      "param-name": "vnfc-model-customization-uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "vnfc-model-invariant-uuid",
-      "param-value": "${vnfc-model-invariant-uuid}"
-    },
-    {
-      "param-name": "vnfc-model-version",
-      "param-value": "${vnfc-model-version}"
-    },
-    {
-      "param-name": "nfc-naming-code",
-      "param-value": "${nfc-naming-code}"
-    },
-    {
-      "param-name": "cloud_env",
-      "param-value": "openstack"
-    },
-    {
-      "param-name": "repo_url_artifacts",
-      "param-value": "https://nexus.onap.org/content/groups/staging"
-    },
-    {
-      "param-name": "repo_url_blob",
-      "param-value": "https://nexus.onap.org/content/repositories/raw"
-    },
-    {
-      "param-name": "vpg_image_name",
-      "param-value": "${vpg_image_name}"
-    },
-    {
-      "param-name": "vpg_int_pktgen_private_ip_0",
-      "param-value": "${vpg_int_pktgen_private_ip_0}"
-    },
-    {
-      "param-name": "vpg_flavor_name",
-      "param-value": "${vpg_flavor_name}"
-    },
-    {
-      "param-name": "key_name",
-      "param-value": "${key_name}"
-    },
-    {
-      "param-name": "pub_key",
-      "param-value": "${pub_key}"
-    },
-    {
-      "param-name": "install_script_version",
-      "param-value": "${install_script_version}"
-    },
-    {
-      "param-name": "demo_artifacts_version",
-      "param-value": "${demo_artifacts_version}"
-    },
-    {
-      "param-name": "nb_api_version",
-      "param-value": "1.2.0"
-    },
-    {
-      "param-name": "public_net_id",
-      "param-value": "${public_net_id}"
-    },
-    {
-      "param-name": "onap_private_net_id",
-      "param-value": "${onap_private_net_id}"
-    },
-    {
-      "param-name": "onap_private_subnet_id",
-      "param-value": "${onap_private_subnet_id}"
-    },
-    {
-      "param-name": "onap_private_net_cidr",
-      "param-value": "${onap_private_net_cidr}"
-    },
-    {
-      "param-name": "nexus_artifact_repo",
-      "param-value": "https://nexus.onap.org"
-    },
-    {
-      "param-name": "sec_group",
-      "param-value": "${sec_group}"
-    }
-  ],
-  "capability-data": [
-    {
-      "capability-name": "generate-name",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vpg_name_0"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vpg_name_0}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vpg_name_0"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VNFC"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "NFC_NAMING_CODE",
-              "param-value": "${nfc-naming-code}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vpg_name_0",
-              "resource-value": "${vpg_name_0}"
-            }
-          ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vf-module-name"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vf-module-name}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vf-module-name"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VF-MODULE"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "VF_MODULE_LABEL",
-              "param-value": "${vf-module-label}"
-            },
-            {
-              "param-name": "vlb_int_pktgen_private_ip_0",
-              "param-value": "${vlb_int_pktgen_private_ip_0}"
-            },
-            {
-              "param-name": "VF_MODULE_TYPE",
-              "param-value": "${vf-module-type}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vf-module-name",
-              "resource-value": "${vf-module-name}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "netbox-ip-assign",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${private2-prefix-id}"
-            },
-            {
-              "param-name": "vf-module-id",
-              "param-value": "${vf-module-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vf-module-id}-pg_int"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "pg_int",
-              "resource-value": "${pg_int}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "aai-vf-module-put",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "vf-module",
-              "param-value": "vf-module"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "aai-vf-module-put",
-              "resource-value": "${status}"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintConstants.kt b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintConstants.kt
index e26af2b..5c522e7 100644
--- a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintConstants.kt
+++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintConstants.kt
@@ -239,4 +239,6 @@
     const val PROPERTY_CLUSTER_NODE_ADDRESS = "CLUSTER_NODE_ADDRESS"
     const val PROPERTY_CLUSTER_JOIN_AS_CLIENT = "CLUSTER_JOIN_AS_CLIENT"
     const val PROPERTY_CLUSTER_CONFIG_FILE = "CLUSTER_CONFIG_FILE"
+
+    const val NODE_TEMPLATE_TYPE_COMPONENT_RESOURCE_RESOLUTION = "component-resource-resolution"
 }
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceHandler.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceHandler.kt
index 74c4b00..e9d0b7b 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceHandler.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceHandler.kt
@@ -75,7 +75,7 @@
                         "Failed to process request, 'actionIdentifiers.mode' not specified. Valid value are: 'sync' or 'async'.",
                         true
                 )
-                publishAuditService.publish(executionServiceOutput)
+                publishAuditService.publish(executionServiceInput.correlationUUID, executionServiceOutput)
                 responseObserver.onNext(
                         executionServiceOutput.toProto()
                 )
@@ -121,7 +121,7 @@
             executionServiceOutput = response(executionServiceInput, e.localizedMessage ?: e.message ?: e.toString(), true)
         }
 
-        publishAuditService.publish(executionServiceOutput)
+        publishAuditService.publish(executionServiceInput.correlationUUID, executionServiceOutput)
         return executionServiceOutput
     }
 
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/KafkaPublishAuditService.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/KafkaPublishAuditService.kt
index 1c5d47c..9ac11c7 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/KafkaPublishAuditService.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/KafkaPublishAuditService.kt
@@ -23,6 +23,7 @@
 import org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.ResourceResolutionConstants
 import org.onap.ccsdk.cds.blueprintsprocessor.message.service.BluePrintMessageLibPropertyService
 import org.onap.ccsdk.cds.blueprintsprocessor.message.service.BlueprintMessageProducerService
+import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants
 import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException
 import org.onap.ccsdk.cds.controllerblueprints.core.asJsonPrimitive
 import org.onap.ccsdk.cds.controllerblueprints.core.common.ApplicationConstants
@@ -51,7 +52,6 @@
 ) : PublishAuditService {
     private var inputInstance: BlueprintMessageProducerService? = null
     private var outputInstance: BlueprintMessageProducerService? = null
-    private lateinit var correlationUUID: String
     private val log = LoggerFactory.getLogger(KafkaPublishAuditService::class.toString())
 
     companion object {
@@ -70,7 +70,6 @@
      * Sensitive data within the request are hidden.
      */
     override suspend fun publish(executionServiceInput: ExecutionServiceInput) {
-        this.correlationUUID = executionServiceInput.correlationUUID
         val secureExecutionServiceInput = hideSensitiveData(executionServiceInput)
         this.inputInstance = this.getInputInstance(INPUT_SELECTOR)
         this.inputInstance!!.sendMessage(secureExecutionServiceInput)
@@ -81,8 +80,8 @@
      * The correlation UUID is used to link the output to its input.
      * A correlation UUID is added to link the input to its output.
      */
-    override fun publish(executionServiceOutput: ExecutionServiceOutput) {
-        executionServiceOutput.correlationUUID = this.correlationUUID
+    override fun publish(correlationUUID: String, executionServiceOutput: ExecutionServiceOutput) {
+        executionServiceOutput.correlationUUID = correlationUUID
         this.outputInstance = this.getOutputInstance(OUTPUT_SELECTOR)
         this.outputInstance!!.sendMessage(executionServiceOutput)
     }
@@ -146,33 +145,40 @@
             val blueprintRuntimeService = BluePrintMetadataUtils.getBluePrintRuntime(requestId, basePath.toString())
             val blueprintContext = blueprintRuntimeService.bluePrintContext()
 
-            val nodeTemplateName = blueprintContext.workflowFirstStepNodeTemplate(workflowName)
-            val interfaceName = blueprintContext.nodeTemplateFirstInterfaceName(nodeTemplateName)
-            val operationName = blueprintContext.nodeTemplateFirstInterfaceFirstOperationName(nodeTemplateName)
+            /** Looking for node templates defined as component-resource-resolution */
+            val nodeTemplates = blueprintContext.nodeTemplates()
+            nodeTemplates!!.forEach { nodeTemplate ->
+                val nodeTemplateName = nodeTemplate.key
+                val nodeTemplateType = blueprintContext.nodeTemplateByName(nodeTemplateName).type
+                if (nodeTemplateType == BluePrintConstants.NODE_TEMPLATE_TYPE_COMPONENT_RESOURCE_RESOLUTION) {
+                    val interfaceName = blueprintContext.nodeTemplateFirstInterfaceName(nodeTemplateName)
+                    val operationName = blueprintContext.nodeTemplateFirstInterfaceFirstOperationName(nodeTemplateName)
 
-            val propertyAssignments: MutableMap<String, JsonNode> =
-                    blueprintContext.nodeTemplateInterfaceOperationInputs(nodeTemplateName, interfaceName, operationName)
-                            ?: hashMapOf()
+                    val propertyAssignments: MutableMap<String, JsonNode> =
+                            blueprintContext.nodeTemplateInterfaceOperationInputs(nodeTemplateName, interfaceName, operationName)
+                                    ?: hashMapOf()
 
-            val artifactPrefixNamesNode = propertyAssignments[ResourceResolutionConstants.INPUT_ARTIFACT_PREFIX_NAMES]
-            val artifactPrefixNames = JacksonUtils.getListFromJsonNode(artifactPrefixNamesNode!!, String::class.java)
+                    val artifactPrefixNamesNode = propertyAssignments[ResourceResolutionConstants.INPUT_ARTIFACT_PREFIX_NAMES]
+                    val artifactPrefixNames = JacksonUtils.getListFromJsonNode(artifactPrefixNamesNode!!, String::class.java)
 
-            /** Storing mapping entries with metadata log-protect set to true */
-            val sensitiveParameters: List<String> = artifactPrefixNames
-                    .map { "$it-mapping" }
-                    .map { blueprintRuntimeService.resolveNodeTemplateArtifact(nodeTemplateName, it) }
-                    .flatMap { JacksonUtils.getListFromJson(it, ResourceAssignment::class.java) }
-                    .filter { PropertyDefinitionUtils.hasLogProtect(it.property) }
-                    .map { it.name }
+                    /** Storing mapping entries with metadata log-protect set to true */
+                    val sensitiveParameters: List<String> = artifactPrefixNames
+                            .map { "$it-mapping" }
+                            .map { blueprintRuntimeService.resolveNodeTemplateArtifact(nodeTemplateName, it) }
+                            .flatMap { JacksonUtils.getListFromJson(it, ResourceAssignment::class.java) }
+                            .filter { PropertyDefinitionUtils.hasLogProtect(it.property) }
+                            .map { it.name }
 
-            /** Hiding sensitive input parameters from the request */
-            var workflowProperties: ObjectNode = clonedExecutionServiceInput.payload
-                    .path("$workflowName-request")
-                    .path("$workflowName-properties") as ObjectNode
+                    /** Hiding sensitive input parameters from the request */
+                    var workflowProperties: ObjectNode = clonedExecutionServiceInput.payload
+                            .path("$workflowName-request")
+                            .path("$workflowName-properties") as ObjectNode
 
-            sensitiveParameters.forEach { sensitiveParameter ->
-                if (workflowProperties.has(sensitiveParameter)) {
-                    workflowProperties.replace(sensitiveParameter, ApplicationConstants.LOG_REDACTED.asJsonPrimitive())
+                    sensitiveParameters.forEach { sensitiveParameter ->
+                        if (workflowProperties.has(sensitiveParameter)) {
+                            workflowProperties.replace(sensitiveParameter, ApplicationConstants.LOG_REDACTED.asJsonPrimitive())
+                        }
+                    }
                 }
             }
         }
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/NoPublishAuditService.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/NoPublishAuditService.kt
index 3f78200..eb66e41 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/NoPublishAuditService.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/NoPublishAuditService.kt
@@ -42,6 +42,6 @@
     override suspend fun publish(executionServiceInput: ExecutionServiceInput) {
     }
 
-    override fun publish(executionServiceOutput: ExecutionServiceOutput) {
+    override fun publish(correlationUUID: String, executionServiceOutput: ExecutionServiceOutput) {
     }
 }
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/PublishAuditService.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/PublishAuditService.kt
index 535a5ea..72f4931 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/PublishAuditService.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/PublishAuditService.kt
@@ -21,5 +21,5 @@
 
 interface PublishAuditService {
     suspend fun publish(executionServiceInput: ExecutionServiceInput)
-    fun publish(executionServiceOutput: ExecutionServiceOutput)
+    fun publish(correlationUUID: String, executionServiceOutput: ExecutionServiceOutput)
 }
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceHandlerTest.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceHandlerTest.kt
index 37f7861..1914562 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceHandlerTest.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceHandlerTest.kt
@@ -114,7 +114,7 @@
         }
 
         verify {
-            publishAuditService.publish(executionServiceOutput!!)
+            publishAuditService.publish(executionServiceInput.correlationUUID, executionServiceOutput!!)
         }
     }
 }