Merge from ecomp 718fd196 - Modern UI

Issue-ID: VID-378

Change-Id: I2736b98426e324ec3aa233b034229ba84d99839f
Signed-off-by: Ittay Stern <ittay.stern@att.com>

1 files changed, 953 insertions, 77 deletions

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"
             },