Adding unlimited max value to VNF, NETWORK
[vid.git] / vid-webpack-master / cypress / integration / iFrames / drawingBoard.e2e.ts
index bd8c4c8..b678702 100644 (file)
@@ -1,15 +1,16 @@
-
 ///<reference path="../../../node_modules/cypress/types/index.d.ts"/>
+import {JsonBuilder} from "../../support/jsonBuilders/jsonBuilder";
+import {ServiceModel} from "../../support/jsonBuilders/models/service.model";
+
 describe('Drawing board', function () {
   beforeEach(() => {
-    cy.window().then((win) => {
-      win.sessionStorage.clear();
+      cy.clearSessionStorage();
       cy.setReduxState();
       cy.preventErrorsOnLoading();
       cy.initAAIMock();
       cy.initVidMock();
+      cy.initActiveNetworks();
       cy.login();
-    });
   });
 
   afterEach(() => {
@@ -19,16 +20,16 @@ describe('Drawing board', function () {
   describe('duplicate', () => {
 
     it('delete vf module reduce the number of vf modules ', function () {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
-        cy.drawingBoardPressAddButtonByElementName('node-2017-488_ADIOD-vPE 0').get('i').should('have.class', 'fa-plus-circle');
-        cy.drawingBoardPressAddButtonByElementName('node-2017-488_ADIOD-vPE 0').click({force: true});
-        cy.fillVnfPopup().then(() => {
-          cy.drawingBoardPressAddButtonByElementName('node-2017-488_ADIOD-vPE 0').click({force: true});
+        cy.drawingBoardPressAddButtonByElementName('node-2017-488_PASQUALE-vPE 0').get('i').should('have.class', 'fa-plus-circle');
+        cy.drawingBoardPressAddButtonByElementName('node-2017-488_PASQUALE-vPE 0').click({force: true});
+        cy.fillVnfPopup(true).then(() => {
+          cy.drawingBoardPressAddButtonByElementName('node-2017-488_PASQUALE-vPE 0').click({force: true});
           cy.fillVnfPopup().then(() => {
             cy.drawingBoardNumberOfExistingElementsShouldContains(2);
-            cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_ADIOD-vPE 0', 1)
+            cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_PASQUALE-vPE 0', 1)
               .drawingBoardTreeClickOnContextMenuOptionByName('Remove');
             cy.drawingBoardNumberOfExistingElementsShouldContains(1);
           });
@@ -37,15 +38,15 @@ describe('Drawing board', function () {
     });
 
     it('create new  vf module  update the number of vf modules ', () => {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
-        cy.drawingBoardPressAddButtonByElementName('node-2017-488_ADIOD-vPE 0').get('i').should('have.class', 'fa-plus-circle');
-        cy.drawingBoardPressAddButtonByElementName('node-2017-488_ADIOD-vPE 0').click({force: true});
-        cy.fillVnfPopup().then(() => {
-          cy.drawingBoardPressAddButtonByElementName('node-2017-488_ADIOD-vPE 0').click({force: true});
+        cy.drawingBoardPressAddButtonByElementName('node-2017-488_PASQUALE-vPE 0').get('i').should('have.class', 'fa-plus-circle');
+        cy.drawingBoardPressAddButtonByElementName('node-2017-488_PASQUALE-vPE 0').click({force: true});
+        cy.fillVnfPopup(true).then(() => {
+          cy.drawingBoardPressAddButtonByElementName('node-2017-488_PASQUALE-vPE 0').click({force: true});
           cy.fillVnfPopup().then(() => {
-            cy.drawingBoardPressAddButtonByElementName('node-2017-488_ADIOD-vPE 0').click({force: true});
+            cy.drawingBoardPressAddButtonByElementName('node-2017-488_PASQUALE-vPE 0').click({force: true});
             cy.fillVnfPopup().then(() => {
               cy.drawingBoardNumberOfExistingElementsShouldContains(3);
             });
@@ -55,32 +56,32 @@ describe('Drawing board', function () {
     });
 
     it('duplicate vnf multi - should update number of vf modules on left side and disable duplicate when created max', () => {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
-        cy.drawingBoardPressAddButtonByElementName('node-2017-488_ADIOD-vPE 0').get('i').should('have.class', 'fa-plus-circle')
-          .drawingBoardPressAddButtonByElementName('node-2017-488_ADIOD-vPE 0').click({force: true});
-        cy.fillVnfPopup().then(() => {
-          cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_ADIOD-vPE 0')
+        cy.drawingBoardPressAddButtonByElementName('node-2017-488_PASQUALE-vPE 0').get('i').should('have.class', 'fa-plus-circle')
+          .drawingBoardPressAddButtonByElementName('node-2017-488_PASQUALE-vPE 0').click({force: true});
+        cy.fillVnfPopup(true).then(() => {
+          cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_PASQUALE-vPE 0')
             .drawingBoardTreeClickOnContextMenuOptionByName('Duplicate')
             .get('.quantity-select option').should('have.length', 9)
             .getElementByDataTestsId('duplicate-amount-vfmodules').select('4')
             .getTagElementContainsText('button', 'Duplicate').click({force: true});
-          cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_ADIOD-vPE 0', 2)
+          cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_PASQUALE-vPE 0', 2)
             .drawingBoardTreeClickOnContextMenuOptionByName('Duplicate')
             .get('.quantity-select option').should('have.length', 5)
             .getElementByDataTestsId('duplicate-amount-vfmodules').select('5')
             .getTagElementContainsText('button', 'Duplicate').click({force: true});
-          cy.getElementByDataTestsId('node-2017-488_ADIOD-vPE 0').get("span").should('have.class', 'icon-v ng-star-inserted');
-          cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_ADIOD-vPE 0', 9)
+          cy.getElementByDataTestsId('node-2017-488_PASQUALE-vPE 0').get("span").should('have.class', 'icon-v ng-star-inserted');
+          cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_PASQUALE-vPE 0', 9)
             .get('ul.dropdown-menu li:nth-child(2)').should('have.class', 'disabled');
           // close menu
           cy.get('body').click();
           cy.drawingBoardNumberOfExistingElementsShouldContains(10);
-          cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_ADIOD-vPE 0', 1)
+          cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_PASQUALE-vPE 0', 1)
             .drawingBoardTreeClickOnContextMenuOptionByName('Remove');
           cy.drawingBoardNumberOfExistingElementsShouldContains(9);
-          cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_ADIOD-vPE 0', 3)
+          cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_PASQUALE-vPE 0', 3)
             .get('ul.dropdown-menu li:nth-child(2)').should('not.have.class', 'disabled');
         })
       });
@@ -90,7 +91,7 @@ describe('Drawing board', function () {
       let res = getReduxWithVNFS(true);
       cy.setReduxState(<any>res);
       cy.openIframe('app/ui/#/servicePlanning?serviceModelId=6e59c5de-f052-46fa-aa7e-2fca9d674c44');
-      const vnfNode = 'node-d6557200-ecf2-4641-8094-5393ae3aae60-VF_vMee 0';
+      const vnfNode = 'node-d6557200-ecf2-4641-8094-5393ae3aae60-VF_vGeraldine 0';
       cy.getElementByDataTestsId(vnfNode).should('have.length', 1)
         .drawingBoardTreeOpenContextMenuByElementDataTestId(vnfNode)
         .drawingBoardTreeClickOnContextMenuOptionByName('Duplicate')
@@ -113,8 +114,8 @@ describe('Drawing board', function () {
       let res = getReduxWithVNFS(true);
       cy.setReduxState(<any>res);
       cy.openIframe('app/ui/#/servicePlanning?serviceModelId=6e59c5de-f052-46fa-aa7e-2fca9d674c44');
-      const vnfNode = 'node-d6557200-ecf2-4641-8094-5393ae3aae60-VF_vMee 0';
-      const vfModuleNode = 'node-522159d5-d6e0-4c2a-aa44-5a542a12a830-vf_vmee0..VfVmee..vmme_vlc..module-1';
+      const vnfNode = 'node-d6557200-ecf2-4641-8094-5393ae3aae60-VF_vGeraldine 0';
+      const vfModuleNode = 'node-522159d5-d6e0-4c2a-aa44-5a542a12a830-vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1';
       cy.duplicateVnf(vnfNode, 1);
       //edit the second vnf lineOfBusiness to be ECOMP
       editSecondVnf(vnfNode);
@@ -122,8 +123,8 @@ describe('Drawing board', function () {
       //assert that each vnf has it's own lineOfBusiness
       cy.getReduxState().then((state) => {
         const serviceInstance = state.service.serviceInstance['6e59c5de-f052-46fa-aa7e-2fca9d674c44'];
-        chai.expect(serviceInstance.vnfs['VF_vMee 0'].lineOfBusiness).equal("zzz1");
-        chai.expect(serviceInstance.vnfs['VF_vMee 0:0001'].lineOfBusiness).equal("ONAP");
+        chai.expect(serviceInstance.vnfs['VF_vGeraldine 0'].lineOfBusiness).equal("zzz1");
+        chai.expect(serviceInstance.vnfs['VF_vGeraldine 0:0001'].lineOfBusiness).equal("ONAP");
       });
     });
 
@@ -131,16 +132,16 @@ describe('Drawing board', function () {
       let res = getReduxWith2VNFS();
       cy.setReduxState(<any>res);
       cy.openIframe('app/ui/#/servicePlanning?serviceModelId=f4d84bb4-a416-4b4e-997e-0059973630b9');
-      cy.getElementByDataTestsId('node-ea81d6f7-0861-44a7-b7d5-d173b562c350-2017-488_ADIOD-vPE 0').should('have.length', 2);
+      cy.getElementByDataTestsId('node-ea81d6f7-0861-44a7-b7d5-d173b562c350-2017-488_PASQUALE-vPE 0').should('have.length', 2);
 
-      cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-ea81d6f7-0861-44a7-b7d5-d173b562c350-2017-488_ADIOD-vPE 0', 1)
+      cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-ea81d6f7-0861-44a7-b7d5-d173b562c350-2017-488_PASQUALE-vPE 0', 1)
         .drawingBoardTreeClickOnContextMenuOptionByName('Duplicate')
         .getTagElementContainsText('button', 'Duplicate').click({force: true})
         .get('#drawing-board-tree .toggle-children').should('have.length', 1);
 
-      cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-ea81d6f7-0861-44a7-b7d5-d173b562c350-2017-488_ADIOD-vPE 0', 2)
+      cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-ea81d6f7-0861-44a7-b7d5-d173b562c350-2017-488_PASQUALE-vPE 0', 2)
         .drawingBoardTreeClickOnContextMenuOptionByName('Duplicate')
-        .getElementByDataTestsId('node-ea81d6f7-0861-44a7-b7d5-d173b562c350-2017-488_ADIOD-vPE 0').should('have.length', 3);
+        .getElementByDataTestsId('node-ea81d6f7-0861-44a7-b7d5-d173b562c350-2017-488_PASQUALE-vPE 0').should('have.length', 3);
     });
 
     it('check the instanceParams set to instance ', () => {
@@ -148,14 +149,14 @@ describe('Drawing board', function () {
       let instanceName = "InstanceName";
       cy.setReduxState(<any>res);
       cy.openIframe('app/ui/#/servicePlanning?serviceModelId=f4d84bb4-a416-4b4e-997e-0059973630b9');
-      cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-ea81d6f7-0861-44a7-b7d5-d173b562c350-2017-488_ADIOD-vPE 0', 1)
+      cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-ea81d6f7-0861-44a7-b7d5-d173b562c350-2017-488_PASQUALE-vPE 0', 1)
         .drawingBoardTreeClickOnContextMenuOptionByName('Edit')
         .getElementByDataTestsId('instanceName').type(instanceName)
         .genericFormSubmitForm();
 
       checkDynamicInputs();
 
-      cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-ea81d6f7-0861-44a7-b7d5-d173b562c350-2017-488_ADIOD-vPE 0', 1)
+      cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-ea81d6f7-0861-44a7-b7d5-d173b562c350-2017-488_PASQUALE-vPE 0', 1)
         .drawingBoardTreeClickOnContextMenuOptionByName('Edit');
       cy.getElementByDataTestsId('instanceName').should('have.value', instanceName);
       checkDynamicInputs();
@@ -166,18 +167,18 @@ describe('Drawing board', function () {
       let res = getReduxWith2VNFS();
       cy.setReduxState(<any>res);
       cy.openIframe('app/ui/#/servicePlanning?serviceModelId=f4d84bb4-a416-4b4e-997e-0059973630b9');
-      cy.getElementByDataTestsId('node-ea81d6f7-0861-44a7-b7d5-d173b562c350-2017-488_ADIOD-vPE 0').should('have.length', 2)
-        .drawingBoardTreeOpenContextMenuByElementDataTestId('node-040e591e-5d30-4e0d-850f-7266e5a8e013-2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0')
+      cy.getElementByDataTestsId('node-ea81d6f7-0861-44a7-b7d5-d173b562c350-2017-488_PASQUALE-vPE 0').should('have.length', 2)
+        .drawingBoardTreeOpenContextMenuByElementDataTestId('node-040e591e-5d30-4e0d-850f-7266e5a8e013-2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0')
         .drawingBoardTreeClickOnContextMenuOptionByName('Remove')
-        .getElementByDataTestsId('node-ea81d6f7-0861-44a7-b7d5-d173b562c350-2017-488_ADIOD-vPE 0').should('have.length', 2);
+        .getElementByDataTestsId('node-ea81d6f7-0861-44a7-b7d5-d173b562c350-2017-488_PASQUALE-vPE 0').should('have.length', 2);
     });
 
     it('duplicate unique vnf ', () => {
       let res = getReduxWith2VNFS();
       cy.setReduxState(<any>res);
       cy.openIframe('app/ui/#/servicePlanning?serviceModelId=f4d84bb4-a416-4b4e-997e-0059973630b9');
-      cy.getElementByDataTestsId('node-ea81d6f7-0861-44a7-b7d5-d173b562c350-2017-488_ADIOD-vPE 0').should('have.length', 2)
-        .drawingBoardTreeOpenContextMenuByElementDataTestId('node-ea81d6f7-0861-44a7-b7d5-d173b562c350-2017-488_ADIOD-vPE 0', 1)
+      cy.getElementByDataTestsId('node-ea81d6f7-0861-44a7-b7d5-d173b562c350-2017-488_PASQUALE-vPE 0').should('have.length', 2)
+        .drawingBoardTreeOpenContextMenuByElementDataTestId('node-ea81d6f7-0861-44a7-b7d5-d173b562c350-2017-488_PASQUALE-vPE 0', 1)
         .drawingBoardTreeClickOnContextMenuOptionByName('Duplicate')
         .getTagElementContainsText('button', 'Duplicate').click({force: true})
         .get('#drawing-board-tree .toggle-children').should('have.length', 1);
@@ -187,16 +188,16 @@ describe('Drawing board', function () {
       let res = getReduxWithVNFS(false);
       cy.setTestApiParamToGR();
 
-      res.service.serviceHierarchy['6e59c5de-f052-46fa-aa7e-2fca9d674c44'].service.instantiationType = "A-La-Carte";
+      res.service.serviceHierarchy['6e59c5de-f052-46fa-aa7e-2fca9d674c44'].service.vidNotions.instantiationType = "ALaCarte";
 
       //remove VfModules since they are not fit to a-la-carte scenario
-      delete res.service.serviceHierarchy['6e59c5de-f052-46fa-aa7e-2fca9d674c44'].vnfs['VF_vMee 0'].vfModules;
-      delete res.service.serviceInstance['6e59c5de-f052-46fa-aa7e-2fca9d674c44'].vnfs['VF_vMee 0'].vfModules;
+      delete res.service.serviceHierarchy['6e59c5de-f052-46fa-aa7e-2fca9d674c44'].vnfs['VF_vGeraldine 0'].vfModules;
+      delete res.service.serviceInstance['6e59c5de-f052-46fa-aa7e-2fca9d674c44'].vnfs['VF_vGeraldine 0'].vfModules;
 
-      res.service.serviceInstance['6e59c5de-f052-46fa-aa7e-2fca9d674c44'].vnfs['VF_vMee 0'].instanceName = "VFvMee00001";
+      res.service.serviceInstance['6e59c5de-f052-46fa-aa7e-2fca9d674c44'].vnfs['VF_vGeraldine 0'].instanceName = "VFvGeraldine00001";
       cy.setReduxState(<any>res);
       cy.openIframe('app/ui/#/servicePlanning?serviceModelId=6e59c5de-f052-46fa-aa7e-2fca9d674c44');
-      const vnfNode = 'node-d6557200-ecf2-4641-8094-5393ae3aae60-VF_vMee 0';
+      const vnfNode = 'node-d6557200-ecf2-4641-8094-5393ae3aae60-VF_vGeraldine 0';
       cy.duplicateVnf(vnfNode, 1);
 
       //edit the second vnf lineOfBusiness to be ECOMP
@@ -209,8 +210,8 @@ describe('Drawing board', function () {
       cy.getReduxState().then((state) => {
         let serviceInstance = state.service.serviceInstance['6e59c5de-f052-46fa-aa7e-2fca9d674c44'];
         //assert that each vnf has it's own lineOfBusiness
-        chai.expect(serviceInstance.vnfs['VF_vMee 0'].lineOfBusiness).equal("zzz1");
-        chai.expect(serviceInstance.vnfs['VF_vMee 0:0001'].lineOfBusiness).equal("ONAP");
+        chai.expect(serviceInstance.vnfs['VF_vGeraldine 0'].lineOfBusiness).equal("zzz1");
+        chai.expect(serviceInstance.vnfs['VF_vGeraldine 0:0001'].lineOfBusiness).equal("ONAP");
         cy.readFile('../vid-automation/src/test/resources/a-la-carte/redux-multiple-vnf-network.json').then((file) => {
           const vnfs = file.vnfs;
           var vnfNames = Object.keys(vnfs);
@@ -219,13 +220,13 @@ describe('Drawing board', function () {
             chai.expect(serviceInstance.vnfs).to.have.any.keys(vnfNames[i]);
           }
 
-          chai.expect(serviceInstance.vnfs['VF_vMee 0'].lineOfBusiness).equal(vnfs['VF_vMee 0'].lineOfBusiness);
-          chai.expect(serviceInstance.vnfs['VF_vMee 0'].instanceName).equal(vnfs['VF_vMee 0'].instanceName);
+          chai.expect(serviceInstance.vnfs['VF_vGeraldine 0'].lineOfBusiness).equal(vnfs['VF_vGeraldine 0'].lineOfBusiness);
+          chai.expect(serviceInstance.vnfs['VF_vGeraldine 0'].instanceName).equal(vnfs['VF_vGeraldine 0'].instanceName);
 
-          vnfs['VF_vMee 0:0001'].trackById = serviceInstance.vnfs['VF_vMee 0:0001'].trackById;
+          vnfs['VF_vGeraldine 0:0001'].trackById = serviceInstance.vnfs['VF_vGeraldine 0:0001'].trackById;
 
-          cy.deepCompare(serviceInstance.vnfs['VF_vMee 0:0001'], vnfs['VF_vMee 0:0001']);
-          cy.deepCompare(serviceInstance.vnfs['VF_vMee 0'], vnfs['VF_vMee 0']);
+          cy.deepCompare(serviceInstance.vnfs['VF_vGeraldine 0:0001'], vnfs['VF_vGeraldine 0:0001']);
+          cy.deepCompare(serviceInstance.vnfs['VF_vGeraldine 0'], vnfs['VF_vGeraldine 0']);
 
           const network = serviceInstance.networks['ExtVL 0'];
 
@@ -242,8 +243,8 @@ describe('Drawing board', function () {
       let res = getReduxWithVFModuleMissingData();
       cy.setReduxState(<any>res);
       cy.openIframe('app/ui/#/servicePlanning?serviceModelId=f4d84bb4-a416-4b4e-997e-0059973630b9');
-      cy.getElementByDataTestsId('node-040e591e-5d30-4e0d-850f-7266e5a8e013-2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0-alert-icon').should('have.class', 'icon-alert')
-        .drawingBoardTreeOpenContextMenuByElementDataTestId('node-040e591e-5d30-4e0d-850f-7266e5a8e013-2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0')
+      cy.getElementByDataTestsId('node-040e591e-5d30-4e0d-850f-7266e5a8e013-2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0-alert-icon').should('have.class', 'icon-alert')
+        .drawingBoardTreeOpenContextMenuByElementDataTestId('node-040e591e-5d30-4e0d-850f-7266e5a8e013-2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0')
         .drawingBoardTreeClickOnContextMenuOptionByName('Remove')
         .getElementByDataTestsId('deployBtn').should('not.have.attr', 'disabled');
 
@@ -255,8 +256,8 @@ describe('Drawing board', function () {
       cy.setReduxState(<any>res);
       cy.openIframe('app/ui/#/servicePlanning?serviceModelId=f4d84bb4-a416-4b4e-997e-0059973630b9');
 
-      cy.getElementByDataTestsId('node-ea81d6f7-0861-44a7-b7d5-d173b562c350-2017-488_ADIOD-vPE 0-alert-icon').should('have.class', 'icon-alert')
-        .drawingBoardTreeOpenContextMenuByElementDataTestId('node-ea81d6f7-0861-44a7-b7d5-d173b562c350-2017-488_ADIOD-vPE 0', 1)
+      cy.getElementByDataTestsId('node-ea81d6f7-0861-44a7-b7d5-d173b562c350-2017-488_PASQUALE-vPE 0-alert-icon').should('have.class', 'icon-alert')
+        .drawingBoardTreeOpenContextMenuByElementDataTestId('node-ea81d6f7-0861-44a7-b7d5-d173b562c350-2017-488_PASQUALE-vPE 0', 1)
         .drawingBoardTreeClickOnContextMenuOptionByName('Remove')
         .getTagElementContainsText('button', 'Remove VNF').click({force: true})
         .getElementByDataTestsId('deployBtn').should('not.have.attr', 'disabled');
@@ -264,7 +265,7 @@ describe('Drawing board', function () {
     });
 
     xit('should display service model name', () => {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
         cy.get('#service-model-name').contains('action-data');
@@ -272,7 +273,8 @@ describe('Drawing board', function () {
     });
 
     it('should display icon and message if no vnf and vnfModules', () => {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
+        res.global.drawingBoardStatus = "CREATE";
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
         cy.getElementByDataTestsId("text-title").contains("Please add objects (VNFs, network, modules etc.)");
@@ -286,92 +288,93 @@ describe('Drawing board', function () {
     });
 
     it('should show alert on remove vnf with modules', () => {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json').then((res) => {
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
-        cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_ADIOD-vPE 0');
+        cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_PASQUALE-vPE 0');
         // assert vfModules are enabled
-        cy.get('.tree-node-disabled div[data-tests-id="node-2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1"]')
+        cy.get('.tree-node-disabled div[data-tests-id="node-2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1"]')
           .should('not.be.visible');
         cy.drawingBoardTreeClickOnContextMenuOptionByName('Remove');
 
         cy.get('.title').contains('Remove VNF');
         cy.get('.sdc-button').contains('Remove VNF').click();
         // assert vfModules are disabled after remove parent vnf
-        cy.get('.tree-node-disabled div[data-tests-id="node-2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1"]')
+        cy.get('.tree-node-disabled div[data-tests-id="node-2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1"]')
           .should('be.visible');
         cy.updateServiceShouldNotOverrideChild();
       });
     });
 
     it('should not show alert on remove vnf without modules', () => {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json').then((res) => {
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
-        cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-0903e1c0-8e03-4936-b5c2-260653b96413-2017-388_ADIOD-vPE 1');
+        cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-0903e1c0-8e03-4936-b5c2-260653b96413-2017-388_PASQUALE-vPE 1');
         cy.drawingBoardTreeClickOnContextMenuOptionByName('Remove')
       });
     });
 
     it('should show <Automatically Assigned> if ecomp is true', () => {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
-        cy.drawingBoardPressAddButtonByElementName('node-2017-388_ADIOD-vPE 0').click({force: true});
+        cy.drawingBoardPressAddButtonByElementName('node-2017-388_PASQUALE-vPE 0').click({force: true});
 
-        cy.selectDropdownOptionByText('productFamily', 'DHV');
+        cy.selectDropdownOptionByText('productFamily', 'ERICA');
         cy.selectDropdownOptionByText('lcpRegion', 'hvf6');
         cy.selectDropdownOptionByText('tenant', 'AIN Web Tool-15-D-testalexandria');
         cy.selectDropdownOptionByText('lineOfBusiness', 'ONAP');
-        cy.selectDropdownOptionByText('platform', 'platform');
+        cy.selectPlatformValue('platform');
         cy.genericFormSubmitForm();
 
-        cy.getElementByDataTestsId('node-afacccf6-397d-45d6-b5ae-94c39734b168-2017-388_ADIOD-vPE 0').contains('<Automatically Assigned>');
+        cy.getElementByDataTestsId('node-afacccf6-397d-45d6-b5ae-94c39734b168-2017-388_PASQUALE-vPE 0').contains('<Automatically Assigned>');
         cy.updateServiceShouldNotOverrideChild();
       });
     });
 
     it('should show model name if ecomp is false', () => {
-      const vnfModelKey: string = '2017-488_ADIOD-vPE 0',
-        vnfModelName: string = '2017-488_ADIOD-vPE';
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
+      const vnfModelKey: string = '2017-488_PASQUALE-vPE 0',
+        vnfModelName: string = '2017-488_PASQUALE-vPE';
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
         res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].vnfs[vnfModelKey].properties.ecomp_generated_naming = 'false';
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
-        cy.drawingBoardPressAddButtonByElementName('node-2017-488_ADIOD-vPE 0').click({force: true});
+        cy.drawingBoardPressAddButtonByElementName('node-2017-488_PASQUALE-vPE 0').click({force: true});
 
-        cy.selectDropdownOptionByText('productFamily', 'DHV');
+        cy.selectDropdownOptionByText('productFamily', 'ERICA');
         cy.selectDropdownOptionByText('lcpRegion', 'hvf6');
         cy.selectDropdownOptionByText('tenant', 'AIN Web Tool-15-D-testalexandria');
-        cy.selectDropdownOptionByText('lineOfBusiness', 'ONAP');
-        cy.selectDropdownOptionByText('platform', 'platform');
+        cy.selectDropdownOptionByText('lineOfBusiness', 'ONAP')
+        cy.selectPlatformValue('platform');
+
         cy.genericFormSubmitForm();
 
-        cy.getElementByDataTestsId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_ADIOD-vPE 0').contains(vnfModelName);
+        cy.getElementByDataTestsId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_PASQUALE-vPE 0').contains(vnfModelName);
       });
     });
 
     describe('add instance open a popup', () => {
 
       it('should add vfModule with popup with empty required instance name', () => {
-        cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json').then((res) => {
-          res.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-488_ADIOD-vPE 0"].properties.ecomp_generated_naming = "false";
-          res.service.serviceInstance["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-488_ADIOD-vPE 0"].vfModules = [];
+        cy.readFile('cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json').then((res) => {
+          res.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-488_PASQUALE-vPE 0"].properties.ecomp_generated_naming = "false";
+          res.service.serviceInstance["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-488_PASQUALE-vPE 0"].vfModules = [];
           cy.setReduxState(<any>res);
           cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
           cy.get('available-models-tree tree-node-expander').eq(2).click();
-          cy.drawingBoardPressAddButtonByElementName('node-2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1').click({force: true});
+          cy.drawingBoardPressAddButtonByElementName('node-2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1').click({force: true});
         });
       });
 
       it('should add vfModule with popup if empty required dynamic input', () => {
-        cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json').then((res) => {
-          res.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-488_ADIOD-vPE 0"].vfModules["2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1"].inputs["adiodvpe0_bandwidth"].default = '';
-          res.service.serviceInstance["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-488_ADIOD-vPE 0"].vfModules = [];
+        cy.readFile('cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json').then((res) => {
+          res.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-488_PASQUALE-vPE 0"].vfModules["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1"].inputs["pasqualevpe0_bandwidth"].default = '';
+          res.service.serviceInstance["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-488_PASQUALE-vPE 0"].vfModules = [];
           cy.setReduxState(<any>res);
           cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
           cy.get('available-models-tree tree-node-expander').eq(2).click();
-          cy.drawingBoardPressAddButtonByElementName('node-2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1').click({force: true});
+          cy.drawingBoardPressAddButtonByElementName('node-2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1').click({force: true});
           cy.get('#instance-popup').and('be.visible');
         });
       });
@@ -381,10 +384,10 @@ describe('Drawing board', function () {
 
     describe('show warning and disable deploy button on vnf missing data', () => {
       it('show warning on vnf, and disable button, remove warning and enable button after edit', () => {
-        cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json').then((res) => {
+        cy.readFile('cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json').then((res) => {
           res.service.serviceInstance['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].existingVNFCounterMap['0903e1c0-8e03-4936-b5c2-260653b96413'] = 1;
           res.service.serviceInstance["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].validationCounter = 1;
-          res.service.serviceInstance["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-388_ADIOD-vPE 1"] = {
+          res.service.serviceInstance["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-388_PASQUALE-vPE 1"] = {
             "rollbackOnFailure": "false",
             "vfModules": {},
             "productFamilyId": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e",
@@ -397,22 +400,22 @@ describe('Drawing board', function () {
               "modelType": "service",
               "modelInvariantId": "00beb8f9-6d39-452f-816d-c709b9cbb87d",
               "modelVersionId": "0903e1c0-8e03-4936-b5c2-260653b96413",
-              "modelName": "2017-388_ADIOD-vPE",
+              "modelName": "2017-388_PASQUALE-vPE",
               "modelVersion": "1.0",
               "modelCustomizationId": "280dec31-f16d-488b-9668-4aae55d6648a",
-              "modelCustomizationName": "2017-388_ADIOD-vPE 1"
+              "modelCustomizationName": "2017-388_PASQUALE-vPE 1"
             }
           };
           cy.setReduxState(<any>res);
           cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
-          cy.getElementByDataTestsId("node-0903e1c0-8e03-4936-b5c2-260653b96413-2017-388_ADIOD-vPE 1-alert-icon").and('be.visible');
+          cy.getElementByDataTestsId("node-0903e1c0-8e03-4936-b5c2-260653b96413-2017-388_PASQUALE-vPE 1-alert-icon").and('be.visible');
           cy.isElementContainsAttr('deployBtn', 'disabled');
-          cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-0903e1c0-8e03-4936-b5c2-260653b96413-2017-388_ADIOD-vPE 1')
+          cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-0903e1c0-8e03-4936-b5c2-260653b96413-2017-388_PASQUALE-vPE 1')
             .drawingBoardTreeClickOnContextMenuOptionByName('Edit')
           cy.selectDropdownOptionByText('lcpRegion', 'hvf6');
           cy.selectDropdownOptionByText('tenant', 'AIN Web Tool-15-D-testalexandria');
           cy.genericFormSubmitForm();
-          cy.getElementByDataTestsId("node-0903e1c0-8e03-4936-b5c2-260653b96413-2017-388_ADIOD-vPE 1-alert-icon").should('not.be.visible');
+          cy.getElementByDataTestsId("node-0903e1c0-8e03-4936-b5c2-260653b96413-2017-388_PASQUALE-vPE 1-alert-icon").should('not.be.visible');
           cy.getElementByDataTestsId('deployBtn').should('not.have.attr', 'disabled');
           cy.updateServiceShouldNotOverrideChild();
         });
@@ -422,17 +425,17 @@ describe('Drawing board', function () {
     describe('vnf should automatically displayed or not according its min value and its vf-modules min value', () => {
 
       it('vnf with min_instances value > 0 without required VF modules, should be created automatically without children', () => {
-        cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/basicRedux.json').then((res) => {
-          res.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-488_ADIOD-vPE 0"].properties['min_instances'] = 1;
-          res.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-488_ADIOD-vPE 0"].vfModules["2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0"].properties['initialCount'] = 0;
-          res.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vfModules["2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0"].properties['initialCount'] = 0;
+        cy.readFile('cypress/support/jsonBuilders/mocks/jsons/basicRedux.json').then((res) => {
+          res.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-488_PASQUALE-vPE 0"].properties['min_instances'] = 1;
+          res.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-488_PASQUALE-vPE 0"].vfModules["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0"].properties['initialCount'] = 0;
+          res.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vfModules["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0"].properties['initialCount'] = 0;
           cy.setReduxState(<any>res);
           cy.fillServicePopup().then(() => {
             cy.visit("welcome.htm").then(() => {
               cy.visit('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd').then(() => {
-                cy.getElementByDataTestsId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_ADIOD-vPE 0').should('exist');
-                cy.getElementByDataTestsId('node-25284168-24bb-4698-8cb4-3f509146eca5-2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1').should('not.exist');
-                cy.getElementByDataTestsId('node-f8360508-3f17-4414-a2ed-6bc71161e8db-2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0').should('not.exist');
+                cy.getElementByDataTestsId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_PASQUALE-vPE 0').should('exist');
+                cy.getElementByDataTestsId('node-25284168-24bb-4698-8cb4-3f509146eca5-2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1').should('not.exist');
+                cy.getElementByDataTestsId('node-f8360508-3f17-4414-a2ed-6bc71161e8db-2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0').should('not.exist');
               })
             })
           });
@@ -441,14 +444,14 @@ describe('Drawing board', function () {
       });
 
       it('vnf with min_instances value > 1 with required VF modules, should be created automatically with children only once', () => {
-        cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/basicRedux.json').then((res) => {
-          res.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-488_ADIOD-vPE 0"].properties['min_instances'] = 3;
+        cy.readFile('cypress/support/jsonBuilders/mocks/jsons/basicRedux.json').then((res) => {
+          res.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-488_PASQUALE-vPE 0"].properties['min_instances'] = 3;
           cy.setReduxState(<any>res);
           cy.fillServicePopup().then(() => {
             cy.visit("welcome.htm").then(() => {
               cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
-              cy.getElementByDataTestsId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_ADIOD-vPE 0').should('exist');
-              cy.getElementByDataTestsId('node-f8360508-3f17-4414-a2ed-6bc71161e8db-2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0').should('have.length', 1);
+              cy.getElementByDataTestsId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_PASQUALE-vPE 0').should('exist');
+              cy.getElementByDataTestsId('node-f8360508-3f17-4414-a2ed-6bc71161e8db-2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0').should('have.length', 1);
 
             });
           });
@@ -457,14 +460,14 @@ describe('Drawing board', function () {
 
 
       it('vnf with min_instances value = 0 with required VF modules should be created automatically with its children', () => {
-        cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/basicRedux.json').then((res) => {
-          res.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-488_ADIOD-vPE 0"].properties['min_instances'] = 0;
+        cy.readFile('cypress/support/jsonBuilders/mocks/jsons/basicRedux.json').then((res) => {
+          res.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-488_PASQUALE-vPE 0"].properties['min_instances'] = 0;
           cy.setReduxState(<any>res);
           cy.fillServicePopup().then(() => {
             cy.visit("welcome.htm").then(() => {
               cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
-              cy.getElementByDataTestsId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_ADIOD-vPE 0').should('exist');
-              cy.getElementByDataTestsId('node-f8360508-3f17-4414-a2ed-6bc71161e8db-2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0').should('exist');
+              cy.getElementByDataTestsId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_PASQUALE-vPE 0').should('exist');
+              cy.getElementByDataTestsId('node-f8360508-3f17-4414-a2ed-6bc71161e8db-2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0').should('exist');
               cy.updateServiceShouldNotOverrideChild();
             });
           });
@@ -474,12 +477,12 @@ describe('Drawing board', function () {
 
 
       it('vnf without min_instances and without required VF modules, should not exist automatically in right side', () => {
-        cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/basicRedux.json').then((res) => {
+        cy.readFile('cypress/support/jsonBuilders/mocks/jsons/basicRedux.json').then((res) => {
           cy.setReduxState(<any>res);
           cy.fillServicePopup().then(() => {
             cy.visit("welcome.htm").then(() => {
               cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
-              cy.getElementByDataTestsId('node-afacccf6-397d-45d6-b5ae-94c39734b168-2017-388_ADIOD-vPE 0').should('not.exist');
+              cy.getElementByDataTestsId('node-afacccf6-397d-45d6-b5ae-94c39734b168-2017-388_PASQUALE-vPE 0').should('not.exist');
             });
           });
         });
@@ -493,7 +496,7 @@ describe('Drawing board', function () {
       let instanceName = 'instanceName';
       cy.setReduxState(<any>res);
       cy.openIframe('app/ui/#/servicePlanning?serviceModelId=6e59c5de-f052-46fa-aa7e-2fca9d674c44');
-      const vfModuleNode = 'node-522159d5-d6e0-4c2a-aa44-5a542a12a830-vf_vmee0..VfVmee..vmme_vlc..module-1';
+      const vfModuleNode = 'node-522159d5-d6e0-4c2a-aa44-5a542a12a830-vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1';
       assertEditvfModuleShowFile(vfModuleNode, "sample.json");
       cy.getElementByDataTestsId('remove-uploaded-file').click({force: true});
       cy.getElementByDataTestsId('form-set').should('not.have.attr', 'disabled');
@@ -501,13 +504,13 @@ describe('Drawing board', function () {
       cy.genericFormSubmitForm();
       cy.getReduxState().then((state) => {
         const serviceInstance = state.service.serviceInstance['6e59c5de-f052-46fa-aa7e-2fca9d674c44'];
-        const vfModuleInstance = serviceInstance.vnfs['VF_vMee 0'].vfModules['vf_vmee0..VfVmee..vmme_vlc..module-1']['vf_vmee0..VfVmee..vmme_vlc..module-1dcudx'];
+        const vfModuleInstance = serviceInstance.vnfs['VF_vGeraldine 0'].vfModules['vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1']['vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1dcudx'];
         chai.expect(vfModuleInstance.supplementaryFile_hidden).to.be.null;
         chai.expect(vfModuleInstance.supplementaryFile_hidden_content).to.be.null;
         chai.expect(vfModuleInstance.supplementaryFileContent).to.be.undefined;
         chai.expect(vfModuleInstance.supplementaryFileName).to.be.undefined;
       });
-      cy.getElementByDataTestsId('node-d6557200-ecf2-4641-8094-5393ae3aae60-VF_vMee 0').click();
+      cy.getElementByDataTestsId('node-d6557200-ecf2-4641-8094-5393ae3aae60-VF_vGeraldine 0').click();
       assertEditvfModuleShowFile(vfModuleNode, "Choose file");
       cy.getElementByDataTestsId('instanceName').should('have.value', instanceName);
     });
@@ -515,6 +518,8 @@ describe('Drawing board', function () {
 
   describe('component info', () => {
 
+    var jsonBuilderAndMock: JsonBuilder<ServiceModel> = new JsonBuilder<ServiceModel>();
+
     const longText = 'Im a very long text for verify wrapping so please dont make me shorter';
 
     function testIfComponentInfoShown(flagState:boolean) {
@@ -540,22 +545,21 @@ describe('Drawing board', function () {
       testIfComponentInfoShown(true);
 
       let labelsAndValues = [
-        ['Model Version', '1.0'],
-        ['Subscriber Name', 'SILVIA ROBBINS'],
-        ['Service Type', 'TYLER SILVIA'],
-        ['Service Role', longText]
+        ['Model version', '1.0'],
+        ['Subscriber name', 'SILVIA ROBBINS'],
+        ['Service type', 'TYLER SILVIA'],
+        ['Service role', longText]
       ];
       const expectedTitle = 'Service Instance INFO';
       cy.assertComponentInfoTitleLabelsAndValues(expectedTitle, labelsAndValues);
-      cy.getElementByDataTestsId('model-item-value-Service Role').should('have.css', 'height', '32px'); //assert that long text is wrap
+      cy.getElementByDataTestsId('model-item-value-Service role').should('have.css', 'height', '32px'); //assert that long text is wrap
     });
 
-    it('component info is not shown when feature flag is false', () => {
+  it('component info is not shown when feature flag is false', () => {
       testIfComponentInfoShown(false);
     });
   });
 
-
   function addNetworkFromModel(instanceName: string) {
     return cy.get('drawing-board-tree').find('tree-node-content').then((elemets) => {
       cy.get('drawing-board-tree tree-node-content').should('have.have.length', elemets.length);
@@ -573,20 +577,14 @@ describe('Drawing board', function () {
         "name": null,
         "flags": {
           "FLAG_SHOW_ASSIGNMENTS": true,
-          "FLAG_UNASSIGN_SERVICE": true,
           "FLAG_SHOW_VERIFY_SERVICE": false,
-          "FLAG_COLLECTION_RESOURCE_SUPPORT": true,
-          "FLAG_ASYNC_INSTANTIATION": true,
-          "EMPTY_DRAWING_BOARD_TEST": false,
           "FLAG_ADD_MSO_TESTAPI_FIELD": true,
           "FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
           "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
-          "FLAG_DUPLICATE_VNF": true,
           "FLAG_SERVICE_MODEL_CACHE": true,
-          "CREATE_INSTANCE_TEST": false,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": false,
-          "FLAG_ASYNC_JOBS": true,
-          "FLAG_1906_COMPONENT_INFO" : false
+          "FLAG_1906_COMPONENT_INFO" : false,
+          "FLAG_2002_VNF_PLATFORM_MULTI_SELECT" : false,
+          "FLAG_2002_UNLIMITED_MAX" : true
         },
         "type": "[FLAGS] Update"
       },
@@ -605,14 +603,17 @@ describe('Drawing board', function () {
               "description": "ComplexService",
               "serviceEcompNaming": "true",
               "instantiationType": "Macro",
+              "vidNotions": {
+                "instantiationType": "Macro"
+              },
               "inputs": {}
             },
             "vnfs": {
-              "VF_vMee 0": {
+              "VF_vGeraldine 0": {
                 "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
                 "invariantUuid": "4160458e-f648-4b30-a176-43881ffffe9e",
-                "description": "VSP_vMee",
-                "name": "VF_vMee",
+                "description": "VSP_vGeraldine",
+                "name": "VF_vGeraldine",
                 "version": "2.0",
                 "customizationUuid": "91415b44-753d-494c-926a-456a9172bbb9",
                 "inputs": {},
@@ -781,74 +782,74 @@ describe('Drawing board', function () {
                   "sctp-b-egress-dst_end_port": "65535.0"
                 },
                 "type": "VF",
-                "modelCustomizationName": "VF_vMee 0",
+                "modelCustomizationName": "VF_vGeraldine 0",
                 "vfModules": {
-                  "vf_vmee0..VfVmee..vmme_vlc..module-1": {
+                  "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
                     "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
                     "invariantUuid": "98a7c88b-b577-476a-90e4-e25a5871e02b",
                     "customizationUuid": "55b1be94-671a-403e-a26c-667e9c47d091",
                     "description": null,
-                    "name": "VfVmee..vmme_vlc..module-1",
+                    "name": "VfVgeraldine..vflorence_vlc..module-1",
                     "version": "2",
-                    "modelCustomizationName": "VfVmee..vmme_vlc..module-1",
+                    "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
                     "properties": {
                       "minCountInstances": 0,
                       "maxCountInstances": null,
                       "initialCount": 0,
-                      "vfModuleLabel": "vmme_vlc"
+                      "vfModuleLabel": "vflorence_vlc"
                     },
                     "inputs": {},
                     "volumeGroupAllowed": false
                   },
-                  "vf_vmee0..VfVmee..vmme_gpb..module-2": {
+                  "vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2": {
                     "uuid": "41708296-e443-4c71-953f-d9a010f059e1",
                     "invariantUuid": "1cca90b8-3490-495e-87da-3f3e4c57d5b9",
                     "customizationUuid": "6add59e0-7fe1-4bc4-af48-f8812422ae7c",
                     "description": null,
-                    "name": "VfVmee..vmme_gpb..module-2",
+                    "name": "VfVgeraldine..vflorence_gpb..module-2",
                     "version": "2",
-                    "modelCustomizationName": "VfVmee..vmme_gpb..module-2",
+                    "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
                     "properties": {
                       "minCountInstances": 0,
                       "maxCountInstances": null,
                       "initialCount": 0,
-                      "vfModuleLabel": "vmme_gpb"
+                      "vfModuleLabel": "vflorence_gpb"
                     },
                     "inputs": {},
                     "volumeGroupAllowed": false
                   },
-                  "vf_vmee0..VfVmee..base_vmme..module-0": {
+                  "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
                     "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
                     "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
                     "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
                     "description": null,
-                    "name": "VfVmee..base_vmme..module-0",
+                    "name": "VfVgeraldine..base_vflorence..module-0",
                     "version": "2",
-                    "modelCustomizationName": "VfVmee..base_vmme..module-0",
+                    "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
                     "properties": {
                       "minCountInstances": 1,
                       "maxCountInstances": 1,
                       "initialCount": 1,
-                      "vfModuleLabel": "base_vmme"
+                      "vfModuleLabel": "base_vflorence"
                     },
                     "inputs": {},
                     "volumeGroupAllowed": true
                   }
                 },
                 "volumeGroups": {
-                  "vf_vmee0..VfVmee..base_vmme..module-0": {
+                  "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
                     "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
                     "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
                     "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
                     "description": null,
-                    "name": "VfVmee..base_vmme..module-0",
+                    "name": "VfVgeraldine..base_vflorence..module-0",
                     "version": "2",
-                    "modelCustomizationName": "VfVmee..base_vmme..module-0",
+                    "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
                     "properties": {
                       "minCountInstances": 1,
                       "maxCountInstances": 1,
                       "initialCount": 1,
-                      "vfModuleLabel": "base_vmme"
+                      "vfModuleLabel": "base_vflorence"
                     },
                     "inputs": {}
                   }
@@ -876,7 +877,7 @@ describe('Drawing board', function () {
                 "modelCustomizationName": "ExtVL 0"
               }
             },
-            "collectionResource": {},
+            "collectionResources": {},
             "configurations": {
               "Port Mirroring Configuration By Policy 0": {
                 "uuid": "b4398538-e89d-4f13-b33d-ca323434ba50",
@@ -897,72 +898,72 @@ describe('Drawing board', function () {
             },
             "serviceProxies": {},
             "vfModules": {
-              "vf_vmee0..VfVmee..vmme_vlc..module-1": {
+              "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
                 "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
                 "invariantUuid": "98a7c88b-b577-476a-90e4-e25a5871e02b",
                 "customizationUuid": "55b1be94-671a-403e-a26c-667e9c47d091",
                 "description": null,
-                "name": "VfVmee..vmme_vlc..module-1",
+                "name": "VfVgeraldine..vflorence_vlc..module-1",
                 "version": "2",
-                "modelCustomizationName": "VfVmee..vmme_vlc..module-1",
+                "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
                 "properties": {
                   "minCountInstances": 0,
                   "maxCountInstances": null,
                   "initialCount": 0,
-                  "vfModuleLabel": "vmme_vlc"
+                  "vfModuleLabel": "vflorence_vlc"
                 },
                 "inputs": {},
                 "volumeGroupAllowed": false
               },
-              "vf_vmee0..VfVmee..vmme_gpb..module-2": {
+              "vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2": {
                 "uuid": "41708296-e443-4c71-953f-d9a010f059e1",
                 "invariantUuid": "1cca90b8-3490-495e-87da-3f3e4c57d5b9",
                 "customizationUuid": "6add59e0-7fe1-4bc4-af48-f8812422ae7c",
                 "description": null,
-                "name": "VfVmee..vmme_gpb..module-2",
+                "name": "VfVgeraldine..vflorence_gpb..module-2",
                 "version": "2",
-                "modelCustomizationName": "VfVmee..vmme_gpb..module-2",
+                "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
                 "properties": {
                   "minCountInstances": 0,
                   "maxCountInstances": null,
                   "initialCount": 0,
-                  "vfModuleLabel": "vmme_gpb"
+                  "vfModuleLabel": "vflorence_gpb"
                 },
                 "inputs": {},
                 "volumeGroupAllowed": false
               },
-              "vf_vmee0..VfVmee..base_vmme..module-0": {
+              "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
                 "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
                 "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
                 "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
                 "description": null,
-                "name": "VfVmee..base_vmme..module-0",
+                "name": "VfVgeraldine..base_vflorence..module-0",
                 "version": "2",
-                "modelCustomizationName": "VfVmee..base_vmme..module-0",
+                "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
                 "properties": {
                   "minCountInstances": 1,
                   "maxCountInstances": 1,
                   "initialCount": 1,
-                  "vfModuleLabel": "base_vmme"
+                  "vfModuleLabel": "base_vflorence"
                 },
                 "inputs": {},
                 "volumeGroupAllowed": true
               }
             },
             "volumeGroups": {
-              "vf_vmee0..VfVmee..base_vmme..module-0": {
+              "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
                 "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
                 "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
                 "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
                 "description": null,
-                "name": "VfVmee..base_vmme..module-0",
+                "name": "VfVgeraldine..base_vflorence..module-0",
                 "version": "2",
-                "modelCustomizationName": "VfVmee..base_vmme..module-0",
+                "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
                 "properties": {
                   "minCountInstances": 1,
                   "maxCountInstances": 1,
                   "initialCount": 1,
-                  "vfModuleLabel": "base_vmme"
+                  "vfModuleLabel": "base_vflorence"
                 },
                 "inputs": {}
               }
@@ -973,17 +974,20 @@ describe('Drawing board', function () {
             "service": {
               "uuid": "f4d84bb4-a416-4b4e-997e-0059973630b9",
               "invariantUuid": "598e3f9e-3244-4d8f-a8e0-0e5d7a29eda9",
-              "name": "ADIOD vMX vPE_BV Service 488",
+              "name": "PASQUALE vMX vPE_BV Service 488",
               "version": "1.0",
               "toscaModelURL": null,
               "category": "Network L1-3",
               "serviceType": "",
               "serviceRole": "",
-              "description": "ADIOD vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM",
+              "description": "PASQUALE vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM",
               "serviceEcompNaming": "true",
               "instantiationType": "Macro",
+              "vidNotions": {
+                "instantiationType": "Macro"
+              },
               "inputs": {
-                "2017488_adiodvpe0_ASN": {
+                "2017488_pasqualevpe0_ASN": {
                   "type": "string",
                   "description": "AV/PE",
                   "entry_schema": null,
@@ -995,11 +999,11 @@ describe('Drawing board', function () {
               }
             },
             "vnfs": {
-              "2017-488_ADIOD-vPE 0": {
+              "2017-488_PASQUALE-vPE 0": {
                 "uuid": "ea81d6f7-0861-44a7-b7d5-d173b562c350",
                 "invariantUuid": "5be7e99e-8eb2-4d97-be63-8081ff3cd10e",
-                "description": "Name ADIOD vPE Description The provider edge function for the ADIOD service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-                "name": "2017-488_ADIOD-vPE",
+                "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
+                "name": "2017-488_PASQUALE-vPE",
                 "version": "9.0",
                 "customizationUuid": "41516cc6-5098-4b40-a619-f8d5f55fc4d8",
                 "inputs": {
@@ -1071,44 +1075,44 @@ describe('Drawing board', function () {
                   "vnf_config_template_version": {
                     "displayName": "vnf_config_template_version",
                     "command": "get_input",
-                    "inputName": "2017488_adiodvpe0_vnf_config_template_version"
+                    "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
                   },
                   "bandwidth_units": {
                     "displayName": "bandwidth_units",
                     "command": "get_input",
-                    "inputName": "2017488_adiodvpe0_bandwidth_units"
+                    "inputName": "2017488_pasqualevpe0_bandwidth_units"
                   },
                   "bandwidth": {
                     "displayName": "bandwidth",
                     "command": "get_input",
-                    "inputName": "2017488_adiodvpe0_bandwidth"
+                    "inputName": "2017488_pasqualevpe0_bandwidth"
                   },
                   "AIC_CLLI": {
                     "displayName": "AIC_CLLI",
                     "command": "get_input",
-                    "inputName": "2017488_adiodvpe0_AIC_CLLI"
+                    "inputName": "2017488_pasqualevpe0_AIC_CLLI"
                   },
                   "availability_zone_0": {
                     "displayName": "availability_zone_0",
                     "command": "get_input",
-                    "inputName": "2017488_adiodvpe0_availability_zone_0"
+                    "inputName": "2017488_pasqualevpe0_availability_zone_0"
                   },
                   "ASN": {
                     "displayName": "ASN",
                     "command": "get_input",
-                    "inputName": "2017488_adiodvpe0_ASN"
+                    "inputName": "2017488_pasqualevpe0_ASN"
                   },
                   "vnf_instance_name": {
                     "displayName": "vnf_instance_name",
                     "command": "get_input",
-                    "inputName": "2017488_adiodvpe0_vnf_instance_name"
+                    "inputName": "2017488_pasqualevpe0_vnf_instance_name"
                   }
                 },
                 "properties": {
                   "max_instances": 10,
                   "min_instances": 1,
                   "vmxvre_retype": "RE-VMX",
-                  "vnf_config_template_version": "get_input:2017488_adiodvpe0_vnf_config_template_version",
+                  "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
                   "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
                   "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
                   "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
@@ -1150,11 +1154,11 @@ describe('Drawing board', function () {
                   "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
                   "vmxvpfe_sriov44_0_port_vlanstrip": "false",
                   "vf_module_id": "123",
-                  "nf_function": "ADIOD vPE",
+                  "nf_function": "PASQUALE vPE",
                   "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
                   "vmxvre_int_ctl_ip_0": "10.0.0.10",
                   "ecomp_generated_naming": "true",
-                  "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI",
+                  "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
                   "vnf_name": "mtnj309me6vre",
                   "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
                   "vmxvre_volume_type_1": "HITACHI",
@@ -1162,14 +1166,14 @@ describe('Drawing board', function () {
                   "vmxvre_volume_type_0": "HITACHI",
                   "vmxvpfe_volume_type_0": "HITACHI",
                   "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-                  "bandwidth_units": "get_input:2017488_adiodvpe0_bandwidth_units",
+                  "bandwidth_units": "get_input:2017488_pasqualevpe0_bandwidth_units",
                   "vnf_id": "123",
                   "vmxvre_oam_prefix": "24",
-                  "availability_zone_0": "get_input:2017488_adiodvpe0_availability_zone_0",
-                  "ASN": "get_input:2017488_adiodvpe0_ASN",
+                  "availability_zone_0": "get_input:2017488_pasqualevpe0_availability_zone_0",
+                  "ASN": "get_input:2017488_pasqualevpe0_ASN",
                   "vmxvre_chassis_i2cid": "161",
                   "vmxvpfe_name_0": "vPFEXI",
-                  "bandwidth": "get_input:2017488_adiodvpe0_bandwidth",
+                  "bandwidth": "get_input:2017488_pasqualevpe0_bandwidth",
                   "availability_zone_max_count": "1",
                   "vmxvre_volume_size_0": "45.0",
                   "vmxvre_volume_size_1": "50.0",
@@ -1179,7 +1183,7 @@ describe('Drawing board', function () {
                   "vmxvre_ore_present": "0",
                   "vmxvre_volume_name_0": "vREXI_FBVolume",
                   "vmxvre_type": "0",
-                  "vnf_instance_name": "get_input:2017488_adiodvpe0_vnf_instance_name",
+                  "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
                   "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
                   "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
                   "vmx_int_ctl_len": "24",
@@ -1193,82 +1197,82 @@ describe('Drawing board', function () {
                   "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
                 },
                 "type": "VF",
-                "modelCustomizationName": "2017-488_ADIOD-vPE 0",
+                "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
                 "vfModules": {
-                  "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+                  "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
                     "uuid": "a5d8df05-11cb-4351-96e0-b6d4168ea4df",
                     "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
                     "customizationUuid": "f3d97417-0c8d-424e-8ff7-b2eb4fbcecc3",
                     "description": null,
-                    "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                    "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                     "version": "8",
-                    "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                     "properties": {
                       "minCountInstances": 0,
                       "maxCountInstances": null,
                       "initialCount": 0,
-                      "vfModuleLabel": "ADIOD_vRE_BV"
+                      "vfModuleLabel": "PASQUALE_vRE_BV"
                     },
                     "inputs": {
-                      "2017488_adiodvpe0_bandwidth_units": {
+                      "2017488_pasqualevpe0_bandwidth_units": {
                         "type": "string",
                         "description": "Units of bandwidth",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "bandwidth_units"
                         },
                         "constraints": null,
                         "required": true,
                         "default": "Gbps"
                       },
-                      "2017488_adiodvpe0_bandwidth": {
+                      "2017488_pasqualevpe0_bandwidth": {
                         "type": "string",
                         "description": "Requested VPE bandwidth",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "bandwidth"
                         },
                         "constraints": null,
                         "required": true,
                         "default": "10"
                       },
-                      "2017488_adiodvpe0_vnf_instance_name": {
+                      "2017488_pasqualevpe0_vnf_instance_name": {
                         "type": "string",
                         "description": "The hostname assigned to the vpe.",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "vnf_instance_name"
                         },
                         "constraints": null,
                         "required": true,
                         "default": "mtnj309me6"
                       },
-                      "2017488_adiodvpe0_vnf_config_template_version": {
+                      "2017488_pasqualevpe0_vnf_config_template_version": {
                         "type": "string",
                         "description": "VPE Software Version",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "vnf_config_template_version"
                         },
                         "constraints": null,
                         "required": true,
                         "default": "17.2"
                       },
-                      "2017488_adiodvpe0_AIC_CLLI": {
+                      "2017488_pasqualevpe0_AIC_CLLI": {
                         "type": "string",
                         "description": "AIC Site CLLI",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "AIC_CLLI"
                         },
                         "constraints": null,
@@ -1278,45 +1282,45 @@ describe('Drawing board', function () {
                     },
                     "volumeGroupAllowed": true
                   },
-                  "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
+                  "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
                     "uuid": "040e591e-5d30-4e0d-850f-7266e5a8e013",
                     "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
                     "customizationUuid": "5c5f91f9-5e31-4120-b892-5536587ec258",
                     "description": null,
-                    "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+                    "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
                     "version": "6",
-                    "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
                     "properties": {
                       "minCountInstances": 1,
                       "maxCountInstances": 1,
                       "initialCount": 1,
-                      "vfModuleLabel": "ADIOD_base_vPE_BV"
+                      "vfModuleLabel": "PASQUALE_base_vPE_BV"
                     },
                     "inputs": {},
                     "volumeGroupAllowed": false
                   },
-                  "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+                  "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
                     "uuid": "b3e8b26e-cff0-49fc-a4e6-f3e16c8440fe",
                     "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
                     "customizationUuid": "6e410843-257c-46d9-ba8a-8d94e1362452",
                     "description": null,
-                    "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                    "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                     "version": "8",
-                    "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                     "properties": {
                       "minCountInstances": 0,
                       "maxCountInstances": null,
                       "initialCount": 0,
-                      "vfModuleLabel": "ADIOD_vPFE_BV"
+                      "vfModuleLabel": "PASQUALE_vPFE_BV"
                     },
                     "inputs": {
-                      "2017488_adiodvpe0_availability_zone_0": {
+                      "2017488_pasqualevpe0_availability_zone_0": {
                         "type": "string",
                         "description": "The Availability Zone to launch the instance.",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vPFE_BV",
+                          "vfModuleLabel": "PASQUALE_vPFE_BV",
                           "paramName": "availability_zone_0"
                         },
                         "constraints": null,
@@ -1328,80 +1332,80 @@ describe('Drawing board', function () {
                   }
                 },
                 "volumeGroups": {
-                  "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+                  "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
                     "uuid": "a5d8df05-11cb-4351-96e0-b6d4168ea4df",
                     "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
                     "customizationUuid": "f3d97417-0c8d-424e-8ff7-b2eb4fbcecc3",
                     "description": null,
-                    "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                    "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                     "version": "8",
-                    "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                     "properties": {
                       "minCountInstances": 0,
                       "maxCountInstances": null,
                       "initialCount": 0,
-                      "vfModuleLabel": "ADIOD_vRE_BV"
+                      "vfModuleLabel": "PASQUALE_vRE_BV"
                     },
                     "inputs": {
-                      "2017488_adiodvpe0_bandwidth_units": {
+                      "2017488_pasqualevpe0_bandwidth_units": {
                         "type": "string",
                         "description": "Units of bandwidth",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "bandwidth_units"
                         },
                         "constraints": null,
                         "required": true,
                         "default": "Gbps"
                       },
-                      "2017488_adiodvpe0_bandwidth": {
+                      "2017488_pasqualevpe0_bandwidth": {
                         "type": "string",
                         "description": "Requested VPE bandwidth",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "bandwidth"
                         },
                         "constraints": null,
                         "required": true,
                         "default": "10"
                       },
-                      "2017488_adiodvpe0_vnf_instance_name": {
+                      "2017488_pasqualevpe0_vnf_instance_name": {
                         "type": "string",
                         "description": "The hostname assigned to the vpe.",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "vnf_instance_name"
                         },
                         "constraints": null,
                         "required": true,
                         "default": "mtnj309me6"
                       },
-                      "2017488_adiodvpe0_vnf_config_template_version": {
+                      "2017488_pasqualevpe0_vnf_config_template_version": {
                         "type": "string",
                         "description": "VPE Software Version",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "vnf_config_template_version"
                         },
                         "constraints": null,
                         "required": true,
                         "default": "17.2"
                       },
-                      "2017488_adiodvpe0_AIC_CLLI": {
+                      "2017488_pasqualevpe0_AIC_CLLI": {
                         "type": "string",
                         "description": "AIC Site CLLI",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "AIC_CLLI"
                         },
                         "constraints": null,
@@ -1410,28 +1414,28 @@ describe('Drawing board', function () {
                       }
                     }
                   },
-                  "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+                  "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
                     "uuid": "b3e8b26e-cff0-49fc-a4e6-f3e16c8440fe",
                     "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
                     "customizationUuid": "6e410843-257c-46d9-ba8a-8d94e1362452",
                     "description": null,
-                    "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                    "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                     "version": "8",
-                    "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                     "properties": {
                       "minCountInstances": 0,
                       "maxCountInstances": null,
                       "initialCount": 0,
-                      "vfModuleLabel": "ADIOD_vPFE_BV"
+                      "vfModuleLabel": "PASQUALE_vPFE_BV"
                     },
                     "inputs": {
-                      "2017488_adiodvpe0_availability_zone_0": {
+                      "2017488_pasqualevpe0_availability_zone_0": {
                         "type": "string",
                         "description": "The Availability Zone to launch the instance.",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vPFE_BV",
+                          "vfModuleLabel": "PASQUALE_vPFE_BV",
                           "paramName": "availability_zone_0"
                         },
                         "constraints": null,
@@ -1445,84 +1449,84 @@ describe('Drawing board', function () {
               }
             },
             "networks": {},
-            "collectionResource": {},
+            "collectionResources": {},
             "configurations": {},
             "serviceProxies": {},
             "vfModules": {
-              "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+              "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
                 "uuid": "a5d8df05-11cb-4351-96e0-b6d4168ea4df",
                 "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
                 "customizationUuid": "f3d97417-0c8d-424e-8ff7-b2eb4fbcecc3",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                 "version": "8",
-                "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                 "properties": {
                   "minCountInstances": 0,
                   "maxCountInstances": null,
                   "initialCount": 0,
-                  "vfModuleLabel": "ADIOD_vRE_BV"
+                  "vfModuleLabel": "PASQUALE_vRE_BV"
                 },
                 "inputs": {
-                  "2017488_adiodvpe0_bandwidth_units": {
+                  "2017488_pasqualevpe0_bandwidth_units": {
                     "type": "string",
                     "description": "Units of bandwidth",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "bandwidth_units"
                     },
                     "constraints": null,
                     "required": true,
                     "default": "Gbps"
                   },
-                  "2017488_adiodvpe0_bandwidth": {
+                  "2017488_pasqualevpe0_bandwidth": {
                     "type": "string",
                     "description": "Requested VPE bandwidth",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "bandwidth"
                     },
                     "constraints": null,
                     "required": true,
                     "default": "10"
                   },
-                  "2017488_adiodvpe0_vnf_instance_name": {
+                  "2017488_pasqualevpe0_vnf_instance_name": {
                     "type": "string",
                     "description": "The hostname assigned to the vpe.",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "vnf_instance_name"
                     },
                     "constraints": null,
                     "required": true,
                     "default": "mtnj309me6"
                   },
-                  "2017488_adiodvpe0_vnf_config_template_version": {
+                  "2017488_pasqualevpe0_vnf_config_template_version": {
                     "type": "string",
                     "description": "VPE Software Version",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "vnf_config_template_version"
                     },
                     "constraints": null,
                     "required": true,
                     "default": "17.2"
                   },
-                  "2017488_adiodvpe0_AIC_CLLI": {
+                  "2017488_pasqualevpe0_AIC_CLLI": {
                     "type": "string",
                     "description": "AIC Site CLLI",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "AIC_CLLI"
                     },
                     "constraints": null,
@@ -1532,45 +1536,45 @@ describe('Drawing board', function () {
                 },
                 "volumeGroupAllowed": true
               },
-              "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
+              "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
                 "uuid": "040e591e-5d30-4e0d-850f-7266e5a8e013",
                 "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
                 "customizationUuid": "5c5f91f9-5e31-4120-b892-5536587ec258",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+                "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
                 "version": "6",
-                "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
                 "properties": {
                   "minCountInstances": 1,
                   "maxCountInstances": 1,
                   "initialCount": 1,
-                  "vfModuleLabel": "ADIOD_base_vPE_BV"
+                  "vfModuleLabel": "PASQUALE_base_vPE_BV"
                 },
                 "inputs": {},
                 "volumeGroupAllowed": false
               },
-              "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+              "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
                 "uuid": "b3e8b26e-cff0-49fc-a4e6-f3e16c8440fe",
                 "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
                 "customizationUuid": "6e410843-257c-46d9-ba8a-8d94e1362452",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                 "version": "8",
-                "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                 "properties": {
                   "minCountInstances": 0,
                   "maxCountInstances": null,
                   "initialCount": 0,
-                  "vfModuleLabel": "ADIOD_vPFE_BV"
+                  "vfModuleLabel": "PASQUALE_vPFE_BV"
                 },
                 "inputs": {
-                  "2017488_adiodvpe0_availability_zone_0": {
+                  "2017488_pasqualevpe0_availability_zone_0": {
                     "type": "string",
                     "description": "The Availability Zone to launch the instance.",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vPFE_BV",
+                      "vfModuleLabel": "PASQUALE_vPFE_BV",
                       "paramName": "availability_zone_0"
                     },
                     "constraints": null,
@@ -1582,80 +1586,80 @@ describe('Drawing board', function () {
               }
             },
             "volumeGroups": {
-              "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+              "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
                 "uuid": "a5d8df05-11cb-4351-96e0-b6d4168ea4df",
                 "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
                 "customizationUuid": "f3d97417-0c8d-424e-8ff7-b2eb4fbcecc3",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                 "version": "8",
-                "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                 "properties": {
                   "minCountInstances": 0,
                   "maxCountInstances": null,
                   "initialCount": 0,
-                  "vfModuleLabel": "ADIOD_vRE_BV"
+                  "vfModuleLabel": "PASQUALE_vRE_BV"
                 },
                 "inputs": {
-                  "2017488_adiodvpe0_bandwidth_units": {
+                  "2017488_pasqualevpe0_bandwidth_units": {
                     "type": "string",
                     "description": "Units of bandwidth",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "bandwidth_units"
                     },
                     "constraints": null,
                     "required": true,
                     "default": "Gbps"
                   },
-                  "2017488_adiodvpe0_bandwidth": {
+                  "2017488_pasqualevpe0_bandwidth": {
                     "type": "string",
                     "description": "Requested VPE bandwidth",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "bandwidth"
                     },
                     "constraints": null,
                     "required": true,
                     "default": "10"
                   },
-                  "2017488_adiodvpe0_vnf_instance_name": {
+                  "2017488_pasqualevpe0_vnf_instance_name": {
                     "type": "string",
                     "description": "The hostname assigned to the vpe.",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "vnf_instance_name"
                     },
                     "constraints": null,
                     "required": true,
                     "default": "mtnj309me6"
                   },
-                  "2017488_adiodvpe0_vnf_config_template_version": {
+                  "2017488_pasqualevpe0_vnf_config_template_version": {
                     "type": "string",
                     "description": "VPE Software Version",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "vnf_config_template_version"
                     },
                     "constraints": null,
                     "required": true,
                     "default": "17.2"
                   },
-                  "2017488_adiodvpe0_AIC_CLLI": {
+                  "2017488_pasqualevpe0_AIC_CLLI": {
                     "type": "string",
                     "description": "AIC Site CLLI",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "AIC_CLLI"
                     },
                     "constraints": null,
@@ -1664,28 +1668,28 @@ describe('Drawing board', function () {
                   }
                 }
               },
-              "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+              "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
                 "uuid": "b3e8b26e-cff0-49fc-a4e6-f3e16c8440fe",
                 "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
                 "customizationUuid": "6e410843-257c-46d9-ba8a-8d94e1362452",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                 "version": "8",
-                "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                 "properties": {
                   "minCountInstances": 0,
                   "maxCountInstances": null,
                   "initialCount": 0,
-                  "vfModuleLabel": "ADIOD_vPFE_BV"
+                  "vfModuleLabel": "PASQUALE_vPFE_BV"
                 },
                 "inputs": {
-                  "2017488_adiodvpe0_availability_zone_0": {
+                  "2017488_pasqualevpe0_availability_zone_0": {
                     "type": "string",
                     "description": "The Availability Zone to launch the instance.",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vPFE_BV",
+                      "vfModuleLabel": "PASQUALE_vPFE_BV",
                       "paramName": "availability_zone_0"
                     },
                     "constraints": null,
@@ -1701,18 +1705,18 @@ describe('Drawing board', function () {
         "serviceInstance": {
           "f4d84bb4-a416-4b4e-997e-0059973630b9": {
             "vnfs": {
-              "2017-488_ADIOD-vPE 0": {
+              "2017-488_PASQUALE-vPE 0": {
                 "rollbackOnFailure": "true",
                 "vfModules": {
-                  "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
-                    "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0eknhp": {
+                  "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
+                    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0eknhp": {
                       "modelInfo": {
                         "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
                         "modelVersionId": "040e591e-5d30-4e0d-850f-7266e5a8e013",
-                        "modelName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+                        "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
                         "modelVersion": "6",
                         "modelCustomizationId": "5c5f91f9-5e31-4120-b892-5536587ec258",
-                        "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0"
+                        "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0"
                       },
                       "isMissingData": false,
                       "instanceParams": [
@@ -1731,17 +1735,17 @@ describe('Drawing board', function () {
                 "modelInfo": {
                   "modelInvariantId": "5be7e99e-8eb2-4d97-be63-8081ff3cd10e",
                   "modelVersionId": "ea81d6f7-0861-44a7-b7d5-d173b562c350",
-                  "modelName": "2017-488_ADIOD-vPE",
+                  "modelName": "2017-488_PASQUALE-vPE",
                   "modelVersion": "9.0",
                   "modelCustomizationId": "41516cc6-5098-4b40-a619-f8d5f55fc4d8",
-                  "modelCustomizationName": "2017-488_ADIOD-vPE 0"
+                  "modelCustomizationName": "2017-488_PASQUALE-vPE 0"
                 }
               },
-              "2017-488_ADIOD-vPE 0:0001": {
+              "2017-488_PASQUALE-vPE 0:0001": {
                 "rollbackOnFailure": "true",
                 "vfModules": {},
                 "isMissingData": false,
-                "originalName": "2017-488_ADIOD-vPE 0",
+                "originalName": "2017-488_PASQUALE-vPE 0",
                 "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
                 "lcpCloudRegionId": "hvf6",
                 "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054",
@@ -1750,23 +1754,23 @@ describe('Drawing board', function () {
                 "modelInfo": {
                   "modelInvariantId": "5be7e99e-8eb2-4d97-be63-8081ff3cd10e",
                   "modelVersionId": "ea81d6f7-0861-44a7-b7d5-d173b562c350",
-                  "modelName": "2017-488_ADIOD-vPE",
+                  "modelName": "2017-488_PASQUALE-vPE",
                   "modelVersion": "9.0",
                   "modelCustomizationId": "41516cc6-5098-4b40-a619-f8d5f55fc4d8",
-                  "modelCustomizationName": "2017-488_ADIOD-vPE 0"
+                  "modelCustomizationName": "2017-488_PASQUALE-vPE 0"
                 }
               }
             },
             "instanceParams": [
               {
-                "2017488_adiodvpe0_ASN": "AV_vPE"
+                "2017488_pasqualevpe0_ASN": "AV_vPE"
               }
             ],
             "validationCounter": 0,
             "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
             "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
             "subscriptionServiceType": "TYLER SILVIA",
-            "lcpCloudRegionId": "JANET25",
+            "lcpCloudRegionId": "AAIAIC25",
             "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
             "aicZoneId": "JAG1",
             "projectName": "x1",
@@ -1776,7 +1780,7 @@ describe('Drawing board', function () {
             "modelInfo": {
               "modelInvariantId": "598e3f9e-3244-4d8f-a8e0-0e5d7a29eda9",
               "modelVersionId": "f4d84bb4-a416-4b4e-997e-0059973630b9",
-              "modelName": "ADIOD vMX vPE_BV Service 488",
+              "modelName": "PASQUALE vMX vPE_BV Service 488",
               "modelVersion": "1.0"
             },
             "tenantName": "USP-SIP-IC-24335-T-01",
@@ -1790,8 +1794,8 @@ describe('Drawing board', function () {
         "lcpRegionsAndTenants": {
           "lcpRegionList": [
             {
-              "id": "JANET25",
-              "name": "JANET25",
+              "id": "AAIAIC25",
+              "name": "AAIAIC25",
               "isPermitted": true
             },
             {
@@ -1801,7 +1805,7 @@ describe('Drawing board', function () {
             }
           ],
           "lcpRegionsTenantsMap": {
-            "JANET25": [
+            "AAIAIC25": [
               {
                 "id": "092eb9e8e4b7412e8787dd091bc58e86",
                 "name": "USP-SIP-IC-24335-T-01",
@@ -1912,7 +1916,7 @@ describe('Drawing board', function () {
         "productFamilies": [
           {
             "id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-            "name": "SCOTTIE",
+            "name": "ERICA",
             "isPermitted": true
           },
           {
@@ -1937,7 +1941,7 @@ describe('Drawing board', function () {
           },
           {
             "id": "323d69d9-2efe-4r45-ay0a-89ea7ard4e6f",
-            "name": "vSCP",
+            "name": "vEsmeralda",
             "isPermitted": true
           },
           {
@@ -1981,7 +1985,7 @@ describe('Drawing board', function () {
             "isPermitted": true
           },
           {
-            "id": "Cisneros",
+            "id": "vMuriel",
             "name": "vMuriel",
             "isPermitted": true
           },
@@ -2007,7 +2011,7 @@ describe('Drawing board', function () {
           },
           {
             "id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
-            "name": "Josefina",
+            "name": "JOSEFINA",
             "isPermitted": true
           },
           {
@@ -2055,7 +2059,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "6",
-              "name": "vSEGW",
+              "name": "vPorfirio",
               "isPermitted": false
             },
             {
@@ -2070,7 +2074,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "9",
-              "name": "vMME",
+              "name": "vFLORENCE",
               "isPermitted": false
             },
             {
@@ -2080,7 +2084,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "11",
-              "name": "vSCP",
+              "name": "vEsmeralda",
               "isPermitted": false
             },
             {
@@ -2090,7 +2094,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "13",
-              "name": "vMMSC",
+              "name": "vWINIFRED",
               "isPermitted": false
             },
             {
@@ -2205,16 +2209,8 @@ describe('Drawing board', function () {
           "FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
           "FLAG_SHOW_ASSIGNMENTS": true,
           "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
-          "FLAG_UNASSIGN_SERVICE": true,
           "FLAG_SHOW_VERIFY_SERVICE": false,
-          "FLAG_COLLECTION_RESOURCE_SUPPORT": true,
-          "FLAG_DUPLICATE_VNF": true,
           "FLAG_SERVICE_MODEL_CACHE": true,
-          "CREATE_INSTANCE_TEST": false,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": true,
-          "FLAG_ASYNC_INSTANTIATION": true,
-          "FLAG_ASYNC_JOBS": true,
-          "EMPTY_DRAWING_BOARD_TEST": false,
           "FLAG_ADD_MSO_TESTAPI_FIELD": true
         },
         "type": "[FLAGS] Update"
@@ -2225,17 +2221,20 @@ describe('Drawing board', function () {
             "service": {
               "uuid": "f4d84bb4-a416-4b4e-997e-0059973630b9",
               "invariantUuid": "598e3f9e-3244-4d8f-a8e0-0e5d7a29eda9",
-              "name": "ADIOD vMX vPE_BV Service 488",
+              "name": "PASQUALE vMX vPE_BV Service 488",
               "version": "1.0",
               "toscaModelURL": null,
               "category": "Network L1-3",
               "serviceType": "",
               "serviceRole": "",
-              "description": "ADIOD vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM",
+              "description": "PASQUALE vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM",
               "serviceEcompNaming": "true",
               "instantiationType": "Macro",
+              "vidNotions": {
+                "instantiationType": "Macro"
+              },
               "inputs": {
-                "2017488_adiodvpe0_ASN": {
+                "2017488_pasqualevpe0_ASN": {
                   "type": "string",
                   "description": "AV/PE",
                   "entry_schema": null,
@@ -2247,11 +2246,11 @@ describe('Drawing board', function () {
               }
             },
             "vnfs": {
-              "2017-488_ADIOD-vPE 0": {
+              "2017-488_PASQUALE-vPE 0": {
                 "uuid": "ea81d6f7-0861-44a7-b7d5-d173b562c350",
                 "invariantUuid": "5be7e99e-8eb2-4d97-be63-8081ff3cd10e",
-                "description": "Name ADIOD vPE Description The provider edge function for the ADIOD service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-                "name": "2017-488_ADIOD-vPE",
+                "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
+                "name": "2017-488_PASQUALE-vPE",
                 "version": "9.0",
                 "customizationUuid": "41516cc6-5098-4b40-a619-f8d5f55fc4d8",
                 "inputs": {
@@ -2323,42 +2322,42 @@ describe('Drawing board', function () {
                   "vnf_config_template_version": {
                     "displayName": "vnf_config_template_version",
                     "command": "get_input",
-                    "inputName": "2017488_adiodvpe0_vnf_config_template_version"
+                    "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
                   },
                   "bandwidth_units": {
                     "displayName": "bandwidth_units",
                     "command": "get_input",
-                    "inputName": "2017488_adiodvpe0_bandwidth_units"
+                    "inputName": "2017488_pasqualevpe0_bandwidth_units"
                   },
                   "bandwidth": {
                     "displayName": "bandwidth",
                     "command": "get_input",
-                    "inputName": "2017488_adiodvpe0_bandwidth"
+                    "inputName": "2017488_pasqualevpe0_bandwidth"
                   },
                   "AIC_CLLI": {
                     "displayName": "AIC_CLLI",
                     "command": "get_input",
-                    "inputName": "2017488_adiodvpe0_AIC_CLLI"
+                    "inputName": "2017488_pasqualevpe0_AIC_CLLI"
                   },
                   "availability_zone_0": {
                     "displayName": "availability_zone_0",
                     "command": "get_input",
-                    "inputName": "2017488_adiodvpe0_availability_zone_0"
+                    "inputName": "2017488_pasqualevpe0_availability_zone_0"
                   },
                   "ASN": {
                     "displayName": "ASN",
                     "command": "get_input",
-                    "inputName": "2017488_adiodvpe0_ASN"
+                    "inputName": "2017488_pasqualevpe0_ASN"
                   },
                   "vnf_instance_name": {
                     "displayName": "vnf_instance_name",
                     "command": "get_input",
-                    "inputName": "2017488_adiodvpe0_vnf_instance_name"
+                    "inputName": "2017488_pasqualevpe0_vnf_instance_name"
                   }
                 },
                 "properties": {
                   "vmxvre_retype": "RE-VMX",
-                  "vnf_config_template_version": "get_input:2017488_adiodvpe0_vnf_config_template_version",
+                  "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
                   "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
                   "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
                   "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
@@ -2400,11 +2399,11 @@ describe('Drawing board', function () {
                   "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
                   "vmxvpfe_sriov44_0_port_vlanstrip": "false",
                   "vf_module_id": "123",
-                  "nf_function": "ADIOD vPE",
+                  "nf_function": "PASQUALE vPE",
                   "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
                   "vmxvre_int_ctl_ip_0": "10.0.0.10",
                   "ecomp_generated_naming": "true",
-                  "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI",
+                  "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
                   "vnf_name": "mtnj309me6vre",
                   "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
                   "vmxvre_volume_type_1": "HITACHI",
@@ -2412,14 +2411,14 @@ describe('Drawing board', function () {
                   "vmxvre_volume_type_0": "HITACHI",
                   "vmxvpfe_volume_type_0": "HITACHI",
                   "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-                  "bandwidth_units": "get_input:2017488_adiodvpe0_bandwidth_units",
+                  "bandwidth_units": "get_input:2017488_pasqualevpe0_bandwidth_units",
                   "vnf_id": "123",
                   "vmxvre_oam_prefix": "24",
-                  "availability_zone_0": "get_input:2017488_adiodvpe0_availability_zone_0",
-                  "ASN": "get_input:2017488_adiodvpe0_ASN",
+                  "availability_zone_0": "get_input:2017488_pasqualevpe0_availability_zone_0",
+                  "ASN": "get_input:2017488_pasqualevpe0_ASN",
                   "vmxvre_chassis_i2cid": "161",
                   "vmxvpfe_name_0": "vPFEXI",
-                  "bandwidth": "get_input:2017488_adiodvpe0_bandwidth",
+                  "bandwidth": "get_input:2017488_pasqualevpe0_bandwidth",
                   "availability_zone_max_count": "1",
                   "vmxvre_volume_size_0": "45.0",
                   "vmxvre_volume_size_1": "50.0",
@@ -2429,7 +2428,7 @@ describe('Drawing board', function () {
                   "vmxvre_ore_present": "0",
                   "vmxvre_volume_name_0": "vREXI_FBVolume",
                   "vmxvre_type": "0",
-                  "vnf_instance_name": "get_input:2017488_adiodvpe0_vnf_instance_name",
+                  "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
                   "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
                   "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
                   "vmx_int_ctl_len": "24",
@@ -2443,82 +2442,82 @@ describe('Drawing board', function () {
                   "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
                 },
                 "type": "VF",
-                "modelCustomizationName": "2017-488_ADIOD-vPE 0",
+                "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
                 "vfModules": {
-                  "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+                  "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
                     "uuid": "a5d8df05-11cb-4351-96e0-b6d4168ea4df",
                     "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
                     "customizationUuid": "f3d97417-0c8d-424e-8ff7-b2eb4fbcecc3",
                     "description": null,
-                    "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                    "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                     "version": "8",
-                    "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                     "properties": {
                       "minCountInstances": 2,
                       "maxCountInstances": null,
                       "initialCount": 0,
-                      "vfModuleLabel": "ADIOD_vRE_BV"
+                      "vfModuleLabel": "PASQUALE_vRE_BV"
                     },
                     "inputs": {
-                      "2017488_adiodvpe0_bandwidth_units": {
+                      "2017488_pasqualevpe0_bandwidth_units": {
                         "type": "string",
                         "description": "Units of bandwidth",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "bandwidth_units"
                         },
                         "constraints": null,
                         "required": true,
                         "default": "Gbps"
                       },
-                      "2017488_adiodvpe0_bandwidth": {
+                      "2017488_pasqualevpe0_bandwidth": {
                         "type": "string",
                         "description": "Requested VPE bandwidth",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "bandwidth"
                         },
                         "constraints": null,
                         "required": true,
                         "default": "10"
                       },
-                      "2017488_adiodvpe0_vnf_instance_name": {
+                      "2017488_pasqualevpe0_vnf_instance_name": {
                         "type": "string",
                         "description": "The hostname assigned to the vpe.",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "vnf_instance_name"
                         },
                         "constraints": null,
                         "required": true,
                         "default": "mtnj309me6"
                       },
-                      "2017488_adiodvpe0_vnf_config_template_version": {
+                      "2017488_pasqualevpe0_vnf_config_template_version": {
                         "type": "string",
                         "description": "VPE Software Version",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "vnf_config_template_version"
                         },
                         "constraints": null,
                         "required": true,
                         "default": "17.2"
                       },
-                      "2017488_adiodvpe0_AIC_CLLI": {
+                      "2017488_pasqualevpe0_AIC_CLLI": {
                         "type": "string",
                         "description": "AIC Site CLLI",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "AIC_CLLI"
                         },
                         "constraints": null,
@@ -2528,45 +2527,45 @@ describe('Drawing board', function () {
                     },
                     "volumeGroupAllowed": true
                   },
-                  "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
+                  "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
                     "uuid": "040e591e-5d30-4e0d-850f-7266e5a8e013",
                     "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
                     "customizationUuid": "5c5f91f9-5e31-4120-b892-5536587ec258",
                     "description": null,
-                    "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+                    "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
                     "version": "6",
-                    "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
                     "properties": {
                       "minCountInstances": 1,
                       "maxCountInstances": 1,
                       "initialCount": 1,
-                      "vfModuleLabel": "ADIOD_base_vPE_BV"
+                      "vfModuleLabel": "PASQUALE_base_vPE_BV"
                     },
                     "inputs": {},
                     "volumeGroupAllowed": false
                   },
-                  "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+                  "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
                     "uuid": "b3e8b26e-cff0-49fc-a4e6-f3e16c8440fe",
                     "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
                     "customizationUuid": "6e410843-257c-46d9-ba8a-8d94e1362452",
                     "description": null,
-                    "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                    "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                     "version": "8",
-                    "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                     "properties": {
                       "minCountInstances": 0,
                       "maxCountInstances": null,
                       "initialCount": 0,
-                      "vfModuleLabel": "ADIOD_vPFE_BV"
+                      "vfModuleLabel": "PASQUALE_vPFE_BV"
                     },
                     "inputs": {
-                      "2017488_adiodvpe0_availability_zone_0": {
+                      "2017488_pasqualevpe0_availability_zone_0": {
                         "type": "string",
                         "description": "The Availability Zone to launch the instance.",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vPFE_BV",
+                          "vfModuleLabel": "PASQUALE_vPFE_BV",
                           "paramName": "availability_zone_0"
                         },
                         "constraints": null,
@@ -2578,80 +2577,80 @@ describe('Drawing board', function () {
                   }
                 },
                 "volumeGroups": {
-                  "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+                  "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
                     "uuid": "a5d8df05-11cb-4351-96e0-b6d4168ea4df",
                     "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
                     "customizationUuid": "f3d97417-0c8d-424e-8ff7-b2eb4fbcecc3",
                     "description": null,
-                    "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                    "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                     "version": "8",
-                    "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                     "properties": {
                       "minCountInstances": 0,
                       "maxCountInstances": null,
                       "initialCount": 0,
-                      "vfModuleLabel": "ADIOD_vRE_BV"
+                      "vfModuleLabel": "PASQUALE_vRE_BV"
                     },
                     "inputs": {
-                      "2017488_adiodvpe0_bandwidth_units": {
+                      "2017488_pasqualevpe0_bandwidth_units": {
                         "type": "string",
                         "description": "Units of bandwidth",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "bandwidth_units"
                         },
                         "constraints": null,
                         "required": true,
                         "default": "Gbps"
                       },
-                      "2017488_adiodvpe0_bandwidth": {
+                      "2017488_pasqualevpe0_bandwidth": {
                         "type": "string",
                         "description": "Requested VPE bandwidth",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "bandwidth"
                         },
                         "constraints": null,
                         "required": true,
                         "default": "10"
                       },
-                      "2017488_adiodvpe0_vnf_instance_name": {
+                      "2017488_pasqualevpe0_vnf_instance_name": {
                         "type": "string",
                         "description": "The hostname assigned to the vpe.",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "vnf_instance_name"
                         },
                         "constraints": null,
                         "required": true,
                         "default": "mtnj309me6"
                       },
-                      "2017488_adiodvpe0_vnf_config_template_version": {
+                      "2017488_pasqualevpe0_vnf_config_template_version": {
                         "type": "string",
                         "description": "VPE Software Version",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "vnf_config_template_version"
                         },
                         "constraints": null,
                         "required": true,
                         "default": "17.2"
                       },
-                      "2017488_adiodvpe0_AIC_CLLI": {
+                      "2017488_pasqualevpe0_AIC_CLLI": {
                         "type": "string",
                         "description": "AIC Site CLLI",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "AIC_CLLI"
                         },
                         "constraints": null,
@@ -2660,28 +2659,28 @@ describe('Drawing board', function () {
                       }
                     }
                   },
-                  "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+                  "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
                     "uuid": "b3e8b26e-cff0-49fc-a4e6-f3e16c8440fe",
                     "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
                     "customizationUuid": "6e410843-257c-46d9-ba8a-8d94e1362452",
                     "description": null,
-                    "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                    "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                     "version": "8",
-                    "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                     "properties": {
                       "minCountInstances": 0,
                       "maxCountInstances": null,
                       "initialCount": 0,
-                      "vfModuleLabel": "ADIOD_vPFE_BV"
+                      "vfModuleLabel": "PASQUALE_vPFE_BV"
                     },
                     "inputs": {
-                      "2017488_adiodvpe0_availability_zone_0": {
+                      "2017488_pasqualevpe0_availability_zone_0": {
                         "type": "string",
                         "description": "The Availability Zone to launch the instance.",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vPFE_BV",
+                          "vfModuleLabel": "PASQUALE_vPFE_BV",
                           "paramName": "availability_zone_0"
                         },
                         "constraints": null,
@@ -2695,84 +2694,84 @@ describe('Drawing board', function () {
               }
             },
             "networks": {},
-            "collectionResource": {},
+            "collectionResources": {},
             "configurations": {},
             "serviceProxies": {},
             "vfModules": {
-              "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+              "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
                 "uuid": "a5d8df05-11cb-4351-96e0-b6d4168ea4df",
                 "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
                 "customizationUuid": "f3d97417-0c8d-424e-8ff7-b2eb4fbcecc3",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                 "version": "8",
-                "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                 "properties": {
                   "minCountInstances": 0,
                   "maxCountInstances": null,
                   "initialCount": 0,
-                  "vfModuleLabel": "ADIOD_vRE_BV"
+                  "vfModuleLabel": "PASQUALE_vRE_BV"
                 },
                 "inputs": {
-                  "2017488_adiodvpe0_bandwidth_units": {
+                  "2017488_pasqualevpe0_bandwidth_units": {
                     "type": "string",
                     "description": "Units of bandwidth",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "bandwidth_units"
                     },
                     "constraints": null,
                     "required": true,
                     "default": "Gbps"
                   },
-                  "2017488_adiodvpe0_bandwidth": {
+                  "2017488_pasqualevpe0_bandwidth": {
                     "type": "string",
                     "description": "Requested VPE bandwidth",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "bandwidth"
                     },
                     "constraints": null,
                     "required": true,
                     "default": "10"
                   },
-                  "2017488_adiodvpe0_vnf_instance_name": {
+                  "2017488_pasqualevpe0_vnf_instance_name": {
                     "type": "string",
                     "description": "The hostname assigned to the vpe.",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "vnf_instance_name"
                     },
                     "constraints": null,
                     "required": true,
                     "default": "mtnj309me6"
                   },
-                  "2017488_adiodvpe0_vnf_config_template_version": {
+                  "2017488_pasqualevpe0_vnf_config_template_version": {
                     "type": "string",
                     "description": "VPE Software Version",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "vnf_config_template_version"
                     },
                     "constraints": null,
                     "required": true,
                     "default": "17.2"
                   },
-                  "2017488_adiodvpe0_AIC_CLLI": {
+                  "2017488_pasqualevpe0_AIC_CLLI": {
                     "type": "string",
                     "description": "AIC Site CLLI",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "AIC_CLLI"
                     },
                     "constraints": null,
@@ -2782,45 +2781,45 @@ describe('Drawing board', function () {
                 },
                 "volumeGroupAllowed": true
               },
-              "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
+              "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
                 "uuid": "040e591e-5d30-4e0d-850f-7266e5a8e013",
                 "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
                 "customizationUuid": "5c5f91f9-5e31-4120-b892-5536587ec258",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+                "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
                 "version": "6",
-                "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
                 "properties": {
                   "minCountInstances": 1,
                   "maxCountInstances": 1,
                   "initialCount": 1,
-                  "vfModuleLabel": "ADIOD_base_vPE_BV"
+                  "vfModuleLabel": "PASQUALE_base_vPE_BV"
                 },
                 "inputs": {},
                 "volumeGroupAllowed": false
               },
-              "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+              "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
                 "uuid": "b3e8b26e-cff0-49fc-a4e6-f3e16c8440fe",
                 "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
                 "customizationUuid": "6e410843-257c-46d9-ba8a-8d94e1362452",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                 "version": "8",
-                "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                 "properties": {
                   "minCountInstances": 0,
                   "maxCountInstances": null,
                   "initialCount": 0,
-                  "vfModuleLabel": "ADIOD_vPFE_BV"
+                  "vfModuleLabel": "PASQUALE_vPFE_BV"
                 },
                 "inputs": {
-                  "2017488_adiodvpe0_availability_zone_0": {
+                  "2017488_pasqualevpe0_availability_zone_0": {
                     "type": "string",
                     "description": "The Availability Zone to launch the instance.",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vPFE_BV",
+                      "vfModuleLabel": "PASQUALE_vPFE_BV",
                       "paramName": "availability_zone_0"
                     },
                     "constraints": null,
@@ -2832,80 +2831,80 @@ describe('Drawing board', function () {
               }
             },
             "volumeGroups": {
-              "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+              "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
                 "uuid": "a5d8df05-11cb-4351-96e0-b6d4168ea4df",
                 "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
                 "customizationUuid": "f3d97417-0c8d-424e-8ff7-b2eb4fbcecc3",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                 "version": "8",
-                "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                 "properties": {
                   "minCountInstances": 0,
                   "maxCountInstances": null,
                   "initialCount": 0,
-                  "vfModuleLabel": "ADIOD_vRE_BV"
+                  "vfModuleLabel": "PASQUALE_vRE_BV"
                 },
                 "inputs": {
-                  "2017488_adiodvpe0_bandwidth_units": {
+                  "2017488_pasqualevpe0_bandwidth_units": {
                     "type": "string",
                     "description": "Units of bandwidth",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "bandwidth_units"
                     },
                     "constraints": null,
                     "required": true,
                     "default": "Gbps"
                   },
-                  "2017488_adiodvpe0_bandwidth": {
+                  "2017488_pasqualevpe0_bandwidth": {
                     "type": "string",
                     "description": "Requested VPE bandwidth",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "bandwidth"
                     },
                     "constraints": null,
                     "required": true,
                     "default": "10"
                   },
-                  "2017488_adiodvpe0_vnf_instance_name": {
+                  "2017488_pasqualevpe0_vnf_instance_name": {
                     "type": "string",
                     "description": "The hostname assigned to the vpe.",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "vnf_instance_name"
                     },
                     "constraints": null,
                     "required": true,
                     "default": "mtnj309me6"
                   },
-                  "2017488_adiodvpe0_vnf_config_template_version": {
+                  "2017488_pasqualevpe0_vnf_config_template_version": {
                     "type": "string",
                     "description": "VPE Software Version",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "vnf_config_template_version"
                     },
                     "constraints": null,
                     "required": true,
                     "default": "17.2"
                   },
-                  "2017488_adiodvpe0_AIC_CLLI": {
+                  "2017488_pasqualevpe0_AIC_CLLI": {
                     "type": "string",
                     "description": "AIC Site CLLI",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "AIC_CLLI"
                     },
                     "constraints": null,
@@ -2914,28 +2913,28 @@ describe('Drawing board', function () {
                   }
                 }
               },
-              "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+              "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
                 "uuid": "b3e8b26e-cff0-49fc-a4e6-f3e16c8440fe",
                 "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
                 "customizationUuid": "6e410843-257c-46d9-ba8a-8d94e1362452",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                 "version": "8",
-                "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                 "properties": {
                   "minCountInstances": 0,
                   "maxCountInstances": null,
                   "initialCount": 0,
-                  "vfModuleLabel": "ADIOD_vPFE_BV"
+                  "vfModuleLabel": "PASQUALE_vPFE_BV"
                 },
                 "inputs": {
-                  "2017488_adiodvpe0_availability_zone_0": {
+                  "2017488_pasqualevpe0_availability_zone_0": {
                     "type": "string",
                     "description": "The Availability Zone to launch the instance.",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vPFE_BV",
+                      "vfModuleLabel": "PASQUALE_vPFE_BV",
                       "paramName": "availability_zone_0"
                     },
                     "constraints": null,
@@ -2960,14 +2959,17 @@ describe('Drawing board', function () {
               "description": "ComplexService",
               "serviceEcompNaming": "true",
               "instantiationType": "Macro",
+              "vidNotions": {
+                "instantiationType": "Macro"
+              },
               "inputs": {}
             },
             "vnfs": {
-              "VF_vMee 0": {
+              "VF_vGeraldine 0": {
                 "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
                 "invariantUuid": "4160458e-f648-4b30-a176-43881ffffe9e",
-                "description": "VSP_vMee",
-                "name": "VF_vMee",
+                "description": "VSP_vGeraldine",
+                "name": "VF_vGeraldine",
                 "version": "2.0",
                 "customizationUuid": "91415b44-753d-494c-926a-456a9172bbb9",
                 "inputs": {},
@@ -3136,74 +3138,74 @@ describe('Drawing board', function () {
                   "sctp-b-egress-dst_end_port": "65535.0"
                 },
                 "type": "VF",
-                "modelCustomizationName": "VF_vMee 0",
+                "modelCustomizationName": "VF_vGeraldine 0",
                 "vfModules": {
-                  "vf_vmee0..VfVmee..vmme_vlc..module-1": {
+                  "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
                     "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
                     "invariantUuid": "98a7c88b-b577-476a-90e4-e25a5871e02b",
                     "customizationUuid": "55b1be94-671a-403e-a26c-667e9c47d091",
                     "description": null,
-                    "name": "VfVmee..vmme_vlc..module-1",
+                    "name": "VfVgeraldine..vflorence_vlc..module-1",
                     "version": "2",
-                    "modelCustomizationName": "VfVmee..vmme_vlc..module-1",
+                    "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
                     "properties": {
                       "minCountInstances": 0,
                       "maxCountInstances": null,
                       "initialCount": 0,
-                      "vfModuleLabel": "vmme_vlc"
+                      "vfModuleLabel": "vflorence_vlc"
                     },
                     "inputs": {},
                     "volumeGroupAllowed": false
                   },
-                  "vf_vmee0..VfVmee..vmme_gpb..module-2": {
+                  "vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2": {
                     "uuid": "41708296-e443-4c71-953f-d9a010f059e1",
                     "invariantUuid": "1cca90b8-3490-495e-87da-3f3e4c57d5b9",
                     "customizationUuid": "6add59e0-7fe1-4bc4-af48-f8812422ae7c",
                     "description": null,
-                    "name": "VfVmee..vmme_gpb..module-2",
+                    "name": "VfVgeraldine..vflorence_gpb..module-2",
                     "version": "2",
-                    "modelCustomizationName": "VfVmee..vmme_gpb..module-2",
+                    "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
                     "properties": {
                       "minCountInstances": 0,
                       "maxCountInstances": null,
                       "initialCount": 0,
-                      "vfModuleLabel": "vmme_gpb"
+                      "vfModuleLabel": "vflorence_gpb"
                     },
                     "inputs": {},
                     "volumeGroupAllowed": false
                   },
-                  "vf_vmee0..VfVmee..base_vmme..module-0": {
+                  "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
                     "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
                     "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
                     "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
                     "description": null,
-                    "name": "VfVmee..base_vmme..module-0",
+                    "name": "VfVgeraldine..base_vflorence..module-0",
                     "version": "2",
-                    "modelCustomizationName": "VfVmee..base_vmme..module-0",
+                    "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
                     "properties": {
                       "minCountInstances": 1,
                       "maxCountInstances": 1,
                       "initialCount": 1,
-                      "vfModuleLabel": "base_vmme"
+                      "vfModuleLabel": "base_vflorence"
                     },
                     "inputs": {},
                     "volumeGroupAllowed": true
                   }
                 },
                 "volumeGroups": {
-                  "vf_vmee0..VfVmee..base_vmme..module-0": {
+                  "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
                     "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
                     "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
                     "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
                     "description": null,
-                    "name": "VfVmee..base_vmme..module-0",
+                    "name": "VfVgeraldine..base_vflorence..module-0",
                     "version": "2",
-                    "modelCustomizationName": "VfVmee..base_vmme..module-0",
+                    "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
                     "properties": {
                       "minCountInstances": 1,
                       "maxCountInstances": 1,
                       "initialCount": 1,
-                      "vfModuleLabel": "base_vmme"
+                      "vfModuleLabel": "base_vflorence"
                     },
                     "inputs": {}
                   }
@@ -3231,7 +3233,7 @@ describe('Drawing board', function () {
                 "modelCustomizationName": "ExtVL 0"
               }
             },
-            "collectionResource": {},
+            "collectionResources": {},
             "configurations": {
               "Port Mirroring Configuration By Policy 0": {
                 "uuid": "b4398538-e89d-4f13-b33d-ca323434ba50",
@@ -3252,72 +3254,72 @@ describe('Drawing board', function () {
             },
             "serviceProxies": {},
             "vfModules": {
-              "vf_vmee0..VfVmee..vmme_vlc..module-1": {
+              "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
                 "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
                 "invariantUuid": "98a7c88b-b577-476a-90e4-e25a5871e02b",
                 "customizationUuid": "55b1be94-671a-403e-a26c-667e9c47d091",
                 "description": null,
-                "name": "VfVmee..vmme_vlc..module-1",
+                "name": "VfVgeraldine..vflorence_vlc..module-1",
                 "version": "2",
-                "modelCustomizationName": "VfVmee..vmme_vlc..module-1",
+                "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
                 "properties": {
                   "minCountInstances": 0,
                   "maxCountInstances": null,
                   "initialCount": 0,
-                  "vfModuleLabel": "vmme_vlc"
+                  "vfModuleLabel": "vflorence_vlc"
                 },
                 "inputs": {},
                 "volumeGroupAllowed": false
               },
-              "vf_vmee0..VfVmee..vmme_gpb..module-2": {
+              "vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2": {
                 "uuid": "41708296-e443-4c71-953f-d9a010f059e1",
                 "invariantUuid": "1cca90b8-3490-495e-87da-3f3e4c57d5b9",
                 "customizationUuid": "6add59e0-7fe1-4bc4-af48-f8812422ae7c",
                 "description": null,
-                "name": "VfVmee..vmme_gpb..module-2",
+                "name": "VfVgeraldine..vflorence_gpb..module-2",
                 "version": "2",
-                "modelCustomizationName": "VfVmee..vmme_gpb..module-2",
+                "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
                 "properties": {
                   "minCountInstances": 0,
                   "maxCountInstances": null,
                   "initialCount": 0,
-                  "vfModuleLabel": "vmme_gpb"
+                  "vfModuleLabel": "vflorence_gpb"
                 },
                 "inputs": {},
                 "volumeGroupAllowed": false
               },
-              "vf_vmee0..VfVmee..base_vmme..module-0": {
+              "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
                 "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
                 "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
                 "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
                 "description": null,
-                "name": "VfVmee..base_vmme..module-0",
+                "name": "VfVgeraldine..base_vflorence..module-0",
                 "version": "2",
-                "modelCustomizationName": "VfVmee..base_vmme..module-0",
+                "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
                 "properties": {
                   "minCountInstances": 1,
                   "maxCountInstances": 1,
                   "initialCount": 1,
-                  "vfModuleLabel": "base_vmme"
+                  "vfModuleLabel": "base_vflorence"
                 },
                 "inputs": {},
                 "volumeGroupAllowed": true
               }
             },
             "volumeGroups": {
-              "vf_vmee0..VfVmee..base_vmme..module-0": {
+              "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
                 "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
                 "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
                 "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
                 "description": null,
-                "name": "VfVmee..base_vmme..module-0",
+                "name": "VfVgeraldine..base_vflorence..module-0",
                 "version": "2",
-                "modelCustomizationName": "VfVmee..base_vmme..module-0",
+                "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
                 "properties": {
                   "minCountInstances": 1,
                   "maxCountInstances": 1,
                   "initialCount": 1,
-                  "vfModuleLabel": "base_vmme"
+                  "vfModuleLabel": "base_vflorence"
                 },
                 "inputs": {}
               }
@@ -3328,21 +3330,21 @@ describe('Drawing board', function () {
         "serviceInstance": {
           "f4d84bb4-a416-4b4e-997e-0059973630b9": {
             "vnfs": {
-              "2017-488_ADIOD-vPE 0": {
+              "2017-488_PASQUALE-vPE 0": {
                 "rollbackOnFailure": "true",
                 "vfModules": {
-                  "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
-                    "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0jkyqv": {
+                  "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
+                    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0jkyqv": {
                       "isMissingData": false,
                       "sdncPreReload": null,
                       "modelInfo": {
                         "modelType": "VFmodule",
                         "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
                         "modelVersionId": "040e591e-5d30-4e0d-850f-7266e5a8e013",
-                        "modelName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+                        "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
                         "modelVersion": "6",
                         "modelCustomizationId": "5c5f91f9-5e31-4120-b892-5536587ec258",
-                        "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0"
+                        "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0"
                       },
                       "instanceParams": [
                         {}
@@ -3362,27 +3364,27 @@ describe('Drawing board', function () {
                   "modelType": "VF",
                   "modelInvariantId": "5be7e99e-8eb2-4d97-be63-8081ff3cd10e",
                   "modelVersionId": "f4d84bb4-a416-4b4e-997e-0059973630b9",
-                  "modelName": "2017-488_ADIOD-vPE",
+                  "modelName": "2017-488_PASQUALE-vPE",
                   "modelVersion": "9.0",
-                  "modelCustomizationName": "2017-488_ADIOD-vPE 0"
+                  "modelCustomizationName": "2017-488_PASQUALE-vPE 0"
                 },
                 "trackById": "iapflwk8bip"
               },
-              "2017-488_ADIOD-vPE 0:0001": {
+              "2017-488_PASQUALE-vPE 0:0001": {
                 "rollbackOnFailure": "true",
                 "vfModules": {
-                  "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
-                    "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0jkyqv": {
+                  "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
+                    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0jkyqv": {
                       "isMissingData": false,
                       "sdncPreReload": null,
                       "modelInfo": {
                         "modelType": "VFmodule",
                         "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
                         "modelVersionId": "040e591e-5d30-4e0d-850f-7266e5a8e013",
-                        "modelName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+                        "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
                         "modelVersion": "6",
                         "modelCustomizationId": "5c5f91f9-5e31-4120-b892-5536587ec258",
-                        "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0"
+                        "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0"
                       },
                       "instanceParams": [
                         {}
@@ -3392,7 +3394,7 @@ describe('Drawing board', function () {
                   }
                 },
                 "isMissingData": true,
-                "originalName": "2017-488_ADIOD-vPE 0",
+                "originalName": "2017-488_PASQUALE-vPE 0",
                 "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
                 "lcpCloudRegionId": null,
                 "tenantId": null,
@@ -3402,23 +3404,23 @@ describe('Drawing board', function () {
                   "modelType": "VF",
                   "modelInvariantId": "5be7e99e-8eb2-4d97-be63-8081ff3cd10e",
                   "modelVersionId": "f4d84bb4-a416-4b4e-997e-0059973630b9",
-                  "modelName": "2017-488_ADIOD-vPE",
+                  "modelName": "2017-488_PASQUALE-vPE",
                   "modelVersion": "9.0",
-                  "modelCustomizationName": "2017-488_ADIOD-vPE 0"
+                  "modelCustomizationName": "2017-488_PASQUALE-vPE 0"
                 },
                 "trackById": "iapflwk8bip"
               }
             },
             "instanceParams": [
               {
-                "2017488_adiodvpe0_ASN": "AV_vPE"
+                "2017488_pasqualevpe0_ASN": "AV_vPE"
               }
             ],
             "validationCounter": 1,
             "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
             "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
             "subscriptionServiceType": "TYLER SILVIA",
-            "lcpCloudRegionId": "JANET25",
+            "lcpCloudRegionId": "AAIAIC25",
             "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
             "aicZoneId": "JAG1",
             "projectName": "x1",
@@ -3428,7 +3430,7 @@ describe('Drawing board', function () {
             "modelInfo": {
               "modelInvariantId": "598e3f9e-3244-4d8f-a8e0-0e5d7a29eda9",
               "modelVersionId": "f4d84bb4-a416-4b4e-997e-0059973630b9",
-              "modelName": "ADIOD vMX vPE_BV Service 488",
+              "modelName": "PASQUALE vMX vPE_BV Service 488",
               "modelVersion": "1.0"
             },
             "existingVNFCounterMap": {
@@ -3442,8 +3444,8 @@ describe('Drawing board', function () {
         "lcpRegionsAndTenants": {
           "lcpRegionList": [
             {
-              "id": "JANET25",
-              "name": "JANET25",
+              "id": "AAIAIC25",
+              "name": "AAIAIC25",
               "isPermitted": true
             },
             {
@@ -3453,7 +3455,7 @@ describe('Drawing board', function () {
             }
           ],
           "lcpRegionsTenantsMap": {
-            "JANET25": [
+            "AAIAIC25": [
               {
                 "id": "092eb9e8e4b7412e8787dd091bc58e86",
                 "name": "USP-SIP-IC-24335-T-01",
@@ -3564,7 +3566,7 @@ describe('Drawing board', function () {
         "productFamilies": [
           {
             "id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-            "name": "SCOTTIE",
+            "name": "ERICA",
             "isPermitted": true
           },
           {
@@ -3589,7 +3591,7 @@ describe('Drawing board', function () {
           },
           {
             "id": "323d69d9-2efe-4r45-ay0a-89ea7ard4e6f",
-            "name": "vSCP",
+            "name": "vEsmeralda",
             "isPermitted": true
           },
           {
@@ -3633,7 +3635,7 @@ describe('Drawing board', function () {
             "isPermitted": true
           },
           {
-            "id": "Cisneros",
+            "id": "vMuriel",
             "name": "vMuriel",
             "isPermitted": true
           },
@@ -3659,7 +3661,7 @@ describe('Drawing board', function () {
           },
           {
             "id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
-            "name": "Josefina",
+            "name": "JOSEFINA",
             "isPermitted": true
           },
           {
@@ -3707,7 +3709,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "6",
-              "name": "vSEGW",
+              "name": "vPorfirio",
               "isPermitted": false
             },
             {
@@ -3722,7 +3724,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "9",
-              "name": "vMME",
+              "name": "vFLORENCE",
               "isPermitted": false
             },
             {
@@ -3732,7 +3734,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "11",
-              "name": "vSCP",
+              "name": "vEsmeralda",
               "isPermitted": false
             },
             {
@@ -3742,7 +3744,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "13",
-              "name": "vMMSC",
+              "name": "vWINIFRED",
               "isPermitted": false
             },
             {
@@ -3857,16 +3859,8 @@ describe('Drawing board', function () {
           "FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
           "FLAG_SHOW_ASSIGNMENTS": true,
           "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
-          "FLAG_UNASSIGN_SERVICE": true,
           "FLAG_SHOW_VERIFY_SERVICE": false,
-          "FLAG_COLLECTION_RESOURCE_SUPPORT": true,
-          "FLAG_DUPLICATE_VNF": true,
           "FLAG_SERVICE_MODEL_CACHE": true,
-          "CREATE_INSTANCE_TEST": false,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": true,
-          "FLAG_ASYNC_INSTANTIATION": true,
-          "FLAG_ASYNC_JOBS": true,
-          "EMPTY_DRAWING_BOARD_TEST": false,
           "FLAG_ADD_MSO_TESTAPI_FIELD": true
         },
         "type": "[FLAGS] Update"
@@ -3877,17 +3871,20 @@ describe('Drawing board', function () {
             "service": {
               "uuid": "f4d84bb4-a416-4b4e-997e-0059973630b9",
               "invariantUuid": "598e3f9e-3244-4d8f-a8e0-0e5d7a29eda9",
-              "name": "ADIOD vMX vPE_BV Service 488",
+              "name": "PASQUALE vMX vPE_BV Service 488",
               "version": "1.0",
               "toscaModelURL": null,
               "category": "Network L1-3",
               "serviceType": "",
               "serviceRole": "",
-              "description": "ADIOD vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM",
+              "description": "PASQUALE vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM",
               "serviceEcompNaming": "true",
               "instantiationType": "Macro",
+              "vidNotions": {
+                "instantiationType": "Macro"
+              },
               "inputs": {
-                "2017488_adiodvpe0_ASN": {
+                "2017488_pasqualevpe0_ASN": {
                   "type": "string",
                   "description": "AV/PE",
                   "entry_schema": null,
@@ -3899,11 +3896,11 @@ describe('Drawing board', function () {
               }
             },
             "vnfs": {
-              "2017-488_ADIOD-vPE 0": {
+              "2017-488_PASQUALE-vPE 0": {
                 "uuid": "ea81d6f7-0861-44a7-b7d5-d173b562c350",
                 "invariantUuid": "5be7e99e-8eb2-4d97-be63-8081ff3cd10e",
-                "description": "Name ADIOD vPE Description The provider edge function for the ADIOD service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-                "name": "2017-488_ADIOD-vPE",
+                "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
+                "name": "2017-488_PASQUALE-vPE",
                 "version": "9.0",
                 "customizationUuid": "41516cc6-5098-4b40-a619-f8d5f55fc4d8",
                 "inputs": {
@@ -3975,42 +3972,42 @@ describe('Drawing board', function () {
                   "vnf_config_template_version": {
                     "displayName": "vnf_config_template_version",
                     "command": "get_input",
-                    "inputName": "2017488_adiodvpe0_vnf_config_template_version"
+                    "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
                   },
                   "bandwidth_units": {
                     "displayName": "bandwidth_units",
                     "command": "get_input",
-                    "inputName": "2017488_adiodvpe0_bandwidth_units"
+                    "inputName": "2017488_pasqualevpe0_bandwidth_units"
                   },
                   "bandwidth": {
                     "displayName": "bandwidth",
                     "command": "get_input",
-                    "inputName": "2017488_adiodvpe0_bandwidth"
+                    "inputName": "2017488_pasqualevpe0_bandwidth"
                   },
                   "AIC_CLLI": {
                     "displayName": "AIC_CLLI",
                     "command": "get_input",
-                    "inputName": "2017488_adiodvpe0_AIC_CLLI"
+                    "inputName": "2017488_pasqualevpe0_AIC_CLLI"
                   },
                   "availability_zone_0": {
                     "displayName": "availability_zone_0",
                     "command": "get_input",
-                    "inputName": "2017488_adiodvpe0_availability_zone_0"
+                    "inputName": "2017488_pasqualevpe0_availability_zone_0"
                   },
                   "ASN": {
                     "displayName": "ASN",
                     "command": "get_input",
-                    "inputName": "2017488_adiodvpe0_ASN"
+                    "inputName": "2017488_pasqualevpe0_ASN"
                   },
                   "vnf_instance_name": {
                     "displayName": "vnf_instance_name",
                     "command": "get_input",
-                    "inputName": "2017488_adiodvpe0_vnf_instance_name"
+                    "inputName": "2017488_pasqualevpe0_vnf_instance_name"
                   }
                 },
                 "properties": {
                   "vmxvre_retype": "RE-VMX",
-                  "vnf_config_template_version": "get_input:2017488_adiodvpe0_vnf_config_template_version",
+                  "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
                   "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
                   "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
                   "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
@@ -4052,11 +4049,11 @@ describe('Drawing board', function () {
                   "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
                   "vmxvpfe_sriov44_0_port_vlanstrip": "false",
                   "vf_module_id": "123",
-                  "nf_function": "ADIOD vPE",
+                  "nf_function": "PASQUALE vPE",
                   "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
                   "vmxvre_int_ctl_ip_0": "10.0.0.10",
                   "ecomp_generated_naming": "true",
-                  "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI",
+                  "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
                   "vnf_name": "mtnj309me6vre",
                   "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
                   "vmxvre_volume_type_1": "HITACHI",
@@ -4064,14 +4061,14 @@ describe('Drawing board', function () {
                   "vmxvre_volume_type_0": "HITACHI",
                   "vmxvpfe_volume_type_0": "HITACHI",
                   "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-                  "bandwidth_units": "get_input:2017488_adiodvpe0_bandwidth_units",
+                  "bandwidth_units": "get_input:2017488_pasqualevpe0_bandwidth_units",
                   "vnf_id": "123",
                   "vmxvre_oam_prefix": "24",
-                  "availability_zone_0": "get_input:2017488_adiodvpe0_availability_zone_0",
-                  "ASN": "get_input:2017488_adiodvpe0_ASN",
+                  "availability_zone_0": "get_input:2017488_pasqualevpe0_availability_zone_0",
+                  "ASN": "get_input:2017488_pasqualevpe0_ASN",
                   "vmxvre_chassis_i2cid": "161",
                   "vmxvpfe_name_0": "vPFEXI",
-                  "bandwidth": "get_input:2017488_adiodvpe0_bandwidth",
+                  "bandwidth": "get_input:2017488_pasqualevpe0_bandwidth",
                   "availability_zone_max_count": "1",
                   "vmxvre_volume_size_0": "45.0",
                   "vmxvre_volume_size_1": "50.0",
@@ -4081,7 +4078,7 @@ describe('Drawing board', function () {
                   "vmxvre_ore_present": "0",
                   "vmxvre_volume_name_0": "vREXI_FBVolume",
                   "vmxvre_type": "0",
-                  "vnf_instance_name": "get_input:2017488_adiodvpe0_vnf_instance_name",
+                  "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
                   "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
                   "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
                   "vmx_int_ctl_len": "24",
@@ -4095,82 +4092,82 @@ describe('Drawing board', function () {
                   "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
                 },
                 "type": "VF",
-                "modelCustomizationName": "2017-488_ADIOD-vPE 0",
+                "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
                 "vfModules": {
-                  "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+                  "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
                     "uuid": "a5d8df05-11cb-4351-96e0-b6d4168ea4df",
                     "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
                     "customizationUuid": "f3d97417-0c8d-424e-8ff7-b2eb4fbcecc3",
                     "description": null,
-                    "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                    "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                     "version": "8",
-                    "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                     "properties": {
                       "minCountInstances": 2,
                       "maxCountInstances": null,
                       "initialCount": 0,
-                      "vfModuleLabel": "ADIOD_vRE_BV"
+                      "vfModuleLabel": "PASQUALE_vRE_BV"
                     },
                     "inputs": {
-                      "2017488_adiodvpe0_bandwidth_units": {
+                      "2017488_pasqualevpe0_bandwidth_units": {
                         "type": "string",
                         "description": "Units of bandwidth",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "bandwidth_units"
                         },
                         "constraints": null,
                         "required": true,
                         "default": "Gbps"
                       },
-                      "2017488_adiodvpe0_bandwidth": {
+                      "2017488_pasqualevpe0_bandwidth": {
                         "type": "string",
                         "description": "Requested VPE bandwidth",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "bandwidth"
                         },
                         "constraints": null,
                         "required": true,
                         "default": "10"
                       },
-                      "2017488_adiodvpe0_vnf_instance_name": {
+                      "2017488_pasqualevpe0_vnf_instance_name": {
                         "type": "string",
                         "description": "The hostname assigned to the vpe.",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "vnf_instance_name"
                         },
                         "constraints": null,
                         "required": true,
                         "default": "mtnj309me6"
                       },
-                      "2017488_adiodvpe0_vnf_config_template_version": {
+                      "2017488_pasqualevpe0_vnf_config_template_version": {
                         "type": "string",
                         "description": "VPE Software Version",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "vnf_config_template_version"
                         },
                         "constraints": null,
                         "required": true,
                         "default": "17.2"
                       },
-                      "2017488_adiodvpe0_AIC_CLLI": {
+                      "2017488_pasqualevpe0_AIC_CLLI": {
                         "type": "string",
                         "description": "AIC Site CLLI",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "AIC_CLLI"
                         },
                         "constraints": null,
@@ -4180,45 +4177,45 @@ describe('Drawing board', function () {
                     },
                     "volumeGroupAllowed": true
                   },
-                  "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
+                  "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
                     "uuid": "040e591e-5d30-4e0d-850f-7266e5a8e013",
                     "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
                     "customizationUuid": "5c5f91f9-5e31-4120-b892-5536587ec258",
                     "description": null,
-                    "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+                    "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
                     "version": "6",
-                    "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
                     "properties": {
                       "minCountInstances": 1,
                       "maxCountInstances": 1,
                       "initialCount": 1,
-                      "vfModuleLabel": "ADIOD_base_vPE_BV"
+                      "vfModuleLabel": "PASQUALE_base_vPE_BV"
                     },
                     "inputs": {},
                     "volumeGroupAllowed": false
                   },
-                  "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+                  "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
                     "uuid": "b3e8b26e-cff0-49fc-a4e6-f3e16c8440fe",
                     "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
                     "customizationUuid": "6e410843-257c-46d9-ba8a-8d94e1362452",
                     "description": null,
-                    "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                    "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                     "version": "8",
-                    "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                     "properties": {
                       "minCountInstances": 0,
                       "maxCountInstances": null,
                       "initialCount": 0,
-                      "vfModuleLabel": "ADIOD_vPFE_BV"
+                      "vfModuleLabel": "PASQUALE_vPFE_BV"
                     },
                     "inputs": {
-                      "2017488_adiodvpe0_availability_zone_0": {
+                      "2017488_pasqualevpe0_availability_zone_0": {
                         "type": "string",
                         "description": "The Availability Zone to launch the instance.",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vPFE_BV",
+                          "vfModuleLabel": "PASQUALE_vPFE_BV",
                           "paramName": "availability_zone_0"
                         },
                         "constraints": null,
@@ -4230,80 +4227,80 @@ describe('Drawing board', function () {
                   }
                 },
                 "volumeGroups": {
-                  "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+                  "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
                     "uuid": "a5d8df05-11cb-4351-96e0-b6d4168ea4df",
                     "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
                     "customizationUuid": "f3d97417-0c8d-424e-8ff7-b2eb4fbcecc3",
                     "description": null,
-                    "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                    "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                     "version": "8",
-                    "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                     "properties": {
                       "minCountInstances": 0,
                       "maxCountInstances": null,
                       "initialCount": 0,
-                      "vfModuleLabel": "ADIOD_vRE_BV"
+                      "vfModuleLabel": "PASQUALE_vRE_BV"
                     },
                     "inputs": {
-                      "2017488_adiodvpe0_bandwidth_units": {
+                      "2017488_pasqualevpe0_bandwidth_units": {
                         "type": "string",
                         "description": "Units of bandwidth",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "bandwidth_units"
                         },
                         "constraints": null,
                         "required": true,
                         "default": "Gbps"
                       },
-                      "2017488_adiodvpe0_bandwidth": {
+                      "2017488_pasqualevpe0_bandwidth": {
                         "type": "string",
                         "description": "Requested VPE bandwidth",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "bandwidth"
                         },
                         "constraints": null,
                         "required": true,
                         "default": "10"
                       },
-                      "2017488_adiodvpe0_vnf_instance_name": {
+                      "2017488_pasqualevpe0_vnf_instance_name": {
                         "type": "string",
                         "description": "The hostname assigned to the vpe.",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "vnf_instance_name"
                         },
                         "constraints": null,
                         "required": true,
                         "default": "mtnj309me6"
                       },
-                      "2017488_adiodvpe0_vnf_config_template_version": {
+                      "2017488_pasqualevpe0_vnf_config_template_version": {
                         "type": "string",
                         "description": "VPE Software Version",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "vnf_config_template_version"
                         },
                         "constraints": null,
                         "required": true,
                         "default": "17.2"
                       },
-                      "2017488_adiodvpe0_AIC_CLLI": {
+                      "2017488_pasqualevpe0_AIC_CLLI": {
                         "type": "string",
                         "description": "AIC Site CLLI",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vRE_BV",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
                           "paramName": "AIC_CLLI"
                         },
                         "constraints": null,
@@ -4312,28 +4309,28 @@ describe('Drawing board', function () {
                       }
                     }
                   },
-                  "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+                  "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
                     "uuid": "b3e8b26e-cff0-49fc-a4e6-f3e16c8440fe",
                     "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
                     "customizationUuid": "6e410843-257c-46d9-ba8a-8d94e1362452",
                     "description": null,
-                    "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                    "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                     "version": "8",
-                    "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                     "properties": {
                       "minCountInstances": 0,
                       "maxCountInstances": null,
                       "initialCount": 0,
-                      "vfModuleLabel": "ADIOD_vPFE_BV"
+                      "vfModuleLabel": "PASQUALE_vPFE_BV"
                     },
                     "inputs": {
-                      "2017488_adiodvpe0_availability_zone_0": {
+                      "2017488_pasqualevpe0_availability_zone_0": {
                         "type": "string",
                         "description": "The Availability Zone to launch the instance.",
                         "entry_schema": null,
                         "inputProperties": {
                           "sourceType": "HEAT",
-                          "vfModuleLabel": "ADIOD_vPFE_BV",
+                          "vfModuleLabel": "PASQUALE_vPFE_BV",
                           "paramName": "availability_zone_0"
                         },
                         "constraints": null,
@@ -4347,84 +4344,84 @@ describe('Drawing board', function () {
               }
             },
             "networks": {},
-            "collectionResource": {},
+            "collectionResources": {},
             "configurations": {},
             "serviceProxies": {},
             "vfModules": {
-              "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+              "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
                 "uuid": "a5d8df05-11cb-4351-96e0-b6d4168ea4df",
                 "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
                 "customizationUuid": "f3d97417-0c8d-424e-8ff7-b2eb4fbcecc3",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                 "version": "8",
-                "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                 "properties": {
                   "minCountInstances": 0,
                   "maxCountInstances": null,
                   "initialCount": 0,
-                  "vfModuleLabel": "ADIOD_vRE_BV"
+                  "vfModuleLabel": "PASQUALE_vRE_BV"
                 },
                 "inputs": {
-                  "2017488_adiodvpe0_bandwidth_units": {
+                  "2017488_pasqualevpe0_bandwidth_units": {
                     "type": "string",
                     "description": "Units of bandwidth",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "bandwidth_units"
                     },
                     "constraints": null,
                     "required": true,
                     "default": "Gbps"
                   },
-                  "2017488_adiodvpe0_bandwidth": {
+                  "2017488_pasqualevpe0_bandwidth": {
                     "type": "string",
                     "description": "Requested VPE bandwidth",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "bandwidth"
                     },
                     "constraints": null,
                     "required": true,
                     "default": "10"
                   },
-                  "2017488_adiodvpe0_vnf_instance_name": {
+                  "2017488_pasqualevpe0_vnf_instance_name": {
                     "type": "string",
                     "description": "The hostname assigned to the vpe.",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "vnf_instance_name"
                     },
                     "constraints": null,
                     "required": true,
                     "default": "mtnj309me6"
                   },
-                  "2017488_adiodvpe0_vnf_config_template_version": {
+                  "2017488_pasqualevpe0_vnf_config_template_version": {
                     "type": "string",
                     "description": "VPE Software Version",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "vnf_config_template_version"
                     },
                     "constraints": null,
                     "required": true,
                     "default": "17.2"
                   },
-                  "2017488_adiodvpe0_AIC_CLLI": {
+                  "2017488_pasqualevpe0_AIC_CLLI": {
                     "type": "string",
                     "description": "AIC Site CLLI",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "AIC_CLLI"
                     },
                     "constraints": null,
@@ -4434,45 +4431,45 @@ describe('Drawing board', function () {
                 },
                 "volumeGroupAllowed": true
               },
-              "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
+              "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
                 "uuid": "040e591e-5d30-4e0d-850f-7266e5a8e013",
                 "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
                 "customizationUuid": "5c5f91f9-5e31-4120-b892-5536587ec258",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+                "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
                 "version": "6",
-                "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
                 "properties": {
                   "minCountInstances": 1,
                   "maxCountInstances": 1,
                   "initialCount": 1,
-                  "vfModuleLabel": "ADIOD_base_vPE_BV"
+                  "vfModuleLabel": "PASQUALE_base_vPE_BV"
                 },
                 "inputs": {},
                 "volumeGroupAllowed": false
               },
-              "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+              "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
                 "uuid": "b3e8b26e-cff0-49fc-a4e6-f3e16c8440fe",
                 "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
                 "customizationUuid": "6e410843-257c-46d9-ba8a-8d94e1362452",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                 "version": "8",
-                "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                 "properties": {
                   "minCountInstances": 0,
                   "maxCountInstances": null,
                   "initialCount": 0,
-                  "vfModuleLabel": "ADIOD_vPFE_BV"
+                  "vfModuleLabel": "PASQUALE_vPFE_BV"
                 },
                 "inputs": {
-                  "2017488_adiodvpe0_availability_zone_0": {
+                  "2017488_pasqualevpe0_availability_zone_0": {
                     "type": "string",
                     "description": "The Availability Zone to launch the instance.",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vPFE_BV",
+                      "vfModuleLabel": "PASQUALE_vPFE_BV",
                       "paramName": "availability_zone_0"
                     },
                     "constraints": null,
@@ -4484,80 +4481,80 @@ describe('Drawing board', function () {
               }
             },
             "volumeGroups": {
-              "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+              "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
                 "uuid": "a5d8df05-11cb-4351-96e0-b6d4168ea4df",
                 "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
                 "customizationUuid": "f3d97417-0c8d-424e-8ff7-b2eb4fbcecc3",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                 "version": "8",
-                "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                 "properties": {
                   "minCountInstances": 0,
                   "maxCountInstances": null,
                   "initialCount": 0,
-                  "vfModuleLabel": "ADIOD_vRE_BV"
+                  "vfModuleLabel": "PASQUALE_vRE_BV"
                 },
                 "inputs": {
-                  "2017488_adiodvpe0_bandwidth_units": {
+                  "2017488_pasqualevpe0_bandwidth_units": {
                     "type": "string",
                     "description": "Units of bandwidth",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "bandwidth_units"
                     },
                     "constraints": null,
                     "required": true,
                     "default": "Gbps"
                   },
-                  "2017488_adiodvpe0_bandwidth": {
+                  "2017488_pasqualevpe0_bandwidth": {
                     "type": "string",
                     "description": "Requested VPE bandwidth",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "bandwidth"
                     },
                     "constraints": null,
                     "required": true,
                     "default": "10"
                   },
-                  "2017488_adiodvpe0_vnf_instance_name": {
+                  "2017488_pasqualevpe0_vnf_instance_name": {
                     "type": "string",
                     "description": "The hostname assigned to the vpe.",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "vnf_instance_name"
                     },
                     "constraints": null,
                     "required": true,
                     "default": "mtnj309me6"
                   },
-                  "2017488_adiodvpe0_vnf_config_template_version": {
+                  "2017488_pasqualevpe0_vnf_config_template_version": {
                     "type": "string",
                     "description": "VPE Software Version",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "vnf_config_template_version"
                     },
                     "constraints": null,
                     "required": true,
                     "default": "17.2"
                   },
-                  "2017488_adiodvpe0_AIC_CLLI": {
+                  "2017488_pasqualevpe0_AIC_CLLI": {
                     "type": "string",
                     "description": "AIC Site CLLI",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vRE_BV",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
                       "paramName": "AIC_CLLI"
                     },
                     "constraints": null,
@@ -4566,28 +4563,28 @@ describe('Drawing board', function () {
                   }
                 }
               },
-              "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+              "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
                 "uuid": "b3e8b26e-cff0-49fc-a4e6-f3e16c8440fe",
                 "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
                 "customizationUuid": "6e410843-257c-46d9-ba8a-8d94e1362452",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                 "version": "8",
-                "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                 "properties": {
                   "minCountInstances": 0,
                   "maxCountInstances": null,
                   "initialCount": 0,
-                  "vfModuleLabel": "ADIOD_vPFE_BV"
+                  "vfModuleLabel": "PASQUALE_vPFE_BV"
                 },
                 "inputs": {
-                  "2017488_adiodvpe0_availability_zone_0": {
+                  "2017488_pasqualevpe0_availability_zone_0": {
                     "type": "string",
                     "description": "The Availability Zone to launch the instance.",
                     "entry_schema": null,
                     "inputProperties": {
                       "sourceType": "HEAT",
-                      "vfModuleLabel": "ADIOD_vPFE_BV",
+                      "vfModuleLabel": "PASQUALE_vPFE_BV",
                       "paramName": "availability_zone_0"
                     },
                     "constraints": null,
@@ -4612,14 +4609,17 @@ describe('Drawing board', function () {
               "description": "ComplexService",
               "serviceEcompNaming": "true",
               "instantiationType": "Macro",
+              "vidNotions": {
+                "instantiationType": "Macro"
+              },
               "inputs": {}
             },
             "vnfs": {
-              "VF_vMee 0": {
+              "VF_vGeraldine 0": {
                 "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
                 "invariantUuid": "4160458e-f648-4b30-a176-43881ffffe9e",
-                "description": "VSP_vMee",
-                "name": "VF_vMee",
+                "description": "VSP_vGeraldine",
+                "name": "VF_vGeraldine",
                 "version": "2.0",
                 "customizationUuid": "91415b44-753d-494c-926a-456a9172bbb9",
                 "inputs": {},
@@ -4788,74 +4788,74 @@ describe('Drawing board', function () {
                   "sctp-b-egress-dst_end_port": "65535.0"
                 },
                 "type": "VF",
-                "modelCustomizationName": "VF_vMee 0",
+                "modelCustomizationName": "VF_vGeraldine 0",
                 "vfModules": {
-                  "vf_vmee0..VfVmee..vmme_vlc..module-1": {
+                  "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
                     "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
                     "invariantUuid": "98a7c88b-b577-476a-90e4-e25a5871e02b",
                     "customizationUuid": "55b1be94-671a-403e-a26c-667e9c47d091",
                     "description": null,
-                    "name": "VfVmee..vmme_vlc..module-1",
+                    "name": "VfVgeraldine..vflorence_vlc..module-1",
                     "version": "2",
-                    "modelCustomizationName": "VfVmee..vmme_vlc..module-1",
+                    "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
                     "properties": {
                       "minCountInstances": 0,
                       "maxCountInstances": null,
                       "initialCount": 0,
-                      "vfModuleLabel": "vmme_vlc"
+                      "vfModuleLabel": "vflorence_vlc"
                     },
                     "inputs": {},
                     "volumeGroupAllowed": false
                   },
-                  "vf_vmee0..VfVmee..vmme_gpb..module-2": {
+                  "vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2": {
                     "uuid": "41708296-e443-4c71-953f-d9a010f059e1",
                     "invariantUuid": "1cca90b8-3490-495e-87da-3f3e4c57d5b9",
                     "customizationUuid": "6add59e0-7fe1-4bc4-af48-f8812422ae7c",
                     "description": null,
-                    "name": "VfVmee..vmme_gpb..module-2",
+                    "name": "VfVgeraldine..vflorence_gpb..module-2",
                     "version": "2",
-                    "modelCustomizationName": "VfVmee..vmme_gpb..module-2",
+                    "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
                     "properties": {
                       "minCountInstances": 0,
                       "maxCountInstances": null,
                       "initialCount": 0,
-                      "vfModuleLabel": "vmme_gpb"
+                      "vfModuleLabel": "vflorence_gpb"
                     },
                     "inputs": {},
                     "volumeGroupAllowed": false
                   },
-                  "vf_vmee0..VfVmee..base_vmme..module-0": {
+                  "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
                     "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
                     "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
                     "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
                     "description": null,
-                    "name": "VfVmee..base_vmme..module-0",
+                    "name": "VfVgeraldine..base_vflorence..module-0",
                     "version": "2",
-                    "modelCustomizationName": "VfVmee..base_vmme..module-0",
+                    "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
                     "properties": {
                       "minCountInstances": 1,
                       "maxCountInstances": 1,
                       "initialCount": 1,
-                      "vfModuleLabel": "base_vmme"
+                      "vfModuleLabel": "base_vflorence"
                     },
                     "inputs": {},
                     "volumeGroupAllowed": true
                   }
                 },
                 "volumeGroups": {
-                  "vf_vmee0..VfVmee..base_vmme..module-0": {
+                  "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
                     "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
                     "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
                     "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
                     "description": null,
-                    "name": "VfVmee..base_vmme..module-0",
+                    "name": "VfVgeraldine..base_vflorence..module-0",
                     "version": "2",
-                    "modelCustomizationName": "VfVmee..base_vmme..module-0",
+                    "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
                     "properties": {
                       "minCountInstances": 1,
                       "maxCountInstances": 1,
                       "initialCount": 1,
-                      "vfModuleLabel": "base_vmme"
+                      "vfModuleLabel": "base_vflorence"
                     },
                     "inputs": {}
                   }
@@ -4883,7 +4883,7 @@ describe('Drawing board', function () {
                 "modelCustomizationName": "ExtVL 0"
               }
             },
-            "collectionResource": {},
+            "collectionResources": {},
             "configurations": {
               "Port Mirroring Configuration By Policy 0": {
                 "uuid": "b4398538-e89d-4f13-b33d-ca323434ba50",
@@ -4904,72 +4904,72 @@ describe('Drawing board', function () {
             },
             "serviceProxies": {},
             "vfModules": {
-              "vf_vmee0..VfVmee..vmme_vlc..module-1": {
+              "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
                 "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
                 "invariantUuid": "98a7c88b-b577-476a-90e4-e25a5871e02b",
                 "customizationUuid": "55b1be94-671a-403e-a26c-667e9c47d091",
                 "description": null,
-                "name": "VfVmee..vmme_vlc..module-1",
+                "name": "VfVgeraldine..vflorence_vlc..module-1",
                 "version": "2",
-                "modelCustomizationName": "VfVmee..vmme_vlc..module-1",
+                "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
                 "properties": {
                   "minCountInstances": 0,
                   "maxCountInstances": null,
                   "initialCount": 0,
-                  "vfModuleLabel": "vmme_vlc"
+                  "vfModuleLabel": "vflorence_vlc"
                 },
                 "inputs": {},
                 "volumeGroupAllowed": false
               },
-              "vf_vmee0..VfVmee..vmme_gpb..module-2": {
+              "vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2": {
                 "uuid": "41708296-e443-4c71-953f-d9a010f059e1",
                 "invariantUuid": "1cca90b8-3490-495e-87da-3f3e4c57d5b9",
                 "customizationUuid": "6add59e0-7fe1-4bc4-af48-f8812422ae7c",
                 "description": null,
-                "name": "VfVmee..vmme_gpb..module-2",
+                "name": "VfVgeraldine..vflorence_gpb..module-2",
                 "version": "2",
-                "modelCustomizationName": "VfVmee..vmme_gpb..module-2",
+                "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
                 "properties": {
                   "minCountInstances": 0,
                   "maxCountInstances": null,
                   "initialCount": 0,
-                  "vfModuleLabel": "vmme_gpb"
+                  "vfModuleLabel": "vflorence_gpb"
                 },
                 "inputs": {},
                 "volumeGroupAllowed": false
               },
-              "vf_vmee0..VfVmee..base_vmme..module-0": {
+              "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
                 "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
                 "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
                 "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
                 "description": null,
-                "name": "VfVmee..base_vmme..module-0",
+                "name": "VfVgeraldine..base_vflorence..module-0",
                 "version": "2",
-                "modelCustomizationName": "VfVmee..base_vmme..module-0",
+                "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
                 "properties": {
                   "minCountInstances": 1,
                   "maxCountInstances": 1,
                   "initialCount": 1,
-                  "vfModuleLabel": "base_vmme"
+                  "vfModuleLabel": "base_vflorence"
                 },
                 "inputs": {},
                 "volumeGroupAllowed": true
               }
             },
             "volumeGroups": {
-              "vf_vmee0..VfVmee..base_vmme..module-0": {
+              "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
                 "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
                 "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
                 "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
                 "description": null,
-                "name": "VfVmee..base_vmme..module-0",
+                "name": "VfVgeraldine..base_vflorence..module-0",
                 "version": "2",
-                "modelCustomizationName": "VfVmee..base_vmme..module-0",
+                "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
                 "properties": {
                   "minCountInstances": 1,
                   "maxCountInstances": 1,
                   "initialCount": 1,
-                  "vfModuleLabel": "base_vmme"
+                  "vfModuleLabel": "base_vflorence"
                 },
                 "inputs": {}
               }
@@ -4980,21 +4980,21 @@ describe('Drawing board', function () {
         "serviceInstance": {
           "f4d84bb4-a416-4b4e-997e-0059973630b9": {
             "vnfs": {
-              "2017-488_ADIOD-vPE 0": {
+              "2017-488_PASQUALE-vPE 0": {
                 "rollbackOnFailure": "true",
                 "vfModules": {
-                  "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
-                    "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0jkyqv": {
+                  "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
+                    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0jkyqv": {
                       "isMissingData": true,
                       "sdncPreReload": null,
                       "modelInfo": {
                         "modelType": "VFmodule",
                         "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
                         "modelVersionId": "040e591e-5d30-4e0d-850f-7266e5a8e013",
-                        "modelName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+                        "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
                         "modelVersion": "6",
                         "modelCustomizationId": "5c5f91f9-5e31-4120-b892-5536587ec258",
-                        "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0"
+                        "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0"
                       },
                       "instanceParams": [
                         {}
@@ -5004,7 +5004,7 @@ describe('Drawing board', function () {
                   }
                 },
                 "isMissingData": false,
-                "originalName": "2017-488_ADIOD-vPE 0",
+                "originalName": "2017-488_PASQUALE-vPE 0",
                 "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
                 "lcpCloudRegionId": null,
                 "tenantId": null,
@@ -5014,23 +5014,23 @@ describe('Drawing board', function () {
                   "modelType": "VF",
                   "modelInvariantId": "5be7e99e-8eb2-4d97-be63-8081ff3cd10e",
                   "modelVersionId": "f4d84bb4-a416-4b4e-997e-0059973630b9",
-                  "modelName": "2017-488_ADIOD-vPE",
+                  "modelName": "2017-488_PASQUALE-vPE",
                   "modelVersion": "9.0",
-                  "modelCustomizationName": "2017-488_ADIOD-vPE 0"
+                  "modelCustomizationName": "2017-488_PASQUALE-vPE 0"
                 },
                 "trackById": "iapflwk8bip"
               }
             },
             "instanceParams": [
               {
-                "2017488_adiodvpe0_ASN": "AV_vPE"
+                "2017488_pasqualevpe0_ASN": "AV_vPE"
               }
             ],
             "validationCounter": 1,
             "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
             "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
             "subscriptionServiceType": "TYLER SILVIA",
-            "lcpCloudRegionId": "JANET25",
+            "lcpCloudRegionId": "AAIAIC25",
             "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
             "aicZoneId": "JAG1",
             "projectName": "x1",
@@ -5040,7 +5040,7 @@ describe('Drawing board', function () {
             "modelInfo": {
               "modelInvariantId": "598e3f9e-3244-4d8f-a8e0-0e5d7a29eda9",
               "modelVersionId": "f4d84bb4-a416-4b4e-997e-0059973630b9",
-              "modelName": "ADIOD vMX vPE_BV Service 488",
+              "modelName": "PASQUALE vMX vPE_BV Service 488",
               "modelVersion": "1.0"
             },
             "existingVNFCounterMap": {
@@ -5054,8 +5054,8 @@ describe('Drawing board', function () {
         "lcpRegionsAndTenants": {
           "lcpRegionList": [
             {
-              "id": "JANET25",
-              "name": "JANET25",
+              "id": "AAIAIC25",
+              "name": "AAIAIC25",
               "isPermitted": true
             },
             {
@@ -5065,7 +5065,7 @@ describe('Drawing board', function () {
             }
           ],
           "lcpRegionsTenantsMap": {
-            "JANET25": [
+            "AAIAIC25": [
               {
                 "id": "092eb9e8e4b7412e8787dd091bc58e86",
                 "name": "USP-SIP-IC-24335-T-01",
@@ -5079,8 +5079,128 @@ describe('Drawing board', function () {
                 "isPermitted": true
               },
               {
-                "id": "d0a3e3f2964542259d155a81c41aadc3",
-                "name": "test-hvf6-09",
+                "id": "229bcdc6eaeb4ca59d55221141d01f8e",
+                "name": "AIN Web Tool-15-D-STTest2",
+                "isPermitted": true
+              },
+              {
+                "id": "1178612d2b394be4834ad77f567c0af2",
+                "name": "AIN Web Tool-15-D-SSPtestcustome",
+                "isPermitted": true
+              },
+              {
+                "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
+                "name": "AIN Web Tool-15-D-UncheckedEcopm",
+                "isPermitted": true
+              },
+              {
+                "id": "de007636e25249238447264a988a927b",
+                "name": "AIN Web Tool-15-D-dfsdf",
+                "isPermitted": true
+              },
+              {
+                "id": "62f29b3613634ca6a3065cbe0e020c44",
+                "name": "AIN/SMS-16-D-Multiservices1",
+                "isPermitted": true
+              },
+              {
+                "id": "649289e30d3244e0b48098114d63c2aa",
+                "name": "AIN Web Tool-15-D-SSPST66",
+                "isPermitted": true
+              },
+              {
+                "id": "3f21eeea6c2c486bba31dab816c05a32",
+                "name": "AIN Web Tool-15-D-ASSPST47",
+                "isPermitted": true
+              },
+              {
+                "id": "f60ce21d3ee6427586cff0d22b03b773",
+                "name": "CESAR-100-D-sspjg67246",
+                "isPermitted": true
+              },
+              {
+                "id": "8774659e425f479895ae091bb5d46560",
+                "name": "CESAR-100-D-sspjg68359",
+                "isPermitted": true
+              },
+              {
+                "id": "624eb554b0d147c19ff8885341760481",
+                "name": "AINWebTool-15-D-iftach",
+                "isPermitted": true
+              },
+              {
+                "id": "214f55f5fc414c678059c383b03e4962",
+                "name": "CESAR-100-D-sspjg612401",
+                "isPermitted": true
+              },
+              {
+                "id": "c90666c291664841bb98e4d981ff1db5",
+                "name": "CESAR-100-D-sspjg621340",
+                "isPermitted": true
+              },
+              {
+                "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
+                "name": "sspjg621351cloned",
+                "isPermitted": true
+              },
+              {
+                "id": "b386b768a3f24c8e953abbe0b3488c02",
+                "name": "AINWebTool-15-D-eteancomp",
+                "isPermitted": true
+              },
+              {
+                "id": "dc6c4dbfd225474e9deaadd34968646c",
+                "name": "AINWebTool-15-T-SPFET",
+                "isPermitted": true
+              },
+              {
+                "id": "02cb5030e9914aa4be120bd9ed1e19eb",
+                "name": "AINWebTool-15-X-eeweww",
+                "isPermitted": true
+              },
+              {
+                "id": "f2f3830e4c984d45bcd00e1a04158a79",
+                "name": "CESAR-100-D-spjg61909",
+                "isPermitted": true
+              },
+              {
+                "id": "05b91bd5137f4929878edd965755c06d",
+                "name": "CESAR-100-D-sspjg621512cloned",
+                "isPermitted": true
+              },
+              {
+                "id": "7002fbe8482d4a989ddf445b1ce336e0",
+                "name": "AINWebTool-15-X-vdr",
+                "isPermitted": true
+              },
+              {
+                "id": "4008522be43741dcb1f5422022a2aa0b",
+                "name": "AINWebTool-15-D-ssasa",
+                "isPermitted": true
+              },
+              {
+                "id": "f44e2e96a1b6476abfda2fa407b00169",
+                "name": "AINWebTool-15-D-PFNPT",
+                "isPermitted": true
+              },
+              {
+                "id": "b69a52bec8a84669a37a1e8b72708be7",
+                "name": "AINWebTool-15-X-vdre",
+                "isPermitted": true
+              },
+              {
+                "id": "fac7d9fd56154caeb9332202dcf2969f",
+                "name": "AINWebTool-15-X-NONPODECOMP",
+                "isPermitted": true
+              },
+              {
+                "id": "2d34d8396e194eb49969fd61ffbff961",
+                "name": "DN5242-Nov16-T5",
+                "isPermitted": true
+              },
+              {
+                "id": "cb42a77ff45b48a8b8deb83bb64acc74",
+                "name": "ro-T11",
                 "isPermitted": true
               },
               {
@@ -5088,6 +5208,16 @@ describe('Drawing board', function () {
                 "name": "ro-T112",
                 "isPermitted": true
               },
+              {
+                "id": "4914ab0ab3a743e58f0eefdacc1dde77",
+                "name": "DN5242-Nov21-T1",
+                "isPermitted": true
+              },
+              {
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
+                "isPermitted": true
+              },
               {
                 "id": "cbb99fe4ada84631b7baf046b6fd2044",
                 "name": "DN5242-Nov16-T3",
@@ -5176,7 +5306,7 @@ describe('Drawing board', function () {
         "productFamilies": [
           {
             "id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-            "name": "SCOTTIE",
+            "name": "ERICA",
             "isPermitted": true
           },
           {
@@ -5201,7 +5331,7 @@ describe('Drawing board', function () {
           },
           {
             "id": "323d69d9-2efe-4r45-ay0a-89ea7ard4e6f",
-            "name": "vSCP",
+            "name": "vEsmeralda",
             "isPermitted": true
           },
           {
@@ -5245,7 +5375,7 @@ describe('Drawing board', function () {
             "isPermitted": true
           },
           {
-            "id": "Cisneros",
+            "id": "vMuriel",
             "name": "vMuriel",
             "isPermitted": true
           },
@@ -5271,7 +5401,7 @@ describe('Drawing board', function () {
           },
           {
             "id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
-            "name": "Josefina",
+            "name": "JOSEFINA",
             "isPermitted": true
           },
           {
@@ -5319,7 +5449,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "6",
-              "name": "vSEGW",
+              "name": "vPorfirio",
               "isPermitted": false
             },
             {
@@ -5334,7 +5464,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "9",
-              "name": "vMME",
+              "name": "vFLORENCE",
               "isPermitted": false
             },
             {
@@ -5344,7 +5474,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "11",
-              "name": "vSCP",
+              "name": "vEsmeralda",
               "isPermitted": false
             },
             {
@@ -5354,7 +5484,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "13",
-              "name": "vMMSC",
+              "name": "vWINIFRED",
               "isPermitted": false
             },
             {
@@ -5467,20 +5597,13 @@ describe('Drawing board', function () {
         "name": null,
         "type": "UPDATE_DRAWING_BOARD_STATUS",
         "flags": {
-          "CREATE_INSTANCE_TEST": false,
           "EMPTY_DRAWING_BOARD_TEST": false,
           "FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
-          "FLAG_ASYNC_INSTANTIATION": true,
-          "FLAG_ASYNC_JOBS": true,
           "FLAG_ADD_MSO_TESTAPI_FIELD": true,
-          "FLAG_UNASSIGN_SERVICE": true,
           "FLAG_SERVICE_MODEL_CACHE": true,
-          "FLAG_COLLECTION_RESOURCE_SUPPORT": false,
           "FLAG_SHOW_ASSIGNMENTS": true,
           "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
-          "FLAG_DUPLICATE_VNF": true,
           "FLAG_DEFAULT_VNF": true,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": true,
           "FLAG_A_LA_CARTE_AUDIT_INFO": true,
           "FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST": true,
           "FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS": true,
@@ -5491,7 +5614,6 @@ describe('Drawing board', function () {
           "FLAG_SHOW_VERIFY_SERVICE": false,
           "FLAG_ASYNC_ALACARTE_VFMODULE": true,
           "FLAG_ASYNC_ALACARTE_VNF": true,
-          "FLAG_SHIFT_VFMODULE_PARAMS_TO_VNF": true,
           "FLAG_1810_AAI_LOCAL_CACHE": true,
           "FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER": false,
           "FLAG_EXP_ANY_ALACARTE_NEW_INSTANTIATION_UI": false,
@@ -5521,7 +5643,8 @@ describe('Drawing board', function () {
               "vidNotions": {
                 "instantiationUI": "networkWithPropertyNetworkTechnologyEqualsStandardSriovOrOvs",
                 "modelCategory": "5G Provider Network",
-                "viewEditUI": "legacy"
+                "viewEditUI": "legacy",
+                "instantiationType": "ALaCarte"
               }
             },
             "vnfs": {},
@@ -5575,7 +5698,7 @@ describe('Drawing board', function () {
                 "modelCustomizationName": "SR-IOV Provider 2-2"
               }
             },
-            "collectionResource": {},
+            "collectionResources": {},
             "configurations": {},
             "fabricConfigurations": {},
             "serviceProxies": {},
@@ -5642,7 +5765,7 @@ describe('Drawing board', function () {
             "projectName": null,
             "rollbackOnFailure": "true",
             "aicZoneName": null,
-            "owningEntityName": "FIREWALL-MISCELLANEOUS",
+            "owningEntityName": "CRAIG-ROBERTSELLANEOUS",
             "testApi": "VNF_API",
             "tenantName": null,
             "modelInfo": {
@@ -5717,13 +5840,13 @@ describe('Drawing board', function () {
             "olson6a": [
               {
                 "id": "1dcd712850414fbd91f8a9fc9cca7fd4",
-                "name": "FNvEPC-27099-T-MS-RDM6A",
+                "name": "FNvEPC-27099-T-MS-olson6A",
                 "isPermitted": true,
                 "cloudOwner": "irma-aic"
               },
               {
                 "id": "26af9ed85a004932822a607d5e9973d5",
-                "name": "ssf-28239-T-RDM6A",
+                "name": "ssf-28239-T-olson6A",
                 "isPermitted": true,
                 "cloudOwner": "irma-aic"
               }
@@ -5837,12 +5960,12 @@ describe('Drawing board', function () {
             },
             {
               "id": "9",
-              "name": "vMME",
+              "name": "vFLORENCE",
               "isPermitted": true
             },
             {
               "id": "25",
-              "name": "vMMSC",
+              "name": "vWINIFRED",
               "isPermitted": true
             },
             {
@@ -5862,12 +5985,12 @@ describe('Drawing board', function () {
             },
             {
               "id": "16",
-              "name": "vSCP",
+              "name": "vEsmeralda",
               "isPermitted": true
             },
             {
               "id": "24",
-              "name": "vSEGW",
+              "name": "vPorfirio",
               "isPermitted": true
             },
             {
@@ -5915,7 +6038,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "2d097967-10d4-4c7f-b23c-89978249ae17",
-              "name": "FIREWALL-MISCELLANEOUS"
+              "name": "CRAIG-ROBERTSELLANEOUS"
             },
             {
               "id": "aedf37e2-acda-4976-b89b-fd6d4ddffbc6",
@@ -5923,15 +6046,15 @@ describe('Drawing board', function () {
             },
             {
               "id": "9463675f-6a75-4cc8-8054-c6cb2e67ad51",
-              "name": "METRO-PACKET-CORE"
+              "name": "METRO-JULIO-ERICKSON"
             },
             {
               "id": "92ddf9af-acae-484c-a786-ad7e9c0da26f",
-              "name": "MOBILITY-ACCESS"
+              "name": "EMANUEL-ACCESS"
             },
             {
               "id": "10c645f5-9924-4b89-bec0-b17cf49d3cad",
-              "name": "MOBILITY-CORE"
+              "name": "EMANUEL-CORE"
             },
             {
               "id": "048eb6e7-fa94-4f3b-ae03-3175a750dc57",
@@ -5939,7 +6062,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "0efc70be-d674-4777-a0fa-329eae187ca0",
-              "name": "PACKET-CORE"
+              "name": "JULIO-ERICKSON"
             },
             {
               "id": "0463287b-b133-46ef-a0f5-9ce62be3a053",
@@ -5974,22 +6097,186 @@ describe('Drawing board', function () {
           ],
           "lineOfBusinessList": [
             {
-              "id": "ONAP",
-              "name": "ONAP"
+              "id": "",
+              "name": ""
             },
             {
-              "id": "zzz1",
-              "name": "zzz1"
+              "id": "ADI",
+              "name": "ADI"
+            },
+            {
+              "id": "ADIG",
+              "name": "ADIG"
+            },
+            {
+              "id": "PASQUALE",
+              "name": "PASQUALE"
+            },
+            {
+              "id": "AT&TLEGACYDATASERVICES",
+              "name": "AT&TLEGACYDATASERVICES"
+            },
+            {
+              "id": "AT&TSWITCHEDETHERNET",
+              "name": "AT&TSWITCHEDETHERNET"
+            },
+            {
+              "id": "AVPN",
+              "name": "AVPN"
+            },
+            {
+              "id": "AVPN-MOW",
+              "name": "AVPN-MOW"
+            },
+            {
+              "id": "CALEA",
+              "name": "CALEA"
+            },
+            {
+              "id": "COLLABORATE",
+              "name": "COLLABORATE"
+            },
+            {
+              "id": "DIRECT-TV",
+              "name": "DIRECT-TV"
+            },
+            {
+              "id": "LINDSEY",
+              "name": "LINDSEY"
+            },
+            {
+              "id": "FLEXWARE",
+              "name": "FLEXWARE"
+            },
+            {
+              "id": "INFRASTRUCTURE",
+              "name": "INFRASTRUCTURE"
+            },
+            {
+              "id": "IOT",
+              "name": "IOT"
+            },
+            {
+              "id": "IP-FLEXIBLE-REACH",
+              "name": "IP-FLEXIBLE-REACH"
+            },
+            {
+              "id": "IP-TOLL-FREE",
+              "name": "IP-TOLL-FREE"
+            },
+            {
+              "id": "EMANUEL-ABS",
+              "name": "EMANUEL-ABS"
+            },
+            {
+              "id": "EMANUEL-CONSUMER",
+              "name": "EMANUEL-CONSUMER"
+            },
+            {
+              "id": "EMANUEL-RESELLER",
+              "name": "EMANUEL-RESELLER"
+            },
+            {
+              "id": "NETBOND",
+              "name": "NETBOND"
+            },
+            {
+              "id": "SD-WAN",
+              "name": "SD-WAN"
+            },
+            {
+              "id": "UVERSE",
+              "name": "UVERSE"
+            },
+            {
+              "id": "UVERSE-VOICE",
+              "name": "UVERSE-VOICE"
+            },
+            {
+              "id": "VIRTUAL-EDGE",
+              "name": "VIRTUAL-EDGE"
+            },
+            {
+              "id": "VOLTE",
+              "name": "VOLTE"
             }
           ],
           "platformList": [
             {
-              "id": "platform",
-              "name": "platform"
+              "id": "3rdPartyCloud",
+              "name": "3rdPartyCloud"
             },
             {
-              "id": "xxx1",
-              "name": "xxx1"
+              "id": "ACCESS",
+              "name": "ACCESS"
+            },
+            {
+              "id": "AIC",
+              "name": "AIC"
+            },
+            {
+              "id": "APPLICATIONS-SERVICES",
+              "name": "APPLICATIONS-SERVICES"
+            },
+            {
+              "id": "BVOIP",
+              "name": "BVOIP"
+            },
+            {
+              "id": "CALEA-DEDICATED",
+              "name": "CALEA-DEDICATED"
+            },
+            {
+              "id": "CBB-MPLS-CORE",
+              "name": "CBB-MPLS-CORE"
+            },
+            {
+              "id": "D1",
+              "name": "D1"
+            },
+            {
+              "id": "D1.5",
+              "name": "D1.5"
+            },
+            {
+              "id": "EPC",
+              "name": "EPC"
+            },
+            {
+              "id": "FIRSTNET-DEDICATED",
+              "name": "FIRSTNET-DEDICATED"
+            },
+            {
+              "id": "IMS-USP",
+              "name": "IMS-USP"
+            },
+            {
+              "id": "IPAG",
+              "name": "IPAG"
+            },
+            {
+              "id": "MNS",
+              "name": "MNS"
+            },
+            {
+              "id": "NETWORK-CLOUD",
+              "name": "NETWORK-CLOUD"
+            },
+            {
+              "id": "RADIO-WIRELESSENGINEERING",
+              "name": "RADIO-WIRELESSENGINEERING"
+            },
+            {
+              "id": "RAN",
+              "name": "RAN"
+            },
+            {
+              "id": "UCPE",
+              "name": "UCPE"
+            },
+            {
+              "id": "VNI",
+              "name": "VNI"
             }
           ]
         },
@@ -6006,16 +6293,8 @@ describe('Drawing board', function () {
           "FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
           "FLAG_SHOW_ASSIGNMENTS": true,
           "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
-          "FLAG_UNASSIGN_SERVICE": true,
           "FLAG_SHOW_VERIFY_SERVICE": false,
-          "FLAG_COLLECTION_RESOURCE_SUPPORT": true,
-          "FLAG_DUPLICATE_VNF": true,
           "FLAG_SERVICE_MODEL_CACHE": true,
-          "CREATE_INSTANCE_TEST": false,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": false,
-          "FLAG_ASYNC_INSTANTIATION": true,
-          "FLAG_ASYNC_JOBS": true,
-          "EMPTY_DRAWING_BOARD_TEST": false,
           "FLAG_ADD_MSO_TESTAPI_FIELD": true,
           "FLAG_SUPPLEMENTARY_FILE": true
         },
@@ -6036,14 +6315,17 @@ describe('Drawing board', function () {
               "description": "ComplexService",
               "serviceEcompNaming": "true",
               "instantiationType": "Macro",
+              "vidNotions": {
+                "instantiationType": "Macro"
+              },
               "inputs": {}
             },
             "vnfs": {
-              "VF_vMee 0": {
+              "VF_vGeraldine 0": {
                 "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
                 "invariantUuid": "4160458e-f648-4b30-a176-43881ffffe9e",
-                "description": "VSP_vMee",
-                "name": "VF_vMee",
+                "description": "VSP_vGeraldine",
+                "name": "VF_vGeraldine",
                 "version": "2.0",
                 "customizationUuid": "91415b44-753d-494c-926a-456a9172bbb9",
                 "inputs": {},
@@ -6214,74 +6496,74 @@ describe('Drawing board', function () {
                   "sctp-b-egress-dst_end_port": "65535.0"
                 },
                 "type": "VF",
-                "modelCustomizationName": "VF_vMee 0",
+                "modelCustomizationName": "VF_vGeraldine 0",
                 "vfModules": {
-                  "vf_vmee0..VfVmee..vmme_vlc..module-1": {
+                  "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
                     "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
                     "invariantUuid": "98a7c88b-b577-476a-90e4-e25a5871e02b",
                     "customizationUuid": "55b1be94-671a-403e-a26c-667e9c47d091",
                     "description": null,
-                    "name": "VfVmee..vmme_vlc..module-1",
+                    "name": "VfVgeraldine..vflorence_vlc..module-1",
                     "version": "2",
-                    "modelCustomizationName": "VfVmee..vmme_vlc..module-1",
+                    "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
                     "properties": {
                       "minCountInstances": 0,
                       "maxCountInstances": null,
                       "initialCount": 0,
-                      "vfModuleLabel": "vmme_vlc"
+                      "vfModuleLabel": "vflorence_vlc"
                     },
                     "inputs": {},
                     "volumeGroupAllowed": false
                   },
-                  "vf_vmee0..VfVmee..vmme_gpb..module-2": {
+                  "vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2": {
                     "uuid": "41708296-e443-4c71-953f-d9a010f059e1",
                     "invariantUuid": "1cca90b8-3490-495e-87da-3f3e4c57d5b9",
                     "customizationUuid": "6add59e0-7fe1-4bc4-af48-f8812422ae7c",
                     "description": null,
-                    "name": "VfVmee..vmme_gpb..module-2",
+                    "name": "VfVgeraldine..vflorence_gpb..module-2",
                     "version": "2",
-                    "modelCustomizationName": "VfVmee..vmme_gpb..module-2",
+                    "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
                     "properties": {
                       "minCountInstances": 0,
                       "maxCountInstances": null,
                       "initialCount": 0,
-                      "vfModuleLabel": "vmme_gpb"
+                      "vfModuleLabel": "vflorence_gpb"
                     },
                     "inputs": {},
                     "volumeGroupAllowed": false
                   },
-                  "vf_vmee0..VfVmee..base_vmme..module-0": {
+                  "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
                     "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
                     "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
                     "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
                     "description": null,
-                    "name": "VfVmee..base_vmme..module-0",
+                    "name": "VfVgeraldine..base_vflorence..module-0",
                     "version": "2",
-                    "modelCustomizationName": "VfVmee..base_vmme..module-0",
+                    "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
                     "properties": {
                       "minCountInstances": 1,
                       "maxCountInstances": 1,
                       "initialCount": 1,
-                      "vfModuleLabel": "base_vmme"
+                      "vfModuleLabel": "base_vflorence"
                     },
                     "inputs": {},
                     "volumeGroupAllowed": true
                   }
                 },
                 "volumeGroups": {
-                  "vf_vmee0..VfVmee..base_vmme..module-0": {
+                  "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
                     "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
                     "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
                     "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
                     "description": null,
-                    "name": "VfVmee..base_vmme..module-0",
+                    "name": "VfVgeraldine..base_vflorence..module-0",
                     "version": "2",
-                    "modelCustomizationName": "VfVmee..base_vmme..module-0",
+                    "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
                     "properties": {
                       "minCountInstances": 1,
                       "maxCountInstances": 1,
                       "initialCount": 1,
-                      "vfModuleLabel": "base_vmme"
+                      "vfModuleLabel": "base_vflorence"
                     },
                     "inputs": {}
                   }
@@ -6310,7 +6592,7 @@ describe('Drawing board', function () {
                 "modelCustomizationName": "ExtVL 0"
               }
             },
-            "collectionResource": {},
+            "collectionResources": {},
             "configurations": {
               "Port Mirroring Configuration By Policy 0": {
                 "uuid": "b4398538-e89d-4f13-b33d-ca323434ba50",
@@ -6331,72 +6613,72 @@ describe('Drawing board', function () {
             },
             "serviceProxies": {},
             "vfModules": {
-              "vf_vmee0..VfVmee..vmme_vlc..module-1": {
+              "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
                 "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
                 "invariantUuid": "98a7c88b-b577-476a-90e4-e25a5871e02b",
                 "customizationUuid": "55b1be94-671a-403e-a26c-667e9c47d091",
                 "description": null,
-                "name": "VfVmee..vmme_vlc..module-1",
+                "name": "VfVgeraldine..vflorence_vlc..module-1",
                 "version": "2",
-                "modelCustomizationName": "VfVmee..vmme_vlc..module-1",
+                "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
                 "properties": {
                   "minCountInstances": 0,
                   "maxCountInstances": null,
                   "initialCount": 0,
-                  "vfModuleLabel": "vmme_vlc"
+                  "vfModuleLabel": "vflorence_vlc"
                 },
                 "inputs": {},
                 "volumeGroupAllowed": false
               },
-              "vf_vmee0..VfVmee..vmme_gpb..module-2": {
+              "vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2": {
                 "uuid": "41708296-e443-4c71-953f-d9a010f059e1",
                 "invariantUuid": "1cca90b8-3490-495e-87da-3f3e4c57d5b9",
                 "customizationUuid": "6add59e0-7fe1-4bc4-af48-f8812422ae7c",
                 "description": null,
-                "name": "VfVmee..vmme_gpb..module-2",
+                "name": "VfVgeraldine..vflorence_gpb..module-2",
                 "version": "2",
-                "modelCustomizationName": "VfVmee..vmme_gpb..module-2",
+                "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
                 "properties": {
                   "minCountInstances": 0,
                   "maxCountInstances": null,
                   "initialCount": 0,
-                  "vfModuleLabel": "vmme_gpb"
+                  "vfModuleLabel": "vflorence_gpb"
                 },
                 "inputs": {},
                 "volumeGroupAllowed": false
               },
-              "vf_vmee0..VfVmee..base_vmme..module-0": {
+              "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
                 "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
                 "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
                 "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
                 "description": null,
-                "name": "VfVmee..base_vmme..module-0",
+                "name": "VfVgeraldine..base_vflorence..module-0",
                 "version": "2",
-                "modelCustomizationName": "VfVmee..base_vmme..module-0",
+                "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
                 "properties": {
                   "minCountInstances": 1,
                   "maxCountInstances": 1,
                   "initialCount": 1,
-                  "vfModuleLabel": "base_vmme"
+                  "vfModuleLabel": "base_vflorence"
                 },
                 "inputs": {},
                 "volumeGroupAllowed": true
               }
             },
             "volumeGroups": {
-              "vf_vmee0..VfVmee..base_vmme..module-0": {
+              "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
                 "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
                 "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
                 "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
                 "description": null,
-                "name": "VfVmee..base_vmme..module-0",
+                "name": "VfVgeraldine..base_vflorence..module-0",
                 "version": "2",
-                "modelCustomizationName": "VfVmee..base_vmme..module-0",
+                "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
                 "properties": {
                   "minCountInstances": 1,
                   "maxCountInstances": 1,
                   "initialCount": 1,
-                  "vfModuleLabel": "base_vmme"
+                  "vfModuleLabel": "base_vflorence"
                 },
                 "inputs": {}
               }
@@ -6407,20 +6689,20 @@ describe('Drawing board', function () {
         "serviceInstance": {
           "6e59c5de-f052-46fa-aa7e-2fca9d674c44": {
             "vnfs": {
-              "VF_vMee 0": {
-                "originalName": "VF_vMee 0",
+              "VF_vGeraldine 0": {
+                "originalName": "VF_vGeraldine 0",
                 "rollbackOnFailure": "true",
                 "instanceName": "",
                 "vfModules": {
-                  "vf_vmee0..VfVmee..vmme_vlc..module-1": {
-                    "vf_vmee0..VfVmee..vmme_vlc..module-1dcudx": {
+                  "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
+                    "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1dcudx": {
                       "modelInfo": {
                         "modelInvariantId": "98a7c88b-b577-476a-90e4-e25a5871e02b",
                         "modelVersionId": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
-                        "modelName": "VfVmee..vmme_vlc..module-1",
+                        "modelName": "VfVgeraldine..vflorence_vlc..module-1",
                         "modelVersion": "2",
                         "modelCustomizationId": "55b1be94-671a-403e-a26c-667e9c47d091",
-                        "modelCustomizationName": "VfVmee..vmme_vlc..module-1"
+                        "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1"
                       },
                       "isMissingData": false,
                       "supplementaryFile": "C:\\fakepath\\sample.json",
@@ -6438,7 +6720,7 @@ describe('Drawing board', function () {
                   }
                 },
                 "isMissingData": false,
-                "modelName": "VF_vMee 0",
+                "modelName": "VF_vGeraldine 0",
                 "productFamilyId": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e",
                 "lcpCloudRegionId": "hvf6",
                 "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054",
@@ -6447,10 +6729,10 @@ describe('Drawing board', function () {
                 "modelInfo": {
                   "modelInvariantId": "4160458e-f648-4b30-a176-43881ffffe9e",
                   "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60",
-                  "modelName": "VF_vMee",
+                  "modelName": "VF_vGeraldine",
                   "modelVersion": "2.0",
                   "modelCustomizationId": "91415b44-753d-494c-926a-456a9172bbb9",
-                  "modelCustomizationName": "VF_vMee 0"
+                  "modelCustomizationName": "VF_vGeraldine 0"
                 },
                 "legacyRegion": null
               }
@@ -6481,7 +6763,7 @@ describe('Drawing board', function () {
             "instanceName": "",
             "existingNames": {
               "serviceinstancename": "",
-              "vfvmee00001": ""
+              "vfvgeraldine00001": ""
             },
             "existingVNFCounterMap": {
               "91415b44-753d-494c-926a-456a9172bbb9": 1
@@ -6494,8 +6776,8 @@ describe('Drawing board', function () {
         "lcpRegionsAndTenants": {
           "lcpRegionList": [
             {
-              "id": "JANET25",
-              "name": "JANET25",
+              "id": "AAIAIC25",
+              "name": "AAIAIC25",
               "isPermitted": true
             },
             {
@@ -6505,7 +6787,7 @@ describe('Drawing board', function () {
             }
           ],
           "lcpRegionsTenantsMap": {
-            "JANET25": [
+            "AAIAIC25": [
               {
                 "id": "092eb9e8e4b7412e8787dd091bc58e86",
                 "name": "USP-SIP-IC-24335-T-01",
@@ -6519,8 +6801,128 @@ describe('Drawing board', function () {
                 "isPermitted": true
               },
               {
-                "id": "d0a3e3f2964542259d155a81c41aadc3",
-                "name": "test-hvf6-09",
+                "id": "229bcdc6eaeb4ca59d55221141d01f8e",
+                "name": "AIN Web Tool-15-D-STTest2",
+                "isPermitted": true
+              },
+              {
+                "id": "1178612d2b394be4834ad77f567c0af2",
+                "name": "AIN Web Tool-15-D-SSPtestcustome",
+                "isPermitted": true
+              },
+              {
+                "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
+                "name": "AIN Web Tool-15-D-UncheckedEcopm",
+                "isPermitted": true
+              },
+              {
+                "id": "de007636e25249238447264a988a927b",
+                "name": "AIN Web Tool-15-D-dfsdf",
+                "isPermitted": true
+              },
+              {
+                "id": "62f29b3613634ca6a3065cbe0e020c44",
+                "name": "AIN/SMS-16-D-Multiservices1",
+                "isPermitted": true
+              },
+              {
+                "id": "649289e30d3244e0b48098114d63c2aa",
+                "name": "AIN Web Tool-15-D-SSPST66",
+                "isPermitted": true
+              },
+              {
+                "id": "3f21eeea6c2c486bba31dab816c05a32",
+                "name": "AIN Web Tool-15-D-ASSPST47",
+                "isPermitted": true
+              },
+              {
+                "id": "f60ce21d3ee6427586cff0d22b03b773",
+                "name": "CESAR-100-D-sspjg67246",
+                "isPermitted": true
+              },
+              {
+                "id": "8774659e425f479895ae091bb5d46560",
+                "name": "CESAR-100-D-sspjg68359",
+                "isPermitted": true
+              },
+              {
+                "id": "624eb554b0d147c19ff8885341760481",
+                "name": "AINWebTool-15-D-iftach",
+                "isPermitted": true
+              },
+              {
+                "id": "214f55f5fc414c678059c383b03e4962",
+                "name": "CESAR-100-D-sspjg612401",
+                "isPermitted": true
+              },
+              {
+                "id": "c90666c291664841bb98e4d981ff1db5",
+                "name": "CESAR-100-D-sspjg621340",
+                "isPermitted": true
+              },
+              {
+                "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
+                "name": "sspjg621351cloned",
+                "isPermitted": true
+              },
+              {
+                "id": "b386b768a3f24c8e953abbe0b3488c02",
+                "name": "AINWebTool-15-D-eteancomp",
+                "isPermitted": true
+              },
+              {
+                "id": "dc6c4dbfd225474e9deaadd34968646c",
+                "name": "AINWebTool-15-T-SPFET",
+                "isPermitted": true
+              },
+              {
+                "id": "02cb5030e9914aa4be120bd9ed1e19eb",
+                "name": "AINWebTool-15-X-eeweww",
+                "isPermitted": true
+              },
+              {
+                "id": "f2f3830e4c984d45bcd00e1a04158a79",
+                "name": "CESAR-100-D-spjg61909",
+                "isPermitted": true
+              },
+              {
+                "id": "05b91bd5137f4929878edd965755c06d",
+                "name": "CESAR-100-D-sspjg621512cloned",
+                "isPermitted": true
+              },
+              {
+                "id": "7002fbe8482d4a989ddf445b1ce336e0",
+                "name": "AINWebTool-15-X-vdr",
+                "isPermitted": true
+              },
+              {
+                "id": "4008522be43741dcb1f5422022a2aa0b",
+                "name": "AINWebTool-15-D-ssasa",
+                "isPermitted": true
+              },
+              {
+                "id": "f44e2e96a1b6476abfda2fa407b00169",
+                "name": "AINWebTool-15-D-PFNPT",
+                "isPermitted": true
+              },
+              {
+                "id": "b69a52bec8a84669a37a1e8b72708be7",
+                "name": "AINWebTool-15-X-vdre",
+                "isPermitted": true
+              },
+              {
+                "id": "fac7d9fd56154caeb9332202dcf2969f",
+                "name": "AINWebTool-15-X-NONPODECOMP",
+                "isPermitted": true
+              },
+              {
+                "id": "2d34d8396e194eb49969fd61ffbff961",
+                "name": "DN5242-Nov16-T5",
+                "isPermitted": true
+              },
+              {
+                "id": "cb42a77ff45b48a8b8deb83bb64acc74",
+                "name": "ro-T11",
                 "isPermitted": true
               },
               {
@@ -6528,6 +6930,16 @@ describe('Drawing board', function () {
                 "name": "ro-T112",
                 "isPermitted": true
               },
+              {
+                "id": "4914ab0ab3a743e58f0eefdacc1dde77",
+                "name": "DN5242-Nov21-T1",
+                "isPermitted": true
+              },
+              {
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
+                "isPermitted": true
+              },
               {
                 "id": "cbb99fe4ada84631b7baf046b6fd2044",
                 "name": "DN5242-Nov16-T3",
@@ -6616,7 +7028,7 @@ describe('Drawing board', function () {
         "productFamilies": [
           {
             "id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-            "name": "SCOTTIE",
+            "name": "ERICA",
             "isPermitted": true
           },
           {
@@ -6641,7 +7053,7 @@ describe('Drawing board', function () {
           },
           {
             "id": "323d69d9-2efe-4r45-ay0a-89ea7ard4e6f",
-            "name": "vSCP",
+            "name": "vEsmeralda",
             "isPermitted": true
           },
           {
@@ -6685,7 +7097,7 @@ describe('Drawing board', function () {
             "isPermitted": true
           },
           {
-            "id": "Cisneros",
+            "id": "vMuriel",
             "name": "vMuriel",
             "isPermitted": true
           },
@@ -6711,7 +7123,7 @@ describe('Drawing board', function () {
           },
           {
             "id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
-            "name": "Josefina",
+            "name": "JOSEFINA",
             "isPermitted": true
           },
           {
@@ -6759,7 +7171,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "6",
-              "name": "vSEGW",
+              "name": "vPorfirio",
               "isPermitted": false
             },
             {
@@ -6774,7 +7186,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "9",
-              "name": "vMME",
+              "name": "vFLORENCE",
               "isPermitted": false
             },
             {
@@ -6784,7 +7196,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "11",
-              "name": "vSCP",
+              "name": "vEsmeralda",
               "isPermitted": false
             },
             {
@@ -6794,7 +7206,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "13",
-              "name": "vMMSC",
+              "name": "vWINIFRED",
               "isPermitted": false
             },
             {
@@ -6910,7 +7322,7 @@ describe('Drawing board', function () {
 
   function checkDynamicInputs() {
     cy.getReduxState().then((state) => {
-      let dynamicInputs = state.service.serviceHierarchy['f4d84bb4-a416-4b4e-997e-0059973630b9'].vnfs['2017-488_ADIOD-vPE 0'].inputs;
+      let dynamicInputs = state.service.serviceHierarchy['f4d84bb4-a416-4b4e-997e-0059973630b9'].vnfs['2017-488_PASQUALE-vPE 0'].inputs;
 
       chai.expect(dynamicInputs.vnf_config_template_version.description).equal("VPE Software Version");
       chai.expect(dynamicInputs.bandwidth_units.description).equal("Units of bandwidth");