Merge changes Ib4430bf2,Icc0bdb9e,I2736b984

* changes:
  Merge from ecomp 718fd196 - Ext. Services Simulator
  Merge from ecomp 718fd196 - Integration Tests
  Merge from ecomp 718fd196 - Modern UI

75 files changed, 17655 insertions, 2303 deletions

diff --git a/vid-webpack-master/cypress/integration/iFrames/ala-carte.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/ala-carte.e2e.ts
index 048836e52..ecd91022b 100644
--- a/vid-webpack-master/cypress/integration/iFrames/ala-carte.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/ala-carte.e2e.ts
@@ -54,7 +54,7 @@ describe('A la carte', function () {
       cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
 
         cy.setTestApiParamToGR();
-        res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].service.instantiationType = 'A-La-Carte';
+        res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].service.vidNotions.instantiationType = 'ALaCarte';
         res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].service.inputs = null;
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
@@ -96,7 +96,7 @@ describe('A la carte', function () {
     it(`VNF a-la-carte`, ()=> {
       cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
         cy.setTestApiParamToGR();
-        res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].service.instantiationType = 'A-La-Carte';
+        res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].service.vidNotions.instantiationType = 'ALaCarte';
         res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].service.inputs = null;
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
@@ -119,9 +119,9 @@ describe('A la carte', function () {
 
         cy.get('#quantity-select').should('have.attr', 'disabled');
         cy.getElementByDataTestsId('form-set').click({force: true}).then(() => {
-          cy.getElementByDataTestsId('node-2017-488_ADIOD-vPE 0-add-btn').click({force: true}).then(() => {
+          cy.getElementByDataTestsId('node-2017-488_PASQUALE-vPE 0-add-btn').click({force: true}).then(() => {
             cy.selectDropdownOptionByText('productFamily', 'Emanuel');
-            cy.selectDropdownOptionByText('lcpRegion', 'JANET25');
+            cy.selectDropdownOptionByText('lcpRegion', 'AAIAIC25');
             cy.typeToInput("lcpRegionText", "just another region");
             cy.selectDropdownOptionByText('tenant', 'USP-SIP-IC-24335-T-01');
             cy.selectDropdownOptionByText('lineOfBusiness', 'zzz1');
@@ -129,12 +129,12 @@ describe('A la carte', function () {
             cy.getElementByDataTestsId('form-set').click({force: true}).then(() => {
               cy.getReduxState().then((state) => {
 
-                const vnf = state.service.serviceInstance['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].vnfs['2017-488_ADIOD-vPE 0'];
+                const vnf = state.service.serviceInstance['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].vnfs['2017-488_PASQUALE-vPE 0'];
 
                 cy.readFile('../vid-automation/src/test/resources/a-la-carte/redux-a-la-carte.json').then((file) => {
-                  file.vnfs['2017-488_ADIOD-vPE 0'].trackById = vnf.trackById;
-                  file.vnfs['2017-488_ADIOD-vPE 0'].vfModules = {};
-                  cy.deepCompare(vnf, file.vnfs['2017-488_ADIOD-vPE 0'])
+                  file.vnfs['2017-488_PASQUALE-vPE 0'].trackById = vnf.trackById;
+                  file.vnfs['2017-488_PASQUALE-vPE 0'].vfModules = {};
+                  cy.deepCompare(vnf, file.vnfs['2017-488_PASQUALE-vPE 0'])
                 });
               });
             });
@@ -147,7 +147,7 @@ describe('A la carte', function () {
     it(`Network a-la-carte`, ()=> {
       cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
         cy.setTestApiParamToGR();
-        res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].service.instantiationType = 'A-La-Carte';
+        res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].service.vidNotions.instantiationType = 'ALaCarte';
         res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].service.inputs = null;
         res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].networks = {
           "ExtVL 0": {
@@ -175,9 +175,9 @@ describe('A la carte', function () {
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
         cy.getElementByDataTestsId("node-ExtVL 0-add-btn").click({force: true});
         cy.selectDropdownOptionByText("platform", "xxx1");
-        cy.selectDropdownOptionByText("lcpRegion", "JANET25");
+        cy.selectDropdownOptionByText("lcpRegion", "AAIAIC25");
         cy.selectDropdownOptionByText("tenant", "USP-SIP-IC-24335-T-01");
-        cy.selectDropdownOptionByText("productFamily", "SCOTTIE");
+        cy.selectDropdownOptionByText("productFamily", "ERICA");
         cy.selectDropdownOptionByText("lineOfBusiness", "zzz1");
         cy.typeToInput("lcpRegionText", "lcpRegionText");
 
@@ -201,28 +201,28 @@ describe('A la carte', function () {
       }
       cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
         cy.setTestApiParamToGR();
-        res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].service.instantiationType = 'A-La-Carte';
+        res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].service.vidNotions.instantiationType = 'ALaCarte';
         res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].service.inputs = null;
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
 
-        cy.getElementByDataTestsId('node-2017-488_ADIOD-vPE 0-add-btn').click({force: true}).then(() => {
+        cy.getElementByDataTestsId('node-2017-488_PASQUALE-vPE 0-add-btn').click({force: true}).then(() => {
           cy.selectDropdownOptionByText('productFamily', 'Emanuel');
           cy.selectDropdownOptionByText('lcpRegion', 'hvf6');
           cy.selectDropdownOptionByText('tenant', 'AIN Web Tool-15-D-STTest2');
           cy.selectDropdownOptionByText('lineOfBusiness', 'zzz1');
           cy.selectDropdownOptionByText('platform', 'xxx1');
           cy.getElementByDataTestsId('form-set').click({force: true}).then(() => {
-            const vnfName = '2017-488_ADIOD-vPE 0';
+            const vnfName = '2017-488_PASQUALE-vPE 0';
             let vfModulesNames: Array<string> = [
-              '2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0',
-              '2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1',
-              '2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2',
+              '2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0',
+              '2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1',
+              '2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2',
             ];
 
             addVfModule(vnfName, vfModulesNames[0], 'mimazepubi', 'hvf6', '', 'AINWebTool-15-D-iftach', false, false, false)
               .then(() => {
-                addVfModule(vnfName, vfModulesNames[1], 'puwesovabe', 'JANET25', 'my region', 'USP-SIP-IC-24335-T-01', true, true, false)
+                addVfModule(vnfName, vfModulesNames[1], 'puwesovabe', 'AAIAIC25', 'my region', 'USP-SIP-IC-24335-T-01', true, true, false)
                   .then(() => {
                     addVfModule(vnfName, vfModulesNames[2], 'bnmgtrx', 'hvf6', '', 'AINWebTool-15-D-iftach', false, false, true)
                       .then(() => {
diff --git a/vid-webpack-master/cypress/integration/iFrames/collectionResource.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/collectionResource.e2e.ts
new file mode 100644
index 000000000..796755c83
--- /dev/null
+++ b/vid-webpack-master/cypress/integration/iFrames/collectionResource.e2e.ts
@@ -0,0 +1,1622 @@
+///<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 : Collection resource', function () {
+
+  let jsonBuilderAndMock: JsonBuilder<ServiceModel> = new JsonBuilder<ServiceModel>();
+
+  beforeEach(() => {
+    cy.window().then((win) => {
+      win.sessionStorage.clear();
+      cy.preventErrorsOnLoading();
+      cy.initAAIMock();
+      cy.initVidMock();
+      cy.login();
+    });
+  });
+
+  afterEach(() => {
+    cy.screenshot();
+  });
+
+
+  describe('should show collection resource model correctly', () => {
+    it('collection type + name', () => {
+      const serviceModelId: string = "6e59c5de-f052-46fa-aa7e-2fca9d674c44";
+      const collectionResourceName: string = "CR_sanity 0";
+      initDrawingBoardWithColectionResource(serviceModelId, collectionResourceName);
+      cy.get('.vf-type').contains('CR');
+      cy.getElementByDataTestsId('available-models-tree').getElementByDataTestsId('node-name').contains(collectionResourceName);
+    });
+
+    it('collection resource component info', () => {
+      const serviceModelId: string = "6e59c5de-f052-46fa-aa7e-2fca9d674c44";
+      const collectionResourceName: string = "CR_sanity 0";
+      const redux = initDrawingBoardWithColectionResource(serviceModelId, collectionResourceName)
+      cy.getElementByDataTestsId(`node-${collectionResourceName}`).click().then(()=>{
+        cy.getElementByDataTestsId('component-info-section-title').contains('Collection Resource INFO');
+        const customizationUuid: string = redux["service"]["serviceHierarchy"][serviceModelId]["collectionResources"][collectionResourceName].customizationUuid;
+        cy.getElementByDataTestsId('model-item-value-Model customization ID').contains(customizationUuid);
+      });
+    });
+  });
+
+  describe('collection resource in view edit mode',()=>{
+    const SUBSCRIBER_ID: string = "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb";
+    const SERVICE_TYPE: string = "Emanuel";
+    const SERVICE_MODEL_ID: string = "6e0bec91-09f3-43aa-9cf3-e617cd0146be";
+    const SERVICE_INSTANCE_ID: string = "a565e6ad-75d1-4493-98f1-33234b5c17e2";
+
+    function verifyOnlyStatusDelete(){
+      cy.getElementByDataTestsId('delete-status-type-header').should('exist');
+      cy.getElementByDataTestsId('resume-status-type-header').should('not.exist');
+      cy.getElementByDataTestsId('serviceName').should('have.css', 'text-decoration').and('contain', 'line-through');
+      cy.isNodeDeleted(0);
+      cy.isNodeDeleted(1);
+    }
+
+    function verifyOnlyStatusResume(){
+      cy.getElementByDataTestsId('resume-status-type-header').should('exist');
+      cy.getElementByDataTestsId('delete-status-type-header').should('not.exist');
+      cy.isNodeNotDeleted(0);
+      cy.isNodeNotDeleted(1);
+    }
+
+    function verifyEmptyStatus(){
+      cy.getElementByDataTestsId('resume-status-type-header').should('not.exist');
+      cy.getElementByDataTestsId('delete-status-type-header').should('not.exist');
+      cy.isNodeNotDeleted(0);
+      cy.isNodeNotDeleted(1);
+    }
+
+    function initCrViewEdit() {
+        cy.permissionVidMock();
+        cy.readFile('../vid-app-common/src/test/resources/getTopology/serviceWithCR/getTopologyWithCR.json').then((res) => {
+          jsonBuilderAndMock.basicJson(
+            res,
+            Cypress.config('baseUrl') + `/aai_get_service_instance_topology/${SUBSCRIBER_ID}/${SERVICE_TYPE}/${SERVICE_INSTANCE_ID}`,
+            200, 0,
+            "getTopologyWithCR",
+          )
+        });
+
+
+      cy.readFile('../vid-app-common/src/test/resources/getTopology/serviceWithCR/serviceWithCRModel.json').then((res) => {
+          jsonBuilderAndMock.basicJson(
+            res,
+            Cypress.config('baseUrl') + `/rest/models/services/${SERVICE_MODEL_ID}`,
+            200,
+            0,
+            "serviceModelWithCR",
+          )
+        });
+      cy.openIframe(`app/ui/#/servicePlanning/EDIT?serviceModelId=${SERVICE_MODEL_ID}&subscriberId=${SUBSCRIBER_ID}&serviceType=${SERVICE_TYPE}&serviceInstanceId=${SERVICE_INSTANCE_ID}`);
+    }
+
+    it('should show left and right trees correctly', () => {
+      initCrViewEdit();
+      cy.hasClass('orchStatusValue','tag-status-value');
+      cy.get('.vf-type').contains('CR');
+      const crModelName = "NCM_VLAN_ym161f 0";
+      cy.getElementByDataTestsId('available-models-tree').getElementByDataTestsId('node-name').contains(crModelName);
+
+      /*
+      Right tree
+      */
+
+      const rightShouldHaves: { [dataTestId: string]: { [dataTestId: string]: string; }; } = {
+        'node-ce8c98bc-4691-44fb-8ff0-7a47487c11c4-undefined': {
+          'node-type-indicator': 'CR',
+          'node-name': 'NcmVlanSvcYm161f_77_vTSBC Customer Landing Network Collection'
+        },
+        'node-undefined-undefined': {
+          'node-type-indicator': 'NCF',
+          'node-name': 'NcmVlanSvcYm161f_77_vTSBC Customer Landing Network Collection'
+        }
+      };
+
+      const expectedComponentInfo: { [key: string]: any } = {
+        'node-ce8c98bc-4691-44fb-8ff0-7a47487c11c4-undefined': {
+          labelsAndValues: [
+            //['Model version', "5.0"] //to add once fix in code
+            ['Instance ID', '84a351ae-3601-45e2-98df-878d6c816abc'],
+            ['In maintenance', 'false']
+          ],
+          title: "Collection Resource Instance INFO"
+        },
+        'node-undefined-undefined': {
+          labelsAndValues: [
+            ['Model version', "1"],
+            ['Instance ID', '6b3536cf-3a12-457f-abb5-fa2203e0d923'],
+            ['Instance type', 'L3-NETWORK'],
+            ['In maintenance', 'false'],
+            ['Role', 'SUB_INTERFACE'],
+            ['Collection function', 'vTSBC Customer Landing Network Collection'],
+            ['Number of networks', '1']
+          ],
+          title: "Network Collection Function Instance INFO"
+        }
+      };
+
+      for (let node in rightShouldHaves) {
+        for (let span in rightShouldHaves[node]) {
+          cy.getElementByDataTestsId(node).find(`[data-tests-id='${span}']`).should('have.text', rightShouldHaves[node][span]);
+        }
+        cy.getElementByDataTestsId(node).click().then(() => {
+          let expected = <any>expectedComponentInfo[node];
+          cy.assertComponentInfoTitleLabelsAndValues(expected['title'], expected['labelsAndValues']);
+        })
+      }
+    });
+
+
+    it('resume service with cr', () => {
+      cy.server().route({
+        url: Cypress.config('baseUrl') + '/asyncInstantiation/bulk',
+        method: 'POST',
+        status: 200,
+        response: "[]",
+      }).as("expectedPostAsyncInstantiation");
+      initCrViewEdit();
+      cy.serviceActionDelete();
+      verifyOnlyStatusDelete();
+      cy.serviceActionResume();
+      verifyOnlyStatusResume();
+      cy.serviceActionDelete();
+      verifyOnlyStatusDelete();
+      cy.serviceActionUndoDelete();
+      verifyEmptyStatus();
+      cy.serviceActionResume();
+      cy.serviceActionUndoResume();
+      verifyEmptyStatus();
+      cy.serviceActionResume();
+      cy.getDrawingBoardDeployBtn().click();
+      cy.wait('@expectedPostAsyncInstantiation').then(xhr => {
+        cy.readFile('../vid-app-common/src/test/resources/payload_jsons/resume/feRequestResumeMacroService.json').then((expectedResult) => {
+           cy.deepCompare(xhr.request.body, expectedResult);
+       });
+      });
+
+    });
+  });
+
+  function initDrawingBoardWithColectionResource(serviceModelId: string, collectionResourceName: string) {
+      const redux = reduxWithCollectionResource(serviceModelId, collectionResourceName);
+      cy.setReduxState(<any>redux);
+      cy.openIframe(`app/ui/#/servicePlanning?serviceModelId=${serviceModelId}`);
+      return redux;
+  }
+
+
+  function reduxWithCollectionResource(serviceModelId: string, collectionResourceName: string) {
+    return {
+      "service": {
+        "serviceHierarchy": {
+          [serviceModelId]: {
+            "service": {
+              "uuid": serviceModelId,
+              "invariantUuid": "cfef8302-d90f-475f-87cc-3f49a62ef14c",
+              "name": "ComplexService",
+              "version": "1.0",
+              "toscaModelURL": null,
+              "category": "Emanuel",
+              "serviceType": "",
+              "serviceRole": "",
+              "description": "ComplexService",
+              "serviceEcompNaming": "true",
+              "instantiationType": "Macro",
+              "inputs": {},
+              "vidNotions": {
+                "instantiationUI": "legacy",
+                "modelCategory": "other",
+                "viewEditUI": "legacy"
+              }
+            },
+            "vnfs": {},
+            "networks": {},
+            "collectionResources": {
+              [collectionResourceName]: {
+                "uuid": "3467f91f-1a2a-4013-a5ed-8ad99d4e06ad",
+                "invariantUuid": "d0060da6-82b8-4ca0-9758-5eb2b111b926",
+                "description": "CR_sanity",
+                "name": "CR_sanity",
+                "version": "1.0",
+                "customizationUuid": "7160c618-9314-4c09-8717-b77f3d29d946",
+                "inputs": {},
+                "commands": {},
+                "properties": {
+                  "cr_sanity..Fixed..0_quantity": "10",
+                  "cr_sanity..NetworkCollection..0_network_collection_function": "ABCD",
+                  "ecomp_generated_naming": "false",
+                  "cr_sanity..NetworkCollection..0_network_collection_description": "ABCD"
+                },
+                "type": "CR",
+                "category": "Network L2-3",
+                "subcategory": "Infrastructure",
+                "resourceVendor": "ATT",
+                "resourceVendorRelease": "2018.06",
+                "resourceVendorModelNumber": "",
+                "customizationUUID": "7160c618-9314-4c09-8717-b77f3d29d946",
+                "networksCollection": {
+                  "cr_sanity..NetworkCollection..0": {
+                    "uuid": "445d7fa8-3e59-4606-bd76-30ba5fc677d3",
+                    "invariantUuid": "9dc623b8-0ae8-47ad-a791-a21b8d8e94a8",
+                    "name": "cr_sanity..NetworkCollection..0",
+                    "version": "1",
+                    "networkCollectionProperties": {
+                      "networkCollectionFunction": "ABCD",
+                      "networkCollectionDescription": "ABCD"
+                    }
+                  }
+                }
+              }
+            },
+            "configurations": {},
+            "fabricConfigurations": {},
+            "serviceProxies": {},
+            "vfModules": {},
+            "volumeGroups": {},
+            "pnfs": {},
+            "vnfGroups": {}
+          }
+        },
+        "serviceInstance": {
+          "6e59c5de-f052-46fa-aa7e-2fca9d674c44": {
+            "action": "Create",
+            "isDirty": true,
+            "vnfs": {},
+            "instanceParams": [
+              {}
+            ],
+            "validationCounter": 0,
+            "existingNames": {
+              "11": "",
+              "yoav": ""
+            },
+            "existingVNFCounterMap": {
+              "91415b44-753d-494c-926a-456a9172bbb9": 1
+            },
+            "existingVnfGroupCounterMap": {},
+            "existingNetworksCounterMap": {},
+            "optionalGroupMembersMap": {},
+            "networks": {},
+            "vnfGroups": {},
+            "bulkSize": 1,
+            "instanceName": "serviceInstanceName",
+            "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
+            "subscriptionServiceType": "TYLER SILVIA",
+            "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
+            "productFamilyId": "d8a6ed93-251c-47ca-adc9-86671fd19f4c",
+            "lcpCloudRegionId": "AAIAIC25",
+            "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+            "aicZoneId": "ATL53",
+            "projectName": "WATKINS",
+            "rollbackOnFailure": "true",
+            "aicZoneName": "AAIATLTE-ATL53",
+            "owningEntityName": "WayneHolland",
+            "testApi": "VNF_API",
+            "tenantName": "USP-SIP-IC-24335-T-01",
+            "modelInfo": {
+              "modelInvariantId": "cfef8302-d90f-475f-87cc-3f49a62ef14c",
+              "modelVersionId": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
+              "modelName": "ComplexService",
+              "modelVersion": "1.0",
+              "uuid": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
+              "modelUniqueId": "6e59c5de-f052-46fa-aa7e-2fca9d674c44"
+            },
+            "isALaCarte": false,
+            "name": "ComplexService",
+            "version": "1.0",
+            "description": "ComplexService",
+            "category": "Emanuel",
+            "uuid": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
+            "invariantUuid": "cfef8302-d90f-475f-87cc-3f49a62ef14c",
+            "serviceType": "",
+            "serviceRole": "",
+            "vidNotions": {
+              "instantiationUI": "legacy",
+              "modelCategory": "other",
+              "viewEditUI": "legacy"
+            },
+            "isEcompGeneratedNaming": true,
+            "isMultiStepDesign": false
+          }
+        },
+        "lcpRegionsAndTenants": {
+          "lcpRegionList": [
+            {
+              "id": "AAIAIC25",
+              "name": "AAIAIC25 (AIC)",
+              "isPermitted": true,
+              "cloudOwner": "irma-aic"
+            },
+            {
+              "id": "hvf6",
+              "name": "hvf6 (AIC)",
+              "isPermitted": true,
+              "cloudOwner": "irma-aic"
+            }
+          ],
+          "lcpRegionsTenantsMap": {
+            "AAIAIC25": [
+              {
+                "id": "092eb9e8e4b7412e8787dd091bc58e86",
+                "name": "USP-SIP-IC-24335-T-01",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              }
+            ],
+            "hvf6": [
+              {
+                "id": "bae71557c5bb4d5aac6743a4e5f1d054",
+                "name": "AIN Web Tool-15-D-testalexandria",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "229bcdc6eaeb4ca59d55221141d01f8e",
+                "name": "AIN Web Tool-15-D-STTest2",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "1178612d2b394be4834ad77f567c0af2",
+                "name": "AIN Web Tool-15-D-SSPtestcustome",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
+                "name": "AIN Web Tool-15-D-UncheckedEcopm",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "de007636e25249238447264a988a927b",
+                "name": "AIN Web Tool-15-D-dfsdf",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "62f29b3613634ca6a3065cbe0e020c44",
+                "name": "AIN/SMS-16-D-Multiservices1",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "649289e30d3244e0b48098114d63c2aa",
+                "name": "AIN Web Tool-15-D-SSPST66",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "3f21eeea6c2c486bba31dab816c05a32",
+                "name": "AIN Web Tool-15-D-ASSPST47",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "f60ce21d3ee6427586cff0d22b03b773",
+                "name": "CESAR-100-D-sspjg67246",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "8774659e425f479895ae091bb5d46560",
+                "name": "CESAR-100-D-sspjg68359",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "624eb554b0d147c19ff8885341760481",
+                "name": "AINWebTool-15-D-iftach",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "214f55f5fc414c678059c383b03e4962",
+                "name": "CESAR-100-D-sspjg612401",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "c90666c291664841bb98e4d981ff1db5",
+                "name": "CESAR-100-D-sspjg621340",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
+                "name": "sspjg621351cloned",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "b386b768a3f24c8e953abbe0b3488c02",
+                "name": "AINWebTool-15-D-eteancomp",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "dc6c4dbfd225474e9deaadd34968646c",
+                "name": "AINWebTool-15-T-SPFET",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "02cb5030e9914aa4be120bd9ed1e19eb",
+                "name": "AINWebTool-15-X-eeweww",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "f2f3830e4c984d45bcd00e1a04158a79",
+                "name": "CESAR-100-D-spjg61909",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "05b91bd5137f4929878edd965755c06d",
+                "name": "CESAR-100-D-sspjg621512cloned",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "7002fbe8482d4a989ddf445b1ce336e0",
+                "name": "AINWebTool-15-X-vdr",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "4008522be43741dcb1f5422022a2aa0b",
+                "name": "AINWebTool-15-D-ssasa",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "f44e2e96a1b6476abfda2fa407b00169",
+                "name": "AINWebTool-15-D-PFNPT",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "b69a52bec8a84669a37a1e8b72708be7",
+                "name": "AINWebTool-15-X-vdre",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "fac7d9fd56154caeb9332202dcf2969f",
+                "name": "AINWebTool-15-X-NONPODECOMP",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "2d34d8396e194eb49969fd61ffbff961",
+                "name": "DN5242-Nov16-T5",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "cb42a77ff45b48a8b8deb83bb64acc74",
+                "name": "ro-T11",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "fa45ca53c80b492fa8be5477cd84fc2b",
+                "name": "ro-T112",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "4914ab0ab3a743e58f0eefdacc1dde77",
+                "name": "DN5242-Nov21-T1",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "cbb99fe4ada84631b7baf046b6fd2044",
+                "name": "DN5242-Nov16-T3",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              }
+            ]
+          }
+        },
+        "subscribers": [
+          {
+            "id": "ERICA5779-Subscriber-2",
+            "name": "ERICA5779-Subscriber-2",
+            "isPermitted": false
+          },
+          {
+            "id": "ERICA5779-Subscriber-3",
+            "name": "ERICA5779-Subscriber-3",
+            "isPermitted": false
+          },
+          {
+            "id": "ERICA5779-Subscriber-4",
+            "name": "ERICA5779-Subscriber-5",
+            "isPermitted": false
+          },
+          {
+            "id": "ERICA5779-TestSub-PWT-101",
+            "name": "ERICA5779-TestSub-PWT-101",
+            "isPermitted": false
+          },
+          {
+            "id": "ERICA5779-TestSub-PWT-102",
+            "name": "ERICA5779-TestSub-PWT-102",
+            "isPermitted": false
+          },
+          {
+            "id": "ERICA5779-TestSub-PWT-103",
+            "name": "ERICA5779-TestSub-PWT-103",
+            "isPermitted": false
+          },
+          {
+            "id": "31739f3e-526b-11e6-beb8-9e71128cae77",
+            "name": "CRAIG/ROBERTS",
+            "isPermitted": false
+          },
+          {
+            "id": "DHV1707-TestSubscriber-2",
+            "name": "DALE BRIDGES",
+            "isPermitted": false
+          },
+          {
+            "id": "jimmy-example",
+            "name": "JimmyExampleCust-20161102",
+            "isPermitted": false
+          },
+          {
+            "id": "jimmy-example2",
+            "name": "JimmyExampleCust-20161103",
+            "isPermitted": false
+          },
+          {
+            "id": "CAR_2020_ER",
+            "name": "CAR_2020_ER",
+            "isPermitted": true
+          },
+          {
+            "id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+            "name": "Emanuel",
+            "isPermitted": true
+          },
+          {
+            "id": "21014aa2-526b-11e6-beb8-9e71128cae77",
+            "name": "JULIO ERICKSON",
+            "isPermitted": false
+          },
+          {
+            "id": "DHV1707-TestSubscriber-1",
+            "name": "LLOYD BRIDGES",
+            "isPermitted": false
+          },
+          {
+            "id": "e433710f-9217-458d-a79d-1c7aff376d89",
+            "name": "SILVIA ROBBINS",
+            "isPermitted": true
+          },
+          {
+            "id": "global-customer-id",
+            "name": "global-customer-id",
+            "isPermitted": true
+          }
+        ],
+        "productFamilies": null,
+        "serviceTypes": {
+          "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb": [
+            {
+              "id": "3",
+              "name": "Emanuel",
+              "isPermitted": false
+            },
+            {
+              "id": "7",
+              "name": "Kennedy",
+              "isPermitted": false
+            },
+            {
+              "id": "6",
+              "name": "vJamie",
+              "isPermitted": false
+            },
+            {
+              "id": "0",
+              "name": "vWINIFRED",
+              "isPermitted": false
+            },
+            {
+              "id": "1",
+              "name": "vMNS",
+              "isPermitted": false
+            },
+            {
+              "id": "4",
+              "name": "vMOG",
+              "isPermitted": false
+            },
+            {
+              "id": "5",
+              "name": "vEsmeralda",
+              "isPermitted": false
+            },
+            {
+              "id": "2",
+              "name": "vVoiceMail",
+              "isPermitted": false
+            }
+          ],
+          "e433710f-9217-458d-a79d-1c7aff376d89": [
+            {
+              "id": "17",
+              "name": "JOHANNA_SANTOS",
+              "isPermitted": false
+            },
+            {
+              "id": "16",
+              "name": "LINDSEY",
+              "isPermitted": false
+            },
+            {
+              "id": "2",
+              "name": "Emanuel",
+              "isPermitted": false
+            },
+            {
+              "id": "5",
+              "name": "Kennedy",
+              "isPermitted": false
+            },
+            {
+              "id": "14",
+              "name": "SSD",
+              "isPermitted": false
+            },
+            {
+              "id": "1",
+              "name": "TYLER SILVIA",
+              "isPermitted": true
+            },
+            {
+              "id": "12",
+              "name": "VPMS",
+              "isPermitted": false
+            },
+            {
+              "id": "3",
+              "name": "vJamie",
+              "isPermitted": false
+            },
+            {
+              "id": "0",
+              "name": "vRichardson",
+              "isPermitted": false
+            },
+            {
+              "id": "18",
+              "name": "vCarroll",
+              "isPermitted": false
+            },
+            {
+              "id": "9",
+              "name": "vFLORENCE",
+              "isPermitted": false
+            },
+            {
+              "id": "13",
+              "name": "vWINIFRED",
+              "isPermitted": false
+            },
+            {
+              "id": "10",
+              "name": "vMNS",
+              "isPermitted": false
+            },
+            {
+              "id": "15",
+              "name": "vMOG",
+              "isPermitted": false
+            },
+            {
+              "id": "8",
+              "name": "vOTA",
+              "isPermitted": false
+            },
+            {
+              "id": "11",
+              "name": "vEsmeralda",
+              "isPermitted": false
+            },
+            {
+              "id": "6",
+              "name": "vPorfirio",
+              "isPermitted": false
+            },
+            {
+              "id": "7",
+              "name": "vVM",
+              "isPermitted": false
+            },
+            {
+              "id": "4",
+              "name": "vVoiceMail",
+              "isPermitted": false
+            }
+          ]
+        },
+        "aicZones": [
+          {
+            "id": "ATL53",
+            "name": "AAIATLTE-ATL53"
+          },
+          {
+            "id": "ABC15",
+            "name": "AAITESAN-ABC15"
+          },
+          {
+            "id": "TES36",
+            "name": "ABCEETES-TES36"
+          },
+          {
+            "id": "ATL54",
+            "name": "AICFTAAI-ATL54"
+          },
+          {
+            "id": "ATL43",
+            "name": "AICLOCID-ATL43"
+          },
+          {
+            "id": "AMD15",
+            "name": "AMDFAA01-AMD15"
+          },
+          {
+            "id": "AMF11",
+            "name": "AMDOCS01-AMF11"
+          },
+          {
+            "id": "RCT1",
+            "name": "AMSTERNL-RCT1"
+          },
+          {
+            "id": "AMS1",
+            "name": "AMSTNLBW-AMS1"
+          },
+          {
+            "id": "HJH1",
+            "name": "AOEEQQQD-HJH1"
+          },
+          {
+            "id": "HJE1",
+            "name": "AOEEWWWD-HJE1"
+          },
+          {
+            "id": "MCS1",
+            "name": "ASACMAMS-MCS1"
+          },
+          {
+            "id": "AUG1",
+            "name": "ASDFGHJK-AUG1"
+          },
+          {
+            "id": "LUC1",
+            "name": "ATLDFGYC-LUC1"
+          },
+          {
+            "id": "ATL1",
+            "name": "ATLNGAMA-ATL1"
+          },
+          {
+            "id": "ATL2",
+            "name": "ATLNGANW-ATL2"
+          },
+          {
+            "id": "HPO1",
+            "name": "ATLNGAUP-HPO1"
+          },
+          {
+            "id": "ANI1",
+            "name": "ATLNGTRE-ANI1"
+          },
+          {
+            "id": "ATL44",
+            "name": "ATLSANAB-ATL44"
+          },
+          {
+            "id": "ATL56",
+            "name": "ATLSANAC-ATL56"
+          },
+          {
+            "id": "ABC11",
+            "name": "ATLSANAI-ABC11"
+          },
+          {
+            "id": "ATL34",
+            "name": "ATLSANAI-ATL34"
+          },
+          {
+            "id": "ATL63",
+            "name": "ATLSANEW-ATL63"
+          },
+          {
+            "id": "ABC12",
+            "name": "ATLSECIA-ABC12"
+          },
+          {
+            "id": "AMD18",
+            "name": "AUDIMA01-AMD18"
+          },
+          {
+            "id": "AVT1",
+            "name": "AVTRFLHD-AVT1"
+          },
+          {
+            "id": "KIT1",
+            "name": "BHYJFGLN-KIT1"
+          },
+          {
+            "id": "BHY17",
+            "name": "BHYTFRF3-BHY17"
+          },
+          {
+            "id": "RTW5",
+            "name": "BHYTFRY4-RTW5"
+          },
+          {
+            "id": "RTZ4",
+            "name": "BHYTFRZ6-RTZ4"
+          },
+          {
+            "id": "RTD2",
+            "name": "BHYTFRk4-RTD2"
+          },
+          {
+            "id": "BNA1",
+            "name": "BNARAGBK-BNA1"
+          },
+          {
+            "id": "VEL1",
+            "name": "BNMLKUIK-VEL1"
+          },
+          {
+            "id": "BOT1",
+            "name": "BOTHWAKY-BOT1"
+          },
+          {
+            "id": "CAL33",
+            "name": "CALIFORN-CAL33"
+          },
+          {
+            "id": "ATL84",
+            "name": "CANTTCOC-ATL84"
+          },
+          {
+            "id": "HSD1",
+            "name": "CHASKCDS-HSD1"
+          },
+          {
+            "id": "CHI1",
+            "name": "CHILLIWE-CHI1"
+          },
+          {
+            "id": "XCP12",
+            "name": "CHKGH123-XCP12"
+          },
+          {
+            "id": "JNL1",
+            "name": "CJALSDAC-JNL1"
+          },
+          {
+            "id": "KJN1",
+            "name": "CKALDKSA-KJN1"
+          },
+          {
+            "id": "CLG1",
+            "name": "CLGRABAD-CLG1"
+          },
+          {
+            "id": "CKL1",
+            "name": "CLKSKCKK-CKL1"
+          },
+          {
+            "id": "ATL66",
+            "name": "CLLIAAII-ATL66"
+          },
+          {
+            "id": "CQK1",
+            "name": "CQKSCAKK-CQK1"
+          },
+          {
+            "id": "CWY1",
+            "name": "CWYMOWBS-CWY1"
+          },
+          {
+            "id": "DKJ1",
+            "name": "DKJSJDKA-DKJ1"
+          },
+          {
+            "id": "DSF45",
+            "name": "DSFBG123-DSF45"
+          },
+          {
+            "id": "DSL12",
+            "name": "DSLFK242-DSL12"
+          },
+          {
+            "id": "FDE55",
+            "name": "FDERT555-FDE55"
+          },
+          {
+            "id": "VEN2",
+            "name": "FGHJUHIL-VEN2"
+          },
+          {
+            "id": "ATL64",
+            "name": "FORLOAAJ-ATL64"
+          },
+          {
+            "id": "GNV1",
+            "name": "GNVLSCTL-GNV1"
+          },
+          {
+            "id": "SAN22",
+            "name": "GNVLSCTL-SAN22"
+          },
+          {
+            "id": "KAP1",
+            "name": "HIOUYTRQ-KAP1"
+          },
+          {
+            "id": "LIS1",
+            "name": "HOSTPROF-LIS1"
+          },
+          {
+            "id": "HRG1",
+            "name": "HRGHRGGS-HRG1"
+          },
+          {
+            "id": "HST25",
+            "name": "HSTNTX01-HST25"
+          },
+          {
+            "id": "STN27",
+            "name": "HSTNTX01-STN27"
+          },
+          {
+            "id": "HST70",
+            "name": "HSTNTX70-HST70"
+          },
+          {
+            "id": "KOR1",
+            "name": "HYFLNBVT-KOR1"
+          },
+          {
+            "id": "RAD10",
+            "name": "INDIPUNE-RAD10"
+          },
+          {
+            "id": "REL1",
+            "name": "INGERFGT-REL1"
+          },
+          {
+            "id": "JAD1",
+            "name": "JADECLLI-JAD1"
+          },
+          {
+            "id": "HKA1",
+            "name": "JAKHLASS-HKA1"
+          },
+          {
+            "id": "JCS1",
+            "name": "JCSJSCJS-JCS1"
+          },
+          {
+            "id": "JCV1",
+            "name": "JCVLFLBW-JCV1"
+          },
+          {
+            "id": "KGM2",
+            "name": "KGMTNC20-KGM2"
+          },
+          {
+            "id": "KJF12",
+            "name": "KJFDH123-KJF12"
+          },
+          {
+            "id": "JGS1",
+            "name": "KSJKKKKK-JGS1"
+          },
+          {
+            "id": "LAG1",
+            "name": "LARGIZON-LAG1"
+          },
+          {
+            "id": "LAG1a",
+            "name": "LARGIZON-LAG1a"
+          },
+          {
+            "id": "LAG45",
+            "name": "LARGIZON-LAG1a"
+          },
+          {
+            "id": "LAG1b",
+            "name": "LARGIZON-LAG1b"
+          },
+          {
+            "id": "WAN1",
+            "name": "LEIWANGW-WAN1"
+          },
+          {
+            "id": "DSA1",
+            "name": "LKJHGFDS-DSA1"
+          },
+          {
+            "id": "LON1",
+            "name": "LONEENCO-LON1"
+          },
+          {
+            "id": "SITE",
+            "name": "LONEENCO-SITE"
+          },
+          {
+            "id": "ZXL1",
+            "name": "LWLWCANN-ZXL1"
+          },
+          {
+            "id": "hvf20",
+            "name": "MDTWNJ21-hvf20"
+          },
+          {
+            "id": "hvf32",
+            "name": "MDTWNJ21-hvf32"
+          },
+          {
+            "id": "AMD13",
+            "name": "MEMATLAN-AMD13"
+          },
+          {
+            "id": "MIC54",
+            "name": "MICHIGAN-MIC54"
+          },
+          {
+            "id": "MAR1",
+            "name": "MNBVCXZM-MAR1"
+          },
+          {
+            "id": "NCA1",
+            "name": "NCANCANN-NCA1"
+          },
+          {
+            "id": "NFT1",
+            "name": "NFTJSSSS-NFT1"
+          },
+          {
+            "id": "GAR1",
+            "name": "NGFVSJKO-GAR1"
+          },
+          {
+            "id": "NYC1",
+            "name": "NYCMNY54-NYC1"
+          },
+          {
+            "id": "OKC1",
+            "name": "OKCBOK55-OKC1"
+          },
+          {
+            "id": "OLG1",
+            "name": "OLHOLHOL-OLG1"
+          },
+          {
+            "id": "OLK1",
+            "name": "OLKOLKLS-OLK1"
+          },
+          {
+            "id": "NIR1",
+            "name": "ORFLMANA-NIR1"
+          },
+          {
+            "id": "JAN1",
+            "name": "ORFLMATT-JAN1"
+          },
+          {
+            "id": "ORL1",
+            "name": "ORLDFLMA-ORL1"
+          },
+          {
+            "id": "PAR1",
+            "name": "PARSFRCG-PAR1"
+          },
+          {
+            "id": "PBL1",
+            "name": "PBLAPBAI-PBL1"
+          },
+          {
+            "id": "mac10",
+            "name": "PKGTESTF-mac10"
+          },
+          {
+            "id": "mac20",
+            "name": "PKGTESTF-mac20"
+          },
+          {
+            "id": "TIR2",
+            "name": "PLKINHYI-TIR2"
+          },
+          {
+            "id": "IBB1",
+            "name": "PLMKOIJU-IBB1"
+          },
+          {
+            "id": "COM1",
+            "name": "PLMKOPIU-COM1"
+          },
+          {
+            "id": "POI1",
+            "name": "PLMNJKIU-POI1"
+          },
+          {
+            "id": "PLT1",
+            "name": "PLTNCA60-PLT1"
+          },
+          {
+            "id": "POI22",
+            "name": "POIUY123-POI22"
+          },
+          {
+            "id": "DCC1",
+            "name": "POIUYTGH-DCC1"
+          },
+          {
+            "id": "DCC1a",
+            "name": "POIUYTGH-DCC1a"
+          },
+          {
+            "id": "DCC1b",
+            "name": "POIUYTGH-DCC1b"
+          },
+          {
+            "id": "DCC2",
+            "name": "POIUYTGH-DCC2"
+          },
+          {
+            "id": "DCC3",
+            "name": "POIUYTGH-DCC3"
+          },
+          {
+            "id": "IAA1",
+            "name": "QAZXSWED-IAA1"
+          },
+          {
+            "id": "QWE1",
+            "name": "QWECLLI1-QWE1"
+          },
+          {
+            "id": "NUM1",
+            "name": "QWERTYUI-NUM1"
+          },
+          {
+            "id": "RAD1",
+            "name": "RADICAL1-RAD1"
+          },
+          {
+            "id": "RJN1",
+            "name": "RJNRBZAW-RJN1"
+          },
+          {
+            "id": "SAA13",
+            "name": "SAIT1AA9-SAA13"
+          },
+          {
+            "id": "SAA14",
+            "name": "SAIT1AA9-SAA14"
+          },
+          {
+            "id": "SDD81",
+            "name": "SAIT1DD6-SDD81"
+          },
+          {
+            "id": "SDD82",
+            "name": "SAIT1DD9-SDD82"
+          },
+          {
+            "id": "SAA11",
+            "name": "SAIT9AA2-SAA11"
+          },
+          {
+            "id": "SAA80",
+            "name": "SAIT9AA3-SAA80"
+          },
+          {
+            "id": "SAA12",
+            "name": "SAIT9AF8-SAA12"
+          },
+          {
+            "id": "SCC80",
+            "name": "SAIT9CC3-SCC80"
+          },
+          {
+            "id": "ATL75",
+            "name": "SANAAIRE-ATL75"
+          },
+          {
+            "id": "ICC1",
+            "name": "SANJITAT-ICC1"
+          },
+          {
+            "id": "SCK1",
+            "name": "SCKSCKSK-SCK1"
+          },
+          {
+            "id": "EHH78",
+            "name": "SDCSHHH5-EHH78"
+          },
+          {
+            "id": "SAA78",
+            "name": "SDCTAAA1-SAA78"
+          },
+          {
+            "id": "SAX78",
+            "name": "SDCTAXG1-SAX78"
+          },
+          {
+            "id": "SBX78",
+            "name": "SDCTBXG1-SBX78"
+          },
+          {
+            "id": "SEE78",
+            "name": "SDCTEEE4-SEE78"
+          },
+          {
+            "id": "SGG78",
+            "name": "SDCTGGG1-SGG78"
+          },
+          {
+            "id": "SXB78",
+            "name": "SDCTGXB1-SXB78"
+          },
+          {
+            "id": "SJJ78",
+            "name": "SDCTJJJ1-SJJ78"
+          },
+          {
+            "id": "SKK78",
+            "name": "SDCTKKK1-SKK78"
+          },
+          {
+            "id": "SLF78",
+            "name": "SDCTLFN1-SLF78"
+          },
+          {
+            "id": "SLL78",
+            "name": "SDCTLLL1-SLL78"
+          },
+          {
+            "id": "MAD11",
+            "name": "SDFQWGKL-MAD11"
+          },
+          {
+            "id": "HGD1",
+            "name": "SDFQWHGD-HGD1"
+          },
+          {
+            "id": "SBB78",
+            "name": "SDIT1BBB-SBB78"
+          },
+          {
+            "id": "SDG78",
+            "name": "SDIT1BDG-SDG78"
+          },
+          {
+            "id": "SBU78",
+            "name": "SDIT1BUB-SBU78"
+          },
+          {
+            "id": "SHH78",
+            "name": "SDIT1HHH-SHH78"
+          },
+          {
+            "id": "SJU78",
+            "name": "SDIT1JUB-SJU78"
+          },
+          {
+            "id": "SNA1",
+            "name": "SNANTXCA-SNA1"
+          },
+          {
+            "id": "SAM1",
+            "name": "SNDGCA64-SAN1"
+          },
+          {
+            "id": "SNG1",
+            "name": "SNGPSIAU-SNG1"
+          },
+          {
+            "id": "SSA56",
+            "name": "SSIT2AA7-SSA56"
+          },
+          {
+            "id": "STG1",
+            "name": "STTGGE62-STG1"
+          },
+          {
+            "id": "STT1",
+            "name": "STTLWA02-STT1"
+          },
+          {
+            "id": "SYD1",
+            "name": "SYDNAUBV-SYD1"
+          },
+          {
+            "id": "ATL99",
+            "name": "TEESTAAI-ATL43"
+          },
+          {
+            "id": "ATL98",
+            "name": "TEESTAAI-ATL43"
+          },
+          {
+            "id": "ATL76",
+            "name": "TELEPAAI-ATL76"
+          },
+          {
+            "id": "ABC14",
+            "name": "TESAAISA-ABC14"
+          },
+          {
+            "id": "TAT33",
+            "name": "TESAAISA-TAT33"
+          },
+          {
+            "id": "TAT34",
+            "name": "TESAAISB-TAT34"
+          },
+          {
+            "id": "TAT37",
+            "name": "TESAAISD-TAT37"
+          },
+          {
+            "id": "ATL62",
+            "name": "TESSASCH-ATL62"
+          },
+          {
+            "id": "TLP1",
+            "name": "TLPNXM18-TLP1"
+          },
+          {
+            "id": "SAN13",
+            "name": "TOKYJPFA-SAN13"
+          },
+          {
+            "id": "TOK1",
+            "name": "TOKYJPFA-TOK1"
+          },
+          {
+            "id": "TOL1",
+            "name": "TOLDOH21-TOL1"
+          },
+          {
+            "id": "TOR1",
+            "name": "TOROONXN-TOR1"
+          },
+          {
+            "id": "TOY1",
+            "name": "TORYONNZ-TOY1"
+          },
+          {
+            "id": "ATL35",
+            "name": "TTESSAAI-ATL35"
+          },
+          {
+            "id": "TUF1",
+            "name": "TUFCLLI1-TUF1"
+          },
+          {
+            "id": "SAI1",
+            "name": "UBEKQLPD-SAI1"
+          },
+          {
+            "id": "UUU4",
+            "name": "UUUAAAUU-UUU4"
+          },
+          {
+            "id": "YYY1",
+            "name": "UUUAIAAI-YYY1"
+          },
+          {
+            "id": "BAN1",
+            "name": "VSDKYUTP-BAN1"
+          },
+          {
+            "id": "WAS1",
+            "name": "WASHDCSW-WAS1"
+          },
+          {
+            "id": "APP1",
+            "name": "WBHGTYUI-APP1"
+          },
+          {
+            "id": "SUL2",
+            "name": "WERTYUJK-SUL2"
+          },
+          {
+            "id": "DEF2",
+            "name": "WSBHGTYL-DEF2"
+          },
+          {
+            "id": "DHA12",
+            "name": "WSXEDECF-DHA12"
+          },
+          {
+            "id": "MNT11",
+            "name": "WSXEFBTH-MNT11"
+          },
+          {
+            "id": "RAJ1",
+            "name": "YGBIJNLQ-RAJ1"
+          },
+          {
+            "id": "JAG1",
+            "name": "YUDFJULP-JAG1"
+          },
+          {
+            "id": "ZEN1",
+            "name": "ZENCLLI1-ZEN1"
+          },
+          {
+            "id": "ZOG1",
+            "name": "ZOGASTRO-ZOG1"
+          },
+          {
+            "id": "SDE1",
+            "name": "ZXCVBNMA-SDE1"
+          },
+          {
+            "id": "SIP1",
+            "name": "ZXCVBNMK-SIP1"
+          },
+          {
+            "id": "JUL1",
+            "name": "ZXCVBNMM-JUL1"
+          },
+          {
+            "id": "ERT1",
+            "name": "ertclli1-ERT1"
+          },
+          {
+            "id": "IOP1",
+            "name": "iopclli1-IOP1"
+          },
+          {
+            "id": "OPA1",
+            "name": "opaclli1-OPA1"
+          },
+          {
+            "id": "RAI1",
+            "name": "poiuytre-RAI1"
+          },
+          {
+            "id": "PUR1",
+            "name": "purelyde-PUR1"
+          },
+          {
+            "id": "RTY1",
+            "name": "rtyclli1-RTY1"
+          },
+          {
+            "id": "SDF1",
+            "name": "sdfclli1-SDF1"
+          },
+          {
+            "id": "SSW56",
+            "name": "ss8126GT-SSW56"
+          },
+          {
+            "id": "UIO1",
+            "name": "uioclli1-UIO1"
+          }
+        ],
+        "categoryParameters": {
+          "owningEntityList": [
+            {
+              "id": "aaa1",
+              "name": "aaa1"
+            },
+            {
+              "id": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
+              "name": "WayneHolland"
+            },
+            {
+              "id": "Melissa",
+              "name": "Melissa"
+            }
+          ],
+          "projectList": [
+            {
+              "id": "WATKINS",
+              "name": "WATKINS"
+            },
+            {
+              "id": "x1",
+              "name": "x1"
+            },
+            {
+              "id": "yyy1",
+              "name": "yyy1"
+            }
+          ],
+          "lineOfBusinessList": [
+            {
+              "id": "ONAP",
+              "name": "ONAP"
+            },
+            {
+              "id": "zzz1",
+              "name": "zzz1"
+            }
+          ],
+          "platformList": [
+            {
+              "id": "platform",
+              "name": "platform"
+            },
+            {
+              "id": "xxx1",
+              "name": "xxx1"
+            }
+          ]
+        },
+        "type": "UPDATE_LCP_REGIONS_AND_TENANTS"
+      },
+      "global": {
+        "name": null,
+        "flags": {
+          "FLAG_1810_IDENTIFY_SERVICE_FOR_NEW_UI": false,
+          "FLAG_1902_VNF_GROUPING": true,
+          "FLAG_1906_COMPONENT_INFO": true,
+          "FLAG_SHOW_ASSIGNMENTS": true,
+          "FLAG_A_LA_CARTE_AUDIT_INFO": true,
+          "FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST": true,
+          "FLAG_SHOW_VERIFY_SERVICE": true,
+          "FLAG_1902_NEW_VIEW_EDIT": true,
+          "EMPTY_DRAWING_BOARD_TEST": false,
+          "FLAG_ADD_MSO_TESTAPI_FIELD": true,
+          "FLAG_1906_INSTANTIATION_API_USER_VALIDATION": true,
+          "FLAG_EXP_CREATE_RESOURCES_IN_PARALLEL": false,
+          "FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS": true,
+          "FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
+          "FLAG_DEFAULT_VNF": true,
+          "FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE": true,
+          "FLAG_ASYNC_ALACARTE_VFMODULE": true,
+          "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
+          "FLAG_ASYNC_ALACARTE_VNF": true,
+          "FLAG_1810_AAI_LOCAL_CACHE": true,
+          "FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER": false,
+          "FLAG_SERVICE_MODEL_CACHE": true,
+          "FLAG_1902_RETRY_JOB": true,
+          "FLAG_EXP_ANY_ALACARTE_NEW_INSTANTIATION_UI": true,
+          "CREATE_INSTANCE_TEST": false,
+          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": true,
+          "FLAG_1906_AAI_SUB_DETAILS_REDUCE_DEPTH": true,
+          "FLAG_VF_MODULE_RESUME_STATUS_CREATE": true,
+          "FLAG_SUPPLEMENTARY_FILE": true,
+          "FLAG_5G_IN_NEW_INSTANTIATION_UI": true,
+          "FLAG_RESTRICTED_SELECT": false,
+          "FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY": true
+        },
+        "drawingBoardStatus": "CREATE",
+        "type": "UPDATE_DRAWING_BOARD_STATUS"
+      }
+    }
+  }
+});
diff --git a/vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts
index bd8c4c88c..503900cec 100644
--- a/vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts
@@ -1,5 +1,8 @@
 
 ///<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) => {
@@ -8,6 +11,7 @@ describe('Drawing board', function () {
       cy.preventErrorsOnLoading();
       cy.initAAIMock();
       cy.initVidMock();
+      cy.initActiveNetworks();
       cy.login();
     });
   });
@@ -22,13 +26,13 @@ describe('Drawing board', function () {
       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.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().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(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);
           });
@@ -40,12 +44,12 @@ describe('Drawing board', function () {
       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.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().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.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);
             });
@@ -58,29 +62,29 @@ describe('Drawing board', function () {
       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.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().then(() => {
-          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')
             .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 +94,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 +117,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 +126,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 +135,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 +152,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 +170,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 +191,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 +213,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 +223,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 +246,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 +259,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');
@@ -273,6 +277,7 @@ 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) => {
+        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.)");
@@ -289,16 +294,16 @@ describe('Drawing board', function () {
       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();
       });
@@ -308,7 +313,7 @@ describe('Drawing board', function () {
       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')
       });
     });
@@ -317,37 +322,37 @@ describe('Drawing board', function () {
       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.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';
+      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.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);
       });
     });
 
@@ -355,23 +360,23 @@ describe('Drawing board', function () {
 
       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 = [];
+          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 = [];
+          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');
         });
       });
@@ -384,7 +389,7 @@ describe('Drawing board', function () {
         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 +402,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();
         });
@@ -423,16 +428,16 @@ describe('Drawing board', function () {
 
       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;
+          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');
               })
             })
           });
@@ -442,13 +447,13 @@ 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;
+          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);
 
             });
           });
@@ -458,13 +463,13 @@ 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;
+          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();
             });
           });
@@ -479,7 +484,7 @@ describe('Drawing board', function () {
           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 +498,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 +506,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 +520,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 +547,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,19 +579,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
         },
         "type": "[FLAGS] Update"
@@ -605,14 +606,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 +785,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 +880,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 +901,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 +977,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 +1002,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 +1078,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 +1157,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 +1169,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 +1186,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 +1200,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 +1285,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 +1335,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 +1417,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 +1452,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 +1539,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 +1589,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 +1671,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 +1708,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 +1738,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 +1757,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 +1783,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 +1797,8 @@ describe('Drawing board', function () {
         "lcpRegionsAndTenants": {
           "lcpRegionList": [
             {
-              "id": "JANET25",
-              "name": "JANET25",
+              "id": "AAIAIC25",
+              "name": "AAIAIC25",
               "isPermitted": true
             },
             {
@@ -1801,7 +1808,7 @@ describe('Drawing board', function () {
             }
           ],
           "lcpRegionsTenantsMap": {
-            "JANET25": [
+            "AAIAIC25": [
               {
                 "id": "092eb9e8e4b7412e8787dd091bc58e86",
                 "name": "USP-SIP-IC-24335-T-01",
@@ -1815,8 +1822,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
               },
               {
@@ -1825,6 +1952,16 @@ describe('Drawing board', function () {
                 "isPermitted": true
               },
               {
+                "id": "4914ab0ab3a743e58f0eefdacc1dde77",
+                "name": "DN5242-Nov21-T1",
+                "isPermitted": true
+              },
+              {
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
+                "isPermitted": true
+              },
+              {
                 "id": "cbb99fe4ada84631b7baf046b6fd2044",
                 "name": "DN5242-Nov16-T3",
                 "isPermitted": true
@@ -1912,7 +2049,7 @@ describe('Drawing board', function () {
         "productFamilies": [
           {
             "id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-            "name": "SCOTTIE",
+            "name": "ERICA",
             "isPermitted": true
           },
           {
@@ -1937,7 +2074,7 @@ describe('Drawing board', function () {
           },
           {
             "id": "323d69d9-2efe-4r45-ay0a-89ea7ard4e6f",
-            "name": "vSCP",
+            "name": "vEsmeralda",
             "isPermitted": true
           },
           {
@@ -1981,7 +2118,7 @@ describe('Drawing board', function () {
             "isPermitted": true
           },
           {
-            "id": "Cisneros",
+            "id": "vMuriel",
             "name": "vMuriel",
             "isPermitted": true
           },
@@ -2007,7 +2144,7 @@ describe('Drawing board', function () {
           },
           {
             "id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
-            "name": "Josefina",
+            "name": "JOSEFINA",
             "isPermitted": true
           },
           {
@@ -2055,7 +2192,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "6",
-              "name": "vSEGW",
+              "name": "vPorfirio",
               "isPermitted": false
             },
             {
@@ -2070,7 +2207,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "9",
-              "name": "vMME",
+              "name": "vFLORENCE",
               "isPermitted": false
             },
             {
@@ -2080,7 +2217,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "11",
-              "name": "vSCP",
+              "name": "vEsmeralda",
               "isPermitted": false
             },
             {
@@ -2090,7 +2227,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "13",
-              "name": "vMMSC",
+              "name": "vWINIFRED",
               "isPermitted": false
             },
             {
@@ -2134,6 +2271,754 @@ describe('Drawing board', function () {
             "name": "UUUAIAAI-YYY1"
           },
           {
+            "id": "BAN1",
+            "name": "VSDKYUTP-BAN1"
+          },
+          {
+            "id": "DKJ1",
+            "name": "DKJSJDKA-DKJ1"
+          },
+          {
+            "id": "MCS1",
+            "name": "ASACMAMS-MCS1"
+          },
+          {
+            "id": "UIO1",
+            "name": "uioclli1-UIO1"
+          },
+          {
+            "id": "RAJ1",
+            "name": "YGBIJNLQ-RAJ1"
+          },
+          {
+            "id": "OPA1",
+            "name": "opaclli1-OPA1"
+          },
+          {
+            "id": "SDE1",
+            "name": "ZXCVBNMA-SDE1"
+          },
+          {
+            "id": "VEN2",
+            "name": "FGHJUHIL-VEN2"
+          },
+          {
+            "id": "ORL1",
+            "name": "ORLDFLMA-ORL1"
+          },
+          {
+            "id": "JAD1",
+            "name": "JADECLLI-JAD1"
+          },
+          {
+            "id": "ZXL1",
+            "name": "LWLWCANN-ZXL1"
+          },
+          {
+            "id": "CKL1",
+            "name": "CLKSKCKK-CKL1"
+          },
+          {
+            "id": "SDF1",
+            "name": "sdfclli1-SDF1"
+          },
+          {
+            "id": "RAD1",
+            "name": "RADICAL1-RAD1"
+          },
+          {
+            "id": "KIT1",
+            "name": "BHYJFGLN-KIT1"
+          },
+          {
+            "id": "REL1",
+            "name": "INGERFGT-REL1"
+          },
+          {
+            "id": "JNL1",
+            "name": "CJALSDAC-JNL1"
+          },
+          {
+            "id": "OLK1",
+            "name": "OLKOLKLS-OLK1"
+          },
+          {
+            "id": "CHI1",
+            "name": "CHILLIWE-CHI1"
+          },
+          {
+            "id": "UUU4",
+            "name": "UUUAAAUU-UUU4"
+          },
+          {
+            "id": "TUF1",
+            "name": "TUFCLLI1-TUF1"
+          },
+          {
+            "id": "KJN1",
+            "name": "CKALDKSA-KJN1"
+          },
+          {
+            "id": "SAM1",
+            "name": "SNDGCA64-SAN1"
+          },
+          {
+            "id": "SCK1",
+            "name": "SCKSCKSK-SCK1"
+          },
+          {
+            "id": "HJH1",
+            "name": "AOEEQQQD-HJH1"
+          },
+          {
+            "id": "HGD1",
+            "name": "SDFQWHGD-HGD1"
+          },
+          {
+            "id": "KOR1",
+            "name": "HYFLNBVT-KOR1"
+          },
+          {
+            "id": "ATL43",
+            "name": "AICLOCID-ATL43"
+          },
+          {
+            "id": "ATL54",
+            "name": "AICFTAAI-ATL54"
+          },
+          {
+            "id": "ATL66",
+            "name": "CLLIAAII-ATL66"
+          },
+          {
+            "id": "VEL1",
+            "name": "BNMLKUIK-VEL1"
+          },
+          {
+            "id": "ICC1",
+            "name": "SANJITAT-ICC1"
+          },
+          {
+            "id": "MNT11",
+            "name": "WSXEFBTH-MNT11"
+          },
+          {
+            "id": "DEF2",
+            "name": "WSBHGTYL-DEF2"
+          },
+          {
+            "id": "MAD11",
+            "name": "SDFQWGKL-MAD11"
+          },
+          {
+            "id": "OLG1",
+            "name": "OLHOLHOL-OLG1"
+          },
+          {
+            "id": "GAR1",
+            "name": "NGFVSJKO-GAR1"
+          },
+          {
+            "id": "SAN22",
+            "name": "GNVLSCTL-SAN22"
+          },
+          {
+            "id": "HRG1",
+            "name": "HRGHRGGS-HRG1"
+          },
+          {
+            "id": "JCS1",
+            "name": "JCSJSCJS-JCS1"
+          },
+          {
+            "id": "DHA12",
+            "name": "WSXEDECF-DHA12"
+          },
+          {
+            "id": "HJE1",
+            "name": "AOEEWWWD-HJE1"
+          },
+          {
+            "id": "NCA1",
+            "name": "NCANCANN-NCA1"
+          },
+          {
+            "id": "IOP1",
+            "name": "iopclli1-IOP1"
+          },
+          {
+            "id": "RTY1",
+            "name": "rtyclli1-RTY1"
+          },
+          {
+            "id": "KAP1",
+            "name": "HIOUYTRQ-KAP1"
+          },
+          {
+            "id": "ZEN1",
+            "name": "ZENCLLI1-ZEN1"
+          },
+          {
+            "id": "HKA1",
+            "name": "JAKHLASS-HKA1"
+          },
+          {
+            "id": "CQK1",
+            "name": "CQKSCAKK-CQK1"
+          },
+          {
+            "id": "SAI1",
+            "name": "UBEKQLPD-SAI1"
+          },
+          {
+            "id": "ERT1",
+            "name": "ertclli1-ERT1"
+          },
+          {
+            "id": "IBB1",
+            "name": "PLMKOIJU-IBB1"
+          },
+          {
+            "id": "TIR2",
+            "name": "PLKINHYI-TIR2"
+          },
+          {
+            "id": "HSD1",
+            "name": "CHASKCDS-HSD1"
+          },
+          {
+            "id": "SLF78",
+            "name": "SDCTLFN1-SLF78"
+          },
+          {
+            "id": "SEE78",
+            "name": "SDCTEEE4-SEE78"
+          },
+          {
+            "id": "SAN13",
+            "name": "TOKYJPFA-SAN13"
+          },
+          {
+            "id": "SAA78",
+            "name": "SDCTAAA1-SAA78"
+          },
+          {
+            "id": "LUC1",
+            "name": "ATLDFGYC-LUC1"
+          },
+          {
+            "id": "AMD13",
+            "name": "MEMATLAN-AMD13"
+          },
+          {
+            "id": "TOR1",
+            "name": "TOROONXN-TOR1"
+          },
+          {
+            "id": "QWE1",
+            "name": "QWECLLI1-QWE1"
+          },
+          {
+            "id": "ZOG1",
+            "name": "ZOGASTRO-ZOG1"
+          },
+          {
+            "id": "CAL33",
+            "name": "CALIFORN-CAL33"
+          },
+          {
+            "id": "SHH78",
+            "name": "SDIT1HHH-SHH78"
+          },
+          {
+            "id": "DSA1",
+            "name": "LKJHGFDS-DSA1"
+          },
+          {
+            "id": "CLG1",
+            "name": "CLGRABAD-CLG1"
+          },
+          {
+            "id": "BNA1",
+            "name": "BNARAGBK-BNA1"
+          },
+          {
+            "id": "ATL84",
+            "name": "CANTTCOC-ATL84"
+          },
+          {
+            "id": "APP1",
+            "name": "WBHGTYUI-APP1"
+          },
+          {
+            "id": "RJN1",
+            "name": "RJNRBZAW-RJN1"
+          },
+          {
+            "id": "EHH78",
+            "name": "SDCSHHH5-EHH78"
+          },
+          {
+            "id": "mac10",
+            "name": "PKGTESTF-mac10"
+          },
+          {
+            "id": "SXB78",
+            "name": "SDCTGXB1-SXB78"
+          },
+          {
+            "id": "SAX78",
+            "name": "SDCTAXG1-SAX78"
+          },
+          {
+            "id": "SYD1",
+            "name": "SYDNAUBV-SYD1"
+          },
+          {
+            "id": "TOK1",
+            "name": "TOKYJPFA-TOK1"
+          },
+          {
+            "id": "KGM2",
+            "name": "KGMTNC20-KGM2"
+          },
+          {
+            "id": "DCC1b",
+            "name": "POIUYTGH-DCC1b"
+          },
+          {
+            "id": "SKK78",
+            "name": "SDCTKKK1-SKK78"
+          },
+          {
+            "id": "SGG78",
+            "name": "SDCTGGG1-SGG78"
+          },
+          {
+            "id": "SJJ78",
+            "name": "SDCTJJJ1-SJJ78"
+          },
+          {
+            "id": "SBX78",
+            "name": "SDCTBXG1-SBX78"
+          },
+          {
+            "id": "LAG1",
+            "name": "LARGIZON-LAG1"
+          },
+          {
+            "id": "IAA1",
+            "name": "QAZXSWED-IAA1"
+          },
+          {
+            "id": "POI1",
+            "name": "PLMNJKIU-POI1"
+          },
+          {
+            "id": "LAG1a",
+            "name": "LARGIZON-LAG1a"
+          },
+          {
+            "id": "PBL1",
+            "name": "PBLAPBAI-PBL1"
+          },
+          {
+            "id": "LAG45",
+            "name": "LARGIZON-LAG1a"
+          },
+          {
+            "id": "MAR1",
+            "name": "MNBVCXZM-MAR1"
+          },
+          {
+            "id": "HST70",
+            "name": "HSTNTX70-HST70"
+          },
+          {
+            "id": "DCC1a",
+            "name": "POIUYTGH-DCC1a"
+          },
+          {
+            "id": "TOL1",
+            "name": "TOLDOH21-TOL1"
+          },
+          {
+            "id": "LON1",
+            "name": "LONEENCO-LON1"
+          },
+          {
+            "id": "SJU78",
+            "name": "SDIT1JUB-SJU78"
+          },
+          {
+            "id": "STN27",
+            "name": "HSTNTX01-STN27"
+          },
+          {
+            "id": "SSW56",
+            "name": "ss8126GT-SSW56"
+          },
+          {
+            "id": "SBB78",
+            "name": "SDIT1BBB-SBB78"
+          },
+          {
+            "id": "DCC3",
+            "name": "POIUYTGH-DCC3"
+          },
+          {
+            "id": "GNV1",
+            "name": "GNVLSCTL-GNV1"
+          },
+          {
+            "id": "WAS1",
+            "name": "WASHDCSW-WAS1"
+          },
+          {
+            "id": "TOY1",
+            "name": "TORYONNZ-TOY1"
+          },
+          {
+            "id": "STT1",
+            "name": "STTLWA02-STT1"
+          },
+          {
+            "id": "STG1",
+            "name": "STTGGE62-STG1"
+          },
+          {
+            "id": "SLL78",
+            "name": "SDCTLLL1-SLL78"
+          },
+          {
+            "id": "SBU78",
+            "name": "SDIT1BUB-SBU78"
+          },
+          {
+            "id": "ATL2",
+            "name": "ATLNGANW-ATL2"
+          },
+          {
+            "id": "BOT1",
+            "name": "BOTHWAKY-BOT1"
+          },
+          {
+            "id": "SNG1",
+            "name": "SNGPSIAU-SNG1"
+          },
+          {
+            "id": "NYC1",
+            "name": "NYCMNY54-NYC1"
+          },
+          {
+            "id": "LAG1b",
+            "name": "LARGIZON-LAG1b"
+          },
+          {
+            "id": "AMD15",
+            "name": "AMDFAA01-AMD15"
+          },
+          {
+            "id": "SNA1",
+            "name": "SNANTXCA-SNA1"
+          },
+          {
+            "id": "PLT1",
+            "name": "PLTNCA60-PLT1"
+          },
+          {
+            "id": "TLP1",
+            "name": "TLPNXM18-TLP1"
+          },
+          {
+            "id": "SDD81",
+            "name": "SAIT1DD6-SDD81"
+          },
+          {
+            "id": "DCC1",
+            "name": "POIUYTGH-DCC1"
+          },
+          {
+            "id": "DCC2",
+            "name": "POIUYTGH-DCC2"
+          },
+          {
+            "id": "OKC1",
+            "name": "OKCBOK55-OKC1"
+          },
+          {
+            "id": "PAR1",
+            "name": "PARSFRCG-PAR1"
+          },
+          {
+            "id": "TES36",
+            "name": "ABCEETES-TES36"
+          },
+          {
+            "id": "COM1",
+            "name": "PLMKOPIU-COM1"
+          },
+          {
+            "id": "ANI1",
+            "name": "ATLNGTRE-ANI1"
+          },
+          {
+            "id": "SDG78",
+            "name": "SDIT1BDG-SDG78"
+          },
+          {
+            "id": "mac20",
+            "name": "PKGTESTF-mac20"
+          },
+          {
+            "id": "DSF45",
+            "name": "DSFBG123-DSF45"
+          },
+          {
+            "id": "HST25",
+            "name": "HSTNTX01-HST25"
+          },
+          {
+            "id": "AMD18",
+            "name": "AUDIMA01-AMD18"
+          },
+          {
+            "id": "SAA80",
+            "name": "SAIT9AA3-SAA80"
+          },
+          {
+            "id": "SSA56",
+            "name": "SSIT2AA7-SSA56"
+          },
+          {
+            "id": "SDD82",
+            "name": "SAIT1DD9-SDD82"
+          },
+          {
+            "id": "JCV1",
+            "name": "JCVLFLBW-JCV1"
+          },
+          {
+            "id": "SUL2",
+            "name": "WERTYUJK-SUL2"
+          },
+          {
+            "id": "PUR1",
+            "name": "purelyde-PUR1"
+          },
+          {
+            "id": "FDE55",
+            "name": "FDERT555-FDE55"
+          },
+          {
+            "id": "SITE",
+            "name": "LONEENCO-SITE"
+          },
+          {
+            "id": "ATL1",
+            "name": "ATLNGAMA-ATL1"
+          },
+          {
+            "id": "JUL1",
+            "name": "ZXCVBNMM-JUL1"
+          },
+          {
+            "id": "TAT34",
+            "name": "TESAAISB-TAT34"
+          },
+          {
+            "id": "XCP12",
+            "name": "CHKGH123-XCP12"
+          },
+          {
+            "id": "RAI1",
+            "name": "poiuytre-RAI1"
+          },
+          {
+            "id": "HPO1",
+            "name": "ATLNGAUP-HPO1"
+          },
+          {
+            "id": "KJF12",
+            "name": "KJFDH123-KJF12"
+          },
+          {
+            "id": "SCC80",
+            "name": "SAIT9CC3-SCC80"
+          },
+          {
+            "id": "SAA12",
+            "name": "SAIT9AF8-SAA12"
+          },
+          {
+            "id": "SAA14",
+            "name": "SAIT1AA9-SAA14"
+          },
+          {
+            "id": "ATL35",
+            "name": "TTESSAAI-ATL35"
+          },
+          {
+            "id": "CWY1",
+            "name": "CWYMOWBS-CWY1"
+          },
+          {
+            "id": "ATL76",
+            "name": "TELEPAAI-ATL76"
+          },
+          {
+            "id": "DSL12",
+            "name": "DSLFK242-DSL12"
+          },
+          {
+            "id": "ATL53",
+            "name": "AAIATLTE-ATL53"
+          },
+          {
+            "id": "SAA11",
+            "name": "SAIT9AA2-SAA11"
+          },
+          {
+            "id": "ATL62",
+            "name": "TESSASCH-ATL62"
+          },
+          {
+            "id": "AUG1",
+            "name": "ASDFGHJK-AUG1"
+          },
+          {
+            "id": "POI22",
+            "name": "POIUY123-POI22"
+          },
+          {
+            "id": "SAA13",
+            "name": "SAIT1AA9-SAA13"
+          },
+          {
+            "id": "BHY17",
+            "name": "BHYTFRF3-BHY17"
+          },
+          {
+            "id": "LIS1",
+            "name": "HOSTPROF-LIS1"
+          },
+          {
+            "id": "SIP1",
+            "name": "ZXCVBNMK-SIP1"
+          },
+          {
+            "id": "ATL99",
+            "name": "TEESTAAI-ATL43"
+          },
+          {
+            "id": "ATL64",
+            "name": "FORLOAAJ-ATL64"
+          },
+          {
+            "id": "TAT33",
+            "name": "TESAAISA-TAT33"
+          },
+          {
+            "id": "RAD10",
+            "name": "INDIPUNE-RAD10"
+          },
+          {
+            "id": "RTW5",
+            "name": "BHYTFRY4-RTW5"
+          },
+          {
+            "id": "JGS1",
+            "name": "KSJKKKKK-JGS1"
+          },
+          {
+            "id": "ATL98",
+            "name": "TEESTAAI-ATL43"
+          },
+          {
+            "id": "WAN1",
+            "name": "LEIWANGW-WAN1"
+          },
+          {
+            "id": "ATL44",
+            "name": "ATLSANAB-ATL44"
+          },
+          {
+            "id": "RTD2",
+            "name": "BHYTFRk4-RTD2"
+          },
+          {
+            "id": "NIR1",
+            "name": "ORFLMANA-NIR1"
+          },
+          {
+            "id": "ATL75",
+            "name": "SANAAIRE-ATL75"
+          },
+          {
+            "id": "NUM1",
+            "name": "QWERTYUI-NUM1"
+          },
+          {
+            "id": "hvf32",
+            "name": "MDTWNJ21-hvf32"
+          },
+          {
+            "id": "RTZ4",
+            "name": "BHYTFRZ6-RTZ4"
+          },
+          {
+            "id": "ATL56",
+            "name": "ATLSANAC-ATL56"
+          },
+          {
+            "id": "AMS1",
+            "name": "AMSTNLBW-AMS1"
+          },
+          {
+            "id": "RCT1",
+            "name": "AMSTERNL-RCT1"
+          },
+          {
+            "id": "JAN1",
+            "name": "ORFLMATT-JAN1"
+          },
+          {
+            "id": "ABC14",
+            "name": "TESAAISA-ABC14"
+          },
+          {
+            "id": "TAT37",
+            "name": "TESAAISD-TAT37"
+          },
+          {
+            "id": "MIC54",
+            "name": "MICHIGAN-MIC54"
+          },
+          {
+            "id": "ABC11",
+            "name": "ATLSANAI-ABC11"
+          },
+          {
+            "id": "AMF11",
+            "name": "AMDOCS01-AMF11"
+          },
+          {
+            "id": "ATL63",
+            "name": "ATLSANEW-ATL63"
+          },
+          {
+            "id": "ABC12",
+            "name": "ATLSECIA-ABC12"
+          },
+          {
+            "id": "hvf20",
+            "name": "MDTWNJ21-hvf20"
+          },
+          {
+            "id": "ABC15",
+            "name": "AAITESAN-ABC15"
+          },
+          {
             "id": "AVT1",
             "name": "AVTRFLHD-AVT1"
           },
@@ -2205,15 +3090,10 @@ 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
         },
@@ -2225,17 +3105,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 +3130,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 +3206,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 +3283,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 +3295,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 +3312,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 +3326,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 +3411,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 +3461,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 +3543,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 +3578,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 +3665,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 +3715,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 +3797,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 +3843,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 +4022,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 +4117,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 +4138,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 +4214,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 +4248,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 +4278,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 +4288,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 +4314,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 +4328,8 @@ describe('Drawing board', function () {
         "lcpRegionsAndTenants": {
           "lcpRegionList": [
             {
-              "id": "JANET25",
-              "name": "JANET25",
+              "id": "AAIAIC25",
+              "name": "AAIAIC25",
               "isPermitted": true
             },
             {
@@ -3453,7 +4339,7 @@ describe('Drawing board', function () {
             }
           ],
           "lcpRegionsTenantsMap": {
-            "JANET25": [
+            "AAIAIC25": [
               {
                 "id": "092eb9e8e4b7412e8787dd091bc58e86",
                 "name": "USP-SIP-IC-24335-T-01",
@@ -3467,8 +4353,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
               },
               {
@@ -3477,6 +4483,16 @@ describe('Drawing board', function () {
                 "isPermitted": true
               },
               {
+                "id": "4914ab0ab3a743e58f0eefdacc1dde77",
+                "name": "DN5242-Nov21-T1",
+                "isPermitted": true
+              },
+              {
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
+                "isPermitted": true
+              },
+              {
                 "id": "cbb99fe4ada84631b7baf046b6fd2044",
                 "name": "DN5242-Nov16-T3",
                 "isPermitted": true
@@ -3564,7 +4580,7 @@ describe('Drawing board', function () {
         "productFamilies": [
           {
             "id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-            "name": "SCOTTIE",
+            "name": "ERICA",
             "isPermitted": true
           },
           {
@@ -3589,7 +4605,7 @@ describe('Drawing board', function () {
           },
           {
             "id": "323d69d9-2efe-4r45-ay0a-89ea7ard4e6f",
-            "name": "vSCP",
+            "name": "vEsmeralda",
             "isPermitted": true
           },
           {
@@ -3633,7 +4649,7 @@ describe('Drawing board', function () {
             "isPermitted": true
           },
           {
-            "id": "Cisneros",
+            "id": "vMuriel",
             "name": "vMuriel",
             "isPermitted": true
           },
@@ -3659,7 +4675,7 @@ describe('Drawing board', function () {
           },
           {
             "id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
-            "name": "Josefina",
+            "name": "JOSEFINA",
             "isPermitted": true
           },
           {
@@ -3707,7 +4723,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "6",
-              "name": "vSEGW",
+              "name": "vPorfirio",
               "isPermitted": false
             },
             {
@@ -3722,7 +4738,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "9",
-              "name": "vMME",
+              "name": "vFLORENCE",
               "isPermitted": false
             },
             {
@@ -3732,7 +4748,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "11",
-              "name": "vSCP",
+              "name": "vEsmeralda",
               "isPermitted": false
             },
             {
@@ -3742,7 +4758,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "13",
-              "name": "vMMSC",
+              "name": "vWINIFRED",
               "isPermitted": false
             },
             {
@@ -3786,6 +4802,754 @@ describe('Drawing board', function () {
             "name": "UUUAIAAI-YYY1"
           },
           {
+            "id": "BAN1",
+            "name": "VSDKYUTP-BAN1"
+          },
+          {
+            "id": "DKJ1",
+            "name": "DKJSJDKA-DKJ1"
+          },
+          {
+            "id": "MCS1",
+            "name": "ASACMAMS-MCS1"
+          },
+          {
+            "id": "UIO1",
+            "name": "uioclli1-UIO1"
+          },
+          {
+            "id": "RAJ1",
+            "name": "YGBIJNLQ-RAJ1"
+          },
+          {
+            "id": "OPA1",
+            "name": "opaclli1-OPA1"
+          },
+          {
+            "id": "SDE1",
+            "name": "ZXCVBNMA-SDE1"
+          },
+          {
+            "id": "VEN2",
+            "name": "FGHJUHIL-VEN2"
+          },
+          {
+            "id": "ORL1",
+            "name": "ORLDFLMA-ORL1"
+          },
+          {
+            "id": "JAD1",
+            "name": "JADECLLI-JAD1"
+          },
+          {
+            "id": "ZXL1",
+            "name": "LWLWCANN-ZXL1"
+          },
+          {
+            "id": "CKL1",
+            "name": "CLKSKCKK-CKL1"
+          },
+          {
+            "id": "SDF1",
+            "name": "sdfclli1-SDF1"
+          },
+          {
+            "id": "RAD1",
+            "name": "RADICAL1-RAD1"
+          },
+          {
+            "id": "KIT1",
+            "name": "BHYJFGLN-KIT1"
+          },
+          {
+            "id": "REL1",
+            "name": "INGERFGT-REL1"
+          },
+          {
+            "id": "JNL1",
+            "name": "CJALSDAC-JNL1"
+          },
+          {
+            "id": "OLK1",
+            "name": "OLKOLKLS-OLK1"
+          },
+          {
+            "id": "CHI1",
+            "name": "CHILLIWE-CHI1"
+          },
+          {
+            "id": "UUU4",
+            "name": "UUUAAAUU-UUU4"
+          },
+          {
+            "id": "TUF1",
+            "name": "TUFCLLI1-TUF1"
+          },
+          {
+            "id": "KJN1",
+            "name": "CKALDKSA-KJN1"
+          },
+          {
+            "id": "SAM1",
+            "name": "SNDGCA64-SAN1"
+          },
+          {
+            "id": "SCK1",
+            "name": "SCKSCKSK-SCK1"
+          },
+          {
+            "id": "HJH1",
+            "name": "AOEEQQQD-HJH1"
+          },
+          {
+            "id": "HGD1",
+            "name": "SDFQWHGD-HGD1"
+          },
+          {
+            "id": "KOR1",
+            "name": "HYFLNBVT-KOR1"
+          },
+          {
+            "id": "ATL43",
+            "name": "AICLOCID-ATL43"
+          },
+          {
+            "id": "ATL54",
+            "name": "AICFTAAI-ATL54"
+          },
+          {
+            "id": "ATL66",
+            "name": "CLLIAAII-ATL66"
+          },
+          {
+            "id": "VEL1",
+            "name": "BNMLKUIK-VEL1"
+          },
+          {
+            "id": "ICC1",
+            "name": "SANJITAT-ICC1"
+          },
+          {
+            "id": "MNT11",
+            "name": "WSXEFBTH-MNT11"
+          },
+          {
+            "id": "DEF2",
+            "name": "WSBHGTYL-DEF2"
+          },
+          {
+            "id": "MAD11",
+            "name": "SDFQWGKL-MAD11"
+          },
+          {
+            "id": "OLG1",
+            "name": "OLHOLHOL-OLG1"
+          },
+          {
+            "id": "GAR1",
+            "name": "NGFVSJKO-GAR1"
+          },
+          {
+            "id": "SAN22",
+            "name": "GNVLSCTL-SAN22"
+          },
+          {
+            "id": "HRG1",
+            "name": "HRGHRGGS-HRG1"
+          },
+          {
+            "id": "JCS1",
+            "name": "JCSJSCJS-JCS1"
+          },
+          {
+            "id": "DHA12",
+            "name": "WSXEDECF-DHA12"
+          },
+          {
+            "id": "HJE1",
+            "name": "AOEEWWWD-HJE1"
+          },
+          {
+            "id": "NCA1",
+            "name": "NCANCANN-NCA1"
+          },
+          {
+            "id": "IOP1",
+            "name": "iopclli1-IOP1"
+          },
+          {
+            "id": "RTY1",
+            "name": "rtyclli1-RTY1"
+          },
+          {
+            "id": "KAP1",
+            "name": "HIOUYTRQ-KAP1"
+          },
+          {
+            "id": "ZEN1",
+            "name": "ZENCLLI1-ZEN1"
+          },
+          {
+            "id": "HKA1",
+            "name": "JAKHLASS-HKA1"
+          },
+          {
+            "id": "CQK1",
+            "name": "CQKSCAKK-CQK1"
+          },
+          {
+            "id": "SAI1",
+            "name": "UBEKQLPD-SAI1"
+          },
+          {
+            "id": "ERT1",
+            "name": "ertclli1-ERT1"
+          },
+          {
+            "id": "IBB1",
+            "name": "PLMKOIJU-IBB1"
+          },
+          {
+            "id": "TIR2",
+            "name": "PLKINHYI-TIR2"
+          },
+          {
+            "id": "HSD1",
+            "name": "CHASKCDS-HSD1"
+          },
+          {
+            "id": "SLF78",
+            "name": "SDCTLFN1-SLF78"
+          },
+          {
+            "id": "SEE78",
+            "name": "SDCTEEE4-SEE78"
+          },
+          {
+            "id": "SAN13",
+            "name": "TOKYJPFA-SAN13"
+          },
+          {
+            "id": "SAA78",
+            "name": "SDCTAAA1-SAA78"
+          },
+          {
+            "id": "LUC1",
+            "name": "ATLDFGYC-LUC1"
+          },
+          {
+            "id": "AMD13",
+            "name": "MEMATLAN-AMD13"
+          },
+          {
+            "id": "TOR1",
+            "name": "TOROONXN-TOR1"
+          },
+          {
+            "id": "QWE1",
+            "name": "QWECLLI1-QWE1"
+          },
+          {
+            "id": "ZOG1",
+            "name": "ZOGASTRO-ZOG1"
+          },
+          {
+            "id": "CAL33",
+            "name": "CALIFORN-CAL33"
+          },
+          {
+            "id": "SHH78",
+            "name": "SDIT1HHH-SHH78"
+          },
+          {
+            "id": "DSA1",
+            "name": "LKJHGFDS-DSA1"
+          },
+          {
+            "id": "CLG1",
+            "name": "CLGRABAD-CLG1"
+          },
+          {
+            "id": "BNA1",
+            "name": "BNARAGBK-BNA1"
+          },
+          {
+            "id": "ATL84",
+            "name": "CANTTCOC-ATL84"
+          },
+          {
+            "id": "APP1",
+            "name": "WBHGTYUI-APP1"
+          },
+          {
+            "id": "RJN1",
+            "name": "RJNRBZAW-RJN1"
+          },
+          {
+            "id": "EHH78",
+            "name": "SDCSHHH5-EHH78"
+          },
+          {
+            "id": "mac10",
+            "name": "PKGTESTF-mac10"
+          },
+          {
+            "id": "SXB78",
+            "name": "SDCTGXB1-SXB78"
+          },
+          {
+            "id": "SAX78",
+            "name": "SDCTAXG1-SAX78"
+          },
+          {
+            "id": "SYD1",
+            "name": "SYDNAUBV-SYD1"
+          },
+          {
+            "id": "TOK1",
+            "name": "TOKYJPFA-TOK1"
+          },
+          {
+            "id": "KGM2",
+            "name": "KGMTNC20-KGM2"
+          },
+          {
+            "id": "DCC1b",
+            "name": "POIUYTGH-DCC1b"
+          },
+          {
+            "id": "SKK78",
+            "name": "SDCTKKK1-SKK78"
+          },
+          {
+            "id": "SGG78",
+            "name": "SDCTGGG1-SGG78"
+          },
+          {
+            "id": "SJJ78",
+            "name": "SDCTJJJ1-SJJ78"
+          },
+          {
+            "id": "SBX78",
+            "name": "SDCTBXG1-SBX78"
+          },
+          {
+            "id": "LAG1",
+            "name": "LARGIZON-LAG1"
+          },
+          {
+            "id": "IAA1",
+            "name": "QAZXSWED-IAA1"
+          },
+          {
+            "id": "POI1",
+            "name": "PLMNJKIU-POI1"
+          },
+          {
+            "id": "LAG1a",
+            "name": "LARGIZON-LAG1a"
+          },
+          {
+            "id": "PBL1",
+            "name": "PBLAPBAI-PBL1"
+          },
+          {
+            "id": "LAG45",
+            "name": "LARGIZON-LAG1a"
+          },
+          {
+            "id": "MAR1",
+            "name": "MNBVCXZM-MAR1"
+          },
+          {
+            "id": "HST70",
+            "name": "HSTNTX70-HST70"
+          },
+          {
+            "id": "DCC1a",
+            "name": "POIUYTGH-DCC1a"
+          },
+          {
+            "id": "TOL1",
+            "name": "TOLDOH21-TOL1"
+          },
+          {
+            "id": "LON1",
+            "name": "LONEENCO-LON1"
+          },
+          {
+            "id": "SJU78",
+            "name": "SDIT1JUB-SJU78"
+          },
+          {
+            "id": "STN27",
+            "name": "HSTNTX01-STN27"
+          },
+          {
+            "id": "SSW56",
+            "name": "ss8126GT-SSW56"
+          },
+          {
+            "id": "SBB78",
+            "name": "SDIT1BBB-SBB78"
+          },
+          {
+            "id": "DCC3",
+            "name": "POIUYTGH-DCC3"
+          },
+          {
+            "id": "GNV1",
+            "name": "GNVLSCTL-GNV1"
+          },
+          {
+            "id": "WAS1",
+            "name": "WASHDCSW-WAS1"
+          },
+          {
+            "id": "TOY1",
+            "name": "TORYONNZ-TOY1"
+          },
+          {
+            "id": "STT1",
+            "name": "STTLWA02-STT1"
+          },
+          {
+            "id": "STG1",
+            "name": "STTGGE62-STG1"
+          },
+          {
+            "id": "SLL78",
+            "name": "SDCTLLL1-SLL78"
+          },
+          {
+            "id": "SBU78",
+            "name": "SDIT1BUB-SBU78"
+          },
+          {
+            "id": "ATL2",
+            "name": "ATLNGANW-ATL2"
+          },
+          {
+            "id": "BOT1",
+            "name": "BOTHWAKY-BOT1"
+          },
+          {
+            "id": "SNG1",
+            "name": "SNGPSIAU-SNG1"
+          },
+          {
+            "id": "NYC1",
+            "name": "NYCMNY54-NYC1"
+          },
+          {
+            "id": "LAG1b",
+            "name": "LARGIZON-LAG1b"
+          },
+          {
+            "id": "AMD15",
+            "name": "AMDFAA01-AMD15"
+          },
+          {
+            "id": "SNA1",
+            "name": "SNANTXCA-SNA1"
+          },
+          {
+            "id": "PLT1",
+            "name": "PLTNCA60-PLT1"
+          },
+          {
+            "id": "TLP1",
+            "name": "TLPNXM18-TLP1"
+          },
+          {
+            "id": "SDD81",
+            "name": "SAIT1DD6-SDD81"
+          },
+          {
+            "id": "DCC1",
+            "name": "POIUYTGH-DCC1"
+          },
+          {
+            "id": "DCC2",
+            "name": "POIUYTGH-DCC2"
+          },
+          {
+            "id": "OKC1",
+            "name": "OKCBOK55-OKC1"
+          },
+          {
+            "id": "PAR1",
+            "name": "PARSFRCG-PAR1"
+          },
+          {
+            "id": "TES36",
+            "name": "ABCEETES-TES36"
+          },
+          {
+            "id": "COM1",
+            "name": "PLMKOPIU-COM1"
+          },
+          {
+            "id": "ANI1",
+            "name": "ATLNGTRE-ANI1"
+          },
+          {
+            "id": "SDG78",
+            "name": "SDIT1BDG-SDG78"
+          },
+          {
+            "id": "mac20",
+            "name": "PKGTESTF-mac20"
+          },
+          {
+            "id": "DSF45",
+            "name": "DSFBG123-DSF45"
+          },
+          {
+            "id": "HST25",
+            "name": "HSTNTX01-HST25"
+          },
+          {
+            "id": "AMD18",
+            "name": "AUDIMA01-AMD18"
+          },
+          {
+            "id": "SAA80",
+            "name": "SAIT9AA3-SAA80"
+          },
+          {
+            "id": "SSA56",
+            "name": "SSIT2AA7-SSA56"
+          },
+          {
+            "id": "SDD82",
+            "name": "SAIT1DD9-SDD82"
+          },
+          {
+            "id": "JCV1",
+            "name": "JCVLFLBW-JCV1"
+          },
+          {
+            "id": "SUL2",
+            "name": "WERTYUJK-SUL2"
+          },
+          {
+            "id": "PUR1",
+            "name": "purelyde-PUR1"
+          },
+          {
+            "id": "FDE55",
+            "name": "FDERT555-FDE55"
+          },
+          {
+            "id": "SITE",
+            "name": "LONEENCO-SITE"
+          },
+          {
+            "id": "ATL1",
+            "name": "ATLNGAMA-ATL1"
+          },
+          {
+            "id": "JUL1",
+            "name": "ZXCVBNMM-JUL1"
+          },
+          {
+            "id": "TAT34",
+            "name": "TESAAISB-TAT34"
+          },
+          {
+            "id": "XCP12",
+            "name": "CHKGH123-XCP12"
+          },
+          {
+            "id": "RAI1",
+            "name": "poiuytre-RAI1"
+          },
+          {
+            "id": "HPO1",
+            "name": "ATLNGAUP-HPO1"
+          },
+          {
+            "id": "KJF12",
+            "name": "KJFDH123-KJF12"
+          },
+          {
+            "id": "SCC80",
+            "name": "SAIT9CC3-SCC80"
+          },
+          {
+            "id": "SAA12",
+            "name": "SAIT9AF8-SAA12"
+          },
+          {
+            "id": "SAA14",
+            "name": "SAIT1AA9-SAA14"
+          },
+          {
+            "id": "ATL35",
+            "name": "TTESSAAI-ATL35"
+          },
+          {
+            "id": "CWY1",
+            "name": "CWYMOWBS-CWY1"
+          },
+          {
+            "id": "ATL76",
+            "name": "TELEPAAI-ATL76"
+          },
+          {
+            "id": "DSL12",
+            "name": "DSLFK242-DSL12"
+          },
+          {
+            "id": "ATL53",
+            "name": "AAIATLTE-ATL53"
+          },
+          {
+            "id": "SAA11",
+            "name": "SAIT9AA2-SAA11"
+          },
+          {
+            "id": "ATL62",
+            "name": "TESSASCH-ATL62"
+          },
+          {
+            "id": "AUG1",
+            "name": "ASDFGHJK-AUG1"
+          },
+          {
+            "id": "POI22",
+            "name": "POIUY123-POI22"
+          },
+          {
+            "id": "SAA13",
+            "name": "SAIT1AA9-SAA13"
+          },
+          {
+            "id": "BHY17",
+            "name": "BHYTFRF3-BHY17"
+          },
+          {
+            "id": "LIS1",
+            "name": "HOSTPROF-LIS1"
+          },
+          {
+            "id": "SIP1",
+            "name": "ZXCVBNMK-SIP1"
+          },
+          {
+            "id": "ATL99",
+            "name": "TEESTAAI-ATL43"
+          },
+          {
+            "id": "ATL64",
+            "name": "FORLOAAJ-ATL64"
+          },
+          {
+            "id": "TAT33",
+            "name": "TESAAISA-TAT33"
+          },
+          {
+            "id": "RAD10",
+            "name": "INDIPUNE-RAD10"
+          },
+          {
+            "id": "RTW5",
+            "name": "BHYTFRY4-RTW5"
+          },
+          {
+            "id": "JGS1",
+            "name": "KSJKKKKK-JGS1"
+          },
+          {
+            "id": "ATL98",
+            "name": "TEESTAAI-ATL43"
+          },
+          {
+            "id": "WAN1",
+            "name": "LEIWANGW-WAN1"
+          },
+          {
+            "id": "ATL44",
+            "name": "ATLSANAB-ATL44"
+          },
+          {
+            "id": "RTD2",
+            "name": "BHYTFRk4-RTD2"
+          },
+          {
+            "id": "NIR1",
+            "name": "ORFLMANA-NIR1"
+          },
+          {
+            "id": "ATL75",
+            "name": "SANAAIRE-ATL75"
+          },
+          {
+            "id": "NUM1",
+            "name": "QWERTYUI-NUM1"
+          },
+          {
+            "id": "hvf32",
+            "name": "MDTWNJ21-hvf32"
+          },
+          {
+            "id": "RTZ4",
+            "name": "BHYTFRZ6-RTZ4"
+          },
+          {
+            "id": "ATL56",
+            "name": "ATLSANAC-ATL56"
+          },
+          {
+            "id": "AMS1",
+            "name": "AMSTNLBW-AMS1"
+          },
+          {
+            "id": "RCT1",
+            "name": "AMSTERNL-RCT1"
+          },
+          {
+            "id": "JAN1",
+            "name": "ORFLMATT-JAN1"
+          },
+          {
+            "id": "ABC14",
+            "name": "TESAAISA-ABC14"
+          },
+          {
+            "id": "TAT37",
+            "name": "TESAAISD-TAT37"
+          },
+          {
+            "id": "MIC54",
+            "name": "MICHIGAN-MIC54"
+          },
+          {
+            "id": "ABC11",
+            "name": "ATLSANAI-ABC11"
+          },
+          {
+            "id": "AMF11",
+            "name": "AMDOCS01-AMF11"
+          },
+          {
+            "id": "ATL63",
+            "name": "ATLSANEW-ATL63"
+          },
+          {
+            "id": "ABC12",
+            "name": "ATLSECIA-ABC12"
+          },
+          {
+            "id": "hvf20",
+            "name": "MDTWNJ21-hvf20"
+          },
+          {
+            "id": "ABC15",
+            "name": "AAITESAN-ABC15"
+          },
+          {
             "id": "AVT1",
             "name": "AVTRFLHD-AVT1"
           },
@@ -3857,15 +5621,10 @@ 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
         },
@@ -3877,17 +5636,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 +5661,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 +5737,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 +5814,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 +5826,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 +5843,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 +5857,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 +5942,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 +5992,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 +6074,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 +6109,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 +6196,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 +6246,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 +6328,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 +6374,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 +6553,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 +6648,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 +6669,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 +6745,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 +6769,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 +6779,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 +6805,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 +6819,8 @@ describe('Drawing board', function () {
         "lcpRegionsAndTenants": {
           "lcpRegionList": [
             {
-              "id": "JANET25",
-              "name": "JANET25",
+              "id": "AAIAIC25",
+              "name": "AAIAIC25",
               "isPermitted": true
             },
             {
@@ -5065,7 +6830,7 @@ describe('Drawing board', function () {
             }
           ],
           "lcpRegionsTenantsMap": {
-            "JANET25": [
+            "AAIAIC25": [
               {
                 "id": "092eb9e8e4b7412e8787dd091bc58e86",
                 "name": "USP-SIP-IC-24335-T-01",
@@ -5079,8 +6844,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
               },
               {
@@ -5089,6 +6974,16 @@ describe('Drawing board', function () {
                 "isPermitted": true
               },
               {
+                "id": "4914ab0ab3a743e58f0eefdacc1dde77",
+                "name": "DN5242-Nov21-T1",
+                "isPermitted": true
+              },
+              {
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
+                "isPermitted": true
+              },
+              {
                 "id": "cbb99fe4ada84631b7baf046b6fd2044",
                 "name": "DN5242-Nov16-T3",
                 "isPermitted": true
@@ -5176,7 +7071,7 @@ describe('Drawing board', function () {
         "productFamilies": [
           {
             "id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-            "name": "SCOTTIE",
+            "name": "ERICA",
             "isPermitted": true
           },
           {
@@ -5201,7 +7096,7 @@ describe('Drawing board', function () {
           },
           {
             "id": "323d69d9-2efe-4r45-ay0a-89ea7ard4e6f",
-            "name": "vSCP",
+            "name": "vEsmeralda",
             "isPermitted": true
           },
           {
@@ -5245,7 +7140,7 @@ describe('Drawing board', function () {
             "isPermitted": true
           },
           {
-            "id": "Cisneros",
+            "id": "vMuriel",
             "name": "vMuriel",
             "isPermitted": true
           },
@@ -5271,7 +7166,7 @@ describe('Drawing board', function () {
           },
           {
             "id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
-            "name": "Josefina",
+            "name": "JOSEFINA",
             "isPermitted": true
           },
           {
@@ -5319,7 +7214,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "6",
-              "name": "vSEGW",
+              "name": "vPorfirio",
               "isPermitted": false
             },
             {
@@ -5334,7 +7229,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "9",
-              "name": "vMME",
+              "name": "vFLORENCE",
               "isPermitted": false
             },
             {
@@ -5344,7 +7239,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "11",
-              "name": "vSCP",
+              "name": "vEsmeralda",
               "isPermitted": false
             },
             {
@@ -5354,7 +7249,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "13",
-              "name": "vMMSC",
+              "name": "vWINIFRED",
               "isPermitted": false
             },
             {
@@ -5398,6 +7293,754 @@ describe('Drawing board', function () {
             "name": "UUUAIAAI-YYY1"
           },
           {
+            "id": "BAN1",
+            "name": "VSDKYUTP-BAN1"
+          },
+          {
+            "id": "DKJ1",
+            "name": "DKJSJDKA-DKJ1"
+          },
+          {
+            "id": "MCS1",
+            "name": "ASACMAMS-MCS1"
+          },
+          {
+            "id": "UIO1",
+            "name": "uioclli1-UIO1"
+          },
+          {
+            "id": "RAJ1",
+            "name": "YGBIJNLQ-RAJ1"
+          },
+          {
+            "id": "OPA1",
+            "name": "opaclli1-OPA1"
+          },
+          {
+            "id": "SDE1",
+            "name": "ZXCVBNMA-SDE1"
+          },
+          {
+            "id": "VEN2",
+            "name": "FGHJUHIL-VEN2"
+          },
+          {
+            "id": "ORL1",
+            "name": "ORLDFLMA-ORL1"
+          },
+          {
+            "id": "JAD1",
+            "name": "JADECLLI-JAD1"
+          },
+          {
+            "id": "ZXL1",
+            "name": "LWLWCANN-ZXL1"
+          },
+          {
+            "id": "CKL1",
+            "name": "CLKSKCKK-CKL1"
+          },
+          {
+            "id": "SDF1",
+            "name": "sdfclli1-SDF1"
+          },
+          {
+            "id": "RAD1",
+            "name": "RADICAL1-RAD1"
+          },
+          {
+            "id": "KIT1",
+            "name": "BHYJFGLN-KIT1"
+          },
+          {
+            "id": "REL1",
+            "name": "INGERFGT-REL1"
+          },
+          {
+            "id": "JNL1",
+            "name": "CJALSDAC-JNL1"
+          },
+          {
+            "id": "OLK1",
+            "name": "OLKOLKLS-OLK1"
+          },
+          {
+            "id": "CHI1",
+            "name": "CHILLIWE-CHI1"
+          },
+          {
+            "id": "UUU4",
+            "name": "UUUAAAUU-UUU4"
+          },
+          {
+            "id": "TUF1",
+            "name": "TUFCLLI1-TUF1"
+          },
+          {
+            "id": "KJN1",
+            "name": "CKALDKSA-KJN1"
+          },
+          {
+            "id": "SAM1",
+            "name": "SNDGCA64-SAN1"
+          },
+          {
+            "id": "SCK1",
+            "name": "SCKSCKSK-SCK1"
+          },
+          {
+            "id": "HJH1",
+            "name": "AOEEQQQD-HJH1"
+          },
+          {
+            "id": "HGD1",
+            "name": "SDFQWHGD-HGD1"
+          },
+          {
+            "id": "KOR1",
+            "name": "HYFLNBVT-KOR1"
+          },
+          {
+            "id": "ATL43",
+            "name": "AICLOCID-ATL43"
+          },
+          {
+            "id": "ATL54",
+            "name": "AICFTAAI-ATL54"
+          },
+          {
+            "id": "ATL66",
+            "name": "CLLIAAII-ATL66"
+          },
+          {
+            "id": "VEL1",
+            "name": "BNMLKUIK-VEL1"
+          },
+          {
+            "id": "ICC1",
+            "name": "SANJITAT-ICC1"
+          },
+          {
+            "id": "MNT11",
+            "name": "WSXEFBTH-MNT11"
+          },
+          {
+            "id": "DEF2",
+            "name": "WSBHGTYL-DEF2"
+          },
+          {
+            "id": "MAD11",
+            "name": "SDFQWGKL-MAD11"
+          },
+          {
+            "id": "OLG1",
+            "name": "OLHOLHOL-OLG1"
+          },
+          {
+            "id": "GAR1",
+            "name": "NGFVSJKO-GAR1"
+          },
+          {
+            "id": "SAN22",
+            "name": "GNVLSCTL-SAN22"
+          },
+          {
+            "id": "HRG1",
+            "name": "HRGHRGGS-HRG1"
+          },
+          {
+            "id": "JCS1",
+            "name": "JCSJSCJS-JCS1"
+          },
+          {
+            "id": "DHA12",
+            "name": "WSXEDECF-DHA12"
+          },
+          {
+            "id": "HJE1",
+            "name": "AOEEWWWD-HJE1"
+          },
+          {
+            "id": "NCA1",
+            "name": "NCANCANN-NCA1"
+          },
+          {
+            "id": "IOP1",
+            "name": "iopclli1-IOP1"
+          },
+          {
+            "id": "RTY1",
+            "name": "rtyclli1-RTY1"
+          },
+          {
+            "id": "KAP1",
+            "name": "HIOUYTRQ-KAP1"
+          },
+          {
+            "id": "ZEN1",
+            "name": "ZENCLLI1-ZEN1"
+          },
+          {
+            "id": "HKA1",
+            "name": "JAKHLASS-HKA1"
+          },
+          {
+            "id": "CQK1",
+            "name": "CQKSCAKK-CQK1"
+          },
+          {
+            "id": "SAI1",
+            "name": "UBEKQLPD-SAI1"
+          },
+          {
+            "id": "ERT1",
+            "name": "ertclli1-ERT1"
+          },
+          {
+            "id": "IBB1",
+            "name": "PLMKOIJU-IBB1"
+          },
+          {
+            "id": "TIR2",
+            "name": "PLKINHYI-TIR2"
+          },
+          {
+            "id": "HSD1",
+            "name": "CHASKCDS-HSD1"
+          },
+          {
+            "id": "SLF78",
+            "name": "SDCTLFN1-SLF78"
+          },
+          {
+            "id": "SEE78",
+            "name": "SDCTEEE4-SEE78"
+          },
+          {
+            "id": "SAN13",
+            "name": "TOKYJPFA-SAN13"
+          },
+          {
+            "id": "SAA78",
+            "name": "SDCTAAA1-SAA78"
+          },
+          {
+            "id": "LUC1",
+            "name": "ATLDFGYC-LUC1"
+          },
+          {
+            "id": "AMD13",
+            "name": "MEMATLAN-AMD13"
+          },
+          {
+            "id": "TOR1",
+            "name": "TOROONXN-TOR1"
+          },
+          {
+            "id": "QWE1",
+            "name": "QWECLLI1-QWE1"
+          },
+          {
+            "id": "ZOG1",
+            "name": "ZOGASTRO-ZOG1"
+          },
+          {
+            "id": "CAL33",
+            "name": "CALIFORN-CAL33"
+          },
+          {
+            "id": "SHH78",
+            "name": "SDIT1HHH-SHH78"
+          },
+          {
+            "id": "DSA1",
+            "name": "LKJHGFDS-DSA1"
+          },
+          {
+            "id": "CLG1",
+            "name": "CLGRABAD-CLG1"
+          },
+          {
+            "id": "BNA1",
+            "name": "BNARAGBK-BNA1"
+          },
+          {
+            "id": "ATL84",
+            "name": "CANTTCOC-ATL84"
+          },
+          {
+            "id": "APP1",
+            "name": "WBHGTYUI-APP1"
+          },
+          {
+            "id": "RJN1",
+            "name": "RJNRBZAW-RJN1"
+          },
+          {
+            "id": "EHH78",
+            "name": "SDCSHHH5-EHH78"
+          },
+          {
+            "id": "mac10",
+            "name": "PKGTESTF-mac10"
+          },
+          {
+            "id": "SXB78",
+            "name": "SDCTGXB1-SXB78"
+          },
+          {
+            "id": "SAX78",
+            "name": "SDCTAXG1-SAX78"
+          },
+          {
+            "id": "SYD1",
+            "name": "SYDNAUBV-SYD1"
+          },
+          {
+            "id": "TOK1",
+            "name": "TOKYJPFA-TOK1"
+          },
+          {
+            "id": "KGM2",
+            "name": "KGMTNC20-KGM2"
+          },
+          {
+            "id": "DCC1b",
+            "name": "POIUYTGH-DCC1b"
+          },
+          {
+            "id": "SKK78",
+            "name": "SDCTKKK1-SKK78"
+          },
+          {
+            "id": "SGG78",
+            "name": "SDCTGGG1-SGG78"
+          },
+          {
+            "id": "SJJ78",
+            "name": "SDCTJJJ1-SJJ78"
+          },
+          {
+            "id": "SBX78",
+            "name": "SDCTBXG1-SBX78"
+          },
+          {
+            "id": "LAG1",
+            "name": "LARGIZON-LAG1"
+          },
+          {
+            "id": "IAA1",
+            "name": "QAZXSWED-IAA1"
+          },
+          {
+            "id": "POI1",
+            "name": "PLMNJKIU-POI1"
+          },
+          {
+            "id": "LAG1a",
+            "name": "LARGIZON-LAG1a"
+          },
+          {
+            "id": "PBL1",
+            "name": "PBLAPBAI-PBL1"
+          },
+          {
+            "id": "LAG45",
+            "name": "LARGIZON-LAG1a"
+          },
+          {
+            "id": "MAR1",
+            "name": "MNBVCXZM-MAR1"
+          },
+          {
+            "id": "HST70",
+            "name": "HSTNTX70-HST70"
+          },
+          {
+            "id": "DCC1a",
+            "name": "POIUYTGH-DCC1a"
+          },
+          {
+            "id": "TOL1",
+            "name": "TOLDOH21-TOL1"
+          },
+          {
+            "id": "LON1",
+            "name": "LONEENCO-LON1"
+          },
+          {
+            "id": "SJU78",
+            "name": "SDIT1JUB-SJU78"
+          },
+          {
+            "id": "STN27",
+            "name": "HSTNTX01-STN27"
+          },
+          {
+            "id": "SSW56",
+            "name": "ss8126GT-SSW56"
+          },
+          {
+            "id": "SBB78",
+            "name": "SDIT1BBB-SBB78"
+          },
+          {
+            "id": "DCC3",
+            "name": "POIUYTGH-DCC3"
+          },
+          {
+            "id": "GNV1",
+            "name": "GNVLSCTL-GNV1"
+          },
+          {
+            "id": "WAS1",
+            "name": "WASHDCSW-WAS1"
+          },
+          {
+            "id": "TOY1",
+            "name": "TORYONNZ-TOY1"
+          },
+          {
+            "id": "STT1",
+            "name": "STTLWA02-STT1"
+          },
+          {
+            "id": "STG1",
+            "name": "STTGGE62-STG1"
+          },
+          {
+            "id": "SLL78",
+            "name": "SDCTLLL1-SLL78"
+          },
+          {
+            "id": "SBU78",
+            "name": "SDIT1BUB-SBU78"
+          },
+          {
+            "id": "ATL2",
+            "name": "ATLNGANW-ATL2"
+          },
+          {
+            "id": "BOT1",
+            "name": "BOTHWAKY-BOT1"
+          },
+          {
+            "id": "SNG1",
+            "name": "SNGPSIAU-SNG1"
+          },
+          {
+            "id": "NYC1",
+            "name": "NYCMNY54-NYC1"
+          },
+          {
+            "id": "LAG1b",
+            "name": "LARGIZON-LAG1b"
+          },
+          {
+            "id": "AMD15",
+            "name": "AMDFAA01-AMD15"
+          },
+          {
+            "id": "SNA1",
+            "name": "SNANTXCA-SNA1"
+          },
+          {
+            "id": "PLT1",
+            "name": "PLTNCA60-PLT1"
+          },
+          {
+            "id": "TLP1",
+            "name": "TLPNXM18-TLP1"
+          },
+          {
+            "id": "SDD81",
+            "name": "SAIT1DD6-SDD81"
+          },
+          {
+            "id": "DCC1",
+            "name": "POIUYTGH-DCC1"
+          },
+          {
+            "id": "DCC2",
+            "name": "POIUYTGH-DCC2"
+          },
+          {
+            "id": "OKC1",
+            "name": "OKCBOK55-OKC1"
+          },
+          {
+            "id": "PAR1",
+            "name": "PARSFRCG-PAR1"
+          },
+          {
+            "id": "TES36",
+            "name": "ABCEETES-TES36"
+          },
+          {
+            "id": "COM1",
+            "name": "PLMKOPIU-COM1"
+          },
+          {
+            "id": "ANI1",
+            "name": "ATLNGTRE-ANI1"
+          },
+          {
+            "id": "SDG78",
+            "name": "SDIT1BDG-SDG78"
+          },
+          {
+            "id": "mac20",
+            "name": "PKGTESTF-mac20"
+          },
+          {
+            "id": "DSF45",
+            "name": "DSFBG123-DSF45"
+          },
+          {
+            "id": "HST25",
+            "name": "HSTNTX01-HST25"
+          },
+          {
+            "id": "AMD18",
+            "name": "AUDIMA01-AMD18"
+          },
+          {
+            "id": "SAA80",
+            "name": "SAIT9AA3-SAA80"
+          },
+          {
+            "id": "SSA56",
+            "name": "SSIT2AA7-SSA56"
+          },
+          {
+            "id": "SDD82",
+            "name": "SAIT1DD9-SDD82"
+          },
+          {
+            "id": "JCV1",
+            "name": "JCVLFLBW-JCV1"
+          },
+          {
+            "id": "SUL2",
+            "name": "WERTYUJK-SUL2"
+          },
+          {
+            "id": "PUR1",
+            "name": "purelyde-PUR1"
+          },
+          {
+            "id": "FDE55",
+            "name": "FDERT555-FDE55"
+          },
+          {
+            "id": "SITE",
+            "name": "LONEENCO-SITE"
+          },
+          {
+            "id": "ATL1",
+            "name": "ATLNGAMA-ATL1"
+          },
+          {
+            "id": "JUL1",
+            "name": "ZXCVBNMM-JUL1"
+          },
+          {
+            "id": "TAT34",
+            "name": "TESAAISB-TAT34"
+          },
+          {
+            "id": "XCP12",
+            "name": "CHKGH123-XCP12"
+          },
+          {
+            "id": "RAI1",
+            "name": "poiuytre-RAI1"
+          },
+          {
+            "id": "HPO1",
+            "name": "ATLNGAUP-HPO1"
+          },
+          {
+            "id": "KJF12",
+            "name": "KJFDH123-KJF12"
+          },
+          {
+            "id": "SCC80",
+            "name": "SAIT9CC3-SCC80"
+          },
+          {
+            "id": "SAA12",
+            "name": "SAIT9AF8-SAA12"
+          },
+          {
+            "id": "SAA14",
+            "name": "SAIT1AA9-SAA14"
+          },
+          {
+            "id": "ATL35",
+            "name": "TTESSAAI-ATL35"
+          },
+          {
+            "id": "CWY1",
+            "name": "CWYMOWBS-CWY1"
+          },
+          {
+            "id": "ATL76",
+            "name": "TELEPAAI-ATL76"
+          },
+          {
+            "id": "DSL12",
+            "name": "DSLFK242-DSL12"
+          },
+          {
+            "id": "ATL53",
+            "name": "AAIATLTE-ATL53"
+          },
+          {
+            "id": "SAA11",
+            "name": "SAIT9AA2-SAA11"
+          },
+          {
+            "id": "ATL62",
+            "name": "TESSASCH-ATL62"
+          },
+          {
+            "id": "AUG1",
+            "name": "ASDFGHJK-AUG1"
+          },
+          {
+            "id": "POI22",
+            "name": "POIUY123-POI22"
+          },
+          {
+            "id": "SAA13",
+            "name": "SAIT1AA9-SAA13"
+          },
+          {
+            "id": "BHY17",
+            "name": "BHYTFRF3-BHY17"
+          },
+          {
+            "id": "LIS1",
+            "name": "HOSTPROF-LIS1"
+          },
+          {
+            "id": "SIP1",
+            "name": "ZXCVBNMK-SIP1"
+          },
+          {
+            "id": "ATL99",
+            "name": "TEESTAAI-ATL43"
+          },
+          {
+            "id": "ATL64",
+            "name": "FORLOAAJ-ATL64"
+          },
+          {
+            "id": "TAT33",
+            "name": "TESAAISA-TAT33"
+          },
+          {
+            "id": "RAD10",
+            "name": "INDIPUNE-RAD10"
+          },
+          {
+            "id": "RTW5",
+            "name": "BHYTFRY4-RTW5"
+          },
+          {
+            "id": "JGS1",
+            "name": "KSJKKKKK-JGS1"
+          },
+          {
+            "id": "ATL98",
+            "name": "TEESTAAI-ATL43"
+          },
+          {
+            "id": "WAN1",
+            "name": "LEIWANGW-WAN1"
+          },
+          {
+            "id": "ATL44",
+            "name": "ATLSANAB-ATL44"
+          },
+          {
+            "id": "RTD2",
+            "name": "BHYTFRk4-RTD2"
+          },
+          {
+            "id": "NIR1",
+            "name": "ORFLMANA-NIR1"
+          },
+          {
+            "id": "ATL75",
+            "name": "SANAAIRE-ATL75"
+          },
+          {
+            "id": "NUM1",
+            "name": "QWERTYUI-NUM1"
+          },
+          {
+            "id": "hvf32",
+            "name": "MDTWNJ21-hvf32"
+          },
+          {
+            "id": "RTZ4",
+            "name": "BHYTFRZ6-RTZ4"
+          },
+          {
+            "id": "ATL56",
+            "name": "ATLSANAC-ATL56"
+          },
+          {
+            "id": "AMS1",
+            "name": "AMSTNLBW-AMS1"
+          },
+          {
+            "id": "RCT1",
+            "name": "AMSTERNL-RCT1"
+          },
+          {
+            "id": "JAN1",
+            "name": "ORFLMATT-JAN1"
+          },
+          {
+            "id": "ABC14",
+            "name": "TESAAISA-ABC14"
+          },
+          {
+            "id": "TAT37",
+            "name": "TESAAISD-TAT37"
+          },
+          {
+            "id": "MIC54",
+            "name": "MICHIGAN-MIC54"
+          },
+          {
+            "id": "ABC11",
+            "name": "ATLSANAI-ABC11"
+          },
+          {
+            "id": "AMF11",
+            "name": "AMDOCS01-AMF11"
+          },
+          {
+            "id": "ATL63",
+            "name": "ATLSANEW-ATL63"
+          },
+          {
+            "id": "ABC12",
+            "name": "ATLSECIA-ABC12"
+          },
+          {
+            "id": "hvf20",
+            "name": "MDTWNJ21-hvf20"
+          },
+          {
+            "id": "ABC15",
+            "name": "AAITESAN-ABC15"
+          },
+          {
             "id": "AVT1",
             "name": "AVTRFLHD-AVT1"
           },
@@ -5470,15 +8113,10 @@ describe('Drawing board', function () {
           "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,
@@ -5491,7 +8129,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 +8158,8 @@ describe('Drawing board', function () {
               "vidNotions": {
                 "instantiationUI": "networkWithPropertyNetworkTechnologyEqualsStandardSriovOrOvs",
                 "modelCategory": "5G Provider Network",
-                "viewEditUI": "legacy"
+                "viewEditUI": "legacy",
+                "instantiationType": "ALaCarte"
               }
             },
             "vnfs": {},
@@ -5575,7 +8213,7 @@ describe('Drawing board', function () {
                 "modelCustomizationName": "SR-IOV Provider 2-2"
               }
             },
-            "collectionResource": {},
+            "collectionResources": {},
             "configurations": {},
             "fabricConfigurations": {},
             "serviceProxies": {},
@@ -5642,7 +8280,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 +8355,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 +8475,12 @@ describe('Drawing board', function () {
             },
             {
               "id": "9",
-              "name": "vMME",
+              "name": "vFLORENCE",
               "isPermitted": true
             },
             {
               "id": "25",
-              "name": "vMMSC",
+              "name": "vWINIFRED",
               "isPermitted": true
             },
             {
@@ -5862,12 +8500,12 @@ describe('Drawing board', function () {
             },
             {
               "id": "16",
-              "name": "vSCP",
+              "name": "vEsmeralda",
               "isPermitted": true
             },
             {
               "id": "24",
-              "name": "vSEGW",
+              "name": "vPorfirio",
               "isPermitted": true
             },
             {
@@ -5915,7 +8553,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 +8561,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 +8577,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 +8612,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,15 +8808,10 @@ 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 +8833,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 +9014,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 +9110,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 +9131,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 +9207,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 +9238,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 +9247,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 +9281,7 @@ describe('Drawing board', function () {
             "instanceName": "",
             "existingNames": {
               "serviceinstancename": "",
-              "vfvmee00001": ""
+              "vfvgeraldine00001": ""
             },
             "existingVNFCounterMap": {
               "91415b44-753d-494c-926a-456a9172bbb9": 1
@@ -6494,8 +9294,8 @@ describe('Drawing board', function () {
         "lcpRegionsAndTenants": {
           "lcpRegionList": [
             {
-              "id": "JANET25",
-              "name": "JANET25",
+              "id": "AAIAIC25",
+              "name": "AAIAIC25",
               "isPermitted": true
             },
             {
@@ -6505,7 +9305,7 @@ describe('Drawing board', function () {
             }
           ],
           "lcpRegionsTenantsMap": {
-            "JANET25": [
+            "AAIAIC25": [
               {
                 "id": "092eb9e8e4b7412e8787dd091bc58e86",
                 "name": "USP-SIP-IC-24335-T-01",
@@ -6519,8 +9319,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
               },
               {
@@ -6529,6 +9449,16 @@ describe('Drawing board', function () {
                 "isPermitted": true
               },
               {
+                "id": "4914ab0ab3a743e58f0eefdacc1dde77",
+                "name": "DN5242-Nov21-T1",
+                "isPermitted": true
+              },
+              {
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
+                "isPermitted": true
+              },
+              {
                 "id": "cbb99fe4ada84631b7baf046b6fd2044",
                 "name": "DN5242-Nov16-T3",
                 "isPermitted": true
@@ -6616,7 +9546,7 @@ describe('Drawing board', function () {
         "productFamilies": [
           {
             "id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-            "name": "SCOTTIE",
+            "name": "ERICA",
             "isPermitted": true
           },
           {
@@ -6641,7 +9571,7 @@ describe('Drawing board', function () {
           },
           {
             "id": "323d69d9-2efe-4r45-ay0a-89ea7ard4e6f",
-            "name": "vSCP",
+            "name": "vEsmeralda",
             "isPermitted": true
           },
           {
@@ -6685,7 +9615,7 @@ describe('Drawing board', function () {
             "isPermitted": true
           },
           {
-            "id": "Cisneros",
+            "id": "vMuriel",
             "name": "vMuriel",
             "isPermitted": true
           },
@@ -6711,7 +9641,7 @@ describe('Drawing board', function () {
           },
           {
             "id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
-            "name": "Josefina",
+            "name": "JOSEFINA",
             "isPermitted": true
           },
           {
@@ -6759,7 +9689,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "6",
-              "name": "vSEGW",
+              "name": "vPorfirio",
               "isPermitted": false
             },
             {
@@ -6774,7 +9704,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "9",
-              "name": "vMME",
+              "name": "vFLORENCE",
               "isPermitted": false
             },
             {
@@ -6784,7 +9714,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "11",
-              "name": "vSCP",
+              "name": "vEsmeralda",
               "isPermitted": false
             },
             {
@@ -6794,7 +9724,7 @@ describe('Drawing board', function () {
             },
             {
               "id": "13",
-              "name": "vMMSC",
+              "name": "vWINIFRED",
               "isPermitted": false
             },
             {
@@ -6838,6 +9768,754 @@ describe('Drawing board', function () {
             "name": "UUUAIAAI-YYY1"
           },
           {
+            "id": "BAN1",
+            "name": "VSDKYUTP-BAN1"
+          },
+          {
+            "id": "DKJ1",
+            "name": "DKJSJDKA-DKJ1"
+          },
+          {
+            "id": "MCS1",
+            "name": "ASACMAMS-MCS1"
+          },
+          {
+            "id": "UIO1",
+            "name": "uioclli1-UIO1"
+          },
+          {
+            "id": "RAJ1",
+            "name": "YGBIJNLQ-RAJ1"
+          },
+          {
+            "id": "OPA1",
+            "name": "opaclli1-OPA1"
+          },
+          {
+            "id": "SDE1",
+            "name": "ZXCVBNMA-SDE1"
+          },
+          {
+            "id": "VEN2",
+            "name": "FGHJUHIL-VEN2"
+          },
+          {
+            "id": "ORL1",
+            "name": "ORLDFLMA-ORL1"
+          },
+          {
+            "id": "JAD1",
+            "name": "JADECLLI-JAD1"
+          },
+          {
+            "id": "ZXL1",
+            "name": "LWLWCANN-ZXL1"
+          },
+          {
+            "id": "CKL1",
+            "name": "CLKSKCKK-CKL1"
+          },
+          {
+            "id": "SDF1",
+            "name": "sdfclli1-SDF1"
+          },
+          {
+            "id": "RAD1",
+            "name": "RADICAL1-RAD1"
+          },
+          {
+            "id": "KIT1",
+            "name": "BHYJFGLN-KIT1"
+          },
+          {
+            "id": "REL1",
+            "name": "INGERFGT-REL1"
+          },
+          {
+            "id": "JNL1",
+            "name": "CJALSDAC-JNL1"
+          },
+          {
+            "id": "OLK1",
+            "name": "OLKOLKLS-OLK1"
+          },
+          {
+            "id": "CHI1",
+            "name": "CHILLIWE-CHI1"
+          },
+          {
+            "id": "UUU4",
+            "name": "UUUAAAUU-UUU4"
+          },
+          {
+            "id": "TUF1",
+            "name": "TUFCLLI1-TUF1"
+          },
+          {
+            "id": "KJN1",
+            "name": "CKALDKSA-KJN1"
+          },
+          {
+            "id": "SAM1",
+            "name": "SNDGCA64-SAN1"
+          },
+          {
+            "id": "SCK1",
+            "name": "SCKSCKSK-SCK1"
+          },
+          {
+            "id": "HJH1",
+            "name": "AOEEQQQD-HJH1"
+          },
+          {
+            "id": "HGD1",
+            "name": "SDFQWHGD-HGD1"
+          },
+          {
+            "id": "KOR1",
+            "name": "HYFLNBVT-KOR1"
+          },
+          {
+            "id": "ATL43",
+            "name": "AICLOCID-ATL43"
+          },
+          {
+            "id": "ATL54",
+            "name": "AICFTAAI-ATL54"
+          },
+          {
+            "id": "ATL66",
+            "name": "CLLIAAII-ATL66"
+          },
+          {
+            "id": "VEL1",
+            "name": "BNMLKUIK-VEL1"
+          },
+          {
+            "id": "ICC1",
+            "name": "SANJITAT-ICC1"
+          },
+          {
+            "id": "MNT11",
+            "name": "WSXEFBTH-MNT11"
+          },
+          {
+            "id": "DEF2",
+            "name": "WSBHGTYL-DEF2"
+          },
+          {
+            "id": "MAD11",
+            "name": "SDFQWGKL-MAD11"
+          },
+          {
+            "id": "OLG1",
+            "name": "OLHOLHOL-OLG1"
+          },
+          {
+            "id": "GAR1",
+            "name": "NGFVSJKO-GAR1"
+          },
+          {
+            "id": "SAN22",
+            "name": "GNVLSCTL-SAN22"
+          },
+          {
+            "id": "HRG1",
+            "name": "HRGHRGGS-HRG1"
+          },
+          {
+            "id": "JCS1",
+            "name": "JCSJSCJS-JCS1"
+          },
+          {
+            "id": "DHA12",
+            "name": "WSXEDECF-DHA12"
+          },
+          {
+            "id": "HJE1",
+            "name": "AOEEWWWD-HJE1"
+          },
+          {
+            "id": "NCA1",
+            "name": "NCANCANN-NCA1"
+          },
+          {
+            "id": "IOP1",
+            "name": "iopclli1-IOP1"
+          },
+          {
+            "id": "RTY1",
+            "name": "rtyclli1-RTY1"
+          },
+          {
+            "id": "KAP1",
+            "name": "HIOUYTRQ-KAP1"
+          },
+          {
+            "id": "ZEN1",
+            "name": "ZENCLLI1-ZEN1"
+          },
+          {
+            "id": "HKA1",
+            "name": "JAKHLASS-HKA1"
+          },
+          {
+            "id": "CQK1",
+            "name": "CQKSCAKK-CQK1"
+          },
+          {
+            "id": "SAI1",
+            "name": "UBEKQLPD-SAI1"
+          },
+          {
+            "id": "ERT1",
+            "name": "ertclli1-ERT1"
+          },
+          {
+            "id": "IBB1",
+            "name": "PLMKOIJU-IBB1"
+          },
+          {
+            "id": "TIR2",
+            "name": "PLKINHYI-TIR2"
+          },
+          {
+            "id": "HSD1",
+            "name": "CHASKCDS-HSD1"
+          },
+          {
+            "id": "SLF78",
+            "name": "SDCTLFN1-SLF78"
+          },
+          {
+            "id": "SEE78",
+            "name": "SDCTEEE4-SEE78"
+          },
+          {
+            "id": "SAN13",
+            "name": "TOKYJPFA-SAN13"
+          },
+          {
+            "id": "SAA78",
+            "name": "SDCTAAA1-SAA78"
+          },
+          {
+            "id": "LUC1",
+            "name": "ATLDFGYC-LUC1"
+          },
+          {
+            "id": "AMD13",
+            "name": "MEMATLAN-AMD13"
+          },
+          {
+            "id": "TOR1",
+            "name": "TOROONXN-TOR1"
+          },
+          {
+            "id": "QWE1",
+            "name": "QWECLLI1-QWE1"
+          },
+          {
+            "id": "ZOG1",
+            "name": "ZOGASTRO-ZOG1"
+          },
+          {
+            "id": "CAL33",
+            "name": "CALIFORN-CAL33"
+          },
+          {
+            "id": "SHH78",
+            "name": "SDIT1HHH-SHH78"
+          },
+          {
+            "id": "DSA1",
+            "name": "LKJHGFDS-DSA1"
+          },
+          {
+            "id": "CLG1",
+            "name": "CLGRABAD-CLG1"
+          },
+          {
+            "id": "BNA1",
+            "name": "BNARAGBK-BNA1"
+          },
+          {
+            "id": "ATL84",
+            "name": "CANTTCOC-ATL84"
+          },
+          {
+            "id": "APP1",
+            "name": "WBHGTYUI-APP1"
+          },
+          {
+            "id": "RJN1",
+            "name": "RJNRBZAW-RJN1"
+          },
+          {
+            "id": "EHH78",
+            "name": "SDCSHHH5-EHH78"
+          },
+          {
+            "id": "mac10",
+            "name": "PKGTESTF-mac10"
+          },
+          {
+            "id": "SXB78",
+            "name": "SDCTGXB1-SXB78"
+          },
+          {
+            "id": "SAX78",
+            "name": "SDCTAXG1-SAX78"
+          },
+          {
+            "id": "SYD1",
+            "name": "SYDNAUBV-SYD1"
+          },
+          {
+            "id": "TOK1",
+            "name": "TOKYJPFA-TOK1"
+          },
+          {
+            "id": "KGM2",
+            "name": "KGMTNC20-KGM2"
+          },
+          {
+            "id": "DCC1b",
+            "name": "POIUYTGH-DCC1b"
+          },
+          {
+            "id": "SKK78",
+            "name": "SDCTKKK1-SKK78"
+          },
+          {
+            "id": "SGG78",
+            "name": "SDCTGGG1-SGG78"
+          },
+          {
+            "id": "SJJ78",
+            "name": "SDCTJJJ1-SJJ78"
+          },
+          {
+            "id": "SBX78",
+            "name": "SDCTBXG1-SBX78"
+          },
+          {
+            "id": "LAG1",
+            "name": "LARGIZON-LAG1"
+          },
+          {
+            "id": "IAA1",
+            "name": "QAZXSWED-IAA1"
+          },
+          {
+            "id": "POI1",
+            "name": "PLMNJKIU-POI1"
+          },
+          {
+            "id": "LAG1a",
+            "name": "LARGIZON-LAG1a"
+          },
+          {
+            "id": "PBL1",
+            "name": "PBLAPBAI-PBL1"
+          },
+          {
+            "id": "LAG45",
+            "name": "LARGIZON-LAG1a"
+          },
+          {
+            "id": "MAR1",
+            "name": "MNBVCXZM-MAR1"
+          },
+          {
+            "id": "HST70",
+            "name": "HSTNTX70-HST70"
+          },
+          {
+            "id": "DCC1a",
+            "name": "POIUYTGH-DCC1a"
+          },
+          {
+            "id": "TOL1",
+            "name": "TOLDOH21-TOL1"
+          },
+          {
+            "id": "LON1",
+            "name": "LONEENCO-LON1"
+          },
+          {
+            "id": "SJU78",
+            "name": "SDIT1JUB-SJU78"
+          },
+          {
+            "id": "STN27",
+            "name": "HSTNTX01-STN27"
+          },
+          {
+            "id": "SSW56",
+            "name": "ss8126GT-SSW56"
+          },
+          {
+            "id": "SBB78",
+            "name": "SDIT1BBB-SBB78"
+          },
+          {
+            "id": "DCC3",
+            "name": "POIUYTGH-DCC3"
+          },
+          {
+            "id": "GNV1",
+            "name": "GNVLSCTL-GNV1"
+          },
+          {
+            "id": "WAS1",
+            "name": "WASHDCSW-WAS1"
+          },
+          {
+            "id": "TOY1",
+            "name": "TORYONNZ-TOY1"
+          },
+          {
+            "id": "STT1",
+            "name": "STTLWA02-STT1"
+          },
+          {
+            "id": "STG1",
+            "name": "STTGGE62-STG1"
+          },
+          {
+            "id": "SLL78",
+            "name": "SDCTLLL1-SLL78"
+          },
+          {
+            "id": "SBU78",
+            "name": "SDIT1BUB-SBU78"
+          },
+          {
+            "id": "ATL2",
+            "name": "ATLNGANW-ATL2"
+          },
+          {
+            "id": "BOT1",
+            "name": "BOTHWAKY-BOT1"
+          },
+          {
+            "id": "SNG1",
+            "name": "SNGPSIAU-SNG1"
+          },
+          {
+            "id": "NYC1",
+            "name": "NYCMNY54-NYC1"
+          },
+          {
+            "id": "LAG1b",
+            "name": "LARGIZON-LAG1b"
+          },
+          {
+            "id": "AMD15",
+            "name": "AMDFAA01-AMD15"
+          },
+          {
+            "id": "SNA1",
+            "name": "SNANTXCA-SNA1"
+          },
+          {
+            "id": "PLT1",
+            "name": "PLTNCA60-PLT1"
+          },
+          {
+            "id": "TLP1",
+            "name": "TLPNXM18-TLP1"
+          },
+          {
+            "id": "SDD81",
+            "name": "SAIT1DD6-SDD81"
+          },
+          {
+            "id": "DCC1",
+            "name": "POIUYTGH-DCC1"
+          },
+          {
+            "id": "DCC2",
+            "name": "POIUYTGH-DCC2"
+          },
+          {
+            "id": "OKC1",
+            "name": "OKCBOK55-OKC1"
+          },
+          {
+            "id": "PAR1",
+            "name": "PARSFRCG-PAR1"
+          },
+          {
+            "id": "TES36",
+            "name": "ABCEETES-TES36"
+          },
+          {
+            "id": "COM1",
+            "name": "PLMKOPIU-COM1"
+          },
+          {
+            "id": "ANI1",
+            "name": "ATLNGTRE-ANI1"
+          },
+          {
+            "id": "SDG78",
+            "name": "SDIT1BDG-SDG78"
+          },
+          {
+            "id": "mac20",
+            "name": "PKGTESTF-mac20"
+          },
+          {
+            "id": "DSF45",
+            "name": "DSFBG123-DSF45"
+          },
+          {
+            "id": "HST25",
+            "name": "HSTNTX01-HST25"
+          },
+          {
+            "id": "AMD18",
+            "name": "AUDIMA01-AMD18"
+          },
+          {
+            "id": "SAA80",
+            "name": "SAIT9AA3-SAA80"
+          },
+          {
+            "id": "SSA56",
+            "name": "SSIT2AA7-SSA56"
+          },
+          {
+            "id": "SDD82",
+            "name": "SAIT1DD9-SDD82"
+          },
+          {
+            "id": "JCV1",
+            "name": "JCVLFLBW-JCV1"
+          },
+          {
+            "id": "SUL2",
+            "name": "WERTYUJK-SUL2"
+          },
+          {
+            "id": "PUR1",
+            "name": "purelyde-PUR1"
+          },
+          {
+            "id": "FDE55",
+            "name": "FDERT555-FDE55"
+          },
+          {
+            "id": "SITE",
+            "name": "LONEENCO-SITE"
+          },
+          {
+            "id": "ATL1",
+            "name": "ATLNGAMA-ATL1"
+          },
+          {
+            "id": "JUL1",
+            "name": "ZXCVBNMM-JUL1"
+          },
+          {
+            "id": "TAT34",
+            "name": "TESAAISB-TAT34"
+          },
+          {
+            "id": "XCP12",
+            "name": "CHKGH123-XCP12"
+          },
+          {
+            "id": "RAI1",
+            "name": "poiuytre-RAI1"
+          },
+          {
+            "id": "HPO1",
+            "name": "ATLNGAUP-HPO1"
+          },
+          {
+            "id": "KJF12",
+            "name": "KJFDH123-KJF12"
+          },
+          {
+            "id": "SCC80",
+            "name": "SAIT9CC3-SCC80"
+          },
+          {
+            "id": "SAA12",
+            "name": "SAIT9AF8-SAA12"
+          },
+          {
+            "id": "SAA14",
+            "name": "SAIT1AA9-SAA14"
+          },
+          {
+            "id": "ATL35",
+            "name": "TTESSAAI-ATL35"
+          },
+          {
+            "id": "CWY1",
+            "name": "CWYMOWBS-CWY1"
+          },
+          {
+            "id": "ATL76",
+            "name": "TELEPAAI-ATL76"
+          },
+          {
+            "id": "DSL12",
+            "name": "DSLFK242-DSL12"
+          },
+          {
+            "id": "ATL53",
+            "name": "AAIATLTE-ATL53"
+          },
+          {
+            "id": "SAA11",
+            "name": "SAIT9AA2-SAA11"
+          },
+          {
+            "id": "ATL62",
+            "name": "TESSASCH-ATL62"
+          },
+          {
+            "id": "AUG1",
+            "name": "ASDFGHJK-AUG1"
+          },
+          {
+            "id": "POI22",
+            "name": "POIUY123-POI22"
+          },
+          {
+            "id": "SAA13",
+            "name": "SAIT1AA9-SAA13"
+          },
+          {
+            "id": "BHY17",
+            "name": "BHYTFRF3-BHY17"
+          },
+          {
+            "id": "LIS1",
+            "name": "HOSTPROF-LIS1"
+          },
+          {
+            "id": "SIP1",
+            "name": "ZXCVBNMK-SIP1"
+          },
+          {
+            "id": "ATL99",
+            "name": "TEESTAAI-ATL43"
+          },
+          {
+            "id": "ATL64",
+            "name": "FORLOAAJ-ATL64"
+          },
+          {
+            "id": "TAT33",
+            "name": "TESAAISA-TAT33"
+          },
+          {
+            "id": "RAD10",
+            "name": "INDIPUNE-RAD10"
+          },
+          {
+            "id": "RTW5",
+            "name": "BHYTFRY4-RTW5"
+          },
+          {
+            "id": "JGS1",
+            "name": "KSJKKKKK-JGS1"
+          },
+          {
+            "id": "ATL98",
+            "name": "TEESTAAI-ATL43"
+          },
+          {
+            "id": "WAN1",
+            "name": "LEIWANGW-WAN1"
+          },
+          {
+            "id": "ATL44",
+            "name": "ATLSANAB-ATL44"
+          },
+          {
+            "id": "RTD2",
+            "name": "BHYTFRk4-RTD2"
+          },
+          {
+            "id": "NIR1",
+            "name": "ORFLMANA-NIR1"
+          },
+          {
+            "id": "ATL75",
+            "name": "SANAAIRE-ATL75"
+          },
+          {
+            "id": "NUM1",
+            "name": "QWERTYUI-NUM1"
+          },
+          {
+            "id": "hvf32",
+            "name": "MDTWNJ21-hvf32"
+          },
+          {
+            "id": "RTZ4",
+            "name": "BHYTFRZ6-RTZ4"
+          },
+          {
+            "id": "ATL56",
+            "name": "ATLSANAC-ATL56"
+          },
+          {
+            "id": "AMS1",
+            "name": "AMSTNLBW-AMS1"
+          },
+          {
+            "id": "RCT1",
+            "name": "AMSTERNL-RCT1"
+          },
+          {
+            "id": "JAN1",
+            "name": "ORFLMATT-JAN1"
+          },
+          {
+            "id": "ABC14",
+            "name": "TESAAISA-ABC14"
+          },
+          {
+            "id": "TAT37",
+            "name": "TESAAISD-TAT37"
+          },
+          {
+            "id": "MIC54",
+            "name": "MICHIGAN-MIC54"
+          },
+          {
+            "id": "ABC11",
+            "name": "ATLSANAI-ABC11"
+          },
+          {
+            "id": "AMF11",
+            "name": "AMDOCS01-AMF11"
+          },
+          {
+            "id": "ATL63",
+            "name": "ATLSANEW-ATL63"
+          },
+          {
+            "id": "ABC12",
+            "name": "ATLSECIA-ABC12"
+          },
+          {
+            "id": "hvf20",
+            "name": "MDTWNJ21-hvf20"
+          },
+          {
+            "id": "ABC15",
+            "name": "AAITESAN-ABC15"
+          },
+          {
             "id": "AVT1",
             "name": "AVTRFLHD-AVT1"
           },
@@ -6910,7 +10588,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");
diff --git a/vid-webpack-master/cypress/integration/iFrames/network.popup.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/network.popup.e2e.ts
index 9748f392c..c730dc72b 100644
--- a/vid-webpack-master/cypress/integration/iFrames/network.popup.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/network.popup.e2e.ts
@@ -28,7 +28,7 @@ describe('Network popup', function () {
 
     it('Network(A-La-Carte) - create / edit / duplicate / delete', function () {
       let redux = getReduxWithVNFSAndNetwork();
-      redux.service.serviceHierarchy['6b528779-44a3-4472-bdff-9cd15ec93450'].service.instantiationType = 'A-La-Carte';
+      redux.service.serviceHierarchy['6b528779-44a3-4472-bdff-9cd15ec93450'].service.vidNotions.instantiationType = 'ALaCarte';
 
       cy.setReduxState(<any>redux);
       cy.openIframe('app/ui/#/servicePlanning?serviceModelId=6b528779-44a3-4472-bdff-9cd15ec93450');
@@ -212,17 +212,12 @@ describe('Network popup', 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,
             "FLAG_ADVANCED_PORTS_FILTER": true,
             "CREATE_INSTANCE_TEST": false,
             "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": false,
             "FLAG_REGION_ID_FROM_REMOTE": true,
-            "FLAG_ASYNC_INSTANTIATION": true,
-            "FLAG_ASYNC_JOBS": true,
             "EMPTY_DRAWING_BOARD_TEST": false,
             "FLAG_ADD_MSO_TESTAPI_FIELD": true
           },
@@ -246,11 +241,11 @@ describe('Network popup', function () {
                 "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": {},
@@ -421,74 +416,74 @@ describe('Network popup', 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": true
                     },
-                    "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": {}
                     }
@@ -516,7 +511,7 @@ describe('Network popup', function () {
                   "modelCustomizationName": "ExtVL 0"
                 }
               },
-              "collectionResource": {},
+              "collectionResources": {},
               "configurations": {
                 "Port Mirroring Configuration By Policy 0": {
                   "uuid": "b4398538-e89d-4f13-b33d-ca323434ba50",
@@ -537,72 +532,72 @@ describe('Network popup', 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": true
                 },
-                "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": {}
                 }
@@ -622,8 +617,11 @@ describe('Network popup', function () {
                 "description": "",
                 "serviceEcompNaming": "false",
                 "instantiationType": "Macro",
+                "vidNotions": {
+                  "instantiationType": "Macro"
+                },
                 "inputs": {
-                  "2017488_adiodvpe0_ASN": {
+                  "2017488_pasqualevpe0_ASN": {
                     "type": "string",
                     "description": "AV/PE",
                     "entry_schema": null,
@@ -635,11 +633,11 @@ describe('Network popup', function () {
                 }
               },
               "vnfs": {
-                "2017-388_ADIOD-vPE 1": {
+                "2017-388_PASQUALE-vPE 1": {
                   "uuid": "0903e1c0-8e03-4936-b5c2-260653b96413",
                   "invariantUuid": "00beb8f9-6d39-452f-816d-c709b9cbb87d",
-                  "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-388_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-388_PASQUALE-vPE",
                   "version": "1.0",
                   "customizationUuid": "280dec31-f16d-488b-9668-4aae55d6648a",
                   "inputs": {
@@ -702,37 +700,37 @@ describe('Network popup', 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": "adiodvpe0_bandwidth_units"
+                      "inputName": "pasqualevpe0_bandwidth_units"
                     },
                     "bandwidth": {
                       "displayName": "bandwidth",
                       "command": "get_input",
-                      "inputName": "adiodvpe0_bandwidth"
+                      "inputName": "pasqualevpe0_bandwidth"
                     },
                     "AIC_CLLI": {
                       "displayName": "AIC_CLLI",
                       "command": "get_input",
-                      "inputName": "2017488_adiodvpe0_AIC_CLLI"
+                      "inputName": "2017488_pasqualevpe0_AIC_CLLI"
                     },
                     "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",
@@ -777,7 +775,7 @@ describe('Network popup', function () {
                     "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
                     "vmxvre_int_ctl_ip_0": "10.0.0.10",
                     "ecomp_generated_naming": "false",
-                    "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",
@@ -785,14 +783,14 @@ describe('Network popup', function () {
                     "vmxvre_volume_type_0": "HITACHI",
                     "vmxvpfe_volume_type_0": "HITACHI",
                     "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-                    "bandwidth_units": "get_input:adiodvpe0_bandwidth_units",
+                    "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
                     "vnf_id": "123",
                     "vmxvre_oam_prefix": "24",
                     "availability_zone_0": "mtpocfo-kvm-az01",
-                    "ASN": "get_input:2017488_adiodvpe0_ASN",
+                    "ASN": "get_input:2017488_pasqualevpe0_ASN",
                     "vmxvre_chassis_i2cid": "161",
                     "vmxvpfe_name_0": "vPFEXI",
-                    "bandwidth": "get_input:adiodvpe0_bandwidth",
+                    "bandwidth": "get_input:pasqualevpe0_bandwidth",
                     "availability_zone_max_count": "1",
                     "vmxvre_volume_size_0": "45.0",
                     "vmxvre_volume_size_1": "50.0",
@@ -802,7 +800,7 @@ describe('Network popup', 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",
@@ -816,16 +814,16 @@ describe('Network popup', function () {
                     "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
                   },
                   "type": "VF",
-                  "modelCustomizationName": "2017-388_ADIOD-vPE 1",
+                  "modelCustomizationName": "2017-388_PASQUALE-vPE 1",
                   "vfModules": {},
                   "volumeGroups": {},
                   "vfcInstanceGroups": {}
                 },
-                "2017-388_ADIOD-vPE 0": {
+                "2017-388_PASQUALE-vPE 0": {
                   "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168",
                   "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-                  "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-388_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-388_PASQUALE-vPE",
                   "version": "4.0",
                   "customizationUuid": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c",
                   "inputs": {
@@ -888,37 +886,37 @@ describe('Network popup', 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": "adiodvpe0_bandwidth_units"
+                      "inputName": "pasqualevpe0_bandwidth_units"
                     },
                     "bandwidth": {
                       "displayName": "bandwidth",
                       "command": "get_input",
-                      "inputName": "adiodvpe0_bandwidth"
+                      "inputName": "pasqualevpe0_bandwidth"
                     },
                     "AIC_CLLI": {
                       "displayName": "AIC_CLLI",
                       "command": "get_input",
-                      "inputName": "2017488_adiodvpe0_AIC_CLLI"
+                      "inputName": "2017488_pasqualevpe0_AIC_CLLI"
                     },
                     "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",
@@ -964,7 +962,7 @@ describe('Network popup', function () {
                     "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
                     "vmxvre_int_ctl_ip_0": "10.0.0.10",
                     "ecomp_generated_naming": "false",
-                    "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",
@@ -972,14 +970,14 @@ describe('Network popup', function () {
                     "vmxvre_volume_type_0": "HITACHI",
                     "vmxvpfe_volume_type_0": "HITACHI",
                     "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-                    "bandwidth_units": "get_input:adiodvpe0_bandwidth_units",
+                    "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
                     "vnf_id": "123",
                     "vmxvre_oam_prefix": "24",
                     "availability_zone_0": "mtpocfo-kvm-az01",
-                    "ASN": "get_input:2017488_adiodvpe0_ASN",
+                    "ASN": "get_input:2017488_pasqualevpe0_ASN",
                     "vmxvre_chassis_i2cid": "161",
                     "vmxvpfe_name_0": "vPFEXI",
-                    "bandwidth": "get_input:adiodvpe0_bandwidth",
+                    "bandwidth": "get_input:pasqualevpe0_bandwidth",
                     "availability_zone_max_count": "1",
                     "vmxvre_volume_size_0": "45.0",
                     "vmxvre_volume_size_1": "50.0",
@@ -989,7 +987,7 @@ describe('Network popup', 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",
@@ -1003,16 +1001,16 @@ describe('Network popup', function () {
                     "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
                   },
                   "type": "VF",
-                  "modelCustomizationName": "2017-388_ADIOD-vPE 0",
+                  "modelCustomizationName": "2017-388_PASQUALE-vPE 0",
                   "vfModules": {},
                   "volumeGroups": {},
                   "vfcInstanceGroups": {}
                 },
-                "2017-488_ADIOD-vPE 0": {
+                "2017-488_PASQUALE-vPE 0": {
                   "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
                   "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-                  "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": "5.0",
                   "customizationUuid": "1da7b585-5e61-4993-b95e-8e6606c81e45",
                   "inputs": {
@@ -1075,37 +1073,37 @@ describe('Network popup', 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": "adiodvpe0_bandwidth_units"
+                      "inputName": "pasqualevpe0_bandwidth_units"
                     },
                     "bandwidth": {
                       "displayName": "bandwidth",
                       "command": "get_input",
-                      "inputName": "adiodvpe0_bandwidth"
+                      "inputName": "pasqualevpe0_bandwidth"
                     },
                     "AIC_CLLI": {
                       "displayName": "AIC_CLLI",
                       "command": "get_input",
-                      "inputName": "2017488_adiodvpe0_AIC_CLLI"
+                      "inputName": "2017488_pasqualevpe0_AIC_CLLI"
                     },
                     "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",
@@ -1152,7 +1150,7 @@ describe('Network popup', function () {
                     "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
                     "vmxvre_int_ctl_ip_0": "10.0.0.10",
                     "ecomp_generated_naming": "false",
-                    "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",
@@ -1160,14 +1158,14 @@ describe('Network popup', function () {
                     "vmxvre_volume_type_0": "HITACHI",
                     "vmxvpfe_volume_type_0": "HITACHI",
                     "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-                    "bandwidth_units": "get_input:adiodvpe0_bandwidth_units",
+                    "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
                     "vnf_id": "123",
                     "vmxvre_oam_prefix": "24",
                     "availability_zone_0": "mtpocfo-kvm-az01",
-                    "ASN": "get_input:2017488_adiodvpe0_ASN",
+                    "ASN": "get_input:2017488_pasqualevpe0_ASN",
                     "vmxvre_chassis_i2cid": "161",
                     "vmxvpfe_name_0": "vPFEXI",
-                    "bandwidth": "get_input:adiodvpe0_bandwidth",
+                    "bandwidth": "get_input:pasqualevpe0_bandwidth",
                     "availability_zone_max_count": "1",
                     "vmxvre_volume_size_0": "45.0",
                     "vmxvre_volume_size_1": "50.0",
@@ -1177,7 +1175,7 @@ describe('Network popup', 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",
@@ -1191,82 +1189,82 @@ describe('Network popup', 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": "25284168-24bb-4698-8cb4-3f509146eca5",
                       "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
                       "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
                       "description": null,
-                      "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                      "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                       "version": "6",
-                      "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": {
-                        "adiodvpe0_bandwidth": {
+                        "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,
                           "required": true,
                           "default": "ATLMY8GA"
                         },
-                        "adiodvpe0_bandwidth_units": {
+                        "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,
@@ -1276,116 +1274,116 @@ describe('Network popup', function () {
                       },
                       "volumeGroupAllowed": true
                     },
-                    "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
+                    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
                       "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
                       "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
                       "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
                       "description": null,
-                      "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+                      "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
                       "version": "5",
-                      "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": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
                       "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
                       "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
                       "description": null,
-                      "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                      "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                       "version": "6",
-                      "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": {},
                       "volumeGroupAllowed": true
                     }
                   },
                   "volumeGroups": {
-                    "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+                    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
                       "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
                       "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
                       "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
                       "description": null,
-                      "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                      "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                       "version": "6",
-                      "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": {
-                        "adiodvpe0_bandwidth": {
+                        "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,
                           "required": true,
                           "default": "ATLMY8GA"
                         },
-                        "adiodvpe0_bandwidth_units": {
+                        "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,
@@ -1394,19 +1392,19 @@ describe('Network popup', function () {
                         }
                       }
                     },
-                    "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+                    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
                       "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
                       "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
                       "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
                       "description": null,
-                      "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                      "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                       "version": "6",
-                      "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": {}
                     }
@@ -1436,85 +1434,85 @@ describe('Network popup', function () {
                   "modelCustomizationName": "ExtVL 0"
                 }
               },
-              "collectionResource": {},
+              "collectionResources": {},
               "configurations": {},
               "fabricConfigurations": {},
               "serviceProxies": {},
               "vfModules": {
-                "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+                "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
                   "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
                   "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
                   "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
                   "description": null,
-                  "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                  "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                   "version": "6",
-                  "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": {
-                    "adiodvpe0_bandwidth": {
+                    "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,
                       "required": true,
                       "default": "ATLMY8GA"
                     },
-                    "adiodvpe0_bandwidth_units": {
+                    "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,
@@ -1524,116 +1522,116 @@ describe('Network popup', function () {
                   },
                   "volumeGroupAllowed": true
                 },
-                "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
+                "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
                   "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
                   "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
                   "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
                   "description": null,
-                  "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+                  "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
                   "version": "5",
-                  "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": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
                   "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
                   "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
                   "description": null,
-                  "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                  "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                   "version": "6",
-                  "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": {},
                   "volumeGroupAllowed": true
                 }
               },
               "volumeGroups": {
-                "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+                "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
                   "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
                   "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
                   "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
                   "description": null,
-                  "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                  "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                   "version": "6",
-                  "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": {
-                    "adiodvpe0_bandwidth": {
+                    "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,
                       "required": true,
                       "default": "ATLMY8GA"
                     },
-                    "adiodvpe0_bandwidth_units": {
+                    "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,
@@ -1642,19 +1640,19 @@ describe('Network popup', function () {
                     }
                   }
                 },
-                "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+                "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
                   "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
                   "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
                   "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
                   "description": null,
-                  "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                  "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                   "version": "6",
-                  "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": {}
                 }
@@ -1665,21 +1663,21 @@ describe('Network popup', function () {
           "serviceInstance": {
             "6e59c5de-f052-46fa-aa7e-2fca9d674c44": {
               "vnfs": {
-                "VF_vMee 0": {
+                "VF_vGeraldine 0": {
                   "rollbackOnFailure": "true",
                   "vfModules": {
-                    "vf_vmee0..VfVmee..base_vmme..module-0": {
-                      "vf_vmee0..VfVmee..base_vmme..module-0vmvzo": {
+                    "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
+                      "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0vmvzo": {
                         "isMissingData": false,
                         "sdncPreReload": null,
                         "modelInfo": {
                           "modelType": "VFmodule",
                           "modelInvariantId": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
                           "modelVersionId": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
-                          "modelName": "VfVmee..base_vmme..module-0",
+                          "modelName": "VfVgeraldine..base_vflorence..module-0",
                           "modelVersion": "2",
                           "modelCustomizationId": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
-                          "modelCustomizationName": "VfVmee..base_vmme..module-0"
+                          "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0"
                         },
                         "instanceParams": [
                           {}
@@ -1689,8 +1687,8 @@ describe('Network popup', function () {
                     }
                   },
                   "isMissingData": true,
-                  "originalName": "VF_vMee 0",
-                  "vnfStoreKey": "VF_vMee 0",
+                  "originalName": "VF_vGeraldine 0",
+                  "vnfStoreKey": "VF_vGeraldine 0",
                   "trackById": "p3wk448m5do",
                   "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
                   "productFamilyId": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e",
@@ -1702,9 +1700,9 @@ describe('Network popup', function () {
                     "modelType": "VF",
                     "modelInvariantId": "4160458e-f648-4b30-a176-43881ffffe9e",
                     "modelVersionId": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
-                    "modelName": "VF_vMee",
+                    "modelName": "VF_vGeraldine",
                     "modelVersion": "2.0",
-                    "modelCustomizationName": "VF_vMee 0"
+                    "modelCustomizationName": "VF_vGeraldine 0"
                   }
                 }
               },
@@ -1750,7 +1748,7 @@ describe('Network popup', function () {
               "vnfs": {},
               "instanceParams": [
                 {
-                  "2017488_adiodvpe0_ASN": "AV_vPE"
+                  "2017488_pasqualevpe0_ASN": "AV_vPE"
                 }
               ],
               "validationCounter": 0,
@@ -1766,7 +1764,7 @@ describe('Network popup', function () {
               "subscriptionServiceType": "TYLER SILVIA",
               "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
               "productFamilyId": "17cc1042-527b-11e6-beb8-9e71128cae77",
-              "lcpCloudRegionId": "JANET25",
+              "lcpCloudRegionId": "AAIAIC25",
               "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
               "aicZoneId": "JAG1",
               "projectName": null,
@@ -1798,8 +1796,8 @@ describe('Network popup', function () {
           "lcpRegionsAndTenants": {
             "lcpRegionList": [
               {
-                "id": "JANET25",
-                "name": "JANET25",
+                "id": "AAIAIC25",
+                "name": "AAIAIC25",
                 "isPermitted": true
               },
               {
@@ -1809,7 +1807,7 @@ describe('Network popup', function () {
               }
             ],
             "lcpRegionsTenantsMap": {
-              "JANET25": [
+              "AAIAIC25": [
                 {
                   "id": "092eb9e8e4b7412e8787dd091bc58e86",
                   "name": "USP-SIP-IC-24335-T-01",
@@ -1823,8 +1821,128 @@ describe('Network popup', 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
                 },
                 {
@@ -1833,6 +1951,16 @@ describe('Network popup', function () {
                   "isPermitted": true
                 },
                 {
+                  "id": "4914ab0ab3a743e58f0eefdacc1dde77",
+                  "name": "DN5242-Nov21-T1",
+                  "isPermitted": true
+                },
+                {
+                  "id": "d0a3e3f2964542259d155a81c41aadc3",
+                  "name": "test-hvf6-09",
+                  "isPermitted": true
+                },
+                {
                   "id": "cbb99fe4ada84631b7baf046b6fd2044",
                   "name": "DN5242-Nov16-T3",
                   "isPermitted": true
@@ -1843,7 +1971,7 @@ describe('Network popup', function () {
           "productFamilies": [
             {
               "id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-              "name": "SCOTTIE",
+              "name": "ERICA",
               "isPermitted": true
             },
             {
@@ -1868,7 +1996,7 @@ describe('Network popup', function () {
             },
             {
               "id": "323d69d9-2efe-4r45-ay0a-89ea7ard4e6f",
-              "name": "vSCP",
+              "name": "vEsmeralda",
               "isPermitted": true
             },
             {
@@ -1912,7 +2040,7 @@ describe('Network popup', function () {
               "isPermitted": true
             },
             {
-              "id": "Cisneros",
+              "id": "vMuriel",
               "name": "vMuriel",
               "isPermitted": true
             },
@@ -1938,7 +2066,7 @@ describe('Network popup', function () {
             },
             {
               "id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
-              "name": "Josefina",
+              "name": "JOSEFINA",
               "isPermitted": true
             },
             {
@@ -1986,7 +2114,7 @@ describe('Network popup', function () {
               },
               {
                 "id": "6",
-                "name": "vSEGW",
+                "name": "vPorfirio",
                 "isPermitted": false
               },
               {
@@ -2001,7 +2129,7 @@ describe('Network popup', function () {
               },
               {
                 "id": "9",
-                "name": "vMME",
+                "name": "vFLORENCE",
                 "isPermitted": false
               },
               {
@@ -2011,7 +2139,7 @@ describe('Network popup', function () {
               },
               {
                 "id": "11",
-                "name": "vSCP",
+                "name": "vEsmeralda",
                 "isPermitted": false
               },
               {
@@ -2021,7 +2149,7 @@ describe('Network popup', function () {
               },
               {
                 "id": "13",
-                "name": "vMMSC",
+                "name": "vWINIFRED",
                 "isPermitted": false
               },
               {
@@ -2065,6 +2193,754 @@ describe('Network popup', function () {
               "name": "UUUAIAAI-YYY1"
             },
             {
+              "id": "BAN1",
+              "name": "VSDKYUTP-BAN1"
+            },
+            {
+              "id": "DKJ1",
+              "name": "DKJSJDKA-DKJ1"
+            },
+            {
+              "id": "MCS1",
+              "name": "ASACMAMS-MCS1"
+            },
+            {
+              "id": "UIO1",
+              "name": "uioclli1-UIO1"
+            },
+            {
+              "id": "RAJ1",
+              "name": "YGBIJNLQ-RAJ1"
+            },
+            {
+              "id": "OPA1",
+              "name": "opaclli1-OPA1"
+            },
+            {
+              "id": "SDE1",
+              "name": "ZXCVBNMA-SDE1"
+            },
+            {
+              "id": "VEN2",
+              "name": "FGHJUHIL-VEN2"
+            },
+            {
+              "id": "ORL1",
+              "name": "ORLDFLMA-ORL1"
+            },
+            {
+              "id": "JAD1",
+              "name": "JADECLLI-JAD1"
+            },
+            {
+              "id": "ZXL1",
+              "name": "LWLWCANN-ZXL1"
+            },
+            {
+              "id": "CKL1",
+              "name": "CLKSKCKK-CKL1"
+            },
+            {
+              "id": "SDF1",
+              "name": "sdfclli1-SDF1"
+            },
+            {
+              "id": "RAD1",
+              "name": "RADICAL1-RAD1"
+            },
+            {
+              "id": "KIT1",
+              "name": "BHYJFGLN-KIT1"
+            },
+            {
+              "id": "REL1",
+              "name": "INGERFGT-REL1"
+            },
+            {
+              "id": "JNL1",
+              "name": "CJALSDAC-JNL1"
+            },
+            {
+              "id": "OLK1",
+              "name": "OLKOLKLS-OLK1"
+            },
+            {
+              "id": "CHI1",
+              "name": "CHILLIWE-CHI1"
+            },
+            {
+              "id": "UUU4",
+              "name": "UUUAAAUU-UUU4"
+            },
+            {
+              "id": "TUF1",
+              "name": "TUFCLLI1-TUF1"
+            },
+            {
+              "id": "KJN1",
+              "name": "CKALDKSA-KJN1"
+            },
+            {
+              "id": "SAM1",
+              "name": "SNDGCA64-SAN1"
+            },
+            {
+              "id": "SCK1",
+              "name": "SCKSCKSK-SCK1"
+            },
+            {
+              "id": "HJH1",
+              "name": "AOEEQQQD-HJH1"
+            },
+            {
+              "id": "HGD1",
+              "name": "SDFQWHGD-HGD1"
+            },
+            {
+              "id": "KOR1",
+              "name": "HYFLNBVT-KOR1"
+            },
+            {
+              "id": "ATL43",
+              "name": "AICLOCID-ATL43"
+            },
+            {
+              "id": "ATL54",
+              "name": "AICFTAAI-ATL54"
+            },
+            {
+              "id": "ATL66",
+              "name": "CLLIAAII-ATL66"
+            },
+            {
+              "id": "VEL1",
+              "name": "BNMLKUIK-VEL1"
+            },
+            {
+              "id": "ICC1",
+              "name": "SANJITAT-ICC1"
+            },
+            {
+              "id": "MNT11",
+              "name": "WSXEFBTH-MNT11"
+            },
+            {
+              "id": "DEF2",
+              "name": "WSBHGTYL-DEF2"
+            },
+            {
+              "id": "MAD11",
+              "name": "SDFQWGKL-MAD11"
+            },
+            {
+              "id": "OLG1",
+              "name": "OLHOLHOL-OLG1"
+            },
+            {
+              "id": "GAR1",
+              "name": "NGFVSJKO-GAR1"
+            },
+            {
+              "id": "SAN22",
+              "name": "GNVLSCTL-SAN22"
+            },
+            {
+              "id": "HRG1",
+              "name": "HRGHRGGS-HRG1"
+            },
+            {
+              "id": "JCS1",
+              "name": "JCSJSCJS-JCS1"
+            },
+            {
+              "id": "DHA12",
+              "name": "WSXEDECF-DHA12"
+            },
+            {
+              "id": "HJE1",
+              "name": "AOEEWWWD-HJE1"
+            },
+            {
+              "id": "NCA1",
+              "name": "NCANCANN-NCA1"
+            },
+            {
+              "id": "IOP1",
+              "name": "iopclli1-IOP1"
+            },
+            {
+              "id": "RTY1",
+              "name": "rtyclli1-RTY1"
+            },
+            {
+              "id": "KAP1",
+              "name": "HIOUYTRQ-KAP1"
+            },
+            {
+              "id": "ZEN1",
+              "name": "ZENCLLI1-ZEN1"
+            },
+            {
+              "id": "HKA1",
+              "name": "JAKHLASS-HKA1"
+            },
+            {
+              "id": "CQK1",
+              "name": "CQKSCAKK-CQK1"
+            },
+            {
+              "id": "SAI1",
+              "name": "UBEKQLPD-SAI1"
+            },
+            {
+              "id": "ERT1",
+              "name": "ertclli1-ERT1"
+            },
+            {
+              "id": "IBB1",
+              "name": "PLMKOIJU-IBB1"
+            },
+            {
+              "id": "TIR2",
+              "name": "PLKINHYI-TIR2"
+            },
+            {
+              "id": "HSD1",
+              "name": "CHASKCDS-HSD1"
+            },
+            {
+              "id": "SLF78",
+              "name": "SDCTLFN1-SLF78"
+            },
+            {
+              "id": "SEE78",
+              "name": "SDCTEEE4-SEE78"
+            },
+            {
+              "id": "SAN13",
+              "name": "TOKYJPFA-SAN13"
+            },
+            {
+              "id": "SAA78",
+              "name": "SDCTAAA1-SAA78"
+            },
+            {
+              "id": "LUC1",
+              "name": "ATLDFGYC-LUC1"
+            },
+            {
+              "id": "AMD13",
+              "name": "MEMATLAN-AMD13"
+            },
+            {
+              "id": "TOR1",
+              "name": "TOROONXN-TOR1"
+            },
+            {
+              "id": "QWE1",
+              "name": "QWECLLI1-QWE1"
+            },
+            {
+              "id": "ZOG1",
+              "name": "ZOGASTRO-ZOG1"
+            },
+            {
+              "id": "CAL33",
+              "name": "CALIFORN-CAL33"
+            },
+            {
+              "id": "SHH78",
+              "name": "SDIT1HHH-SHH78"
+            },
+            {
+              "id": "DSA1",
+              "name": "LKJHGFDS-DSA1"
+            },
+            {
+              "id": "CLG1",
+              "name": "CLGRABAD-CLG1"
+            },
+            {
+              "id": "BNA1",
+              "name": "BNARAGBK-BNA1"
+            },
+            {
+              "id": "ATL84",
+              "name": "CANTTCOC-ATL84"
+            },
+            {
+              "id": "APP1",
+              "name": "WBHGTYUI-APP1"
+            },
+            {
+              "id": "RJN1",
+              "name": "RJNRBZAW-RJN1"
+            },
+            {
+              "id": "EHH78",
+              "name": "SDCSHHH5-EHH78"
+            },
+            {
+              "id": "mac10",
+              "name": "PKGTESTF-mac10"
+            },
+            {
+              "id": "SXB78",
+              "name": "SDCTGXB1-SXB78"
+            },
+            {
+              "id": "SAX78",
+              "name": "SDCTAXG1-SAX78"
+            },
+            {
+              "id": "SYD1",
+              "name": "SYDNAUBV-SYD1"
+            },
+            {
+              "id": "TOK1",
+              "name": "TOKYJPFA-TOK1"
+            },
+            {
+              "id": "KGM2",
+              "name": "KGMTNC20-KGM2"
+            },
+            {
+              "id": "DCC1b",
+              "name": "POIUYTGH-DCC1b"
+            },
+            {
+              "id": "SKK78",
+              "name": "SDCTKKK1-SKK78"
+            },
+            {
+              "id": "SGG78",
+              "name": "SDCTGGG1-SGG78"
+            },
+            {
+              "id": "SJJ78",
+              "name": "SDCTJJJ1-SJJ78"
+            },
+            {
+              "id": "SBX78",
+              "name": "SDCTBXG1-SBX78"
+            },
+            {
+              "id": "LAG1",
+              "name": "LARGIZON-LAG1"
+            },
+            {
+              "id": "IAA1",
+              "name": "QAZXSWED-IAA1"
+            },
+            {
+              "id": "POI1",
+              "name": "PLMNJKIU-POI1"
+            },
+            {
+              "id": "LAG1a",
+              "name": "LARGIZON-LAG1a"
+            },
+            {
+              "id": "PBL1",
+              "name": "PBLAPBAI-PBL1"
+            },
+            {
+              "id": "LAG45",
+              "name": "LARGIZON-LAG1a"
+            },
+            {
+              "id": "MAR1",
+              "name": "MNBVCXZM-MAR1"
+            },
+            {
+              "id": "HST70",
+              "name": "HSTNTX70-HST70"
+            },
+            {
+              "id": "DCC1a",
+              "name": "POIUYTGH-DCC1a"
+            },
+            {
+              "id": "TOL1",
+              "name": "TOLDOH21-TOL1"
+            },
+            {
+              "id": "LON1",
+              "name": "LONEENCO-LON1"
+            },
+            {
+              "id": "SJU78",
+              "name": "SDIT1JUB-SJU78"
+            },
+            {
+              "id": "STN27",
+              "name": "HSTNTX01-STN27"
+            },
+            {
+              "id": "SSW56",
+              "name": "ss8126GT-SSW56"
+            },
+            {
+              "id": "SBB78",
+              "name": "SDIT1BBB-SBB78"
+            },
+            {
+              "id": "DCC3",
+              "name": "POIUYTGH-DCC3"
+            },
+            {
+              "id": "GNV1",
+              "name": "GNVLSCTL-GNV1"
+            },
+            {
+              "id": "WAS1",
+              "name": "WASHDCSW-WAS1"
+            },
+            {
+              "id": "TOY1",
+              "name": "TORYONNZ-TOY1"
+            },
+            {
+              "id": "STT1",
+              "name": "STTLWA02-STT1"
+            },
+            {
+              "id": "STG1",
+              "name": "STTGGE62-STG1"
+            },
+            {
+              "id": "SLL78",
+              "name": "SDCTLLL1-SLL78"
+            },
+            {
+              "id": "SBU78",
+              "name": "SDIT1BUB-SBU78"
+            },
+            {
+              "id": "ATL2",
+              "name": "ATLNGANW-ATL2"
+            },
+            {
+              "id": "BOT1",
+              "name": "BOTHWAKY-BOT1"
+            },
+            {
+              "id": "SNG1",
+              "name": "SNGPSIAU-SNG1"
+            },
+            {
+              "id": "NYC1",
+              "name": "NYCMNY54-NYC1"
+            },
+            {
+              "id": "LAG1b",
+              "name": "LARGIZON-LAG1b"
+            },
+            {
+              "id": "AMD15",
+              "name": "AMDFAA01-AMD15"
+            },
+            {
+              "id": "SNA1",
+              "name": "SNANTXCA-SNA1"
+            },
+            {
+              "id": "PLT1",
+              "name": "PLTNCA60-PLT1"
+            },
+            {
+              "id": "TLP1",
+              "name": "TLPNXM18-TLP1"
+            },
+            {
+              "id": "SDD81",
+              "name": "SAIT1DD6-SDD81"
+            },
+            {
+              "id": "DCC1",
+              "name": "POIUYTGH-DCC1"
+            },
+            {
+              "id": "DCC2",
+              "name": "POIUYTGH-DCC2"
+            },
+            {
+              "id": "OKC1",
+              "name": "OKCBOK55-OKC1"
+            },
+            {
+              "id": "PAR1",
+              "name": "PARSFRCG-PAR1"
+            },
+            {
+              "id": "TES36",
+              "name": "ABCEETES-TES36"
+            },
+            {
+              "id": "COM1",
+              "name": "PLMKOPIU-COM1"
+            },
+            {
+              "id": "ANI1",
+              "name": "ATLNGTRE-ANI1"
+            },
+            {
+              "id": "SDG78",
+              "name": "SDIT1BDG-SDG78"
+            },
+            {
+              "id": "mac20",
+              "name": "PKGTESTF-mac20"
+            },
+            {
+              "id": "DSF45",
+              "name": "DSFBG123-DSF45"
+            },
+            {
+              "id": "HST25",
+              "name": "HSTNTX01-HST25"
+            },
+            {
+              "id": "AMD18",
+              "name": "AUDIMA01-AMD18"
+            },
+            {
+              "id": "SAA80",
+              "name": "SAIT9AA3-SAA80"
+            },
+            {
+              "id": "SSA56",
+              "name": "SSIT2AA7-SSA56"
+            },
+            {
+              "id": "SDD82",
+              "name": "SAIT1DD9-SDD82"
+            },
+            {
+              "id": "JCV1",
+              "name": "JCVLFLBW-JCV1"
+            },
+            {
+              "id": "SUL2",
+              "name": "WERTYUJK-SUL2"
+            },
+            {
+              "id": "PUR1",
+              "name": "purelyde-PUR1"
+            },
+            {
+              "id": "FDE55",
+              "name": "FDERT555-FDE55"
+            },
+            {
+              "id": "SITE",
+              "name": "LONEENCO-SITE"
+            },
+            {
+              "id": "ATL1",
+              "name": "ATLNGAMA-ATL1"
+            },
+            {
+              "id": "JUL1",
+              "name": "ZXCVBNMM-JUL1"
+            },
+            {
+              "id": "TAT34",
+              "name": "TESAAISB-TAT34"
+            },
+            {
+              "id": "XCP12",
+              "name": "CHKGH123-XCP12"
+            },
+            {
+              "id": "RAI1",
+              "name": "poiuytre-RAI1"
+            },
+            {
+              "id": "HPO1",
+              "name": "ATLNGAUP-HPO1"
+            },
+            {
+              "id": "KJF12",
+              "name": "KJFDH123-KJF12"
+            },
+            {
+              "id": "SCC80",
+              "name": "SAIT9CC3-SCC80"
+            },
+            {
+              "id": "SAA12",
+              "name": "SAIT9AF8-SAA12"
+            },
+            {
+              "id": "SAA14",
+              "name": "SAIT1AA9-SAA14"
+            },
+            {
+              "id": "ATL35",
+              "name": "TTESSAAI-ATL35"
+            },
+            {
+              "id": "CWY1",
+              "name": "CWYMOWBS-CWY1"
+            },
+            {
+              "id": "ATL76",
+              "name": "TELEPAAI-ATL76"
+            },
+            {
+              "id": "DSL12",
+              "name": "DSLFK242-DSL12"
+            },
+            {
+              "id": "ATL53",
+              "name": "AAIATLTE-ATL53"
+            },
+            {
+              "id": "SAA11",
+              "name": "SAIT9AA2-SAA11"
+            },
+            {
+              "id": "ATL62",
+              "name": "TESSASCH-ATL62"
+            },
+            {
+              "id": "AUG1",
+              "name": "ASDFGHJK-AUG1"
+            },
+            {
+              "id": "POI22",
+              "name": "POIUY123-POI22"
+            },
+            {
+              "id": "SAA13",
+              "name": "SAIT1AA9-SAA13"
+            },
+            {
+              "id": "BHY17",
+              "name": "BHYTFRF3-BHY17"
+            },
+            {
+              "id": "LIS1",
+              "name": "HOSTPROF-LIS1"
+            },
+            {
+              "id": "SIP1",
+              "name": "ZXCVBNMK-SIP1"
+            },
+            {
+              "id": "ATL99",
+              "name": "TEESTAAI-ATL43"
+            },
+            {
+              "id": "ATL64",
+              "name": "FORLOAAJ-ATL64"
+            },
+            {
+              "id": "TAT33",
+              "name": "TESAAISA-TAT33"
+            },
+            {
+              "id": "RAD10",
+              "name": "INDIPUNE-RAD10"
+            },
+            {
+              "id": "RTW5",
+              "name": "BHYTFRY4-RTW5"
+            },
+            {
+              "id": "JGS1",
+              "name": "KSJKKKKK-JGS1"
+            },
+            {
+              "id": "ATL98",
+              "name": "TEESTAAI-ATL43"
+            },
+            {
+              "id": "WAN1",
+              "name": "LEIWANGW-WAN1"
+            },
+            {
+              "id": "ATL44",
+              "name": "ATLSANAB-ATL44"
+            },
+            {
+              "id": "RTD2",
+              "name": "BHYTFRk4-RTD2"
+            },
+            {
+              "id": "NIR1",
+              "name": "ORFLMANA-NIR1"
+            },
+            {
+              "id": "ATL75",
+              "name": "SANAAIRE-ATL75"
+            },
+            {
+              "id": "NUM1",
+              "name": "QWERTYUI-NUM1"
+            },
+            {
+              "id": "hvf32",
+              "name": "MDTWNJ21-hvf32"
+            },
+            {
+              "id": "RTZ4",
+              "name": "BHYTFRZ6-RTZ4"
+            },
+            {
+              "id": "ATL56",
+              "name": "ATLSANAC-ATL56"
+            },
+            {
+              "id": "AMS1",
+              "name": "AMSTNLBW-AMS1"
+            },
+            {
+              "id": "RCT1",
+              "name": "AMSTERNL-RCT1"
+            },
+            {
+              "id": "JAN1",
+              "name": "ORFLMATT-JAN1"
+            },
+            {
+              "id": "ABC14",
+              "name": "TESAAISA-ABC14"
+            },
+            {
+              "id": "TAT37",
+              "name": "TESAAISD-TAT37"
+            },
+            {
+              "id": "MIC54",
+              "name": "MICHIGAN-MIC54"
+            },
+            {
+              "id": "ABC11",
+              "name": "ATLSANAI-ABC11"
+            },
+            {
+              "id": "AMF11",
+              "name": "AMDOCS01-AMF11"
+            },
+            {
+              "id": "ATL63",
+              "name": "ATLSANEW-ATL63"
+            },
+            {
+              "id": "ABC12",
+              "name": "ATLSECIA-ABC12"
+            },
+            {
+              "id": "hvf20",
+              "name": "MDTWNJ21-hvf20"
+            },
+            {
+              "id": "ABC15",
+              "name": "AAITESAN-ABC15"
+            },
+            {
               "id": "AVT1",
               "name": "AVTRFLHD-AVT1"
             },
diff --git a/vid-webpack-master/cypress/integration/iFrames/permission.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/permission.e2e.ts
index 225c12c6b..97be48c9f 100644
--- a/vid-webpack-master/cypress/integration/iFrames/permission.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/permission.e2e.ts
@@ -96,11 +96,11 @@ describe('Permissions ',  ()=> {
     cy.readFile('../vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json').then((res) => {
 
       // Adding VNF with isFailed.
-      res.vnfs["2017-388_ADIOD-vPE 0"].isFailed = true;
-      res.vnfs["2017-488_ADIOD-vPE 0"].isFailed = true;
+      res.vnfs["2017-388_PASQUALE-vPE 0"].isFailed = true;
+      res.vnfs["2017-488_PASQUALE-vPE 0"].isFailed = true;
 
       // Adding VFModule with isFailed.
-      res.vnfs["2017-488_ADIOD-vPE 0"].vfModules["2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0"]["2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0uvfot"].isFailed = true;
+      res.vnfs["2017-488_PASQUALE-vPE 0"].vfModules["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0"]["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot"].isFailed = true;
 
       jsonBuilderAndMock.basicJson(
         res,
diff --git a/vid-webpack-master/cypress/integration/iFrames/pnf.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/pnf.e2e.ts
new file mode 100644
index 000000000..a13094a6a
--- /dev/null
+++ b/vid-webpack-master/cypress/integration/iFrames/pnf.e2e.ts
@@ -0,0 +1,2814 @@
+///<reference path="../../../node_modules/cypress/types/index.d.ts"/>
+
+
+describe('Drawing board: PNF ',  function()  {
+  beforeEach(() => {
+    cy.window().then((win) => {
+      win.sessionStorage.clear();
+      cy.setReduxState();
+      cy.preventErrorsOnLoading();
+      cy.initAAIMock();
+      cy.initVidMock();
+      cy.login();
+    });
+  });
+
+  afterEach(() => {
+    cy.screenshot();
+  });
+
+  describe('Should show PNF correctly',  () => {
+    it('on left side', () => {
+      const serviceModelId: string = "6e59c5de-f052-46fa-aa7e-2fca9d674c44";
+      const pnfName: string = "PNF1";
+      initDrawingBoardWithPnf(serviceModelId, pnfName);
+      cy.get('.vf-type').contains('PNF');
+    });
+
+    it ('on Component Info section', ()=>{
+      const serviceModelId: string = "6e59c5de-f052-46fa-aa7e-2fca9d674c44";
+      const pnfName: string = "PNF1";
+      const redux =  initDrawingBoardWithPnf(serviceModelId, pnfName);
+      cy.get('.vf-type').contains('PNF').click().then(() =>{
+         cy.getElementByDataTestsId('component-info-section-title').contains('PNF INFO');
+         const customizationUuid = redux["service"]["serviceHierarchy"][serviceModelId]['pnfs'][pnfName].customizationUuid;
+         cy.getElementByDataTestsId('model-item-value-Model customization ID').contains(customizationUuid);
+      })
+    });
+  });
+
+  //todo to check with Yoav to delete reduxWithPnfs
+  it('edit service popup should appear without error on tenant', ()=>{
+    const serviceModelId: string = "12550cd7-7708-4f53-a09e-41d3d6327ebc";
+    const pnfName: string = "PNF4";
+    const redux =  initDrawingBoardWithFourPnf(serviceModelId, pnfName);
+    cy.get('.vf-type').contains('PNF').click().then(() =>{
+      const customizationUuid = redux["service"]["serviceHierarchy"][serviceModelId]['pnfs'][pnfName].customizationUuid;
+      cy.getElementByDataTestsId('model-item-value-Model customization ID').contains(customizationUuid);
+      cy.getElementByDataTestsId('openMenuBtn').click().then(()=>{
+        cy.getElementByDataTestsId('context-menu-header-edit-item').click().then(()=>{
+          cy.getElementByDataTestsId('no-results-error').should('not.exist')
+        })
+      })
+    })
+  });
+});
+
+  function initDrawingBoardWithPnf(serviceModelId: string, pnfName: string) {
+    const redux = reduxWithPnfs(serviceModelId, pnfName);
+    cy.setReduxState(<any>redux);
+    cy.openIframe(`app/ui/#/servicePlanning?serviceModelId=${serviceModelId}`);
+    return redux;
+  }
+
+function initDrawingBoardWithFourPnf(serviceModelId: string, pnfName: string) {
+  const redux = reduxWithFourPnfs(serviceModelId, pnfName);
+  cy.setReduxState(<any>redux);
+  cy.openIframe(`app/ui/#/servicePlanning?serviceModelId=${serviceModelId}`);
+  return redux;
+}
+
+  function reduxWithPnfs(serviceModelId: string, pnfName: string) {
+    return {
+      "service": {
+        "serviceHierarchy": {
+          [serviceModelId]: {
+            "service": {
+              "uuid": serviceModelId,
+              "invariantUuid": "cfef8302-d90f-475f-87cc-3f49a62ef14c",
+              "name": "ComplexService",
+              "version": "1.0",
+              "toscaModelURL": null,
+              "category": "Emanuel",
+              "serviceType": "Transport",
+              "serviceRole": "ATM",
+              "description": "ComplexService",
+              "serviceEcompNaming": "true",
+              "instantiationType": "Macro",
+              "inputs": {},
+              "vidNotions": {
+                "instantiationUI": "legacy",
+                "modelCategory": "other",
+                "viewEditUI": "legacy"
+              }
+            },
+            "vnfs": {},
+            "networks": {},
+            "collectionResources": {},
+            "configurations": {},
+            "fabricConfigurations": {},
+            "serviceProxies": {},
+            "vfModules": {},
+            "volumeGroups": {},
+            "pnfs": {
+              [pnfName]:{
+                "uuid": "1c831fa9-28a6-4778-8c1d-80b9e769f2ed",
+                "invariantUuid": "74e13a12-dac9-4fba-b102-cd242d9e7f02",
+                "description": "AIM Transport service",
+                "name": "AIM PNF Model",
+                "version": "1.0",
+                "customizationUuid": "ce2453ef-4e8e-4108-944c-57bef89cfab0",
+                "inputs": {},
+                "commands": {},
+                "properties": {
+                  "nf_function": "AIM CE",
+                  "nf_role": "pCE",
+                  "ecomp_generated_naming": "false",
+                  "nf_type": "ROUTER"
+                },
+                "type": "PNF"
+              }
+            },
+            "vnfGroups": {}
+          }
+        },
+        "serviceInstance": {
+          "6e59c5de-f052-46fa-aa7e-2fca9d674c44": {
+            "action": "Create",
+            "isDirty": true,
+            "vnfs": {},
+            "instanceParams": [
+              {}
+            ],
+            "validationCounter": 0,
+            "existingNames": {
+              "11": "",
+              "yoav": ""
+            },
+            "existingVNFCounterMap": {
+              "91415b44-753d-494c-926a-456a9172bbb9": 1
+            },
+            "existingVnfGroupCounterMap": {},
+            "existingNetworksCounterMap": {},
+            "optionalGroupMembersMap": {},
+            "networks": {},
+            "vnfGroups": {},
+            "bulkSize": 1,
+            "instanceName": "serviceInstanceName",
+            "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
+            "subscriptionServiceType": "TYLER SILVIA",
+            "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
+            "productFamilyId": "d8a6ed93-251c-47ca-adc9-86671fd19f4c",
+            "lcpCloudRegionId": "AAIAIC25",
+            "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+            "aicZoneId": "ATL53",
+            "projectName": "WATKINS",
+            "rollbackOnFailure": "true",
+            "aicZoneName": "AAIATLTE-ATL53",
+            "owningEntityName": "WayneHolland",
+            "testApi": "VNF_API",
+            "tenantName": "USP-SIP-IC-24335-T-01",
+            "modelInfo": {
+              "modelInvariantId": "cfef8302-d90f-475f-87cc-3f49a62ef14c",
+              "modelVersionId": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
+              "modelName": "ComplexService",
+              "modelVersion": "1.0",
+              "uuid": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
+              "modelUniqueId": "6e59c5de-f052-46fa-aa7e-2fca9d674c44"
+            },
+            "isALaCarte": false,
+            "name": "ComplexService",
+            "version": "1.0",
+            "description": "ComplexService",
+            "category": "Emanuel",
+            "uuid": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
+            "invariantUuid": "cfef8302-d90f-475f-87cc-3f49a62ef14c",
+            "serviceType": "",
+            "serviceRole": "",
+            "vidNotions": {
+              "instantiationUI": "legacy",
+              "modelCategory": "other",
+              "viewEditUI": "legacy"
+            },
+            "isEcompGeneratedNaming": true,
+            "isMultiStepDesign": false
+          }
+        },
+        "lcpRegionsAndTenants": {
+          "lcpRegionList": [
+            {
+              "id": "AAIAIC25",
+              "name": "AAIAIC25 (AIC)",
+              "isPermitted": true,
+              "cloudOwner": "irma-aic"
+            },
+            {
+              "id": "hvf6",
+              "name": "hvf6 (AIC)",
+              "isPermitted": true,
+              "cloudOwner": "irma-aic"
+            }
+          ],
+          "lcpRegionsTenantsMap": {
+            "AAIAIC25": [
+              {
+                "id": "092eb9e8e4b7412e8787dd091bc58e86",
+                "name": "USP-SIP-IC-24335-T-01",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              }
+            ],
+            "hvf6": [
+              {
+                "id": "bae71557c5bb4d5aac6743a4e5f1d054",
+                "name": "AIN Web Tool-15-D-testalexandria",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "229bcdc6eaeb4ca59d55221141d01f8e",
+                "name": "AIN Web Tool-15-D-STTest2",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "1178612d2b394be4834ad77f567c0af2",
+                "name": "AIN Web Tool-15-D-SSPtestcustome",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
+                "name": "AIN Web Tool-15-D-UncheckedEcopm",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "de007636e25249238447264a988a927b",
+                "name": "AIN Web Tool-15-D-dfsdf",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "62f29b3613634ca6a3065cbe0e020c44",
+                "name": "AIN/SMS-16-D-Multiservices1",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "649289e30d3244e0b48098114d63c2aa",
+                "name": "AIN Web Tool-15-D-SSPST66",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "3f21eeea6c2c486bba31dab816c05a32",
+                "name": "AIN Web Tool-15-D-ASSPST47",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "f60ce21d3ee6427586cff0d22b03b773",
+                "name": "CESAR-100-D-sspjg67246",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "8774659e425f479895ae091bb5d46560",
+                "name": "CESAR-100-D-sspjg68359",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "624eb554b0d147c19ff8885341760481",
+                "name": "AINWebTool-15-D-iftach",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "214f55f5fc414c678059c383b03e4962",
+                "name": "CESAR-100-D-sspjg612401",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "c90666c291664841bb98e4d981ff1db5",
+                "name": "CESAR-100-D-sspjg621340",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
+                "name": "sspjg621351cloned",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "b386b768a3f24c8e953abbe0b3488c02",
+                "name": "AINWebTool-15-D-eteancomp",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "dc6c4dbfd225474e9deaadd34968646c",
+                "name": "AINWebTool-15-T-SPFET",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "02cb5030e9914aa4be120bd9ed1e19eb",
+                "name": "AINWebTool-15-X-eeweww",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "f2f3830e4c984d45bcd00e1a04158a79",
+                "name": "CESAR-100-D-spjg61909",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "05b91bd5137f4929878edd965755c06d",
+                "name": "CESAR-100-D-sspjg621512cloned",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "7002fbe8482d4a989ddf445b1ce336e0",
+                "name": "AINWebTool-15-X-vdr",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "4008522be43741dcb1f5422022a2aa0b",
+                "name": "AINWebTool-15-D-ssasa",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "f44e2e96a1b6476abfda2fa407b00169",
+                "name": "AINWebTool-15-D-PFNPT",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "b69a52bec8a84669a37a1e8b72708be7",
+                "name": "AINWebTool-15-X-vdre",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "fac7d9fd56154caeb9332202dcf2969f",
+                "name": "AINWebTool-15-X-NONPODECOMP",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "2d34d8396e194eb49969fd61ffbff961",
+                "name": "DN5242-Nov16-T5",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "cb42a77ff45b48a8b8deb83bb64acc74",
+                "name": "ro-T11",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "fa45ca53c80b492fa8be5477cd84fc2b",
+                "name": "ro-T112",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "4914ab0ab3a743e58f0eefdacc1dde77",
+                "name": "DN5242-Nov21-T1",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "cbb99fe4ada84631b7baf046b6fd2044",
+                "name": "DN5242-Nov16-T3",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              }
+            ]
+          }
+        },
+        "subscribers": [
+          {
+            "id": "ERICA5779-Subscriber-2",
+            "name": "ERICA5779-Subscriber-2",
+            "isPermitted": false
+          },
+          {
+            "id": "ERICA5779-Subscriber-3",
+            "name": "ERICA5779-Subscriber-3",
+            "isPermitted": false
+          },
+          {
+            "id": "ERICA5779-Subscriber-4",
+            "name": "ERICA5779-Subscriber-5",
+            "isPermitted": false
+          },
+          {
+            "id": "ERICA5779-TestSub-PWT-101",
+            "name": "ERICA5779-TestSub-PWT-101",
+            "isPermitted": false
+          },
+          {
+            "id": "ERICA5779-TestSub-PWT-102",
+            "name": "ERICA5779-TestSub-PWT-102",
+            "isPermitted": false
+          },
+          {
+            "id": "ERICA5779-TestSub-PWT-103",
+            "name": "ERICA5779-TestSub-PWT-103",
+            "isPermitted": false
+          },
+          {
+            "id": "31739f3e-526b-11e6-beb8-9e71128cae77",
+            "name": "CRAIG/ROBERTS",
+            "isPermitted": false
+          },
+          {
+            "id": "DHV1707-TestSubscriber-2",
+            "name": "DALE BRIDGES",
+            "isPermitted": false
+          },
+          {
+            "id": "jimmy-example",
+            "name": "JimmyExampleCust-20161102",
+            "isPermitted": false
+          },
+          {
+            "id": "jimmy-example2",
+            "name": "JimmyExampleCust-20161103",
+            "isPermitted": false
+          },
+          {
+            "id": "CAR_2020_ER",
+            "name": "CAR_2020_ER",
+            "isPermitted": true
+          },
+          {
+            "id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+            "name": "Emanuel",
+            "isPermitted": true
+          },
+          {
+            "id": "21014aa2-526b-11e6-beb8-9e71128cae77",
+            "name": "JULIO ERICKSON",
+            "isPermitted": false
+          },
+          {
+            "id": "DHV1707-TestSubscriber-1",
+            "name": "LLOYD BRIDGES",
+            "isPermitted": false
+          },
+          {
+            "id": "e433710f-9217-458d-a79d-1c7aff376d89",
+            "name": "SILVIA ROBBINS",
+            "isPermitted": true
+          },
+          {
+            "id": "global-customer-id",
+            "name": "global-customer-id",
+            "isPermitted": true
+          }
+        ],
+        "productFamilies": null,
+        "serviceTypes": {
+          "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb": [
+            {
+              "id": "3",
+              "name": "Emanuel",
+              "isPermitted": false
+            },
+            {
+              "id": "7",
+              "name": "Kennedy",
+              "isPermitted": false
+            },
+            {
+              "id": "6",
+              "name": "vJamie",
+              "isPermitted": false
+            },
+            {
+              "id": "0",
+              "name": "vWINIFRED",
+              "isPermitted": false
+            },
+            {
+              "id": "1",
+              "name": "vMNS",
+              "isPermitted": false
+            },
+            {
+              "id": "4",
+              "name": "vMOG",
+              "isPermitted": false
+            },
+            {
+              "id": "5",
+              "name": "vEsmeralda",
+              "isPermitted": false
+            },
+            {
+              "id": "2",
+              "name": "vVoiceMail",
+              "isPermitted": false
+            }
+          ],
+          "e433710f-9217-458d-a79d-1c7aff376d89": [
+            {
+              "id": "17",
+              "name": "JOHANNA_SANTOS",
+              "isPermitted": false
+            },
+            {
+              "id": "16",
+              "name": "LINDSEY",
+              "isPermitted": false
+            },
+            {
+              "id": "2",
+              "name": "Emanuel",
+              "isPermitted": false
+            },
+            {
+              "id": "5",
+              "name": "Kennedy",
+              "isPermitted": false
+            },
+            {
+              "id": "14",
+              "name": "SSD",
+              "isPermitted": false
+            },
+            {
+              "id": "1",
+              "name": "TYLER SILVIA",
+              "isPermitted": true
+            },
+            {
+              "id": "12",
+              "name": "VPMS",
+              "isPermitted": false
+            },
+            {
+              "id": "3",
+              "name": "vJamie",
+              "isPermitted": false
+            },
+            {
+              "id": "0",
+              "name": "vRichardson",
+              "isPermitted": false
+            },
+            {
+              "id": "18",
+              "name": "vCarroll",
+              "isPermitted": false
+            },
+            {
+              "id": "9",
+              "name": "vFLORENCE",
+              "isPermitted": false
+            },
+            {
+              "id": "13",
+              "name": "vWINIFRED",
+              "isPermitted": false
+            },
+            {
+              "id": "10",
+              "name": "vMNS",
+              "isPermitted": false
+            },
+            {
+              "id": "15",
+              "name": "vMOG",
+              "isPermitted": false
+            },
+            {
+              "id": "8",
+              "name": "vOTA",
+              "isPermitted": false
+            },
+            {
+              "id": "11",
+              "name": "vEsmeralda",
+              "isPermitted": false
+            },
+            {
+              "id": "6",
+              "name": "vPorfirio",
+              "isPermitted": false
+            },
+            {
+              "id": "7",
+              "name": "vVM",
+              "isPermitted": false
+            },
+            {
+              "id": "4",
+              "name": "vVoiceMail",
+              "isPermitted": false
+            }
+          ]
+        },
+        "aicZones": [
+          {
+            "id": "ATL53",
+            "name": "AAIATLTE-ATL53"
+          },
+          {
+            "id": "ABC15",
+            "name": "AAITESAN-ABC15"
+          },
+          {
+            "id": "TES36",
+            "name": "ABCEETES-TES36"
+          },
+          {
+            "id": "ATL54",
+            "name": "AICFTAAI-ATL54"
+          },
+          {
+            "id": "ATL43",
+            "name": "AICLOCID-ATL43"
+          },
+          {
+            "id": "AMD15",
+            "name": "AMDFAA01-AMD15"
+          },
+          {
+            "id": "AMF11",
+            "name": "AMDOCS01-AMF11"
+          },
+          {
+            "id": "RCT1",
+            "name": "AMSTERNL-RCT1"
+          },
+          {
+            "id": "AMS1",
+            "name": "AMSTNLBW-AMS1"
+          },
+          {
+            "id": "HJH1",
+            "name": "AOEEQQQD-HJH1"
+          },
+          {
+            "id": "HJE1",
+            "name": "AOEEWWWD-HJE1"
+          },
+          {
+            "id": "MCS1",
+            "name": "ASACMAMS-MCS1"
+          },
+          {
+            "id": "AUG1",
+            "name": "ASDFGHJK-AUG1"
+          },
+          {
+            "id": "LUC1",
+            "name": "ATLDFGYC-LUC1"
+          },
+          {
+            "id": "ATL1",
+            "name": "ATLNGAMA-ATL1"
+          },
+          {
+            "id": "ATL2",
+            "name": "ATLNGANW-ATL2"
+          },
+          {
+            "id": "HPO1",
+            "name": "ATLNGAUP-HPO1"
+          },
+          {
+            "id": "ANI1",
+            "name": "ATLNGTRE-ANI1"
+          },
+          {
+            "id": "ATL44",
+            "name": "ATLSANAB-ATL44"
+          },
+          {
+            "id": "ATL56",
+            "name": "ATLSANAC-ATL56"
+          },
+          {
+            "id": "ABC11",
+            "name": "ATLSANAI-ABC11"
+          },
+          {
+            "id": "ATL34",
+            "name": "ATLSANAI-ATL34"
+          },
+          {
+            "id": "ATL63",
+            "name": "ATLSANEW-ATL63"
+          },
+          {
+            "id": "ABC12",
+            "name": "ATLSECIA-ABC12"
+          },
+          {
+            "id": "AMD18",
+            "name": "AUDIMA01-AMD18"
+          },
+          {
+            "id": "AVT1",
+            "name": "AVTRFLHD-AVT1"
+          },
+          {
+            "id": "KIT1",
+            "name": "BHYJFGLN-KIT1"
+          },
+          {
+            "id": "BHY17",
+            "name": "BHYTFRF3-BHY17"
+          },
+          {
+            "id": "RTW5",
+            "name": "BHYTFRY4-RTW5"
+          },
+          {
+            "id": "RTZ4",
+            "name": "BHYTFRZ6-RTZ4"
+          },
+          {
+            "id": "RTD2",
+            "name": "BHYTFRk4-RTD2"
+          },
+          {
+            "id": "BNA1",
+            "name": "BNARAGBK-BNA1"
+          },
+          {
+            "id": "VEL1",
+            "name": "BNMLKUIK-VEL1"
+          },
+          {
+            "id": "BOT1",
+            "name": "BOTHWAKY-BOT1"
+          },
+          {
+            "id": "CAL33",
+            "name": "CALIFORN-CAL33"
+          },
+          {
+            "id": "ATL84",
+            "name": "CANTTCOC-ATL84"
+          },
+          {
+            "id": "HSD1",
+            "name": "CHASKCDS-HSD1"
+          },
+          {
+            "id": "CHI1",
+            "name": "CHILLIWE-CHI1"
+          },
+          {
+            "id": "XCP12",
+            "name": "CHKGH123-XCP12"
+          },
+          {
+            "id": "JNL1",
+            "name": "CJALSDAC-JNL1"
+          },
+          {
+            "id": "KJN1",
+            "name": "CKALDKSA-KJN1"
+          },
+          {
+            "id": "CLG1",
+            "name": "CLGRABAD-CLG1"
+          },
+          {
+            "id": "CKL1",
+            "name": "CLKSKCKK-CKL1"
+          },
+          {
+            "id": "ATL66",
+            "name": "CLLIAAII-ATL66"
+          },
+          {
+            "id": "CQK1",
+            "name": "CQKSCAKK-CQK1"
+          },
+          {
+            "id": "CWY1",
+            "name": "CWYMOWBS-CWY1"
+          },
+          {
+            "id": "DKJ1",
+            "name": "DKJSJDKA-DKJ1"
+          },
+          {
+            "id": "DSF45",
+            "name": "DSFBG123-DSF45"
+          },
+          {
+            "id": "DSL12",
+            "name": "DSLFK242-DSL12"
+          },
+          {
+            "id": "FDE55",
+            "name": "FDERT555-FDE55"
+          },
+          {
+            "id": "VEN2",
+            "name": "FGHJUHIL-VEN2"
+          },
+          {
+            "id": "ATL64",
+            "name": "FORLOAAJ-ATL64"
+          },
+          {
+            "id": "GNV1",
+            "name": "GNVLSCTL-GNV1"
+          },
+          {
+            "id": "SAN22",
+            "name": "GNVLSCTL-SAN22"
+          },
+          {
+            "id": "KAP1",
+            "name": "HIOUYTRQ-KAP1"
+          },
+          {
+            "id": "LIS1",
+            "name": "HOSTPROF-LIS1"
+          },
+          {
+            "id": "HRG1",
+            "name": "HRGHRGGS-HRG1"
+          },
+          {
+            "id": "HST25",
+            "name": "HSTNTX01-HST25"
+          },
+          {
+            "id": "STN27",
+            "name": "HSTNTX01-STN27"
+          },
+          {
+            "id": "HST70",
+            "name": "HSTNTX70-HST70"
+          },
+          {
+            "id": "KOR1",
+            "name": "HYFLNBVT-KOR1"
+          },
+          {
+            "id": "RAD10",
+            "name": "INDIPUNE-RAD10"
+          },
+          {
+            "id": "REL1",
+            "name": "INGERFGT-REL1"
+          },
+          {
+            "id": "JAD1",
+            "name": "JADECLLI-JAD1"
+          },
+          {
+            "id": "HKA1",
+            "name": "JAKHLASS-HKA1"
+          },
+          {
+            "id": "JCS1",
+            "name": "JCSJSCJS-JCS1"
+          },
+          {
+            "id": "JCV1",
+            "name": "JCVLFLBW-JCV1"
+          },
+          {
+            "id": "KGM2",
+            "name": "KGMTNC20-KGM2"
+          },
+          {
+            "id": "KJF12",
+            "name": "KJFDH123-KJF12"
+          },
+          {
+            "id": "JGS1",
+            "name": "KSJKKKKK-JGS1"
+          },
+          {
+            "id": "LAG1",
+            "name": "LARGIZON-LAG1"
+          },
+          {
+            "id": "LAG1a",
+            "name": "LARGIZON-LAG1a"
+          },
+          {
+            "id": "LAG45",
+            "name": "LARGIZON-LAG1a"
+          },
+          {
+            "id": "LAG1b",
+            "name": "LARGIZON-LAG1b"
+          },
+          {
+            "id": "WAN1",
+            "name": "LEIWANGW-WAN1"
+          },
+          {
+            "id": "DSA1",
+            "name": "LKJHGFDS-DSA1"
+          },
+          {
+            "id": "LON1",
+            "name": "LONEENCO-LON1"
+          },
+          {
+            "id": "SITE",
+            "name": "LONEENCO-SITE"
+          },
+          {
+            "id": "ZXL1",
+            "name": "LWLWCANN-ZXL1"
+          },
+          {
+            "id": "hvf20",
+            "name": "MDTWNJ21-hvf20"
+          },
+          {
+            "id": "hvf32",
+            "name": "MDTWNJ21-hvf32"
+          },
+          {
+            "id": "AMD13",
+            "name": "MEMATLAN-AMD13"
+          },
+          {
+            "id": "MIC54",
+            "name": "MICHIGAN-MIC54"
+          },
+          {
+            "id": "MAR1",
+            "name": "MNBVCXZM-MAR1"
+          },
+          {
+            "id": "NCA1",
+            "name": "NCANCANN-NCA1"
+          },
+          {
+            "id": "NFT1",
+            "name": "NFTJSSSS-NFT1"
+          },
+          {
+            "id": "GAR1",
+            "name": "NGFVSJKO-GAR1"
+          },
+          {
+            "id": "NYC1",
+            "name": "NYCMNY54-NYC1"
+          },
+          {
+            "id": "OKC1",
+            "name": "OKCBOK55-OKC1"
+          },
+          {
+            "id": "OLG1",
+            "name": "OLHOLHOL-OLG1"
+          },
+          {
+            "id": "OLK1",
+            "name": "OLKOLKLS-OLK1"
+          },
+          {
+            "id": "NIR1",
+            "name": "ORFLMANA-NIR1"
+          },
+          {
+            "id": "JAN1",
+            "name": "ORFLMATT-JAN1"
+          },
+          {
+            "id": "ORL1",
+            "name": "ORLDFLMA-ORL1"
+          },
+          {
+            "id": "PAR1",
+            "name": "PARSFRCG-PAR1"
+          },
+          {
+            "id": "PBL1",
+            "name": "PBLAPBAI-PBL1"
+          },
+          {
+            "id": "mac10",
+            "name": "PKGTESTF-mac10"
+          },
+          {
+            "id": "mac20",
+            "name": "PKGTESTF-mac20"
+          },
+          {
+            "id": "TIR2",
+            "name": "PLKINHYI-TIR2"
+          },
+          {
+            "id": "IBB1",
+            "name": "PLMKOIJU-IBB1"
+          },
+          {
+            "id": "COM1",
+            "name": "PLMKOPIU-COM1"
+          },
+          {
+            "id": "POI1",
+            "name": "PLMNJKIU-POI1"
+          },
+          {
+            "id": "PLT1",
+            "name": "PLTNCA60-PLT1"
+          },
+          {
+            "id": "POI22",
+            "name": "POIUY123-POI22"
+          },
+          {
+            "id": "DCC1",
+            "name": "POIUYTGH-DCC1"
+          },
+          {
+            "id": "DCC1a",
+            "name": "POIUYTGH-DCC1a"
+          },
+          {
+            "id": "DCC1b",
+            "name": "POIUYTGH-DCC1b"
+          },
+          {
+            "id": "DCC2",
+            "name": "POIUYTGH-DCC2"
+          },
+          {
+            "id": "DCC3",
+            "name": "POIUYTGH-DCC3"
+          },
+          {
+            "id": "IAA1",
+            "name": "QAZXSWED-IAA1"
+          },
+          {
+            "id": "QWE1",
+            "name": "QWECLLI1-QWE1"
+          },
+          {
+            "id": "NUM1",
+            "name": "QWERTYUI-NUM1"
+          },
+          {
+            "id": "RAD1",
+            "name": "RADICAL1-RAD1"
+          },
+          {
+            "id": "RJN1",
+            "name": "RJNRBZAW-RJN1"
+          },
+          {
+            "id": "SAA13",
+            "name": "SAIT1AA9-SAA13"
+          },
+          {
+            "id": "SAA14",
+            "name": "SAIT1AA9-SAA14"
+          },
+          {
+            "id": "SDD81",
+            "name": "SAIT1DD6-SDD81"
+          },
+          {
+            "id": "SDD82",
+            "name": "SAIT1DD9-SDD82"
+          },
+          {
+            "id": "SAA11",
+            "name": "SAIT9AA2-SAA11"
+          },
+          {
+            "id": "SAA80",
+            "name": "SAIT9AA3-SAA80"
+          },
+          {
+            "id": "SAA12",
+            "name": "SAIT9AF8-SAA12"
+          },
+          {
+            "id": "SCC80",
+            "name": "SAIT9CC3-SCC80"
+          },
+          {
+            "id": "ATL75",
+            "name": "SANAAIRE-ATL75"
+          },
+          {
+            "id": "ICC1",
+            "name": "SANJITAT-ICC1"
+          },
+          {
+            "id": "SCK1",
+            "name": "SCKSCKSK-SCK1"
+          },
+          {
+            "id": "EHH78",
+            "name": "SDCSHHH5-EHH78"
+          },
+          {
+            "id": "SAA78",
+            "name": "SDCTAAA1-SAA78"
+          },
+          {
+            "id": "SAX78",
+            "name": "SDCTAXG1-SAX78"
+          },
+          {
+            "id": "SBX78",
+            "name": "SDCTBXG1-SBX78"
+          },
+          {
+            "id": "SEE78",
+            "name": "SDCTEEE4-SEE78"
+          },
+          {
+            "id": "SGG78",
+            "name": "SDCTGGG1-SGG78"
+          },
+          {
+            "id": "SXB78",
+            "name": "SDCTGXB1-SXB78"
+          },
+          {
+            "id": "SJJ78",
+            "name": "SDCTJJJ1-SJJ78"
+          },
+          {
+            "id": "SKK78",
+            "name": "SDCTKKK1-SKK78"
+          },
+          {
+            "id": "SLF78",
+            "name": "SDCTLFN1-SLF78"
+          },
+          {
+            "id": "SLL78",
+            "name": "SDCTLLL1-SLL78"
+          },
+          {
+            "id": "MAD11",
+            "name": "SDFQWGKL-MAD11"
+          },
+          {
+            "id": "HGD1",
+            "name": "SDFQWHGD-HGD1"
+          },
+          {
+            "id": "SBB78",
+            "name": "SDIT1BBB-SBB78"
+          },
+          {
+            "id": "SDG78",
+            "name": "SDIT1BDG-SDG78"
+          },
+          {
+            "id": "SBU78",
+            "name": "SDIT1BUB-SBU78"
+          },
+          {
+            "id": "SHH78",
+            "name": "SDIT1HHH-SHH78"
+          },
+          {
+            "id": "SJU78",
+            "name": "SDIT1JUB-SJU78"
+          },
+          {
+            "id": "SNA1",
+            "name": "SNANTXCA-SNA1"
+          },
+          {
+            "id": "SAM1",
+            "name": "SNDGCA64-SAN1"
+          },
+          {
+            "id": "SNG1",
+            "name": "SNGPSIAU-SNG1"
+          },
+          {
+            "id": "SSA56",
+            "name": "SSIT2AA7-SSA56"
+          },
+          {
+            "id": "STG1",
+            "name": "STTGGE62-STG1"
+          },
+          {
+            "id": "STT1",
+            "name": "STTLWA02-STT1"
+          },
+          {
+            "id": "SYD1",
+            "name": "SYDNAUBV-SYD1"
+          },
+          {
+            "id": "ATL99",
+            "name": "TEESTAAI-ATL43"
+          },
+          {
+            "id": "ATL98",
+            "name": "TEESTAAI-ATL43"
+          },
+          {
+            "id": "ATL76",
+            "name": "TELEPAAI-ATL76"
+          },
+          {
+            "id": "ABC14",
+            "name": "TESAAISA-ABC14"
+          },
+          {
+            "id": "TAT33",
+            "name": "TESAAISA-TAT33"
+          },
+          {
+            "id": "TAT34",
+            "name": "TESAAISB-TAT34"
+          },
+          {
+            "id": "TAT37",
+            "name": "TESAAISD-TAT37"
+          },
+          {
+            "id": "ATL62",
+            "name": "TESSASCH-ATL62"
+          },
+          {
+            "id": "TLP1",
+            "name": "TLPNXM18-TLP1"
+          },
+          {
+            "id": "SAN13",
+            "name": "TOKYJPFA-SAN13"
+          },
+          {
+            "id": "TOK1",
+            "name": "TOKYJPFA-TOK1"
+          },
+          {
+            "id": "TOL1",
+            "name": "TOLDOH21-TOL1"
+          },
+          {
+            "id": "TOR1",
+            "name": "TOROONXN-TOR1"
+          },
+          {
+            "id": "TOY1",
+            "name": "TORYONNZ-TOY1"
+          },
+          {
+            "id": "ATL35",
+            "name": "TTESSAAI-ATL35"
+          },
+          {
+            "id": "TUF1",
+            "name": "TUFCLLI1-TUF1"
+          },
+          {
+            "id": "SAI1",
+            "name": "UBEKQLPD-SAI1"
+          },
+          {
+            "id": "UUU4",
+            "name": "UUUAAAUU-UUU4"
+          },
+          {
+            "id": "YYY1",
+            "name": "UUUAIAAI-YYY1"
+          },
+          {
+            "id": "BAN1",
+            "name": "VSDKYUTP-BAN1"
+          },
+          {
+            "id": "WAS1",
+            "name": "WASHDCSW-WAS1"
+          },
+          {
+            "id": "APP1",
+            "name": "WBHGTYUI-APP1"
+          },
+          {
+            "id": "SUL2",
+            "name": "WERTYUJK-SUL2"
+          },
+          {
+            "id": "DEF2",
+            "name": "WSBHGTYL-DEF2"
+          },
+          {
+            "id": "DHA12",
+            "name": "WSXEDECF-DHA12"
+          },
+          {
+            "id": "MNT11",
+            "name": "WSXEFBTH-MNT11"
+          },
+          {
+            "id": "RAJ1",
+            "name": "YGBIJNLQ-RAJ1"
+          },
+          {
+            "id": "JAG1",
+            "name": "YUDFJULP-JAG1"
+          },
+          {
+            "id": "ZEN1",
+            "name": "ZENCLLI1-ZEN1"
+          },
+          {
+            "id": "ZOG1",
+            "name": "ZOGASTRO-ZOG1"
+          },
+          {
+            "id": "SDE1",
+            "name": "ZXCVBNMA-SDE1"
+          },
+          {
+            "id": "SIP1",
+            "name": "ZXCVBNMK-SIP1"
+          },
+          {
+            "id": "JUL1",
+            "name": "ZXCVBNMM-JUL1"
+          },
+          {
+            "id": "ERT1",
+            "name": "ertclli1-ERT1"
+          },
+          {
+            "id": "IOP1",
+            "name": "iopclli1-IOP1"
+          },
+          {
+            "id": "OPA1",
+            "name": "opaclli1-OPA1"
+          },
+          {
+            "id": "RAI1",
+            "name": "poiuytre-RAI1"
+          },
+          {
+            "id": "PUR1",
+            "name": "purelyde-PUR1"
+          },
+          {
+            "id": "RTY1",
+            "name": "rtyclli1-RTY1"
+          },
+          {
+            "id": "SDF1",
+            "name": "sdfclli1-SDF1"
+          },
+          {
+            "id": "SSW56",
+            "name": "ss8126GT-SSW56"
+          },
+          {
+            "id": "UIO1",
+            "name": "uioclli1-UIO1"
+          }
+        ],
+        "categoryParameters": {
+          "owningEntityList": [
+            {
+              "id": "aaa1",
+              "name": "aaa1"
+            },
+            {
+              "id": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
+              "name": "WayneHolland"
+            },
+            {
+              "id": "Melissa",
+              "name": "Melissa"
+            }
+          ],
+          "projectList": [
+            {
+              "id": "WATKINS",
+              "name": "WATKINS"
+            },
+            {
+              "id": "x1",
+              "name": "x1"
+            },
+            {
+              "id": "yyy1",
+              "name": "yyy1"
+            }
+          ],
+          "lineOfBusinessList": [
+            {
+              "id": "ONAP",
+              "name": "ONAP"
+            },
+            {
+              "id": "zzz1",
+              "name": "zzz1"
+            }
+          ],
+          "platformList": [
+            {
+              "id": "platform",
+              "name": "platform"
+            },
+            {
+              "id": "xxx1",
+              "name": "xxx1"
+            }
+          ]
+        },
+        "type": "UPDATE_LCP_REGIONS_AND_TENANTS"
+      },
+      "global": {
+        "name": null,
+        "flags": {
+          "FLAG_1810_IDENTIFY_SERVICE_FOR_NEW_UI": false,
+          "FLAG_1902_VNF_GROUPING": true,
+          "FLAG_1906_COMPONENT_INFO": true,
+          "FLAG_SHOW_ASSIGNMENTS": true,
+          "FLAG_A_LA_CARTE_AUDIT_INFO": true,
+          "FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST": true,
+          "FLAG_SHOW_VERIFY_SERVICE": true,
+          "FLAG_1902_NEW_VIEW_EDIT": true,
+          "EMPTY_DRAWING_BOARD_TEST": false,
+          "FLAG_ADD_MSO_TESTAPI_FIELD": true,
+          "FLAG_1906_INSTANTIATION_API_USER_VALIDATION": true,
+          "FLAG_EXP_CREATE_RESOURCES_IN_PARALLEL": false,
+          "FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS": true,
+          "FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
+          "FLAG_DEFAULT_VNF": true,
+          "FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE": true,
+          "FLAG_ASYNC_ALACARTE_VFMODULE": true,
+          "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
+          "FLAG_ASYNC_ALACARTE_VNF": true,
+          "FLAG_1810_AAI_LOCAL_CACHE": true,
+          "FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER": false,
+          "FLAG_SERVICE_MODEL_CACHE": true,
+          "FLAG_1902_RETRY_JOB": true,
+          "FLAG_EXP_ANY_ALACARTE_NEW_INSTANTIATION_UI": true,
+          "CREATE_INSTANCE_TEST": false,
+          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": true,
+          "FLAG_1906_AAI_SUB_DETAILS_REDUCE_DEPTH": true,
+          "FLAG_VF_MODULE_RESUME_STATUS_CREATE": true,
+          "FLAG_SUPPLEMENTARY_FILE": true,
+          "FLAG_5G_IN_NEW_INSTANTIATION_UI": true,
+          "FLAG_RESTRICTED_SELECT": false,
+          "FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY": true
+        },
+        "drawingBoardStatus": "CREATE",
+        "type": "UPDATE_DRAWING_BOARD_STATUS"
+      }
+    }
+  }
+
+
+  function  reduxWithFourPnfs(serviceModelId: string, pnfName: string) {
+    return {
+      "service": {
+        "serviceHierarchy": {
+          [serviceModelId]: {
+            // "12550cd7-7708-4f53-a09e-41d3d6327ebc": {
+            "service": {
+              "uuid": "12550cd7-7708-4f53-a09e-41d3d6327ebc",
+              "invariantUuid": "561faa57-7bbb-40ec-a81c-c0d4133e98d4",
+              "name": "AIM Transport SVC_ym161f",
+              "version": "1.0",
+              "toscaModelURL": null,
+              "category": "Network L1-3",
+              "serviceType": "TRANSPORT",
+              "serviceRole": "AIM",
+              "description": "AIM Transport service",
+              "serviceEcompNaming": "true",
+              "instantiationType": "Macro",
+              "inputs": {},
+              "vidNotions": {
+                "instantiationUI": "transportService",
+                "modelCategory": "Transport",
+                "viewEditUI": "legacy",
+                "instantiationType": "Macro"
+              }
+            },
+            "vnfs": {},
+            "networks": {},
+            "collectionResources": {},
+            "configurations": {},
+            "fabricConfigurations": {},
+            "serviceProxies": {},
+            "vfModules": {},
+            "volumeGroups": {},
+            "pnfs": {
+              [pnfName]: {
+                "uuid": "1c831fa9-28a6-4778-8c1d-80b9e769f2ed",
+                "invariantUuid": "74e13a12-dac9-4fba-b102-cd242d9e7f02",
+                "description": "AIM Transport service",
+                "name": "AIM PNF Model",
+                "version": "1.0",
+                "customizationUuid": "ce2453ef-4e8e-4108-944c-57bef89cfab0",
+                "inputs": {},
+                "commands": {},
+                "properties": {
+                  "nf_function": "AIM CE",
+                  "nf_role": "pCE",
+                  "ecomp_generated_naming": "false",
+                  "nf_type": "ROUTER"
+                },
+                "type": "PNF"
+              },
+            },
+            "vnfGroups": {},
+            "vrfs": {}
+          }
+        },
+        "serviceInstance": {
+          "12550cd7-7708-4f53-a09e-41d3d6327ebc": {
+            "action": "Create",
+            "isDirty": false,
+            "vnfs": {},
+            "vrfs": {},
+            "instanceParams": [
+              {}
+            ],
+            "validationCounter": 0,
+            "existingNames": {},
+            "existingVNFCounterMap": {},
+            "existingVRFCounterMap": {},
+            "existingVnfGroupCounterMap": {},
+            "existingNetworksCounterMap": {},
+            "optionalGroupMembersMap": {},
+            "networks": {},
+            "vnfGroups": {},
+            "bulkSize": 1,
+            "instanceName": null,
+            "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
+            "subscriptionServiceType": "TYLER SILVIA",
+            "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
+            "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
+            "lcpCloudRegionId": null,
+            "aicZoneId": null,
+            "projectName": "WATKINS",
+            "rollbackOnFailure": "true",
+            "aicZoneName": null,
+            "owningEntityName": "WayneHolland",
+            "testApi": "VNF_API",
+            "tenantName": null,
+            "modelInfo": {
+              "modelInvariantId": "561faa57-7bbb-40ec-a81c-c0d4133e98d4",
+              "modelVersionId": "12550cd7-7708-4f53-a09e-41d3d6327ebc",
+              "modelName": "AIM Transport SVC_ym161f",
+              "modelVersion": "1.0",
+              "uuid": "12550cd7-7708-4f53-a09e-41d3d6327ebc",
+              "modelUniqueId": "12550cd7-7708-4f53-a09e-41d3d6327ebc"
+            },
+            "isALaCarte": false,
+            "name": "AIM Transport SVC_ym161f",
+            "version": "1.0",
+            "description": "AIM Transport service",
+            "category": "Network L1-3",
+            "uuid": "12550cd7-7708-4f53-a09e-41d3d6327ebc",
+            "invariantUuid": "561faa57-7bbb-40ec-a81c-c0d4133e98d4",
+            "serviceType": "TRANSPORT",
+            "serviceRole": "AIM",
+            "vidNotions": {
+              "instantiationUI": "transportService",
+              "modelCategory": "Transport",
+              "viewEditUI": "legacy",
+              "instantiationType": "Macro"
+            },
+            "isEcompGeneratedNaming": true,
+            "isMultiStepDesign": false
+          }
+        },
+        "lcpRegionsAndTenants": {
+          "lcpRegionList": [
+            {
+              "id": "AAIAIC25",
+              "name": "AAIAIC25 (AIC)",
+              "isPermitted": true,
+              "cloudOwner": "irma-aic"
+            },
+            {
+              "id": "hvf6",
+              "name": "hvf6 (AIC)",
+              "isPermitted": true,
+              "cloudOwner": "irma-aic"
+            }
+          ],
+          "lcpRegionsTenantsMap": {
+            "AAIAIC25": [
+              {
+                "id": "092eb9e8e4b7412e8787dd091bc58e86",
+                "name": "USP-SIP-IC-24335-T-01",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              }
+            ],
+            "hvf6": [
+              {
+                "id": "bae71557c5bb4d5aac6743a4e5f1d054",
+                "name": "AIN Web Tool-15-D-testalexandria",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "229bcdc6eaeb4ca59d55221141d01f8e",
+                "name": "AIN Web Tool-15-D-STTest2",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "1178612d2b394be4834ad77f567c0af2",
+                "name": "AIN Web Tool-15-D-SSPtestcustome",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
+                "name": "AIN Web Tool-15-D-UncheckedEcopm",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "de007636e25249238447264a988a927b",
+                "name": "AIN Web Tool-15-D-dfsdf",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "62f29b3613634ca6a3065cbe0e020c44",
+                "name": "AIN/SMS-16-D-Multiservices1",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "649289e30d3244e0b48098114d63c2aa",
+                "name": "AIN Web Tool-15-D-SSPST66",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "3f21eeea6c2c486bba31dab816c05a32",
+                "name": "AIN Web Tool-15-D-ASSPST47",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "f60ce21d3ee6427586cff0d22b03b773",
+                "name": "CESAR-100-D-sspjg67246",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "8774659e425f479895ae091bb5d46560",
+                "name": "CESAR-100-D-sspjg68359",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "624eb554b0d147c19ff8885341760481",
+                "name": "AINWebTool-15-D-iftach",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "214f55f5fc414c678059c383b03e4962",
+                "name": "CESAR-100-D-sspjg612401",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "c90666c291664841bb98e4d981ff1db5",
+                "name": "CESAR-100-D-sspjg621340",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
+                "name": "sspjg621351cloned",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "b386b768a3f24c8e953abbe0b3488c02",
+                "name": "AINWebTool-15-D-eteancomp",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "dc6c4dbfd225474e9deaadd34968646c",
+                "name": "AINWebTool-15-T-SPFET",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "02cb5030e9914aa4be120bd9ed1e19eb",
+                "name": "AINWebTool-15-X-eeweww",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "f2f3830e4c984d45bcd00e1a04158a79",
+                "name": "CESAR-100-D-spjg61909",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "05b91bd5137f4929878edd965755c06d",
+                "name": "CESAR-100-D-sspjg621512cloned",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "7002fbe8482d4a989ddf445b1ce336e0",
+                "name": "AINWebTool-15-X-vdr",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "4008522be43741dcb1f5422022a2aa0b",
+                "name": "AINWebTool-15-D-ssasa",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "f44e2e96a1b6476abfda2fa407b00169",
+                "name": "AINWebTool-15-D-PFNPT",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "b69a52bec8a84669a37a1e8b72708be7",
+                "name": "AINWebTool-15-X-vdre",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "fac7d9fd56154caeb9332202dcf2969f",
+                "name": "AINWebTool-15-X-NONPODECOMP",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "2d34d8396e194eb49969fd61ffbff961",
+                "name": "DN5242-Nov16-T5",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "cb42a77ff45b48a8b8deb83bb64acc74",
+                "name": "ro-T11",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "fa45ca53c80b492fa8be5477cd84fc2b",
+                "name": "ro-T112",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "4914ab0ab3a743e58f0eefdacc1dde77",
+                "name": "DN5242-Nov21-T1",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "cbb99fe4ada84631b7baf046b6fd2044",
+                "name": "DN5242-Nov16-T3",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              }
+            ]
+          }
+        },
+        "subscribers": [
+          {
+            "id": "ERICA5779-Subscriber-2",
+            "name": "ERICA5779-Subscriber-2",
+            "isPermitted": false
+          },
+          {
+            "id": "ERICA5779-Subscriber-3",
+            "name": "ERICA5779-Subscriber-3",
+            "isPermitted": false
+          },
+          {
+            "id": "ERICA5779-Subscriber-4",
+            "name": "ERICA5779-Subscriber-5",
+            "isPermitted": false
+          },
+          {
+            "id": "ERICA5779-TestSub-PWT-101",
+            "name": "ERICA5779-TestSub-PWT-101",
+            "isPermitted": false
+          },
+          {
+            "id": "ERICA5779-TestSub-PWT-102",
+            "name": "ERICA5779-TestSub-PWT-102",
+            "isPermitted": false
+          },
+          {
+            "id": "ERICA5779-TestSub-PWT-103",
+            "name": "ERICA5779-TestSub-PWT-103",
+            "isPermitted": false
+          },
+          {
+            "id": "31739f3e-526b-11e6-beb8-9e71128cae77",
+            "name": "CRAIG/ROBERTS",
+            "isPermitted": false
+          },
+          {
+            "id": "DHV1707-TestSubscriber-2",
+            "name": "DALE BRIDGES",
+            "isPermitted": false
+          },
+          {
+            "id": "jimmy-example",
+            "name": "JimmyExampleCust-20161102",
+            "isPermitted": false
+          },
+          {
+            "id": "jimmy-example2",
+            "name": "JimmyExampleCust-20161103",
+            "isPermitted": false
+          },
+          {
+            "id": "CAR_2020_ER",
+            "name": "CAR_2020_ER",
+            "isPermitted": true
+          },
+          {
+            "id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+            "name": "Emanuel",
+            "isPermitted": true
+          },
+          {
+            "id": "21014aa2-526b-11e6-beb8-9e71128cae77",
+            "name": "JULIO ERICKSON",
+            "isPermitted": false
+          },
+          {
+            "id": "DHV1707-TestSubscriber-1",
+            "name": "LLOYD BRIDGES",
+            "isPermitted": false
+          },
+          {
+            "id": "e433710f-9217-458d-a79d-1c7aff376d89",
+            "name": "SILVIA ROBBINS",
+            "isPermitted": true
+          },
+          {
+            "id": "global-customer-id",
+            "name": "global-customer-id",
+            "isPermitted": true
+          }
+        ],
+        "productFamilies": null,
+        "serviceTypes": {
+          "e433710f-9217-458d-a79d-1c7aff376d89": [
+            {
+              "id": "17",
+              "name": "JOHANNA_SANTOS",
+              "isPermitted": false
+            },
+            {
+              "id": "16",
+              "name": "LINDSEY",
+              "isPermitted": false
+            },
+            {
+              "id": "2",
+              "name": "Emanuel",
+              "isPermitted": false
+            },
+            {
+              "id": "5",
+              "name": "Kennedy",
+              "isPermitted": false
+            },
+            {
+              "id": "14",
+              "name": "SSD",
+              "isPermitted": false
+            },
+            {
+              "id": "1",
+              "name": "TYLER SILVIA",
+              "isPermitted": true
+            },
+            {
+              "id": "12",
+              "name": "VPMS",
+              "isPermitted": false
+            },
+            {
+              "id": "3",
+              "name": "vJamie",
+              "isPermitted": false
+            },
+            {
+              "id": "0",
+              "name": "vRichardson",
+              "isPermitted": false
+            },
+            {
+              "id": "18",
+              "name": "vCarroll",
+              "isPermitted": false
+            },
+            {
+              "id": "9",
+              "name": "vFLORENCE",
+              "isPermitted": false
+            },
+            {
+              "id": "13",
+              "name": "vWINIFRED",
+              "isPermitted": false
+            },
+            {
+              "id": "10",
+              "name": "vMNS",
+              "isPermitted": false
+            },
+            {
+              "id": "15",
+              "name": "vMOG",
+              "isPermitted": false
+            },
+            {
+              "id": "8",
+              "name": "vOTA",
+              "isPermitted": false
+            },
+            {
+              "id": "11",
+              "name": "vEsmeralda",
+              "isPermitted": false
+            },
+            {
+              "id": "6",
+              "name": "vPorfirio",
+              "isPermitted": false
+            },
+            {
+              "id": "7",
+              "name": "vVM",
+              "isPermitted": false
+            },
+            {
+              "id": "4",
+              "name": "vVoiceMail",
+              "isPermitted": false
+            }
+          ]
+        },
+        "aicZones": [
+          {
+            "id": "ATL53",
+            "name": "AAIATLTE-ATL53"
+          },
+          {
+            "id": "ABC15",
+            "name": "AAITESAN-ABC15"
+          },
+          {
+            "id": "TES36",
+            "name": "ABCEETES-TES36"
+          },
+          {
+            "id": "ATL54",
+            "name": "AICFTAAI-ATL54"
+          },
+          {
+            "id": "ATL43",
+            "name": "AICLOCID-ATL43"
+          },
+          {
+            "id": "AMD15",
+            "name": "AMDFAA01-AMD15"
+          },
+          {
+            "id": "AMF11",
+            "name": "AMDOCS01-AMF11"
+          },
+          {
+            "id": "RCT1",
+            "name": "AMSTERNL-RCT1"
+          },
+          {
+            "id": "AMS1",
+            "name": "AMSTNLBW-AMS1"
+          },
+          {
+            "id": "HJH1",
+            "name": "AOEEQQQD-HJH1"
+          },
+          {
+            "id": "HJE1",
+            "name": "AOEEWWWD-HJE1"
+          },
+          {
+            "id": "MCS1",
+            "name": "ASACMAMS-MCS1"
+          },
+          {
+            "id": "AUG1",
+            "name": "ASDFGHJK-AUG1"
+          },
+          {
+            "id": "LUC1",
+            "name": "ATLDFGYC-LUC1"
+          },
+          {
+            "id": "ATL1",
+            "name": "ATLNGAMA-ATL1"
+          },
+          {
+            "id": "ATL2",
+            "name": "ATLNGANW-ATL2"
+          },
+          {
+            "id": "HPO1",
+            "name": "ATLNGAUP-HPO1"
+          },
+          {
+            "id": "ANI1",
+            "name": "ATLNGTRE-ANI1"
+          },
+          {
+            "id": "ATL44",
+            "name": "ATLSANAB-ATL44"
+          },
+          {
+            "id": "ATL56",
+            "name": "ATLSANAC-ATL56"
+          },
+          {
+            "id": "ABC11",
+            "name": "ATLSANAI-ABC11"
+          },
+          {
+            "id": "ATL34",
+            "name": "ATLSANAI-ATL34"
+          },
+          {
+            "id": "ATL63",
+            "name": "ATLSANEW-ATL63"
+          },
+          {
+            "id": "ABC12",
+            "name": "ATLSECIA-ABC12"
+          },
+          {
+            "id": "AMD18",
+            "name": "AUDIMA01-AMD18"
+          },
+          {
+            "id": "AVT1",
+            "name": "AVTRFLHD-AVT1"
+          },
+          {
+            "id": "KIT1",
+            "name": "BHYJFGLN-KIT1"
+          },
+          {
+            "id": "BHY17",
+            "name": "BHYTFRF3-BHY17"
+          },
+          {
+            "id": "RTW5",
+            "name": "BHYTFRY4-RTW5"
+          },
+          {
+            "id": "RTZ4",
+            "name": "BHYTFRZ6-RTZ4"
+          },
+          {
+            "id": "RTD2",
+            "name": "BHYTFRk4-RTD2"
+          },
+          {
+            "id": "BNA1",
+            "name": "BNARAGBK-BNA1"
+          },
+          {
+            "id": "VEL1",
+            "name": "BNMLKUIK-VEL1"
+          },
+          {
+            "id": "BOT1",
+            "name": "BOTHWAKY-BOT1"
+          },
+          {
+            "id": "CAL33",
+            "name": "CALIFORN-CAL33"
+          },
+          {
+            "id": "ATL84",
+            "name": "CANTTCOC-ATL84"
+          },
+          {
+            "id": "HSD1",
+            "name": "CHASKCDS-HSD1"
+          },
+          {
+            "id": "CHI1",
+            "name": "CHILLIWE-CHI1"
+          },
+          {
+            "id": "XCP12",
+            "name": "CHKGH123-XCP12"
+          },
+          {
+            "id": "JNL1",
+            "name": "CJALSDAC-JNL1"
+          },
+          {
+            "id": "KJN1",
+            "name": "CKALDKSA-KJN1"
+          },
+          {
+            "id": "CLG1",
+            "name": "CLGRABAD-CLG1"
+          },
+          {
+            "id": "CKL1",
+            "name": "CLKSKCKK-CKL1"
+          },
+          {
+            "id": "ATL66",
+            "name": "CLLIAAII-ATL66"
+          },
+          {
+            "id": "CQK1",
+            "name": "CQKSCAKK-CQK1"
+          },
+          {
+            "id": "CWY1",
+            "name": "CWYMOWBS-CWY1"
+          },
+          {
+            "id": "DKJ1",
+            "name": "DKJSJDKA-DKJ1"
+          },
+          {
+            "id": "DSF45",
+            "name": "DSFBG123-DSF45"
+          },
+          {
+            "id": "DSL12",
+            "name": "DSLFK242-DSL12"
+          },
+          {
+            "id": "FDE55",
+            "name": "FDERT555-FDE55"
+          },
+          {
+            "id": "VEN2",
+            "name": "FGHJUHIL-VEN2"
+          },
+          {
+            "id": "ATL64",
+            "name": "FORLOAAJ-ATL64"
+          },
+          {
+            "id": "GNV1",
+            "name": "GNVLSCTL-GNV1"
+          },
+          {
+            "id": "SAN22",
+            "name": "GNVLSCTL-SAN22"
+          },
+          {
+            "id": "KAP1",
+            "name": "HIOUYTRQ-KAP1"
+          },
+          {
+            "id": "LIS1",
+            "name": "HOSTPROF-LIS1"
+          },
+          {
+            "id": "HRG1",
+            "name": "HRGHRGGS-HRG1"
+          },
+          {
+            "id": "HST25",
+            "name": "HSTNTX01-HST25"
+          },
+          {
+            "id": "STN27",
+            "name": "HSTNTX01-STN27"
+          },
+          {
+            "id": "HST70",
+            "name": "HSTNTX70-HST70"
+          },
+          {
+            "id": "KOR1",
+            "name": "HYFLNBVT-KOR1"
+          },
+          {
+            "id": "RAD10",
+            "name": "INDIPUNE-RAD10"
+          },
+          {
+            "id": "REL1",
+            "name": "INGERFGT-REL1"
+          },
+          {
+            "id": "JAD1",
+            "name": "JADECLLI-JAD1"
+          },
+          {
+            "id": "HKA1",
+            "name": "JAKHLASS-HKA1"
+          },
+          {
+            "id": "JCS1",
+            "name": "JCSJSCJS-JCS1"
+          },
+          {
+            "id": "JCV1",
+            "name": "JCVLFLBW-JCV1"
+          },
+          {
+            "id": "KGM2",
+            "name": "KGMTNC20-KGM2"
+          },
+          {
+            "id": "KJF12",
+            "name": "KJFDH123-KJF12"
+          },
+          {
+            "id": "JGS1",
+            "name": "KSJKKKKK-JGS1"
+          },
+          {
+            "id": "LAG1",
+            "name": "LARGIZON-LAG1"
+          },
+          {
+            "id": "LAG1a",
+            "name": "LARGIZON-LAG1a"
+          },
+          {
+            "id": "LAG45",
+            "name": "LARGIZON-LAG1a"
+          },
+          {
+            "id": "LAG1b",
+            "name": "LARGIZON-LAG1b"
+          },
+          {
+            "id": "WAN1",
+            "name": "LEIWANGW-WAN1"
+          },
+          {
+            "id": "DSA1",
+            "name": "LKJHGFDS-DSA1"
+          },
+          {
+            "id": "LON1",
+            "name": "LONEENCO-LON1"
+          },
+          {
+            "id": "SITE",
+            "name": "LONEENCO-SITE"
+          },
+          {
+            "id": "ZXL1",
+            "name": "LWLWCANN-ZXL1"
+          },
+          {
+            "id": "hvf20",
+            "name": "MDTWNJ21-hvf20"
+          },
+          {
+            "id": "hvf32",
+            "name": "MDTWNJ21-hvf32"
+          },
+          {
+            "id": "AMD13",
+            "name": "MEMATLAN-AMD13"
+          },
+          {
+            "id": "MIC54",
+            "name": "MICHIGAN-MIC54"
+          },
+          {
+            "id": "MAR1",
+            "name": "MNBVCXZM-MAR1"
+          },
+          {
+            "id": "NCA1",
+            "name": "NCANCANN-NCA1"
+          },
+          {
+            "id": "NFT1",
+            "name": "NFTJSSSS-NFT1"
+          },
+          {
+            "id": "GAR1",
+            "name": "NGFVSJKO-GAR1"
+          },
+          {
+            "id": "NYC1",
+            "name": "NYCMNY54-NYC1"
+          },
+          {
+            "id": "OKC1",
+            "name": "OKCBOK55-OKC1"
+          },
+          {
+            "id": "OLG1",
+            "name": "OLHOLHOL-OLG1"
+          },
+          {
+            "id": "OLK1",
+            "name": "OLKOLKLS-OLK1"
+          },
+          {
+            "id": "NIR1",
+            "name": "ORFLMANA-NIR1"
+          },
+          {
+            "id": "JAN1",
+            "name": "ORFLMATT-JAN1"
+          },
+          {
+            "id": "ORL1",
+            "name": "ORLDFLMA-ORL1"
+          },
+          {
+            "id": "PAR1",
+            "name": "PARSFRCG-PAR1"
+          },
+          {
+            "id": "PBL1",
+            "name": "PBLAPBAI-PBL1"
+          },
+          {
+            "id": "mac10",
+            "name": "PKGTESTF-mac10"
+          },
+          {
+            "id": "mac20",
+            "name": "PKGTESTF-mac20"
+          },
+          {
+            "id": "TIR2",
+            "name": "PLKINHYI-TIR2"
+          },
+          {
+            "id": "IBB1",
+            "name": "PLMKOIJU-IBB1"
+          },
+          {
+            "id": "COM1",
+            "name": "PLMKOPIU-COM1"
+          },
+          {
+            "id": "POI1",
+            "name": "PLMNJKIU-POI1"
+          },
+          {
+            "id": "PLT1",
+            "name": "PLTNCA60-PLT1"
+          },
+          {
+            "id": "POI22",
+            "name": "POIUY123-POI22"
+          },
+          {
+            "id": "DCC1",
+            "name": "POIUYTGH-DCC1"
+          },
+          {
+            "id": "DCC1a",
+            "name": "POIUYTGH-DCC1a"
+          },
+          {
+            "id": "DCC1b",
+            "name": "POIUYTGH-DCC1b"
+          },
+          {
+            "id": "DCC2",
+            "name": "POIUYTGH-DCC2"
+          },
+          {
+            "id": "DCC3",
+            "name": "POIUYTGH-DCC3"
+          },
+          {
+            "id": "IAA1",
+            "name": "QAZXSWED-IAA1"
+          },
+          {
+            "id": "QWE1",
+            "name": "QWECLLI1-QWE1"
+          },
+          {
+            "id": "NUM1",
+            "name": "QWERTYUI-NUM1"
+          },
+          {
+            "id": "RAD1",
+            "name": "RADICAL1-RAD1"
+          },
+          {
+            "id": "RJN1",
+            "name": "RJNRBZAW-RJN1"
+          },
+          {
+            "id": "SAA13",
+            "name": "SAIT1AA9-SAA13"
+          },
+          {
+            "id": "SAA14",
+            "name": "SAIT1AA9-SAA14"
+          },
+          {
+            "id": "SDD81",
+            "name": "SAIT1DD6-SDD81"
+          },
+          {
+            "id": "SDD82",
+            "name": "SAIT1DD9-SDD82"
+          },
+          {
+            "id": "SAA11",
+            "name": "SAIT9AA2-SAA11"
+          },
+          {
+            "id": "SAA80",
+            "name": "SAIT9AA3-SAA80"
+          },
+          {
+            "id": "SAA12",
+            "name": "SAIT9AF8-SAA12"
+          },
+          {
+            "id": "SCC80",
+            "name": "SAIT9CC3-SCC80"
+          },
+          {
+            "id": "ATL75",
+            "name": "SANAAIRE-ATL75"
+          },
+          {
+            "id": "ICC1",
+            "name": "SANJITAT-ICC1"
+          },
+          {
+            "id": "SCK1",
+            "name": "SCKSCKSK-SCK1"
+          },
+          {
+            "id": "EHH78",
+            "name": "SDCSHHH5-EHH78"
+          },
+          {
+            "id": "SAA78",
+            "name": "SDCTAAA1-SAA78"
+          },
+          {
+            "id": "SAX78",
+            "name": "SDCTAXG1-SAX78"
+          },
+          {
+            "id": "SBX78",
+            "name": "SDCTBXG1-SBX78"
+          },
+          {
+            "id": "SEE78",
+            "name": "SDCTEEE4-SEE78"
+          },
+          {
+            "id": "SGG78",
+            "name": "SDCTGGG1-SGG78"
+          },
+          {
+            "id": "SXB78",
+            "name": "SDCTGXB1-SXB78"
+          },
+          {
+            "id": "SJJ78",
+            "name": "SDCTJJJ1-SJJ78"
+          },
+          {
+            "id": "SKK78",
+            "name": "SDCTKKK1-SKK78"
+          },
+          {
+            "id": "SLF78",
+            "name": "SDCTLFN1-SLF78"
+          },
+          {
+            "id": "SLL78",
+            "name": "SDCTLLL1-SLL78"
+          },
+          {
+            "id": "MAD11",
+            "name": "SDFQWGKL-MAD11"
+          },
+          {
+            "id": "HGD1",
+            "name": "SDFQWHGD-HGD1"
+          },
+          {
+            "id": "SBB78",
+            "name": "SDIT1BBB-SBB78"
+          },
+          {
+            "id": "SDG78",
+            "name": "SDIT1BDG-SDG78"
+          },
+          {
+            "id": "SBU78",
+            "name": "SDIT1BUB-SBU78"
+          },
+          {
+            "id": "SHH78",
+            "name": "SDIT1HHH-SHH78"
+          },
+          {
+            "id": "SJU78",
+            "name": "SDIT1JUB-SJU78"
+          },
+          {
+            "id": "SNA1",
+            "name": "SNANTXCA-SNA1"
+          },
+          {
+            "id": "SAM1",
+            "name": "SNDGCA64-SAN1"
+          },
+          {
+            "id": "SNG1",
+            "name": "SNGPSIAU-SNG1"
+          },
+          {
+            "id": "SSA56",
+            "name": "SSIT2AA7-SSA56"
+          },
+          {
+            "id": "STG1",
+            "name": "STTGGE62-STG1"
+          },
+          {
+            "id": "STT1",
+            "name": "STTLWA02-STT1"
+          },
+          {
+            "id": "SYD1",
+            "name": "SYDNAUBV-SYD1"
+          },
+          {
+            "id": "ATL99",
+            "name": "TEESTAAI-ATL43"
+          },
+          {
+            "id": "ATL98",
+            "name": "TEESTAAI-ATL43"
+          },
+          {
+            "id": "ATL76",
+            "name": "TELEPAAI-ATL76"
+          },
+          {
+            "id": "ABC14",
+            "name": "TESAAISA-ABC14"
+          },
+          {
+            "id": "TAT33",
+            "name": "TESAAISA-TAT33"
+          },
+          {
+            "id": "TAT34",
+            "name": "TESAAISB-TAT34"
+          },
+          {
+            "id": "TAT37",
+            "name": "TESAAISD-TAT37"
+          },
+          {
+            "id": "ATL62",
+            "name": "TESSASCH-ATL62"
+          },
+          {
+            "id": "TLP1",
+            "name": "TLPNXM18-TLP1"
+          },
+          {
+            "id": "SAN13",
+            "name": "TOKYJPFA-SAN13"
+          },
+          {
+            "id": "TOK1",
+            "name": "TOKYJPFA-TOK1"
+          },
+          {
+            "id": "TOL1",
+            "name": "TOLDOH21-TOL1"
+          },
+          {
+            "id": "TOR1",
+            "name": "TOROONXN-TOR1"
+          },
+          {
+            "id": "TOY1",
+            "name": "TORYONNZ-TOY1"
+          },
+          {
+            "id": "ATL35",
+            "name": "TTESSAAI-ATL35"
+          },
+          {
+            "id": "TUF1",
+            "name": "TUFCLLI1-TUF1"
+          },
+          {
+            "id": "SAI1",
+            "name": "UBEKQLPD-SAI1"
+          },
+          {
+            "id": "UUU4",
+            "name": "UUUAAAUU-UUU4"
+          },
+          {
+            "id": "YYY1",
+            "name": "UUUAIAAI-YYY1"
+          },
+          {
+            "id": "BAN1",
+            "name": "VSDKYUTP-BAN1"
+          },
+          {
+            "id": "WAS1",
+            "name": "WASHDCSW-WAS1"
+          },
+          {
+            "id": "APP1",
+            "name": "WBHGTYUI-APP1"
+          },
+          {
+            "id": "SUL2",
+            "name": "WERTYUJK-SUL2"
+          },
+          {
+            "id": "DEF2",
+            "name": "WSBHGTYL-DEF2"
+          },
+          {
+            "id": "DHA12",
+            "name": "WSXEDECF-DHA12"
+          },
+          {
+            "id": "MNT11",
+            "name": "WSXEFBTH-MNT11"
+          },
+          {
+            "id": "RAJ1",
+            "name": "YGBIJNLQ-RAJ1"
+          },
+          {
+            "id": "JAG1",
+            "name": "YUDFJULP-JAG1"
+          },
+          {
+            "id": "ZEN1",
+            "name": "ZENCLLI1-ZEN1"
+          },
+          {
+            "id": "ZOG1",
+            "name": "ZOGASTRO-ZOG1"
+          },
+          {
+            "id": "SDE1",
+            "name": "ZXCVBNMA-SDE1"
+          },
+          {
+            "id": "SIP1",
+            "name": "ZXCVBNMK-SIP1"
+          },
+          {
+            "id": "JUL1",
+            "name": "ZXCVBNMM-JUL1"
+          },
+          {
+            "id": "ERT1",
+            "name": "ertclli1-ERT1"
+          },
+          {
+            "id": "IOP1",
+            "name": "iopclli1-IOP1"
+          },
+          {
+            "id": "OPA1",
+            "name": "opaclli1-OPA1"
+          },
+          {
+            "id": "RAI1",
+            "name": "poiuytre-RAI1"
+          },
+          {
+            "id": "PUR1",
+            "name": "purelyde-PUR1"
+          },
+          {
+            "id": "RTY1",
+            "name": "rtyclli1-RTY1"
+          },
+          {
+            "id": "SDF1",
+            "name": "sdfclli1-SDF1"
+          },
+          {
+            "id": "SSW56",
+            "name": "ss8126GT-SSW56"
+          },
+          {
+            "id": "UIO1",
+            "name": "uioclli1-UIO1"
+          }
+        ],
+        "categoryParameters": {
+          "owningEntityList": [
+            {
+              "id": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
+              "name": "WayneHolland"
+            },
+            {
+              "id": "Melissa",
+              "name": "Melissa"
+            },
+            {
+              "id": "aaa1",
+              "name": "aaa1"
+            }
+          ],
+          "projectList": [
+            {
+              "id": "WATKINS",
+              "name": "WATKINS"
+            },
+            {
+              "id": "x1",
+              "name": "x1"
+            },
+            {
+              "id": "yyy1",
+              "name": "yyy1"
+            }
+          ],
+          "lineOfBusinessList": [
+            {
+              "id": "ONAP",
+              "name": "ONAP"
+            },
+            {
+              "id": "zzz1",
+              "name": "zzz1"
+            }
+          ],
+          "platformList": [
+            {
+              "id": "platform",
+              "name": "platform"
+            },
+            {
+              "id": "xxx1",
+              "name": "xxx1"
+            }
+          ]
+        },
+        "type": "UPDATE_LCP_REGIONS_AND_TENANTS"
+      }
+
+    }
+  }
diff --git a/vid-webpack-master/cypress/integration/iFrames/resume.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/resume.e2e.ts
new file mode 100644
index 000000000..65913d46b
--- /dev/null
+++ b/vid-webpack-master/cypress/integration/iFrames/resume.e2e.ts
@@ -0,0 +1,119 @@
+///<reference path="../../../node_modules/cypress/types/index.d.ts"/>
+import {JsonBuilder} from '../../support/jsonBuilders/jsonBuilder';
+import {ServiceModel} from '../../support/jsonBuilders/models/service.model';
+import {AaiServiceInstancesModel} from '../../support/jsonBuilders/models/serviceInstances.model';
+import {AAISubDetailsModel} from '../../support/jsonBuilders/models/aaiSubDetails.model';
+import {AAISubViewEditModel} from '../../support/jsonBuilders/models/aaiSubViewEdit.model';
+
+describe('Resume tests', function () {
+  describe('Resume Defect 710619 - VID doesn\'t prompt to allow the user to attach the volume group on clicking Resume', () => {
+
+    let jsonBuilderAAIService: JsonBuilder<ServiceModel> = new JsonBuilder<ServiceModel>();
+    let jsonBuilderAAISubViewEditModel: JsonBuilder<AAISubViewEditModel> = new JsonBuilder<AAISubViewEditModel>();
+    let jsonBuilderAAISubDetailsModel: JsonBuilder<AAISubDetailsModel> = new JsonBuilder<AAISubDetailsModel>();
+    let jsonBuilderAaiServiceInstances: JsonBuilder<AaiServiceInstancesModel> = new JsonBuilder<AaiServiceInstancesModel>();
+    beforeEach(() => {
+      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/defect710619/serviceE2E.json').then((res) => {
+        jsonBuilderAAIService.basicJson(
+          res,
+          Cypress.config('baseUrl') + "/rest/models/services/**",
+          200, 0,
+          "service-complexService")
+      });
+
+
+      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiSubViewEditForServiceWithSomeVFModuleE2E.json').then((res) => {
+        jsonBuilderAAISubViewEditModel.basicJson(
+          res,
+          Cypress.config('baseUrl') + "/aai_sub_viewedit/**",
+          200,
+          0,
+          "aai-sub-view-edit")
+      });
+
+      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiSubDetailsE2E.json').then((res) => {
+        jsonBuilderAAISubDetailsModel.basicJson(
+          res,
+          Cypress.config('baseUrl') + "/aai_sub_details/**",
+          200,
+          0,
+          "aai-sub-details")
+      });
+
+      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiServiceInstancesE2E.json').then((res) => {
+        jsonBuilderAaiServiceInstances.basicJson(
+          res,
+          Cypress.config('baseUrl') + "/search_service_instances**",
+          200,
+          0,
+          "aai-get-service-instances")
+      });
+
+      cy.server().route({
+        url: Cypress.config('baseUrl') + '/mso/mso_create_vfmodule_instance/dedd680f-f3bd-46d8-97c7-b6fc28db9317/vnfs/1d45e992-e282-4ba5-b17a-9ca6562169e3',
+        method: 'POST',
+        status: 200,
+        response: "[]",
+      }).as("actualResumeCall");
+
+      cy.initVidMock();
+
+      cy.initTenants();
+
+      cy.login();
+    });
+
+    afterEach(() => {
+      cy.screenshot();
+    });
+
+    it(`Resume Defect 710619 - with flag FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE is ON`, function () {
+      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=SILVIA ROBBINS&serviceType=TYLER%20SILVIA&serviceInstanceId=dedd680f-f3bd-46d8-97c7-b6fc28db9317&aaiModelVersionId=4b60252a-bf6c-40df-9db5-98b4c363fdf4&isPermitted=true').then(()=>{
+        cy.wait('@service-complexService');
+        checkResumeAndPopup("dpa2bccfx5992v_base_module","vfModuleTreeNode-assigned");
+      });
+     });
+
+    it(`Resume Defect 710619 - with flag FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE is OFF`, function () {
+
+      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/flags.json').then((res) => {
+        cy.server()
+          .route({
+            method: 'GET',
+            delay :  0,
+            status :  200,
+            url : Cypress.config('baseUrl') + "/flags**",
+            response : {
+              "FLAG_ADD_MSO_TESTAPI_FIELD": true,
+              "FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE": false
+            }
+          }).as('initFlags');
+      });
+
+      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=SILVIA ROBBINS&serviceType=TYLER%20SILVIA&serviceInstanceId=dedd680f-f3bd-46d8-97c7-b6fc28db9317&aaiModelVersionId=4b60252a-bf6c-40df-9db5-98b4c363fdf4&isPermitted=true');
+      cy.wait('@service-complexService');
+
+      checkResumeAndPopup("dpa2bccfx5992v_base_module","vfModuleTreeNode-assigned");
+
+    });
+
+
+    function checkResumeAndPopup(vfModuleName:string, vfModuleClassName:string)  {
+      cy.get('div').find('.' + vfModuleClassName)
+        .getElementByDataTestsId('resumeVFModuleButton-' + vfModuleName).click().then(()=> {
+        cy.getElementByDataTestsId('confirmResumeDeleteButton').should('be.visible')
+          .getElementByDataTestsId('softDeleteButton').should('not.be.visible')
+          .getElementByDataTestsId('lcpRegion').should('be.visible').select("hvf6")
+          .getElementByDataTestsId('tenant').should('be.visible').select("bae71557c5bb4d5aac6743a4e5f1d054");
+        cy.getElementByDataTestsId('confirmResumeDeleteButton').not('.button--inactive').click().then(()=> {
+            cy.wait('@actualResumeCall').then(xhr => {
+              cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/defect710619/expectedResumeWithVGResults.json').then((expectedResult) => {
+                cy.deepCompare(xhr.request.body, expectedResult);
+              });
+            });
+        });
+      });
+    }
+  });
+});
+
diff --git a/vid-webpack-master/cypress/integration/iFrames/retry.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/retry.e2e.ts
index cc6434300..683e1d96c 100644
--- a/vid-webpack-master/cypress/integration/iFrames/retry.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/retry.e2e.ts
@@ -35,18 +35,18 @@ describe('Retry Page', function () {
       res.action = 'Create';
       res.statusMessage = 'Service instantiation has failed.'
       // Adding VNF with isFailed.
-      res.vnfs["2017-388_ADIOD-vPE 0"].isFailed = true;
-      res.vnfs["2017-488_ADIOD-vPE 0"].isFailed = true;
-      res.vnfs["2017-488_ADIOD-vPE 0"].statusMessage = 'VNF instantiation failed message';
-      res.vnfs["2017-388_ADIOD-vPE 0"].action = 'Create';
-      res.vnfs["2017-488_ADIOD-vPE 0"].action = 'Create';
+      res.vnfs["2017-388_PASQUALE-vPE 0"].isFailed = true;
+      res.vnfs["2017-488_PASQUALE-vPE 0"].isFailed = true;
+      res.vnfs["2017-488_PASQUALE-vPE 0"].statusMessage = 'VNF instantiation failed message';
+      res.vnfs["2017-388_PASQUALE-vPE 0"].action = 'Create';
+      res.vnfs["2017-488_PASQUALE-vPE 0"].action = 'Create';
       res.networks["ExtVL 0"].action = 'Create';
       res.networks["ExtVL 0"].statusMessage = 'Network instantiation failed message';
 
       // Adding VFModule with isFailed.
-      res.vnfs["2017-488_ADIOD-vPE 0"].vfModules["2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0"]["2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0uvfot"].isFailed = true;
-      res.vnfs["2017-488_ADIOD-vPE 0"].vfModules["2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0"]["2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0uvfot"].statusMessage = 'Short vfModule Failure Message';
-      res.vnfs["2017-488_ADIOD-vPE 0"].vfModules["2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0"]["2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0uvfot"].action = 'Create';
+      res.vnfs["2017-488_PASQUALE-vPE 0"].vfModules["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0"]["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot"].isFailed = true;
+      res.vnfs["2017-488_PASQUALE-vPE 0"].vfModules["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0"]["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot"].statusMessage = 'Short vfModule Failure Message';
+      res.vnfs["2017-488_PASQUALE-vPE 0"].vfModules["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0"]["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot"].action = 'Create';
 
       jsonBuilderAndMock.basicJson(
         res,
@@ -58,7 +58,7 @@ describe('Retry Page', function () {
 
     cy.openIframe(`app/ui/#/servicePlanning/RETRY_EDIT?serviceModelId=${SERVICE_MODEL_ID}&subscriberId=${SUBSCRIBER_ID}&serviceType=${SERVICE_TYPE}&serviceInstanceId=${SERVICE_INSTANCE_ID}&jobId=${JOB_ID}`);
 
-    cy.getElementByDataTestsId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_ADIOD-vPE 0').click();
+    cy.getElementByDataTestsId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_PASQUALE-vPE 0').click();
 
     cy.get('.failed-msg').should('have.length', 5);
     cy.get('.newIcon').should('have.length', 4);
@@ -69,10 +69,10 @@ describe('Retry Page', function () {
       cy.get('.newIcon').should('have.length', 4);
     });
 
-    cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-afacccf6-397d-45d6-b5ae-94c39734b168-2017-388_ADIOD-vPE 0')
+    cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-afacccf6-397d-45d6-b5ae-94c39734b168-2017-388_PASQUALE-vPE 0')
       .drawingBoardTreeClickOnContextMenuOptionByName('Edit')
       .getElementByDataTestsId('cancelButton').click({force: true});
-    cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-afacccf6-397d-45d6-b5ae-94c39734b168-2017-388_ADIOD-vPE 0')
+    cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-afacccf6-397d-45d6-b5ae-94c39734b168-2017-388_PASQUALE-vPE 0')
       .drawingBoardTreeClickOnContextMenuOptionByName('Remove');
 
     cy.get('.newIcon').should('have.length', 2);
@@ -106,14 +106,14 @@ describe('Retry Page', function () {
     cy.readFile('../vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json').then((res) => {
 
       // Adding VNF with isFailed.
-      res.vnfs["2017-388_ADIOD-vPE 0"].isFailed = true;
-      res.vnfs["2017-488_ADIOD-vPE 0"].isFailed = true;
-      res.vnfs["2017-388_ADIOD-vPE 0"].action = 'Create';
-      res.vnfs["2017-488_ADIOD-vPE 0"].action = 'Create';
-      res.vnfs["2017-488_ADIOD-vPE 0"].statusMessage = 'Very long message that checks the popoverwindow can show very very long messagewithout problem.as-erfderfd-rfghthth-yjyjyj-ukuk. For more details go to audit show window';
+      res.vnfs["2017-388_PASQUALE-vPE 0"].isFailed = true;
+      res.vnfs["2017-488_PASQUALE-vPE 0"].isFailed = true;
+      res.vnfs["2017-388_PASQUALE-vPE 0"].action = 'Create';
+      res.vnfs["2017-488_PASQUALE-vPE 0"].action = 'Create';
+      res.vnfs["2017-488_PASQUALE-vPE 0"].statusMessage = 'Very long message that checks the popoverwindow can show very very long messagewithout problem.as-erfderfd-rfghthth-yjyjyj-ukuk. For more details go to audit show window';
       // Adding VFModule with isFailed.
-      res.vnfs["2017-488_ADIOD-vPE 0"].vfModules["2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0"]["2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0uvfot"].isFailed = true;
-      res.vnfs["2017-488_ADIOD-vPE 0"].vfModules["2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0"]["2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0uvfot"].action = 'Create';
+      res.vnfs["2017-488_PASQUALE-vPE 0"].vfModules["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0"]["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot"].isFailed = true;
+      res.vnfs["2017-488_PASQUALE-vPE 0"].vfModules["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0"]["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot"].action = 'Create';
 
       cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/responceForFailedInstance.json').then((res) => {
         jsonBuilderAndMock.basicJson(
@@ -135,7 +135,7 @@ describe('Retry Page', function () {
 
     cy.openIframe(`app/ui/#/servicePlanning/RETRY?serviceModelId=${SERVICE_MODEL_ID}&subscriberId=${SUBSCRIBER_ID}&serviceType=${SERVICE_TYPE}&serviceInstanceId=${SERVICE_INSTANCE_ID}&jobId=${JOB_ID}`);
 
-    cy.getElementByDataTestsId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_ADIOD-vPE 0').click();
+    cy.getElementByDataTestsId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_PASQUALE-vPE 0').click();
 
     cy.get('.failed-msg').should('have.length', 4);
     cy.get('.newIcon').should('have.length', 4);
@@ -144,7 +144,7 @@ describe('Retry Page', function () {
       cy.get('.failed-msg').should('have.length', 4);
       cy.get('.newIcon').should('have.length', 4);
     });
-    cy.assertMenuItemsForNode(['showAuditInfo'],'node-afacccf6-397d-45d6-b5ae-94c39734b168-2017-388_ADIOD-vPE 0-menu-btn');
+    cy.assertMenuItemsForNode(['showAuditInfo'],'node-afacccf6-397d-45d6-b5ae-94c39734b168-2017-388_PASQUALE-vPE 0-menu-btn');
     cy.getElementByDataTestsId('isViewOnly-status-test').contains('VIEW ONLY');
 
     // deploy button should be 'REDEPLOY' and disabled.
@@ -157,7 +157,7 @@ describe('Retry Page', function () {
 
   });
 
-  it(`RETRY - drawing board mode - should show correct failed icon + Retry button`, function () {
+  it(`RETRY - drawing board mode - should show correct failed icon + Retry button`,  ()=> {
     const SUBSCRIBER_ID: string = "e433710f-9217-458d-a79d-1c7aff376d89";
     const SERVICE_TYPE: string = "TYLER SILVIA";
     const SERVICE_INSTANCE_ID: string = "f8791436-8d55-4fde-b4d5-72dd2cf13cfb";
@@ -196,4 +196,59 @@ describe('Retry Page', function () {
 
   });
 
+  it('RETRY- edit mode- failed service with vnf', ()=>{
+    const SUBSCRIBER_ID: string = "e433710f-9217-458d-a79d-1c7aff376d89";
+    const SERVICE_TYPE: string = "TYLER SILVIA";
+    const SERVICE_INSTANCE_ID: string = "f8791436-8d55-4fde-b4d5-72dd2cf13cfb";
+    const SERVICE_MODEL_ID: string = '6b528779-44a3-4472-bdff-9cd15ec93450';
+    const JOB_ID: string = '123456-44a3-4472-bdff-9cd15ec12345';
+    const TRACK_BY_ID = '14561234';
+    let expectedResult: JSON;
+    cy.readFile('../vid-automation/src/test/resources/asyncInstantiation/ServiceWithFailedServiceInstance.json').then((res) => {
+
+      cy.readFile('../vid-automation/src/test/resources/asyncInstantiation/auditModalFailedServiceInstance.json').then((res) => {
+        jsonBuilderAndMock.basicJson(
+          res,
+          Cypress.config('baseUrl') + "/asyncInstantiation/auditStatusForRetry/TRACK_BY_ID",
+          200,
+          0,
+          "msoStatusForFailedInstance",
+        )
+      });
+
+      jsonBuilderAndMock.basicJson(
+        res,
+        Cypress.config('baseUrl') + "/asyncInstantiation/bulkForRetry/" + JOB_ID,
+        200, 0,
+        "initFAiledServiceInstanceRetryTopology",
+      )
+    });
+
+    cy.openIframe(`app/ui/#/servicePlanning/RETRY_EDIT?serviceModelId=${SERVICE_MODEL_ID}&subscriberId=${SUBSCRIBER_ID}&serviceType=${SERVICE_TYPE}&serviceInstanceId=${SERVICE_INSTANCE_ID}&jobId=${JOB_ID}`);
+    cy.get('.newIcon').should('have.length', 1);
+    cy.getElementByDataTestsId('isViewOnly-status-test').contains('IN EDITING');
+    cy.getElementByDataTestsId("openMenuBtn").click({force: true});
+    cy.getElementByDataTestsId("context-menu-header-edit-item").click({force: true})
+      .getElementByDataTestsId("serviceName").should('have.text','INSTANCE_NAME')
+      .getElementByDataTestsId("subscriberName")
+      .getElementByDataTestsId("serviceType")
+      .getElementByDataTestsId("owningEntity")
+      .getElementByDataTestsId("project")
+      .getElementByDataTestsId("rollback")
+      .getElementByDataTestsId('cancelButton').click({force: true});
+    cy.getElementByDataTestsId("openMenuBtn").click({force: true})
+      .getElementByDataTestsId("context-menu-header-audit-item").click({force: true});
+    cy.getElementByDataTestsId('requestId').should('contain', 'e5f93320-cce6-424d-adc6-259a4ee8b342');
+    cy.getElementByDataTestsId('jobStatus').should('contain', 'Failed');
+    cy.getElementByDataTestsId('additionalInfo').should('contain', 'The service instantiation is failed');
+    cy.getElementByDataTestsId('close-button').click({force: true});
+    // // button should be RETRY
+    cy.getElementByDataTestsId('deployBtn').should('contain', 'REDEPLOY');
+    cy.getElementByDataTestsId('deployBtn').should('not.have.attr', 'disabled');
+    cy.get('.failed-msg').should('have.length', 1);
+    cy.get('.newIcon').should('have.length', 1);
+
+    cy.checkPopoverContentOnMouseEvent('service-failed-msg',  '.popover-content.popover-body','mouseenter', 0)
+      .should('contain', 'The service instantiation is failed');
+    });
 });
diff --git a/vid-webpack-master/cypress/integration/iFrames/searchExistingInstance.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/searchExistingInstance.e2e.ts
index 22e7a9950..0e6893044 100644
--- a/vid-webpack-master/cypress/integration/iFrames/searchExistingInstance.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/searchExistingInstance.e2e.ts
@@ -35,7 +35,7 @@ describe('search existing instance', function () {
         "serviceInstanceId":SERVICE_INSTANCE_ID,
         "globalCustomerId": SUBSCRIBER_ID,
         "serviceType": SERVICE_TYPE,
-        "serviceInstanceName": "abc_mdns_2017_1011_IST_Service_CSI",
+        "serviceInstanceName": "abc_CHARLOTTE_2017_1011_IST_Service_CSI",
         "subscriberName": SUBSCRIBER_NAME,
         "aaiModelInvariantId": SERVICE_MODEL_INVARIANT_ID,
         "aaiModelVersionId": SERVICE_MODEL_VERSION_ID,
diff --git a/vid-webpack-master/cypress/integration/iFrames/service.popup.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/service.popup.e2e.ts
index 8b9239c52..4af4a14ca 100644
--- a/vid-webpack-master/cypress/integration/iFrames/service.popup.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/service.popup.e2e.ts
@@ -19,7 +19,7 @@ describe('Service popup', function () {
 
     it('a-la-carte service instantiation popup has all required fields ', function () {
       cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res1) => {
-        res1.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].service.instantiationType = 'A-LA-Carte';
+        res1.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].service.vidNotions.instantiationType = 'ALaCarte';
         cy.setReduxState(<any>res1);
         cy.openIframe('/app/ui/#/servicePopup?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd&isCreate=true');
         cy.isElementContainsAttr('form-set', 'disabled');
@@ -34,7 +34,7 @@ describe('Service popup', function () {
 
     it('a-la-carte service instantiation popup has Instance name as required', function () {
       cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res1) => {
-        res1.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].service.instantiationType = 'A-LA-Carte';
+        res1.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].service.vidNotions.instantiationType = 'ALaCarte';
         let isEcompNaming = false;
         res1.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].service.serviceEcompNaming = isEcompNaming.toString();
         cy.setReduxState(<any>res1);
diff --git a/vid-webpack-master/cypress/integration/iFrames/serviceWithNetwork.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/serviceWithNetwork.e2e.ts
index 678609c5c..8e297d0c9 100644
--- a/vid-webpack-master/cypress/integration/iFrames/serviceWithNetwork.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/serviceWithNetwork.e2e.ts
@@ -94,7 +94,7 @@ describe('View Edit Page', function () {
     });
 
     it(`should allow delete network on view edit`, function () {
-      cy.visit('/serviceModels.htm#/instantiate?subscriberId=a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb&subscriberName=Mobility&serviceType=vMOG&serviceInstanceId=9cdd1b2a-43a7-47bc-a88e-759ba2399f0b&aaiModelVersionId=5a3ad576-c01d-4bed-8194-0e72b4a3d020&isPermitted=true');
+      cy.visit('/serviceModels.htm#/instantiate?subscriberId=a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb&subscriberName=Emanuel&serviceType=vMOG&serviceInstanceId=9cdd1b2a-43a7-47bc-a88e-759ba2399f0b&aaiModelVersionId=5a3ad576-c01d-4bed-8194-0e72b4a3d020&isPermitted=true');
        cy.wait('@aai_getPortMirroringSourcePorts - empty response');
       cy.getElementByDataTestsId("deleteNetworkButton").should('not.have.attr', 'disabled');
       cy.get(".vlansTreeNode").should('have.length', 2);
diff --git a/vid-webpack-master/cypress/integration/iFrames/serviceWithVnfNetwork.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/serviceWithVnfNetwork.e2e.ts
index f6984a2e9..a1af531c1 100644
--- a/vid-webpack-master/cypress/integration/iFrames/serviceWithVnfNetwork.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/serviceWithVnfNetwork.e2e.ts
@@ -77,7 +77,7 @@ describe('Service With VNF network', function () {
     });
 
     it(`Display VNF's network and its vlans hierarchically`, function () {
-      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=USP%20VOICE&serviceType=VIRTUAL%20USP&serviceInstanceId=3f93c7cb-2fd0-4557-9514-e189b7b04f9d&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d674c44&isPermitted=true');
+      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=SILVIA%20ROBBINS&serviceType=TYLER%20SILVIA&serviceInstanceId=3f93c7cb-2fd0-4557-9514-e189b7b04f9d&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d674c44&isPermitted=true');
       cy.wait('@service-complexService');
       cy.get('div').contains('VNF: fsd')
         .get('div').contains('NETWORK: AAAAABBBBCCCC')
diff --git a/vid-webpack-master/cypress/integration/iFrames/softDeleteAndResume.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/softDeleteAndResume.e2e.ts
index 53e5e13be..02bc2728d 100644
--- a/vid-webpack-master/cypress/integration/iFrames/softDeleteAndResume.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/softDeleteAndResume.e2e.ts
@@ -63,13 +63,13 @@ describe('Soft delete tests', function () {
     });
 
     it(`Soft delete button will be display also if base module is true`, function () {
-      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=USP%20VOICE&serviceType=VIRTUAL%20USP&serviceInstanceId=3f93c7cb-2fd0-4557-9514-e189b7b04f9d&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d674c44&isPermitted=true');
+      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=SILVIA%20ROBBINS&serviceType=TYLER%20SILVIA&serviceInstanceId=3f93c7cb-2fd0-4557-9514-e189b7b04f9d&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d674c44&isPermitted=true');
       cy.wait('@service-complexService');
       checkSoftDeleteAndDeletePopup('aa', 'vfModuleTreeNode-pendingactivation', true, true);
     });
 
     it(`Soft delete button not display in assigned orch status`, function () {
-      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=USP%20VOICE&serviceType=VIRTUAL%20USP&serviceInstanceId=3f93c7cb-2fd0-4557-9514-e189b7b04f9d&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d674c44&isPermitted=true');
+      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=SILVIA%20ROBBINS&serviceType=TYLER%20SILVIA&serviceInstanceId=3f93c7cb-2fd0-4557-9514-e189b7b04f9d&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d674c44&isPermitted=true');
       cy.wait('@service-complexService');
       checkSoftDeleteAndDeletePopup('gg', 'vfModuleTreeNode-assigned', false, true);
     });
@@ -90,7 +90,7 @@ describe('Soft delete tests', function () {
           }).as('initFlags');
       });
 
-      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=USP%20VOICE&serviceType=VIRTUAL%20USP&serviceInstanceId=3f93c7cb-2fd0-4557-9514-e189b7b04f9d&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d674c44&isPermitted=true');
+      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=SILVIA%20ROBBINS&serviceType=TYLER%20SILVIA&serviceInstanceId=3f93c7cb-2fd0-4557-9514-e189b7b04f9d&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d674c44&isPermitted=true');
       cy.wait('@service-complexService');
 
       checkResumeAndPopup('aa', 'vfModuleTreeNode-pendingactivation');
@@ -105,7 +105,7 @@ describe('Soft delete tests', function () {
 
     it(`Resume button display in orch status - pendingactivation, assigned, created - feature FLAG_VF_MODULE_RESUME_STATUS_CREATE - is ON`, function () {
 
-      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=USP%20VOICE&serviceType=VIRTUAL%20USP&serviceInstanceId=3f93c7cb-2fd0-4557-9514-e189b7b04f9d&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d674c44&isPermitted=true');
+      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=SILVIA%20ROBBINS&serviceType=TYLER%20SILVIA&serviceInstanceId=3f93c7cb-2fd0-4557-9514-e189b7b04f9d&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d674c44&isPermitted=true');
       cy.wait('@service-complexService');
 
       checkResumeAndPopup('aa', 'vfModuleTreeNode-pendingactivation');
@@ -118,10 +118,10 @@ describe('Soft delete tests', function () {
     });
 
     it(`Delete popup with not homing data from AAI`, function () {
-      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=USP%20VOICE&serviceType=VIRTUAL%20USP&serviceInstanceId=3f93c7cb-2fd0-4557-9514-e189b7b04f9d&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d674c44&isPermitted=true');
+      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=SILVIA%20ROBBINS&serviceType=TYLER%20SILVIA&serviceInstanceId=3f93c7cb-2fd0-4557-9514-e189b7b04f9d&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d674c44&isPermitted=true');
       cy.wait('@service-complexService');
       checkSoftDeleteAndDeletePopup('gg', 'vfModuleTreeNode-assigned', false, true);
-      cy.selectDropdownOptionByText('lcpRegion', 'JANET25');
+      cy.selectDropdownOptionByText('lcpRegion', 'AAIAIC25');
       cy.getElementByDataTestsId('confirmResumeDeleteButton').should('have.attr', 'disabled');
       cy.typeToInput("lcpRegionText", "just another region");
       cy.getElementByDataTestsId('confirmResumeDeleteButton').should('have.attr', 'disabled');
@@ -147,11 +147,11 @@ describe('Soft delete tests', function () {
       });
 
 
-      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=USP%20VOICE&serviceType=VIRTUAL%20USP&serviceInstanceId=3f93c7cb-2fd0-4557-9514-e189b7b04f9d&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d674c44&isPermitted=true');
+      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=SILVIA%20ROBBINS&serviceType=TYLER%20SILVIA&serviceInstanceId=3f93c7cb-2fd0-4557-9514-e189b7b04f9d&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d674c44&isPermitted=true');
       cy.wait('@service-complexService');
       checkSoftDeleteAndDeletePopup('my_vfModule', 'vfModuleTreeNode-pending-delete', true, true);
       cy.getElementByDataTestsId('lcpRegionText').should('be.visible');
-      cy.getElementByDataTestsId('lcpRegion').contains('JANET25');
+      cy.getElementByDataTestsId('lcpRegion').contains('AAIAIC25');
       cy.getElementByDataTestsId('tenant').contains('USP-SIP-IC-24335-T-01');
     });
 
@@ -166,13 +166,13 @@ describe('Soft delete tests', function () {
           "aai-get-homing-data")
       });
 
-      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=USP%20VOICE&serviceType=VIRTUAL%20USP&serviceInstanceId=3f93c7cb-2fd0-4557-9514-e189b7b04f9d&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d674c44&isPermitted=true');
+      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=SILVIA%20ROBBINS&serviceType=TYLER%20SILVIA&serviceInstanceId=3f93c7cb-2fd0-4557-9514-e189b7b04f9d&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d674c44&isPermitted=true');
       cy.wait('@service-complexService');
       checkSoftDeleteAndDeletePopup('vf_module2', 'vfModuleTreeNode-pendingcreate', true, false);
     });
 
-    it(`Soft delete and Delete - Mega region is JANET25 - not 'olson3', 'olson5a'`, function () {
-      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=USP%20VOICE&serviceType=VIRTUAL%20USP&serviceInstanceId=3f93c7cb-2fd0-4557-9514-e189b7b04f9d&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d674c44&isPermitted=true');
+    it(`Soft delete and Delete - Mega region is AAIAIC25 - not 'olson3', 'olson5a'`, function () {
+      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=SILVIA%20ROBBINS&serviceType=TYLER%20SILVIA&serviceInstanceId=3f93c7cb-2fd0-4557-9514-e189b7b04f9d&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d674c44&isPermitted=true');
       cy.wait('@service-complexService');
       //Delete
       checkSoftDeleteAndDeletePopup('gg', 'vfModuleTreeNode-assigned', false, true);
@@ -190,7 +190,7 @@ describe('Soft delete tests', function () {
     });
 
     function checkLegacyRegion() {
-      checkIsLegacyRegionTextIsDisplay('JANET25', true);
+      checkIsLegacyRegionTextIsDisplay('AAIAIC25', true);
       checkIsLegacyRegionTextIsDisplay('olson3', false);
       checkIsLegacyRegionTextIsDisplay('olson5a', false);
       checkIsLegacyRegionTextIsDisplay('hvf6', false);
diff --git a/vid-webpack-master/cypress/integration/iFrames/viewEdit.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/viewEdit.e2e.ts
index 813934e30..c7780b4c1 100644
--- a/vid-webpack-master/cypress/integration/iFrames/viewEdit.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/viewEdit.e2e.ts
@@ -157,7 +157,7 @@ describe('View Edit Page', function () {
 
     it(`should display service model name and version on each info form`, function () {
       let typesToIncludeModel:Array<string> = ['service', 'vnf', 'vfmodule', 'volume-group', 'network'];
-      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=USP%20VOICE&serviceType=VIRTUAL%20USP&serviceInstanceId=3f93c7cb-2fd0-4557-9514-e189b7b04f9d&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d674c44&isPermitted=true');
+      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=SILVIA%20ROBBINS&serviceType=TYLER%20SILVIA&serviceInstanceId=3f93c7cb-2fd0-4557-9514-e189b7b04f9d&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d674c44&isPermitted=true');
       cy.wait('@service-complexService');
       cy.wait('@aai_getPortMirroringConfigsDate - empty response');
       cy.get('div').contains('VOLUME GROUP: f'); // waits for the view/edit to be ready after ports' redraw
@@ -170,7 +170,7 @@ describe('View Edit Page', function () {
     });
 
     it(`Check fabric configuration service with some configuration with diff orchStatus`, function () {
-      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=USP%20VOICE&serviceType=VIRTUAL%20USP&serviceInstanceId=c187e9fe-40c3-4862-b73e-84ff056205f61234&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d671234&isPermitted=true');
+      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=SILVIA%20ROBBINS&serviceType=TYLER%20SILVIA&serviceInstanceId=c187e9fe-40c3-4862-b73e-84ff056205f61234&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d671234&isPermitted=true');
       cy.wait('@service-FabricConfig');
       cy.get('.error-msg').should("be.visible").should('contain','Activate fabric configuration button is not available as some of the configuration objects are not in Assigned status. Check MSO logs for the reasons for this abnormal case.');
       cy.getElementByDataTestsId("activateFabricConfigurationButton").should('have.attr', 'disabled');
@@ -178,7 +178,7 @@ describe('View Edit Page', function () {
     });
 
     it(`Check fabric configuration service with active status`, function () {
-      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=USP%20VOICE&serviceType=VIRTUAL%20USP&serviceInstanceId=c187e9fe-40c3-4862-b73e-84ff056205f65678&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d671234&isPermitted=true');
+      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=SILVIA%20ROBBINS&serviceType=TYLER%20SILVIA&serviceInstanceId=c187e9fe-40c3-4862-b73e-84ff056205f65678&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d671234&isPermitted=true');
       cy.wait('@service-FabricConfig');
       cy.getElementByDataTestsId("activateFabricConfigurationButton").should('not.be.visible');
       cy.getElementByDataTestsId("activateButton").should('have.attr', 'disabled');
@@ -186,7 +186,7 @@ describe('View Edit Page', function () {
     });
 
     it(`Check fabric configuration service with created status`, function () {
-      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=USP%20VOICE&serviceType=VIRTUAL%20USP&serviceInstanceId=c187e9fe-40c3-4862-b73e-84ff056205f69000&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d679000&isPermitted=true');
+      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=SILVIA%20ROBBINS&serviceType=TYLER%20SILVIA&serviceInstanceId=c187e9fe-40c3-4862-b73e-84ff056205f69000&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d679000&isPermitted=true');
       cy.wait('@service-FabricConfig');
       cy.getElementByDataTestsId("activateFabricConfigurationButton").should('not.be.visible');
       cy.getElementByDataTestsId("activateButton").should('have.attr', 'disabled');
@@ -194,7 +194,7 @@ describe('View Edit Page', function () {
     });
 
     it(`Check fabric configuration service with pendingdeLete status`, function () {
-      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=USP%20VOICE&serviceType=VIRTUAL%20USP&serviceInstanceId=c187e9fe-40c3-4862-b73e-84ff056205f61000&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d671000&isPermitted=true');
+      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=SILVIA%20ROBBINS&serviceType=TYLER%20SILVIA&serviceInstanceId=c187e9fe-40c3-4862-b73e-84ff056205f61000&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d671000&isPermitted=true');
       cy.wait('@service-FabricConfig');
       cy.getElementByDataTestsId("activateFabricConfigurationButton").should('not.be.visible');
       cy.getElementByDataTestsId("activateButton").should('not.have.attr', 'disabled');
@@ -210,11 +210,11 @@ describe('View Edit Page', function () {
   function changeServiceModel(serviceModel: ServiceModel) {
     serviceModel.service.uuid = "6e59c5de-f052-46fa-aa7e-2fca9d674c44";
     serviceModel.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": {},
@@ -383,74 +383,74 @@ describe('View Edit Page', 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": {}
           }
@@ -459,72 +459,72 @@ describe('View Edit Page', function () {
       }
     };
     serviceModel.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
       }
     };
     serviceModel.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": {}
       }
diff --git a/vid-webpack-master/cypress/integration/iFrames/viewOnlyDrawingBoard.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/viewOnlyDrawingBoard.e2e.ts
index d15809df5..2f2ed14c4 100644
--- a/vid-webpack-master/cypress/integration/iFrames/viewOnlyDrawingBoard.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/viewOnlyDrawingBoard.e2e.ts
@@ -77,24 +77,24 @@ describe('View only drawing board', function () {
     //cy.visit("welcome.htm"); //relaod page to not break the following tests
 
     //testing left side
-    cy.getElementByDataTestsId('node-2017-388_ADIOD-vPE 1').find(`[data-tests-id='node-type-indicator']`).should('have.text', 'VNF');
-    cy.getElementByDataTestsId('node-2017-488_ADIOD-vPE 0').click({force: true});
-    cy.getElementByDataTestsId('node-2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1').find(`[data-tests-id='node-type-indicator']`).should('have.text', 'M');
+    cy.getElementByDataTestsId('node-2017-388_PASQUALE-vPE 1').find(`[data-tests-id='node-type-indicator']`).should('have.text', 'VNF');
+    cy.getElementByDataTestsId('node-2017-488_PASQUALE-vPE 0').click({force: true});
+    cy.getElementByDataTestsId('node-2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1').find(`[data-tests-id='node-type-indicator']`).should('have.text', 'M');
 
     //testing right side
-    cy.getElementByDataTestsId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_ADIOD-vPE 0').find(`[data-tests-id='node-type-indicator']`).should('have.text', 'VNF');
-    cy.getElementByDataTestsId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_ADIOD-vPE 0').click({force: true});
-    cy.getElementByDataTestsId('node-f8360508-3f17-4414-a2ed-6bc71161e8db-2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0').eq(0).find(`[data-tests-id='node-type-indicator']`).should('have.text', 'M');
+    cy.getElementByDataTestsId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_PASQUALE-vPE 0').find(`[data-tests-id='node-type-indicator']`).should('have.text', 'VNF');
+    cy.getElementByDataTestsId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_PASQUALE-vPE 0').click({force: true});
+    cy.getElementByDataTestsId('node-f8360508-3f17-4414-a2ed-6bc71161e8db-2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0').eq(0).find(`[data-tests-id='node-type-indicator']`).should('have.text', 'M');
 
     //check vnf node tree sub header
-    cy.getElementByDataTestsId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_ADIOD-vPE 0').find("[data-tests-id='status-property-orchStatus']").should('have.text', 'Created');
-    cy.getElementByDataTestsId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_ADIOD-vPE 0').find("[data-tests-id='status-property-provStatus']").should('have.text', '');
-    cy.getElementByDataTestsId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_ADIOD-vPE 0').find("[data-tests-id='status-property-inMaint']").should('not.exist');
+    cy.getElementByDataTestsId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_PASQUALE-vPE 0').find("[data-tests-id='status-property-orchStatus']").should('have.text', 'Created');
+    cy.getElementByDataTestsId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_PASQUALE-vPE 0').find("[data-tests-id='status-property-provStatus']").should('have.text', '');
+    cy.getElementByDataTestsId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_PASQUALE-vPE 0').find("[data-tests-id='status-property-inMaint']").should('not.exist');
 
     //check vf Module node tree sub header
-    cy.getElementByDataTestsId('node-f8360508-3f17-4414-a2ed-6bc71161e8db-2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0').find("[data-tests-id='status-property-provStatus']").eq(0).should('have.text', 'Prov Status');
-    cy.getElementByDataTestsId('node-f8360508-3f17-4414-a2ed-6bc71161e8db-2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0').find("[data-tests-id='status-property-orchStatus']").eq(0).should('have.text', 'Active');
-    cy.getElementByDataTestsId('node-f8360508-3f17-4414-a2ed-6bc71161e8db-2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0').find("[data-tests-id='status-property-inMaint']").eq(0).should('have.text', '');
+    cy.getElementByDataTestsId('node-f8360508-3f17-4414-a2ed-6bc71161e8db-2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0').find("[data-tests-id='status-property-provStatus']").eq(0).should('have.text', 'Prov Status');
+    cy.getElementByDataTestsId('node-f8360508-3f17-4414-a2ed-6bc71161e8db-2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0').find("[data-tests-id='status-property-orchStatus']").eq(0).should('have.text', 'Active');
+    cy.getElementByDataTestsId('node-f8360508-3f17-4414-a2ed-6bc71161e8db-2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0').find("[data-tests-id='status-property-inMaint']").eq(0).should('have.text', '');
 
     cy.getElementByDataTestsId("serviceInstance").should('have.text', 'Service instance:');
     cy.getElementByDataTestsId("serviceName").should('have.text', 'mCaNkinstancename');
@@ -105,8 +105,7 @@ describe('View only drawing board', function () {
 
 
   });
-
-  it(`when open service planning in view mode service instance is shown as expected - e2e with API's ServiceTreeWithMultipleChildren`, function () {
+  function initServicePlanning(){
     const SUBSCRIBER_ID: string = "e433710f-9217-458d-a79d-1c7aff376d89";
     const SERVICE_TYPE: string = "TYLER SILVIA";
     const SERVICE_INSTANCE_ID: string = "f8791436-8d55-4fde-b4d5-72dd2cf13cfb";
@@ -133,6 +132,16 @@ describe('View only drawing board', function () {
 
     cy.openIframe(`app/ui/#/servicePlanning/VIEW?serviceModelId=${SERVICE_MODEL_ID}&subscriberId=${SUBSCRIBER_ID}&serviceType=${SERVICE_TYPE}&serviceInstanceId=${SERVICE_INSTANCE_ID}`);
 
+  }
+  it('check component info for 2 trees for vnf, vf-module, and network', function(){
+    initServicePlanning();
+    testComponentInfoForVNF();
+    testComponentInfoForVFMODULE();
+    testComponentInfoForNetwork();
+  });
+
+  it(`when open service planning in view mode service instance is shown as expected - e2e with API's ServiceTreeWithMultipleChildren`, function () {
+    initServicePlanning();
     /*
     0. title area -> generic stuff
                      instance name
@@ -151,9 +160,9 @@ describe('View only drawing board', function () {
 
     // test component info of service-level
     let labelsAndValues = [
-      ['Model Version', '1.0'],
+      ['Model version', '1.0'],
       ['Instance ID', 'service-instance-id'],
-      ['Service Type', 'service-instance-type'],
+      ['Service type', 'service-instance-type'],
     ];
     cy.assertComponentInfoTitleLabelsAndValues('Service Instance INFO', labelsAndValues);
 
@@ -167,24 +176,24 @@ describe('View only drawing board', function () {
                     Configuration
     */
     const leftShouldHaves: { [dataTestId: string]: { [dataTestId: string]: string; }; } = {
-      'node-VF_vMee 0': {
+      'node-VF_vGeraldine 0': {
         'node-type-indicator': 'VNF',
-        'node-name': 'VF_vMee 0',
+        'node-name': 'VF_vGeraldine 0',
         'numberButton': '1',
       },
-      'node-vf_vmee0..VfVmee..base_vmme..module-0': {
+      'node-vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0': {
         'node-type-indicator': 'M',
-        'node-name': 'vf_vmee0..VfVmee..base_vmme..module-0',
+        'node-name': 'vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0',
         'numberButton': '',
       },
-      'node-vf_vmee0..VfVmee..vmme_vlc..module-1': {
+      'node-vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1': {
         'node-type-indicator': 'M',
-        'node-name': 'vf_vmee0..VfVmee..vmme_vlc..module-1',
+        'node-name': 'vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1',
         'numberButton': '1',
       },
-      'node-vf_vmee0..VfVmee..vmme_gpb..module-2': {
+      'node-vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2': {
         'node-type-indicator': 'M',
-        'node-name': 'vf_vmee0..VfVmee..vmme_gpb..module-2',
+        'node-name': 'vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2',
         'numberButton': '',
       },
       'node-ExtVL 0': {
@@ -212,7 +221,7 @@ describe('View only drawing board', function () {
                      IGNORE, don't check: first node, which have no Service connection
     */
     const rightShouldHaves: { [dataTestId: string]: { [dataTestId: string]: string; }; } = {
-      'node-d6557200-ecf2-4641-8094-5393ae3aae60-VF_vMee 0:0': {
+      'node-d6557200-ecf2-4641-8094-5393ae3aae60-VF_vGeraldine 0:0': {
         'node-type-indicator': 'VNF',
         'node-name': 'VNF2_INSTANCE_NAME',
         'status-property-orchStatus': '',
@@ -225,7 +234,7 @@ describe('View only drawing board', function () {
         'status-property-orchStatus': 'Assigned',
         'status-property-provStatus': '',
       },
-      'node-522159d5-d6e0-4c2a-aa44-5a542a12a830-vf_vmee0..VfVmee..vmme_vlc..module-1:0': {
+      'node-522159d5-d6e0-4c2a-aa44-5a542a12a830-vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1:0': {
         'node-type-indicator': 'M',
         'node-name': 'ss820f_0918_db',
         'status-property-orchStatus': 'deleted',
@@ -263,10 +272,10 @@ describe('View only drawing board', function () {
                     configuration: # of instances = 0, click -> nothing
     */
     const leftShouldHighlight: { [text: string]: string[] } = {
-      'VF_vMee 0': ['VNF2_INSTANCE_NAME'],
-      'vf_vmee0..VfVmee..base_vmme..module-0': [],
-      'vf_vmee0..VfVmee..vmme_vlc..module-1': ['ss820f_0918_db'],
-      'vf_vmee0..VfVmee..vmme_gpb..module-2': [],
+      'VF_vGeraldine 0': ['VNF2_INSTANCE_NAME'],
+      'vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0': [],
+      'vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1': ['ss820f_0918_db'],
+      'vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2': [],
       'ExtVL 0': ['NETWORK3_INSTANCE_NAME', 'NETWORK4_INSTANCE_NAME'],
       'Port Mirroring Configuration By Policy 0': [],
     };
@@ -286,9 +295,9 @@ describe('View only drawing board', function () {
                     network2: click -> network selected
      */
     const rightShouldHighlight: { [text: string]: string[] } = {
-      'VNF2_INSTANCE_NAME': ['VF_vMee 0'],
+      'VNF2_INSTANCE_NAME': ['VF_vGeraldine 0'],
       'ss820f_0918_base': [],
-      'ss820f_0918_db': ['vf_vmee0..VfVmee..vmme_vlc..module-1'],
+      'ss820f_0918_db': ['vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1'],
       'NETWORK3_INSTANCE_NAME': ['ExtVL 0'],
       'NETWORK4_INSTANCE_NAME': ['ExtVL 0'],
     };
@@ -312,4 +321,54 @@ describe('View only drawing board', function () {
 
 
   });
+
+  function testComponentInfoForVNF(){
+    const labelsAndValuesForModel = [
+      ['Model version', '2.0'],
+      ['Model customization ID', '91415b44-753d-494c-926a-456a9172bbb9'],
+      ['Min instances', '0'],
+      ['Max instances', '1']
+    ];
+    const extraLabelsAndValuesForInstance = [['Instance type', 'VNF2_INSTANCE_TYPE'],['In maintenance','true'], ['Instance ID', 'VNF2_INSTANCE_ID']];
+    testComponentInfoByType('node-VF_vGeraldine 0', labelsAndValuesForModel,'VNF INFO',
+      'VNF2_INSTANCE_NAME', extraLabelsAndValuesForInstance,'VNF Instance INFO');
+
+  }
+
+  function testComponentInfoForVFMODULE(){
+    const labelsAndValuesForModel = [
+      ['Model version', '2'],
+      ['Model customization ID', '55b1be94-671a-403e-a26c-667e9c47d091'],
+      ['Base module', 'false'],
+      ['Min instances', '0'],
+      ['Initial instances count', '0']
+    ];
+    const extraLabelsAndValuesForInstance = [['In maintenance','true'], ['Instance ID', '2c1ca484-cbc2-408b-ab86-25a2c15ce280']];
+    testComponentInfoByType('node-vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1',labelsAndValuesForModel,'VFModule INFO',
+      'ss820f_0918_db',extraLabelsAndValuesForInstance,'VFModule Instance INFO')
+
+  }
+
+  function testComponentInfoForNetwork(){
+    const labelsAndValuesForModel = [
+      ['Model version', '37.0'],
+      ['Model customization ID', '94fdd893-4a36-4d70-b16a-ec29c54c184f'],
+      ['Network role','network role 1, network role 2']
+    ];
+    const extraLabelsAndValuesForInstance = [['In maintenance','false'], ['Instance ID', 'NETWORK3_INSTANCE_ID'],['Instance type', 'CONTRAIL30_BASIC']];
+    testComponentInfoByType('node-ExtVL 0',labelsAndValuesForModel,'Network INFO',
+      'NETWORK3_INSTANCE_NAME',extraLabelsAndValuesForInstance,'Network Instance INFO');
+
+  }
+
+  function testComponentInfoByType(leftNode:string, labelsAndValuesForModel: string[][], expectedTitleForModel:string, rightNode:string, extraLabelsAndValuesForInstance: string[][], expectedTitleForInstance:string){
+    cy.getElementByDataTestsId(leftNode).eq(0).click({force: true});
+    cy.assertComponentInfoTitleLabelsAndValues(expectedTitleForModel, labelsAndValuesForModel);
+
+    let labelsAndValuesForInstance = labelsAndValuesForModel.concat(extraLabelsAndValuesForInstance);
+    cy.get('drawing-board-tree').contains(rightNode).click();
+    cy.assertComponentInfoTitleLabelsAndValues(expectedTitleForInstance, labelsAndValuesForInstance);
+  }
+
+
 });
diff --git a/vid-webpack-master/cypress/integration/iFrames/vnf.popup.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/vnf.popup.e2e.ts
index e75cf24be..b48f939e2 100644
--- a/vid-webpack-master/cypress/integration/iFrames/vnf.popup.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/vnf.popup.e2e.ts
@@ -20,13 +20,13 @@ describe('Vnf popup', function () {
 
     it('volume group should change on instance name blur if the value is null or empty', function () {
         let redux = getReduxWithVNFS();
-        redux.service.serviceHierarchy['6e59c5de-f052-46fa-aa7e-2fca9d674c44'].vnfs['VF_vMee 0'].properties['ecomp_generated_naming'] = 'false';
-        redux.service.serviceHierarchy['6e59c5de-f052-46fa-aa7e-2fca9d674c44'].vfModules['vf_vmee0..VfVmee..vmme_vlc..module-1']['volumeGroupAllowed'] = true;
+        redux.service.serviceHierarchy['6e59c5de-f052-46fa-aa7e-2fca9d674c44'].vnfs['VF_vGeraldine 0'].properties['ecomp_generated_naming'] = 'false';
+        redux.service.serviceHierarchy['6e59c5de-f052-46fa-aa7e-2fca9d674c44'].vfModules['vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1']['volumeGroupAllowed'] = true;
 
         cy.setReduxState(<any>redux);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=6e59c5de-f052-46fa-aa7e-2fca9d674c44');
 
-        cy.getElementByDataTestsId('node-522159d5-d6e0-4c2a-aa44-5a542a12a830-vf_vmee0..VfVmee..vmme_vlc..module-1-menu-btn').click({force: true})
+        cy.getElementByDataTestsId('node-522159d5-d6e0-4c2a-aa44-5a542a12a830-vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1-menu-btn').click({force: true})
           .getElementByDataTestsId('context-menu-edit').click({force: true})
           .getElementByDataTestsId('form-set').should('not.have.attr', 'disabled')
           .getElementByDataTestsId("instanceName").clear()
@@ -38,7 +38,7 @@ describe('Vnf popup', function () {
         cy.typeToInput('volumeGroupName', 'textAfter');
         cy.getElementByDataTestsId('form-set').click()
           .get('#drawing-board-tree .toggle-children').click()
-          .getElementByDataTestsId('node-522159d5-d6e0-4c2a-aa44-5a542a12a830-vf_vmee0..VfVmee..vmme_vlc..module-1-menu-btn').click({force: true})
+          .getElementByDataTestsId('node-522159d5-d6e0-4c2a-aa44-5a542a12a830-vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1-menu-btn').click({force: true})
           .getElementByDataTestsId('context-menu-edit').click({force: true})
           .getElementByDataTestsId("volumeGroupName").should('have.value', 'someInput1_voltextAfter');
 
@@ -46,11 +46,11 @@ describe('Vnf popup', function () {
 
     it('should display min/max', function () {
       cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
-        res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].vnfs['2017-488_ADIOD-vPE 0'].properties.min_instances = 100;
-        res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].vnfs['2017-488_ADIOD-vPE 0'].properties.max_instances = 200;
+        res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].vnfs['2017-488_PASQUALE-vPE 0'].properties.min_instances = 100;
+        res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].vnfs['2017-488_PASQUALE-vPE 0'].properties.max_instances = 200;
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
-        cy.getElementByDataTestsId('node-2017-488_ADIOD-vPE 0-add-btn').click({force : true});
+        cy.getElementByDataTestsId('node-2017-488_PASQUALE-vPE 0-add-btn').click({force : true});
         cy.getElementByDataTestsId('model-item-label-vnf-min').contains('Minimum to instantiate');
         cy.getElementByDataTestsId('model-item-value-vnf-min').contains('100');
         cy.getElementByDataTestsId('model-item-label-vnf-max').contains('Maximum to instantiate');
@@ -60,11 +60,11 @@ describe('Vnf popup', function () {
 
     it('should display default values for undefined min/max', function () {
       cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
-        res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].vnfs['2017-488_ADIOD-vPE 0'].properties.min_instances = null;
-        res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].vnfs['2017-488_ADIOD-vPE 0'].properties.max_instances = null;
+        res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].vnfs['2017-488_PASQUALE-vPE 0'].properties.min_instances = null;
+        res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].vnfs['2017-488_PASQUALE-vPE 0'].properties.max_instances = null;
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
-        cy.getElementByDataTestsId('node-2017-488_ADIOD-vPE 0-add-btn').click({force : true});
+        cy.getElementByDataTestsId('node-2017-488_PASQUALE-vPE 0-add-btn').click({force : true});
         cy.getElementByDataTestsId('model-item-label-vnf-min').contains('Minimum to instantiate');
         cy.getElementByDataTestsId('model-item-value-vnf-min').contains('0');
         cy.getElementByDataTestsId('model-item-label-vnf-max').contains('Maximum to instantiate');
@@ -74,11 +74,11 @@ describe('Vnf popup', function () {
 
     it('fill all fields of vnf popup', function () {
       cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
-        res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].vnfs['2017-488_ADIOD-vPE 0'].min = null;
-        res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].vnfs['2017-488_ADIOD-vPE 0'].max = null;
+        res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].vnfs['2017-488_PASQUALE-vPE 0'].min = null;
+        res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].vnfs['2017-488_PASQUALE-vPE 0'].max = null;
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
-        cy.getElementByDataTestsId('node-2017-488_ADIOD-vPE 0-add-btn').click({force : true});
+        cy.getElementByDataTestsId('node-2017-488_PASQUALE-vPE 0-add-btn').click({force : true});
         cy.selectDropdownOptionByText('productFamily', 'Emanuel');
         cy.selectDropdownOptionByText('lcpRegion', 'hvf6');
         cy.selectDropdownOptionByText('tenant', 'AIN Web Tool-15-D-STTest2');
@@ -96,15 +96,10 @@ describe('Vnf popup', 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
           },
@@ -125,14 +120,17 @@ describe('Vnf popup', 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": {},
@@ -303,74 +301,74 @@ describe('Vnf popup', 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": {}
                     }
@@ -398,7 +396,7 @@ describe('Vnf popup', function () {
                   "modelCustomizationName": "ExtVL 0"
                 }
               },
-              "collectionResource": {},
+              "collectionResources": {},
               "configurations": {
                 "Port Mirroring Configuration By Policy 0": {
                   "uuid": "b4398538-e89d-4f13-b33d-ca323434ba50",
@@ -419,72 +417,72 @@ describe('Vnf popup', 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": {}
                 }
@@ -495,19 +493,19 @@ describe('Vnf popup', function () {
           "serviceInstance": {
             "6e59c5de-f052-46fa-aa7e-2fca9d674c44": {
               "vnfs": {
-                "VF_vMee 0": {
-                  "originalName": "VF_vMee 0",
+                "VF_vGeraldine 0": {
+                  "originalName": "VF_vGeraldine 0",
                   "rollbackOnFailure": "true",
                   "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,
                         "instanceParams": [
@@ -517,7 +515,7 @@ describe('Vnf popup', function () {
                     }
                   },
                   "isMissingData": false,
-                  "modelName": "VF_vMee 0",
+                  "modelName": "VF_vGeraldine 0",
                   "productFamilyId": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e",
                   "lcpCloudRegionId": "hvf6",
                   "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054",
@@ -526,10 +524,10 @@ describe('Vnf popup', 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"
                   }
                 }
               },
@@ -565,8 +563,8 @@ describe('Vnf popup', function () {
           "lcpRegionsAndTenants": {
             "lcpRegionList": [
               {
-                "id": "JANET25",
-                "name": "JANET25 (AIC)",
+                "id": "AAIAIC25",
+                "name": "AAIAIC25 (AIC)",
                 "cloudOwner" : "irma-aic",
                 "isPermitted": true
               },
@@ -578,7 +576,7 @@ describe('Vnf popup', function () {
               }
             ],
             "lcpRegionsTenantsMap": {
-              "JANET25": [
+              "AAIAIC25": [
                 {
                   "id": "092eb9e8e4b7412e8787dd091bc58e86",
                   "name": "USP-SIP-IC-24335-T-01",
@@ -592,8 +590,128 @@ describe('Vnf popup', 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
                 },
                 {
@@ -602,6 +720,16 @@ describe('Vnf popup', function () {
                   "isPermitted": true
                 },
                 {
+                  "id": "4914ab0ab3a743e58f0eefdacc1dde77",
+                  "name": "DN5242-Nov21-T1",
+                  "isPermitted": true
+                },
+                {
+                  "id": "d0a3e3f2964542259d155a81c41aadc3",
+                  "name": "test-hvf6-09",
+                  "isPermitted": true
+                },
+                {
                   "id": "cbb99fe4ada84631b7baf046b6fd2044",
                   "name": "DN5242-Nov16-T3",
                   "isPermitted": true
@@ -689,7 +817,7 @@ describe('Vnf popup', function () {
           "productFamilies": [
             {
               "id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-              "name": "SCOTTIE",
+              "name": "ERICA",
               "isPermitted": true
             },
             {
@@ -714,7 +842,7 @@ describe('Vnf popup', function () {
             },
             {
               "id": "323d69d9-2efe-4r45-ay0a-89ea7ard4e6f",
-              "name": "vSCP",
+              "name": "vEsmeralda",
               "isPermitted": true
             },
             {
@@ -758,7 +886,7 @@ describe('Vnf popup', function () {
               "isPermitted": true
             },
             {
-              "id": "Cisneros",
+              "id": "vMuriel",
               "name": "vMuriel",
               "isPermitted": true
             },
@@ -784,7 +912,7 @@ describe('Vnf popup', function () {
             },
             {
               "id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
-              "name": "Josefina",
+              "name": "JOSEFINA",
               "isPermitted": true
             },
             {
@@ -832,7 +960,7 @@ describe('Vnf popup', function () {
               },
               {
                 "id": "6",
-                "name": "vSEGW",
+                "name": "vPorfirio",
                 "isPermitted": false
               },
               {
@@ -847,7 +975,7 @@ describe('Vnf popup', function () {
               },
               {
                 "id": "9",
-                "name": "vMME",
+                "name": "vFLORENCE",
                 "isPermitted": false
               },
               {
@@ -857,7 +985,7 @@ describe('Vnf popup', function () {
               },
               {
                 "id": "11",
-                "name": "vSCP",
+                "name": "vEsmeralda",
                 "isPermitted": false
               },
               {
@@ -867,7 +995,7 @@ describe('Vnf popup', function () {
               },
               {
                 "id": "13",
-                "name": "vMMSC",
+                "name": "vWINIFRED",
                 "isPermitted": false
               },
               {
@@ -911,6 +1039,754 @@ describe('Vnf popup', function () {
               "name": "UUUAIAAI-YYY1"
             },
             {
+              "id": "BAN1",
+              "name": "VSDKYUTP-BAN1"
+            },
+            {
+              "id": "DKJ1",
+              "name": "DKJSJDKA-DKJ1"
+            },
+            {
+              "id": "MCS1",
+              "name": "ASACMAMS-MCS1"
+            },
+            {
+              "id": "UIO1",
+              "name": "uioclli1-UIO1"
+            },
+            {
+              "id": "RAJ1",
+              "name": "YGBIJNLQ-RAJ1"
+            },
+            {
+              "id": "OPA1",
+              "name": "opaclli1-OPA1"
+            },
+            {
+              "id": "SDE1",
+              "name": "ZXCVBNMA-SDE1"
+            },
+            {
+              "id": "VEN2",
+              "name": "FGHJUHIL-VEN2"
+            },
+            {
+              "id": "ORL1",
+              "name": "ORLDFLMA-ORL1"
+            },
+            {
+              "id": "JAD1",
+              "name": "JADECLLI-JAD1"
+            },
+            {
+              "id": "ZXL1",
+              "name": "LWLWCANN-ZXL1"
+            },
+            {
+              "id": "CKL1",
+              "name": "CLKSKCKK-CKL1"
+            },
+            {
+              "id": "SDF1",
+              "name": "sdfclli1-SDF1"
+            },
+            {
+              "id": "RAD1",
+              "name": "RADICAL1-RAD1"
+            },
+            {
+              "id": "KIT1",
+              "name": "BHYJFGLN-KIT1"
+            },
+            {
+              "id": "REL1",
+              "name": "INGERFGT-REL1"
+            },
+            {
+              "id": "JNL1",
+              "name": "CJALSDAC-JNL1"
+            },
+            {
+              "id": "OLK1",
+              "name": "OLKOLKLS-OLK1"
+            },
+            {
+              "id": "CHI1",
+              "name": "CHILLIWE-CHI1"
+            },
+            {
+              "id": "UUU4",
+              "name": "UUUAAAUU-UUU4"
+            },
+            {
+              "id": "TUF1",
+              "name": "TUFCLLI1-TUF1"
+            },
+            {
+              "id": "KJN1",
+              "name": "CKALDKSA-KJN1"
+            },
+            {
+              "id": "SAM1",
+              "name": "SNDGCA64-SAN1"
+            },
+            {
+              "id": "SCK1",
+              "name": "SCKSCKSK-SCK1"
+            },
+            {
+              "id": "HJH1",
+              "name": "AOEEQQQD-HJH1"
+            },
+            {
+              "id": "HGD1",
+              "name": "SDFQWHGD-HGD1"
+            },
+            {
+              "id": "KOR1",
+              "name": "HYFLNBVT-KOR1"
+            },
+            {
+              "id": "ATL43",
+              "name": "AICLOCID-ATL43"
+            },
+            {
+              "id": "ATL54",
+              "name": "AICFTAAI-ATL54"
+            },
+            {
+              "id": "ATL66",
+              "name": "CLLIAAII-ATL66"
+            },
+            {
+              "id": "VEL1",
+              "name": "BNMLKUIK-VEL1"
+            },
+            {
+              "id": "ICC1",
+              "name": "SANJITAT-ICC1"
+            },
+            {
+              "id": "MNT11",
+              "name": "WSXEFBTH-MNT11"
+            },
+            {
+              "id": "DEF2",
+              "name": "WSBHGTYL-DEF2"
+            },
+            {
+              "id": "MAD11",
+              "name": "SDFQWGKL-MAD11"
+            },
+            {
+              "id": "OLG1",
+              "name": "OLHOLHOL-OLG1"
+            },
+            {
+              "id": "GAR1",
+              "name": "NGFVSJKO-GAR1"
+            },
+            {
+              "id": "SAN22",
+              "name": "GNVLSCTL-SAN22"
+            },
+            {
+              "id": "HRG1",
+              "name": "HRGHRGGS-HRG1"
+            },
+            {
+              "id": "JCS1",
+              "name": "JCSJSCJS-JCS1"
+            },
+            {
+              "id": "DHA12",
+              "name": "WSXEDECF-DHA12"
+            },
+            {
+              "id": "HJE1",
+              "name": "AOEEWWWD-HJE1"
+            },
+            {
+              "id": "NCA1",
+              "name": "NCANCANN-NCA1"
+            },
+            {
+              "id": "IOP1",
+              "name": "iopclli1-IOP1"
+            },
+            {
+              "id": "RTY1",
+              "name": "rtyclli1-RTY1"
+            },
+            {
+              "id": "KAP1",
+              "name": "HIOUYTRQ-KAP1"
+            },
+            {
+              "id": "ZEN1",
+              "name": "ZENCLLI1-ZEN1"
+            },
+            {
+              "id": "HKA1",
+              "name": "JAKHLASS-HKA1"
+            },
+            {
+              "id": "CQK1",
+              "name": "CQKSCAKK-CQK1"
+            },
+            {
+              "id": "SAI1",
+              "name": "UBEKQLPD-SAI1"
+            },
+            {
+              "id": "ERT1",
+              "name": "ertclli1-ERT1"
+            },
+            {
+              "id": "IBB1",
+              "name": "PLMKOIJU-IBB1"
+            },
+            {
+              "id": "TIR2",
+              "name": "PLKINHYI-TIR2"
+            },
+            {
+              "id": "HSD1",
+              "name": "CHASKCDS-HSD1"
+            },
+            {
+              "id": "SLF78",
+              "name": "SDCTLFN1-SLF78"
+            },
+            {
+              "id": "SEE78",
+              "name": "SDCTEEE4-SEE78"
+            },
+            {
+              "id": "SAN13",
+              "name": "TOKYJPFA-SAN13"
+            },
+            {
+              "id": "SAA78",
+              "name": "SDCTAAA1-SAA78"
+            },
+            {
+              "id": "LUC1",
+              "name": "ATLDFGYC-LUC1"
+            },
+            {
+              "id": "AMD13",
+              "name": "MEMATLAN-AMD13"
+            },
+            {
+              "id": "TOR1",
+              "name": "TOROONXN-TOR1"
+            },
+            {
+              "id": "QWE1",
+              "name": "QWECLLI1-QWE1"
+            },
+            {
+              "id": "ZOG1",
+              "name": "ZOGASTRO-ZOG1"
+            },
+            {
+              "id": "CAL33",
+              "name": "CALIFORN-CAL33"
+            },
+            {
+              "id": "SHH78",
+              "name": "SDIT1HHH-SHH78"
+            },
+            {
+              "id": "DSA1",
+              "name": "LKJHGFDS-DSA1"
+            },
+            {
+              "id": "CLG1",
+              "name": "CLGRABAD-CLG1"
+            },
+            {
+              "id": "BNA1",
+              "name": "BNARAGBK-BNA1"
+            },
+            {
+              "id": "ATL84",
+              "name": "CANTTCOC-ATL84"
+            },
+            {
+              "id": "APP1",
+              "name": "WBHGTYUI-APP1"
+            },
+            {
+              "id": "RJN1",
+              "name": "RJNRBZAW-RJN1"
+            },
+            {
+              "id": "EHH78",
+              "name": "SDCSHHH5-EHH78"
+            },
+            {
+              "id": "mac10",
+              "name": "PKGTESTF-mac10"
+            },
+            {
+              "id": "SXB78",
+              "name": "SDCTGXB1-SXB78"
+            },
+            {
+              "id": "SAX78",
+              "name": "SDCTAXG1-SAX78"
+            },
+            {
+              "id": "SYD1",
+              "name": "SYDNAUBV-SYD1"
+            },
+            {
+              "id": "TOK1",
+              "name": "TOKYJPFA-TOK1"
+            },
+            {
+              "id": "KGM2",
+              "name": "KGMTNC20-KGM2"
+            },
+            {
+              "id": "DCC1b",
+              "name": "POIUYTGH-DCC1b"
+            },
+            {
+              "id": "SKK78",
+              "name": "SDCTKKK1-SKK78"
+            },
+            {
+              "id": "SGG78",
+              "name": "SDCTGGG1-SGG78"
+            },
+            {
+              "id": "SJJ78",
+              "name": "SDCTJJJ1-SJJ78"
+            },
+            {
+              "id": "SBX78",
+              "name": "SDCTBXG1-SBX78"
+            },
+            {
+              "id": "LAG1",
+              "name": "LARGIZON-LAG1"
+            },
+            {
+              "id": "IAA1",
+              "name": "QAZXSWED-IAA1"
+            },
+            {
+              "id": "POI1",
+              "name": "PLMNJKIU-POI1"
+            },
+            {
+              "id": "LAG1a",
+              "name": "LARGIZON-LAG1a"
+            },
+            {
+              "id": "PBL1",
+              "name": "PBLAPBAI-PBL1"
+            },
+            {
+              "id": "LAG45",
+              "name": "LARGIZON-LAG1a"
+            },
+            {
+              "id": "MAR1",
+              "name": "MNBVCXZM-MAR1"
+            },
+            {
+              "id": "HST70",
+              "name": "HSTNTX70-HST70"
+            },
+            {
+              "id": "DCC1a",
+              "name": "POIUYTGH-DCC1a"
+            },
+            {
+              "id": "TOL1",
+              "name": "TOLDOH21-TOL1"
+            },
+            {
+              "id": "LON1",
+              "name": "LONEENCO-LON1"
+            },
+            {
+              "id": "SJU78",
+              "name": "SDIT1JUB-SJU78"
+            },
+            {
+              "id": "STN27",
+              "name": "HSTNTX01-STN27"
+            },
+            {
+              "id": "SSW56",
+              "name": "ss8126GT-SSW56"
+            },
+            {
+              "id": "SBB78",
+              "name": "SDIT1BBB-SBB78"
+            },
+            {
+              "id": "DCC3",
+              "name": "POIUYTGH-DCC3"
+            },
+            {
+              "id": "GNV1",
+              "name": "GNVLSCTL-GNV1"
+            },
+            {
+              "id": "WAS1",
+              "name": "WASHDCSW-WAS1"
+            },
+            {
+              "id": "TOY1",
+              "name": "TORYONNZ-TOY1"
+            },
+            {
+              "id": "STT1",
+              "name": "STTLWA02-STT1"
+            },
+            {
+              "id": "STG1",
+              "name": "STTGGE62-STG1"
+            },
+            {
+              "id": "SLL78",
+              "name": "SDCTLLL1-SLL78"
+            },
+            {
+              "id": "SBU78",
+              "name": "SDIT1BUB-SBU78"
+            },
+            {
+              "id": "ATL2",
+              "name": "ATLNGANW-ATL2"
+            },
+            {
+              "id": "BOT1",
+              "name": "BOTHWAKY-BOT1"
+            },
+            {
+              "id": "SNG1",
+              "name": "SNGPSIAU-SNG1"
+            },
+            {
+              "id": "NYC1",
+              "name": "NYCMNY54-NYC1"
+            },
+            {
+              "id": "LAG1b",
+              "name": "LARGIZON-LAG1b"
+            },
+            {
+              "id": "AMD15",
+              "name": "AMDFAA01-AMD15"
+            },
+            {
+              "id": "SNA1",
+              "name": "SNANTXCA-SNA1"
+            },
+            {
+              "id": "PLT1",
+              "name": "PLTNCA60-PLT1"
+            },
+            {
+              "id": "TLP1",
+              "name": "TLPNXM18-TLP1"
+            },
+            {
+              "id": "SDD81",
+              "name": "SAIT1DD6-SDD81"
+            },
+            {
+              "id": "DCC1",
+              "name": "POIUYTGH-DCC1"
+            },
+            {
+              "id": "DCC2",
+              "name": "POIUYTGH-DCC2"
+            },
+            {
+              "id": "OKC1",
+              "name": "OKCBOK55-OKC1"
+            },
+            {
+              "id": "PAR1",
+              "name": "PARSFRCG-PAR1"
+            },
+            {
+              "id": "TES36",
+              "name": "ABCEETES-TES36"
+            },
+            {
+              "id": "COM1",
+              "name": "PLMKOPIU-COM1"
+            },
+            {
+              "id": "ANI1",
+              "name": "ATLNGTRE-ANI1"
+            },
+            {
+              "id": "SDG78",
+              "name": "SDIT1BDG-SDG78"
+            },
+            {
+              "id": "mac20",
+              "name": "PKGTESTF-mac20"
+            },
+            {
+              "id": "DSF45",
+              "name": "DSFBG123-DSF45"
+            },
+            {
+              "id": "HST25",
+              "name": "HSTNTX01-HST25"
+            },
+            {
+              "id": "AMD18",
+              "name": "AUDIMA01-AMD18"
+            },
+            {
+              "id": "SAA80",
+              "name": "SAIT9AA3-SAA80"
+            },
+            {
+              "id": "SSA56",
+              "name": "SSIT2AA7-SSA56"
+            },
+            {
+              "id": "SDD82",
+              "name": "SAIT1DD9-SDD82"
+            },
+            {
+              "id": "JCV1",
+              "name": "JCVLFLBW-JCV1"
+            },
+            {
+              "id": "SUL2",
+              "name": "WERTYUJK-SUL2"
+            },
+            {
+              "id": "PUR1",
+              "name": "purelyde-PUR1"
+            },
+            {
+              "id": "FDE55",
+              "name": "FDERT555-FDE55"
+            },
+            {
+              "id": "SITE",
+              "name": "LONEENCO-SITE"
+            },
+            {
+              "id": "ATL1",
+              "name": "ATLNGAMA-ATL1"
+            },
+            {
+              "id": "JUL1",
+              "name": "ZXCVBNMM-JUL1"
+            },
+            {
+              "id": "TAT34",
+              "name": "TESAAISB-TAT34"
+            },
+            {
+              "id": "XCP12",
+              "name": "CHKGH123-XCP12"
+            },
+            {
+              "id": "RAI1",
+              "name": "poiuytre-RAI1"
+            },
+            {
+              "id": "HPO1",
+              "name": "ATLNGAUP-HPO1"
+            },
+            {
+              "id": "KJF12",
+              "name": "KJFDH123-KJF12"
+            },
+            {
+              "id": "SCC80",
+              "name": "SAIT9CC3-SCC80"
+            },
+            {
+              "id": "SAA12",
+              "name": "SAIT9AF8-SAA12"
+            },
+            {
+              "id": "SAA14",
+              "name": "SAIT1AA9-SAA14"
+            },
+            {
+              "id": "ATL35",
+              "name": "TTESSAAI-ATL35"
+            },
+            {
+              "id": "CWY1",
+              "name": "CWYMOWBS-CWY1"
+            },
+            {
+              "id": "ATL76",
+              "name": "TELEPAAI-ATL76"
+            },
+            {
+              "id": "DSL12",
+              "name": "DSLFK242-DSL12"
+            },
+            {
+              "id": "ATL53",
+              "name": "AAIATLTE-ATL53"
+            },
+            {
+              "id": "SAA11",
+              "name": "SAIT9AA2-SAA11"
+            },
+            {
+              "id": "ATL62",
+              "name": "TESSASCH-ATL62"
+            },
+            {
+              "id": "AUG1",
+              "name": "ASDFGHJK-AUG1"
+            },
+            {
+              "id": "POI22",
+              "name": "POIUY123-POI22"
+            },
+            {
+              "id": "SAA13",
+              "name": "SAIT1AA9-SAA13"
+            },
+            {
+              "id": "BHY17",
+              "name": "BHYTFRF3-BHY17"
+            },
+            {
+              "id": "LIS1",
+              "name": "HOSTPROF-LIS1"
+            },
+            {
+              "id": "SIP1",
+              "name": "ZXCVBNMK-SIP1"
+            },
+            {
+              "id": "ATL99",
+              "name": "TEESTAAI-ATL43"
+            },
+            {
+              "id": "ATL64",
+              "name": "FORLOAAJ-ATL64"
+            },
+            {
+              "id": "TAT33",
+              "name": "TESAAISA-TAT33"
+            },
+            {
+              "id": "RAD10",
+              "name": "INDIPUNE-RAD10"
+            },
+            {
+              "id": "RTW5",
+              "name": "BHYTFRY4-RTW5"
+            },
+            {
+              "id": "JGS1",
+              "name": "KSJKKKKK-JGS1"
+            },
+            {
+              "id": "ATL98",
+              "name": "TEESTAAI-ATL43"
+            },
+            {
+              "id": "WAN1",
+              "name": "LEIWANGW-WAN1"
+            },
+            {
+              "id": "ATL44",
+              "name": "ATLSANAB-ATL44"
+            },
+            {
+              "id": "RTD2",
+              "name": "BHYTFRk4-RTD2"
+            },
+            {
+              "id": "NIR1",
+              "name": "ORFLMANA-NIR1"
+            },
+            {
+              "id": "ATL75",
+              "name": "SANAAIRE-ATL75"
+            },
+            {
+              "id": "NUM1",
+              "name": "QWERTYUI-NUM1"
+            },
+            {
+              "id": "hvf32",
+              "name": "MDTWNJ21-hvf32"
+            },
+            {
+              "id": "RTZ4",
+              "name": "BHYTFRZ6-RTZ4"
+            },
+            {
+              "id": "ATL56",
+              "name": "ATLSANAC-ATL56"
+            },
+            {
+              "id": "AMS1",
+              "name": "AMSTNLBW-AMS1"
+            },
+            {
+              "id": "RCT1",
+              "name": "AMSTERNL-RCT1"
+            },
+            {
+              "id": "JAN1",
+              "name": "ORFLMATT-JAN1"
+            },
+            {
+              "id": "ABC14",
+              "name": "TESAAISA-ABC14"
+            },
+            {
+              "id": "TAT37",
+              "name": "TESAAISD-TAT37"
+            },
+            {
+              "id": "MIC54",
+              "name": "MICHIGAN-MIC54"
+            },
+            {
+              "id": "ABC11",
+              "name": "ATLSANAI-ABC11"
+            },
+            {
+              "id": "AMF11",
+              "name": "AMDOCS01-AMF11"
+            },
+            {
+              "id": "ATL63",
+              "name": "ATLSANEW-ATL63"
+            },
+            {
+              "id": "ABC12",
+              "name": "ATLSECIA-ABC12"
+            },
+            {
+              "id": "hvf20",
+              "name": "MDTWNJ21-hvf20"
+            },
+            {
+              "id": "ABC15",
+              "name": "AAITESAN-ABC15"
+            },
+            {
               "id": "AVT1",
               "name": "AVTRFLHD-AVT1"
             },
diff --git a/vid-webpack-master/cypress/integration/iFrames/vnf.update.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/vnf.update.e2e.ts
new file mode 100644
index 000000000..4d2d7dbaf
--- /dev/null
+++ b/vid-webpack-master/cypress/integration/iFrames/vnf.update.e2e.ts
@@ -0,0 +1,94 @@
+///<reference path="../../../node_modules/cypress/types/index.d.ts"/>
+import {JsonBuilder} from '../../support/jsonBuilders/jsonBuilder';
+import {ServiceModel} from '../../support/jsonBuilders/models/service.model';
+import {AsyncInstantiationModel} from "../../support/jsonBuilders/models/asyncInstantiation.model";
+
+describe('Delete vnf instance', function () {
+  let jsonBuilderAndMock: JsonBuilder<ServiceModel> = new JsonBuilder<ServiceModel>();
+
+  let jsonBuilderInstantiationBuilder: JsonBuilder<AsyncInstantiationModel> = new JsonBuilder<AsyncInstantiationModel>();
+
+  beforeEach(() => {
+    cy.window().then((win) => {
+      win.sessionStorage.clear();
+      cy.preventErrorsOnLoading();
+      cy.initAAIMock();
+      cy.initVidMock();
+      cy.initZones();
+      cy.permissionVidMock();
+      cy.login();
+    });
+  });
+
+  afterEach(() => {
+    cy.screenshot();
+  });
+
+  it(`Update vnf - add 1 delete 1`, function () {
+    const SUBSCRIBER_ID: string = "e433710f-9217-458d-a79d-1c7aff376d89";
+    const SERVICE_TYPE: string = "TYLER SILVIA";
+    const SERVICE_INSTANCE_ID: string = "f8791436-8d55-4fde-b4d5-72dd2cf13cfb";
+    const SERVICE_MODEL_ID: string = '6b528779-44a3-4472-bdff-9cd15ec93450';
+
+    cy.server().route({
+      url: Cypress.config('baseUrl') + '/asyncInstantiation/bulk',
+      method: 'POST',
+      status: 200,
+      response: "[]",
+    }).as("expectedPostAsyncInstantiation");
+
+    cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/serviceModels/ecompNamingFalseModel.json').then((res) => {
+      res.service.vidNotions.instantiationType = 'ALaCarte';
+      jsonBuilderAndMock.basicJson(
+        res,
+        Cypress.config('baseUrl') + "/rest/models/services/6b528779-44a3-4472-bdff-9cd15ec93450",
+        200,
+        0,
+        "ecompNamingFalseModel",
+      )
+    });
+
+    cy.readFile('../vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json').then((res) => {
+      res.networks = {};
+      res.isALaCarte = true;
+      res.instanceId = "f8791436-8d55-4fde-b4d5-72dd2cf13cfb";
+
+      const vnf = res.vnfs['2017-488_PASQUALE-vPE 0'];
+      vnf.instanceId = "VNF_INSTANCE_ID";
+      vnf.vfModules['2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0']['2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot'].instanceId = "VF_MODULE_BASE_INSTANCE_ID";
+      vnf.vfModules['2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1']['2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1fshmc'].instanceId = "VF_MODULE_INSTANCE_ID";
+
+      jsonBuilderAndMock.basicJson(
+        res,
+        Cypress.config('baseUrl') + "/aai_get_service_instance_topology/e433710f-9217-458d-a79d-1c7aff376d89/TYLER SILVIA/f8791436-8d55-4fde-b4d5-72dd2cf13cfb",
+        200, 0,
+        "initServiceInstanceTopology",
+      )
+    });
+
+    cy.openIframe(`app/ui/#/servicePlanning/EDIT?serviceModelId=${SERVICE_MODEL_ID}&subscriberId=${SUBSCRIBER_ID}&serviceType=${SERVICE_TYPE}&serviceInstanceId=${SERVICE_INSTANCE_ID}`);
+
+    // add a vnf on update mode
+    cy.drawingBoardPressAddButtonByElementName('node-2017-388_PASQUALE-vPE 0').click({force: true});
+    cy.selectDropdownOptionByText('rollback', 'Rollback');
+    cy.fillVnfPopup();
+
+    // delete VNF
+    cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_PASQUALE-vPE 0', 0)
+      .drawingBoardTreeClickOnContextMenuOptionByName('Delete');
+
+    // update service
+    cy.getDrawingBoardDeployBtn().click();
+
+    cy.getReduxState().then((state) => {
+      const vnf = state.service.serviceInstance[SERVICE_MODEL_ID].vnfs["2017-388_PASQUALE-vPE 0_1"];
+      cy.wait('@expectedPostAsyncInstantiation').then(xhr => {
+        cy.readFile('../vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json').then((expectedResult) => {
+          expectedResult.vnfs["2017-388_PASQUALE-vPE 0_1"].trackById = vnf.trackById;
+          cy.deepCompare(xhr.request.body, expectedResult);
+        });
+      });
+    });
+  });
+
+});
diff --git a/vid-webpack-master/cypress/integration/iFrames/vnfGroups.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/vnfGroups.e2e.ts
index 5db0c751d..f9c188bd7 100644
--- a/vid-webpack-master/cypress/integration/iFrames/vnfGroups.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/vnfGroups.e2e.ts
@@ -145,6 +145,7 @@ describe('Vnf Groups', function () {
 
           reduxRes.service.serviceHierarchy[SERVICE_MODEL_ID] = serviceModel;
           reduxRes.service.serviceInstance[SERVICE_MODEL_ID] = basicServiceInstance;
+          reduxRes.global.genericModalHelper = {};
 
           cy.setReduxState(<any>reduxRes);
 
@@ -205,6 +206,7 @@ describe('Vnf Groups', function () {
         });
 
         cy.openIframe(`app/ui/#/servicePlanning/EDIT?serviceModelId=${SERVICE_MODEL_ID}&subscriberId=${SUBSCRIBER_ID}&serviceType=${SERVICE_TYPE}&serviceInstanceId=${SERVICE_INSTANCE_ID}`);
+        cy.getElementByDataTestsId('orchStatusValue').should('not.have.class', 'tag-status-value');
         cy.getElementByDataTestsId('openMenuBtn').click();
         cy.getElementByDataTestsId('context-menu-header-delete-item').should('have.text', 'Delete');
         cy.getElementByDataTestsId('context-menu-header-delete-item').click();
@@ -545,7 +547,7 @@ describe('Vnf Groups', function () {
         });
       });
 
-      it(`vnf group with vnf members, add group members option open modal"`, () => {
+      it(`vnf group with vnf members, add group members option open modal`, () => {
         const SUBSCRIBER_ID: string = "global-customer-id";
         const SERVICE_TYPE: string = "service-instance-type";
         const SERVICE_INSTANCE_ID: string = "f8791436-8d55-4fde-b4d5-72dd2cf13cfb";
@@ -594,17 +596,16 @@ describe('Vnf Groups', function () {
         cy.getElementByDataTestsId('node-daeb6568-cef8-417f-9075-ed259ce59f48-groupingservicefortest..ResourceInstanceGroup..0-menu-btn')
           .eq(0).click({force: true}).then(() => {
           cy.getElementByDataTestsId('context-menu-addGroupMember').click({force: true}).then(() => {
-            cy.getElementByDataTestsId('sourceModelName').contains("vDBE_Svc_vPRS");
+            cy.getElementByDataTestsId('sourceModelName').contains("vDOROTHEA_Svc_vPRS");
             cy.getElementByDataTestsId('sourceModelInvariant').contains("24632e6b-584b-4f45-80d4-fefd75fd9f14");
             cy.get('#vnfName').eq(0).get('#VNF1_INSTANCE_NAME').contains('VNF1_INSTANCE_NAME');
             cy.get('#vnfName').eq(0).get('#VNF1_INSTANCE_ID').contains('VNF1_INSTANCE_ID');
-            cy.getElementByDataTestsId('total-amount').should('have.text', '4 VNFs match your criteria');
+            cy.getElementByDataTestsId('total-amount').should('have.text', '4 VNFs match your criteria |');
             cy.getElementByDataTestsId('total-selected').should('have.text', '0 VNF selected');
             cy.getElementByDataTestsId('setMembersBtn').should('have.attr', 'disabled');
             testCheckbox();
             testResetAddMemberModal();
             testUpdateBtn();
-
           });
         });
       });
@@ -650,7 +651,7 @@ describe('Vnf Groups', function () {
         cy.getElementByDataTestsId('node-daeb6568-cef8-417f-9075-ed259ce59f48-groupingservicefortest..ResourceInstanceGroup..0-menu-btn')
           .eq(0).click({force: true}).then(() => {
           cy.getElementByDataTestsId('context-menu-addGroupMember').click({force: true}).then(() => {
-            cy.getElementByDataTestsId('total-amount').should('have.text', '0 VNFs match your criteria');
+            cy.getElementByDataTestsId('total-amount').should('have.text', '0 VNFs match your criteria |');
             cy.getElementByDataTestsId('total-selected').should('have.text', '0 VNF selected');
             cy.get('.no-result').should('have.text', 'No VNFs were found that can belong to this group.');
           });
@@ -714,22 +715,10 @@ describe('Vnf Groups', function () {
           cy.getElementByDataTestsId('node-' + NODE_ID + '-' + GROUP_NAME_TO_DEPLOY + '-menu-btn').each((row, index) => {
             cy.wrap(row).click({force: true}).then(() => {
               cy.getElementByDataTestsId('context-menu-addGroupMember').click({force: true}).then(() => {
-                cy.getElementByDataTestsId('total-amount').should('have.text', '4 VNFs match your criteria');
-                cy.get('.allCheckboxAreSelected input').click({force: true});
-                cy.getElementByDataTestsId('setMembersBtn').click({force: true}).then(() => {
-                  checkIsErrorAppear(true, 'node-' + NODE_ID + '-' + GROUP_NAME_TO_DEPLOY, 3, index);
-                  cy.get('.toggle-children').click({force: true}).then(() => {
-                    let memberIndex = 3;
-                    while (!index && memberIndex >= 0) {
-                      clickOnVnfMemberAndAssertScaling(memberIndex--, 'context-menu-remove', false, FULL_GROUP_NAME, 3, index);
-                    }
-                  });
-                });
+
               });
             });
           });
-          clickOnVnfMemberAndAssertScaling(0, 'context-menu-remove', false, FULL_GROUP_NAME, 3, 1);
-          cy.getElementByDataTestsId('deployBtn').should('have.text', 'DEPLOY').click();
         });
       });
 
@@ -786,7 +775,7 @@ describe('Vnf Groups', function () {
         cy.getElementByDataTestsId('node-' + NODE_ID + '-' + GROUP_NAME_TO_DEPLOY + '-menu-btn')
           .eq(0).click({force: true}).then(() => {
           cy.getElementByDataTestsId('context-menu-addGroupMember').click({force: true}).then(() => {
-            cy.getElementByDataTestsId('total-amount').should('have.text', '4 VNFs match your criteria');
+            cy.getElementByDataTestsId('total-amount').should('have.text', '4 VNFs match your criteria |');
             cy.get('.allCheckboxAreSelected input').click({force: true});
             cy.getElementByDataTestsId('setMembersBtn').click({force: true}).then(() => {
               checkIsErrorAppear(true, FULL_GROUP_NAME, 4, 0);
@@ -824,32 +813,32 @@ describe('Vnf Groups', function () {
         let totalNumber = 4;
         cy.get('.allCheckboxAreSelected input').click({force: true});
         cy.getElementByDataTestsId('setMembersBtn').should('not.have.attr', 'disabled');
-        cy.getElementByDataTestsId('numberOfNotHideVnfMembers').contains(totalNumber);
-        cy.getElementByDataTestsId('numberOfSelectedVnfMembers').contains(totalNumber);
+        cy.getElementByDataTestsId('numberOfNotHideRows').contains(totalNumber);
+        cy.getElementByDataTestsId('numberOfSelectedRows').contains(totalNumber);
         cy.get('.sdcCheckboxMember input').eq(0).click({force: true});
-        cy.getElementByDataTestsId('numberOfSelectedVnfMembers').contains(totalNumber - 1);
+        cy.getElementByDataTestsId('numberOfSelectedRows').contains(totalNumber - 1);
         cy.get('.sdcCheckboxMember input').eq(1).click({force: true});
-        cy.getElementByDataTestsId('numberOfSelectedVnfMembers').contains(totalNumber - 2);
+        cy.getElementByDataTestsId('numberOfSelectedRows').contains(totalNumber - 2);
         cy.get('.allCheckboxAreSelected input').click({force: true});
-        cy.getElementByDataTestsId('numberOfSelectedVnfMembers').contains(totalNumber);
+        cy.getElementByDataTestsId('numberOfSelectedRows').contains(totalNumber);
         cy.get('.allCheckboxAreSelected input').click({force: true});
-        cy.getElementByDataTestsId('numberOfSelectedVnfMembers').contains(0);
+        cy.getElementByDataTestsId('numberOfSelectedRows').contains(0);
 
         cy.getElementByDataTestsId("vnf-members-search").find('input').type("2.0");
-        cy.getElementByDataTestsId('numberOfNotHideVnfMembers').contains(1);
+        cy.getElementByDataTestsId('numberOfNotHideRows').contains(1);
         cy.getElementByDataTestsId("vnf-members-search").find('input').clear().type("vnf1");
-        cy.getElementByDataTestsId('numberOfNotHideVnfMembers').contains(1);
+        cy.getElementByDataTestsId('numberOfNotHideRows').contains(1);
         cy.get('.allCheckboxAreSelected input').click({force: true});
-        cy.getElementByDataTestsId('numberOfSelectedVnfMembers').contains(1);
+        cy.getElementByDataTestsId('numberOfSelectedRows').contains(1);
         cy.getElementByDataTestsId("vnf-members-search").find('input').clear();
-        cy.getElementByDataTestsId('numberOfSelectedVnfMembers').contains(1);
+        cy.getElementByDataTestsId('numberOfSelectedRows').contains(1);
 
         cy.getElementByDataTestsId('setMembersBtn').click({force: true});
         //check second time behavior (selected VNFs should be filtered)
         cy.getElementByDataTestsId('node-daeb6568-cef8-417f-9075-ed259ce59f48-groupingservicefortest..ResourceInstanceGroup..0-menu-btn')
           .eq(1).click({force: true}).then(() => {
           cy.getElementByDataTestsId('context-menu-addGroupMember').click({force: true}).then(() => {
-            cy.getElementByDataTestsId('numberOfNotHideVnfMembers').contains(totalNumber - 1);
+            cy.getElementByDataTestsId('numberOfNotHideRows').contains(totalNumber - 1);
             cy.getElementByDataTestsId('cancelBtn').click({force: true});
           });
         });
@@ -859,7 +848,7 @@ describe('Vnf Groups', function () {
         cy.getElementByDataTestsId('node-groupingservicefortest..ResourceInstanceGroup..1-add-btn').click({force: true})
           .getElementByDataTestsId('node-c2b300e6-45de-4e5e-abda-3032bee2de56-groupingservicefortest..ResourceInstanceGroup..1-menu-btn').eq(0).click({force: true}).then(() => {
           cy.getElementByDataTestsId('context-menu-addGroupMember').click({force: true}).then(() => {
-            cy.getElementByDataTestsId('numberOfNotHideVnfMembers').contains(0);
+            cy.getElementByDataTestsId('numberOfNotHideRows').contains(0);
             cy.getElementByDataTestsId('cancelBtn').click({force: true});
           });
           cy.getElementByDataTestsId('node-c2b300e6-45de-4e5e-abda-3032bee2de56-groupingservicefortest..ResourceInstanceGroup..1-menu-btn').eq(0).click({force: true}).then(() => {
@@ -883,8 +872,6 @@ describe('Vnf Groups', function () {
           checkIsErrorAppear(isError, groupRowId, limit, index);
         });
       }
-
-
     }
   );
 });
diff --git a/vid-webpack-master/cypress/integration/iFrames/vrf.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/vrf.e2e.ts
new file mode 100644
index 000000000..717d3a927
--- /dev/null
+++ b/vid-webpack-master/cypress/integration/iFrames/vrf.e2e.ts
@@ -0,0 +1,587 @@
+import {JsonBuilder} from "../../support/jsonBuilders/jsonBuilder";
+import {ServiceModel} from "../../support/jsonBuilders/models/service.model";
+
+describe('Drawing board : VRF', function () {
+
+  var jsonBuilderAndMock: JsonBuilder<ServiceModel> = new JsonBuilder<ServiceModel>();
+
+  beforeEach(() => {
+    cy.window().then((win) => {
+      win.sessionStorage.clear();
+      cy.setReduxState();
+      cy.preventErrorsOnLoading();
+      cy.initAAIMock();
+      cy.initActiveNetworks();
+      cy.initActiveVPNs();
+      cy.initVidMock();
+      cy.login();
+
+      cy.server().route({
+        url: Cypress.config('baseUrl') + '/asyncInstantiation/bulk',
+        method: 'POST',
+        status: 200,
+        response: "[]",
+      }).as("expectedPostAsyncInstantiation");
+    });
+  });
+
+  afterEach(() => {
+    cy.screenshot();
+  });
+
+
+  describe('vrf drawing board', () => {
+    it('should show vrf model and vrf instance correctly', () => {
+      const serviceModelId: string = "f028b2e2-7080-4b13-91b2-94944d4c42d8";
+      const vrfEntryName: string = "VRF Entry Configuration 0";
+      initDrawingBoardWithColectionResource(serviceModelId);
+      cy.get('.vf-type').contains('VRF');
+      cy.getElementByDataTestsId('available-models-tree').getElementByDataTestsId('node-name').contains(vrfEntryName);
+
+      /*
+      Right tree
+      */
+
+      const rightShouldHaves: { [dataTestId: string]: { [dataTestId: string]: string; }; } = {
+        'node-9cac02be-2489-4374-888d-2863b4511a59-VRF Entry Configuration 0:0': {
+          'node-type-indicator': 'VRF',
+          'node-name': '<Automatically Assigned>'
+        },
+        'node-undefined-undefined:0': {
+          'node-type-indicator': 'N',
+          'node-name': 'NETWORK1_INSTANCE_NAME',
+          'status-property-orchStatus': 'Assigned',
+          'status-property-provStatus': 'prov'
+        },
+        'node-undefined-undefined:1': {
+          'node-type-indicator': 'VPN',
+          'node-name': 'VPN1_INSTANCE_NAME',
+          'status-property-orchStatus': 'Assigned',
+          'status-property-provStatus': 'prov'
+        }
+      };
+
+      for (let node in rightShouldHaves) {
+        var [nodeName, nodeEq] = node.split(":");
+        for (let span in rightShouldHaves[node]) {
+          cy.getElementByDataTestsId(nodeName).eq(+nodeEq).find(`[data-tests-id='${span}']`).should('have.text', rightShouldHaves[node][span]);
+
+        }
+      }
+    });
+
+
+    it('vrf on click add should show generic modal ', () => {
+      const serviceModelId: string = "f028b2e2-7080-4b13-91b2-94944d4c42d8";
+      initDrawingBoardWithColectionResource(serviceModelId);
+      cy.getElementByDataTestsId('searchByNetworkRole').click({force: true}).then(() => {
+        cy.get('.allCheckboxAreSelected input').should('have.attr', 'disabled');
+        cy.get('.sdcCheckboxMember input').eq(0).should('not.have.attr', 'disabled');
+
+        cy.get('.sdcCheckboxMember input').eq(0).click({force: true});
+        cy.get('table thead .allCheckboxAreSelected input').should('have.attr', 'disabled');
+        cy.get('.sdcCheckboxMember input').eq(1).should('not.have.attr', 'disabled');
+        cy.getElementByDataTestsId("vnf-members-search").find('input').type("2.0");
+      });
+    });
+
+    it('check VRF popup', () => {
+      const serviceModelId: string = "f028b2e2-7080-4b13-91b2-94944d4c42d8";
+      initDrawingBoardWithColectionResource(serviceModelId);
+      cy.getElementByDataTestsId('searchByNetworkRole').click({force: true}).then(() => {
+        checkNetworkTableHeaders();
+        checkNetworkPopupTitles();
+        cy.validateSelectOptions('roles-criteria', roleOptions);
+        // set Network should be disabled
+        cy.isElementContainsAttr("setMembersBtn", "disabled");
+        cy.get('.sdcCheckboxMember input').eq(0).click({force: true}).then(() => {
+          cy.isElementNotContainsAttr("setMembersBtn", "disabled");
+          cy.getElementByDataTestsId('setMembersBtn').click({force: true}).then(() => {
+            checkVPNTableHeaders();
+            checkVPNPopupTitles();
+            cy.isElementContainsAttr("setMembersBtn", "disabled");
+            cy.get('.sdcCheckboxMember[data-tests-id=\'120d39fb-3627-473d-913c-d228dd0f8e5b\'] input').eq(0).click({force: true}).then(() => {
+              cy.isElementNotContainsAttr("setMembersBtn", "disabled");
+              cy.getElementByDataTestsId('setMembersBtn').click({force: true}).then(() => {
+                cy.isElementNotContainsAttr("deployBtn", "disabled");
+                cy.getElementByDataTestsId('deployBtn').click({force: true}).then(() => {
+                  cy.wait('@expectedPostAsyncInstantiation').then(xhr => {
+                    cy.readFile('../vid-automation/src/test/resources/vrf/vrfServiceCreateRequest.json').then((expectedResult) => {
+                      cy.deepCompare(xhr.request.body, expectedResult);
+                    });
+                  });
+                });
+              });
+            });
+          });
+        })
+      });
+    });
+
+    it('create new VRF and change associations', () => {
+
+      const oldVPNDataTestId: string = '120d39fb-3627-473d-913c-d228dd0f8e5b';
+      const oldNETWORKDataTestId: string = '10a74149-c9d7-4918-bbcf-d5fb9b1799ce';
+      const newVPNDataTestId: string = '46fcb25a-e7ba-4d96-99ba-3bb6eae6aba7';
+      const newNETWORKDataTestId: string = '3b3308d4-0cd3-43e4-9a7b-d1925c861135';
+
+      const serviceModelId: string = "f028b2e2-7080-4b13-91b2-94944d4c42d8";
+
+      const redux = reduxWithVrf(serviceModelId);
+      redux.service.serviceInstance[serviceModelId].vrfs = <any>{};
+      cy.setReduxState(<any>redux);
+      cy.openIframe(`app/ui/#/servicePlanning?serviceModelId=${serviceModelId}`);
+
+      cy.getElementByDataTestsId('searchByNetworkRole').click({force: true}).then(() => {
+        cy.isElementContainsAttr("setMembersBtn", "disabled");
+        cy.get('.sdcCheckboxMember[data-tests-id="' + newNETWORKDataTestId + '"] input').eq(0).click({force: true}).then(() => {
+          cy.isElementNotContainsAttr("setMembersBtn", "disabled");
+          cy.getElementByDataTestsId('setMembersBtn').click({force: true}).then(() => {
+            cy.isElementContainsAttr("setMembersBtn", "disabled");
+            cy.get('.sdcCheckboxMember[data-tests-id="' + newVPNDataTestId + '"] input').eq(0).click({force: true}).then(() => {
+              cy.isElementNotContainsAttr("setMembersBtn", "disabled");
+              cy.getElementByDataTestsId('setMembersBtn').click({force: true}).then(() => {
+                cy.get('#VRF').should('have.length', 1);
+                cy.get('#VRF .icon-browse').click({force: true}).then(() => {
+                  cy.getElementByDataTestsId('context-menu-changeAssociations').click(); // click on change associations
+                  cy.getElementByDataTestsId(oldNETWORKDataTestId).get('input').should('be.checked'); // check if selected network is checked.
+                  cy.getElementByDataTestsId('setMembersBtn').click({force: true}).then(() => { // click 'NEXT' (set network)
+                    cy.getElementByDataTestsId(oldVPNDataTestId).get('input').should('be.checked'); // check if selected VPN is checked
+
+                    cy.get(".sdcCheckboxMember[data-tests-id='" + newVPNDataTestId + "'] input").check({force: true}).then(() => { // select other VPN
+                      cy.getElementByDataTestsId('cancelBtn').click().then(() => {
+                        cy.get(".sdcCheckboxMember[data-tests-id='" + newNETWORKDataTestId + "'] input").check({force: true}).then(() => { // select other VPN
+                          cy.getElementByDataTestsId('setMembersBtn').click();
+                          cy.get(".sdcCheckboxMember[data-tests-id='" + newVPNDataTestId + "'] input")
+                          cy.getElementByDataTestsId('setMembersBtn').click();
+
+                          checkSelectedRows(newNETWORKDataTestId, newVPNDataTestId);
+                        })
+                      });
+                    })
+                  });
+                });
+              })
+            });
+          });
+        })
+      });
+    });
+
+    it('delete vrf', () => {
+      cy.permissionVidMock();
+      const SUBSCRIBER_ID: string = "e433710f-9217-458d-a79d-1c7aff376d89";
+      const SERVICE_TYPE: string = "TYLER SILVIA";
+      const SERVICE_MODEL_ID: string = '4117a0b6-e234-467d-b5b9-fe2f68c8b0fc';
+      const SERVICE_INSTANCE_ID: string = "f8791436-8d55-4fde-b4d5-72dd2cf13cfb";
+
+      configExpectedPostAsyncInstantiationDelete();
+      configServiceTopologyWithVRF(SUBSCRIBER_ID, SERVICE_TYPE, SERVICE_INSTANCE_ID);
+      configServiceTreeWithMultipleChildren_serviceModel(SERVICE_MODEL_ID);
+
+      cy.readFile('../vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json').then((expectedResult) => {
+        cy.openIframe(`app/ui/#/servicePlanning/EDIT?serviceModelId=${SERVICE_MODEL_ID}&subscriberId=${SUBSCRIBER_ID}&serviceType=${SERVICE_TYPE}&serviceInstanceId=${SERVICE_INSTANCE_ID}`);
+        cy.serviceActionDelete();
+        cy.getElementByDataTestsId('delete-status-type-header').should('exist');
+        cy.serviceActionUndoDelete();
+        cy.getElementByDataTestsId('delete-status-type-header').should('not.exist');
+        cy.serviceActionDelete();
+        cy.isNodeDeleted(0);
+        cy.isNodeNotDeleted(1);
+        cy.isNodeNotDeleted(2);
+        cy.isElementNotContainsAttr("deployBtn", "disabled");
+        cy.getDrawingBoardDeployBtn().click();
+        /*cy.wait('@expectedPostAsyncInstantiationDelete').then(xhr => {
+          cy.readFile('../vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteMacroService.json').then((expectedResult) => {
+            cy.deepCompare(xhr.request.body, expectedResult);
+          });
+        });*/
+      });
+    });
+
+    it('vpn component info', () => {
+      cy.permissionVidMock();
+      const SUBSCRIBER_ID: string = "e433710f-9217-458d-a79d-1c7aff376d89";
+      const SERVICE_TYPE: string = "TYLER SILVIA";
+      const SERVICE_MODEL_ID: string = '4117a0b6-e234-467d-b5b9-fe2f68c8b0fc';
+      const SERVICE_INSTANCE_ID: string = "f8791436-8d55-4fde-b4d5-72dd2cf13cfb";
+
+      configServiceTopologyWithVRF(SUBSCRIBER_ID, SERVICE_TYPE, SERVICE_INSTANCE_ID);
+      configServiceTreeWithMultipleChildren_serviceModel(SERVICE_MODEL_ID);
+
+      cy.openIframe(`app/ui/#/servicePlanning/EDIT?serviceModelId=${SERVICE_MODEL_ID}&subscriberId=${SUBSCRIBER_ID}&serviceType=${SERVICE_TYPE}&serviceInstanceId=${SERVICE_INSTANCE_ID}`);
+      cy.getElementByDataTestsId("node-undefined-undefined").eq(1).click();
+      cy.getElementByDataTestsId("model-item-value-Route target id").should("have.text","mock-global-1");
+      cy.getElementByDataTestsId("model-item-value-Route target role").should("have.text","mock-role-x");
+      cy.getElementByDataTestsId("model-item-value-Customet VPN ID").should("have.text","VPN1260");
+      cy.getElementByDataTestsId("model-item-value-Region").should("have.text","USA,EMEA");
+    });
+
+  });
+
+  it('network component info', () => {
+    cy.permissionVidMock();
+    const SUBSCRIBER_ID: string = "e433710f-9217-458d-a79d-1c7aff376d89";
+    const SERVICE_TYPE: string = "TYLER SILVIA";
+    const SERVICE_MODEL_ID: string = '4117a0b6-e234-467d-b5b9-fe2f68c8b0fc';
+    const SERVICE_INSTANCE_ID: string = "f8791436-8d55-4fde-b4d5-72dd2cf13cfb";
+
+    configServiceTopologyWithVRF(SUBSCRIBER_ID, SERVICE_TYPE, SERVICE_INSTANCE_ID);
+    configServiceTreeWithMultipleChildren_serviceModel(SERVICE_MODEL_ID);
+
+    cy.openIframe(`app/ui/#/servicePlanning/EDIT?serviceModelId=${SERVICE_MODEL_ID}&subscriberId=${SUBSCRIBER_ID}&serviceType=${SERVICE_TYPE}&serviceInstanceId=${SERVICE_INSTANCE_ID}`);
+    cy.getElementByDataTestsId("node-undefined-undefined").eq(0).click();
+    cy.getElementByDataTestsId("model-item-value-Route target id").should("have.text","mock-global-1");
+    cy.getElementByDataTestsId("model-item-value-Route target role").should("have.text","mock-role-x");
+  });
+
+  function configServiceTopologyWithVRF(SUBSCRIBER_ID: string, SERVICE_TYPE: string, SERVICE_INSTANCE_ID: string) {
+    cy.readFile('../vid-automation/src/test/resources/aaiGetInstanceTopology/serviceWithVrfTopology.json').then((res) => {
+      jsonBuilderAndMock.basicJson(
+        res,
+        Cypress.config('baseUrl') + `/aai_get_service_instance_topology/${SUBSCRIBER_ID}/${SERVICE_TYPE}/${SERVICE_INSTANCE_ID}`,
+        200, 0,
+        "serviceWithVRF",
+      )
+    });
+  }
+
+  function configExpectedPostAsyncInstantiationDelete()
+  {
+    cy.server().route({
+      url: Cypress.config('baseUrl') + '/asyncInstantiation/bulk',
+      method: 'POST',
+      status: 200,
+      response: "[]",
+    }).as("expectedPostAsyncInstantiationDelete");
+  }
+
+  function configServiceTreeWithMultipleChildren_serviceModel(SERVICE_MODEL_ID: string) {
+    cy.readFile('../vid-automation/src/test/resources/vrf/vrfServiceRoleResponse.json').then((res) => {
+      jsonBuilderAndMock.basicJson(
+        res,
+        Cypress.config('baseUrl') + `/rest/models/services/${SERVICE_MODEL_ID}`,
+        200,
+        0,
+        "ServiceTreeWithMultipleChildren_serviceModel",
+      )
+    });
+  }
+
+  let roleOptions: string[] = [
+    '-- select an option --',
+    'Not assigned',
+    'oam_calea_net_0',
+    'oam_calea_net_1',
+    'oam_calea_net_2',
+    'oam_calea_net_3',
+  ];
+
+  function checkSelectedRows(networkFataTestId: string, vpnDataTestId: string) {
+    cy.get('#VRF .icon-browse').click({force: true}).then(() => {
+      cy.getElementByDataTestsId('context-menu-changeAssociations').click(); // click on change associations
+      cy.getElementByDataTestsId(networkFataTestId).get('input').should('be.checked'); // check if selected network is checked.
+      cy.getElementByDataTestsId('setMembersBtn').click({force: true}).then(() => { // click 'NEXT' (set network)
+        cy.getElementByDataTestsId(vpnDataTestId).get('input').should('be.checked'); // check if selected VPN is checked
+        cy.getElementByDataTestsId('setMembersBtn').click();
+        cy.getElementByDataTestsId('setMembersBtn').click();
+      });
+    });
+  }
+
+  function reduxWithVrf(serviceModelId: string) {
+    return {
+      "service": {
+        "subscribers": [
+          {
+            "id": "e433710f-9217-458d-a79d-1c7aff376d89",
+            "name": "SILVIA ROBBINS",
+            "isPermitted": true
+          },
+        ],
+        "serviceHierarchy": {
+          [serviceModelId]: {
+            "service": {
+              "uuid": serviceModelId,
+              "invariantUuid": "dfc2c44c-2429-44ca-ae26-1e6dc1f207fb",
+              "name": "infraVPN",
+              "version": "1.0",
+              "toscaModelURL": null,
+              "category": "Network Service",
+              "serviceType": "BONDING",
+              "serviceRole": "INFRASTRUCTURE-VPN",
+              "description": "ddd",
+              "serviceEcompNaming": "true",
+              "instantiationType": "A-La-Carte",
+              "inputs": {},
+              "vidNotions": {
+                "instantiationUI": "macroService",
+                "modelCategory": "other",
+                "viewEditUI": "legacy",
+                "instantiationType": "Macro"
+              }
+            },
+            "vnfs": {},
+            "networks": {},
+            "collectionResources": {},
+            "configurations": {},
+            "fabricConfigurations": {},
+            "serviceProxies": {
+              "misvpn_service_proxy 0": {
+                "uuid": "35186eb0-e6b6-4fa5-86bb-1501b342a7b1",
+                "invariantUuid": "73f89e21-b96c-473f-8884-8b93bcbd2f76",
+                "description": "A Proxy for Service MISVPN_SERVICE",
+                "name": "MISVPN_SERVICE Service Proxy",
+                "version": "3.0",
+                "customizationUuid": "4c2fb7e0-a0a5-4b32-b6ed-6a974e55d923",
+                "inputs": {},
+                "commands": {},
+                "properties": {
+                  "ecomp_generated_naming": "false"
+                },
+                "type": "Service Proxy",
+                "sourceModelUuid": "d5cc7d15-c842-450e-95ae-2a69e66dd23b",
+                "sourceModelInvariant": "c126ec86-59fe-48c0-9532-e39a9b3e5272",
+                "sourceModelName": "MISVPN_SERVICE"
+              }
+            },
+            "vfModules": {},
+            "volumeGroups": {},
+            "pnfs": {},
+            "vnfGroups": {},
+            "vrfs": {
+              "VRF Entry Configuration 0": {
+                "uuid": "9cac02be-2489-4374-888d-2863b4511a59",
+                "invariantUuid": "b67a289b-1688-496d-86e8-1583c828be0a",
+                "description": "VRF Entry configuration object",
+                "name": "VRF Entry Configuration",
+                "version": "30.0",
+                "customizationUuid": "dd024d73-9bd1-425d-9db5-476338d53433",
+                "inputs": {},
+                "commands": {},
+                "properties": {
+                  "ecomp_generated_naming": "false"
+                },
+                "type": "Configuration",
+                "modelCustomizationName": "VRF Entry Configuration 0",
+                "sourceNodes": [],
+                "collectorNodes": null,
+                "configurationByPolicy": false
+              }
+            }
+          }
+        },
+        "serviceInstance": {
+          [serviceModelId]: {
+            "action": "Create",
+            "isDirty": false,
+            "vrfs": {
+              "VRF Entry Configuration 0": {
+                "originalName": null,
+                "trackById": "VRF1_INSTANCE_ID",
+                "action": "None",
+                "instanceId": "VRF1_INSTANCE_ID",
+                "instanceType": "VRF1_INSTANCE_TYPE",
+                "orchStatus": null,
+                "provStatus": null,
+                "inMaint": false,
+                "modelInfo": {
+                  "modelInvariantId": "vnf-instance-model-invariant-id",
+                  "modelVersionId": "vnf-instance-model-version-id",
+                  "modelCustomizationId": "vnf-instance-model-customization-id",
+                  "modelType": "vrf"
+                },
+                "uuid": "vnf-instance-model-version-id",
+                "productFamilyId": null,
+                "lcpCloudRegionId": "olson3",
+                "cloudOwner": "att-nc",
+                "legacyRegion": null,
+                "tenantId": "229bcdc6eaeb4ca59d55221141d01f8e",
+                "lineOfBusiness": null,
+                "platformName": null,
+                "vfModules": {},
+                "networks": {
+                  "NETWORK1_INSTANCE_ID": {
+                    "originalName": null,
+                    "trackById": "NETWORK1_INSTANCE_ID",
+                    "instanceName": "NETWORK1_INSTANCE_NAME",
+                    "action": "None",
+                    "instanceId": "NETWORK1_INSTANCE_ID",
+                    "instanceType": "CONTRAIL30_BASIC",
+                    "orchStatus": "Assigned",
+                    "provStatus": "prov",
+                    "inMaint": false,
+                    "modelInfo": {
+                      "modelInvariantId": "network-instance-model-invariant-id",
+                      "modelVersionId": "network-instance-model-version-id",
+                      "modelCustomizationId": "network-instance-model-customization-id",
+                      "modelName": "modelName",
+                      "modelType": "network"
+                    },
+                    "uuid": "network-instance-model-version-id",
+                    "productFamilyId": null,
+                    "lcpCloudRegionId": null,
+                    "legacyRegion": null,
+                    "tenantId": null,
+                    "lineOfBusiness": null,
+                    "platformName": null
+                  }
+                },
+                "vpns": {
+                  "VPN1_INSTANCE_ID": {
+                    "originalName": null,
+                    "trackById": "VPN1_INSTANCE_ID",
+                    "instanceName": "VPN1_INSTANCE_NAME",
+                    "action": "None",
+                    "instanceId": "VPN1_INSTANCE_ID",
+                    "instanceType": "CONTRAIL30_BASIC",
+                    "orchStatus": "Assigned",
+                    "provStatus": "prov",
+                    "inMaint": false,
+                    "modelInfo": {
+                      "modelInvariantId": "network-instance-model-invariant-id",
+                      "modelVersionId": "network-instance-model-version-id",
+                      "modelCustomizationId": "network-instance-model-customization-id",
+                      "modelName": "modelName",
+                      "modelType": "vpnBinding"
+                    },
+                    "uuid": "network-instance-model-version-id",
+                    "productFamilyId": null,
+                    "lcpCloudRegionId": null,
+                    "legacyRegion": null,
+                    "tenantId": null,
+                    "lineOfBusiness": null,
+                    "platformName": null
+                  }
+                }
+              }
+            },
+            "vnfs": {},
+            "instanceParams": [
+              {}
+            ],
+            "validationCounter": 0,
+            "existingNames": {
+              "dfd": ""
+            },
+            "existingVNFCounterMap": {},
+            "existingVRFCounterMap": {},
+            "existingVnfGroupCounterMap": {},
+            "existingNetworksCounterMap": {},
+            "optionalGroupMembersMap": {},
+            "networks": {},
+            "vnfGroups": {},
+            "bulkSize": 1,
+            "instanceName": "dfd",
+            "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
+            "subscriptionServiceType": "TYLER SILVIA",
+            "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
+            "lcpCloudRegionId": "lcpCloudRegionId",
+            "tenantName": "tenantName",
+            "projectName": "WATKINS",
+            "rollbackOnFailure": "true",
+            "aicZoneName": null,
+            "owningEntityName": "WayneHolland",
+            "testApi": "VNF_API",
+            "modelInfo": {
+              "modelInvariantId": "dfc2c44c-2429-44ca-ae26-1e6dc1f207fb",
+              "modelVersionId": "f028b2e2-7080-4b13-91b2-94944d4c42d8",
+              "modelName": "infraVPN",
+              "modelVersion": "1.0",
+              "uuid": serviceModelId,
+              "modelUniqueId": "f028b2e2-7080-4b13-91b2-94944d4c42d8"
+            },
+            "isALaCarte": true,
+            "name": "infraVPN",
+            "version": "1.0",
+            "description": "ddd",
+            "category": "Network Service",
+            "uuid": serviceModelId,
+            "invariantUuid": "dfc2c44c-2429-44ca-ae26-1e6dc1f207fb",
+            "serviceType": "BONDING",
+            "serviceRole": "INFRASTRUCTURE-VPN",
+            "vidNotions": {
+              "instantiationUI": "macroService",
+              "modelCategory": "other",
+              "viewEditUI": "legacy",
+              "instantiationType": "Macro"
+            },
+            "isEcompGeneratedNaming": true,
+            "isMultiStepDesign": false
+          }
+        },
+        "categoryParameters": {
+          "owningEntityList": [
+            {
+              "id": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
+              "name": "WayneHolland"
+            }
+          ]
+        },
+      }
+    }
+  }
+
+  function initDrawingBoardWithColectionResource(serviceModelId: string) {
+    const redux = reduxWithVrf(serviceModelId);
+    cy.setReduxState(<any>redux);
+    cy.openIframe(`app/ui/#/servicePlanning?serviceModelId=${serviceModelId}`);
+    return redux;
+  }
+
+
+  function checkNetworkTableHeaders() {
+    cy.get('.header-title').contains('Name');
+    cy.get('.header-title').contains('Type');
+    cy.get('.header-title').contains('Role');
+    cy.get('.header-title').contains('Orch. Status');
+    cy.get('.header-title').contains('Physical name');
+    cy.get('.header-title').contains('Instance ID');
+    cy.get('.header-title').contains('Model UUID');
+    cy.get('.header-title').contains('Service name');
+    cy.get('.header-title').contains('Service UUID');
+    cy.get('.header-title').contains('Tenant');
+    cy.get('.header-title').contains('Region');
+
+    const headerTitles: string[] = [
+      'Network instance name',
+      'Instance version',
+      'Network model'
+    ];
+  }
+
+
+  function checkVPNTableHeaders() {
+    const headerTitles: string[] = [
+      'VPN instance name',
+      'Version',
+      'Instance ID',
+      'Platform',
+      'Region',
+      'Route target',
+      'Route target role',
+      'Customer VPN ID'
+    ];
+
+    headerTitles.forEach((title: string) => {
+      cy.get('.header-title').contains(title);
+    });
+  }
+
+
+  function checkNetworkPopupTitles() {
+    cy.get('.title').contains('Associate network');
+    cy.get('.title-header').contains('Select a network to associate to the VRF Entry');
+    cy.getElementByDataTestsId('setMembersBtn').contains('Next');
+    cy.getElementByDataTestsId('Orch_status').contains('Active');
+    cy.getElementByDataTestsId('Region').contains('lcpCloudRegionId');
+    cy.getElementByDataTestsId('Tenant').contains('tenantName');
+  }
+
+
+  function checkVPNPopupTitles() {
+    cy.get('.title').contains('Associate VPN');
+    cy.get('.title-header').contains('Select a VPN to associate to the VRF Entry');
+    cy.getElementByDataTestsId('setMembersBtn').contains('SET VPN');
+  }
+});
diff --git a/vid-webpack-master/cypress/integration/iFrames/welcomePage.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/welcomePage.e2e.ts
index 98d39ff8e..5b34ee57f 100644
--- a/vid-webpack-master/cypress/integration/iFrames/welcomePage.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/welcomePage.e2e.ts
@@ -18,7 +18,7 @@ describe('Welcome page', function () {
 
     it(`verifying Contact Us link"`, function () {
     cy.visit('/welcome.htm');
-    cy.get('A[href="mailto:portal@lists.onap.org"]').contains('Contact Us');
+    cy.get('A[href="mailto:VID-Tier4@list.att.com"]').contains('Contact Us');
       });
 
   it(`verifying VID version"`, function () {
diff --git a/vid-webpack-master/cypress/pipeline/group1.txt b/vid-webpack-master/cypress/pipeline/group1.txt
new file mode 100644
index 000000000..1c7a8cbfe
--- /dev/null
+++ b/vid-webpack-master/cypress/pipeline/group1.txt
@@ -0,0 +1,10 @@
+cypress/integration/iFrames/auditInfo.modal.e2e.ts
+cypress/integration/iFrames/browse-sdc.e2e.ts
+cypress/integration/iFrames/collectionResource.e2e.ts
+cypress/integration/iFrames/drawingBoard.e2e.ts
+cypress/integration/iFrames/instantiationStatus.e2e.ts
+cypress/integration/iFrames/network.popup.e2e.ts
+cypress/integration/iFrames/permission.e2e.ts
+cypress/integration/iFrames/pnf.e2e.ts
+cypress/integration/iFrames/resume.e2e.ts
+cypress/integration/iFrames/retry.e2e.ts
diff --git a/vid-webpack-master/cypress/pipeline/run_group1.sh b/vid-webpack-master/cypress/pipeline/run_group1.sh
new file mode 100644
index 000000000..d60b85312
--- /dev/null
+++ b/vid-webpack-master/cypress/pipeline/run_group1.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+. $HOME/.nvm/nvm.sh
+
+set -x
+
+CYPRESS_HOME_DIR=$1
+TESTS_GROUP_FILE=cypress/pipeline/group1.txt
+
+cd ${CYPRESS_HOME_DIR}
+
+cat ${TESTS_GROUP_FILE}
+npm run cypress:headless -- --spec=$(cat ${TESTS_GROUP_FILE} | tr '\n' ',')
diff --git a/vid-webpack-master/cypress/pipeline/run_group2.sh b/vid-webpack-master/cypress/pipeline/run_group2.sh
new file mode 100644
index 000000000..2f30fa7df
--- /dev/null
+++ b/vid-webpack-master/cypress/pipeline/run_group2.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+. $HOME/.nvm/nvm.sh
+
+set -x
+
+CYPRESS_HOME_DIR=$1
+TESTS_GROUP_FILE_1=cypress/pipeline/group1.txt
+TESTS_GROUP_FILE=cypress/pipeline/group2.generated.txt
+
+cd ${CYPRESS_HOME_DIR}
+
+# make group2 by "negating" group1.txt
+ls -1 cypress/integration/*/*.e2e.ts | comm -3 - ${TESTS_GROUP_FILE_1} > ${TESTS_GROUP_FILE}
+
+cat ${TESTS_GROUP_FILE}
+npm run cypress:headless -- --spec=$(cat ${TESTS_GROUP_FILE} | tr '\n' ',')
diff --git a/vid-webpack-master/cypress/support/application/application.session.actions.ts b/vid-webpack-master/cypress/support/application/application.session.actions.ts
index 19f6881f6..84114aa36 100644
--- a/vid-webpack-master/cypress/support/application/application.session.actions.ts
+++ b/vid-webpack-master/cypress/support/application/application.session.actions.ts
@@ -61,7 +61,8 @@ function buildReduxStateWithServiceRespone(res: any, serviceId:string, isEcompGe
             "vnfs": {},
             "vnfGroups": {},
             "isEcompGeneratedNaming": isEcompGeneratedNaming,
-            "existingNames": {}
+            "existingNames": {},
+            "vidNotions": res.service.vidNotions
           }
         }
       }
diff --git a/vid-webpack-master/cypress/support/elements/element.actions.ts b/vid-webpack-master/cypress/support/elements/element.actions.ts
index 44e85830c..6d63e9fda 100644
--- a/vid-webpack-master/cypress/support/elements/element.actions.ts
+++ b/vid-webpack-master/cypress/support/elements/element.actions.ts
@@ -8,6 +8,7 @@ declare namespace Cypress {
     hasClass : typeof hasClass;
     getElementByDataTestsId : typeof getElementByDataTestsId;
     getTagElementContainsText : typeof  getTagElementContainsText;
+    isElementNotContainsAttr : typeof  isElementNotContainsAttr;
   }
 }
 
@@ -18,6 +19,13 @@ function isElementContainsAttr(id : string, attr: string) : void {
   cy.getElementByDataTestsId(id).should('have.attr', attr);
 }
 
+/*************************************************************************
+ isElementContainsAttr : check if element with id not contains some attribute
+ *************************************************************************/
+function isElementNotContainsAttr(id : string, attr: string) : void {
+  cy.getElementByDataTestsId(id).should('not.have.attr', attr);
+}
+
 /*********************************************************
  isElementDisabled : check if element with id is disabled
  *********************************************************/
@@ -54,3 +62,4 @@ Cypress.Commands.add('isElementEnabled', isElementEnabled);
 Cypress.Commands.add('hasClass', hasClass);
 Cypress.Commands.add('getElementByDataTestsId', getElementByDataTestsId);
 Cypress.Commands.add('getTagElementContainsText', getTagElementContainsText);
+Cypress.Commands.add('isElementNotContainsAttr', isElementNotContainsAttr);
diff --git a/vid-webpack-master/cypress/support/elements/element.select.actions.ts b/vid-webpack-master/cypress/support/elements/element.select.actions.ts
index 1f8eea024..4df62168f 100644
--- a/vid-webpack-master/cypress/support/elements/element.select.actions.ts
+++ b/vid-webpack-master/cypress/support/elements/element.select.actions.ts
@@ -2,6 +2,7 @@ declare namespace Cypress {
   interface Chainable {
     selectDropdownOptionByText : typeof selectDropdownOptionByText;
     checkIsOptionSelected : typeof checkIsOptionSelected;
+    validateSelectOptions: typeof validateSelectOptions;
   }
 }
 
@@ -21,6 +22,18 @@ function checkIsOptionSelected(selectId : string, optionText : string) : void {
     .should('have.value', optionText)
 }
 
+
+/************************************************
+ validate the options of selected drop down
+ ************************************************/
+function validateSelectOptions(rolesCriteria: string, values: string[]){
+  values.forEach((value)=>{
+    selectDropdownOptionByText(rolesCriteria, value);
+    checkIsOptionSelected(rolesCriteria, value);
+  });
+}
+
 Cypress.Commands.add('selectDropdownOptionByText', selectDropdownOptionByText);
 Cypress.Commands.add('checkIsOptionSelected', checkIsOptionSelected);
+Cypress.Commands.add('validateSelectOptions', validateSelectOptions);
 
diff --git a/vid-webpack-master/cypress/support/index.js b/vid-webpack-master/cypress/support/index.js
index a757a16ed..ae125c469 100644
--- a/vid-webpack-master/cypress/support/index.js
+++ b/vid-webpack-master/cypress/support/index.js
@@ -36,6 +36,7 @@ import './steps/general/compareDeepObjects.step';
 import './steps/drawingBoard/drawingBoardModel.steps';
 import './steps/drawingBoard/drawingBoardTree.steps';
 import './steps/genericForm/genericFormAction.steps';
+import './steps/drawingBoard/drawingBoardHeader.steps';
 import './steps/drawingBoard/general.steps';
 import './steps/general/clickOutside.step';
 import './steps/drawingBoard/drawingBoardComponentInfo.steps';
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/aai.mock.ts b/vid-webpack-master/cypress/support/jsonBuilders/mocks/aai.mock.ts
index 6cb8f6171..acb58c261 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/aai.mock.ts
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/aai.mock.ts
@@ -5,6 +5,8 @@ declare namespace Cypress {
     initZones : typeof initZones;
     initTenants : typeof initTenants;
     initSearchVNFMemebers : typeof  initSearchVNFMemebers;
+    initActiveNetworks : typeof  initActiveNetworks;
+    initActiveVPNs : typeof  initActiveVPNs;
   }
 }
 
@@ -109,13 +111,36 @@ function initSearchVNFMemebers(response? : JSON) : void {
   });
 }
 
+function initActiveNetworks(response? : JSON) : void {
+  cy.readFile('../vid-automation/src/test/resources/viewEdit/aaiGetActiveNetworks.json').then((res) => {
+    cy.server()
+      .route({
+        method: 'GET',
+        status : 200,
+        url : Cypress.config('baseUrl') + "/aai_get_active_networks/**",
+        response : response ? response : res
+      }).as(('getActiveNetworks'));
+  });
+}
 
+function initActiveVPNs(response? : JSON) : void {
+  cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/aaiActiveVPNs.json').then((res) => {
+    cy.server()
+      .route({
+        method: 'GET',
+        status : 200,
+        url : Cypress.config('baseUrl') + "/aai_get_vpn_list/**",
+        response : response ? response : res
+      }).as(('getVPNs'));
+  });
+}
 
 function initAAIMock(): void {
   initAaiGetFullSubscribers();
   initGetSubscribers();
   initAAIServices();
   initTenants();
+
 }
 
 
@@ -125,5 +150,7 @@ Cypress.Commands.add('initZones', initZones);
 Cypress.Commands.add('initTenants', initTenants);
 Cypress.Commands.add('initAaiGetFullSubscribers', initAaiGetFullSubscribers);
 Cypress.Commands.add('initSearchVNFMemebers', initSearchVNFMemebers);
+Cypress.Commands.add('initActiveNetworks', initActiveNetworks);
+Cypress.Commands.add('initActiveVPNs', initActiveVPNs);
 
 
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiActiveVPNs.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiActiveVPNs.json
new file mode 100644
index 000000000..2e58776a2
--- /dev/null
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiActiveVPNs.json
@@ -0,0 +1,139 @@
+[
+  {
+    "instanceId": "120d39fb-3627-473d-913c-d228dd0f8e5b",
+    "instanceName": "LPPVPN",
+    "platformName": "AVPN",
+    "instanceType": "SERVICE-INFRASTRUCTURE",
+    "region": "USA,EMEA",
+    "customerId": "VPN1260",
+    "modelInfo" : {
+      "modelCustomizationId": null,
+      "modelInvariantId": null,
+      "modelVersionId": null
+    },
+    "routeTargets": [{
+      "globalRouteTarget": "globalRouteTarget_1",
+      "routeTargetRole": "routeTargetRole_1"
+    },
+      {
+        "globalRouteTarget": "globalRouteTarget_2",
+        "routeTargetRole": "routeTargetRole_2"
+      },
+      {
+        "globalRouteTarget": "globalRouteTarget_3",
+        "routeTargetRole": "routeTargetRole_3"
+      }]
+  },
+  {
+    "instanceId": "c70391f3-a6e3-4874-9834-cbe12d7bf8b6",
+    "instanceName": "LPPVPN",
+    "platformName": "AVPN",
+    "instanceType": "SERVICE-INFRASTRUCTURE",
+    "region": "USA,EMEA",
+    "customerId": "VPN1274",
+    "modelInfo" : {
+      "modelCustomizationId": null,
+      "modelInvariantId": null,
+      "modelVersionId": null
+    },
+    "routeTargets": null
+  },
+  {
+    "instanceId": "4776516b-7da2-446c-9ba7-47ca8c30c571",
+    "instanceName": "LPPVPN",
+    "platformName": "AVPN",
+    "instanceType": "SERVICE-INFRASTRUCTURE",
+    "region": "USA,EMEA",
+    "customerId": "VPN1275",
+    "modelInfo" : {
+      "modelCustomizationId": null,
+      "modelInvariantId": null,
+      "modelVersionId": null
+    },
+    "routeTargets": null
+  },
+  {
+    "instanceId": "46fcb25a-e7ba-4d96-99ba-3bb6eae6aba7",
+    "instanceName": "LPPVPN",
+    "platformName": "AVPN",
+    "instanceType": "SERVICE-INFRASTRUCTURE",
+    "region": "USA,EMEA",
+    "customerId": "VPN1271",
+    "modelInfo" : {
+      "modelCustomizationId": null,
+      "modelInvariantId": null,
+      "modelVersionId": null
+    },
+    "routeTargets": null
+  },
+  {
+    "instanceId": "ffefbe38-3087-418a-87ae-f6582a15be78",
+    "instanceName": "LPPVPN",
+    "platformName": "AVPN",
+    "instanceType": "SERVICE-INFRASTRUCTURE",
+    "region": "USA,EMEA",
+    "customerId": "VPN1272",
+    "modelInfo" : {
+      "modelCustomizationId": null,
+      "modelInvariantId": null,
+      "modelVersionId": null
+    },
+    "routeTargets": null
+  },
+  {
+    "instanceId": "961d05be-ee41-40a2-8653-f603fc495175",
+    "instanceName": "LPPVPN",
+    "platformName": "AVPN",
+    "type": "SERVICE-INFRASTRUCTURE",
+    "instanceType": "USA,EMEA",
+    "customerId": "VPN1273",
+    "modelInfo" : {
+      "modelCustomizationId": null,
+      "modelInvariantId": null,
+      "modelVersionId": null
+    },
+    "routeTargets": null
+  },
+  {
+    "instanceId": "14bcfc2f-bbee-4fd9-89a5-42eb5dbb08d5",
+    "instanceName": "LPPVPN",
+    "platformName": "AVPN",
+    "instanceType": "SERVICE-INFRASTRUCTURE",
+    "region": "USA,EMEA",
+    "customerId": "913443",
+    "modelInfo" : {
+      "modelCustomizationId": null,
+      "modelInvariantId": null,
+      "modelVersionId": null
+    },
+    "routeTargets": null
+  },
+  {
+    "instanceId": "89d4c968-158c-4722-a22c-c5c2ccc17fd5",
+    "instanceName": "LPPVPN",
+    "platformName": "AVPN",
+    "instanceType": "SERVICE-INFRASTRUCTURE",
+    "region": "USA,EMEA",
+    "customerId": "VPN1276",
+    "modelInfo" : {
+      "modelCustomizationId": null,
+      "modelInvariantId": null,
+      "modelVersionId": null
+    },
+    "routeTargets": null
+  },
+  {
+    "instanceId": "3e7834fb-a8e0-4243-a837-5352ccab4602",
+    "instanceName": "LPPVPN",
+    "platformName": "AVPN",
+    "instanceType": "SERVICE-INFRASTRUCTURE",
+    "region": "USA,EMEA",
+    "customerId": "VPN1259",
+    "modelInfo" : {
+      "modelCustomizationId": null,
+      "modelInvariantId": null,
+      "modelVersionId": null
+    },
+    "routeTargets": null
+  }
+]
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiGetHomingData.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiGetHomingData.json
index d8a7faab2..a28d038dd 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiGetHomingData.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiGetHomingData.json
@@ -2,6 +2,6 @@
   "tenantName": "USP-SIP-IC-24335-T-01",
   "tenantID": "092eb9e8e4b7412e8787dd091bc58e86",
   "cloudOwner": "irma-aic",
-  "cloudRegionID": "JANET25",
+  "cloudRegionID": "AAIAIC25",
   "is-permitted": true
 }
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiServices.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiServices.json
index 1528c752a..b0aa2c0d4 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiServices.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiServices.json
@@ -2,7 +2,7 @@
   "service": [
     {
       "service-id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-      "service-description": "SCOTTIE",
+      "service-description": "ERICA",
       "resource-version": "1494001985150",
       "is-permitted": true
     },
@@ -32,7 +32,7 @@
     },
     {
       "service-id": "323d69d9-2efe-4r45-ay0a-89ea7ard4e6f",
-      "service-description": "vSCP",
+      "service-description": "vEsmeralda",
       "resource-version": "1494001903012",
       "is-permitted": true
     },
@@ -85,7 +85,7 @@
       "is-permitted": true
     },
     {
-      "service-id": "Cisneros",
+      "service-id": "vMuriel",
       "service-description": "vMuriel",
       "resource-version": "1490910058887",
       "is-permitted": true
@@ -116,7 +116,7 @@
     },
     {
       "service-id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
-      "service-description": "Josefina",
+      "service-description": "JOSEFINA",
       "resource-version": "1494001941772",
       "is-permitted": true
     },
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubDetails.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubDetails.json
index f2ce0870b..199883c3c 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubDetails.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubDetails.json
@@ -17,8 +17,8 @@
               "persona-model-version": null,
               "resource-version": "1501137356564",
               "orchestration-status": "Active",
-              "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
-              "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586"
+              "modelInvariantId": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
+              "modelVersionId": "1de57bcf-365a-4ba7-8a51-7377b7144586"
             },
             {
               "service-instance-id": "328e117c-8f27-4a59-beea-3b3c36e4652f",
@@ -27,8 +27,8 @@
               "persona-model-version": null,
               "resource-version": "1501142919029",
               "orchestration-status": "Active",
-              "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a",
-              "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7"
+              "modelInvariantId": "74b2fa72-e3b9-4942-8448-983a4b50891a",
+              "modelVersionId": "8c16d416-f183-4f2e-8a05-48a7ee0738f7"
             },
             {
               "service-instance-id": "66608fd9-a786-4f60-ae7b-c18d030c499b",
@@ -37,8 +37,8 @@
               "persona-model-version": null,
               "resource-version": "1503224667654",
               "orchestration-status": "Active",
-              "model-invariant-id": "1cc41b64-5c12-4d51-bac9-448e963bd81d",
-              "model-version-id": "91f79100-6450-4078-80d7-531427b4fe74"
+              "modelInvariantId": "1cc41b64-5c12-4d51-bac9-448e963bd81d",
+              "modelVersionId": "91f79100-6450-4078-80d7-531427b4fe74"
             },
             {
               "service-instance-id": "9d29dcf2-7742-4384-bca0-a38f6c296a79",
@@ -47,8 +47,8 @@
               "persona-model-version": null,
               "resource-version": "1500813552431",
               "orchestration-status": "Active",
-              "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
-              "model-version-id": "5b174112-cea4-4a36-b540-853b9d0548fc"
+              "modelInvariantId": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
+              "modelVersionId": "5b174112-cea4-4a36-b540-853b9d0548fc"
             },
             {
               "service-instance-id": "e10414d0-692b-4e8e-b56e-9fdc5ef24059",
@@ -57,8 +57,8 @@
               "persona-model-version": null,
               "resource-version": "1501144603052",
               "orchestration-status": "Active",
-              "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
-              "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586"
+              "modelInvariantId": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
+              "modelVersionId": "1de57bcf-365a-4ba7-8a51-7377b7144586"
             },
             {
               "service-instance-id": "25a5cc93-73df-4c9c-9cc5-e2df9a72f3b7",
@@ -67,8 +67,8 @@
               "persona-model-version": null,
               "resource-version": "1501412516301",
               "orchestration-status": "Active",
-              "model-invariant-id": "b594a6ec-94e0-4c95-826f-4c3d3af56339",
-              "model-version-id": "59f3ea84-313a-4670-b7c2-8997e5749864"
+              "modelInvariantId": "b594a6ec-94e0-4c95-826f-4c3d3af56339",
+              "modelVersionId": "59f3ea84-313a-4670-b7c2-8997e5749864"
             },
             {
               "service-instance-id": "9cfcd777-7f14-425c-80bf-a562fba03cfa",
@@ -77,8 +77,8 @@
               "persona-model-version": null,
               "resource-version": "1501421232100",
               "orchestration-status": "Active",
-              "model-invariant-id": "9f5ed6d5-c960-4903-9625-4ccb6ba9c63a",
-              "model-version-id": "f263c8f6-b52f-4b6c-9ed9-0c83ad098697"
+              "modelInvariantId": "9f5ed6d5-c960-4903-9625-4ccb6ba9c63a",
+              "modelVersionId": "f263c8f6-b52f-4b6c-9ed9-0c83ad098697"
             },
             {
               "service-instance-id": "4173d5da-df33-474e-a4ef-c93be61a1355",
@@ -87,8 +87,8 @@
               "persona-model-version": null,
               "resource-version": "1500966394803",
               "orchestration-status": "Active",
-              "model-invariant-id": "9f5ed6d5-c960-4903-9625-4ccb6ba9c63a",
-              "model-version-id": "25447dd8-4154-4146-b57b-bc3d82e1a670"
+              "modelInvariantId": "9f5ed6d5-c960-4903-9625-4ccb6ba9c63a",
+              "modelVersionId": "25447dd8-4154-4146-b57b-bc3d82e1a670"
             },
             {
               "service-instance-id": "1753f7eb-85db-498c-aa6a-c68a06fc77db",
@@ -97,8 +97,8 @@
               "persona-model-version": null,
               "resource-version": "1500991399818",
               "orchestration-status": "Active",
-              "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
-              "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586"
+              "modelInvariantId": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
+              "modelVersionId": "1de57bcf-365a-4ba7-8a51-7377b7144586"
             },
             {
               "service-instance-id": "5d5520c7-dcbc-4287-bed2-50ff57c41a6f",
@@ -107,8 +107,8 @@
               "persona-model-version": null,
               "resource-version": "1501400257544",
               "orchestration-status": "Active",
-              "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
-              "model-version-id": "240376de-870e-48df-915a-31f140eedd2c"
+              "modelInvariantId": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
+              "modelVersionId": "240376de-870e-48df-915a-31f140eedd2c"
             },
             {
               "service-instance-id": "1ab8ad18-1445-412a-81f2-671b936ab650",
@@ -117,8 +117,8 @@
               "persona-model-version": null,
               "resource-version": "1500562034054",
               "orchestration-status": "Active",
-              "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a",
-              "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7"
+              "modelInvariantId": "74b2fa72-e3b9-4942-8448-983a4b50891a",
+              "modelVersionId": "8c16d416-f183-4f2e-8a05-48a7ee0738f7"
             },
             {
               "service-instance-id": "a1427609-254d-4637-906f-8f0f6f6d4711",
@@ -127,8 +127,8 @@
               "persona-model-version": null,
               "resource-version": "1502111792531",
               "orchestration-status": "Active",
-              "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
-              "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0"
+              "modelInvariantId": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
+              "modelVersionId": "c079d859-4d81-4add-a9c3-94551f96e2b0"
             },
             {
               "service-instance-id": "f87c0dbe-2658-4971-8014-ad5da1f9df51",
@@ -137,8 +137,8 @@
               "persona-model-version": null,
               "resource-version": "1502006858511",
               "orchestration-status": "Active",
-              "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
-              "model-version-id": "240376de-870e-48df-915a-31f140eedd2c"
+              "modelInvariantId": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
+              "modelVersionId": "240376de-870e-48df-915a-31f140eedd2c"
             },
             {
               "service-instance-id": "7a8dea9f-5f67-4755-9344-ec3736240b9e",
@@ -147,8 +147,8 @@
               "persona-model-version": null,
               "resource-version": "1502111390681",
               "orchestration-status": "Active",
-              "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
-              "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0"
+              "modelInvariantId": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
+              "modelVersionId": "c079d859-4d81-4add-a9c3-94551f96e2b0"
             },
             {
               "service-instance-id": "8d0f4c13-a564-43ec-b756-c0017161dee2",
@@ -157,8 +157,8 @@
               "persona-model-version": null,
               "resource-version": "1500553831697",
               "orchestration-status": "Active",
-              "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
-              "model-version-id": "5b174112-cea4-4a36-b540-853b9d0548fc"
+              "modelInvariantId": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
+              "modelVersionId": "5b174112-cea4-4a36-b540-853b9d0548fc"
             },
             {
               "service-instance-id": "27535e2a-785e-47e8-a482-16f4d019033a",
@@ -167,8 +167,8 @@
               "persona-model-version": null,
               "resource-version": "1502109495302",
               "orchestration-status": "Active",
-              "model-invariant-id": "452538c0-ef1e-4d65-9939-697f6ed58934",
-              "model-version-id": "f430728a-4530-42be-a577-1206b9484cef"
+              "modelInvariantId": "452538c0-ef1e-4d65-9939-697f6ed58934",
+              "modelVersionId": "f430728a-4530-42be-a577-1206b9484cef"
             },
             {
               "service-instance-id": "9601d34e-d3f9-4108-932c-fc52312c260a",
@@ -177,8 +177,8 @@
               "persona-model-version": null,
               "resource-version": "1502028721334",
               "orchestration-status": "Active",
-              "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097",
-              "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202"
+              "modelInvariantId": "d2103eaa-8cc7-4422-ad67-1ce582af0097",
+              "modelVersionId": "5801fed3-b6db-4969-abb4-d1171c4c3202"
             },
             {
               "service-instance-id": "e65ae593-afdd-4f31-8192-ba7606a026e4",
@@ -187,8 +187,8 @@
               "persona-model-version": null,
               "resource-version": "1502026481024",
               "orchestration-status": "Active",
-              "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097",
-              "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202"
+              "modelInvariantId": "d2103eaa-8cc7-4422-ad67-1ce582af0097",
+              "modelVersionId": "5801fed3-b6db-4969-abb4-d1171c4c3202"
             },
             {
               "service-instance-id": "29e210af-9fa5-44ae-940c-acca84b1b287",
@@ -197,8 +197,8 @@
               "persona-model-version": null,
               "resource-version": "1502114664500",
               "orchestration-status": "Active",
-              "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
-              "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0"
+              "modelInvariantId": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
+              "modelVersionId": "c079d859-4d81-4add-a9c3-94551f96e2b0"
             },
             {
               "service-instance-id": "c1a81ab3-2bc6-4b6f-b04f-d358e67c1d01",
@@ -207,8 +207,8 @@
               "persona-model-version": null,
               "resource-version": "1500552497782",
               "orchestration-status": "Active",
-              "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
-              "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586"
+              "modelInvariantId": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
+              "modelVersionId": "1de57bcf-365a-4ba7-8a51-7377b7144586"
             },
             {
               "service-instance-id": "01834681-686a-4258-aff0-6eea448deddd",
@@ -217,8 +217,8 @@
               "persona-model-version": null,
               "resource-version": "1502019889568",
               "orchestration-status": "Active",
-              "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097",
-              "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202"
+              "modelInvariantId": "d2103eaa-8cc7-4422-ad67-1ce582af0097",
+              "modelVersionId": "5801fed3-b6db-4969-abb4-d1171c4c3202"
             },
             {
               "service-instance-id": "266008e8-04f9-440a-90e9-d9299821ec08",
@@ -227,8 +227,8 @@
               "persona-model-version": null,
               "resource-version": "1494001993349",
               "orchestration-status": null,
-              "model-invariant-id": "",
-              "model-version-id": null
+              "modelInvariantId": "",
+              "modelVersionId": null
             },
             {
               "service-instance-id": "6c3a22e9-6b04-49d2-b1fa-1e49103971ca",
@@ -237,8 +237,8 @@
               "persona-model-version": null,
               "resource-version": "1494001986409",
               "orchestration-status": null,
-              "model-invariant-id": "",
-              "model-version-id": null
+              "modelInvariantId": "",
+              "modelVersionId": null
             },
             {
               "service-instance-id": "918085fc-29cf-41c2-acc8-15878c0d58b3",
@@ -247,8 +247,8 @@
               "persona-model-version": null,
               "resource-version": "1494001986411",
               "orchestration-status": null,
-              "model-invariant-id": "",
-              "model-version-id": null
+              "modelInvariantId": "",
+              "modelVersionId": null
             },
             {
               "service-instance-id": "1c464a9d-eff7-4d29-8e97-ed1e9e3c8458",
@@ -257,8 +257,8 @@
               "persona-model-version": null,
               "resource-version": "1494001953169",
               "orchestration-status": null,
-              "model-invariant-id": "",
-              "model-version-id": null
+              "modelInvariantId": "",
+              "modelVersionId": null
             },
             {
               "service-instance-id": "bb2f563f-6db7-46ec-b521-fc6ee07e4f3e",
@@ -267,8 +267,8 @@
               "persona-model-version": null,
               "resource-version": "1494002002228",
               "orchestration-status": null,
-              "model-invariant-id": "",
-              "model-version-id": null
+              "modelInvariantId": "",
+              "modelVersionId": null
             },
             {
               "service-instance-id": "4cf94a42-85b8-414f-8fb4-a43b1dac1d2f",
@@ -277,8 +277,8 @@
               "persona-model-version": null,
               "resource-version": "1494001834026",
               "orchestration-status": null,
-              "model-invariant-id": "",
-              "model-version-id": null
+              "modelInvariantId": "",
+              "modelVersionId": null
             },
             {
               "service-instance-id": "ed7c0d8e-de81-408f-b695-47b9dd6b2ca0",
@@ -287,8 +287,8 @@
               "persona-model-version": null,
               "resource-version": "1494001986403",
               "orchestration-status": null,
-              "model-invariant-id": "",
-              "model-version-id": null
+              "modelInvariantId": "",
+              "modelVersionId": null
             },
             {
               "service-instance-id": "8bf34b89-1648-4a41-a21f-9b752833bd4b",
@@ -297,8 +297,8 @@
               "persona-model-version": null,
               "resource-version": "1500377885652",
               "orchestration-status": "Active",
-              "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
-              "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586"
+              "modelInvariantId": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
+              "modelVersionId": "1de57bcf-365a-4ba7-8a51-7377b7144586"
             },
             {
               "service-instance-id": "082c606c-60d7-4d9a-87c7-1370de6e56ba",
@@ -307,8 +307,8 @@
               "persona-model-version": null,
               "resource-version": "1500375305701",
               "orchestration-status": "Active",
-              "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097",
-              "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202"
+              "modelInvariantId": "d2103eaa-8cc7-4422-ad67-1ce582af0097",
+              "modelVersionId": "5801fed3-b6db-4969-abb4-d1171c4c3202"
             },
             {
               "service-instance-id": "c4707aae-9b16-49b4-8b52-cbeb8c4129ab",
@@ -317,8 +317,8 @@
               "persona-model-version": null,
               "resource-version": "1500376318829",
               "orchestration-status": "Active",
-              "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800",
-              "model-version-id": "cad9f2eb-39f7-4692-90c2-8726bb594610"
+              "modelInvariantId": "d27e42cf-087e-4d31-88ac-6c4b7585f800",
+              "modelVersionId": "cad9f2eb-39f7-4692-90c2-8726bb594610"
             },
             {
               "service-instance-id": "86ab6048-9037-4367-ac01-f2e5881e8034",
@@ -327,8 +327,8 @@
               "persona-model-version": null,
               "resource-version": "1500369079277",
               "orchestration-status": "Active",
-              "model-invariant-id": "b1ed0d58-0700-4631-be18-d2f1e527d637",
-              "model-version-id": "849a6347-cca7-4ae6-b5c2-7d41e9f6d9b2"
+              "modelInvariantId": "b1ed0d58-0700-4631-be18-d2f1e527d637",
+              "modelVersionId": "849a6347-cca7-4ae6-b5c2-7d41e9f6d9b2"
             },
             {
               "service-instance-id": "a5e3b6ae-7b4c-4247-b975-1cd46c3b3e9a",
@@ -337,8 +337,8 @@
               "persona-model-version": null,
               "resource-version": "1506931067790",
               "orchestration-status": "Active",
-              "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
-              "model-version-id": "5b174112-cea4-4a36-b540-853b9d0548fc"
+              "modelInvariantId": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
+              "modelVersionId": "5b174112-cea4-4a36-b540-853b9d0548fc"
             },
             {
               "service-instance-id": "c9fb03a4-8c21-444a-84ee-a6f969698d9c",
@@ -347,8 +347,8 @@
               "persona-model-version": null,
               "resource-version": "1502021459612",
               "orchestration-status": "Active",
-              "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097",
-              "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202"
+              "modelInvariantId": "d2103eaa-8cc7-4422-ad67-1ce582af0097",
+              "modelVersionId": "5801fed3-b6db-4969-abb4-d1171c4c3202"
             },
             {
               "service-instance-id": "4fd55324-bc4d-4acf-8f76-2e1eb01ae6a5",
@@ -357,8 +357,8 @@
               "persona-model-version": null,
               "resource-version": "1502019352627",
               "orchestration-status": "Active",
-              "model-invariant-id": "e3ee9d25-2c6b-4734-8a8c-b6e0dee11ca9",
-              "model-version-id": "159cc54d-a6be-4c3b-bea3-3214181ebb5d"
+              "modelInvariantId": "e3ee9d25-2c6b-4734-8a8c-b6e0dee11ca9",
+              "modelVersionId": "159cc54d-a6be-4c3b-bea3-3214181ebb5d"
             },
             {
               "service-instance-id": "bbccd5cf-f641-4082-8411-7ae123530d92",
@@ -367,8 +367,8 @@
               "persona-model-version": null,
               "resource-version": "1502087710872",
               "orchestration-status": "Active",
-              "model-invariant-id": "331a194d-9248-4533-88bc-62c812ccb5c1",
-              "model-version-id": "171b3887-e73e-479d-8ef8-2690bf74f2aa"
+              "modelInvariantId": "331a194d-9248-4533-88bc-62c812ccb5c1",
+              "modelVersionId": "171b3887-e73e-479d-8ef8-2690bf74f2aa"
             },
             {
               "service-instance-id": "4c263e04-260e-434a-8ac2-b0335a02f30b",
@@ -377,8 +377,8 @@
               "persona-model-version": null,
               "resource-version": "1494001791264",
               "orchestration-status": null,
-              "model-invariant-id": "",
-              "model-version-id": null
+              "modelInvariantId": "",
+              "modelVersionId": null
             },
             {
               "service-instance-id": "e4feb759-e4a9-4614-b2d2-985848ba3b9f",
@@ -387,8 +387,8 @@
               "persona-model-version": null,
               "resource-version": "1499869396079",
               "orchestration-status": "Active",
-              "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
-              "model-version-id": "240376de-870e-48df-915a-31f140eedd2c"
+              "modelInvariantId": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
+              "modelVersionId": "240376de-870e-48df-915a-31f140eedd2c"
             }
           ]
         },
@@ -406,8 +406,8 @@
               "persona-model-version": null,
               "resource-version": "1500370094198",
               "orchestration-status": "Active",
-              "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
-              "model-version-id": "240376de-870e-48df-915a-31f140eedd2c"
+              "modelInvariantId": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
+              "modelVersionId": "240376de-870e-48df-915a-31f140eedd2c"
             },
             {
               "service-instance-id": "7cb54908-f3fb-46b9-b547-d1e670ea95b2",
@@ -416,8 +416,8 @@
               "persona-model-version": null,
               "resource-version": "1499868690949",
               "orchestration-status": "Active",
-              "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
-              "model-version-id": "240376de-870e-48df-915a-31f140eedd2c"
+              "modelInvariantId": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
+              "modelVersionId": "240376de-870e-48df-915a-31f140eedd2c"
             },
             {
               "service-instance-id": "8e953267-4cd8-45ec-ae7f-bdeb018656c0",
@@ -426,8 +426,8 @@
               "persona-model-version": null,
               "resource-version": "1509355912484",
               "orchestration-status": "Active",
-              "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450",
-              "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50"
+              "modelInvariantId": "340f3957-ff0a-4503-866d-a34fd1b97450",
+              "modelVersionId": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50"
             },
             {
               "service-instance-id": "e2ecfd33-b5d3-4a7b-85ba-1a709b26b66c",
@@ -436,8 +436,8 @@
               "persona-model-version": null,
               "resource-version": "1509356358573",
               "orchestration-status": "Active",
-              "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae",
-              "model-version-id": "06ac9663-54cf-4c77-b926-6e8757cf6380"
+              "modelInvariantId": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae",
+              "modelVersionId": "06ac9663-54cf-4c77-b926-6e8757cf6380"
             },
             {
               "service-instance-id": "7dfef88f-fec0-421f-90d4-91eea35a5813",
@@ -446,8 +446,8 @@
               "persona-model-version": null,
               "resource-version": "1508144995828",
               "orchestration-status": "Active",
-              "model-invariant-id": "d7b48529-6ae2-49f0-8633-b29e7cd4d4ce",
-              "model-version-id": "44671b15-83dd-4db7-a36e-dfada3eaa2f9"
+              "modelInvariantId": "d7b48529-6ae2-49f0-8633-b29e7cd4d4ce",
+              "modelVersionId": "44671b15-83dd-4db7-a36e-dfada3eaa2f9"
             },
             {
               "service-instance-id": "a46ca55c-e9bd-4e68-9c49-c98933240218",
@@ -456,8 +456,8 @@
               "persona-model-version": null,
               "resource-version": "1494001997513",
               "orchestration-status": null,
-              "model-invariant-id": "732263bd-0655-428d-a347-d65676d1a949",
-              "model-version-id": null
+              "modelInvariantId": "732263bd-0655-428d-a347-d65676d1a949",
+              "modelVersionId": null
             },
             {
               "service-instance-id": "e165f1af-a3cf-4323-8cd2-607acb55baa9",
@@ -466,8 +466,8 @@
               "persona-model-version": null,
               "resource-version": "1508071197869",
               "orchestration-status": "Active",
-              "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8",
-              "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6"
+              "modelInvariantId": "5b9c0f33-eec1-484a-bf77-736a6644d7a8",
+              "modelVersionId": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6"
             }
           ]
         },
@@ -481,32 +481,32 @@
             {
               "service-instance-id": "c187e9fe-40c3-4862-b73e-84ff056205f61234",
               "service-instance-name": "test_fabric_config",
-              "model-invariant-id": "12343f9e-3244-4d8f-a8e0-0e5d7a29eda9",
-              "model-version-id": "12344bb4-a416-4b4e-997e-0059973630b9",
+              "modelInvariantId": "12343f9e-3244-4d8f-a8e0-0e5d7a29eda9",
+              "modelVersionId": "12344bb4-a416-4b4e-997e-0059973630b9",
               "resource-version": "1500789244674",
               "orchestration-status": "Assigned"
             },
             {
               "service-instance-id": "c187e9fe-40c3-4862-b73e-84ff056205f69000",
               "service-instance-name": "test_fabric_config",
-              "model-invariant-id": "90003f9e-3244-4d8f-a8e0-0e5d7a29eda9",
-              "model-version-id": "90004bb4-a416-4b4e-997e-0059973630b9",
+              "modelInvariantId": "90003f9e-3244-4d8f-a8e0-0e5d7a29eda9",
+              "modelVersionId": "90004bb4-a416-4b4e-997e-0059973630b9",
               "resource-version": "1500789244674",
               "orchestration-status": "Active"
             },
             {
               "service-instance-id": "c187e9fe-40c3-4862-b73e-84ff056205f61000",
               "service-instance-name": "test_fabric_config",
-              "model-invariant-id": "10003f9e-3244-4d8f-a8e0-0e5d7a29eda9",
-              "model-version-id": "10004bb4-a416-4b4e-997e-0059973630b9",
+              "modelInvariantId": "10003f9e-3244-4d8f-a8e0-0e5d7a29eda9",
+              "modelVersionId": "10004bb4-a416-4b4e-997e-0059973630b9",
               "resource-version": "1500789244674",
               "orchestration-status": "pendingdeLete"
             },
             {
               "service-instance-id": "c187e9fe-40c3-4862-b73e-84ff056205f65678",
               "service-instance-name": "test_fabric_config",
-              "model-invariant-id": "12343f9e-3244-4d8f-a8e0-0e5d7a29eda9",
-              "model-version-id": "12344bb4-a416-4b4e-997e-0059973630b9",
+              "modelInvariantId": "12343f9e-3244-4d8f-a8e0-0e5d7a29eda9",
+              "modelVersionId": "12344bb4-a416-4b4e-997e-0059973630b9",
               "resource-version": "1500789244674",
               "orchestration-status": "Created"
             },
@@ -517,8 +517,8 @@
               "persona-model-version":null,
               "resource-version":"1502391806301",
               "orchestration-status":"Active",
-              "model-invariant-id":"64dbe153-48c6-4d6f-95e7-12ff4cce9871",
-              "model-version-id":"4e8b6372-dea3-4028-81d0-16eba59c94fd"
+              "modelInvariantId":"64dbe153-48c6-4d6f-95e7-12ff4cce9871",
+              "modelVersionId":"4e8b6372-dea3-4028-81d0-16eba59c94fd"
             }
           ]
         },
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForActiveFabricConfigService.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForActiveFabricConfigService.json
index 38c76060e..69d6f7d40 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForActiveFabricConfigService.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForActiveFabricConfigService.json
@@ -16,12 +16,12 @@
               "configuration-name": "dummy_instance_1",
               "configuration-type": "fabric-configuration-type-1",
               "configuration-sub-type": "fabric-configuration-sub-type-1",
-              "model-invariant-id": "model-invariant-id-1",
-              "model-version-id": "model-version-id-1",
+              "modelInvariantId": "model-invariant-id-1",
+              "modelVersionId": "model-version-id-1",
               "orchestration-status": "Assigned",
               "operational-status": "",
               "configuration-selflink": "",
-              "model-customization-id": "model-customization-id-1",
+              "modelCustomizationId": "model-customization-id-1",
               "resource-version": "1504038855716"
             },
             "extra-properties": {
@@ -34,12 +34,12 @@
               "configuration-name": "dummy_instance_2",
               "configuration-type": "fabric-configuration-type-2",
               "configuration-sub-type": "fabric-configuration-sub-type-2",
-              "model-invariant-id": "model-invariant-id-2",
-              "model-version-id": "model-version-id-2",
+              "modelInvariantId": "model-invariant-id-2",
+              "modelVersionId": "model-version-id-2",
               "orchestration-status": "Assigned",
               "operational-status": "",
               "configuration-selflink": "",
-              "model-customization-id": "model-customization-id-2",
+              "modelCustomizationId": "model-customization-id-2",
               "resource-version": "1504038855712"
             },
             "extra-properties": {
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForComplexService.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForComplexService.json
index d6107b821..82b81eff5 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForComplexService.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForComplexService.json
@@ -10,20 +10,20 @@
       "inventory-response-items": {
         "inventory-response-item": [
           {
-            "model-name": "VID-PCRF-05-15-17",
+            "model-name": "VID-RODERICK-05-15-17",
             "generic-vnf": {
               "vnf-id": "c015cc0f-0f37-4488-aabf-53795fd93cd3",
               "vnf-name": "fsd",
-              "vnf-type": "1707vidnf/VID-PCRF-05-15-17 0",
+              "vnf-type": "1707vidnf/VID-RODERICK-05-15-17 0",
               "service-id": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e",
               "prov-status": "PREPROV",
               "orchestration-status": "Created",
               "in-maint": false,
               "is-closed-loop-disabled": false,
               "resource-version": "1502299355826",
-              "model-invariant-id": "4160458e-f648-4b30-a176-43881ffffe9e",
-              "model-version-id": "d6557200-ecf2-4641-8094-5393ae3aae60",
-              "model-customization-id": "91415b44-753d-494c-926a-456a9172bbb9",
+              "modelInvariantId": "4160458e-f648-4b30-a176-43881ffffe9e",
+              "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60",
+              "modelCustomizationId": "91415b44-753d-494c-926a-456a9172bbb9",
               "nf-type": "null",
               "nf-function": "null",
               "nf-role": "null",
@@ -52,9 +52,9 @@
                     "orchestration-status": "pendingactivation",
                     "is-base-vf-module": true,
                     "resource-version": "1504770843380",
-                    "model-invariant-id": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
-                    "model-version-id": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
-                    "model-customization-id": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
+                    "modelInvariantId": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
+                    "modelVersionId": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
+                    "modelCustomizationId": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
                     "module-index": 0
                   },
                   "extra-properties": {}
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForCreatedFabricConfigService.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForCreatedFabricConfigService.json
index 0ad741cd7..3dba16b97 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForCreatedFabricConfigService.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForCreatedFabricConfigService.json
@@ -16,12 +16,12 @@
               "configuration-name": "dummy_instance_1",
               "configuration-type": "fabric-configuration-type-1",
               "configuration-sub-type": "fabric-configuration-sub-type-1",
-              "model-invariant-id": "model-invariant-id-1",
-              "model-version-id": "model-version-id-1",
+              "modelInvariantId": "model-invariant-id-1",
+              "modelVersionId": "model-version-id-1",
               "orchestration-status": "Active",
               "operational-status": "",
               "configuration-selflink": "",
-              "model-customization-id": "model-customization-id-1",
+              "modelCustomizationId": "model-customization-id-1",
               "resource-version": "1504038855716"
             },
             "extra-properties": {
@@ -34,12 +34,12 @@
               "configuration-name": "dummy_instance_2",
               "configuration-type": "fabric-configuration-type-2",
               "configuration-sub-type": "fabric-configuration-sub-type-2",
-              "model-invariant-id": "model-invariant-id-2",
-              "model-version-id": "model-version-id-2",
+              "modelInvariantId": "model-invariant-id-2",
+              "modelVersionId": "model-version-id-2",
               "orchestration-status": "Assigned",
               "operational-status": "",
               "configuration-selflink": "",
-              "model-customization-id": "model-customization-id-2",
+              "modelCustomizationId": "model-customization-id-2",
               "resource-version": "1504038855712"
             },
             "extra-properties": {
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForDeactivatedFabricConfigService.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForDeactivatedFabricConfigService.json
index b224e323f..b51e86229 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForDeactivatedFabricConfigService.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForDeactivatedFabricConfigService.json
@@ -16,12 +16,12 @@
               "configuration-name": "dummy_instance_1",
               "configuration-type": "fabric-configuration-type-1",
               "configuration-sub-type": "fabric-configuration-sub-type-1",
-              "model-invariant-id": "model-invariant-id-1",
-              "model-version-id": "model-version-id-1",
+              "modelInvariantId": "model-invariant-id-1",
+              "modelVersionId": "model-version-id-1",
               "orchestration-status": "Active",
               "operational-status": "",
               "configuration-selflink": "",
-              "model-customization-id": "model-customization-id-1",
+              "modelCustomizationId": "model-customization-id-1",
               "resource-version": "1504038855716"
             },
             "extra-properties": {
@@ -34,12 +34,12 @@
               "configuration-name": "dummy_instance_2",
               "configuration-type": "fabric-configuration-type-2",
               "configuration-sub-type": "fabric-configuration-sub-type-2",
-              "model-invariant-id": "model-invariant-id-2",
-              "model-version-id": "model-version-id-2",
+              "modelInvariantId": "model-invariant-id-2",
+              "modelVersionId": "model-version-id-2",
               "orchestration-status": "Assigned",
               "operational-status": "",
               "configuration-selflink": "",
-              "model-customization-id": "model-customization-id-2",
+              "modelCustomizationId": "model-customization-id-2",
               "resource-version": "1504038855712"
             },
             "extra-properties": {
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForFabricConfigService.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForFabricConfigService.json
index ddd673b87..ec512c3b6 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForFabricConfigService.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForFabricConfigService.json
@@ -16,12 +16,12 @@
               "configuration-name": "dummy_instance_1",
               "configuration-type": "fabric-configuration-type-1",
               "configuration-sub-type": "fabric-configuration-sub-type-1",
-              "model-invariant-id": "model-invariant-id-1",
-              "model-version-id": "model-version-id-1",
+              "modelInvariantId": "model-invariant-id-1",
+              "modelVersionId": "model-version-id-1",
               "orchestration-status": "Assigned",
               "operational-status": "",
               "configuration-selflink": "",
-              "model-customization-id": "model-customization-id-1",
+              "modelCustomizationId": "model-customization-id-1",
               "resource-version": "1504038855716"
             },
             "extra-properties": {
@@ -34,12 +34,12 @@
               "configuration-name": "dummy_instance_2",
               "configuration-type": "fabric-configuration-type-2",
               "configuration-sub-type": "fabric-configuration-sub-type-2",
-              "model-invariant-id": "model-invariant-id-2",
-              "model-version-id": "model-version-id-2",
+              "modelInvariantId": "model-invariant-id-2",
+              "modelVersionId": "model-version-id-2",
               "orchestration-status": "Active",
               "operational-status": "",
               "configuration-selflink": "",
-              "model-customization-id": "model-customization-id-2",
+              "modelCustomizationId": "model-customization-id-2",
               "resource-version": "1504038855712"
             },
             "extra-properties": {
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForServiceWithSomeVFModule.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForServiceWithSomeVFModule.json
index 0a0de81a4..6dfa614cb 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForServiceWithSomeVFModule.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForServiceWithSomeVFModule.json
@@ -10,20 +10,20 @@
       "inventory-response-items": {
         "inventory-response-item": [
           {
-            "model-name": "VID-PCRF-05-15-17",
+            "model-name": "VID-RODERICK-05-15-17",
             "generic-vnf": {
               "vnf-id": "c015cc0f-0f37-4488-aabf-53795fd93cd3",
               "vnf-name": "fsd",
-              "vnf-type": "1707vidnf/VID-PCRF-05-15-17 0",
+              "vnf-type": "1707vidnf/VID-RODERICK-05-15-17 0",
               "service-id": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e",
               "prov-status": "PREPROV",
               "orchestration-status": "Created",
               "in-maint": false,
               "is-closed-loop-disabled": false,
               "resource-version": "1502299355826",
-              "model-invariant-id": "af94e0b5-454c-4fd8-b62b-ef27632afd22",
-              "model-version-id": "3d2657a7-6816-4662-93f0-26e315611336",
-              "model-customization-id": "d279139c-4b85-48ff-8ac4-9b83a6fc6da7",
+              "modelInvariantId": "af94e0b5-454c-4fd8-b62b-ef27632afd22",
+              "modelVersionId": "3d2657a7-6816-4662-93f0-26e315611336",
+              "modelCustomizationId": "d279139c-4b85-48ff-8ac4-9b83a6fc6da7",
               "nf-type": "null",
               "nf-function": "null",
               "nf-role": "null",
@@ -52,9 +52,9 @@
                     "orchestration-status": "pendingactivation",
                     "is-base-vf-module": true,
                     "resource-version": "1504770843380",
-                    "model-invariant-id": "df35ebf5-880b-4052-b4dc-5fbf38a423ca",
-                    "model-version-id": "bbf63386-42ec-4cae-a6a1-a8dade4e09e1",
-                    "model-customization-id": "56f23f2a-de4b-4f72-a51c-439970350885",
+                    "modelInvariantId": "df35ebf5-880b-4052-b4dc-5fbf38a423ca",
+                    "modelVersionId": "bbf63386-42ec-4cae-a6a1-a8dade4e09e1",
+                    "modelCustomizationId": "56f23f2a-de4b-4f72-a51c-439970350885",
                     "module-index": 0
                   },
                   "extra-properties": {}
@@ -67,9 +67,9 @@
                     "orchestration-status": "assiGned",
                     "is-base-vf-module": false,
                     "resource-version": "1504694876599",
-                    "model-invariant-id": "eb5a1e09-7f46-4f1c-ab7a-b017bad95261",
-                    "model-version-id": "fa1c8558-006c-4fb6-82f2-4fc0646d6b06",
-                    "model-customization-id": "222bd8f2-341d-4419-aa0e-98398fa34050",
+                    "modelInvariantId": "eb5a1e09-7f46-4f1c-ab7a-b017bad95261",
+                    "modelVersionId": "fa1c8558-006c-4fb6-82f2-4fc0646d6b06",
+                    "modelCustomizationId": "222bd8f2-341d-4419-aa0e-98398fa34050",
                     "module-index": 1
                   },
                   "extra-properties": {}
@@ -82,9 +82,9 @@
                     "orchestration-status": "Created",
                     "is-base-vf-module": false,
                     "resource-version": "1504694876599",
-                    "model-invariant-id": "eb5a1e09-7f46-4f1c-ab7a-b017bad95265",
-                    "model-version-id": "fa1c8558-006c-4fb6-82f2-4fc0646d6b05",
-                    "model-customization-id": "222bd8f2-341d-4419-aa0e-98398fa34055",
+                    "modelInvariantId": "eb5a1e09-7f46-4f1c-ab7a-b017bad95265",
+                    "modelVersionId": "fa1c8558-006c-4fb6-82f2-4fc0646d6b05",
+                    "modelCustomizationId": "222bd8f2-341d-4419-aa0e-98398fa34055",
                     "module-index": 1
                   },
                   "extra-properties": {}
@@ -97,9 +97,9 @@
                     "orchestration-status": "pending-delete",
                     "is-base-vf-module": false,
                     "resource-version": "1505044772033",
-                    "model-invariant-id": "eb5a1e09-7f46-4f1c-ab7a-b017bad95261",
-                    "model-version-id": "fa1c8558-006c-4fb6-82f2-4fc0646d6b06",
-                    "model-customization-id": "222bd8f2-341d-4419-aa0e-98398fa34050",
+                    "modelInvariantId": "eb5a1e09-7f46-4f1c-ab7a-b017bad95261",
+                    "modelVersionId": "fa1c8558-006c-4fb6-82f2-4fc0646d6b06",
+                    "modelCustomizationId": "222bd8f2-341d-4419-aa0e-98398fa34050",
                     "module-index": 0
                   },
                   "extra-properties": {}
@@ -108,20 +108,20 @@
             }
           },
           {
-            "model-name": "VID-PCRF-05-15-17",
+            "model-name": "VID-RODERICK-05-15-17",
             "generic-vnf": {
               "vnf-id": "0846287b-65bf-45a6-88f6-6a1af4149fac",
               "vnf-name": "kjkjk",
-              "vnf-type": "1707vidnf/VID-PCRF-05-15-17 0",
+              "vnf-type": "1707vidnf/VID-RODERICK-05-15-17 0",
               "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
               "prov-status": "PREPROV",
               "orchestration-status": "Created",
               "in-maint": false,
               "is-closed-loop-disabled": false,
               "resource-version": "1504008534044",
-              "model-invariant-id": "af94e0b5-454c-4fd8-b62b-ef27632afd22",
-              "model-version-id": "3d2657a7-6816-4662-93f0-26e315611336",
-              "model-customization-id": "d279139c-4b85-48ff-8ac4-9b83a6fc6da7",
+              "modelInvariantId": "af94e0b5-454c-4fd8-b62b-ef27632afd22",
+              "modelVersionId": "3d2657a7-6816-4662-93f0-26e315611336",
+              "modelCustomizationId": "d279139c-4b85-48ff-8ac4-9b83a6fc6da7",
               "nf-type": "",
               "nf-function": "",
               "nf-role": "",
@@ -162,9 +162,9 @@
                     "orchestration-status": "PendingCreate",
                     "is-base-vf-module": false,
                     "resource-version": "1504694397912",
-                    "model-invariant-id": "eb5a1e09-7f46-4f1c-ab7a-b017bad95261",
-                    "model-version-id": "fa1c8558-006c-4fb6-82f2-4fc0646d6b06",
-                    "model-customization-id": "222bd8f2-341d-4419-aa0e-98398fa34050",
+                    "modelInvariantId": "eb5a1e09-7f46-4f1c-ab7a-b017bad95261",
+                    "modelVersionId": "fa1c8558-006c-4fb6-82f2-4fc0646d6b06",
+                    "modelCustomizationId": "222bd8f2-341d-4419-aa0e-98398fa34050",
                     "module-index": 0
                   },
                   "extra-properties": {}
@@ -173,20 +173,20 @@
             }
           },
           {
-            "model-name": "VID-PCRF-05-15-17",
+            "model-name": "VID-RODERICK-05-15-17",
             "generic-vnf": {
               "vnf-id": "9908b762-136f-4b1f-8eb4-ef670ef58bb4",
               "vnf-name": "uiui",
-              "vnf-type": "1707vidnf/VID-PCRF-05-15-17 0",
+              "vnf-type": "1707vidnf/VID-RODERICK-05-15-17 0",
               "service-id": "vRosemarie",
               "prov-status": "PREPROV",
               "orchestration-status": "Created",
               "in-maint": false,
               "is-closed-loop-disabled": false,
               "resource-version": "1504516218649",
-              "model-invariant-id": "af94e0b5-454c-4fd8-b62b-ef27632afd22",
-              "model-version-id": "3d2657a7-6816-4662-93f0-26e315611336",
-              "model-customization-id": "d279139c-4b85-48ff-8ac4-9b83a6fc6da7",
+              "modelInvariantId": "af94e0b5-454c-4fd8-b62b-ef27632afd22",
+              "modelVersionId": "3d2657a7-6816-4662-93f0-26e315611336",
+              "modelCustomizationId": "d279139c-4b85-48ff-8ac4-9b83a6fc6da7",
               "nf-type": "",
               "nf-function": "",
               "nf-role": "",
@@ -195,20 +195,20 @@
             "extra-properties": {}
           },
           {
-            "model-name": "VID-PCRF-05-15-17",
+            "model-name": "VID-RODERICK-05-15-17",
             "generic-vnf": {
               "vnf-id": "543931f5-e50e-45a2-a69f-ab727e4c7f2f",
               "vnf-name": "sdfsdfdsf",
-              "vnf-type": "1707vidnf/VID-PCRF-05-15-17 0",
+              "vnf-type": "1707vidnf/VID-RODERICK-05-15-17 0",
               "service-id": "LRSI-OSPF",
               "prov-status": "PREPROV",
               "orchestration-status": "Created",
               "in-maint": false,
               "is-closed-loop-disabled": false,
               "resource-version": "1506509961062",
-              "model-invariant-id": "af94e0b5-454c-4fd8-b62b-ef27632afd22",
-              "model-version-id": "3d2657a7-6816-4662-93f0-26e315611336",
-              "model-customization-id": "d279139c-4b85-48ff-8ac4-9b83a6fc6da7",
+              "modelInvariantId": "af94e0b5-454c-4fd8-b62b-ef27632afd22",
+              "modelVersionId": "3d2657a7-6816-4662-93f0-26e315611336",
+              "modelCustomizationId": "d279139c-4b85-48ff-8ac4-9b83a6fc6da7",
               "nf-type": "",
               "nf-function": "",
               "nf-role": "",
@@ -217,20 +217,20 @@
             "extra-properties": {}
           },
           {
-            "model-name": "VID-PCRF-05-15-17",
+            "model-name": "VID-RODERICK-05-15-17",
             "generic-vnf": {
               "vnf-id": "25e84884-22d5-44c9-8212-cb459f63e0ba",
               "vnf-name": "sdada",
-              "vnf-type": "1707vidnf/VID-PCRF-05-15-17 0",
-              "service-id": "Cisneros",
+              "vnf-type": "1707vidnf/VID-RODERICK-05-15-17 0",
+              "service-id": "vMuriel",
               "prov-status": "PREPROV",
               "orchestration-status": "Created",
               "in-maint": false,
               "is-closed-loop-disabled": false,
               "resource-version": "1506509479125",
-              "model-invariant-id": "af94e0b5-454c-4fd8-b62b-ef27632afd22",
-              "model-version-id": "3d2657a7-6816-4662-93f0-26e315611336",
-              "model-customization-id": "d279139c-4b85-48ff-8ac4-9b83a6fc6da7",
+              "modelInvariantId": "af94e0b5-454c-4fd8-b62b-ef27632afd22",
+              "modelVersionId": "3d2657a7-6816-4662-93f0-26e315611336",
+              "modelCustomizationId": "d279139c-4b85-48ff-8ac4-9b83a6fc6da7",
               "nf-type": "",
               "nf-function": "",
               "nf-role": "",
@@ -239,20 +239,20 @@
             "extra-properties": {}
           },
           {
-            "model-name": "VID-PCRF-05-15-17",
+            "model-name": "VID-RODERICK-05-15-17",
             "generic-vnf": {
               "vnf-id": "013fb0ba-977b-496c-9faa-7f8e5f083eec",
               "vnf-name": "gvb",
-              "vnf-type": "1707vidnf/VID-PCRF-05-15-17 0",
+              "vnf-type": "1707vidnf/VID-RODERICK-05-15-17 0",
               "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
               "prov-status": "PREPROV",
               "orchestration-status": "Created",
               "in-maint": false,
               "is-closed-loop-disabled": false,
               "resource-version": "1508048678134",
-              "model-invariant-id": "af94e0b5-454c-4fd8-b62b-ef27632afd22",
-              "model-version-id": "3d2657a7-6816-4662-93f0-26e315611336",
-              "model-customization-id": "d279139c-4b85-48ff-8ac4-9b83a6fc6da7",
+              "modelInvariantId": "af94e0b5-454c-4fd8-b62b-ef27632afd22",
+              "modelVersionId": "3d2657a7-6816-4662-93f0-26e315611336",
+              "modelCustomizationId": "d279139c-4b85-48ff-8ac4-9b83a6fc6da7",
               "nf-type": "",
               "nf-function": "",
               "nf-role": "",
@@ -261,20 +261,20 @@
             "extra-properties": {}
           },
           {
-            "model-name": "VID-PCRF-05-15-17",
+            "model-name": "VID-RODERICK-05-15-17",
             "generic-vnf": {
               "vnf-id": "06914296-cb46-4b62-9453-329a706a6cbb",
               "vnf-name": "lkllll",
-              "vnf-type": "1707vidnf/VID-PCRF-05-15-17 0",
+              "vnf-type": "1707vidnf/VID-RODERICK-05-15-17 0",
               "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
               "prov-status": "PREPROV",
               "orchestration-status": "Created",
               "in-maint": false,
               "is-closed-loop-disabled": false,
               "resource-version": "1504507099829",
-              "model-invariant-id": "af94e0b5-454c-4fd8-b62b-ef27632afd22",
-              "model-version-id": "3d2657a7-6816-4662-93f0-26e315611336",
-              "model-customization-id": "d279139c-4b85-48ff-8ac4-9b83a6fc6da7",
+              "modelInvariantId": "af94e0b5-454c-4fd8-b62b-ef27632afd22",
+              "modelVersionId": "3d2657a7-6816-4662-93f0-26e315611336",
+              "modelCustomizationId": "d279139c-4b85-48ff-8ac4-9b83a6fc6da7",
               "nf-type": "",
               "nf-function": "",
               "nf-role": "",
@@ -283,20 +283,20 @@
             "extra-properties": {}
           },
           {
-            "model-name": "VID-PCRF-05-15-17",
+            "model-name": "VID-RODERICK-05-15-17",
             "generic-vnf": {
               "vnf-id": "c55da606-cf38-42c7-bc3c-be8e23b19299",
               "vnf-name": "ss",
-              "vnf-type": "1707vidnf/VID-PCRF-05-15-17 0",
+              "vnf-type": "1707vidnf/VID-RODERICK-05-15-17 0",
               "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
               "prov-status": "PREPROV",
               "orchestration-status": "Created",
               "in-maint": false,
               "is-closed-loop-disabled": false,
               "resource-version": "1508048827342",
-              "model-invariant-id": "af94e0b5-454c-4fd8-b62b-ef27632afd22",
-              "model-version-id": "3d2657a7-6816-4662-93f0-26e315611336",
-              "model-customization-id": "d279139c-4b85-48ff-8ac4-9b83a6fc6da7",
+              "modelInvariantId": "af94e0b5-454c-4fd8-b62b-ef27632afd22",
+              "modelVersionId": "3d2657a7-6816-4662-93f0-26e315611336",
+              "modelCustomizationId": "d279139c-4b85-48ff-8ac4-9b83a6fc6da7",
               "nf-type": "",
               "nf-function": "",
               "nf-role": "",
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/activeFabricConfigService.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/activeFabricConfigService.json
index f98a8d49a..cf830c4f5 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/activeFabricConfigService.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/activeFabricConfigService.json
@@ -2,13 +2,13 @@
   "service": {
     "uuid": "56784bb4-a416-4b4e-997e-0059973630b9",
     "invariantUuid": "56783f9e-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": "ClientConfig",
     "inputs": {
@@ -21,7 +21,7 @@
   "networks": {
 
   },
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {
 
   },
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json
index 317c046ff..eba4798db 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json
@@ -215,7 +215,7 @@
     "aicZoneName": "NFTJSSSS-NFT1",
     "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
     "tenantName": "USP-SIP-IC-24335-T-01",
-    "regionId": "JANET25",
+    "regionId": "AAIAIC25",
     "regionName": null,
     "serviceType": "TYLER SILVIA",
     "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89",
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicAsyncInstantiation.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicAsyncInstantiation.json
index 744013a9a..1053a65f5 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicAsyncInstantiation.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicAsyncInstantiation.json
@@ -210,7 +210,7 @@
     "aicZoneName": "NFTJSSSS-NFT1",
     "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
     "tenantName": "USP-SIP-IC-24335-T-01",
-    "regionId": "JANET25",
+    "regionId": "AAIAIC25",
     "regionName": null,
     "serviceType": "TYLER SILVIA",
     "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89",
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicFabricConfigService.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicFabricConfigService.json
index 46989e143..304035b3a 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicFabricConfigService.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicFabricConfigService.json
@@ -2,13 +2,13 @@
   "service": {
     "uuid": "12344bb4-a416-4b4e-997e-0059973630b9",
     "invariantUuid": "12343f9e-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": "ClientConfig",
     "inputs": {
@@ -21,7 +21,7 @@
   "networks": {
 
   },
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {
 
   },
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicNetworkInstance.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicNetworkInstance.json
index 3f85c89b5..eec14137f 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicNetworkInstance.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicNetworkInstance.json
@@ -25,7 +25,7 @@
   "vnfs": {},
   "instanceParams": [
     {
-      "2017488_adiodvpe0_ASN": "AV_vPE"
+      "2017488_pasqualevpe0_ASN": "AV_vPE"
     }
   ],
   "validationCounter": 0,
@@ -41,7 +41,7 @@
   "subscriptionServiceType": "TYLER SILVIA",
   "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
   "productFamilyId": "17cc1042-527b-11e6-beb8-9e71128cae77",
-  "lcpCloudRegionId": "JANET25",
+  "lcpCloudRegionId": "AAIAIC25",
   "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
   "aicZoneId": "JAG1",
   "projectName": "WATKINS",
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicNetworkModel.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicNetworkModel.json
index cd411fed4..3bc105d2a 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicNetworkModel.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicNetworkModel.json
@@ -11,8 +11,14 @@
     "description": "",
     "serviceEcompNaming": "false",
     "instantiationType": "A-La-Carte",
+    "vidNotions": {
+      "instantiationUI": "legacy",
+      "modelCategory": "other",
+      "viewEditUI": "legacy",
+      "instantiationType": "ALaCarte"
+    },
     "inputs": {
-      "2017488_adiodvpe0_ASN": {
+      "2017488_pasqualevpe0_ASN": {
         "type": "string",
         "description": "AV/PE",
         "entry_schema": null,
@@ -46,7 +52,7 @@
       "modelCustomizationName": "ExtVL 0"
     }
   },
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {},
   "fabricConfigurations": {},
   "serviceProxies": {},
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicRedux.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicRedux.json
index 84c9c2499..a962fc249 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicRedux.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicRedux.json
@@ -17,8 +17,11 @@
           "description": "",
           "serviceEcompNaming": "true",
           "instantiationType": "Macro",
+          "vidNotions": {
+            "instantiationType": "Macro"
+          },
           "inputs": {
-            "2017488_adiodvpe0_ASN": {
+            "2017488_pasqualevpe0_ASN": {
               "type": "string",
               "description": "AV/PE",
               "entry_schema": null,
@@ -30,18 +33,18 @@
           }
         },
         "vnfs": {
-          "2017-388_ADIOD-vPE 1": {
+          "2017-388_PASQUALE-vPE 1": {
             "uuid": "0903e1c0-8e03-4936-b5c2-260653b96413",
             "invariantUuid": "00beb8f9-6d39-452f-816d-c709b9cbb87d",
-            "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-388_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-388_PASQUALE-vPE",
             "version": "1.0",
             "customizationUuid": "280dec31-f16d-488b-9668-4aae55d6648a",
             "inputs": {},
             "commands": {},
             "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",
@@ -86,7 +89,7 @@
               "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",
@@ -94,14 +97,14 @@
               "vmxvre_volume_type_0": "HITACHI",
               "vmxvpfe_volume_type_0": "HITACHI",
               "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-              "bandwidth_units": "get_input:adiodvpe0_bandwidth_units",
+              "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
               "vnf_id": "123",
               "vmxvre_oam_prefix": "24",
               "availability_zone_0": "mtpocfo-kvm-az01",
-              "ASN": "get_input:2017488_adiodvpe0_ASN",
+              "ASN": "get_input:2017488_pasqualevpe0_ASN",
               "vmxvre_chassis_i2cid": "161",
               "vmxvpfe_name_0": "vPFEXI",
-              "bandwidth": "get_input:adiodvpe0_bandwidth",
+              "bandwidth": "get_input:pasqualevpe0_bandwidth",
               "availability_zone_max_count": "1",
               "vmxvre_volume_size_0": "45.0",
               "vmxvre_volume_size_1": "50.0",
@@ -111,7 +114,7 @@
               "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",
@@ -125,23 +128,23 @@
               "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
             },
             "type": "VF",
-            "modelCustomizationName": "2017-388_ADIOD-vPE 1",
+            "modelCustomizationName": "2017-388_PASQUALE-vPE 1",
             "vfModules": {},
             "volumeGroups": {},
             "vfcInstanceGroups": {}
           },
-          "2017-388_ADIOD-vPE 0": {
+          "2017-388_PASQUALE-vPE 0": {
             "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168",
             "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-            "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-388_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-388_PASQUALE-vPE",
             "version": "4.0",
             "customizationUuid": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c",
             "inputs": {},
             "commands": {},
             "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",
@@ -186,7 +189,7 @@
               "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",
@@ -194,14 +197,14 @@
               "vmxvre_volume_type_0": "HITACHI",
               "vmxvpfe_volume_type_0": "HITACHI",
               "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-              "bandwidth_units": "get_input:adiodvpe0_bandwidth_units",
+              "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
               "vnf_id": "123",
               "vmxvre_oam_prefix": "24",
               "availability_zone_0": "mtpocfo-kvm-az01",
-              "ASN": "get_input:2017488_adiodvpe0_ASN",
+              "ASN": "get_input:2017488_pasqualevpe0_ASN",
               "vmxvre_chassis_i2cid": "161",
               "vmxvpfe_name_0": "vPFEXI",
-              "bandwidth": "get_input:adiodvpe0_bandwidth",
+              "bandwidth": "get_input:pasqualevpe0_bandwidth",
               "availability_zone_max_count": "1",
               "vmxvre_volume_size_0": "45.0",
               "vmxvre_volume_size_1": "50.0",
@@ -211,7 +214,7 @@
               "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",
@@ -225,23 +228,23 @@
               "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
             },
             "type": "VF",
-            "modelCustomizationName": "2017-388_ADIOD-vPE 0",
+            "modelCustomizationName": "2017-388_PASQUALE-vPE 0",
             "vfModules": {},
             "volumeGroups": {},
             "vfcInstanceGroups": {}
           },
-          "2017-488_ADIOD-vPE 0": {
+          "2017-488_PASQUALE-vPE 0": {
             "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
             "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-            "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": "5.0",
             "customizationUuid": "1da7b585-5e61-4993-b95e-8e6606c81e45",
             "inputs": {},
             "commands": {},
             "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",
@@ -286,7 +289,7 @@
               "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",
@@ -294,14 +297,14 @@
               "vmxvre_volume_type_0": "HITACHI",
               "vmxvpfe_volume_type_0": "HITACHI",
               "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-              "bandwidth_units": "get_input:adiodvpe0_bandwidth_units",
+              "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
               "vnf_id": "123",
               "vmxvre_oam_prefix": "24",
               "availability_zone_0": "mtpocfo-kvm-az01",
-              "ASN": "get_input:2017488_adiodvpe0_ASN",
+              "ASN": "get_input:2017488_pasqualevpe0_ASN",
               "vmxvre_chassis_i2cid": "161",
               "vmxvpfe_name_0": "vPFEXI",
-              "bandwidth": "get_input:adiodvpe0_bandwidth",
+              "bandwidth": "get_input:pasqualevpe0_bandwidth",
               "availability_zone_max_count": "1",
               "vmxvre_volume_size_0": "45.0",
               "vmxvre_volume_size_1": "50.0",
@@ -311,7 +314,7 @@
               "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",
@@ -325,82 +328,82 @@
               "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": "25284168-24bb-4698-8cb4-3f509146eca5",
                 "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
                 "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                 "version": "6",
-                "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": {
-                  "adiodvpe0_bandwidth": {
+                  "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,
                     "required": true,
                     "default": "ATLMY8GA"
                   },
-                  "adiodvpe0_bandwidth_units": {
+                  "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,
@@ -410,116 +413,116 @@
                 },
                 "volumeGroupAllowed": true
               },
-              "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
+              "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
                 "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
                 "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
                 "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+                "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
                 "version": "5",
-                "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": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
                 "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
                 "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                 "version": "6",
-                "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": {},
                 "volumeGroupAllowed": true
               }
             },
             "volumeGroups": {
-              "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+              "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
                 "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
                 "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
                 "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                 "version": "6",
-                "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": {
-                  "adiodvpe0_bandwidth": {
+                  "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,
                     "required": true,
                     "default": "ATLMY8GA"
                   },
-                  "adiodvpe0_bandwidth_units": {
+                  "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,
@@ -528,19 +531,19 @@
                   }
                 }
               },
-              "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+              "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
                 "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
                 "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
                 "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                 "version": "6",
-                "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": {}
               }
@@ -549,84 +552,84 @@
           }
         },
         "networks": {},
-        "collectionResource": {},
+        "collectionResources": {},
         "configurations": {},
         "serviceProxies": {},
         "vfModules": {
-          "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
             "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
             "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
             "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
             "description": null,
-            "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+            "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
             "version": "6",
-            "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": {
-              "adiodvpe0_bandwidth": {
+              "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,
                 "required": true,
                 "default": "ATLMY8GA"
               },
-              "adiodvpe0_bandwidth_units": {
+              "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,
@@ -636,116 +639,116 @@
             },
             "volumeGroupAllowed": true
           },
-          "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
             "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
             "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
             "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
             "description": null,
-            "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+            "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
             "version": "5",
-            "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": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
             "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
             "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
             "description": null,
-            "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+            "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
             "version": "6",
-            "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": {},
             "volumeGroupAllowed": true
           }
         },
         "volumeGroups": {
-          "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
             "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
             "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
             "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
             "description": null,
-            "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+            "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
             "version": "6",
-            "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": {
-              "adiodvpe0_bandwidth": {
+              "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,
                 "required": true,
                 "default": "ATLMY8GA"
               },
-              "adiodvpe0_bandwidth_units": {
+              "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,
@@ -754,19 +757,19 @@
               }
             }
           },
-          "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
             "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
             "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
             "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
             "description": null,
-            "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+            "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
             "version": "6",
-            "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": {}
           }
@@ -778,8 +781,8 @@
     "lcpRegionsAndTenants": {
       "lcpRegionList": [
         {
-          "id": "JANET25",
-          "name": "JANET25 (AIC)",
+          "id": "AAIAIC25",
+          "name": "AAIAIC25 (AIC)",
           "isPermitted": true
         },
         {
@@ -789,7 +792,7 @@
         }
       ],
       "lcpRegionsTenantsMap": {
-        "JANET25": [
+        "AAIAIC25": [
           {
             "id": "092eb9e8e4b7412e8787dd091bc58e86",
             "name": "USP-SIP-IC-24335-T-01",
@@ -803,8 +806,128 @@
             "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
           },
           {
@@ -813,6 +936,16 @@
             "isPermitted": true
           },
           {
+            "id": "4914ab0ab3a743e58f0eefdacc1dde77",
+            "name": "DN5242-Nov21-T1",
+            "isPermitted": true
+          },
+          {
+            "id": "d0a3e3f2964542259d155a81c41aadc3",
+            "name": "test-hvf6-09",
+            "isPermitted": true
+          },
+          {
             "id": "cbb99fe4ada84631b7baf046b6fd2044",
             "name": "DN5242-Nov16-T3",
             "isPermitted": true
@@ -840,7 +973,7 @@
     "productFamilies": [
       {
         "id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-        "name": "SCOTTIE",
+        "name": "ERICA",
         "isPermitted": true
       },
       {
@@ -865,7 +998,7 @@
       },
       {
         "id": "323d69d9-2efe-4r45-ay0a-89ea7ard4e6f",
-        "name": "vSCP",
+        "name": "vEsmeralda",
         "isPermitted": true
       },
       {
@@ -909,7 +1042,7 @@
         "isPermitted": true
       },
       {
-        "id": "Cisneros",
+        "id": "vMuriel",
         "name": "vMuriel",
         "isPermitted": true
       },
@@ -935,7 +1068,7 @@
       },
       {
         "id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
-        "name": "Josefina",
+        "name": "JOSEFINA",
         "isPermitted": true
       },
       {
@@ -983,7 +1116,7 @@
         },
         {
           "id": "6",
-          "name": "vSEGW",
+          "name": "vPorfirio",
           "isPermitted": false
         },
         {
@@ -998,7 +1131,7 @@
         },
         {
           "id": "9",
-          "name": "vMME",
+          "name": "vFLORENCE",
           "isPermitted": false
         },
         {
@@ -1008,7 +1141,7 @@
         },
         {
           "id": "11",
-          "name": "vSCP",
+          "name": "vEsmeralda",
           "isPermitted": false
         },
         {
@@ -1018,7 +1151,7 @@
         },
         {
           "id": "13",
-          "name": "vMMSC",
+          "name": "vWINIFRED",
           "isPermitted": false
         },
         {
@@ -1062,6 +1195,754 @@
         "name": "UUUAIAAI-YYY1"
       },
       {
+        "id": "BAN1",
+        "name": "VSDKYUTP-BAN1"
+      },
+      {
+        "id": "DKJ1",
+        "name": "DKJSJDKA-DKJ1"
+      },
+      {
+        "id": "MCS1",
+        "name": "ASACMAMS-MCS1"
+      },
+      {
+        "id": "UIO1",
+        "name": "uioclli1-UIO1"
+      },
+      {
+        "id": "RAJ1",
+        "name": "YGBIJNLQ-RAJ1"
+      },
+      {
+        "id": "OPA1",
+        "name": "opaclli1-OPA1"
+      },
+      {
+        "id": "SDE1",
+        "name": "ZXCVBNMA-SDE1"
+      },
+      {
+        "id": "VEN2",
+        "name": "FGHJUHIL-VEN2"
+      },
+      {
+        "id": "ORL1",
+        "name": "ORLDFLMA-ORL1"
+      },
+      {
+        "id": "JAD1",
+        "name": "JADECLLI-JAD1"
+      },
+      {
+        "id": "ZXL1",
+        "name": "LWLWCANN-ZXL1"
+      },
+      {
+        "id": "CKL1",
+        "name": "CLKSKCKK-CKL1"
+      },
+      {
+        "id": "SDF1",
+        "name": "sdfclli1-SDF1"
+      },
+      {
+        "id": "RAD1",
+        "name": "RADICAL1-RAD1"
+      },
+      {
+        "id": "KIT1",
+        "name": "BHYJFGLN-KIT1"
+      },
+      {
+        "id": "REL1",
+        "name": "INGERFGT-REL1"
+      },
+      {
+        "id": "JNL1",
+        "name": "CJALSDAC-JNL1"
+      },
+      {
+        "id": "OLK1",
+        "name": "OLKOLKLS-OLK1"
+      },
+      {
+        "id": "CHI1",
+        "name": "CHILLIWE-CHI1"
+      },
+      {
+        "id": "UUU4",
+        "name": "UUUAAAUU-UUU4"
+      },
+      {
+        "id": "TUF1",
+        "name": "TUFCLLI1-TUF1"
+      },
+      {
+        "id": "KJN1",
+        "name": "CKALDKSA-KJN1"
+      },
+      {
+        "id": "SAM1",
+        "name": "SNDGCA64-SAN1"
+      },
+      {
+        "id": "SCK1",
+        "name": "SCKSCKSK-SCK1"
+      },
+      {
+        "id": "HJH1",
+        "name": "AOEEQQQD-HJH1"
+      },
+      {
+        "id": "HGD1",
+        "name": "SDFQWHGD-HGD1"
+      },
+      {
+        "id": "KOR1",
+        "name": "HYFLNBVT-KOR1"
+      },
+      {
+        "id": "ATL43",
+        "name": "AICLOCID-ATL43"
+      },
+      {
+        "id": "ATL54",
+        "name": "AICFTAAI-ATL54"
+      },
+      {
+        "id": "ATL66",
+        "name": "CLLIAAII-ATL66"
+      },
+      {
+        "id": "VEL1",
+        "name": "BNMLKUIK-VEL1"
+      },
+      {
+        "id": "ICC1",
+        "name": "SANJITAT-ICC1"
+      },
+      {
+        "id": "MNT11",
+        "name": "WSXEFBTH-MNT11"
+      },
+      {
+        "id": "DEF2",
+        "name": "WSBHGTYL-DEF2"
+      },
+      {
+        "id": "MAD11",
+        "name": "SDFQWGKL-MAD11"
+      },
+      {
+        "id": "OLG1",
+        "name": "OLHOLHOL-OLG1"
+      },
+      {
+        "id": "GAR1",
+        "name": "NGFVSJKO-GAR1"
+      },
+      {
+        "id": "SAN22",
+        "name": "GNVLSCTL-SAN22"
+      },
+      {
+        "id": "HRG1",
+        "name": "HRGHRGGS-HRG1"
+      },
+      {
+        "id": "JCS1",
+        "name": "JCSJSCJS-JCS1"
+      },
+      {
+        "id": "DHA12",
+        "name": "WSXEDECF-DHA12"
+      },
+      {
+        "id": "HJE1",
+        "name": "AOEEWWWD-HJE1"
+      },
+      {
+        "id": "NCA1",
+        "name": "NCANCANN-NCA1"
+      },
+      {
+        "id": "IOP1",
+        "name": "iopclli1-IOP1"
+      },
+      {
+        "id": "RTY1",
+        "name": "rtyclli1-RTY1"
+      },
+      {
+        "id": "KAP1",
+        "name": "HIOUYTRQ-KAP1"
+      },
+      {
+        "id": "ZEN1",
+        "name": "ZENCLLI1-ZEN1"
+      },
+      {
+        "id": "HKA1",
+        "name": "JAKHLASS-HKA1"
+      },
+      {
+        "id": "CQK1",
+        "name": "CQKSCAKK-CQK1"
+      },
+      {
+        "id": "SAI1",
+        "name": "UBEKQLPD-SAI1"
+      },
+      {
+        "id": "ERT1",
+        "name": "ertclli1-ERT1"
+      },
+      {
+        "id": "IBB1",
+        "name": "PLMKOIJU-IBB1"
+      },
+      {
+        "id": "TIR2",
+        "name": "PLKINHYI-TIR2"
+      },
+      {
+        "id": "HSD1",
+        "name": "CHASKCDS-HSD1"
+      },
+      {
+        "id": "SLF78",
+        "name": "SDCTLFN1-SLF78"
+      },
+      {
+        "id": "SEE78",
+        "name": "SDCTEEE4-SEE78"
+      },
+      {
+        "id": "SAN13",
+        "name": "TOKYJPFA-SAN13"
+      },
+      {
+        "id": "SAA78",
+        "name": "SDCTAAA1-SAA78"
+      },
+      {
+        "id": "LUC1",
+        "name": "ATLDFGYC-LUC1"
+      },
+      {
+        "id": "AMD13",
+        "name": "MEMATLAN-AMD13"
+      },
+      {
+        "id": "TOR1",
+        "name": "TOROONXN-TOR1"
+      },
+      {
+        "id": "QWE1",
+        "name": "QWECLLI1-QWE1"
+      },
+      {
+        "id": "ZOG1",
+        "name": "ZOGASTRO-ZOG1"
+      },
+      {
+        "id": "CAL33",
+        "name": "CALIFORN-CAL33"
+      },
+      {
+        "id": "SHH78",
+        "name": "SDIT1HHH-SHH78"
+      },
+      {
+        "id": "DSA1",
+        "name": "LKJHGFDS-DSA1"
+      },
+      {
+        "id": "CLG1",
+        "name": "CLGRABAD-CLG1"
+      },
+      {
+        "id": "BNA1",
+        "name": "BNARAGBK-BNA1"
+      },
+      {
+        "id": "ATL84",
+        "name": "CANTTCOC-ATL84"
+      },
+      {
+        "id": "APP1",
+        "name": "WBHGTYUI-APP1"
+      },
+      {
+        "id": "RJN1",
+        "name": "RJNRBZAW-RJN1"
+      },
+      {
+        "id": "EHH78",
+        "name": "SDCSHHH5-EHH78"
+      },
+      {
+        "id": "mac10",
+        "name": "PKGTESTF-mac10"
+      },
+      {
+        "id": "SXB78",
+        "name": "SDCTGXB1-SXB78"
+      },
+      {
+        "id": "SAX78",
+        "name": "SDCTAXG1-SAX78"
+      },
+      {
+        "id": "SYD1",
+        "name": "SYDNAUBV-SYD1"
+      },
+      {
+        "id": "TOK1",
+        "name": "TOKYJPFA-TOK1"
+      },
+      {
+        "id": "KGM2",
+        "name": "KGMTNC20-KGM2"
+      },
+      {
+        "id": "DCC1b",
+        "name": "POIUYTGH-DCC1b"
+      },
+      {
+        "id": "SKK78",
+        "name": "SDCTKKK1-SKK78"
+      },
+      {
+        "id": "SGG78",
+        "name": "SDCTGGG1-SGG78"
+      },
+      {
+        "id": "SJJ78",
+        "name": "SDCTJJJ1-SJJ78"
+      },
+      {
+        "id": "SBX78",
+        "name": "SDCTBXG1-SBX78"
+      },
+      {
+        "id": "LAG1",
+        "name": "LARGIZON-LAG1"
+      },
+      {
+        "id": "IAA1",
+        "name": "QAZXSWED-IAA1"
+      },
+      {
+        "id": "POI1",
+        "name": "PLMNJKIU-POI1"
+      },
+      {
+        "id": "LAG1a",
+        "name": "LARGIZON-LAG1a"
+      },
+      {
+        "id": "PBL1",
+        "name": "PBLAPBAI-PBL1"
+      },
+      {
+        "id": "LAG45",
+        "name": "LARGIZON-LAG1a"
+      },
+      {
+        "id": "MAR1",
+        "name": "MNBVCXZM-MAR1"
+      },
+      {
+        "id": "HST70",
+        "name": "HSTNTX70-HST70"
+      },
+      {
+        "id": "DCC1a",
+        "name": "POIUYTGH-DCC1a"
+      },
+      {
+        "id": "TOL1",
+        "name": "TOLDOH21-TOL1"
+      },
+      {
+        "id": "LON1",
+        "name": "LONEENCO-LON1"
+      },
+      {
+        "id": "SJU78",
+        "name": "SDIT1JUB-SJU78"
+      },
+      {
+        "id": "STN27",
+        "name": "HSTNTX01-STN27"
+      },
+      {
+        "id": "SSW56",
+        "name": "ss8126GT-SSW56"
+      },
+      {
+        "id": "SBB78",
+        "name": "SDIT1BBB-SBB78"
+      },
+      {
+        "id": "DCC3",
+        "name": "POIUYTGH-DCC3"
+      },
+      {
+        "id": "GNV1",
+        "name": "GNVLSCTL-GNV1"
+      },
+      {
+        "id": "WAS1",
+        "name": "WASHDCSW-WAS1"
+      },
+      {
+        "id": "TOY1",
+        "name": "TORYONNZ-TOY1"
+      },
+      {
+        "id": "STT1",
+        "name": "STTLWA02-STT1"
+      },
+      {
+        "id": "STG1",
+        "name": "STTGGE62-STG1"
+      },
+      {
+        "id": "SLL78",
+        "name": "SDCTLLL1-SLL78"
+      },
+      {
+        "id": "SBU78",
+        "name": "SDIT1BUB-SBU78"
+      },
+      {
+        "id": "ATL2",
+        "name": "ATLNGANW-ATL2"
+      },
+      {
+        "id": "BOT1",
+        "name": "BOTHWAKY-BOT1"
+      },
+      {
+        "id": "SNG1",
+        "name": "SNGPSIAU-SNG1"
+      },
+      {
+        "id": "NYC1",
+        "name": "NYCMNY54-NYC1"
+      },
+      {
+        "id": "LAG1b",
+        "name": "LARGIZON-LAG1b"
+      },
+      {
+        "id": "AMD15",
+        "name": "AMDFAA01-AMD15"
+      },
+      {
+        "id": "SNA1",
+        "name": "SNANTXCA-SNA1"
+      },
+      {
+        "id": "PLT1",
+        "name": "PLTNCA60-PLT1"
+      },
+      {
+        "id": "TLP1",
+        "name": "TLPNXM18-TLP1"
+      },
+      {
+        "id": "SDD81",
+        "name": "SAIT1DD6-SDD81"
+      },
+      {
+        "id": "DCC1",
+        "name": "POIUYTGH-DCC1"
+      },
+      {
+        "id": "DCC2",
+        "name": "POIUYTGH-DCC2"
+      },
+      {
+        "id": "OKC1",
+        "name": "OKCBOK55-OKC1"
+      },
+      {
+        "id": "PAR1",
+        "name": "PARSFRCG-PAR1"
+      },
+      {
+        "id": "TES36",
+        "name": "ABCEETES-TES36"
+      },
+      {
+        "id": "COM1",
+        "name": "PLMKOPIU-COM1"
+      },
+      {
+        "id": "ANI1",
+        "name": "ATLNGTRE-ANI1"
+      },
+      {
+        "id": "SDG78",
+        "name": "SDIT1BDG-SDG78"
+      },
+      {
+        "id": "mac20",
+        "name": "PKGTESTF-mac20"
+      },
+      {
+        "id": "DSF45",
+        "name": "DSFBG123-DSF45"
+      },
+      {
+        "id": "HST25",
+        "name": "HSTNTX01-HST25"
+      },
+      {
+        "id": "AMD18",
+        "name": "AUDIMA01-AMD18"
+      },
+      {
+        "id": "SAA80",
+        "name": "SAIT9AA3-SAA80"
+      },
+      {
+        "id": "SSA56",
+        "name": "SSIT2AA7-SSA56"
+      },
+      {
+        "id": "SDD82",
+        "name": "SAIT1DD9-SDD82"
+      },
+      {
+        "id": "JCV1",
+        "name": "JCVLFLBW-JCV1"
+      },
+      {
+        "id": "SUL2",
+        "name": "WERTYUJK-SUL2"
+      },
+      {
+        "id": "PUR1",
+        "name": "purelyde-PUR1"
+      },
+      {
+        "id": "FDE55",
+        "name": "FDERT555-FDE55"
+      },
+      {
+        "id": "SITE",
+        "name": "LONEENCO-SITE"
+      },
+      {
+        "id": "ATL1",
+        "name": "ATLNGAMA-ATL1"
+      },
+      {
+        "id": "JUL1",
+        "name": "ZXCVBNMM-JUL1"
+      },
+      {
+        "id": "TAT34",
+        "name": "TESAAISB-TAT34"
+      },
+      {
+        "id": "XCP12",
+        "name": "CHKGH123-XCP12"
+      },
+      {
+        "id": "RAI1",
+        "name": "poiuytre-RAI1"
+      },
+      {
+        "id": "HPO1",
+        "name": "ATLNGAUP-HPO1"
+      },
+      {
+        "id": "KJF12",
+        "name": "KJFDH123-KJF12"
+      },
+      {
+        "id": "SCC80",
+        "name": "SAIT9CC3-SCC80"
+      },
+      {
+        "id": "SAA12",
+        "name": "SAIT9AF8-SAA12"
+      },
+      {
+        "id": "SAA14",
+        "name": "SAIT1AA9-SAA14"
+      },
+      {
+        "id": "ATL35",
+        "name": "TTESSAAI-ATL35"
+      },
+      {
+        "id": "CWY1",
+        "name": "CWYMOWBS-CWY1"
+      },
+      {
+        "id": "ATL76",
+        "name": "TELEPAAI-ATL76"
+      },
+      {
+        "id": "DSL12",
+        "name": "DSLFK242-DSL12"
+      },
+      {
+        "id": "ATL53",
+        "name": "AAIATLTE-ATL53"
+      },
+      {
+        "id": "SAA11",
+        "name": "SAIT9AA2-SAA11"
+      },
+      {
+        "id": "ATL62",
+        "name": "TESSASCH-ATL62"
+      },
+      {
+        "id": "AUG1",
+        "name": "ASDFGHJK-AUG1"
+      },
+      {
+        "id": "POI22",
+        "name": "POIUY123-POI22"
+      },
+      {
+        "id": "SAA13",
+        "name": "SAIT1AA9-SAA13"
+      },
+      {
+        "id": "BHY17",
+        "name": "BHYTFRF3-BHY17"
+      },
+      {
+        "id": "LIS1",
+        "name": "HOSTPROF-LIS1"
+      },
+      {
+        "id": "SIP1",
+        "name": "ZXCVBNMK-SIP1"
+      },
+      {
+        "id": "ATL99",
+        "name": "TEESTAAI-ATL43"
+      },
+      {
+        "id": "ATL64",
+        "name": "FORLOAAJ-ATL64"
+      },
+      {
+        "id": "TAT33",
+        "name": "TESAAISA-TAT33"
+      },
+      {
+        "id": "RAD10",
+        "name": "INDIPUNE-RAD10"
+      },
+      {
+        "id": "RTW5",
+        "name": "BHYTFRY4-RTW5"
+      },
+      {
+        "id": "JGS1",
+        "name": "KSJKKKKK-JGS1"
+      },
+      {
+        "id": "ATL98",
+        "name": "TEESTAAI-ATL43"
+      },
+      {
+        "id": "WAN1",
+        "name": "LEIWANGW-WAN1"
+      },
+      {
+        "id": "ATL44",
+        "name": "ATLSANAB-ATL44"
+      },
+      {
+        "id": "RTD2",
+        "name": "BHYTFRk4-RTD2"
+      },
+      {
+        "id": "NIR1",
+        "name": "ORFLMANA-NIR1"
+      },
+      {
+        "id": "ATL75",
+        "name": "SANAAIRE-ATL75"
+      },
+      {
+        "id": "NUM1",
+        "name": "QWERTYUI-NUM1"
+      },
+      {
+        "id": "hvf32",
+        "name": "MDTWNJ21-hvf32"
+      },
+      {
+        "id": "RTZ4",
+        "name": "BHYTFRZ6-RTZ4"
+      },
+      {
+        "id": "ATL56",
+        "name": "ATLSANAC-ATL56"
+      },
+      {
+        "id": "AMS1",
+        "name": "AMSTNLBW-AMS1"
+      },
+      {
+        "id": "RCT1",
+        "name": "AMSTERNL-RCT1"
+      },
+      {
+        "id": "JAN1",
+        "name": "ORFLMATT-JAN1"
+      },
+      {
+        "id": "ABC14",
+        "name": "TESAAISA-ABC14"
+      },
+      {
+        "id": "TAT37",
+        "name": "TESAAISD-TAT37"
+      },
+      {
+        "id": "MIC54",
+        "name": "MICHIGAN-MIC54"
+      },
+      {
+        "id": "ABC11",
+        "name": "ATLSANAI-ABC11"
+      },
+      {
+        "id": "AMF11",
+        "name": "AMDOCS01-AMF11"
+      },
+      {
+        "id": "ATL63",
+        "name": "ATLSANEW-ATL63"
+      },
+      {
+        "id": "ABC12",
+        "name": "ATLSECIA-ABC12"
+      },
+      {
+        "id": "hvf20",
+        "name": "MDTWNJ21-hvf20"
+      },
+      {
+        "id": "ABC15",
+        "name": "AAITESAN-ABC15"
+      },
+      {
         "id": "AVT1",
         "name": "AVTRFLHD-AVT1"
       },
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicService.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicService.json
index 7b4440d48..7800cc3ab 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicService.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicService.json
@@ -37,7 +37,7 @@
       "modelCustomizationName": "MULTI_PROVIDER_PORT_GROUP 0"
     }
   },
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {},
   "serviceProxies": {},
   "vfModules": {},
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/Dror_service1806_Macro1.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/Dror_service1806_Macro1.json
index 4a0dc2422..df0fed086 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/Dror_service1806_Macro1.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/Dror_service1806_Macro1.json
@@ -40,72 +40,72 @@
       "type": "VF",
       "modelCustomizationName": "092017_VSP_GINGERby11 0",
       "vfModules": {
-        "092017_vsp_gingerby110..092017VspGingerby11..pxmc_vmt..module-1": {
+        "092017_vsp_gingerby110..092017VspGingerby11..CORNELIUS_vmt..module-1": {
           "uuid": "96af1531-35b5-44b8-b8e9-17e400cce6fd",
           "invariantUuid": "be556344-d212-4c88-9fe1-c72003591e78",
           "customizationUuid": "abb15cf7-174a-4815-86e8-91997b1f07b7",
           "description": null,
-          "name": "092017VspGingerby11..pxmc_vmt..module-1",
+          "name": "092017VspGingerby11..CORNELIUS_vmt..module-1",
           "version": "1",
-          "modelCustomizationName": "092017VspGingerby11..pxmc_vmt..module-1",
+          "modelCustomizationName": "092017VspGingerby11..CORNELIUS_vmt..module-1",
           "properties": {
             "minCountInstances": 0,
             "maxCountInstances": null,
             "initialCount": 0,
-            "vfModuleLabel": "pxmc_vmt"
+            "vfModuleLabel": "CORNELIUS_vmt"
           },
           "inputs": {},
           "volumeGroupAllowed": false
         },
-        "092017_vsp_gingerby110..092017VspGingerby11..pxmc_mmn..module-2": {
+        "092017_vsp_gingerby110..092017VspGingerby11..CORNELIUS_mmn..module-2": {
           "uuid": "2d8bf918-ad4b-42f6-b87d-8cb5c13660b6",
           "invariantUuid": "19c5c400-9d33-4e69-a0ef-9a26ebe68b3d",
           "customizationUuid": "6268df2d-74cc-4189-b7b5-7f833b54d457",
           "description": null,
-          "name": "092017VspGingerby11..pxmc_mmn..module-2",
+          "name": "092017VspGingerby11..CORNELIUS_mmn..module-2",
           "version": "1",
-          "modelCustomizationName": "092017VspGingerby11..pxmc_mmn..module-2",
+          "modelCustomizationName": "092017VspGingerby11..CORNELIUS_mmn..module-2",
           "properties": {
             "minCountInstances": 0,
             "maxCountInstances": null,
             "initialCount": 0,
-            "vfModuleLabel": "pxmc_mmn"
+            "vfModuleLabel": "CORNELIUS_mmn"
           },
           "inputs": {},
           "volumeGroupAllowed": true
         },
-        "092017_vsp_gingerby110..092017VspGingerby11..pxmc_base..module-0": {
+        "092017_vsp_gingerby110..092017VspGingerby11..CORNELIUS_base..module-0": {
           "uuid": "a3d8289d-7b29-4e0f-8b51-e825bfe54749",
           "invariantUuid": "dea04dc1-f4fb-435d-80b4-f176d4c15653",
           "customizationUuid": "e6e4a00e-3fde-459c-9a68-4bf2b35d5e9e",
           "description": null,
-          "name": "092017VspGingerby11..pxmc_base..module-0",
+          "name": "092017VspGingerby11..CORNELIUS_base..module-0",
           "version": "1",
-          "modelCustomizationName": "092017VspGingerby11..pxmc_base..module-0",
+          "modelCustomizationName": "092017VspGingerby11..CORNELIUS_base..module-0",
           "properties": {
             "minCountInstances": 1,
             "maxCountInstances": 1,
             "initialCount": 1,
-            "vfModuleLabel": "pxmc_base"
+            "vfModuleLabel": "CORNELIUS_base"
           },
           "inputs": {},
           "volumeGroupAllowed": false
         }
       },
       "volumeGroups": {
-        "092017_vsp_gingerby110..092017VspGingerby11..pxmc_mmn..module-2": {
+        "092017_vsp_gingerby110..092017VspGingerby11..CORNELIUS_mmn..module-2": {
           "uuid": "2d8bf918-ad4b-42f6-b87d-8cb5c13660b6",
           "invariantUuid": "19c5c400-9d33-4e69-a0ef-9a26ebe68b3d",
           "customizationUuid": "6268df2d-74cc-4189-b7b5-7f833b54d457",
           "description": null,
-          "name": "092017VspGingerby11..pxmc_mmn..module-2",
+          "name": "092017VspGingerby11..CORNELIUS_mmn..module-2",
           "version": "1",
-          "modelCustomizationName": "092017VspGingerby11..pxmc_mmn..module-2",
+          "modelCustomizationName": "092017VspGingerby11..CORNELIUS_mmn..module-2",
           "properties": {
             "minCountInstances": 0,
             "maxCountInstances": null,
             "initialCount": 0,
-            "vfModuleLabel": "pxmc_mmn"
+            "vfModuleLabel": "CORNELIUS_mmn"
           },
           "inputs": {}
         }
@@ -114,76 +114,76 @@
     }
   },
   "networks": {},
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {},
   "serviceProxies": {},
   "vfModules": {
-    "092017_vsp_gingerby110..092017VspGingerby11..pxmc_vmt..module-1": {
+    "092017_vsp_gingerby110..092017VspGingerby11..CORNELIUS_vmt..module-1": {
       "uuid": "96af1531-35b5-44b8-b8e9-17e400cce6fd",
       "invariantUuid": "be556344-d212-4c88-9fe1-c72003591e78",
       "customizationUuid": "abb15cf7-174a-4815-86e8-91997b1f07b7",
       "description": null,
-      "name": "092017VspGingerby11..pxmc_vmt..module-1",
+      "name": "092017VspGingerby11..CORNELIUS_vmt..module-1",
       "version": "1",
-      "modelCustomizationName": "092017VspGingerby11..pxmc_vmt..module-1",
+      "modelCustomizationName": "092017VspGingerby11..CORNELIUS_vmt..module-1",
       "properties": {
         "minCountInstances": 0,
         "maxCountInstances": null,
         "initialCount": 0,
-        "vfModuleLabel": "pxmc_vmt"
+        "vfModuleLabel": "CORNELIUS_vmt"
       },
       "inputs": {},
       "volumeGroupAllowed": false
     },
-    "092017_vsp_gingerby110..092017VspGingerby11..pxmc_base..module-0": {
+    "092017_vsp_gingerby110..092017VspGingerby11..CORNELIUS_base..module-0": {
       "uuid": "a3d8289d-7b29-4e0f-8b51-e825bfe54749",
       "invariantUuid": "dea04dc1-f4fb-435d-80b4-f176d4c15653",
       "customizationUuid": "e6e4a00e-3fde-459c-9a68-4bf2b35d5e9e",
       "description": null,
-      "name": "092017VspGingerby11..pxmc_base..module-0",
+      "name": "092017VspGingerby11..CORNELIUS_base..module-0",
       "version": "1",
-      "modelCustomizationName": "092017VspGingerby11..pxmc_base..module-0",
+      "modelCustomizationName": "092017VspGingerby11..CORNELIUS_base..module-0",
       "properties": {
         "minCountInstances": 1,
         "maxCountInstances": 1,
         "initialCount": 1,
-        "vfModuleLabel": "pxmc_base"
+        "vfModuleLabel": "CORNELIUS_base"
       },
       "inputs": {},
       "volumeGroupAllowed": false
     },
-    "092017_vsp_gingerby110..092017VspGingerby11..pxmc_mmn..module-2": {
+    "092017_vsp_gingerby110..092017VspGingerby11..CORNELIUS_mmn..module-2": {
       "uuid": "2d8bf918-ad4b-42f6-b87d-8cb5c13660b6",
       "invariantUuid": "19c5c400-9d33-4e69-a0ef-9a26ebe68b3d",
       "customizationUuid": "6268df2d-74cc-4189-b7b5-7f833b54d457",
       "description": null,
-      "name": "092017VspGingerby11..pxmc_mmn..module-2",
+      "name": "092017VspGingerby11..CORNELIUS_mmn..module-2",
       "version": "1",
-      "modelCustomizationName": "092017VspGingerby11..pxmc_mmn..module-2",
+      "modelCustomizationName": "092017VspGingerby11..CORNELIUS_mmn..module-2",
       "properties": {
         "minCountInstances": 0,
         "maxCountInstances": null,
         "initialCount": 0,
-        "vfModuleLabel": "pxmc_mmn"
+        "vfModuleLabel": "CORNELIUS_mmn"
       },
       "inputs": {},
       "volumeGroupAllowed": true
     }
   },
   "volumeGroups": {
-    "092017_vsp_gingerby110..092017VspGingerby11..pxmc_mmn..module-2": {
+    "092017_vsp_gingerby110..092017VspGingerby11..CORNELIUS_mmn..module-2": {
       "uuid": "2d8bf918-ad4b-42f6-b87d-8cb5c13660b6",
       "invariantUuid": "19c5c400-9d33-4e69-a0ef-9a26ebe68b3d",
       "customizationUuid": "6268df2d-74cc-4189-b7b5-7f833b54d457",
       "description": null,
-      "name": "092017VspGingerby11..pxmc_mmn..module-2",
+      "name": "092017VspGingerby11..CORNELIUS_mmn..module-2",
       "version": "1",
-      "modelCustomizationName": "092017VspGingerby11..pxmc_mmn..module-2",
+      "modelCustomizationName": "092017VspGingerby11..CORNELIUS_mmn..module-2",
       "properties": {
         "minCountInstances": 0,
         "maxCountInstances": null,
         "initialCount": 0,
-        "vfModuleLabel": "pxmc_mmn"
+        "vfModuleLabel": "CORNELIUS_mmn"
       },
       "inputs": {}
     }
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/Dror_service1806_Macro_NW.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/Dror_service1806_Macro_NW.json
index fe7efe36f..2da74cf8a 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/Dror_service1806_Macro_NW.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/Dror_service1806_Macro_NW.json
@@ -99,7 +99,7 @@
       "modelCustomizationName": "ExtVL 0"
     }
   },
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {},
   "serviceProxies": {},
   "vfModules": {
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/service-with-configuration.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/service-with-configuration.json
index 12d1c273a..7ccd9778f 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/service-with-configuration.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/service-with-configuration.json
@@ -15,7 +15,7 @@
   },
   "vnfs": {},
   "networks": {},
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {
     "Port Mirroring Configuration By Policy 1": {
       "uuid": "f58d039d-4cfc-40ec-bd75-1f05f0458a6c",
@@ -35,9 +35,9 @@
       "type": "Configuration",
       "modelCustomizationName": "Port Mirroring Configuration By Policy 1",
       "sourceNodes": [
-        "vmmeservice2_proxy 2",
-        "vmmeservice2_proxy 3",
-        "vmmeservice_proxy 1"
+        "vflorenceservice2_proxy 2",
+        "vflorenceservice2_proxy 3",
+        "vflorenceservice_proxy 1"
       ],
       "collectorNodes": [
         "pprobeservice_proxy 5"
@@ -62,9 +62,9 @@
       "type": "Configuration",
       "modelCustomizationName": "Port Mirroring Configuration By Policy 0",
       "sourceNodes": [
-        "vmmeservice2_proxy 2",
-        "vmmeservice_proxy 1",
-        "vmmeservice_proxy 0"
+        "vflorenceservice2_proxy 2",
+        "vflorenceservice_proxy 1",
+        "vflorenceservice_proxy 0"
       ],
       "collectorNodes": [
         "pprobeservice_proxy 4"
@@ -73,11 +73,11 @@
     }
   },
   "serviceProxies": {
-    "vmmeservice_proxy 0": {
+    "vflorenceservice_proxy 0": {
       "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee",
       "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10",
-      "description": "A Proxy for Service vmmeService",
-      "name": "vmmeService Service Proxy",
+      "description": "A Proxy for Service vflorenceService",
+      "name": "vflorenceService Service Proxy",
       "version": "1.0",
       "customizationUuid": "d7cfe338-eeda-4217-ba13-f24b0811fb17",
       "inputs": {},
@@ -86,13 +86,13 @@
       "type": "Service Proxy",
       "sourceModelUuid": "c3e6c9bd-b24d-458e-aa99-e0cadf70c5e5",
       "sourceModelInvariant": "dd8a805d-3946-4f11-9831-e26cd6aec9a3",
-      "sourceModelName": "vmmeService"
+      "sourceModelName": "vflorenceService"
     },
-    "vmmeservice_proxy 1": {
+    "vflorenceservice_proxy 1": {
       "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee",
       "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10",
-      "description": "A Proxy for Service vmmeService",
-      "name": "vmmeService Service Proxy",
+      "description": "A Proxy for Service vflorenceService",
+      "name": "vflorenceService Service Proxy",
       "version": "1.0",
       "customizationUuid": "7a69f133-564c-4eb6-b93e-0a8281967efb",
       "inputs": {},
@@ -101,13 +101,13 @@
       "type": "Service Proxy",
       "sourceModelUuid": "c3e6c9bd-b24d-458e-aa99-e0cadf70c5e5",
       "sourceModelInvariant": "dd8a805d-3946-4f11-9831-e26cd6aec9a3",
-      "sourceModelName": "vmmeService"
+      "sourceModelName": "vflorenceService"
     },
-    "vmmeservice2_proxy 3": {
+    "vflorenceservice2_proxy 3": {
       "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee",
       "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10",
-      "description": "A Proxy for Service vmmeService2",
-      "name": "vmmeService2 Service Proxy",
+      "description": "A Proxy for Service vflorenceService2",
+      "name": "vflorenceService2 Service Proxy",
       "version": "1.0",
       "customizationUuid": "9d81c21f-e29c-44f6-b5f6-caa974ee078a",
       "inputs": {},
@@ -116,7 +116,7 @@
       "type": "Service Proxy",
       "sourceModelUuid": "2a2ea15f-07c6-4b89-bfca-e8aba39a34d6",
       "sourceModelInvariant": "a7eac2b3-8444-40ee-92e3-b3359b32445c",
-      "sourceModelName": "vmmeService2"
+      "sourceModelName": "vflorenceService2"
     },
     "pprobeservice_proxy 4": {
       "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee",
@@ -148,11 +148,11 @@
       "sourceModelInvariant": "83b458fd-5dd3-419b-a9e3-7335814a0911",
       "sourceModelName": "pProbeService"
     },
-    "vmmeservice2_proxy 2": {
+    "vflorenceservice2_proxy 2": {
       "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee",
       "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10",
-      "description": "A Proxy for Service vmmeService2",
-      "name": "vmmeService2 Service Proxy",
+      "description": "A Proxy for Service vflorenceService2",
+      "name": "vflorenceService2 Service Proxy",
       "version": "1.0",
       "customizationUuid": "060be63d-5f9c-4fd0-8ef7-830d5e8eca17",
       "inputs": {},
@@ -161,7 +161,7 @@
       "type": "Service Proxy",
       "sourceModelUuid": "2a2ea15f-07c6-4b89-bfca-e8aba39a34d6",
       "sourceModelInvariant": "a7eac2b3-8444-40ee-92e3-b3359b32445c",
-      "sourceModelName": "vmmeService2"
+      "sourceModelName": "vflorenceService2"
     }
   },
   "vfModules": {},
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug_aLaCarteServiceWrongPopup/list-services.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug_aLaCarteServiceWrongPopup/list-services.json
index c93191db1..a2e25fe30 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug_aLaCarteServiceWrongPopup/list-services.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug_aLaCarteServiceWrongPopup/list-services.json
@@ -3,7 +3,7 @@
     {
       "uuid": "09c476c7-91ae-44b8-a731-04d8d8fa3695",
       "invariantUUID": "11819cb5-0ad7-4c6d-9205-2ac30d09bdc6",
-      "name": "Mobility Networking Svc Mode",
+      "name": "Emanuel Networking Svc Mode",
       "version": "1.0",
       "toscaModelURL": null,
       "category": "service",
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug_aLaCarteServiceWrongPopup/serviceWithoutInstantiationType.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug_aLaCarteServiceWrongPopup/serviceWithoutInstantiationType.json
index 90ca6128b..444851eeb 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug_aLaCarteServiceWrongPopup/serviceWithoutInstantiationType.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug_aLaCarteServiceWrongPopup/serviceWithoutInstantiationType.json
@@ -2,20 +2,20 @@
   "service": {
     "uuid": "09c476c7-91ae-44b8-a731-04d8d8fa3695",
     "invariantUuid": "11819cb5-0ad7-4c6d-9205-2ac30d09bdc6",
-    "name": "Mobility Networking Svc Mode",
+    "name": "Emanuel Networking Svc Mode",
     "version": "1.0",
     "toscaModelURL": null,
     "category": "Emanuel",
     "serviceType": null,
     "serviceRole": null,
-    "description": "single generic service model with mobility VLs in it to create any mobility network",
+    "description": "single generic service model with emanuel VLs in it to create any emanuel network",
     "serviceEcompNaming": "false",
     "instantiationType": null,
     "inputs": {}
   },
   "vnfs": {},
   "networks": {},
-  "collectionResource": null,
+  "collectionResources": null,
   "configurations": null,
   "fabricConfigurations": {},
   "serviceProxies": null,
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/createdFabricConfigService.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/createdFabricConfigService.json
index 3e556550c..398fe6c21 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/createdFabricConfigService.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/createdFabricConfigService.json
@@ -2,13 +2,13 @@
   "service": {
     "uuid": "90004bb4-a416-4b4e-997e-0059973630b9",
     "invariantUuid": "90003f9e-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": "ClientConfig",
     "inputs": {
@@ -21,7 +21,7 @@
   "networks": {
 
   },
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {
 
   },
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/deactivatedFabricConfigService.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/deactivatedFabricConfigService.json
index e3aeca412..982e10d8d 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/deactivatedFabricConfigService.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/deactivatedFabricConfigService.json
@@ -2,13 +2,13 @@
   "service": {
     "uuid": "10004bb4-a416-4b4e-997e-0059973630b9",
     "invariantUuid": "10003f9e-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": "ClientConfig",
     "inputs": {
@@ -21,7 +21,7 @@
   "networks": {
 
   },
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {
 
   },
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiServiceInstancesE2E.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiServiceInstancesE2E.json
new file mode 100644
index 000000000..85175b0c2
--- /dev/null
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiServiceInstancesE2E.json
@@ -0,0 +1 @@
+{"service-instances":[{"serviceInstanceId":"dedd680f-f3bd-46d8-97c7-b6fc28db9317","globalCustomerId":"e433710f-9217-458d-a79d-1c7aff376d89","serviceType":"TYLER SILVIA","serviceInstanceName":"SI_E2E_vCCF_6610SD_SVC","subscriberName":"SILVIA ROBBINS","aaiModelInvariantId":"5c3eb5cb-a3ef-4089-bdbe-3b5ebd20541d","aaiModelVersionId":"afe751ef-2687-4647-8474-aba4d64cc3a3","isPermitted":true}]}
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiSubDetailsE2E.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiSubDetailsE2E.json
new file mode 100644
index 000000000..9a8fc8050
--- /dev/null
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiSubDetailsE2E.json
@@ -0,0 +1,180 @@
+{
+  "global-customer-id": "e433710f-9217-458d-a79d-1c7aff376d89",
+  "subscriber-name": "SILVIA ROBBINS",
+  "subscriber-type": "INFRA",
+  "resource-version": "1494254832007",
+  "service-subscriptions": {
+    "service-subscription": [{
+      "service-type": "LINDSEY",
+      "resource-version": "1506190376301",
+      "service-instances": {
+        "service-instance": [{
+          "service-instance-id": "ec1e72f9-1503-4f91-9a9d-f02e6afe3e64",
+          "service-instance-name": "ap7134_544027_retest_1806",
+          "persona-model-id": null,
+          "persona-model-version": null,
+          "resource-version": "1531404579331",
+          "orchestration-status": "Active",
+          "model-invariant-id": "20384767-da0d-4815-bb5b-8da1fb4f1995",
+          "model-version-id": "4b60252a-bf6c-40df-9db5-98b4c363fdf4"
+        },
+          {
+            "service-instance-id": "e59b07d9-2e59-417d-ad0e-08337a409b7c",
+            "service-instance-name": "ap7134_spnup_7252018",
+            "persona-model-id": null,
+            "persona-model-version": null,
+            "resource-version": "1532529555496",
+            "orchestration-status": "Active",
+            "model-invariant-id": "e0457621-4f61-4b30-beb5-7f27be4dc9c6",
+            "model-version-id": "b504896c-85e6-4c4a-adad-c9aaf49addc1"
+          }, {
+            "service-instance-id": "2468b69a-86b0-4756-a435-d974d01736c9",
+            "service-instance-name": "vson_bb389n_813",
+            "persona-model-id": null,
+            "persona-model-version": null,
+            "resource-version": "1534130966388",
+            "orchestration-status": "Active",
+            "model-invariant-id": "e85bacdf-b8c0-4cdf-b1ba-eb55a9b14027",
+            "model-version-id": "d948e05b-9728-4915-9b4a-6833c3a32144"
+          }, {
+            "service-instance-id": "f14b959a-b1e2-4168-a9a4-0c2e23b5721c",
+            "service-instance-name": "vrar_bb389n_0705",
+            "persona-model-id": null,
+            "persona-model-version": null,
+            "resource-version": "1530734584462",
+            "orchestration-status": "Active",
+            "model-invariant-id": "b66b71d8-a341-4351-a8bf-6346362a9e13",
+            "model-version-id": "6a0f035b-a90e-49cf-b6de-12d7540f51ae"
+          }, {
+            "service-instance-id": "9853dcaa-fb5e-48e6-866f-682a9da8f040",
+            "service-instance-name": "olson5bTFNET_CORE_Svc",
+            "persona-model-id": null,
+            "persona-model-version": null,
+            "resource-version": "1547998014228",
+            "orchestration-status": "Active",
+            "model-invariant-id": "27a63d80-76b7-438d-86fb-29ad806bff2b",
+            "model-version-id": "bb3d8047-05d3-4ea0-a243-20038e53675c"
+          }, {
+            "service-instance-id": "bedd3b9d-b274-4a3b-8cb6-f17b98904720",
+            "service-instance-name": "vson_ap7134_vnf",
+            "persona-model-id": null,
+            "persona-model-version": null,
+            "resource-version": "1531775345108",
+            "orchestration-status": "Active",
+            "model-invariant-id": "28a020b2-1ca4-45b3-aff9-9d4c21b2ff63",
+            "model-version-id": "0389f916-f78b-4707-b766-7efb7ff1a499"
+          }, {
+            "service-instance-id": "348ab22e-a8f7-4164-9cf2-e0a612c0b2bb",
+            "service-instance-name": "vson_72618_bb389n",
+            "persona-model-id": null,
+            "persona-model-version": null,
+            "resource-version": "1532547746080",
+            "orchestration-status": "Active",
+            "model-invariant-id": "e0457621-4f61-4b30-beb5-7f27be4dc9c6",
+            "model-version-id": "2846371c-baf0-469e-8384-00473a4f8ddf"
+          }, {
+            "service-instance-id": "74b3aa0c-39b3-4b71-ade9-2a8c3c8dcd22",
+            "service-instance-name": "vnf_vson_spnup_ap7134",
+            "persona-model-id": null,
+            "persona-model-version": null,
+            "resource-version": "1531837750994",
+            "orchestration-status": "Active",
+            "model-invariant-id": "28a020b2-1ca4-45b3-aff9-9d4c21b2ff63",
+            "model-version-id": "0389f916-f78b-4707-b766-7efb7ff1a499"
+          }, {
+            "service-instance-id": "de5127f9-3b0d-4ff6-a51d-01b4c8855848",
+            "service-instance-name": "olson5aTFNET_CORE_Svc",
+            "persona-model-id": null,
+            "persona-model-version": null,
+            "resource-version": "1500478578807",
+            "orchestration-status": "Active",
+            "model-invariant-id": "137fb14d-ad74-4295-9d39-400b920f8727",
+            "model-version-id": "c0b2f779-9c5d-40dd-a30d-4b6d7599b52c"
+          }, {
+            "service-instance-id": "5238bcdf-9a64-4b9e-a4c5-fca0bcc7c466",
+            "service-instance-name": "spinup_ap7134_822018",
+            "persona-model-id": null,
+            "persona-model-version": null,
+            "resource-version": "1533231684103",
+            "orchestration-status": "Active",
+            "model-invariant-id": "4b71a28a-7955-4d64-88cf-2e5426577c73",
+            "model-version-id": "087cec64-c2d3-402c-b645-a3c322255906"
+          }, {
+            "service-instance-id": "0e970d97-f5a5-4957-8c12-db63d9286fd1",
+            "service-instance-name": "vSON_ap7134_vnf_spnup",
+            "persona-model-id": null,
+            "persona-model-version": null,
+            "resource-version": "1531841030174",
+            "orchestration-status": "Active",
+            "model-invariant-id": "28a020b2-1ca4-45b3-aff9-9d4c21b2ff63",
+            "model-version-id": "0389f916-f78b-4707-b766-7efb7ff1a499"
+          }, {
+            "service-instance-id": "e166a16b-b374-4bbd-bfb7-47edadc4a00a",
+            "service-instance-name": "ap7134_spnup_822018",
+            "persona-model-id": null,
+            "persona-model-version": null,
+            "resource-version": "1533223911561",
+            "orchestration-status": "Active",
+            "model-invariant-id": "4b71a28a-7955-4d64-88cf-2e5426577c73",
+            "model-version-id": "087cec64-c2d3-402c-b645-a3c322255906"
+          }, {
+            "service-instance-id": "cbe1a45b-f7cb-4c5c-b81e-0d609895a290",
+            "service-instance-name": "vson_ap7134_Network_71118",
+            "persona-model-id": null,
+            "persona-model-version": null,
+            "resource-version": "1531319680581",
+            "orchestration-status": "Active",
+            "model-invariant-id": "62acd6dc-cfa5-451f-b9ff-47319ee5fc92",
+            "model-version-id": "51c91dfc-479d-4ac0-aa07-44bbc4425b73"
+          }
+        ]
+      },
+      "is-permitted": true
+    }, {
+      "service-type": "TSBC",
+      "resource-version": "1494254819433",
+      "service-instances": {
+        "service-instance": [
+          {
+            "service-instance-id": "dedd680f-f3bd-46d8-97c7-b6fc28db9317",
+            "service-instance-name": "SI_E2E_vCCF_6610SD_SVC",
+            "persona-model-id": null,
+            "persona-model-version": null,
+            "resource-version": "1548785479902",
+            "orchestration-status": "Active",
+            "model-invariant-id": "5c3eb5cb-a3ef-4089-bdbe-3b5ebd20541d",
+            "model-version-id": "afe751ef-2687-4647-8474-aba4d64cc3a3"
+          }
+        ]
+      },
+      "is-permitted": true
+    }, {
+      "service-type": "DARREN MCGEE",
+      "resource-version": "1520621552263",
+      "service-instances": {
+        "service-instance": []
+      },
+      "is-permitted": true
+    }, {
+      "service-type": "DARREN-MCGEE",
+      "resource-version": "1494254868313",
+      "service-instances": null,
+      "is-permitted": false
+    }, {
+      "service-type": "BVOIP",
+      "resource-version": "1495115903610",
+      "service-instances": {
+        "service-instance": []
+      },
+      "is-permitted": true
+    }, {
+      "service-type": "TYLER SILVIA",
+      "resource-version": "1537366571571",
+      "service-instances": {
+        "service-instance": []
+      },
+      "is-permitted": true
+    }
+    ]
+  }
+}
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiSubViewEditForServiceWithSomeVFModuleE2E.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiSubViewEditForServiceWithSomeVFModuleE2E.json
new file mode 100644
index 000000000..2c427fdda
--- /dev/null
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiSubViewEditForServiceWithSomeVFModuleE2E.json
@@ -0,0 +1,310 @@
+{
+  "inventory-response-item": [{
+    "model-name": "E2E_vCCF_6610SD _SVC",
+    "service-instance": {
+      "service-instance-id": "dedd680f-f3bd-46d8-97c7-b6fc28db9317",
+      "service-instance-name": "SI_E2E_vCCF_6610SD_SVC"
+    },
+    "extra-properties": {},
+    "inventory-response-items": {
+      "inventory-response-item": [{
+        "model-name": "E2E_vCCF_6610SD _VSP",
+        "generic-vnf": {
+          "vnf-id": "1d45e992-e282-4ba5-b17a-9ca6562169e3",
+          "vnf-name": "dpa2bccfx5992v",
+          "vnf-type": "E2E_vCCF_6610SD _SVC/E2E_vCCF_6610SD _VSP 0",
+          "service-id": "e433710f-9217-458d-a79d-1c7aff376d89",
+          "prov-status": "PREPROV",
+          "equipment-role": "vCCF",
+          "orchestration-status": "Active",
+          "in-maint": false,
+          "is-closed-loop-disabled": false,
+          "resource-version": "1551298829859",
+          "model-invariant-id": "57437138-b11e-47b1-aaca-4578251ee173",
+          "model-version-id": "229ac49e-61de-43d9-ab1a-9e6951226efe",
+          "model-customization-id": "b80c20bb-35b5-4e16-9819-4d09692e9435",
+          "nf-type": "CDR-GENERATOR",
+          "nf-function": "VUSP-VCCF",
+          "nf-role": "vCCF",
+          "nf-naming-code": "ccfx",
+          "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/dedd680f-f3bd-46d8-97c7-b6fc28db9317/service-data/vnfs/vnf/1d45e992-e282-4ba5-b17a-9ca6562169e3/vnf-data/vnf-topology/"
+        },
+        "extra-properties": {},
+        "inventory-response-items": {
+          "inventory-response-item": [{
+            "volume-group": {
+              "volume-group-id": "2ca48b79-062a-4471-a731-4fe15c2d961d",
+              "volume-group-name": "dpa2bccfx5992_vol",
+              "heat-stack-id": "dpa2bccfx5992_vol/43e17f84-0d50-4f99-9f9d-7c27fc1b39d8",
+              "vnf-type": "E2E_vCCF_6610SD _SVC/E2E_vCCF_6610SD _VSP 0",
+              "orchestration-status": "Active",
+              "model-customization-id": "ed87e68b-1b32-4aae-8aea-d2725a5e5602",
+              "vf-module-model-customization-id": "ed87e68b-1b32-4aae-8aea-d2725a5e5602",
+              "resource-version": "1548831528407"
+            },
+            "extra-properties": {}
+          }, {
+            "model-name": "E2eVccf6610sdVsp..base_vIECCF..module-0",
+            "vf-module": {
+              "vf-module-id": "f1688a69-2792-4f1f-bc95-4864f4742e7b",
+              "vf-module-name": "dpa2bccfx5992v_base_module",
+              "orchestration-status": "Assigned",
+              "is-base-vf-module": true,
+              "automated-assignment": false,
+              "resource-version": "1551299087384",
+              "model-invariant-id": "4453a55f-13fa-44eb-a158-eb36e7803787",
+              "model-version-id": "ce92010b-3520-49c7-b37f-9b10ce5a8009",
+              "model-customization-id": "ed87e68b-1b32-4aae-8aea-d2725a5e5602",
+              "module-index": 0,
+              "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/dedd680f-f3bd-46d8-97c7-b6fc28db9317/service-data/vnfs/vnf/1d45e992-e282-4ba5-b17a-9ca6562169e3/vnf-data/vf-modules/vf-module/f1688a69-2792-4f1f-bc95-4864f4742e7b/vf-module-data/vf-module-topology/"
+            },
+            "extra-properties": {},
+            "inventory-response-items": {
+              "inventory-response-item": [{
+                "volume-group": {
+                  "volume-group-id": "2ca48b79-062a-4471-a731-4fe15c2d961d",
+                  "volume-group-name": "dpa2bccfx5992_vol",
+                  "heat-stack-id": "dpa2bccfx5992_vol/43e17f84-0d50-4f99-9f9d-7c27fc1b39d8",
+                  "vnf-type": "E2E_vCCF_6610SD _SVC/E2E_vCCF_6610SD _VSP 0",
+                  "orchestration-status": "Active",
+                  "model-customization-id": "ed87e68b-1b32-4aae-8aea-d2725a5e5602",
+                  "vf-module-model-customization-id": "ed87e68b-1b32-4aae-8aea-d2725a5e5602",
+                  "resource-version": "1548831528407"
+                },
+                "extra-properties": {}
+              }, {
+                "vserver": {
+                  "vserver-id": "ca2a6247-8ed7-4b6e-ae60-1979c24db55d",
+                  "vserver-name": "dpa2bccfx5992vm011",
+                  "vserver-name2": "dpa2bccfx5992vm011",
+                  "vserver-selflink": "https://comp.onap.org:8774/v2/b60da4f71c1d4b35b8113d4eca6deaa1/servers/ca2a6247-8ed7-4b6e-ae60-1979c24db55d",
+                  "in-maint": false,
+                  "is-closed-loop-disabled": false,
+                  "resource-version": "1550896212439"
+                },
+                "extra-properties": {}
+              }, {
+                "vserver": {
+                  "vserver-id": "6354b5e7-e5eb-48b1-b770-8fb9de5ab21f",
+                  "vserver-name": "dpa2bccfx5992vm005",
+                  "vserver-name2": "dpa2bccfx5992vm005",
+                  "vserver-selflink": "https://comp.onap.org:8774/v2/b60da4f71c1d4b35b8113d4eca6deaa1/servers/6354b5e7-e5eb-48b1-b770-8fb9de5ab21f",
+                  "in-maint": false,
+                  "is-closed-loop-disabled": false,
+                  "resource-version": "1550896353025"
+                },
+                "extra-properties": {}
+              }, {
+                "vserver": {
+                  "vserver-id": "dafb62ad-36cf-4aa1-8286-337dc7232c05",
+                  "vserver-name": "dpa2bccfx5992vm010",
+                  "vserver-name2": "dpa2bccfx5992vm010",
+                  "vserver-selflink": "https://comp.onap.org:8774/v2/b60da4f71c1d4b35b8113d4eca6deaa1/servers/dafb62ad-36cf-4aa1-8286-337dc7232c05",
+                  "in-maint": false,
+                  "is-closed-loop-disabled": false,
+                  "resource-version": "1550896347787"
+                },
+                "extra-properties": {}
+              }, {
+                "vserver": {
+                  "vserver-id": "7c6e8a86-97d4-47d0-bbec-9046925f0a0c",
+                  "vserver-name": "dpa2bccfx5992vm002",
+                  "vserver-name2": "dpa2bccfx5992vm002",
+                  "vserver-selflink": "https://comp.onap.org:8774/v2/b60da4f71c1d4b35b8113d4eca6deaa1/servers/7c6e8a86-97d4-47d0-bbec-9046925f0a0c",
+                  "in-maint": false,
+                  "is-closed-loop-disabled": false,
+                  "resource-version": "1550896385541"
+                },
+                "extra-properties": {}
+              }, {
+                "vserver": {
+                  "vserver-id": "25d1e26b-fd12-4db7-85cf-900cef7af347",
+                  "vserver-name": "dpa2bccfx5992vm003",
+                  "vserver-name2": "dpa2bccfx5992vm003",
+                  "vserver-selflink": "https://comp.onap.org:8774/v2/b60da4f71c1d4b35b8113d4eca6deaa1/servers/25d1e26b-fd12-4db7-85cf-900cef7af347",
+                  "in-maint": false,
+                  "is-closed-loop-disabled": false,
+                  "resource-version": "1550896421775"
+                },
+                "extra-properties": {}
+              }, {
+                "vserver": {
+                  "vserver-id": "c6d36d19-3a31-46a1-98e7-e173807e4e57",
+                  "vserver-name": "dpa2bccfx5992vm004",
+                  "vserver-name2": "dpa2bccfx5992vm004",
+                  "vserver-selflink": "https://comp.onap.org:8774/v2/b60da4f71c1d4b35b8113d4eca6deaa1/servers/c6d36d19-3a31-46a1-98e7-e173807e4e57",
+                  "in-maint": false,
+                  "is-closed-loop-disabled": false,
+                  "resource-version": "1550896345784"
+                },
+                "extra-properties": {}
+              }, {
+                "vserver": {
+                  "vserver-id": "957e5f81-5b90-4a31-a3ff-0f34fdd9e487",
+                  "vserver-name": "dpa2bccfx5992vm006",
+                  "vserver-name2": "dpa2bccfx5992vm006",
+                  "vserver-selflink": "https://comp.onap.org:8774/v2/b60da4f71c1d4b35b8113d4eca6deaa1/servers/957e5f81-5b90-4a31-a3ff-0f34fdd9e487",
+                  "in-maint": false,
+                  "is-closed-loop-disabled": false,
+                  "resource-version": "1550896285901"
+                },
+                "extra-properties": {}
+              }, {
+                "vserver": {
+                  "vserver-id": "97f82bd5-1522-4c9d-8061-e362a3cbfdb8",
+                  "vserver-name": "dpa2bccfx5992vm008",
+                  "vserver-name2": "dpa2bccfx5992vm008",
+                  "vserver-selflink": "https://comp.onap.org:8774/v2/b60da4f71c1d4b35b8113d4eca6deaa1/servers/97f82bd5-1522-4c9d-8061-e362a3cbfdb8",
+                  "in-maint": false,
+                  "is-closed-loop-disabled": false,
+                  "resource-version": "1550896282486"
+                },
+                "extra-properties": {}
+              }, {
+                "vserver": {
+                  "vserver-id": "fd2f0db6-fcc5-46a1-8fd6-d9c4233f0e10",
+                  "vserver-name": "dpa2bccfx5992vm001",
+                  "vserver-name2": "dpa2bccfx5992vm001",
+                  "vserver-selflink": "https://comp.onap.org:8774/v2/b60da4f71c1d4b35b8113d4eca6deaa1/servers/fd2f0db6-fcc5-46a1-8fd6-d9c4233f0e10",
+                  "in-maint": false,
+                  "is-closed-loop-disabled": false,
+                  "resource-version": "1550896275425"
+                },
+                "extra-properties": {}
+              }, {
+                "vserver": {
+                  "vserver-id": "75bac4b9-dd19-40b1-848f-d3ce5ce109da",
+                  "vserver-name": "dpa2bccfx5992vm007",
+                  "vserver-name2": "dpa2bccfx5992vm007",
+                  "vserver-selflink": "https://comp.onap.org:8774/v2/b60da4f71c1d4b35b8113d4eca6deaa1/servers/75bac4b9-dd19-40b1-848f-d3ce5ce109da",
+                  "in-maint": false,
+                  "is-closed-loop-disabled": false,
+                  "resource-version": "1550896218468"
+                },
+                "extra-properties": {}
+              }, {
+                "vserver": {
+                  "vserver-id": "f255dc26-7ffb-40a1-a37a-02f858ebbd52",
+                  "vserver-name": "dpa2bccfx5992vm009",
+                  "vserver-name2": "dpa2bccfx5992vm009",
+                  "vserver-selflink": "https://comp.onap.org:8774/v2/b60da4f71c1d4b35b8113d4eca6deaa1/servers/f255dc26-7ffb-40a1-a37a-02f858ebbd52",
+                  "in-maint": false,
+                  "is-closed-loop-disabled": false,
+                  "resource-version": "1550896341966"
+                },
+                "extra-properties": {}
+              }, {
+                "l3-network": {
+                  "network-id": "b90ea5aa-5079-470b-8e79-3e2dc1a4e502",
+                  "network-name": "Control_Loop-23804-T-01-dpa2b_CORE-VIF-TSIG0_net_0",
+                  "network-type": "CONTRAIL30_BASIC",
+                  "network-role": "Control_Loop-23804-T-01-dpa2b_CORE-VIF-TSIG0",
+                  "network-technology": "contrail",
+                  "neutron-network-id": "4e996ec6-2c17-4881-b8c4-9225ec64678b",
+                  "is-bound-to-vpn": true,
+                  "service-id": "e433710f-9217-458d-a79d-1c7aff376d89",
+                  "network-role-instance": 0,
+                  "resource-version": "1547969639781",
+                  "orchestration-status": "Created",
+                  "heat-stack-id": "Control_Loop-23804-T-01-dpa2b_CORE-VIF-TSIG0_net_0/9e260519-dde7-4b9a-9692-cef542089ed5",
+                  "contrail-network-fqdn": "default-domain:Closed_Loop-23804-T-01-dpa2b:Control_Loop-23804-T-01-dpa2b_CORE-VIF-TSIG0_net_0",
+                  "physical-network-name": "Not Aplicable",
+                  "is-provider-network": false,
+                  "is-shared-network": false,
+                  "is-external-network": false,
+                  "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/cd48e066-08f5-4134-9c83-34615d6bba5c/service-data/networks/network/b90ea5aa-5079-470b-8e79-3e2dc1a4e502/network-data/network-topology/"
+                },
+                "extra-properties": {},
+                "inventory-response-items": {
+                  "inventory-response-item": [{
+                    "subnet": {
+                      "subnet-id": "2eaceba4-58ae-4abc-b6a5-bb7f2248699d",
+                      "subnet-name": "Control_Loop-23804-T-01-dpa2b_CORE-VIF-TSIG0_net_0_IPv6_Subnet1",
+                      "neutron-subnet-id": "d342e7c9-62af-4e88-939d-65b032be8078",
+                      "gateway-address": "2001:1890:1001:22D5:0:0:0:1",
+                      "network-start-address": "2001:1890:1001:22D5::",
+                      "cidr-mask": "64",
+                      "ip-version": "6",
+                      "orchestration-status": "Created",
+                      "dhcp-enabled": true,
+                      "dhcp-start": "2001:1890:1001:22D5:ffff:ffff:ffff:0",
+                      "dhcp-end": "2001:1890:1001:22D5:ffff:ffff:ffff:fffe",
+                      "ip-assignment-direction": "true",
+                      "resource-version": "1517256523275"
+                    },
+                    "extra-properties": {}
+                  }, {
+                    "subnet": {
+                      "subnet-id": "124278b1-b77b-4bb3-aeca-83d1deb58409",
+                      "subnet-name": "Control_Loop-23804-T-01-dpa2b_CORE-VIF-TSIG0_net_0_IPv4_Subnet1",
+                      "neutron-subnet-id": "9edb7006-7936-4e9d-84e0-55eb04e6a9b1",
+                      "gateway-address": "10.0.0.10",
+                      "network-start-address": "10.0.0.10",
+                      "cidr-mask": "25",
+                      "ip-version": "4",
+                      "orchestration-status": "Created",
+                      "dhcp-enabled": true,
+                      "dhcp-start": "10.0.0.10",
+                      "dhcp-end": "10.0.0.10",
+                      "ip-assignment-direction": "true",
+                      "resource-version": "1517256523267"
+                    },
+                    "extra-properties": {}
+                  }
+                  ]
+                }
+              }, {
+                "l3-network": {
+                  "network-id": "16f9455e-05d9-42b4-a40c-f2a900cebbcf",
+                  "network-name": "Control_Loop-23804-T-01-dpa2b_CORE-NSD-TOAM0_net_0",
+                  "network-type": "CONTRAIL30_BASIC",
+                  "network-role": "Control_Loop-23804-T-01-dpa2b_CORE-NSD-TOAM0",
+                  "network-technology": "contrail",
+                  "neutron-network-id": "26b26c1e-7903-478c-ad3d-9e27ef194456",
+                  "is-bound-to-vpn": true,
+                  "service-id": "e433710f-9217-458d-a79d-1c7aff376d89",
+                  "network-role-instance": 0,
+                  "resource-version": "1547969631952",
+                  "orchestration-status": "Created",
+                  "heat-stack-id": "Control_Loop-23804-T-01-dpa2b_CORE-NSD-TOAM0_net_0/f161b66f-cb65-4e97-a386-1f2e6758cbed",
+                  "contrail-network-fqdn": "default-domain:Closed_Loop-23804-T-01-dpa2b:Control_Loop-23804-T-01-dpa2b_CORE-NSD-TOAM0_net_0",
+                  "physical-network-name": "Not Aplicable",
+                  "is-provider-network": false,
+                  "is-shared-network": false,
+                  "is-external-network": false,
+                  "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/cd48e066-08f5-4134-9c83-34615d6bba5c/service-data/networks/network/16f9455e-05d9-42b4-a40c-f2a900cebbcf/network-data/network-topology/"
+                },
+                "extra-properties": {},
+                "inventory-response-items": {
+                  "inventory-response-item": [{
+                    "subnet": {
+                      "subnet-id": "b09c8d09-a873-446e-ac12-ee55c15d4915",
+                      "subnet-name": "Control_Loop-23804-T-01-dpa2b_CORE-NSD-TOAM0_net_0_IPv4_Subnet1",
+                      "neutron-subnet-id": "3dfb5920-f438-473b-9273-2c10c57ca7e5",
+                      "gateway-address": "10.0.0.10",
+                      "network-start-address": "10.0.0.10",
+                      "cidr-mask": "24",
+                      "ip-version": "4",
+                      "orchestration-status": "Created",
+                      "dhcp-enabled": true,
+                      "dhcp-start": "10.0.0.10",
+                      "dhcp-end": "10.0.0.10",
+                      "ip-assignment-direction": "true",
+                      "resource-version": "1517256872855"
+                    },
+                    "extra-properties": {}
+                  }
+                  ]
+                }
+              }
+              ]
+            }
+          }
+          ]
+        }
+      }
+      ]
+    }
+  }
+  ]
+}
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/expectedResumeWithVGResults.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/expectedResumeWithVGResults.json
new file mode 100644
index 000000000..53cb341a1
--- /dev/null
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/expectedResumeWithVGResults.json
@@ -0,0 +1,67 @@
+{
+  "requestDetails": {
+    "requestInfo": {
+      "instanceName": "dpa2bccfx5992v_base_module",
+      "source": "VID",
+      "suppressRollback": false,
+      "requestorId": "us16807000"
+    },
+    "modelInfo": {
+      "modelType": "vfModule",
+      "modelInvariantId": "4453a55f-13fa-44eb-a158-eb36e7803787",
+      "modelVersionId": "ce92010b-3520-49c7-b37f-9b10ce5a8009",
+      "modelName": "E2eVccf6610sdVsp..base_vIECCF..module-0",
+      "modelVersion": "1",
+      "modelCustomizationId": "ed87e68b-1b32-4aae-8aea-d2725a5e5602",
+      "modelCustomizationName": "E2eVccf6610sdVsp..base_vIECCF..module-0"
+    },
+    "requestParameters": {
+      "userParams": [],
+      "testApi": "VNF_API",
+      "usePreload": false
+    },
+    "cloudConfiguration": {
+      "lcpCloudRegionId": "hvf6",
+      "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054"
+    },
+    "relatedInstanceList": [{
+      "relatedInstance": {
+        "instanceId": "dedd680f-f3bd-46d8-97c7-b6fc28db9317",
+        "modelInfo": {
+          "modelType": "service",
+          "modelName": "E2E_vCCF_6610SD _SVC",
+          "modelInvariantId": "5c3eb5cb-a3ef-4089-bdbe-3b5ebd20541d",
+          "modelVersion": "1.0",
+          "modelVersionId": "afe751ef-2687-4647-8474-aba4d64cc3a3"
+        }
+      }
+    }, {
+      "relatedInstance": {
+        "instanceId": "1d45e992-e282-4ba5-b17a-9ca6562169e3",
+        "modelInfo": {
+          "modelType": "vnf",
+          "modelName": "E2E_vCCF_6610SD _VSP",
+          "modelInvariantId": "57437138-b11e-47b1-aaca-4578251ee173",
+          "modelVersion": "1.0",
+          "modelVersionId": "229ac49e-61de-43d9-ab1a-9e6951226efe",
+          "modelCustomizationId": "b80c20bb-35b5-4e16-9819-4d09692e9435",
+          "modelCustomizationName": "E2E_vCCF_6610SD _VSP 0"
+        }
+      }
+    }, {
+      "relatedInstance": {
+        "instanceId": "2ca48b79-062a-4471-a731-4fe15c2d961d",
+        "modelInfo": {
+          "modelType": "volumeGroup",
+          "modelName": "E2eVccf6610sdVsp..base_vIECCF..module-0",
+          "modelInvariantId": "4453a55f-13fa-44eb-a158-eb36e7803787",
+          "modelVersion": "1",
+          "modelVersionId": "ce92010b-3520-49c7-b37f-9b10ce5a8009",
+          "modelCustomizationId": "ed87e68b-1b32-4aae-8aea-d2725a5e5602",
+          "modelCustomizationName": "E2eVccf6610sdVsp..base_vIECCF..module-0"
+        }
+      }
+    }
+    ]
+  }
+}
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/serviceE2E.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/serviceE2E.json
new file mode 100644
index 000000000..ea3fe0027
--- /dev/null
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/serviceE2E.json
@@ -0,0 +1,144 @@
+{
+  "service": {
+    "uuid": "afe751ef-2687-4647-8474-aba4d64cc3a3",
+    "invariantUuid": "5c3eb5cb-a3ef-4089-bdbe-3b5ebd20541d",
+    "name": "E2E_vCCF_6610SD _SVC",
+    "version": "1.0",
+    "toscaModelURL": null,
+    "category": "Network L4+",
+    "serviceType": "",
+    "serviceRole": "",
+    "description": "vCCF for Soft Delete in DPA2b CL tenant",
+    "serviceEcompNaming": "true",
+    "instantiationType": "A-La-Carte",
+    "inputs": {},
+    "vidNotions": {
+      "instantiationUI": "legacy",
+      "modelCategory": "other",
+      "viewEditUI": "legacy"
+    }
+  },
+  "vnfs": {
+    "E2E_vCCF_6610SD _VSP 0": {
+      "uuid": "229ac49e-61de-43d9-ab1a-9e6951226efe",
+      "invariantUuid": "57437138-b11e-47b1-aaca-4578251ee173",
+      "description": "vCCF for SoftDelete in DPA2b CL tenant",
+      "name": "E2E_vCCF_6610SD _VSP",
+      "version": "1.0",
+      "customizationUuid": "b80c20bb-35b5-4e16-9819-4d09692e9435",
+      "inputs": {},
+      "commands": {},
+      "properties": {
+        "iox_flavor_name": "nd.c4r4d50",
+        "nf_naming": "{ecomp_generated_naming=true}",
+        "multi_stage_design": "false",
+        "nf_function": "VUSP-VCCF",
+        "nf_naming_code": "ccfx",
+        "app_volume_size_0": "130.0",
+        "ieccf_debug": "no",
+        "availability_zone_max_count": "1",
+        "app_flavor_name": "nd.c12r4d50",
+        "plt_pair_uuid": "573f433e25ba8",
+        "ecomp_generated_naming": "true",
+        "int_internal_subnet_cidr": "169.30.12.0/24",
+        "nf_type": "CDR-GENERATOR",
+        "plt_servicedata2_volume_size_0": "150.0",
+        "plt_servicedata1_volume_size_0": "70.0",
+        "iox_image_name": "USP_IECF-IO_30.3.3-mcas4.4.6.qcow2",
+        "nf_role": "vCCF",
+        "iox_pair_uuid": "573f433e284b4",
+        "plt_image_name": "USP_IECF-PILOT_30.3.3-mcas4.4.6.qcow2",
+        "app_image_name": "USP_IECF-APP_30.3.3-mcas4.4.6.qcow2",
+        "plt_flavor_name": "nd.c2r4d50"
+      },
+      "type": "VF",
+      "modelCustomizationName": "E2E_vCCF_6610SD _VSP 0",
+      "vfModules": {
+        "e2e_vccf_6610sd_vsp0..E2eVccf6610sdVsp..base_vIECCF..module-0": {
+          "uuid": "ce92010b-3520-49c7-b37f-9b10ce5a8009",
+          "invariantUuid": "4453a55f-13fa-44eb-a158-eb36e7803787",
+          "customizationUuid": "ed87e68b-1b32-4aae-8aea-d2725a5e5602",
+          "description": null,
+          "name": "E2eVccf6610sdVsp..base_vIECCF..module-0",
+          "version": "1",
+          "modelCustomizationName": "E2eVccf6610sdVsp..base_vIECCF..module-0",
+          "properties": {
+            "minCountInstances": 1,
+            "maxCountInstances": 1,
+            "initialCount": 1,
+            "vfModuleLabel": "base_vIECCF",
+            "baseModule": true
+          },
+          "inputs": {},
+          "volumeGroupAllowed": true
+        }
+      },
+      "volumeGroups": {
+        "e2e_vccf_6610sd_vsp0..E2eVccf6610sdVsp..base_vIECCF..module-0": {
+          "uuid": "ce92010b-3520-49c7-b37f-9b10ce5a8009",
+          "invariantUuid": "4453a55f-13fa-44eb-a158-eb36e7803787",
+          "customizationUuid": "ed87e68b-1b32-4aae-8aea-d2725a5e5602",
+          "description": null,
+          "name": "E2eVccf6610sdVsp..base_vIECCF..module-0",
+          "version": "1",
+          "modelCustomizationName": "E2eVccf6610sdVsp..base_vIECCF..module-0",
+          "properties": {
+            "minCountInstances": 1,
+            "maxCountInstances": 1,
+            "initialCount": 1,
+            "vfModuleLabel": "base_vIECCF",
+            "baseModule": true
+          },
+          "inputs": {}
+        }
+      },
+      "vfcInstanceGroups": {}
+    }
+  },
+  "networks": {},
+  "collectionResources": {},
+  "configurations": {},
+  "fabricConfigurations": {},
+  "serviceProxies": {},
+  "vfModules": {
+    "e2e_vccf_6610sd_vsp0..E2eVccf6610sdVsp..base_vIECCF..module-0": {
+      "uuid": "ce92010b-3520-49c7-b37f-9b10ce5a8009",
+      "invariantUuid": "4453a55f-13fa-44eb-a158-eb36e7803787",
+      "customizationUuid": "ed87e68b-1b32-4aae-8aea-d2725a5e5602",
+      "description": null,
+      "name": "E2eVccf6610sdVsp..base_vIECCF..module-0",
+      "version": "1",
+      "modelCustomizationName": "E2eVccf6610sdVsp..base_vIECCF..module-0",
+      "properties": {
+        "minCountInstances": 1,
+        "maxCountInstances": 1,
+        "initialCount": 1,
+        "vfModuleLabel": "base_vIECCF",
+        "baseModule": true
+      },
+      "inputs": {},
+      "volumeGroupAllowed": true
+    }
+  },
+  "volumeGroups": {
+    "e2e_vccf_6610sd_vsp0..E2eVccf6610sdVsp..base_vIECCF..module-0": {
+      "uuid": "ce92010b-3520-49c7-b37f-9b10ce5a8009",
+      "invariantUuid": "4453a55f-13fa-44eb-a158-eb36e7803787",
+      "customizationUuid": "ed87e68b-1b32-4aae-8aea-d2725a5e5602",
+      "description": null,
+      "name": "E2eVccf6610sdVsp..base_vIECCF..module-0",
+      "version": "1",
+      "modelCustomizationName": "E2eVccf6610sdVsp..base_vIECCF..module-0",
+      "properties": {
+        "minCountInstances": 1,
+        "maxCountInstances": 1,
+        "initialCount": 1,
+        "vfModuleLabel": "base_vIECCF",
+        "baseModule": true
+      },
+      "inputs": {}
+    }
+  },
+  "pnfs": {},
+  "vnfGroups": {}
+}
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json
index 8e91f7fe5..6d984bae8 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json
@@ -17,8 +17,11 @@
           "description": "",
           "serviceEcompNaming": "true",
           "instantiationType": "Macro",
+          "vidNotions": {
+            "instantiationType": "Macro"
+          },
           "inputs": {
-            "2017488_adiodvpe0_ASN": {
+            "2017488_pasqualevpe0_ASN": {
               "type": "string",
               "description": "AV/PE",
               "entry_schema": null,
@@ -30,11 +33,11 @@
           }
         },
         "vnfs": {
-          "2017-388_ADIOD-vPE 1": {
+          "2017-388_PASQUALE-vPE 1": {
             "uuid": "0903e1c0-8e03-4936-b5c2-260653b96413",
             "invariantUuid": "00beb8f9-6d39-452f-816d-c709b9cbb87d",
-            "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-388_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-388_PASQUALE-vPE",
             "version": "1.0",
             "customizationUuid": "280dec31-f16d-488b-9668-4aae55d6648a",
             "inputs": {},
@@ -43,7 +46,7 @@
               "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",
@@ -88,7 +91,7 @@
               "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
               "vmxvre_int_ctl_ip_0": "10.0.0.10",
               "ecomp_generated_naming": "false",
-              "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",
@@ -96,14 +99,14 @@
               "vmxvre_volume_type_0": "HITACHI",
               "vmxvpfe_volume_type_0": "HITACHI",
               "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-              "bandwidth_units": "get_input:adiodvpe0_bandwidth_units",
+              "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
               "vnf_id": "123",
               "vmxvre_oam_prefix": "24",
               "availability_zone_0": "mtpocfo-kvm-az01",
-              "ASN": "get_input:2017488_adiodvpe0_ASN",
+              "ASN": "get_input:2017488_pasqualevpe0_ASN",
               "vmxvre_chassis_i2cid": "161",
               "vmxvpfe_name_0": "vPFEXI",
-              "bandwidth": "get_input:adiodvpe0_bandwidth",
+              "bandwidth": "get_input:pasqualevpe0_bandwidth",
               "availability_zone_max_count": "1",
               "vmxvre_volume_size_0": "45.0",
               "vmxvre_volume_size_1": "50.0",
@@ -113,7 +116,7 @@
               "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",
@@ -127,16 +130,16 @@
               "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
             },
             "type": "VF",
-            "modelCustomizationName": "2017-388_ADIOD-vPE 1",
+            "modelCustomizationName": "2017-388_PASQUALE-vPE 1",
             "vfModules": {},
             "volumeGroups": {},
             "vfcInstanceGroups": {}
           },
-          "2017-388_ADIOD-vPE 0": {
+          "2017-388_PASQUALE-vPE 0": {
             "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168",
             "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-            "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-388_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-388_PASQUALE-vPE",
             "version": "4.0",
             "customizationUuid": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c",
             "inputs": {},
@@ -145,7 +148,7 @@
               "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",
@@ -190,7 +193,7 @@
               "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",
@@ -198,14 +201,14 @@
               "vmxvre_volume_type_0": "HITACHI",
               "vmxvpfe_volume_type_0": "HITACHI",
               "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-              "bandwidth_units": "get_input:adiodvpe0_bandwidth_units",
+              "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
               "vnf_id": "123",
               "vmxvre_oam_prefix": "24",
               "availability_zone_0": "mtpocfo-kvm-az01",
-              "ASN": "get_input:2017488_adiodvpe0_ASN",
+              "ASN": "get_input:2017488_pasqualevpe0_ASN",
               "vmxvre_chassis_i2cid": "161",
               "vmxvpfe_name_0": "vPFEXI",
-              "bandwidth": "get_input:adiodvpe0_bandwidth",
+              "bandwidth": "get_input:pasqualevpe0_bandwidth",
               "availability_zone_max_count": "1",
               "vmxvre_volume_size_0": "45.0",
               "vmxvre_volume_size_1": "50.0",
@@ -215,7 +218,7 @@
               "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",
@@ -229,16 +232,16 @@
               "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
             },
             "type": "VF",
-            "modelCustomizationName": "2017-388_ADIOD-vPE 0",
+            "modelCustomizationName": "2017-388_PASQUALE-vPE 0",
             "vfModules": {},
             "volumeGroups": {},
             "vfcInstanceGroups": {}
           },
-          "2017-488_ADIOD-vPE 0": {
+          "2017-488_PASQUALE-vPE 0": {
             "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
             "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-            "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": "5.0",
             "customizationUuid": "1da7b585-5e61-4993-b95e-8e6606c81e45",
             "inputs": {},
@@ -247,7 +250,7 @@
               "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",
@@ -292,7 +295,7 @@
               "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
               "vmxvre_int_ctl_ip_0": "10.0.0.10",
               "ecomp_generated_naming": "false",
-              "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",
@@ -300,14 +303,14 @@
               "vmxvre_volume_type_0": "HITACHI",
               "vmxvpfe_volume_type_0": "HITACHI",
               "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-              "bandwidth_units": "get_input:adiodvpe0_bandwidth_units",
+              "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
               "vnf_id": "123",
               "vmxvre_oam_prefix": "24",
               "availability_zone_0": "mtpocfo-kvm-az01",
-              "ASN": "get_input:2017488_adiodvpe0_ASN",
+              "ASN": "get_input:2017488_pasqualevpe0_ASN",
               "vmxvre_chassis_i2cid": "161",
               "vmxvpfe_name_0": "vPFEXI",
-              "bandwidth": "get_input:adiodvpe0_bandwidth",
+              "bandwidth": "get_input:pasqualevpe0_bandwidth",
               "availability_zone_max_count": "1",
               "vmxvre_volume_size_0": "45.0",
               "vmxvre_volume_size_1": "50.0",
@@ -317,7 +320,7 @@
               "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",
@@ -331,82 +334,82 @@
               "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": "25284168-24bb-4698-8cb4-3f509146eca5",
                 "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
                 "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                 "version": "6",
-                "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": {
-                  "adiodvpe0_bandwidth": {
+                  "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,
                     "required": true,
                     "default": "ATLMY8GA"
                   },
-                  "adiodvpe0_bandwidth_units": {
+                  "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,
@@ -416,116 +419,116 @@
                 },
                 "volumeGroupAllowed": true
               },
-              "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
+              "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
                 "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
                 "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
                 "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+                "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
                 "version": "5",
-                "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": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
                 "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
                 "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                 "version": "6",
-                "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": {},
                 "volumeGroupAllowed": true
               }
             },
             "volumeGroups": {
-              "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+              "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
                 "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
                 "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
                 "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                 "version": "6",
-                "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": {
-                  "adiodvpe0_bandwidth": {
+                  "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,
                     "required": true,
                     "default": "ATLMY8GA"
                   },
-                  "adiodvpe0_bandwidth_units": {
+                  "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,
@@ -534,19 +537,19 @@
                   }
                 }
               },
-              "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+              "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
                 "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
                 "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
                 "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                 "version": "6",
-                "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": {}
               }
@@ -555,84 +558,84 @@
           }
         },
         "networks": {},
-        "collectionResource": {},
+        "collectionResources": {},
         "configurations": {},
         "serviceProxies": {},
         "vfModules": {
-          "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
             "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
             "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
             "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
             "description": null,
-            "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+            "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
             "version": "6",
-            "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": {
-              "adiodvpe0_bandwidth": {
+              "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,
                 "required": true,
                 "default": "ATLMY8GA"
               },
-              "adiodvpe0_bandwidth_units": {
+              "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,
@@ -642,116 +645,116 @@
             },
             "volumeGroupAllowed": true
           },
-          "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
             "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
             "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
             "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
             "description": null,
-            "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+            "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
             "version": "5",
-            "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": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
             "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
             "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
             "description": null,
-            "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+            "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
             "version": "6",
-            "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": {},
             "volumeGroupAllowed": true
           }
         },
         "volumeGroups": {
-          "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
             "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
             "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
             "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
             "description": null,
-            "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+            "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
             "version": "6",
-            "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": {
-              "adiodvpe0_bandwidth": {
+              "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,
                 "required": true,
                 "default": "ATLMY8GA"
               },
-              "adiodvpe0_bandwidth_units": {
+              "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,
@@ -760,19 +763,19 @@
               }
             }
           },
-          "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
             "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
             "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
             "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
             "description": null,
-            "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+            "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
             "version": "6",
-            "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": {}
           }
@@ -783,17 +786,17 @@
         "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",
           "inputs": {
-            "2017488_adiodvpe0_ASN": {
+            "2017488_pasqualevpe0_ASN": {
               "type": "string",
               "description": "AV/PE",
               "entry_schema": null,
@@ -805,18 +808,18 @@
           }
         },
         "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": {},
             "commands": {},
             "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",
@@ -858,11 +861,11 @@
               "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",
@@ -870,14 +873,14 @@
               "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",
@@ -887,7 +890,7 @@
               "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",
@@ -901,82 +904,82 @@
               "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,
@@ -986,45 +989,45 @@
                 },
                 "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,
@@ -1036,80 +1039,80 @@
               }
             },
             "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,
@@ -1118,28 +1121,28 @@
                   }
                 }
               },
-              "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,
@@ -1153,84 +1156,84 @@
           }
         },
         "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,
@@ -1240,45 +1243,45 @@
             },
             "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,
@@ -1290,80 +1293,80 @@
           }
         },
         "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,
@@ -1372,28 +1375,28 @@
               }
             }
           },
-          "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,
@@ -1413,13 +1416,13 @@
         "vnfs": {},
         "instanceParams": [
           {
-            "2017488_adiodvpe0_ASN": "AV_vPE"
+            "2017488_pasqualevpe0_ASN": "AV_vPE"
           }
         ],
         "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
         "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
         "subscriptionServiceType": "TYLER SILVIA",
-        "lcpCloudRegionId": "JANET25",
+        "lcpCloudRegionId": "AAIAIC25",
         "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
         "aicZoneId": "JAG1",
         "projectName": "WATKINS",
@@ -1435,14 +1438,17 @@
         "isEcompGeneratedNaming": true,
         "tenantName": "USP-SIP-IC-24335-T-01",
         "aicZoneName": "YUDFJULP-JAG1",
-        "existingNames": {}
+        "existingNames": {},
+        "vidNotions": {
+          "instantiationType": "Macro"
+        }
       }
     },
     "lcpRegionsAndTenants": {
       "lcpRegionList": [
         {
-          "id": "JANET25",
-          "name": "JANET25",
+          "id": "AAIAIC25",
+          "name": "AAIAIC25",
           "isPermitted": true
         },
         {
@@ -1452,7 +1458,7 @@
         }
       ],
       "lcpRegionsTenantsMap": {
-        "JANET25": [
+        "AAIAIC25": [
           {
             "id": "092eb9e8e4b7412e8787dd091bc58e86",
             "name": "USP-SIP-IC-24335-T-01",
@@ -1466,8 +1472,128 @@
             "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
           },
           {
@@ -1476,6 +1602,16 @@
             "isPermitted": true
           },
           {
+            "id": "4914ab0ab3a743e58f0eefdacc1dde77",
+            "name": "DN5242-Nov21-T1",
+            "isPermitted": true
+          },
+          {
+            "id": "d0a3e3f2964542259d155a81c41aadc3",
+            "name": "test-hvf6-09",
+            "isPermitted": true
+          },
+          {
             "id": "cbb99fe4ada84631b7baf046b6fd2044",
             "name": "DN5242-Nov16-T3",
             "isPermitted": true
@@ -1503,7 +1639,7 @@
     "productFamilies": [
       {
         "id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-        "name": "SCOTTIE",
+        "name": "ERICA",
         "isPermitted": true
       },
       {
@@ -1528,7 +1664,7 @@
       },
       {
         "id": "323d69d9-2efe-4r45-ay0a-89ea7ard4e6f",
-        "name": "vSCP",
+        "name": "vEsmeralda",
         "isPermitted": true
       },
       {
@@ -1572,7 +1708,7 @@
         "isPermitted": true
       },
       {
-        "id": "Cisneros",
+        "id": "vMuriel",
         "name": "vMuriel",
         "isPermitted": true
       },
@@ -1598,7 +1734,7 @@
       },
       {
         "id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
-        "name": "Josefina",
+        "name": "JOSEFINA",
         "isPermitted": true
       },
       {
@@ -1646,7 +1782,7 @@
         },
         {
           "id": "6",
-          "name": "vSEGW",
+          "name": "vPorfirio",
           "isPermitted": false
         },
         {
@@ -1661,7 +1797,7 @@
         },
         {
           "id": "9",
-          "name": "vMME",
+          "name": "vFLORENCE",
           "isPermitted": false
         },
         {
@@ -1671,7 +1807,7 @@
         },
         {
           "id": "11",
-          "name": "vSCP",
+          "name": "vEsmeralda",
           "isPermitted": false
         },
         {
@@ -1681,7 +1817,7 @@
         },
         {
           "id": "13",
-          "name": "vMMSC",
+          "name": "vWINIFRED",
           "isPermitted": false
         },
         {
@@ -1725,6 +1861,754 @@
         "name": "UUUAIAAI-YYY1"
       },
       {
+        "id": "BAN1",
+        "name": "VSDKYUTP-BAN1"
+      },
+      {
+        "id": "DKJ1",
+        "name": "DKJSJDKA-DKJ1"
+      },
+      {
+        "id": "MCS1",
+        "name": "ASACMAMS-MCS1"
+      },
+      {
+        "id": "UIO1",
+        "name": "uioclli1-UIO1"
+      },
+      {
+        "id": "RAJ1",
+        "name": "YGBIJNLQ-RAJ1"
+      },
+      {
+        "id": "OPA1",
+        "name": "opaclli1-OPA1"
+      },
+      {
+        "id": "SDE1",
+        "name": "ZXCVBNMA-SDE1"
+      },
+      {
+        "id": "VEN2",
+        "name": "FGHJUHIL-VEN2"
+      },
+      {
+        "id": "ORL1",
+        "name": "ORLDFLMA-ORL1"
+      },
+      {
+        "id": "JAD1",
+        "name": "JADECLLI-JAD1"
+      },
+      {
+        "id": "ZXL1",
+        "name": "LWLWCANN-ZXL1"
+      },
+      {
+        "id": "CKL1",
+        "name": "CLKSKCKK-CKL1"
+      },
+      {
+        "id": "SDF1",
+        "name": "sdfclli1-SDF1"
+      },
+      {
+        "id": "RAD1",
+        "name": "RADICAL1-RAD1"
+      },
+      {
+        "id": "KIT1",
+        "name": "BHYJFGLN-KIT1"
+      },
+      {
+        "id": "REL1",
+        "name": "INGERFGT-REL1"
+      },
+      {
+        "id": "JNL1",
+        "name": "CJALSDAC-JNL1"
+      },
+      {
+        "id": "OLK1",
+        "name": "OLKOLKLS-OLK1"
+      },
+      {
+        "id": "CHI1",
+        "name": "CHILLIWE-CHI1"
+      },
+      {
+        "id": "UUU4",
+        "name": "UUUAAAUU-UUU4"
+      },
+      {
+        "id": "TUF1",
+        "name": "TUFCLLI1-TUF1"
+      },
+      {
+        "id": "KJN1",
+        "name": "CKALDKSA-KJN1"
+      },
+      {
+        "id": "SAM1",
+        "name": "SNDGCA64-SAN1"
+      },
+      {
+        "id": "SCK1",
+        "name": "SCKSCKSK-SCK1"
+      },
+      {
+        "id": "HJH1",
+        "name": "AOEEQQQD-HJH1"
+      },
+      {
+        "id": "HGD1",
+        "name": "SDFQWHGD-HGD1"
+      },
+      {
+        "id": "KOR1",
+        "name": "HYFLNBVT-KOR1"
+      },
+      {
+        "id": "ATL43",
+        "name": "AICLOCID-ATL43"
+      },
+      {
+        "id": "ATL54",
+        "name": "AICFTAAI-ATL54"
+      },
+      {
+        "id": "ATL66",
+        "name": "CLLIAAII-ATL66"
+      },
+      {
+        "id": "VEL1",
+        "name": "BNMLKUIK-VEL1"
+      },
+      {
+        "id": "ICC1",
+        "name": "SANJITAT-ICC1"
+      },
+      {
+        "id": "MNT11",
+        "name": "WSXEFBTH-MNT11"
+      },
+      {
+        "id": "DEF2",
+        "name": "WSBHGTYL-DEF2"
+      },
+      {
+        "id": "MAD11",
+        "name": "SDFQWGKL-MAD11"
+      },
+      {
+        "id": "OLG1",
+        "name": "OLHOLHOL-OLG1"
+      },
+      {
+        "id": "GAR1",
+        "name": "NGFVSJKO-GAR1"
+      },
+      {
+        "id": "SAN22",
+        "name": "GNVLSCTL-SAN22"
+      },
+      {
+        "id": "HRG1",
+        "name": "HRGHRGGS-HRG1"
+      },
+      {
+        "id": "JCS1",
+        "name": "JCSJSCJS-JCS1"
+      },
+      {
+        "id": "DHA12",
+        "name": "WSXEDECF-DHA12"
+      },
+      {
+        "id": "HJE1",
+        "name": "AOEEWWWD-HJE1"
+      },
+      {
+        "id": "NCA1",
+        "name": "NCANCANN-NCA1"
+      },
+      {
+        "id": "IOP1",
+        "name": "iopclli1-IOP1"
+      },
+      {
+        "id": "RTY1",
+        "name": "rtyclli1-RTY1"
+      },
+      {
+        "id": "KAP1",
+        "name": "HIOUYTRQ-KAP1"
+      },
+      {
+        "id": "ZEN1",
+        "name": "ZENCLLI1-ZEN1"
+      },
+      {
+        "id": "HKA1",
+        "name": "JAKHLASS-HKA1"
+      },
+      {
+        "id": "CQK1",
+        "name": "CQKSCAKK-CQK1"
+      },
+      {
+        "id": "SAI1",
+        "name": "UBEKQLPD-SAI1"
+      },
+      {
+        "id": "ERT1",
+        "name": "ertclli1-ERT1"
+      },
+      {
+        "id": "IBB1",
+        "name": "PLMKOIJU-IBB1"
+      },
+      {
+        "id": "TIR2",
+        "name": "PLKINHYI-TIR2"
+      },
+      {
+        "id": "HSD1",
+        "name": "CHASKCDS-HSD1"
+      },
+      {
+        "id": "SLF78",
+        "name": "SDCTLFN1-SLF78"
+      },
+      {
+        "id": "SEE78",
+        "name": "SDCTEEE4-SEE78"
+      },
+      {
+        "id": "SAN13",
+        "name": "TOKYJPFA-SAN13"
+      },
+      {
+        "id": "SAA78",
+        "name": "SDCTAAA1-SAA78"
+      },
+      {
+        "id": "LUC1",
+        "name": "ATLDFGYC-LUC1"
+      },
+      {
+        "id": "AMD13",
+        "name": "MEMATLAN-AMD13"
+      },
+      {
+        "id": "TOR1",
+        "name": "TOROONXN-TOR1"
+      },
+      {
+        "id": "QWE1",
+        "name": "QWECLLI1-QWE1"
+      },
+      {
+        "id": "ZOG1",
+        "name": "ZOGASTRO-ZOG1"
+      },
+      {
+        "id": "CAL33",
+        "name": "CALIFORN-CAL33"
+      },
+      {
+        "id": "SHH78",
+        "name": "SDIT1HHH-SHH78"
+      },
+      {
+        "id": "DSA1",
+        "name": "LKJHGFDS-DSA1"
+      },
+      {
+        "id": "CLG1",
+        "name": "CLGRABAD-CLG1"
+      },
+      {
+        "id": "BNA1",
+        "name": "BNARAGBK-BNA1"
+      },
+      {
+        "id": "ATL84",
+        "name": "CANTTCOC-ATL84"
+      },
+      {
+        "id": "APP1",
+        "name": "WBHGTYUI-APP1"
+      },
+      {
+        "id": "RJN1",
+        "name": "RJNRBZAW-RJN1"
+      },
+      {
+        "id": "EHH78",
+        "name": "SDCSHHH5-EHH78"
+      },
+      {
+        "id": "mac10",
+        "name": "PKGTESTF-mac10"
+      },
+      {
+        "id": "SXB78",
+        "name": "SDCTGXB1-SXB78"
+      },
+      {
+        "id": "SAX78",
+        "name": "SDCTAXG1-SAX78"
+      },
+      {
+        "id": "SYD1",
+        "name": "SYDNAUBV-SYD1"
+      },
+      {
+        "id": "TOK1",
+        "name": "TOKYJPFA-TOK1"
+      },
+      {
+        "id": "KGM2",
+        "name": "KGMTNC20-KGM2"
+      },
+      {
+        "id": "DCC1b",
+        "name": "POIUYTGH-DCC1b"
+      },
+      {
+        "id": "SKK78",
+        "name": "SDCTKKK1-SKK78"
+      },
+      {
+        "id": "SGG78",
+        "name": "SDCTGGG1-SGG78"
+      },
+      {
+        "id": "SJJ78",
+        "name": "SDCTJJJ1-SJJ78"
+      },
+      {
+        "id": "SBX78",
+        "name": "SDCTBXG1-SBX78"
+      },
+      {
+        "id": "LAG1",
+        "name": "LARGIZON-LAG1"
+      },
+      {
+        "id": "IAA1",
+        "name": "QAZXSWED-IAA1"
+      },
+      {
+        "id": "POI1",
+        "name": "PLMNJKIU-POI1"
+      },
+      {
+        "id": "LAG1a",
+        "name": "LARGIZON-LAG1a"
+      },
+      {
+        "id": "PBL1",
+        "name": "PBLAPBAI-PBL1"
+      },
+      {
+        "id": "LAG45",
+        "name": "LARGIZON-LAG1a"
+      },
+      {
+        "id": "MAR1",
+        "name": "MNBVCXZM-MAR1"
+      },
+      {
+        "id": "HST70",
+        "name": "HSTNTX70-HST70"
+      },
+      {
+        "id": "DCC1a",
+        "name": "POIUYTGH-DCC1a"
+      },
+      {
+        "id": "TOL1",
+        "name": "TOLDOH21-TOL1"
+      },
+      {
+        "id": "LON1",
+        "name": "LONEENCO-LON1"
+      },
+      {
+        "id": "SJU78",
+        "name": "SDIT1JUB-SJU78"
+      },
+      {
+        "id": "STN27",
+        "name": "HSTNTX01-STN27"
+      },
+      {
+        "id": "SSW56",
+        "name": "ss8126GT-SSW56"
+      },
+      {
+        "id": "SBB78",
+        "name": "SDIT1BBB-SBB78"
+      },
+      {
+        "id": "DCC3",
+        "name": "POIUYTGH-DCC3"
+      },
+      {
+        "id": "GNV1",
+        "name": "GNVLSCTL-GNV1"
+      },
+      {
+        "id": "WAS1",
+        "name": "WASHDCSW-WAS1"
+      },
+      {
+        "id": "TOY1",
+        "name": "TORYONNZ-TOY1"
+      },
+      {
+        "id": "STT1",
+        "name": "STTLWA02-STT1"
+      },
+      {
+        "id": "STG1",
+        "name": "STTGGE62-STG1"
+      },
+      {
+        "id": "SLL78",
+        "name": "SDCTLLL1-SLL78"
+      },
+      {
+        "id": "SBU78",
+        "name": "SDIT1BUB-SBU78"
+      },
+      {
+        "id": "ATL2",
+        "name": "ATLNGANW-ATL2"
+      },
+      {
+        "id": "BOT1",
+        "name": "BOTHWAKY-BOT1"
+      },
+      {
+        "id": "SNG1",
+        "name": "SNGPSIAU-SNG1"
+      },
+      {
+        "id": "NYC1",
+        "name": "NYCMNY54-NYC1"
+      },
+      {
+        "id": "LAG1b",
+        "name": "LARGIZON-LAG1b"
+      },
+      {
+        "id": "AMD15",
+        "name": "AMDFAA01-AMD15"
+      },
+      {
+        "id": "SNA1",
+        "name": "SNANTXCA-SNA1"
+      },
+      {
+        "id": "PLT1",
+        "name": "PLTNCA60-PLT1"
+      },
+      {
+        "id": "TLP1",
+        "name": "TLPNXM18-TLP1"
+      },
+      {
+        "id": "SDD81",
+        "name": "SAIT1DD6-SDD81"
+      },
+      {
+        "id": "DCC1",
+        "name": "POIUYTGH-DCC1"
+      },
+      {
+        "id": "DCC2",
+        "name": "POIUYTGH-DCC2"
+      },
+      {
+        "id": "OKC1",
+        "name": "OKCBOK55-OKC1"
+      },
+      {
+        "id": "PAR1",
+        "name": "PARSFRCG-PAR1"
+      },
+      {
+        "id": "TES36",
+        "name": "ABCEETES-TES36"
+      },
+      {
+        "id": "COM1",
+        "name": "PLMKOPIU-COM1"
+      },
+      {
+        "id": "ANI1",
+        "name": "ATLNGTRE-ANI1"
+      },
+      {
+        "id": "SDG78",
+        "name": "SDIT1BDG-SDG78"
+      },
+      {
+        "id": "mac20",
+        "name": "PKGTESTF-mac20"
+      },
+      {
+        "id": "DSF45",
+        "name": "DSFBG123-DSF45"
+      },
+      {
+        "id": "HST25",
+        "name": "HSTNTX01-HST25"
+      },
+      {
+        "id": "AMD18",
+        "name": "AUDIMA01-AMD18"
+      },
+      {
+        "id": "SAA80",
+        "name": "SAIT9AA3-SAA80"
+      },
+      {
+        "id": "SSA56",
+        "name": "SSIT2AA7-SSA56"
+      },
+      {
+        "id": "SDD82",
+        "name": "SAIT1DD9-SDD82"
+      },
+      {
+        "id": "JCV1",
+        "name": "JCVLFLBW-JCV1"
+      },
+      {
+        "id": "SUL2",
+        "name": "WERTYUJK-SUL2"
+      },
+      {
+        "id": "PUR1",
+        "name": "purelyde-PUR1"
+      },
+      {
+        "id": "FDE55",
+        "name": "FDERT555-FDE55"
+      },
+      {
+        "id": "SITE",
+        "name": "LONEENCO-SITE"
+      },
+      {
+        "id": "ATL1",
+        "name": "ATLNGAMA-ATL1"
+      },
+      {
+        "id": "JUL1",
+        "name": "ZXCVBNMM-JUL1"
+      },
+      {
+        "id": "TAT34",
+        "name": "TESAAISB-TAT34"
+      },
+      {
+        "id": "XCP12",
+        "name": "CHKGH123-XCP12"
+      },
+      {
+        "id": "RAI1",
+        "name": "poiuytre-RAI1"
+      },
+      {
+        "id": "HPO1",
+        "name": "ATLNGAUP-HPO1"
+      },
+      {
+        "id": "KJF12",
+        "name": "KJFDH123-KJF12"
+      },
+      {
+        "id": "SCC80",
+        "name": "SAIT9CC3-SCC80"
+      },
+      {
+        "id": "SAA12",
+        "name": "SAIT9AF8-SAA12"
+      },
+      {
+        "id": "SAA14",
+        "name": "SAIT1AA9-SAA14"
+      },
+      {
+        "id": "ATL35",
+        "name": "TTESSAAI-ATL35"
+      },
+      {
+        "id": "CWY1",
+        "name": "CWYMOWBS-CWY1"
+      },
+      {
+        "id": "ATL76",
+        "name": "TELEPAAI-ATL76"
+      },
+      {
+        "id": "DSL12",
+        "name": "DSLFK242-DSL12"
+      },
+      {
+        "id": "ATL53",
+        "name": "AAIATLTE-ATL53"
+      },
+      {
+        "id": "SAA11",
+        "name": "SAIT9AA2-SAA11"
+      },
+      {
+        "id": "ATL62",
+        "name": "TESSASCH-ATL62"
+      },
+      {
+        "id": "AUG1",
+        "name": "ASDFGHJK-AUG1"
+      },
+      {
+        "id": "POI22",
+        "name": "POIUY123-POI22"
+      },
+      {
+        "id": "SAA13",
+        "name": "SAIT1AA9-SAA13"
+      },
+      {
+        "id": "BHY17",
+        "name": "BHYTFRF3-BHY17"
+      },
+      {
+        "id": "LIS1",
+        "name": "HOSTPROF-LIS1"
+      },
+      {
+        "id": "SIP1",
+        "name": "ZXCVBNMK-SIP1"
+      },
+      {
+        "id": "ATL99",
+        "name": "TEESTAAI-ATL43"
+      },
+      {
+        "id": "ATL64",
+        "name": "FORLOAAJ-ATL64"
+      },
+      {
+        "id": "TAT33",
+        "name": "TESAAISA-TAT33"
+      },
+      {
+        "id": "RAD10",
+        "name": "INDIPUNE-RAD10"
+      },
+      {
+        "id": "RTW5",
+        "name": "BHYTFRY4-RTW5"
+      },
+      {
+        "id": "JGS1",
+        "name": "KSJKKKKK-JGS1"
+      },
+      {
+        "id": "ATL98",
+        "name": "TEESTAAI-ATL43"
+      },
+      {
+        "id": "WAN1",
+        "name": "LEIWANGW-WAN1"
+      },
+      {
+        "id": "ATL44",
+        "name": "ATLSANAB-ATL44"
+      },
+      {
+        "id": "RTD2",
+        "name": "BHYTFRk4-RTD2"
+      },
+      {
+        "id": "NIR1",
+        "name": "ORFLMANA-NIR1"
+      },
+      {
+        "id": "ATL75",
+        "name": "SANAAIRE-ATL75"
+      },
+      {
+        "id": "NUM1",
+        "name": "QWERTYUI-NUM1"
+      },
+      {
+        "id": "hvf32",
+        "name": "MDTWNJ21-hvf32"
+      },
+      {
+        "id": "RTZ4",
+        "name": "BHYTFRZ6-RTZ4"
+      },
+      {
+        "id": "ATL56",
+        "name": "ATLSANAC-ATL56"
+      },
+      {
+        "id": "AMS1",
+        "name": "AMSTNLBW-AMS1"
+      },
+      {
+        "id": "RCT1",
+        "name": "AMSTERNL-RCT1"
+      },
+      {
+        "id": "JAN1",
+        "name": "ORFLMATT-JAN1"
+      },
+      {
+        "id": "ABC14",
+        "name": "TESAAISA-ABC14"
+      },
+      {
+        "id": "TAT37",
+        "name": "TESAAISD-TAT37"
+      },
+      {
+        "id": "MIC54",
+        "name": "MICHIGAN-MIC54"
+      },
+      {
+        "id": "ABC11",
+        "name": "ATLSANAI-ABC11"
+      },
+      {
+        "id": "AMF11",
+        "name": "AMDOCS01-AMF11"
+      },
+      {
+        "id": "ATL63",
+        "name": "ATLSANEW-ATL63"
+      },
+      {
+        "id": "ABC12",
+        "name": "ATLSECIA-ABC12"
+      },
+      {
+        "id": "hvf20",
+        "name": "MDTWNJ21-hvf20"
+      },
+      {
+        "id": "ABC15",
+        "name": "AAITESAN-ABC15"
+      },
+      {
         "id": "AVT1",
         "name": "AVTRFLHD-AVT1"
       },
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.json
index b8c3136f0..c4b8ef4fd 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.json
@@ -2,15 +2,10 @@
   "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": false,
   "FLAG_SERVICE_MODEL_CACHE": false,
-  "FLAG_COLLECTION_RESOURCE_SUPPORT": true,
   "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,
@@ -19,5 +14,6 @@
   "FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE": true,
   "FLAG_1902_NEW_VIEW_EDIT": true,
   "FLAG_VF_MODULE_RESUME_STATUS_CREATE" : true,
-  "FLAG_1906_COMPONENT_INFO": true
+  "FLAG_1906_COMPONENT_INFO": true,
+  "FLAG_1908_RESUME_MACRO_SERVICE": true
 }
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/service.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/service.json
index 5cb1c8655..f68908570 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/service.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/service.json
@@ -8,24 +8,24 @@
     "category": "Network L1-3",
     "serviceType": "pnf",
     "serviceRole": "Testing",
-    "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": "false",
     "instantiationType": "Macro",
     "inputs": {}
   },
   "vnfs": {
-    "2017-388_ADIOD-vPE 1": {
+    "2017-388_PASQUALE-vPE 1": {
       "uuid": "0903e1c0-8e03-4936-b5c2-260653b96413",
       "invariantUuid": "00beb8f9-6d39-452f-816d-c709b9cbb87d",
-      "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-388_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-388_PASQUALE-vPE",
       "version": "1.0",
       "customizationUuid": "280dec31-f16d-488b-9668-4aae55d6648a",
       "inputs": {},
       "commands": {},
       "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",
@@ -70,7 +70,7 @@
         "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",
@@ -78,14 +78,14 @@
         "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": "mtpocfo-kvm-az01",
-        "ASN": "get_input:2017488_adiodvpe0_ASN",
+        "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",
@@ -95,7 +95,7 @@
         "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",
@@ -109,23 +109,23 @@
         "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
       },
       "type": "VF",
-      "modelCustomizationName": "2017-388_ADIOD-vPE 1",
+      "modelCustomizationName": "2017-388_PASQUALE-vPE 1",
       "vfModules": {},
       "volumeGroups": {},
       "vfcInstanceGroups": {}
     },
-    "2017-388_ADIOD-vPE 0": {
+    "2017-388_PASQUALE-vPE 0": {
       "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168",
       "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-      "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-388_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-388_PASQUALE-vPE",
       "version": "4.0",
       "customizationUuid": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c",
       "inputs": {},
       "commands": {},
       "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",
@@ -170,7 +170,7 @@
         "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",
@@ -178,14 +178,14 @@
         "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": "mtpocfo-kvm-az01",
-        "ASN": "get_input:2017488_adiodvpe0_ASN",
+        "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",
@@ -195,7 +195,7 @@
         "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",
@@ -209,23 +209,23 @@
         "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
       },
       "type": "VF",
-      "modelCustomizationName": "2017-388_ADIOD-vPE 0",
+      "modelCustomizationName": "2017-388_PASQUALE-vPE 0",
       "vfModules": {},
       "volumeGroups": {},
       "vfcInstanceGroups": {}
     },
-    "2017-488_ADIOD-vPE 0": {
+    "2017-488_PASQUALE-vPE 0": {
       "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
       "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-      "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": "5.0",
       "customizationUuid": "1da7b585-5e61-4993-b95e-8e6606c81e45",
       "inputs": {},
       "commands": {},
       "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",
@@ -270,7 +270,7 @@
         "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",
@@ -278,14 +278,14 @@
         "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": "mtpocfo-kvm-az01",
-        "ASN": "get_input:2017488_adiodvpe0_ASN",
+        "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",
@@ -295,7 +295,7 @@
         "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",
@@ -309,90 +309,90 @@
         "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": "25284168-24bb-4698-8cb4-3f509146eca5",
           "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
           "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
           "description": null,
-          "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+          "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
           "version": "6",
-          "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": {},
           "volumeGroupAllowed": true
         },
-        "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
           "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
           "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
           "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
           "description": null,
-          "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+          "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
           "version": "5",
-          "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": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
           "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
           "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
           "description": null,
-          "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+          "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
           "version": "6",
-          "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": {},
           "volumeGroupAllowed": true
         }
       },
       "volumeGroups": {
-        "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
           "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
           "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
           "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
           "description": null,
-          "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+          "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
           "version": "6",
-          "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..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
           "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
           "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
           "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
           "description": null,
-          "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+          "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
           "version": "6",
-          "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": {}
         }
@@ -401,92 +401,92 @@
     }
   },
   "networks": {},
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {},
   "serviceProxies": {},
   "vfModules": {
-    "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
       "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
       "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
       "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
       "description": null,
-      "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+      "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
       "version": "6",
-      "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": {},
       "volumeGroupAllowed": true
     },
-    "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
+    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
       "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
       "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
       "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
       "description": null,
-      "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+      "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
       "version": "5",
-      "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": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
       "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
       "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
       "description": null,
-      "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+      "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
       "version": "6",
-      "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": {},
       "volumeGroupAllowed": true
     }
   },
   "volumeGroups": {
-    "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
       "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
       "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
       "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
       "description": null,
-      "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+      "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
       "version": "6",
-      "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..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
       "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
       "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
       "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
       "description": null,
-      "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+      "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
       "version": "6",
-      "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": {}
     }
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceInstanceWithVRF.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceInstanceWithVRF.json
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceInstanceWithVRF.json
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceModels/ecompNamingFalseModel.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceModels/ecompNamingFalseModel.json
index d34da2bea..6f23f3192 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceModels/ecompNamingFalseModel.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceModels/ecompNamingFalseModel.json
@@ -12,7 +12,7 @@
     "serviceEcompNaming": "false",
     "instantiationType": "Macro",
     "inputs": {
-      "2017488_adiodvpe0_ASN": {
+      "2017488_pasqualevpe0_ASN": {
         "type": "string",
         "description": "AV/PE",
         "entry_schema": null,
@@ -24,15 +24,17 @@
     },
     "vidNotions": {
       "instantiationUI": "legacy",
-      "modelCategory": "other"
+      "viewEditUI": "legacy",
+      "modelCategory": "other",
+      "instantiationType": "Macro"
     }
   },
   "vnfs": {
-    "2017-388_ADIOD-vPE 1": {
+    "2017-388_PASQUALE-vPE 1": {
       "uuid": "0903e1c0-8e03-4936-b5c2-260653b96413",
       "invariantUuid": "00beb8f9-6d39-452f-816d-c709b9cbb87d",
-      "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-388_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-388_PASQUALE-vPE",
       "version": "1.0",
       "customizationUuid": "280dec31-f16d-488b-9668-4aae55d6648a",
       "inputs": {
@@ -95,37 +97,37 @@
         "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": "adiodvpe0_bandwidth_units"
+          "inputName": "pasqualevpe0_bandwidth_units"
         },
         "bandwidth": {
           "displayName": "bandwidth",
           "command": "get_input",
-          "inputName": "adiodvpe0_bandwidth"
+          "inputName": "pasqualevpe0_bandwidth"
         },
         "AIC_CLLI": {
           "displayName": "AIC_CLLI",
           "command": "get_input",
-          "inputName": "2017488_adiodvpe0_AIC_CLLI"
+          "inputName": "2017488_pasqualevpe0_AIC_CLLI"
         },
         "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",
@@ -170,7 +172,7 @@
         "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
         "vmxvre_int_ctl_ip_0": "10.0.0.10",
         "ecomp_generated_naming": "false",
-        "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",
@@ -178,14 +180,14 @@
         "vmxvre_volume_type_0": "HITACHI",
         "vmxvpfe_volume_type_0": "HITACHI",
         "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-        "bandwidth_units": "get_input:adiodvpe0_bandwidth_units",
+        "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
         "vnf_id": "123",
         "vmxvre_oam_prefix": "24",
         "availability_zone_0": "mtpocfo-kvm-az01",
-        "ASN": "get_input:2017488_adiodvpe0_ASN",
+        "ASN": "get_input:2017488_pasqualevpe0_ASN",
         "vmxvre_chassis_i2cid": "161",
         "vmxvpfe_name_0": "vPFEXI",
-        "bandwidth": "get_input:adiodvpe0_bandwidth",
+        "bandwidth": "get_input:pasqualevpe0_bandwidth",
         "availability_zone_max_count": "1",
         "vmxvre_volume_size_0": "45.0",
         "vmxvre_volume_size_1": "50.0",
@@ -195,7 +197,7 @@
         "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",
@@ -209,16 +211,16 @@
         "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
       },
       "type": "VF",
-      "modelCustomizationName": "2017-388_ADIOD-vPE 1",
+      "modelCustomizationName": "2017-388_PASQUALE-vPE 1",
       "vfModules": {},
       "volumeGroups": {},
       "vfcInstanceGroups": {}
     },
-    "2017-388_ADIOD-vPE 0": {
+    "2017-388_PASQUALE-vPE 0": {
       "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168",
       "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-      "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-388_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-388_PASQUALE-vPE",
       "version": "4.0",
       "customizationUuid": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c",
       "inputs": {
@@ -281,37 +283,37 @@
         "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": "adiodvpe0_bandwidth_units"
+          "inputName": "pasqualevpe0_bandwidth_units"
         },
         "bandwidth": {
           "displayName": "bandwidth",
           "command": "get_input",
-          "inputName": "adiodvpe0_bandwidth"
+          "inputName": "pasqualevpe0_bandwidth"
         },
         "AIC_CLLI": {
           "displayName": "AIC_CLLI",
           "command": "get_input",
-          "inputName": "2017488_adiodvpe0_AIC_CLLI"
+          "inputName": "2017488_pasqualevpe0_AIC_CLLI"
         },
         "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",
@@ -357,7 +359,7 @@
         "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
         "vmxvre_int_ctl_ip_0": "10.0.0.10",
         "ecomp_generated_naming": "false",
-        "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",
@@ -365,14 +367,14 @@
         "vmxvre_volume_type_0": "HITACHI",
         "vmxvpfe_volume_type_0": "HITACHI",
         "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-        "bandwidth_units": "get_input:adiodvpe0_bandwidth_units",
+        "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
         "vnf_id": "123",
         "vmxvre_oam_prefix": "24",
         "availability_zone_0": "mtpocfo-kvm-az01",
-        "ASN": "get_input:2017488_adiodvpe0_ASN",
+        "ASN": "get_input:2017488_pasqualevpe0_ASN",
         "vmxvre_chassis_i2cid": "161",
         "vmxvpfe_name_0": "vPFEXI",
-        "bandwidth": "get_input:adiodvpe0_bandwidth",
+        "bandwidth": "get_input:pasqualevpe0_bandwidth",
         "availability_zone_max_count": "1",
         "vmxvre_volume_size_0": "45.0",
         "vmxvre_volume_size_1": "50.0",
@@ -382,7 +384,7 @@
         "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",
@@ -396,16 +398,16 @@
         "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
       },
       "type": "VF",
-      "modelCustomizationName": "2017-388_ADIOD-vPE 0",
+      "modelCustomizationName": "2017-388_PASQUALE-vPE 0",
       "vfModules": {},
       "volumeGroups": {},
       "vfcInstanceGroups": {}
     },
-    "2017-488_ADIOD-vPE 0": {
+    "2017-488_PASQUALE-vPE 0": {
       "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
       "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-      "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": "5.0",
       "customizationUuid": "1da7b585-5e61-4993-b95e-8e6606c81e45",
       "inputs": {
@@ -468,37 +470,37 @@
         "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": "adiodvpe0_bandwidth_units"
+          "inputName": "pasqualevpe0_bandwidth_units"
         },
         "bandwidth": {
           "displayName": "bandwidth",
           "command": "get_input",
-          "inputName": "adiodvpe0_bandwidth"
+          "inputName": "pasqualevpe0_bandwidth"
         },
         "AIC_CLLI": {
           "displayName": "AIC_CLLI",
           "command": "get_input",
-          "inputName": "2017488_adiodvpe0_AIC_CLLI"
+          "inputName": "2017488_pasqualevpe0_AIC_CLLI"
         },
         "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",
@@ -545,7 +547,7 @@
         "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
         "vmxvre_int_ctl_ip_0": "10.0.0.10",
         "ecomp_generated_naming": "false",
-        "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",
@@ -553,14 +555,14 @@
         "vmxvre_volume_type_0": "HITACHI",
         "vmxvpfe_volume_type_0": "HITACHI",
         "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-        "bandwidth_units": "get_input:adiodvpe0_bandwidth_units",
+        "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
         "vnf_id": "123",
         "vmxvre_oam_prefix": "24",
         "availability_zone_0": "mtpocfo-kvm-az01",
-        "ASN": "get_input:2017488_adiodvpe0_ASN",
+        "ASN": "get_input:2017488_pasqualevpe0_ASN",
         "vmxvre_chassis_i2cid": "161",
         "vmxvpfe_name_0": "vPFEXI",
-        "bandwidth": "get_input:adiodvpe0_bandwidth",
+        "bandwidth": "get_input:pasqualevpe0_bandwidth",
         "availability_zone_max_count": "1",
         "vmxvre_volume_size_0": "45.0",
         "vmxvre_volume_size_1": "50.0",
@@ -570,7 +572,7 @@
         "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",
@@ -584,21 +586,21 @@
         "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": "25284168-24bb-4698-8cb4-3f509146eca5",
           "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
           "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
           "description": null,
-          "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+          "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
           "version": "6",
-          "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",
             "baseModule": false
           },
           "inputs": {
@@ -608,10 +610,10 @@
               "entry_schema": null,
               "inputProperties": {
                 "sourceType": "HEAT",
-                "vfModuleLabel": "ADIOD_vRE_BV",
+                "vfModuleLabel": "PASQUALE_vRE_BV",
                 "paramName": "vnf_config_template_version"
               },
-              "fromInputName": "2017488_adiodvpe0_vnf_config_template_version",
+              "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
               "constraints": null,
               "required": true,
               "default": "17.2"
@@ -622,10 +624,10 @@
               "entry_schema": null,
               "inputProperties": {
                 "sourceType": "HEAT",
-                "vfModuleLabel": "ADIOD_vRE_BV",
+                "vfModuleLabel": "PASQUALE_vRE_BV",
                 "paramName": "bandwidth_units"
               },
-              "fromInputName": "adiodvpe0_bandwidth_units",
+              "fromInputName": "pasqualevpe0_bandwidth_units",
               "constraints": null,
               "required": true,
               "default": "Gbps"
@@ -636,10 +638,10 @@
               "entry_schema": null,
               "inputProperties": {
                 "sourceType": "HEAT",
-                "vfModuleLabel": "ADIOD_vRE_BV",
+                "vfModuleLabel": "PASQUALE_vRE_BV",
                 "paramName": "bandwidth"
               },
-              "fromInputName": "adiodvpe0_bandwidth",
+              "fromInputName": "pasqualevpe0_bandwidth",
               "constraints": null,
               "required": true,
               "default": "10"
@@ -650,10 +652,10 @@
               "entry_schema": null,
               "inputProperties": {
                 "sourceType": "HEAT",
-                "vfModuleLabel": "ADIOD_vRE_BV",
+                "vfModuleLabel": "PASQUALE_vRE_BV",
                 "paramName": "AIC_CLLI"
               },
-              "fromInputName": "2017488_adiodvpe0_AIC_CLLI",
+              "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
               "constraints": null,
               "required": true,
               "default": "ATLMY8GA"
@@ -664,10 +666,10 @@
               "entry_schema": null,
               "inputProperties": {
                 "sourceType": "HEAT",
-                "vfModuleLabel": "ADIOD_vRE_BV",
+                "vfModuleLabel": "PASQUALE_vRE_BV",
                 "paramName": "vnf_instance_name"
               },
-              "fromInputName": "2017488_adiodvpe0_vnf_instance_name",
+              "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
               "constraints": null,
               "required": true,
               "default": "mtnj309me6"
@@ -675,37 +677,37 @@
           },
           "volumeGroupAllowed": true
         },
-        "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
           "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
           "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
           "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
           "description": null,
-          "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+          "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
           "version": "5",
-          "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",
             "baseModule": true
           },
           "inputs": {},
           "volumeGroupAllowed": false
         },
-        "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
           "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
           "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
           "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
           "description": null,
-          "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+          "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
           "version": "6",
-          "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",
             "baseModule": false
           },
           "inputs": {},
@@ -713,19 +715,19 @@
         }
       },
       "volumeGroups": {
-        "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
           "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
           "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
           "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
           "description": null,
-          "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+          "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
           "version": "6",
-          "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",
             "baseModule": false
           },
           "inputs": {
@@ -735,10 +737,10 @@
               "entry_schema": null,
               "inputProperties": {
                 "sourceType": "HEAT",
-                "vfModuleLabel": "ADIOD_vRE_BV",
+                "vfModuleLabel": "PASQUALE_vRE_BV",
                 "paramName": "vnf_config_template_version"
               },
-              "fromInputName": "2017488_adiodvpe0_vnf_config_template_version",
+              "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
               "constraints": null,
               "required": true,
               "default": "17.2"
@@ -749,10 +751,10 @@
               "entry_schema": null,
               "inputProperties": {
                 "sourceType": "HEAT",
-                "vfModuleLabel": "ADIOD_vRE_BV",
+                "vfModuleLabel": "PASQUALE_vRE_BV",
                 "paramName": "bandwidth_units"
               },
-              "fromInputName": "adiodvpe0_bandwidth_units",
+              "fromInputName": "pasqualevpe0_bandwidth_units",
               "constraints": null,
               "required": true,
               "default": "Gbps"
@@ -763,10 +765,10 @@
               "entry_schema": null,
               "inputProperties": {
                 "sourceType": "HEAT",
-                "vfModuleLabel": "ADIOD_vRE_BV",
+                "vfModuleLabel": "PASQUALE_vRE_BV",
                 "paramName": "bandwidth"
               },
-              "fromInputName": "adiodvpe0_bandwidth",
+              "fromInputName": "pasqualevpe0_bandwidth",
               "constraints": null,
               "required": true,
               "default": "10"
@@ -777,10 +779,10 @@
               "entry_schema": null,
               "inputProperties": {
                 "sourceType": "HEAT",
-                "vfModuleLabel": "ADIOD_vRE_BV",
+                "vfModuleLabel": "PASQUALE_vRE_BV",
                 "paramName": "AIC_CLLI"
               },
-              "fromInputName": "2017488_adiodvpe0_AIC_CLLI",
+              "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
               "constraints": null,
               "required": true,
               "default": "ATLMY8GA"
@@ -791,29 +793,29 @@
               "entry_schema": null,
               "inputProperties": {
                 "sourceType": "HEAT",
-                "vfModuleLabel": "ADIOD_vRE_BV",
+                "vfModuleLabel": "PASQUALE_vRE_BV",
                 "paramName": "vnf_instance_name"
               },
-              "fromInputName": "2017488_adiodvpe0_vnf_instance_name",
+              "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
               "constraints": null,
               "required": true,
               "default": "mtnj309me6"
             }
           }
         },
-        "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
           "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
           "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
           "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
           "description": null,
-          "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+          "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
           "version": "6",
-          "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",
             "baseModule": false
           },
           "inputs": {}
@@ -823,24 +825,24 @@
     }
   },
   "networks": {},
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {},
   "fabricConfigurations": {},
   "serviceProxies": {},
   "vfModules": {
-    "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
       "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
       "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
       "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
       "description": null,
-      "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+      "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
       "version": "6",
-      "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",
         "baseModule": false
       },
       "inputs": {
@@ -850,10 +852,10 @@
           "entry_schema": null,
           "inputProperties": {
             "sourceType": "HEAT",
-            "vfModuleLabel": "ADIOD_vRE_BV",
+            "vfModuleLabel": "PASQUALE_vRE_BV",
             "paramName": "vnf_config_template_version"
           },
-          "fromInputName": "2017488_adiodvpe0_vnf_config_template_version",
+          "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
           "constraints": null,
           "required": true,
           "default": "17.2"
@@ -864,10 +866,10 @@
           "entry_schema": null,
           "inputProperties": {
             "sourceType": "HEAT",
-            "vfModuleLabel": "ADIOD_vRE_BV",
+            "vfModuleLabel": "PASQUALE_vRE_BV",
             "paramName": "bandwidth_units"
           },
-          "fromInputName": "adiodvpe0_bandwidth_units",
+          "fromInputName": "pasqualevpe0_bandwidth_units",
           "constraints": null,
           "required": true,
           "default": "Gbps"
@@ -878,10 +880,10 @@
           "entry_schema": null,
           "inputProperties": {
             "sourceType": "HEAT",
-            "vfModuleLabel": "ADIOD_vRE_BV",
+            "vfModuleLabel": "PASQUALE_vRE_BV",
             "paramName": "bandwidth"
           },
-          "fromInputName": "adiodvpe0_bandwidth",
+          "fromInputName": "pasqualevpe0_bandwidth",
           "constraints": null,
           "required": true,
           "default": "10"
@@ -892,10 +894,10 @@
           "entry_schema": null,
           "inputProperties": {
             "sourceType": "HEAT",
-            "vfModuleLabel": "ADIOD_vRE_BV",
+            "vfModuleLabel": "PASQUALE_vRE_BV",
             "paramName": "AIC_CLLI"
           },
-          "fromInputName": "2017488_adiodvpe0_AIC_CLLI",
+          "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
           "constraints": null,
           "required": true,
           "default": "ATLMY8GA"
@@ -906,10 +908,10 @@
           "entry_schema": null,
           "inputProperties": {
             "sourceType": "HEAT",
-            "vfModuleLabel": "ADIOD_vRE_BV",
+            "vfModuleLabel": "PASQUALE_vRE_BV",
             "paramName": "vnf_instance_name"
           },
-          "fromInputName": "2017488_adiodvpe0_vnf_instance_name",
+          "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
           "constraints": null,
           "required": true,
           "default": "mtnj309me6"
@@ -917,37 +919,37 @@
       },
       "volumeGroupAllowed": true
     },
-    "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
+    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
       "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
       "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
       "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
       "description": null,
-      "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+      "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
       "version": "5",
-      "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",
         "baseModule": true
       },
       "inputs": {},
       "volumeGroupAllowed": false
     },
-    "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
       "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
       "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
       "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
       "description": null,
-      "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+      "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
       "version": "6",
-      "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",
         "baseModule": false
       },
       "inputs": {},
@@ -955,19 +957,19 @@
     }
   },
   "volumeGroups": {
-    "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
       "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
       "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
       "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
       "description": null,
-      "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+      "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
       "version": "6",
-      "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",
         "baseModule": false
       },
       "inputs": {
@@ -977,10 +979,10 @@
           "entry_schema": null,
           "inputProperties": {
             "sourceType": "HEAT",
-            "vfModuleLabel": "ADIOD_vRE_BV",
+            "vfModuleLabel": "PASQUALE_vRE_BV",
             "paramName": "vnf_config_template_version"
           },
-          "fromInputName": "2017488_adiodvpe0_vnf_config_template_version",
+          "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
           "constraints": null,
           "required": true,
           "default": "17.2"
@@ -991,10 +993,10 @@
           "entry_schema": null,
           "inputProperties": {
             "sourceType": "HEAT",
-            "vfModuleLabel": "ADIOD_vRE_BV",
+            "vfModuleLabel": "PASQUALE_vRE_BV",
             "paramName": "bandwidth_units"
           },
-          "fromInputName": "adiodvpe0_bandwidth_units",
+          "fromInputName": "pasqualevpe0_bandwidth_units",
           "constraints": null,
           "required": true,
           "default": "Gbps"
@@ -1005,10 +1007,10 @@
           "entry_schema": null,
           "inputProperties": {
             "sourceType": "HEAT",
-            "vfModuleLabel": "ADIOD_vRE_BV",
+            "vfModuleLabel": "PASQUALE_vRE_BV",
             "paramName": "bandwidth"
           },
-          "fromInputName": "adiodvpe0_bandwidth",
+          "fromInputName": "pasqualevpe0_bandwidth",
           "constraints": null,
           "required": true,
           "default": "10"
@@ -1019,10 +1021,10 @@
           "entry_schema": null,
           "inputProperties": {
             "sourceType": "HEAT",
-            "vfModuleLabel": "ADIOD_vRE_BV",
+            "vfModuleLabel": "PASQUALE_vRE_BV",
             "paramName": "AIC_CLLI"
           },
-          "fromInputName": "2017488_adiodvpe0_AIC_CLLI",
+          "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
           "constraints": null,
           "required": true,
           "default": "ATLMY8GA"
@@ -1033,29 +1035,29 @@
           "entry_schema": null,
           "inputProperties": {
             "sourceType": "HEAT",
-            "vfModuleLabel": "ADIOD_vRE_BV",
+            "vfModuleLabel": "PASQUALE_vRE_BV",
             "paramName": "vnf_instance_name"
           },
-          "fromInputName": "2017488_adiodvpe0_vnf_instance_name",
+          "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
           "constraints": null,
           "required": true,
           "default": "mtnj309me6"
         }
       }
     },
-    "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
       "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
       "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
       "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
       "description": null,
-      "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+      "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
       "version": "6",
-      "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",
         "baseModule": false
       },
       "inputs": {}
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceModels/serviceForNewViewEdit.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceModels/serviceForNewViewEdit.json
index a749e5787..0c462b32f 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceModels/serviceForNewViewEdit.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceModels/serviceForNewViewEdit.json
@@ -2,13 +2,13 @@
   "service": {
     "uuid": "a1531622-4e08-43fa-9ffd-222090cab7d2",
     "invariantUuid": "c54c1178-ab4b-498c-aea0-52cc2043d44f",
-    "name": "mdns_2017_1011_IST_Service",
+    "name": "CHARLOTTE_2017_1011_IST_Service",
     "version": "5.0",
     "toscaModelURL": null,
     "category": "Emanuel",
     "serviceType": "",
     "serviceRole": "",
-    "description": "mdns_2017_1011_IST_Service -Creating Service for PID 298109a",
+    "description": "CHARLOTTE_2017_1011_IST_Service -Creating Service for PID 298109a",
     "serviceEcompNaming": "true",
     "instantiationType": "ClientConfig",
     "inputs": {},
@@ -19,29 +19,29 @@
     }
   },
   "vnfs": {
-    "mdns_2017_1011_IST_Vf 0": {
+    "CHARLOTTE_2017_1011_IST_Vf 0": {
       "uuid": "e54ac8ab-746b-494d-918a-efab23a50e0d",
       "invariantUuid": "b22715a2-4ec1-4e2f-bf4f-d79fa9519707",
-      "description": "mdns_2017_1011_IST_Vf -Creating for PID 298109a",
-      "name": "mdns_2017_1011_IST_Vf",
+      "description": "CHARLOTTE_2017_1011_IST_Vf -Creating for PID 298109a",
+      "name": "CHARLOTTE_2017_1011_IST_Vf",
       "version": "4.0",
       "customizationUuid": "efa526df-e1f5-4fda-9e0d-475cb5e44e4f",
       "inputs": {},
       "commands": {},
       "properties": {
-        "nf_naming": "{naming_policy=gw1218.Config_MS_VmVnfcNamingPolicyMobility1710.*, ecomp_generated_naming=true}",
+        "nf_naming": "{naming_policy=gw1218.Config_MS_VmVnfcNamingPolicyEmanuel1710.*, ecomp_generated_naming=true}",
         "multi_stage_design": "false",
         "availability_zone_max_count": "1",
         "ecomp_generated_naming": "true",
         "node_count": "4.0",
-        "dns_image_name": "NIMBUS_MDNS_3.0.4.qcow2",
+        "dns_image_name": "KENNEDY_CHARLOTTE_3.0.4.qcow2",
         "route_eth0": "135.144.38.211/32 via 107.239.83.1 dev eth0 155.165.201.253/32 via 107.239.83.1 dev eth0 141.204.0.0/16 via 107.239.83.1 dev eth0 ",
         "dns_flavor_name": "nv.c4r4d80"
       },
       "type": "VF",
-      "modelCustomizationName": "mdns_2017_1011_IST_Vf 0",
+      "modelCustomizationName": "CHARLOTTE_2017_1011_IST_Vf 0",
       "vfModules": {
-        "mdns_2017_1011_ist_vf0..Mdns20171011IstVf..base_dns..module-0": {
+        "CHARLOTTE_2017_1011_ist_vf0..Mdns20171011IstVf..base_dns..module-0": {
           "uuid": "1259fe65-4112-44ab-a622-cc9f99296c90",
           "invariantUuid": "0be2f9a6-889a-45bd-9ba5-13ef9f62474b",
           "customizationUuid": "89200091-4583-4f01-bc2b-aade7a0eb6de",
@@ -59,7 +59,7 @@
           "inputs": {},
           "volumeGroupAllowed": false
         },
-        "mdns_2017_1011_ist_vf0..Mdns20171011IstVf..dns_az_01..module-1": {
+        "CHARLOTTE_2017_1011_ist_vf0..Mdns20171011IstVf..dns_az_01..module-1": {
           "uuid": "c921c0dd-4f02-4b1e-8234-063675955c45",
           "invariantUuid": "3744764d-32a1-468f-801d-2fc2485dc159",
           "customizationUuid": "a86c56b6-7d7d-4bc1-b60f-ea384cadd232",
@@ -83,12 +83,12 @@
     }
   },
   "networks": {},
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {},
   "fabricConfigurations": {},
   "serviceProxies": {},
   "vfModules": {
-    "mdns_2017_1011_ist_vf0..Mdns20171011IstVf..base_dns..module-0": {
+    "CHARLOTTE_2017_1011_ist_vf0..Mdns20171011IstVf..base_dns..module-0": {
       "uuid": "1259fe65-4112-44ab-a622-cc9f99296c90",
       "invariantUuid": "0be2f9a6-889a-45bd-9ba5-13ef9f62474b",
       "customizationUuid": "89200091-4583-4f01-bc2b-aade7a0eb6de",
@@ -106,7 +106,7 @@
       "inputs": {},
       "volumeGroupAllowed": false
     },
-    "mdns_2017_1011_ist_vf0..Mdns20171011IstVf..dns_az_01..module-1": {
+    "CHARLOTTE_2017_1011_ist_vf0..Mdns20171011IstVf..dns_az_01..module-1": {
       "uuid": "c921c0dd-4f02-4b1e-8234-063675955c45",
       "invariantUuid": "3744764d-32a1-468f-801d-2fc2485dc159",
       "customizationUuid": "a86c56b6-7d7d-4bc1-b60f-ea384cadd232",
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithNetwork/aaiSubDetailsForServiceWithNetwork.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithNetwork/aaiSubDetailsForServiceWithNetwork.json
index b447e1d58..5cd14387e 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithNetwork/aaiSubDetailsForServiceWithNetwork.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithNetwork/aaiSubDetailsForServiceWithNetwork.json
@@ -278,7 +278,7 @@
               "resource-version": "1516045827731",
               "orchestration-status": "Active",
               "model-invariant-id": "92a72881-0a97-4d16-8c29-4831062e7e9b",
-              "model-version-id": "5a3ad576-c01d-4bed-8194-0e72b4a3d020"
+              "model-version-id": "f6f4e9ee-4f2f-4a9d-9b42-56485fd4a225"
             }
           ]
         },
@@ -288,3 +288,4 @@
     ]
   }
 }
+
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithNetwork/serviceWithNetwork.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithNetwork/serviceWithNetwork.json
index 35539dde4..f5f3adb7a 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithNetwork/serviceWithNetwork.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithNetwork/serviceWithNetwork.json
@@ -18,7 +18,7 @@
     "CONTRAIL30_BASIC 0": {
       "uuid": "2920cd06-f585-436b-a002-c3081f6a91b3",
       "invariantUuid": "56f4e746-c58e-4b76-93d4-6717b8f59205",
-      "description": "Basic contrail 3.0.x L3 network for AIC 3.x sites. Keeping for existing mobility networks. ",
+      "description": "Basic contrail 3.0.x L3 network for AIC 3.x sites. Keeping for existing emanuel networks. ",
       "name": "CONTRAIL30_BASIC",
       "version": "3.0",
       "customizationUuid": "8e2128bf-77e8-4a48-84d0-520c44718161",
@@ -37,7 +37,7 @@
       "modelCustomizationName": "CONTRAIL30_BASIC 0"
     }
   },
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {},
   "fabricConfigurations": {},
   "serviceProxies": {},
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json
index e40d89f88..2c43efdfe 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json
@@ -8,17 +8,20 @@
         "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,
@@ -30,18 +33,18 @@
           }
         },
         "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": {},
             "commands": {},
             "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",
@@ -83,11 +86,11 @@
               "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",
@@ -95,14 +98,14 @@
               "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",
@@ -112,7 +115,7 @@
               "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",
@@ -126,82 +129,82 @@
               "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,
@@ -211,45 +214,45 @@
                 },
                 "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,
@@ -261,80 +264,80 @@
               }
             },
             "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,
@@ -343,28 +346,28 @@
                   }
                 }
               },
-              "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,
@@ -378,84 +381,84 @@
           }
         },
         "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,
@@ -465,45 +468,45 @@
             },
             "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,
@@ -515,80 +518,80 @@
           }
         },
         "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,
@@ -597,28 +600,28 @@
               }
             }
           },
-          "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,
@@ -643,8 +646,11 @@
           "description": "",
           "serviceEcompNaming": "true",
           "instantiationType": "Macro",
+          "vidNotions": {
+            "instantiationType": "Macro"
+          },
           "inputs": {
-            "2017488_adiodvpe0_ASN": {
+            "2017488_pasqualevpe0_ASN": {
               "type": "string",
               "description": "AV/PE",
               "entry_schema": null,
@@ -656,18 +662,18 @@
           }
         },
         "vnfs": {
-          "2017-388_ADIOD-vPE 1": {
+          "2017-388_PASQUALE-vPE 1": {
             "uuid": "0903e1c0-8e03-4936-b5c2-260653b96413",
             "invariantUuid": "00beb8f9-6d39-452f-816d-c709b9cbb87d",
-            "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-388_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-388_PASQUALE-vPE",
             "version": "1.0",
             "customizationUuid": "280dec31-f16d-488b-9668-4aae55d6648a",
             "inputs": {},
             "commands": {},
             "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",
@@ -712,7 +718,7 @@
               "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",
@@ -720,14 +726,14 @@
               "vmxvre_volume_type_0": "HITACHI",
               "vmxvpfe_volume_type_0": "HITACHI",
               "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-              "bandwidth_units": "get_input:adiodvpe0_bandwidth_units",
+              "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
               "vnf_id": "123",
               "vmxvre_oam_prefix": "24",
               "availability_zone_0": "mtpocfo-kvm-az01",
-              "ASN": "get_input:2017488_adiodvpe0_ASN",
+              "ASN": "get_input:2017488_pasqualevpe0_ASN",
               "vmxvre_chassis_i2cid": "161",
               "vmxvpfe_name_0": "vPFEXI",
-              "bandwidth": "get_input:adiodvpe0_bandwidth",
+              "bandwidth": "get_input:pasqualevpe0_bandwidth",
               "availability_zone_max_count": "1",
               "vmxvre_volume_size_0": "45.0",
               "vmxvre_volume_size_1": "50.0",
@@ -737,7 +743,7 @@
               "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",
@@ -751,23 +757,23 @@
               "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
             },
             "type": "VF",
-            "modelCustomizationName": "2017-388_ADIOD-vPE 1",
+            "modelCustomizationName": "2017-388_PASQUALE-vPE 1",
             "vfModules": {},
             "volumeGroups": {},
             "vfcInstanceGroups": {}
           },
-          "2017-388_ADIOD-vPE 0": {
+          "2017-388_PASQUALE-vPE 0": {
             "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168",
             "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-            "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-388_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-388_PASQUALE-vPE",
             "version": "4.0",
             "customizationUuid": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c",
             "inputs": {},
             "commands": {},
             "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",
@@ -812,7 +818,7 @@
               "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",
@@ -820,14 +826,14 @@
               "vmxvre_volume_type_0": "HITACHI",
               "vmxvpfe_volume_type_0": "HITACHI",
               "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-              "bandwidth_units": "get_input:adiodvpe0_bandwidth_units",
+              "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
               "vnf_id": "123",
               "vmxvre_oam_prefix": "24",
               "availability_zone_0": "mtpocfo-kvm-az01",
-              "ASN": "get_input:2017488_adiodvpe0_ASN",
+              "ASN": "get_input:2017488_pasqualevpe0_ASN",
               "vmxvre_chassis_i2cid": "161",
               "vmxvpfe_name_0": "vPFEXI",
-              "bandwidth": "get_input:adiodvpe0_bandwidth",
+              "bandwidth": "get_input:pasqualevpe0_bandwidth",
               "availability_zone_max_count": "1",
               "vmxvre_volume_size_0": "45.0",
               "vmxvre_volume_size_1": "50.0",
@@ -837,7 +843,7 @@
               "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",
@@ -851,23 +857,23 @@
               "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
             },
             "type": "VF",
-            "modelCustomizationName": "2017-388_ADIOD-vPE 0",
+            "modelCustomizationName": "2017-388_PASQUALE-vPE 0",
             "vfModules": {},
             "volumeGroups": {},
             "vfcInstanceGroups": {}
           },
-          "2017-488_ADIOD-vPE 0": {
+          "2017-488_PASQUALE-vPE 0": {
             "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
             "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-            "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": "5.0",
             "customizationUuid": "1da7b585-5e61-4993-b95e-8e6606c81e45",
             "inputs": {},
             "commands": {},
             "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",
@@ -912,7 +918,7 @@
               "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",
@@ -920,14 +926,14 @@
               "vmxvre_volume_type_0": "HITACHI",
               "vmxvpfe_volume_type_0": "HITACHI",
               "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-              "bandwidth_units": "get_input:adiodvpe0_bandwidth_units",
+              "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
               "vnf_id": "123",
               "vmxvre_oam_prefix": "24",
               "availability_zone_0": "mtpocfo-kvm-az01",
-              "ASN": "get_input:2017488_adiodvpe0_ASN",
+              "ASN": "get_input:2017488_pasqualevpe0_ASN",
               "vmxvre_chassis_i2cid": "161",
               "vmxvpfe_name_0": "vPFEXI",
-              "bandwidth": "get_input:adiodvpe0_bandwidth",
+              "bandwidth": "get_input:pasqualevpe0_bandwidth",
               "availability_zone_max_count": "1",
               "vmxvre_volume_size_0": "45.0",
               "vmxvre_volume_size_1": "50.0",
@@ -937,7 +943,7 @@
               "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",
@@ -951,82 +957,82 @@
               "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": "25284168-24bb-4698-8cb4-3f509146eca5",
                 "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
                 "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                 "version": "6",
-                "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": {
-                  "adiodvpe0_bandwidth": {
+                  "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,
                     "required": true,
                     "default": "ATLMY8GA"
                   },
-                  "adiodvpe0_bandwidth_units": {
+                  "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,
@@ -1036,116 +1042,116 @@
                 },
                 "volumeGroupAllowed": true
               },
-              "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
+              "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
                 "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
                 "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
                 "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+                "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
                 "version": "5",
-                "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": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
                 "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
                 "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                 "version": "6",
-                "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": {},
                 "volumeGroupAllowed": true
               }
             },
             "volumeGroups": {
-              "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+              "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
                 "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
                 "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
                 "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                 "version": "6",
-                "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": {
-                  "adiodvpe0_bandwidth": {
+                  "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,
                     "required": true,
                     "default": "ATLMY8GA"
                   },
-                  "adiodvpe0_bandwidth_units": {
+                  "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,
@@ -1154,19 +1160,19 @@
                   }
                 }
               },
-              "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+              "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
                 "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
                 "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
                 "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
                 "description": null,
-                "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+                "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
                 "version": "6",
-                "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": {}
               }
@@ -1175,84 +1181,84 @@
           }
         },
         "networks": {},
-        "collectionResource": {},
+        "collectionResources": {},
         "configurations": {},
         "serviceProxies": {},
         "vfModules": {
-          "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
             "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
             "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
             "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
             "description": null,
-            "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+            "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
             "version": "6",
-            "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": {
-              "adiodvpe0_bandwidth": {
+              "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,
                 "required": true,
                 "default": "ATLMY8GA"
               },
-              "adiodvpe0_bandwidth_units": {
+              "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,
@@ -1262,116 +1268,116 @@
             },
             "volumeGroupAllowed": true
           },
-          "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
             "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
             "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
             "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
             "description": null,
-            "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+            "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
             "version": "5",
-            "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": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
             "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
             "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
             "description": null,
-            "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+            "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
             "version": "6",
-            "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": {},
             "volumeGroupAllowed": true
           }
         },
         "volumeGroups": {
-          "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
             "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
             "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
             "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
             "description": null,
-            "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+            "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
             "version": "6",
-            "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": {
-              "adiodvpe0_bandwidth": {
+              "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,
                 "required": true,
                 "default": "ATLMY8GA"
               },
-              "adiodvpe0_bandwidth_units": {
+              "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,
@@ -1380,19 +1386,19 @@
               }
             }
           },
-          "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
             "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
             "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
             "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
             "description": null,
-            "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+            "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
             "version": "6",
-            "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": {}
           }
@@ -1407,7 +1413,7 @@
           "1da7b585-5e61-4993-b95e-8e6606c81e45": 1
         },
         "vnfs": {
-          "2017-388_ADIOD-vPE 1": {
+          "2017-388_PASQUALE-vPE 1": {
             "rollbackOnFailure": "false",
             "vfModules": {},
             "productFamilyId": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e",
@@ -1415,38 +1421,38 @@
             "tenantId": "229bcdc6eaeb4ca59d55221141d01f8e",
             "lineOfBusiness": "zzz1",
             "platformName": "platform",
-            "originalName": "2017-388_ADIOD-vPE 1",
+            "originalName": "2017-388_PASQUALE-vPE 1",
             "modelInfo": {
               "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"
             }
           },
-          "2017-488_ADIOD-vPE 0": {
+          "2017-488_PASQUALE-vPE 0": {
             "rollbackOnFailure": "false",
-            "originalName": "2017-488_ADIOD-vPE 0",
+            "originalName": "2017-488_PASQUALE-vPE 0",
             "vfModules": {
-              "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
-                "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+              "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
+                "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
                   "rollbackOnFailure": true,
                   "modelInfo": {
                     "modelType": "service",
                     "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
                     "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5",
-                    "modelName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+                    "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
                     "modelVersion": "6"
                   },
                   "instanceParams": [
                     {
-                      "adiodvpe0_bandwidth": "10",
-                      "2017488_adiodvpe0_vnf_instance_name": "mtnj309me6",
-                      "2017488_adiodvpe0_vnf_config_template_version": "17.2",
-                      "2017488_adiodvpe0_AIC_CLLI": "ATLMY8GA",
-                      "adiodvpe0_bandwidth_units": "Gbps"
+                      "pasqualevpe0_bandwidth": "10",
+                      "2017488_pasqualevpe0_vnf_instance_name": "mtnj309me6",
+                      "2017488_pasqualevpe0_vnf_config_template_version": "17.2",
+                      "2017488_pasqualevpe0_AIC_CLLI": "ATLMY8GA",
+                      "pasqualevpe0_bandwidth_units": "Gbps"
                     }
                   ]
                 }
@@ -1461,22 +1467,22 @@
               "modelType": "service",
               "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
               "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
-              "modelName": "2017-488_ADIOD-vPE",
+              "modelName": "2017-488_PASQUALE-vPE",
               "modelVersion": "5.0",
               "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45",
-              "modelCustomizationName": "2017-488_ADIOD-vPE 0"
+              "modelCustomizationName": "2017-488_PASQUALE-vPE 0"
             }
           }
         },
         "instanceParams": [
           {
-            "2017488_adiodvpe0_ASN": "AV_vPE"
+            "2017488_pasqualevpe0_ASN": "AV_vPE"
           }
         ],
         "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
         "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
         "subscriptionServiceType": "TYLER SILVIA",
-        "lcpCloudRegionId": "JANET25",
+        "lcpCloudRegionId": "AAIAIC25",
         "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
         "aicZoneId": "JAG1",
         "projectName": "WATKINS",
@@ -1489,6 +1495,9 @@
           "modelName": "action-data",
           "modelVersion": "1.0"
         },
+        "vidNotions": {
+          "instantiationType": "Macro"
+        },
         "isEcompGeneratedNaming": true,
         "tenantName": "USP-SIP-IC-24335-T-01",
         "aicZoneName": "YUDFJULP-JAG1"
@@ -1497,8 +1506,8 @@
     "lcpRegionsAndTenants": {
       "lcpRegionList": [
         {
-          "id": "JANET25",
-          "name": "JANET25",
+          "id": "AAIAIC25",
+          "name": "AAIAIC25",
           "isPermitted": true
         },
         {
@@ -1508,7 +1517,7 @@
         }
       ],
       "lcpRegionsTenantsMap": {
-        "JANET25": [
+        "AAIAIC25": [
           {
             "id": "092eb9e8e4b7412e8787dd091bc58e86",
             "name": "USP-SIP-IC-24335-T-01",
@@ -1522,8 +1531,128 @@
             "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
           },
           {
@@ -1532,6 +1661,16 @@
             "isPermitted": true
           },
           {
+            "id": "4914ab0ab3a743e58f0eefdacc1dde77",
+            "name": "DN5242-Nov21-T1",
+            "isPermitted": true
+          },
+          {
+            "id": "d0a3e3f2964542259d155a81c41aadc3",
+            "name": "test-hvf6-09",
+            "isPermitted": true
+          },
+          {
             "id": "cbb99fe4ada84631b7baf046b6fd2044",
             "name": "DN5242-Nov16-T3",
             "isPermitted": true
@@ -1559,7 +1698,7 @@
     "productFamilies": [
       {
         "id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-        "name": "SCOTTIE",
+        "name": "ERICA",
         "isPermitted": true
       },
       {
@@ -1584,7 +1723,7 @@
       },
       {
         "id": "323d69d9-2efe-4r45-ay0a-89ea7ard4e6f",
-        "name": "vSCP",
+        "name": "vEsmeralda",
         "isPermitted": true
       },
       {
@@ -1628,7 +1767,7 @@
         "isPermitted": true
       },
       {
-        "id": "Cisneros",
+        "id": "vMuriel",
         "name": "vMuriel",
         "isPermitted": true
       },
@@ -1654,7 +1793,7 @@
       },
       {
         "id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
-        "name": "Josefina",
+        "name": "JOSEFINA",
         "isPermitted": true
       },
       {
@@ -1702,7 +1841,7 @@
         },
         {
           "id": "6",
-          "name": "vSEGW",
+          "name": "vPorfirio",
           "isPermitted": false
         },
         {
@@ -1717,7 +1856,7 @@
         },
         {
           "id": "9",
-          "name": "vMME",
+          "name": "vFLORENCE",
           "isPermitted": false
         },
         {
@@ -1727,7 +1866,7 @@
         },
         {
           "id": "11",
-          "name": "vSCP",
+          "name": "vEsmeralda",
           "isPermitted": false
         },
         {
@@ -1737,7 +1876,7 @@
         },
         {
           "id": "13",
-          "name": "vMMSC",
+          "name": "vWINIFRED",
           "isPermitted": false
         },
         {
@@ -1781,6 +1920,754 @@
         "name": "UUUAIAAI-YYY1"
       },
       {
+        "id": "BAN1",
+        "name": "VSDKYUTP-BAN1"
+      },
+      {
+        "id": "DKJ1",
+        "name": "DKJSJDKA-DKJ1"
+      },
+      {
+        "id": "MCS1",
+        "name": "ASACMAMS-MCS1"
+      },
+      {
+        "id": "UIO1",
+        "name": "uioclli1-UIO1"
+      },
+      {
+        "id": "RAJ1",
+        "name": "YGBIJNLQ-RAJ1"
+      },
+      {
+        "id": "OPA1",
+        "name": "opaclli1-OPA1"
+      },
+      {
+        "id": "SDE1",
+        "name": "ZXCVBNMA-SDE1"
+      },
+      {
+        "id": "VEN2",
+        "name": "FGHJUHIL-VEN2"
+      },
+      {
+        "id": "ORL1",
+        "name": "ORLDFLMA-ORL1"
+      },
+      {
+        "id": "JAD1",
+        "name": "JADECLLI-JAD1"
+      },
+      {
+        "id": "ZXL1",
+        "name": "LWLWCANN-ZXL1"
+      },
+      {
+        "id": "CKL1",
+        "name": "CLKSKCKK-CKL1"
+      },
+      {
+        "id": "SDF1",
+        "name": "sdfclli1-SDF1"
+      },
+      {
+        "id": "RAD1",
+        "name": "RADICAL1-RAD1"
+      },
+      {
+        "id": "KIT1",
+        "name": "BHYJFGLN-KIT1"
+      },
+      {
+        "id": "REL1",
+        "name": "INGERFGT-REL1"
+      },
+      {
+        "id": "JNL1",
+        "name": "CJALSDAC-JNL1"
+      },
+      {
+        "id": "OLK1",
+        "name": "OLKOLKLS-OLK1"
+      },
+      {
+        "id": "CHI1",
+        "name": "CHILLIWE-CHI1"
+      },
+      {
+        "id": "UUU4",
+        "name": "UUUAAAUU-UUU4"
+      },
+      {
+        "id": "TUF1",
+        "name": "TUFCLLI1-TUF1"
+      },
+      {
+        "id": "KJN1",
+        "name": "CKALDKSA-KJN1"
+      },
+      {
+        "id": "SAM1",
+        "name": "SNDGCA64-SAN1"
+      },
+      {
+        "id": "SCK1",
+        "name": "SCKSCKSK-SCK1"
+      },
+      {
+        "id": "HJH1",
+        "name": "AOEEQQQD-HJH1"
+      },
+      {
+        "id": "HGD1",
+        "name": "SDFQWHGD-HGD1"
+      },
+      {
+        "id": "KOR1",
+        "name": "HYFLNBVT-KOR1"
+      },
+      {
+        "id": "ATL43",
+        "name": "AICLOCID-ATL43"
+      },
+      {
+        "id": "ATL54",
+        "name": "AICFTAAI-ATL54"
+      },
+      {
+        "id": "ATL66",
+        "name": "CLLIAAII-ATL66"
+      },
+      {
+        "id": "VEL1",
+        "name": "BNMLKUIK-VEL1"
+      },
+      {
+        "id": "ICC1",
+        "name": "SANJITAT-ICC1"
+      },
+      {
+        "id": "MNT11",
+        "name": "WSXEFBTH-MNT11"
+      },
+      {
+        "id": "DEF2",
+        "name": "WSBHGTYL-DEF2"
+      },
+      {
+        "id": "MAD11",
+        "name": "SDFQWGKL-MAD11"
+      },
+      {
+        "id": "OLG1",
+        "name": "OLHOLHOL-OLG1"
+      },
+      {
+        "id": "GAR1",
+        "name": "NGFVSJKO-GAR1"
+      },
+      {
+        "id": "SAN22",
+        "name": "GNVLSCTL-SAN22"
+      },
+      {
+        "id": "HRG1",
+        "name": "HRGHRGGS-HRG1"
+      },
+      {
+        "id": "JCS1",
+        "name": "JCSJSCJS-JCS1"
+      },
+      {
+        "id": "DHA12",
+        "name": "WSXEDECF-DHA12"
+      },
+      {
+        "id": "HJE1",
+        "name": "AOEEWWWD-HJE1"
+      },
+      {
+        "id": "NCA1",
+        "name": "NCANCANN-NCA1"
+      },
+      {
+        "id": "IOP1",
+        "name": "iopclli1-IOP1"
+      },
+      {
+        "id": "RTY1",
+        "name": "rtyclli1-RTY1"
+      },
+      {
+        "id": "KAP1",
+        "name": "HIOUYTRQ-KAP1"
+      },
+      {
+        "id": "ZEN1",
+        "name": "ZENCLLI1-ZEN1"
+      },
+      {
+        "id": "HKA1",
+        "name": "JAKHLASS-HKA1"
+      },
+      {
+        "id": "CQK1",
+        "name": "CQKSCAKK-CQK1"
+      },
+      {
+        "id": "SAI1",
+        "name": "UBEKQLPD-SAI1"
+      },
+      {
+        "id": "ERT1",
+        "name": "ertclli1-ERT1"
+      },
+      {
+        "id": "IBB1",
+        "name": "PLMKOIJU-IBB1"
+      },
+      {
+        "id": "TIR2",
+        "name": "PLKINHYI-TIR2"
+      },
+      {
+        "id": "HSD1",
+        "name": "CHASKCDS-HSD1"
+      },
+      {
+        "id": "SLF78",
+        "name": "SDCTLFN1-SLF78"
+      },
+      {
+        "id": "SEE78",
+        "name": "SDCTEEE4-SEE78"
+      },
+      {
+        "id": "SAN13",
+        "name": "TOKYJPFA-SAN13"
+      },
+      {
+        "id": "SAA78",
+        "name": "SDCTAAA1-SAA78"
+      },
+      {
+        "id": "LUC1",
+        "name": "ATLDFGYC-LUC1"
+      },
+      {
+        "id": "AMD13",
+        "name": "MEMATLAN-AMD13"
+      },
+      {
+        "id": "TOR1",
+        "name": "TOROONXN-TOR1"
+      },
+      {
+        "id": "QWE1",
+        "name": "QWECLLI1-QWE1"
+      },
+      {
+        "id": "ZOG1",
+        "name": "ZOGASTRO-ZOG1"
+      },
+      {
+        "id": "CAL33",
+        "name": "CALIFORN-CAL33"
+      },
+      {
+        "id": "SHH78",
+        "name": "SDIT1HHH-SHH78"
+      },
+      {
+        "id": "DSA1",
+        "name": "LKJHGFDS-DSA1"
+      },
+      {
+        "id": "CLG1",
+        "name": "CLGRABAD-CLG1"
+      },
+      {
+        "id": "BNA1",
+        "name": "BNARAGBK-BNA1"
+      },
+      {
+        "id": "ATL84",
+        "name": "CANTTCOC-ATL84"
+      },
+      {
+        "id": "APP1",
+        "name": "WBHGTYUI-APP1"
+      },
+      {
+        "id": "RJN1",
+        "name": "RJNRBZAW-RJN1"
+      },
+      {
+        "id": "EHH78",
+        "name": "SDCSHHH5-EHH78"
+      },
+      {
+        "id": "mac10",
+        "name": "PKGTESTF-mac10"
+      },
+      {
+        "id": "SXB78",
+        "name": "SDCTGXB1-SXB78"
+      },
+      {
+        "id": "SAX78",
+        "name": "SDCTAXG1-SAX78"
+      },
+      {
+        "id": "SYD1",
+        "name": "SYDNAUBV-SYD1"
+      },
+      {
+        "id": "TOK1",
+        "name": "TOKYJPFA-TOK1"
+      },
+      {
+        "id": "KGM2",
+        "name": "KGMTNC20-KGM2"
+      },
+      {
+        "id": "DCC1b",
+        "name": "POIUYTGH-DCC1b"
+      },
+      {
+        "id": "SKK78",
+        "name": "SDCTKKK1-SKK78"
+      },
+      {
+        "id": "SGG78",
+        "name": "SDCTGGG1-SGG78"
+      },
+      {
+        "id": "SJJ78",
+        "name": "SDCTJJJ1-SJJ78"
+      },
+      {
+        "id": "SBX78",
+        "name": "SDCTBXG1-SBX78"
+      },
+      {
+        "id": "LAG1",
+        "name": "LARGIZON-LAG1"
+      },
+      {
+        "id": "IAA1",
+        "name": "QAZXSWED-IAA1"
+      },
+      {
+        "id": "POI1",
+        "name": "PLMNJKIU-POI1"
+      },
+      {
+        "id": "LAG1a",
+        "name": "LARGIZON-LAG1a"
+      },
+      {
+        "id": "PBL1",
+        "name": "PBLAPBAI-PBL1"
+      },
+      {
+        "id": "LAG45",
+        "name": "LARGIZON-LAG1a"
+      },
+      {
+        "id": "MAR1",
+        "name": "MNBVCXZM-MAR1"
+      },
+      {
+        "id": "HST70",
+        "name": "HSTNTX70-HST70"
+      },
+      {
+        "id": "DCC1a",
+        "name": "POIUYTGH-DCC1a"
+      },
+      {
+        "id": "TOL1",
+        "name": "TOLDOH21-TOL1"
+      },
+      {
+        "id": "LON1",
+        "name": "LONEENCO-LON1"
+      },
+      {
+        "id": "SJU78",
+        "name": "SDIT1JUB-SJU78"
+      },
+      {
+        "id": "STN27",
+        "name": "HSTNTX01-STN27"
+      },
+      {
+        "id": "SSW56",
+        "name": "ss8126GT-SSW56"
+      },
+      {
+        "id": "SBB78",
+        "name": "SDIT1BBB-SBB78"
+      },
+      {
+        "id": "DCC3",
+        "name": "POIUYTGH-DCC3"
+      },
+      {
+        "id": "GNV1",
+        "name": "GNVLSCTL-GNV1"
+      },
+      {
+        "id": "WAS1",
+        "name": "WASHDCSW-WAS1"
+      },
+      {
+        "id": "TOY1",
+        "name": "TORYONNZ-TOY1"
+      },
+      {
+        "id": "STT1",
+        "name": "STTLWA02-STT1"
+      },
+      {
+        "id": "STG1",
+        "name": "STTGGE62-STG1"
+      },
+      {
+        "id": "SLL78",
+        "name": "SDCTLLL1-SLL78"
+      },
+      {
+        "id": "SBU78",
+        "name": "SDIT1BUB-SBU78"
+      },
+      {
+        "id": "ATL2",
+        "name": "ATLNGANW-ATL2"
+      },
+      {
+        "id": "BOT1",
+        "name": "BOTHWAKY-BOT1"
+      },
+      {
+        "id": "SNG1",
+        "name": "SNGPSIAU-SNG1"
+      },
+      {
+        "id": "NYC1",
+        "name": "NYCMNY54-NYC1"
+      },
+      {
+        "id": "LAG1b",
+        "name": "LARGIZON-LAG1b"
+      },
+      {
+        "id": "AMD15",
+        "name": "AMDFAA01-AMD15"
+      },
+      {
+        "id": "SNA1",
+        "name": "SNANTXCA-SNA1"
+      },
+      {
+        "id": "PLT1",
+        "name": "PLTNCA60-PLT1"
+      },
+      {
+        "id": "TLP1",
+        "name": "TLPNXM18-TLP1"
+      },
+      {
+        "id": "SDD81",
+        "name": "SAIT1DD6-SDD81"
+      },
+      {
+        "id": "DCC1",
+        "name": "POIUYTGH-DCC1"
+      },
+      {
+        "id": "DCC2",
+        "name": "POIUYTGH-DCC2"
+      },
+      {
+        "id": "OKC1",
+        "name": "OKCBOK55-OKC1"
+      },
+      {
+        "id": "PAR1",
+        "name": "PARSFRCG-PAR1"
+      },
+      {
+        "id": "TES36",
+        "name": "ABCEETES-TES36"
+      },
+      {
+        "id": "COM1",
+        "name": "PLMKOPIU-COM1"
+      },
+      {
+        "id": "ANI1",
+        "name": "ATLNGTRE-ANI1"
+      },
+      {
+        "id": "SDG78",
+        "name": "SDIT1BDG-SDG78"
+      },
+      {
+        "id": "mac20",
+        "name": "PKGTESTF-mac20"
+      },
+      {
+        "id": "DSF45",
+        "name": "DSFBG123-DSF45"
+      },
+      {
+        "id": "HST25",
+        "name": "HSTNTX01-HST25"
+      },
+      {
+        "id": "AMD18",
+        "name": "AUDIMA01-AMD18"
+      },
+      {
+        "id": "SAA80",
+        "name": "SAIT9AA3-SAA80"
+      },
+      {
+        "id": "SSA56",
+        "name": "SSIT2AA7-SSA56"
+      },
+      {
+        "id": "SDD82",
+        "name": "SAIT1DD9-SDD82"
+      },
+      {
+        "id": "JCV1",
+        "name": "JCVLFLBW-JCV1"
+      },
+      {
+        "id": "SUL2",
+        "name": "WERTYUJK-SUL2"
+      },
+      {
+        "id": "PUR1",
+        "name": "purelyde-PUR1"
+      },
+      {
+        "id": "FDE55",
+        "name": "FDERT555-FDE55"
+      },
+      {
+        "id": "SITE",
+        "name": "LONEENCO-SITE"
+      },
+      {
+        "id": "ATL1",
+        "name": "ATLNGAMA-ATL1"
+      },
+      {
+        "id": "JUL1",
+        "name": "ZXCVBNMM-JUL1"
+      },
+      {
+        "id": "TAT34",
+        "name": "TESAAISB-TAT34"
+      },
+      {
+        "id": "XCP12",
+        "name": "CHKGH123-XCP12"
+      },
+      {
+        "id": "RAI1",
+        "name": "poiuytre-RAI1"
+      },
+      {
+        "id": "HPO1",
+        "name": "ATLNGAUP-HPO1"
+      },
+      {
+        "id": "KJF12",
+        "name": "KJFDH123-KJF12"
+      },
+      {
+        "id": "SCC80",
+        "name": "SAIT9CC3-SCC80"
+      },
+      {
+        "id": "SAA12",
+        "name": "SAIT9AF8-SAA12"
+      },
+      {
+        "id": "SAA14",
+        "name": "SAIT1AA9-SAA14"
+      },
+      {
+        "id": "ATL35",
+        "name": "TTESSAAI-ATL35"
+      },
+      {
+        "id": "CWY1",
+        "name": "CWYMOWBS-CWY1"
+      },
+      {
+        "id": "ATL76",
+        "name": "TELEPAAI-ATL76"
+      },
+      {
+        "id": "DSL12",
+        "name": "DSLFK242-DSL12"
+      },
+      {
+        "id": "ATL53",
+        "name": "AAIATLTE-ATL53"
+      },
+      {
+        "id": "SAA11",
+        "name": "SAIT9AA2-SAA11"
+      },
+      {
+        "id": "ATL62",
+        "name": "TESSASCH-ATL62"
+      },
+      {
+        "id": "AUG1",
+        "name": "ASDFGHJK-AUG1"
+      },
+      {
+        "id": "POI22",
+        "name": "POIUY123-POI22"
+      },
+      {
+        "id": "SAA13",
+        "name": "SAIT1AA9-SAA13"
+      },
+      {
+        "id": "BHY17",
+        "name": "BHYTFRF3-BHY17"
+      },
+      {
+        "id": "LIS1",
+        "name": "HOSTPROF-LIS1"
+      },
+      {
+        "id": "SIP1",
+        "name": "ZXCVBNMK-SIP1"
+      },
+      {
+        "id": "ATL99",
+        "name": "TEESTAAI-ATL43"
+      },
+      {
+        "id": "ATL64",
+        "name": "FORLOAAJ-ATL64"
+      },
+      {
+        "id": "TAT33",
+        "name": "TESAAISA-TAT33"
+      },
+      {
+        "id": "RAD10",
+        "name": "INDIPUNE-RAD10"
+      },
+      {
+        "id": "RTW5",
+        "name": "BHYTFRY4-RTW5"
+      },
+      {
+        "id": "JGS1",
+        "name": "KSJKKKKK-JGS1"
+      },
+      {
+        "id": "ATL98",
+        "name": "TEESTAAI-ATL43"
+      },
+      {
+        "id": "WAN1",
+        "name": "LEIWANGW-WAN1"
+      },
+      {
+        "id": "ATL44",
+        "name": "ATLSANAB-ATL44"
+      },
+      {
+        "id": "RTD2",
+        "name": "BHYTFRk4-RTD2"
+      },
+      {
+        "id": "NIR1",
+        "name": "ORFLMANA-NIR1"
+      },
+      {
+        "id": "ATL75",
+        "name": "SANAAIRE-ATL75"
+      },
+      {
+        "id": "NUM1",
+        "name": "QWERTYUI-NUM1"
+      },
+      {
+        "id": "hvf32",
+        "name": "MDTWNJ21-hvf32"
+      },
+      {
+        "id": "RTZ4",
+        "name": "BHYTFRZ6-RTZ4"
+      },
+      {
+        "id": "ATL56",
+        "name": "ATLSANAC-ATL56"
+      },
+      {
+        "id": "AMS1",
+        "name": "AMSTNLBW-AMS1"
+      },
+      {
+        "id": "RCT1",
+        "name": "AMSTERNL-RCT1"
+      },
+      {
+        "id": "JAN1",
+        "name": "ORFLMATT-JAN1"
+      },
+      {
+        "id": "ABC14",
+        "name": "TESAAISA-ABC14"
+      },
+      {
+        "id": "TAT37",
+        "name": "TESAAISD-TAT37"
+      },
+      {
+        "id": "MIC54",
+        "name": "MICHIGAN-MIC54"
+      },
+      {
+        "id": "ABC11",
+        "name": "ATLSANAI-ABC11"
+      },
+      {
+        "id": "AMF11",
+        "name": "AMDOCS01-AMF11"
+      },
+      {
+        "id": "ATL63",
+        "name": "ATLSANEW-ATL63"
+      },
+      {
+        "id": "ABC12",
+        "name": "ATLSECIA-ABC12"
+      },
+      {
+        "id": "hvf20",
+        "name": "MDTWNJ21-hvf20"
+      },
+      {
+        "id": "ABC15",
+        "name": "AAITESAN-ABC15"
+      },
+      {
         "id": "AVT1",
         "name": "AVTRFLHD-AVT1"
       },
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/tenants.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/tenants.json
index 30d53b4ff..028b62bd5 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/tenants.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/tenants.json
@@ -3,7 +3,7 @@
     "cloudOwner": "irma-aic",
     "tenantName": "USP-SIP-IC-24335-T-01",
     "tenantID": "092eb9e8e4b7412e8787dd091bc58e86",
-    "cloudRegionID": "JANET25",
+    "cloudRegionID": "AAIAIC25",
     "is-permitted": true
   },
   {
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/vnfGroupBasicServiceInstance.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/vnfGroupBasicServiceInstance.json
index bba5ec19f..bc37b6bed 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/vnfGroupBasicServiceInstance.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/vnfGroupBasicServiceInstance.json
@@ -7,7 +7,7 @@
   "vnfGroups":{},
   "instanceParams":[
     {
-      "2017488_adiodvpe0_ASN":"AV_vPE"
+      "2017488_pasqualevpe0_ASN":"AV_vPE"
     }],
   "globalSubscriberId":"e433710f-9217-458d-a79d-1c7aff376d89",
   "subscriptionServiceType":"TYLER SILVIA",
@@ -21,6 +21,12 @@
     "modelName":"Grouping Service for Test",
     "modelVersion":"1.0"
   },
+  "vidNotions": {
+    "instantiationUI": "serviceWithVnfGrouping",
+    "modelCategory": "other",
+    "viewEditUI": "serviceWithVnfGrouping",
+    "instantiationType": "ALaCarte"
+  },
   "existingNames":{},
   "instanceName": "Grouping_Service_Instance",
   "subscriberName":"SILVIA ROBBINS",
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/vnfGroupsBasicModel.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/vnfGroupsBasicModel.json
index 6012d5928..a96da4c2f 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/vnfGroupsBasicModel.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/vnfGroupsBasicModel.json
@@ -15,7 +15,7 @@
           "serviceEcompNaming": "true",
           "instantiationType": "Macro",
           "inputs": {
-            "2017488_adiodvpe0_ASN": {
+            "2017488_pasqualevpe0_ASN": {
               "type": "string",
               "description": "AV/PE",
               "entry_schema": null,
@@ -42,11 +42,11 @@
               "type": "LOAD-GROUP"
             },
             "members": {
-              "vdbe_svc_vprs_proxy 0": {
+              "vdorothea_svc_vprs_proxy 0": {
                 "uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c",
                 "invariantUuid": "f4baae0c-b3a5-4ca1-a777-afbffe7010bc",
-                "description": "A Proxy for Service vDBE_Svc_vPRS",
-                "name": "vDBE_Svc_vPRS Service Proxy",
+                "description": "A Proxy for Service vDOROTHEA_Svc_vPRS",
+                "name": "vDOROTHEA_Svc_vPRS Service Proxy",
                 "version": "1.0",
                 "customizationUuid": "bdb63d23-e132-4ce7-af2c-a493b4cafac9",
                 "inputs": {},
@@ -55,12 +55,12 @@
                 "type": "Service Proxy",
                 "sourceModelUuid": "da7827a2-366d-4be6-8c68-a69153c61274",
                 "sourceModelInvariant": "24632e6b-584b-4f45-80d4-fefd75fd9f14",
-                "sourceModelName": "vDBE_Svc_vPRS"
+                "sourceModelName": "vDOROTHEA_Svc_vPRS"
               },
-              "vdbe_svc_vprs_proxy 1": {
+              "vdorothea_svc_vprs_proxy 1": {
                 "uuid": "111dfa8-a0d9-443f-95ad-836cd044e26c",
                 "invariantUuid": "111ae0c-b3a5-4ca1-a777-afbffe7010bc",
-                "description": "A Proxy for Service vDBE_Svc_vPRS",
+                "description": "A Proxy for Service vDOROTHEA_Svc_vPRS",
                 "name": "111_Svc_vPRS Service Proxy",
                 "version": "1.0",
                 "customizationUuid": "1113d23-e132-4ce7-af2c-a493b4cafac9",
@@ -76,7 +76,7 @@
           }
         },
         "networks": {},
-        "collectionResource": {},
+        "collectionResources": {},
         "configurations": {},
         "serviceProxies": {},
         "vfModules": {},
@@ -93,13 +93,13 @@
         "vnfGroups": {},
         "instanceParams": [
           {
-            "2017488_adiodvpe0_ASN": "AV_vPE"
+            "2017488_pasqualevpe0_ASN": "AV_vPE"
           }
         ],
         "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
         "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
         "subscriptionServiceType": "TYLER SILVIA",
-        "lcpCloudRegionId": "JANET25",
+        "lcpCloudRegionId": "AAIAIC25",
         "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
         "aicZoneId": "JAG1",
         "projectName": "WATKINS",
@@ -121,8 +121,8 @@
     "lcpRegionsAndTenants": {
       "lcpRegionList": [
         {
-          "id": "JANET25",
-          "name": "JANET25 (AIC)",
+          "id": "AAIAIC25",
+          "name": "AAIAIC25 (AIC)",
           "isPermitted": true,
           "cloudOwner": "irma-aic"
         },
@@ -134,7 +134,7 @@
         }
       ],
       "lcpRegionsTenantsMap": {
-        "JANET25": [
+        "AAIAIC25": [
           {
             "id": "092eb9e8e4b7412e8787dd091bc58e86",
             "name": "USP-SIP-IC-24335-T-01",
@@ -150,8 +150,152 @@
             "cloudOwner": "irma-aic"
           },
           {
-            "id": "d0a3e3f2964542259d155a81c41aadc3",
-            "name": "test-hvf6-09",
+            "id": "229bcdc6eaeb4ca59d55221141d01f8e",
+            "name": "AIN Web Tool-15-D-STTest2",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
+            "id": "1178612d2b394be4834ad77f567c0af2",
+            "name": "AIN Web Tool-15-D-SSPtestcustome",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
+            "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
+            "name": "AIN Web Tool-15-D-UncheckedEcopm",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
+            "id": "de007636e25249238447264a988a927b",
+            "name": "AIN Web Tool-15-D-dfsdf",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
+            "id": "62f29b3613634ca6a3065cbe0e020c44",
+            "name": "AIN/SMS-16-D-Multiservices1",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
+            "id": "649289e30d3244e0b48098114d63c2aa",
+            "name": "AIN Web Tool-15-D-SSPST66",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
+            "id": "3f21eeea6c2c486bba31dab816c05a32",
+            "name": "AIN Web Tool-15-D-ASSPST47",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
+            "id": "f60ce21d3ee6427586cff0d22b03b773",
+            "name": "CESAR-100-D-sspjg67246",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
+            "id": "8774659e425f479895ae091bb5d46560",
+            "name": "CESAR-100-D-sspjg68359",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
+            "id": "624eb554b0d147c19ff8885341760481",
+            "name": "AINWebTool-15-D-iftach",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
+            "id": "214f55f5fc414c678059c383b03e4962",
+            "name": "CESAR-100-D-sspjg612401",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
+            "id": "c90666c291664841bb98e4d981ff1db5",
+            "name": "CESAR-100-D-sspjg621340",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
+            "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
+            "name": "sspjg621351cloned",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
+            "id": "b386b768a3f24c8e953abbe0b3488c02",
+            "name": "AINWebTool-15-D-eteancomp",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
+            "id": "dc6c4dbfd225474e9deaadd34968646c",
+            "name": "AINWebTool-15-T-SPFET",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
+            "id": "02cb5030e9914aa4be120bd9ed1e19eb",
+            "name": "AINWebTool-15-X-eeweww",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
+            "id": "f2f3830e4c984d45bcd00e1a04158a79",
+            "name": "CESAR-100-D-spjg61909",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
+            "id": "05b91bd5137f4929878edd965755c06d",
+            "name": "CESAR-100-D-sspjg621512cloned",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
+            "id": "7002fbe8482d4a989ddf445b1ce336e0",
+            "name": "AINWebTool-15-X-vdr",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
+            "id": "4008522be43741dcb1f5422022a2aa0b",
+            "name": "AINWebTool-15-D-ssasa",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
+            "id": "f44e2e96a1b6476abfda2fa407b00169",
+            "name": "AINWebTool-15-D-PFNPT",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
+            "id": "b69a52bec8a84669a37a1e8b72708be7",
+            "name": "AINWebTool-15-X-vdre",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
+            "id": "fac7d9fd56154caeb9332202dcf2969f",
+            "name": "AINWebTool-15-X-NONPODECOMP",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
+            "id": "2d34d8396e194eb49969fd61ffbff961",
+            "name": "DN5242-Nov16-T5",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
+            "id": "cb42a77ff45b48a8b8deb83bb64acc74",
+            "name": "ro-T11",
             "isPermitted": true,
             "cloudOwner": "irma-aic"
           },
@@ -162,6 +306,18 @@
             "cloudOwner": "irma-aic"
           },
           {
+            "id": "4914ab0ab3a743e58f0eefdacc1dde77",
+            "name": "DN5242-Nov21-T1",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
+            "id": "d0a3e3f2964542259d155a81c41aadc3",
+            "name": "test-hvf6-09",
+            "isPermitted": true,
+            "cloudOwner": "irma-aic"
+          },
+          {
             "id": "cbb99fe4ada84631b7baf046b6fd2044",
             "name": "DN5242-Nov16-T3",
             "isPermitted": true,
@@ -190,7 +346,7 @@
     "productFamilies": [
       {
         "id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-        "name": "SCOTTIE",
+        "name": "ERICA",
         "isPermitted": true
       },
       {
@@ -215,7 +371,7 @@
       },
       {
         "id": "323d69d9-2efe-4r45-ay0a-89ea7ard4e6f",
-        "name": "vSCP",
+        "name": "vEsmeralda",
         "isPermitted": true
       },
       {
@@ -259,7 +415,7 @@
         "isPermitted": true
       },
       {
-        "id": "Cisneros",
+        "id": "vMuriel",
         "name": "vMuriel",
         "isPermitted": true
       },
@@ -285,7 +441,7 @@
       },
       {
         "id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
-        "name": "Josefina",
+        "name": "JOSEFINA",
         "isPermitted": true
       },
       {
@@ -333,7 +489,7 @@
         },
         {
           "id": "6",
-          "name": "vSEGW",
+          "name": "vPorfirio",
           "isPermitted": false
         },
         {
@@ -348,7 +504,7 @@
         },
         {
           "id": "9",
-          "name": "vMME",
+          "name": "vFLORENCE",
           "isPermitted": false
         },
         {
@@ -358,7 +514,7 @@
         },
         {
           "id": "11",
-          "name": "vSCP",
+          "name": "vEsmeralda",
           "isPermitted": false
         },
         {
@@ -368,7 +524,7 @@
         },
         {
           "id": "13",
-          "name": "vMMSC",
+          "name": "vWINIFRED",
           "isPermitted": false
         },
         {
@@ -412,6 +568,754 @@
         "name": "UUUAIAAI-YYY1"
       },
       {
+        "id": "BAN1",
+        "name": "VSDKYUTP-BAN1"
+      },
+      {
+        "id": "DKJ1",
+        "name": "DKJSJDKA-DKJ1"
+      },
+      {
+        "id": "MCS1",
+        "name": "ASACMAMS-MCS1"
+      },
+      {
+        "id": "UIO1",
+        "name": "uioclli1-UIO1"
+      },
+      {
+        "id": "RAJ1",
+        "name": "YGBIJNLQ-RAJ1"
+      },
+      {
+        "id": "OPA1",
+        "name": "opaclli1-OPA1"
+      },
+      {
+        "id": "SDE1",
+        "name": "ZXCVBNMA-SDE1"
+      },
+      {
+        "id": "VEN2",
+        "name": "FGHJUHIL-VEN2"
+      },
+      {
+        "id": "ORL1",
+        "name": "ORLDFLMA-ORL1"
+      },
+      {
+        "id": "JAD1",
+        "name": "JADECLLI-JAD1"
+      },
+      {
+        "id": "ZXL1",
+        "name": "LWLWCANN-ZXL1"
+      },
+      {
+        "id": "CKL1",
+        "name": "CLKSKCKK-CKL1"
+      },
+      {
+        "id": "SDF1",
+        "name": "sdfclli1-SDF1"
+      },
+      {
+        "id": "RAD1",
+        "name": "RADICAL1-RAD1"
+      },
+      {
+        "id": "KIT1",
+        "name": "BHYJFGLN-KIT1"
+      },
+      {
+        "id": "REL1",
+        "name": "INGERFGT-REL1"
+      },
+      {
+        "id": "JNL1",
+        "name": "CJALSDAC-JNL1"
+      },
+      {
+        "id": "OLK1",
+        "name": "OLKOLKLS-OLK1"
+      },
+      {
+        "id": "CHI1",
+        "name": "CHILLIWE-CHI1"
+      },
+      {
+        "id": "UUU4",
+        "name": "UUUAAAUU-UUU4"
+      },
+      {
+        "id": "TUF1",
+        "name": "TUFCLLI1-TUF1"
+      },
+      {
+        "id": "KJN1",
+        "name": "CKALDKSA-KJN1"
+      },
+      {
+        "id": "SAM1",
+        "name": "SNDGCA64-SAN1"
+      },
+      {
+        "id": "SCK1",
+        "name": "SCKSCKSK-SCK1"
+      },
+      {
+        "id": "HJH1",
+        "name": "AOEEQQQD-HJH1"
+      },
+      {
+        "id": "HGD1",
+        "name": "SDFQWHGD-HGD1"
+      },
+      {
+        "id": "KOR1",
+        "name": "HYFLNBVT-KOR1"
+      },
+      {
+        "id": "ATL43",
+        "name": "AICLOCID-ATL43"
+      },
+      {
+        "id": "ATL54",
+        "name": "AICFTAAI-ATL54"
+      },
+      {
+        "id": "ATL66",
+        "name": "CLLIAAII-ATL66"
+      },
+      {
+        "id": "VEL1",
+        "name": "BNMLKUIK-VEL1"
+      },
+      {
+        "id": "ICC1",
+        "name": "SANJITAT-ICC1"
+      },
+      {
+        "id": "MNT11",
+        "name": "WSXEFBTH-MNT11"
+      },
+      {
+        "id": "DEF2",
+        "name": "WSBHGTYL-DEF2"
+      },
+      {
+        "id": "MAD11",
+        "name": "SDFQWGKL-MAD11"
+      },
+      {
+        "id": "OLG1",
+        "name": "OLHOLHOL-OLG1"
+      },
+      {
+        "id": "GAR1",
+        "name": "NGFVSJKO-GAR1"
+      },
+      {
+        "id": "SAN22",
+        "name": "GNVLSCTL-SAN22"
+      },
+      {
+        "id": "HRG1",
+        "name": "HRGHRGGS-HRG1"
+      },
+      {
+        "id": "JCS1",
+        "name": "JCSJSCJS-JCS1"
+      },
+      {
+        "id": "DHA12",
+        "name": "WSXEDECF-DHA12"
+      },
+      {
+        "id": "HJE1",
+        "name": "AOEEWWWD-HJE1"
+      },
+      {
+        "id": "NCA1",
+        "name": "NCANCANN-NCA1"
+      },
+      {
+        "id": "IOP1",
+        "name": "iopclli1-IOP1"
+      },
+      {
+        "id": "RTY1",
+        "name": "rtyclli1-RTY1"
+      },
+      {
+        "id": "KAP1",
+        "name": "HIOUYTRQ-KAP1"
+      },
+      {
+        "id": "ZEN1",
+        "name": "ZENCLLI1-ZEN1"
+      },
+      {
+        "id": "HKA1",
+        "name": "JAKHLASS-HKA1"
+      },
+      {
+        "id": "CQK1",
+        "name": "CQKSCAKK-CQK1"
+      },
+      {
+        "id": "SAI1",
+        "name": "UBEKQLPD-SAI1"
+      },
+      {
+        "id": "ERT1",
+        "name": "ertclli1-ERT1"
+      },
+      {
+        "id": "IBB1",
+        "name": "PLMKOIJU-IBB1"
+      },
+      {
+        "id": "TIR2",
+        "name": "PLKINHYI-TIR2"
+      },
+      {
+        "id": "HSD1",
+        "name": "CHASKCDS-HSD1"
+      },
+      {
+        "id": "SLF78",
+        "name": "SDCTLFN1-SLF78"
+      },
+      {
+        "id": "SEE78",
+        "name": "SDCTEEE4-SEE78"
+      },
+      {
+        "id": "SAN13",
+        "name": "TOKYJPFA-SAN13"
+      },
+      {
+        "id": "SAA78",
+        "name": "SDCTAAA1-SAA78"
+      },
+      {
+        "id": "LUC1",
+        "name": "ATLDFGYC-LUC1"
+      },
+      {
+        "id": "AMD13",
+        "name": "MEMATLAN-AMD13"
+      },
+      {
+        "id": "TOR1",
+        "name": "TOROONXN-TOR1"
+      },
+      {
+        "id": "QWE1",
+        "name": "QWECLLI1-QWE1"
+      },
+      {
+        "id": "ZOG1",
+        "name": "ZOGASTRO-ZOG1"
+      },
+      {
+        "id": "CAL33",
+        "name": "CALIFORN-CAL33"
+      },
+      {
+        "id": "SHH78",
+        "name": "SDIT1HHH-SHH78"
+      },
+      {
+        "id": "DSA1",
+        "name": "LKJHGFDS-DSA1"
+      },
+      {
+        "id": "CLG1",
+        "name": "CLGRABAD-CLG1"
+      },
+      {
+        "id": "BNA1",
+        "name": "BNARAGBK-BNA1"
+      },
+      {
+        "id": "ATL84",
+        "name": "CANTTCOC-ATL84"
+      },
+      {
+        "id": "APP1",
+        "name": "WBHGTYUI-APP1"
+      },
+      {
+        "id": "RJN1",
+        "name": "RJNRBZAW-RJN1"
+      },
+      {
+        "id": "EHH78",
+        "name": "SDCSHHH5-EHH78"
+      },
+      {
+        "id": "mac10",
+        "name": "PKGTESTF-mac10"
+      },
+      {
+        "id": "SXB78",
+        "name": "SDCTGXB1-SXB78"
+      },
+      {
+        "id": "SAX78",
+        "name": "SDCTAXG1-SAX78"
+      },
+      {
+        "id": "SYD1",
+        "name": "SYDNAUBV-SYD1"
+      },
+      {
+        "id": "TOK1",
+        "name": "TOKYJPFA-TOK1"
+      },
+      {
+        "id": "KGM2",
+        "name": "KGMTNC20-KGM2"
+      },
+      {
+        "id": "DCC1b",
+        "name": "POIUYTGH-DCC1b"
+      },
+      {
+        "id": "SKK78",
+        "name": "SDCTKKK1-SKK78"
+      },
+      {
+        "id": "SGG78",
+        "name": "SDCTGGG1-SGG78"
+      },
+      {
+        "id": "SJJ78",
+        "name": "SDCTJJJ1-SJJ78"
+      },
+      {
+        "id": "SBX78",
+        "name": "SDCTBXG1-SBX78"
+      },
+      {
+        "id": "LAG1",
+        "name": "LARGIZON-LAG1"
+      },
+      {
+        "id": "IAA1",
+        "name": "QAZXSWED-IAA1"
+      },
+      {
+        "id": "POI1",
+        "name": "PLMNJKIU-POI1"
+      },
+      {
+        "id": "LAG1a",
+        "name": "LARGIZON-LAG1a"
+      },
+      {
+        "id": "PBL1",
+        "name": "PBLAPBAI-PBL1"
+      },
+      {
+        "id": "LAG45",
+        "name": "LARGIZON-LAG1a"
+      },
+      {
+        "id": "MAR1",
+        "name": "MNBVCXZM-MAR1"
+      },
+      {
+        "id": "HST70",
+        "name": "HSTNTX70-HST70"
+      },
+      {
+        "id": "DCC1a",
+        "name": "POIUYTGH-DCC1a"
+      },
+      {
+        "id": "TOL1",
+        "name": "TOLDOH21-TOL1"
+      },
+      {
+        "id": "LON1",
+        "name": "LONEENCO-LON1"
+      },
+      {
+        "id": "SJU78",
+        "name": "SDIT1JUB-SJU78"
+      },
+      {
+        "id": "STN27",
+        "name": "HSTNTX01-STN27"
+      },
+      {
+        "id": "SSW56",
+        "name": "ss8126GT-SSW56"
+      },
+      {
+        "id": "SBB78",
+        "name": "SDIT1BBB-SBB78"
+      },
+      {
+        "id": "DCC3",
+        "name": "POIUYTGH-DCC3"
+      },
+      {
+        "id": "GNV1",
+        "name": "GNVLSCTL-GNV1"
+      },
+      {
+        "id": "WAS1",
+        "name": "WASHDCSW-WAS1"
+      },
+      {
+        "id": "TOY1",
+        "name": "TORYONNZ-TOY1"
+      },
+      {
+        "id": "STT1",
+        "name": "STTLWA02-STT1"
+      },
+      {
+        "id": "STG1",
+        "name": "STTGGE62-STG1"
+      },
+      {
+        "id": "SLL78",
+        "name": "SDCTLLL1-SLL78"
+      },
+      {
+        "id": "SBU78",
+        "name": "SDIT1BUB-SBU78"
+      },
+      {
+        "id": "ATL2",
+        "name": "ATLNGANW-ATL2"
+      },
+      {
+        "id": "BOT1",
+        "name": "BOTHWAKY-BOT1"
+      },
+      {
+        "id": "SNG1",
+        "name": "SNGPSIAU-SNG1"
+      },
+      {
+        "id": "NYC1",
+        "name": "NYCMNY54-NYC1"
+      },
+      {
+        "id": "LAG1b",
+        "name": "LARGIZON-LAG1b"
+      },
+      {
+        "id": "AMD15",
+        "name": "AMDFAA01-AMD15"
+      },
+      {
+        "id": "SNA1",
+        "name": "SNANTXCA-SNA1"
+      },
+      {
+        "id": "PLT1",
+        "name": "PLTNCA60-PLT1"
+      },
+      {
+        "id": "TLP1",
+        "name": "TLPNXM18-TLP1"
+      },
+      {
+        "id": "SDD81",
+        "name": "SAIT1DD6-SDD81"
+      },
+      {
+        "id": "DCC1",
+        "name": "POIUYTGH-DCC1"
+      },
+      {
+        "id": "DCC2",
+        "name": "POIUYTGH-DCC2"
+      },
+      {
+        "id": "OKC1",
+        "name": "OKCBOK55-OKC1"
+      },
+      {
+        "id": "PAR1",
+        "name": "PARSFRCG-PAR1"
+      },
+      {
+        "id": "TES36",
+        "name": "ABCEETES-TES36"
+      },
+      {
+        "id": "COM1",
+        "name": "PLMKOPIU-COM1"
+      },
+      {
+        "id": "ANI1",
+        "name": "ATLNGTRE-ANI1"
+      },
+      {
+        "id": "SDG78",
+        "name": "SDIT1BDG-SDG78"
+      },
+      {
+        "id": "mac20",
+        "name": "PKGTESTF-mac20"
+      },
+      {
+        "id": "DSF45",
+        "name": "DSFBG123-DSF45"
+      },
+      {
+        "id": "HST25",
+        "name": "HSTNTX01-HST25"
+      },
+      {
+        "id": "AMD18",
+        "name": "AUDIMA01-AMD18"
+      },
+      {
+        "id": "SAA80",
+        "name": "SAIT9AA3-SAA80"
+      },
+      {
+        "id": "SSA56",
+        "name": "SSIT2AA7-SSA56"
+      },
+      {
+        "id": "SDD82",
+        "name": "SAIT1DD9-SDD82"
+      },
+      {
+        "id": "JCV1",
+        "name": "JCVLFLBW-JCV1"
+      },
+      {
+        "id": "SUL2",
+        "name": "WERTYUJK-SUL2"
+      },
+      {
+        "id": "PUR1",
+        "name": "purelyde-PUR1"
+      },
+      {
+        "id": "FDE55",
+        "name": "FDERT555-FDE55"
+      },
+      {
+        "id": "SITE",
+        "name": "LONEENCO-SITE"
+      },
+      {
+        "id": "ATL1",
+        "name": "ATLNGAMA-ATL1"
+      },
+      {
+        "id": "JUL1",
+        "name": "ZXCVBNMM-JUL1"
+      },
+      {
+        "id": "TAT34",
+        "name": "TESAAISB-TAT34"
+      },
+      {
+        "id": "XCP12",
+        "name": "CHKGH123-XCP12"
+      },
+      {
+        "id": "RAI1",
+        "name": "poiuytre-RAI1"
+      },
+      {
+        "id": "HPO1",
+        "name": "ATLNGAUP-HPO1"
+      },
+      {
+        "id": "KJF12",
+        "name": "KJFDH123-KJF12"
+      },
+      {
+        "id": "SCC80",
+        "name": "SAIT9CC3-SCC80"
+      },
+      {
+        "id": "SAA12",
+        "name": "SAIT9AF8-SAA12"
+      },
+      {
+        "id": "SAA14",
+        "name": "SAIT1AA9-SAA14"
+      },
+      {
+        "id": "ATL35",
+        "name": "TTESSAAI-ATL35"
+      },
+      {
+        "id": "CWY1",
+        "name": "CWYMOWBS-CWY1"
+      },
+      {
+        "id": "ATL76",
+        "name": "TELEPAAI-ATL76"
+      },
+      {
+        "id": "DSL12",
+        "name": "DSLFK242-DSL12"
+      },
+      {
+        "id": "ATL53",
+        "name": "AAIATLTE-ATL53"
+      },
+      {
+        "id": "SAA11",
+        "name": "SAIT9AA2-SAA11"
+      },
+      {
+        "id": "ATL62",
+        "name": "TESSASCH-ATL62"
+      },
+      {
+        "id": "AUG1",
+        "name": "ASDFGHJK-AUG1"
+      },
+      {
+        "id": "POI22",
+        "name": "POIUY123-POI22"
+      },
+      {
+        "id": "SAA13",
+        "name": "SAIT1AA9-SAA13"
+      },
+      {
+        "id": "BHY17",
+        "name": "BHYTFRF3-BHY17"
+      },
+      {
+        "id": "LIS1",
+        "name": "HOSTPROF-LIS1"
+      },
+      {
+        "id": "SIP1",
+        "name": "ZXCVBNMK-SIP1"
+      },
+      {
+        "id": "ATL99",
+        "name": "TEESTAAI-ATL43"
+      },
+      {
+        "id": "ATL64",
+        "name": "FORLOAAJ-ATL64"
+      },
+      {
+        "id": "TAT33",
+        "name": "TESAAISA-TAT33"
+      },
+      {
+        "id": "RAD10",
+        "name": "INDIPUNE-RAD10"
+      },
+      {
+        "id": "RTW5",
+        "name": "BHYTFRY4-RTW5"
+      },
+      {
+        "id": "JGS1",
+        "name": "KSJKKKKK-JGS1"
+      },
+      {
+        "id": "ATL98",
+        "name": "TEESTAAI-ATL43"
+      },
+      {
+        "id": "WAN1",
+        "name": "LEIWANGW-WAN1"
+      },
+      {
+        "id": "ATL44",
+        "name": "ATLSANAB-ATL44"
+      },
+      {
+        "id": "RTD2",
+        "name": "BHYTFRk4-RTD2"
+      },
+      {
+        "id": "NIR1",
+        "name": "ORFLMANA-NIR1"
+      },
+      {
+        "id": "ATL75",
+        "name": "SANAAIRE-ATL75"
+      },
+      {
+        "id": "NUM1",
+        "name": "QWERTYUI-NUM1"
+      },
+      {
+        "id": "hvf32",
+        "name": "MDTWNJ21-hvf32"
+      },
+      {
+        "id": "RTZ4",
+        "name": "BHYTFRZ6-RTZ4"
+      },
+      {
+        "id": "ATL56",
+        "name": "ATLSANAC-ATL56"
+      },
+      {
+        "id": "AMS1",
+        "name": "AMSTNLBW-AMS1"
+      },
+      {
+        "id": "RCT1",
+        "name": "AMSTERNL-RCT1"
+      },
+      {
+        "id": "JAN1",
+        "name": "ORFLMATT-JAN1"
+      },
+      {
+        "id": "ABC14",
+        "name": "TESAAISA-ABC14"
+      },
+      {
+        "id": "TAT37",
+        "name": "TESAAISD-TAT37"
+      },
+      {
+        "id": "MIC54",
+        "name": "MICHIGAN-MIC54"
+      },
+      {
+        "id": "ABC11",
+        "name": "ATLSANAI-ABC11"
+      },
+      {
+        "id": "AMF11",
+        "name": "AMDOCS01-AMF11"
+      },
+      {
+        "id": "ATL63",
+        "name": "ATLSANEW-ATL63"
+      },
+      {
+        "id": "ABC12",
+        "name": "ATLSECIA-ABC12"
+      },
+      {
+        "id": "hvf20",
+        "name": "MDTWNJ21-hvf20"
+      },
+      {
+        "id": "ABC15",
+        "name": "AAITESAN-ABC15"
+      },
+      {
         "id": "AVT1",
         "name": "AVTRFLHD-AVT1"
       },
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/zones.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/zones.json
index de18d8b36..3942d82f1 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/zones.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/zones.json
@@ -701,8 +701,8 @@
       "zone-name": "QWERTYUI-NUM1"
     },
     {
-      "zone-id": "MTN32",
-      "zone-name": "MDTWNJ21-MTN32"
+      "zone-id": "hvf32",
+      "zone-name": "MDTWNJ21-hvf32"
     },
     {
       "zone-id": "RTZ4",
@@ -753,8 +753,8 @@
       "zone-name": "ATLSECIA-ABC12"
     },
     {
-      "zone-id": "MTN20",
-      "zone-name": "MDTWNJ21-MTN20"
+      "zone-id": "hvf20",
+      "zone-name": "MDTWNJ21-hvf20"
     },
     {
       "zone-id": "ABC15",
diff --git a/vid-webpack-master/cypress/support/steps/drawingBoard/drawingBoardComponentInfo.steps.ts b/vid-webpack-master/cypress/support/steps/drawingBoard/drawingBoardComponentInfo.steps.ts
index 2033f060c..26682775f 100644
--- a/vid-webpack-master/cypress/support/steps/drawingBoard/drawingBoardComponentInfo.steps.ts
+++ b/vid-webpack-master/cypress/support/steps/drawingBoard/drawingBoardComponentInfo.steps.ts
@@ -8,6 +8,7 @@ declare namespace Cypress {
 
 function assertComponentInfoTitleLabelsAndValues(expectedTitle: string, labelsAndValues: string[][]) : void{
   cy.getElementByDataTestsId('component-info-section-title').should('have.text', expectedTitle);
+  cy.get('.componentInfoItem').should('have.length', labelsAndValues.length);
   labelsAndValues.forEach((tuple: string[], index: number, array: string[][]) => {
     let label = tuple[0];
     let value = tuple[1];
diff --git a/vid-webpack-master/cypress/support/steps/drawingBoard/drawingBoardHeader.steps.ts b/vid-webpack-master/cypress/support/steps/drawingBoard/drawingBoardHeader.steps.ts
new file mode 100644
index 000000000..7881eb1e4
--- /dev/null
+++ b/vid-webpack-master/cypress/support/steps/drawingBoard/drawingBoardHeader.steps.ts
@@ -0,0 +1,33 @@
+declare namespace Cypress {
+  interface Chainable {
+    serviceActionDelete: typeof serviceActionDelete
+    serviceActionUndoDelete: typeof serviceActionUndoDelete
+    serviceActionResume: typeof serviceActionResume
+    serviceActionUndoResume: typeof serviceActionResume
+  }
+}
+
+function serviceActionDelete() : void  {
+  cy.getElementByDataTestsId('openMenuBtn').click();
+  cy.getElementByDataTestsId('context-menu-header-delete-item').click();
+  cy.getElementByDataTestsId('openMenuBtn').click();
+  cy.getElementByDataTestsId('context-menu-header-delete-item').should("have.text", "Undo delete");
+}
+
+function serviceActionUndoDelete() : void  {
+  cy.getElementByDataTestsId('openMenuBtn').click();
+  cy.getElementByDataTestsId('context-menu-header-delete-item').click();
+  cy.getElementByDataTestsId('openMenuBtn').click();
+  cy.getElementByDataTestsId('context-menu-header-delete-item').should("have.text", "Delete");
+}
+
+function serviceActionResume() : void {
+  cy.getElementByDataTestsId('openMenuBtn').click();
+  cy.getElementByDataTestsId('context-menu-header-resume-item').click();
+}
+
+
+Cypress.Commands.add('serviceActionUndoDelete', serviceActionUndoDelete);
+Cypress.Commands.add('serviceActionDelete', serviceActionDelete);
+Cypress.Commands.add('serviceActionResume', serviceActionResume);
+Cypress.Commands.add('serviceActionUndoResume', serviceActionResume);
diff --git a/vid-webpack-master/cypress/support/steps/drawingBoard/drawingBoardModel.steps.ts b/vid-webpack-master/cypress/support/steps/drawingBoard/drawingBoardModel.steps.ts
index b2b48b268..7854899f8 100644
--- a/vid-webpack-master/cypress/support/steps/drawingBoard/drawingBoardModel.steps.ts
+++ b/vid-webpack-master/cypress/support/steps/drawingBoard/drawingBoardModel.steps.ts
@@ -2,6 +2,7 @@ declare namespace Cypress {
   interface Chainable {
     drawingBoardPressAddButtonByElementName: typeof drawingBoardPressAddButtonByElementName,
     drawingBoardNumberOfExistingElementsShouldContains: typeof drawingBoardNumberOfExistingElementsShouldContains
+    getDrawingBoardDeployBtn: typeof getDrawingBoardDeployBtn
   }
 }
 
@@ -13,5 +14,10 @@ function drawingBoardNumberOfExistingElementsShouldContains(expectedElements : n
   cy.getElementByDataTestsId('numberButton').contains(expectedElements);
 }
 
+function getDrawingBoardDeployBtn() : Chainable<any> {
+  return cy.getElementByDataTestsId('deployBtn');
+}
+
 Cypress.Commands.add('drawingBoardPressAddButtonByElementName', drawingBoardPressAddButtonByElementName);
 Cypress.Commands.add('drawingBoardNumberOfExistingElementsShouldContains', drawingBoardNumberOfExistingElementsShouldContains);
+Cypress.Commands.add('getDrawingBoardDeployBtn', getDrawingBoardDeployBtn);
diff --git a/vid-webpack-master/cypress/support/steps/drawingBoard/drawingBoardTree.steps.ts b/vid-webpack-master/cypress/support/steps/drawingBoard/drawingBoardTree.steps.ts
index 0150b44aa..a940ae15e 100644
--- a/vid-webpack-master/cypress/support/steps/drawingBoard/drawingBoardTree.steps.ts
+++ b/vid-webpack-master/cypress/support/steps/drawingBoard/drawingBoardTree.steps.ts
@@ -1,7 +1,13 @@
 declare namespace Cypress {
   interface Chainable {
     drawingBoardTreeOpenContextMenuByElementDataTestId: typeof drawingBoardTreeOpenContextMenuByElementDataTestId,
-    drawingBoardTreeClickOnContextMenuOptionByName: typeof drawingBoardTreeClickOnContextMenuOptionByName
+    drawingBoardTreeClickOnContextMenuOptionByName: typeof drawingBoardTreeClickOnContextMenuOptionByName,
+    nodeWithLineThrough: typeof nodeWithLineThrough,
+    nodeWithoutLineThrough: typeof nodeWithoutLineThrough,
+    IsDeleteTagShownOnNode: typeof IsDeleteTagShownOnNode,
+    IsDeleteTagNotShownOnNode: typeof IsDeleteTagNotShownOnNode,
+    isNodeDeleted: typeof isNodeDeleted,
+    isNodeNotDeleted: typeof isNodeNotDeleted
   }
 }
 
@@ -17,11 +23,51 @@ function drawingBoardTreeClickOnContextMenuOptionByName(optionName : string) : C
       return cy.getElementByDataTestsId('context-menu-remove').click({force : true});
     case 'Edit':
       return cy.getElementByDataTestsId('context-menu-edit').click({force : true});
+    case 'Delete':
+      return cy.getElementByDataTestsId('context-menu-delete').trigger('mouseover').click();
     default:
       return cy.getElementByDataTestsId('context-menu-duplicate').click({force : true});
   }
 }
 
+function isNodeDeleted(index: number)
+{
+  cy.get('.tree-node').eq(1).find('[data-tests-id="node-name"]').eq(index).should('have.css', 'text-decoration').and('contain', 'line-through');
+  cy.getElementByDataTestsId('delete-status-type').eq(index).should("contain.text", "Delete").should("contain.css", "opacity", "1");
+}
+
+function isNodeNotDeleted(index: number)
+{
+  cy.get('.tree-node').eq(1).find('[data-tests-id="node-name"]').eq(index).should('have.css', 'text-decoration').and('not.contain', 'line-through');
+  cy.getElementByDataTestsId('delete-status-type').eq(index).should("contain.text", "Delete").should("contain.css", "opacity", "0");
+}
+function nodeWithLineThrough(index: number)
+{
+  cy.getElementByDataTestsId('node-name').eq(index).should('have.css', 'text-decoration').and('contain', 'line-through')
+}
+
+function nodeWithoutLineThrough(index: number)
+{
+  cy.getElementByDataTestsId('node-name').eq(index).should('have.css', 'text-decoration').and('not.contain', 'line-through')
+}
+
+
+function IsDeleteTagShownOnNode(index: number)
+{
+  cy.getElementByDataTestsId('delete-status-type').eq(index).should("contain.text", "Delete").should("contain.css", "opacity", "1");
+}
+
+function IsDeleteTagNotShownOnNode(index: number)
+{
+  cy.getElementByDataTestsId('delete-status-type').eq(index).should("contain.text", "Delete").should("contain.css", "opacity", "0");
+}
 
 Cypress.Commands.add('drawingBoardTreeOpenContextMenuByElementDataTestId', drawingBoardTreeOpenContextMenuByElementDataTestId);
 Cypress.Commands.add('drawingBoardTreeClickOnContextMenuOptionByName', drawingBoardTreeClickOnContextMenuOptionByName);
+Cypress.Commands.add('nodeWithLineThrough', nodeWithLineThrough);
+Cypress.Commands.add('nodeWithoutLineThrough', nodeWithoutLineThrough);
+Cypress.Commands.add('IsDeleteTagShownOnNode', IsDeleteTagShownOnNode);
+Cypress.Commands.add('IsDeleteTagNotShownOnNode', IsDeleteTagNotShownOnNode);
+
+Cypress.Commands.add('isNodeDeleted', isNodeDeleted);
+Cypress.Commands.add('isNodeNotDeleted', isNodeNotDeleted);