Adding feature: Replace vfmodule

Issue-ID: VID-603
Change-Id: I59068a0979d6fb733e4243c8f78921f396dc9d17
Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>
Signed-off-by: Amichai Hemli <amichai.hemli@intl.att.com>
Signed-off-by: Ittay Stern <ittay.stern@att.com>

43 files changed, 922 insertions, 6912 deletions

diff --git a/vid-webpack-master/src/app/drawingBoard/drawingBoard.module.ts b/vid-webpack-master/src/app/drawingBoard/drawingBoard.module.ts
index 67b54059e..25d170320 100644
--- a/vid-webpack-master/src/app/drawingBoard/drawingBoard.module.ts
+++ b/vid-webpack-master/src/app/drawingBoard/drawingBoard.module.ts
@@ -40,7 +40,7 @@ import {VpnStepService} from "./service-planning/objectsToTree/models/vrf/vrfMod
 
 @NgModule({
   imports: [
-    TreeModule,
+    TreeModule.forRoot(),
     BrowserModule,
     ContextMenuModule,
     FormsModule,
diff --git a/vid-webpack-master/src/app/drawingBoard/guards/servicePlanningGuard/drawingBoardGuard.ts b/vid-webpack-master/src/app/drawingBoard/guards/servicePlanningGuard/drawingBoardGuard.ts
index 4a305b193..d486fb4fa 100644
--- a/vid-webpack-master/src/app/drawingBoard/guards/servicePlanningGuard/drawingBoardGuard.ts
+++ b/vid-webpack-master/src/app/drawingBoard/guards/servicePlanningGuard/drawingBoardGuard.ts
@@ -1,18 +1,17 @@
 import {Injectable} from "@angular/core";
-import {CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, Router} from "@angular/router";
+import {ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot} from "@angular/router";
 import {NgRedux} from "@angular-redux/store";
-import {Observable} from "rxjs";
+import {Observable, of} from "rxjs";
 import {HttpClient} from "@angular/common/http";
 import {AppState} from "../../../shared/store/reducers";
 import {updateDrawingBoardStatus} from "../../../shared/storeUtil/utils/global/global.actions";
 import {DrawingBoardModes} from "../../service-planning/drawing-board.modes";
-import {of} from "rxjs";
 
 @Injectable()
 export class DrawingBoardGuard implements CanActivate {
   constructor(private store: NgRedux<AppState>, private _http: HttpClient, private _router : Router) { }
   canActivate(next: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
-      let url : string = `/vid/roles/service_permissions?subscriberId=${next.queryParams['subscriberId']}&serviceType=${next.queryParams['serviceType']}`;
+      let url : string = `../../roles/service_permissions?subscriberId=${next.queryParams['subscriberId']}&serviceType=${next.queryParams['serviceType']}`;
       const viewMode = state.url.includes(DrawingBoardModes.RETRY_EDIT)? DrawingBoardModes.RETRY: DrawingBoardModes.VIEW;
       return this._http.get(url)
         .map((result : DrawingBoardPermissions) => {
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.component.html b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.component.html
index 46807607d..7a18bce89 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.component.html
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.component.html
@@ -7,7 +7,7 @@
         [testId]="'backBtn'"
         [size]="'large'"
         [name]="'navigation-arrow-back'">
-              </svg-icon>
+      </svg-icon>
     </span>
 
     <div class="header-col middleDetails" style="padding-top: 7px;padding-left: 13px;line-height: 100%;" *ngIf="isServiceFailed">
@@ -38,10 +38,13 @@
     <span [attr.data-tests-id]="'isViewOnly-status-test'" class="service-instance-label purple">{{getModeName()}}</span>
   </div>
 
-
   <div class="right-header">
-    <span class="action-status-type-header delete" [attr.data-tests-id]="'delete-status-type-header'" *ngIf="isDeleted === true">Delete</span>
-    <span class="action-status-type-header resume" [attr.data-tests-id]="'resume-status-type-header'" *ngIf="isResume === true">Resume</span>
+    <span
+      *ngIf = "isUpgrade || isDeleted || isResume"
+      [ngClass] = "isDeleted===true ? 'action-status-type-header delete' : 'action-status-type-header resume'"
+      [attr.data-tests-id]="determineDataTestId()">
+      {{getAction()}}
+    </span>
     <span class="menu-container notShowOnViewMode notShowOnRetryMode">
       <span [attr.data-tests-id]="'openMenuBtn'" class="icon-browse" (click)="onContextMenu($event)"></span>
       <context-menu>
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.component.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.component.ts
index 51f90534b..7923313bf 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.component.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.component.ts
@@ -39,12 +39,16 @@ export class DrawingBoardHeader {
   mode : DrawingBoardModes = DrawingBoardModes.CREATE;
   serviceOrchStatus: string;
   isDeleted: boolean = false;
+  isUpgrade: boolean = false;
   isResume: boolean = false;
   store : NgRedux<AppState>;
   drawingBoardPermissions : DrawingBoardPermissions;
   drawingBoardHeaderService : DrawingBoardHeaderService;
   isServiceFailed: boolean;
   serviceStatusMessage: string;
+  private readonly action: string;
+  private presentedAction: string;
+
   constructor(private _contextMenuService: ContextMenuService, private dialogService: DialogService,
               private _iframeService : IframeService,
               private route: ActivatedRoute, private msoService: MsoService,
@@ -68,6 +72,11 @@ export class DrawingBoardHeader {
           });
         }
       });
+    if (!_.isNil(this.store.getState().service.serviceInstance[this.serviceModelId].action)){
+      if (this.store.getState().service.serviceInstance[this.serviceModelId].action.includes("Upgrade")) {
+        this.isUpgrade = true;
+      }
+    }
   }
 
 
@@ -114,6 +123,7 @@ export class DrawingBoardHeader {
       this.serviceOrchStatus =  serviceInstance.orchStatus || "";
       this.isServiceFailed = serviceInstance.isFailed;
       this.serviceStatusMessage = serviceInstance.statusMessage;
+      this.isUpgrade = serviceInstance.isUpgraded;
     }
   }
 
@@ -131,12 +141,25 @@ export class DrawingBoardHeader {
     });
   }
 
+
+
   onDeleteUndoDeleteClick(){
     this.cancelResume(this.serviceModelId);
     this.isDeleted = !this.isDeleted;
     this._drawingBoardHeaderService.deleteService(this.serviceModelId, this.isDeleted)
   }
 
+  determineDataTestId() :string {
+    switch(true) {
+      case this.isResume:
+        return'resume-status-type-header';
+      case this.isDeleted:
+        return 'delete-status-type-header';
+      case this.isUpgrade:
+        return 'upgrade-status-type-header';
+    }
+  }
+
   onResumeUndoResumeClick(){
     this.cancelDelete(this.serviceModelId);
     this.isResume = !this.isResume;
@@ -174,9 +197,14 @@ export class DrawingBoardHeader {
       instanceFields.subscriberName = this.store.getState().service.subscribers.find(sub => sub.id === instanceFields.globalSubscriberId).name;
       instanceFields.owningEntityName = this.extractOwningEntityNameAccordingtoId(instanceFields.owningEntityId);
     }
-    return _.omit(instanceFields,'optionalGroupMembersMap');
+    return _.omit(instanceFields,['optionalGroupMembersMap', 'upgradedVFMSonsCounter', 'isUpgraded', 'latestAvailableVersion']);
   }
 
+  private getAction(): string {
+    if(!_.isNil(this.store.getState().service.serviceInstance[this.serviceModelId].action))
+      return this.store.getState().service.serviceInstance[this.serviceModelId].action.split('_').pop();
+    return;
+  }
 
   public deployService(): void {
       let instanceFields = this.extractServiceFields();
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.service.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.service.ts
index 7df2f3a3f..1b71d9098 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.service.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.service.ts
@@ -36,6 +36,15 @@ export class DrawingBoardHeaderService{
     }
   }
 
+  upgradeService(serviceModelId: string, isUpgraded: boolean ) {
+    if(isUpgraded){
+      this.store.dispatch(addServiceAction(serviceModelId, ServiceInstanceActions.Upgrade));
+    }
+    else{
+      this.store.dispatch(addServiceAction(serviceModelId, ServiceInstanceActions.None));
+    }
+  }
+
   showAuditInfo(serviceModelId) : void {
     let instance: ServiceInstance = this.store.getState().service.serviceInstance[serviceModelId];
     let model =  new ServiceModel(this.store.getState().service.serviceHierarchy[serviceModelId]);
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.component.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.component.ts
index 6be5036b2..0e2d8e276 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.component.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.component.ts
@@ -28,6 +28,7 @@ import {ComponentInfoService} from "../component-info/component-info.service";
 import {ComponentInfoModel} from "../component-info/component-info-model";
 import {ObjectToModelTreeService} from "../objectsToTree/objectToModelTree/objectToModelTree.service";
 import {DrawingBoardModes} from "../drawing-board.modes";
+import {ServiceInstanceActions} from "../../../shared/models/serviceInstanceActions";
 
 @Component({
   selector: 'drawing-board-tree',
@@ -203,6 +204,24 @@ export class DrawingBoardTreeComponent implements OnInit, AfterViewInit {
     return false;
   }
 
+
+
+  isUpgraded(node: ITreeNode): boolean {
+    return this.isLabeledAsAction(node, "Upgrade");
+  }
+
+  isDeleted(node: ITreeNode): boolean {
+    return this.isLabeledAsAction(node, "Delete");
+  }
+
+  private isLabeledAsAction(node: ITreeNode, action) {
+    let nodeAction = node.data.action.split('_').pop();
+    if (!_.isNil(nodeAction)) {
+      return nodeAction === action;
+    }
+    return false;
+  }
+
   public selectNode(node: ITreeNode): void {
     node.expand();
     this._sharedTreeService.setSelectedVNF(node);
@@ -220,6 +239,13 @@ export class DrawingBoardTreeComponent implements OnInit, AfterViewInit {
     this.tree.treeModel.getNodeById(id).parent.expand();
   }
 
+  getcontextMenuOptionLabel(contextMenuOption: TreeNodeContextMenuModel): string{
+    let optionLabel = contextMenuOption.label;
+    if(contextMenuOption.label === ServiceInstanceActions.Upgrade) {
+      return optionLabel.concat(" to V" + this._store.getState().service.serviceInstance[this.serviceModelId].latestAvailableVersion);
+    }
+    return optionLabel;
+  }
 }
 
 
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.html b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.html
index e1d88a696..8db53e808 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.html
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.html
@@ -78,12 +78,12 @@
               <div [attr.data-tests-id]="contextMenuOption.dataTestId">
                 <div style="float: left;margin-top: 3px;">
                   <svg-icon
-                    [ngClass]="contextMenuOption.iconClass"
                     class="icon-edit"
+                    [ngClass]="contextMenuOption.iconClass"
                     [size]="'small'"
                     [name]="contextMenuOption.iconClass">
                 </svg-icon></div>
-                <div style="padding-left: 25px;">{{contextMenuOption.label}}</div>
+                <div style="padding-left: 25px;">{{getcontextMenuOptionLabel(contextMenuOption)}}</div>
               </div>
             </ng-template>
           </context-menu>
@@ -100,16 +100,17 @@
                 [size]="'medium'"
                 [name]="'alert-triangle-o'">
               </svg-icon>
-            </span>
+          </span>
           <span *ngIf="drawingBoardTreeService.isVFModuleMissingData(node, serviceModelId)" class="icon-alert"
                 tooltip="{{ missingDataTooltip }}" tooltipPlacement="left"
                 [attr.data-tests-id]="'node-'+node.data.modelId +'-' +node.data.modelName+'-alert-icon'"></span>
         </div>
 
         <div class="action-status">
-          <span class="action-status-type delete" [attr.data-tests-id]="'delete-status-type'" [ngStyle]="{ 'opacity': node.data.action.split('_').pop() !== 'Delete' ? '0' : '1'}">Delete</span>
+          <span
+            [ngClass]="isUpgraded(node)?'action-status-type upgrade':'action-status-type delete'"
+            [attr.data-tests-id]="isUpgraded(node)?'action-status-type':'delete-status-type'" [ngStyle]="{ 'opacity': isUpgraded(node) || isDeleted(node) ? '1' : '0'}">{{isUpgraded(node)?"Upgrade":"Delete"}}</span>
         </div>
-
       </div>
     </ng-template>
   </tree-root>
@@ -117,3 +118,4 @@
 
 
 
+
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.scss b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.scss
index e08e69e2e..b774e03b6 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.scss
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.scss
@@ -341,15 +341,21 @@ drawing-board-tree {
                   line-height: 42px;
                   width: 95px;
                   min-width: 95px;
-                  .action-status-type.delete {
+                  .action-status-type {
                     background: transparent;
                     font-family: OpenSans-SemiBold;
                     font-size: 12px;
-                    color: red;
                     border-radius: 50px;
                     border: 1px solid gray;
-                    padding: 5px 20px;
+                    padding: 5px 17px;
+                    &.delete {
+                      color: red;
+                    }
+                    &.upgrade{
+                      color: #009FDB;
+                    }
                   }
+
                 }
 
                 .model-info.rightBorder {
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.service.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.service.spec.ts
index b804342c6..e5979f7ed 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.service.spec.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.service.spec.ts
@@ -1,8 +1,5 @@
-import {TestBed, getTestBed} from '@angular/core/testing';
-import {
-  HttpClientTestingModule,
-  HttpTestingController
-} from '@angular/common/http/testing';
+import {getTestBed, TestBed} from '@angular/core/testing';
+import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing';
 import {NgRedux} from "@angular-redux/store";
 import {DrawingBoardTreeService, TreeNodeContextMenuModel} from "./drawing-board-tree.service";
 import {ITreeNode} from "angular-tree-component/dist/defs/api";
@@ -74,10 +71,12 @@ describe('Drawing board tree Service', () => {
       new TreeNodeContextMenuModel('addGroupMember', 'context-menu-addGroupMember', 'Add group members', 'plus'),
       new TreeNodeContextMenuModel('delete', 'context-menu-delete', 'Delete', 'trash-o'),
       new TreeNodeContextMenuModel('remove', 'context-menu-remove', 'Remove', 'trash-o'),
+      new TreeNodeContextMenuModel('upgrade', 'context-menu-upgrade', 'Upgrade', 'upgrade'),
       new TreeNodeContextMenuModel('undoDelete', 'context-menu-undoDelete', 'Undo Delete', 'undo-delete'),
+      new TreeNodeContextMenuModel('undoUpgrade', 'context-menu-undoUpgrade', 'Undo Upgrade', 'undo-delete'),
       new TreeNodeContextMenuModel('changeAssociations', 'context-menu-changeAssociations', 'Change Associations', 'edit-file-o')
     ];
-    expect(options.length).toEqual(8);
+    expect(options.length).toEqual(10);
     expect(options).toEqual(expected);
   });
 
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.service.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.service.ts
index acf622463..28b6e51b1 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.service.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.service.ts
@@ -42,7 +42,9 @@ export class  DrawingBoardTreeService {
       new TreeNodeContextMenuModel('addGroupMember', 'context-menu-addGroupMember', 'Add group members', 'plus'),
       new TreeNodeContextMenuModel('delete', 'context-menu-delete', 'Delete', 'trash-o'),
       new TreeNodeContextMenuModel('remove', 'context-menu-remove', 'Remove', 'trash-o'),
+      new TreeNodeContextMenuModel('upgrade', 'context-menu-upgrade', 'Upgrade', 'upgrade'),
       new TreeNodeContextMenuModel('undoDelete', 'context-menu-undoDelete', 'Undo Delete', 'undo-delete'),
+      new TreeNodeContextMenuModel('undoUpgrade', 'context-menu-undoUpgrade', 'Undo Upgrade', 'undo-delete'),
       new TreeNodeContextMenuModel('changeAssociations', 'context-menu-changeAssociations', 'Change Associations', 'edit-file-o')
     ];
   }
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.ts
index bfe1d0082..47a6dcb50 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.ts
@@ -23,10 +23,12 @@ import {
   deleteActionVfModuleInstance,
   removeVfModuleInstance,
   undoDeleteVfModuleInstance,
-  updateVFModulePosition
+  undoUgradeVFModule,
+  updateVFModulePosition,
+  upgradeVFModule
 } from "../../../../../shared/storeUtil/utils/vfModule/vfModule.actions";
 import {ComponentInfoService} from "../../../component-info/component-info.service";
-import {ComponentInfoModel, ComponentInfoType} from "../../../component-info/component-info-model";
+import {ComponentInfoType} from "../../../component-info/component-info-model";
 import {ModelInformationItem} from "../../../../../shared/components/model-information/model-information.component";
 
 export class VFModuleModelInfo implements ILevelNodeInfo {
@@ -353,10 +355,32 @@ export class VFModuleModelInfo implements ILevelNodeInfo {
         },
         visible: (node) => this._sharedTreeService.shouldShowUndoDelete(node),
         enable: (node, serviceModelId) => this._sharedTreeService.shouldShowUndoDelete(node) && this._sharedTreeService.shouldShowDelete(node.parent) && !this._sharedTreeService.isServiceOnDeleteMode(serviceModelId)
-      }
+      },
+      upgrade : {
+        method : (node, serviceModelId) => {
+          this._sharedTreeService.upgradeBottomUp(node, serviceModelId);
+          this._store.dispatch(upgradeVFModule(node.data.modelName,  node.parent.data.vnfStoreKey, serviceModelId, node.data.dynamicModelName));
+        },
+        visible: (node,serviceModelId) => {
+          return this._sharedTreeService.shouldShowUpgrade(node, serviceModelId);
+        },
+        enable:  (node, serviceModelId) => {
+          return this._sharedTreeService.shouldShowUpgrade(node, serviceModelId);
+        }
+      },
+      undoUpgrade: {
+        method: (node, serviceModelId) => {
+          this._sharedTreeService.undoUpgradeBottomUp(node, serviceModelId);
+          this._store.dispatch(undoUgradeVFModule(node.data.modelName,  node.parent.data.vnfStoreKey, serviceModelId, node.data.dynamicModelName));
+        },
+        visible: (node) => {
+          return this._sharedTreeService.shouldShowUndoUpgrade(node);
+        },
+        enable: (node) => {
+          return this._sharedTreeService.shouldShowUndoUpgrade(node);
+        }
+      },
     };
-
-
   }
 
   updatePosition(that , node, instanceId, parentStoreKey): void {
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vnf/vnf.model.info.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vnf/vnf.model.info.ts
index 2bdeda083..ebcba162e 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vnf/vnf.model.info.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vnf/vnf.model.info.ts
@@ -29,7 +29,9 @@ import {ServiceInstanceActions} from "../../../../../shared/models/serviceInstan
 import {
   deleteActionVnfInstance,
   undoDeleteActionVnfInstance,
-  updateVnfPosition
+  undoUpgradeVnf,
+  updateVnfPosition,
+  upgradeVnf
 } from "../../../../../shared/storeUtil/utils/vnf/vnf.actions";
 import * as _ from 'lodash';
 import {IModalConfig} from "onap-ui-angular/dist/modals/models/modal-config";
@@ -278,7 +280,21 @@ export class VnfModelInfo implements ILevelNodeInfo {
         },
         visible: (node) => this._sharedTreeService.shouldShowUndoDelete(node),
         enable: (node, serviceModelId) => this._sharedTreeService.shouldShowUndoDelete(node) && !this._sharedTreeService.isServiceOnDeleteMode(serviceModelId)
-      }
+      },
+      upgrade: {
+        method: (node, serviceModelId) => {
+          this._store.dispatch(upgradeVnf(node.data.vnfStoreKey, serviceModelId));
+        },
+        visible: () => false,
+        enable: () => false
+      },
+      undoUpgrade: {
+        method: (node, serviceModelId) => {
+          this._store.dispatch(undoUpgradeVnf(node.data.vnfStoreKey, serviceModelId));
+        },
+        visible: () => false,
+        enable: () => false
+      },
     }
   }
 
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vrf/vrfModal/networkStep/network.step.service.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vrf/vrfModal/networkStep/network.step.service.ts
index 9cd928e8f..f303434a8 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vrf/vrfModal/networkStep/network.step.service.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vrf/vrfModal/networkStep/network.step.service.ts
@@ -8,7 +8,9 @@ import {
 } from "../../../../../../../shared/storeUtil/utils/global/global.actions";
 import {ElementsTableService} from "../../../../../../../shared/components/searchMembersModal/members-table/elements-table.service";
 import {
-  ICriteria, ISearchField, ITableContent,
+  ICriteria,
+  ISearchField,
+  ITableContent,
   ModalInformation
 } from "../../../../../../../shared/components/searchMembersModal/members-table/element-table-row.model";
 import {Observable, of} from "rxjs";
@@ -76,7 +78,7 @@ export class NetworkStepService {
 
   getNetworks = (serviceInstance): Observable<any[]> => {
     let cloudRegion = serviceInstance.lcpCloudRegionId;
-    let tenantId = serviceInstance.tenantName;
+    let tenantId = serviceInstance.tenantId;
     return this._aaiService.retrieveActiveNetwork(cloudRegion, tenantId).map((networks: NetworkModalRow[]) => {
       this.generateRolesOptions(networks);
       return this.sortElementsResultByField(networks, this.uniqObjectField);
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts
index cad23ffd9..89e20a2d6 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts
@@ -50,13 +50,27 @@ class MockAppStore<T> {
   }
 }
 
-class MockVnfModelInfo<T> {
-  getModel() {
-    return {}
+
+
+
+function getNodeWithData(menuAction:string){
+  const nodeData = {
+    menuActions: {}
+  };
+  nodeData['menuActions'][menuAction] =  {
+    method: (node, serviceModelId) => {}
   }
+  const node = {
+    parent: {
+      data: nodeData,
+      parent: {
+        data: nodeData
+      }
+    }
+  };
+  return node
 }
 
-
 describe('Shared Tree Service', () => {
   let injector;
   let service: SharedTreeService;
@@ -110,6 +124,25 @@ describe('Shared Tree Service', () => {
     expect(service).toBeDefined();
   });
 
+  test('SharedTreeService upgradeBottomUp should call redux actions', () => {
+    const serviceModelId = "1a80c596-27e5-4ca9-b5bb-e03a7fd4c0fd";
+    const node = getNodeWithData("upgrade")
+    spyOn(node.parent.data.menuActions['upgrade'], 'method');
+    service.upgradeBottomUp(node, serviceModelId);
+    expect(node.parent.data.menuActions['upgrade'].method).toBeCalledWith(node.parent, serviceModelId);
+    expect(node.parent.data.menuActions['upgrade'].method).toBeCalledTimes(2);
+
+  });
+
+  test('SharedTreeService undoUpgradeBottomUp should call redux actions', () => {
+    const serviceModelId = "1a80c596-27e5-4ca9-b5bb-e03a7fd4c0fd";
+    const node = getNodeWithData("undoUpgrade")
+    spyOn(node.parent.data.menuActions['undoUpgrade'], 'method');
+    service.undoUpgradeBottomUp(node, serviceModelId);
+    expect(node.parent.data.menuActions['undoUpgrade'].method).toBeCalledWith(node.parent, serviceModelId);
+    expect(node.parent.data.menuActions['undoUpgrade'].method).toBeCalledTimes(2);
+  });
+
   test('shouldShowDeleteInstanceWithChildrenModal should open modal if child exist with action create', () => {
     jest.spyOn(MessageBoxService.openModal, 'next');
     let foo = () => {
@@ -128,7 +161,9 @@ describe('Shared Tree Service', () => {
   test('openAuditInfoModal should open modal for failed instance', () => {
     jest.spyOn(AuditInfoModalComponent.openInstanceAuditInfoModal, 'next');
 
-    let modelInfoServiceMock: ILevelNodeInfo = new VnfModelInfo(null, null, null, null, null, null, null, null, null, null,null);
+    let modelInfoServiceMock: ILevelNodeInfo = new VnfModelInfo(null, null,
+      null, null, null, null,
+      null, null, null, null,null);
     const modelMock = {"a": "a"};
     const instanceMock = {"instance": "instance", "trackById": "123456789"};
     const instanceTypeMock = "instanceTypeMock";
@@ -1331,128 +1366,8 @@ function getStore() {
             "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",
+            "id": "d0a3e3f2964542259d155a81c41aadc3",
+            "name": "test-hvf6-09",
             "isPermitted": true,
             "cloudOwner": "irma-aic"
           }, {
@@ -1461,16 +1376,6 @@ function getStore() {
             "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,
@@ -1567,199 +1472,28 @@ function getStore() {
           "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"
-      }],
+      "aicZones": [
+        {
+          "id": "NFT1",
+          "name": "NFTJSSSS-NFT1"
+        },
+        {
+          "id": "JAG1",
+          "name": "YUDFJULP-JAG1"
+        },
+        {
+          "id": "YYY1",
+          "name": "UUUAIAAI-YYY1"
+        },
+        {
+          "id": "AVT1",
+          "name": "AVTRFLHD-AVT1"
+        },
+        {
+          "id": "ATL34",
+          "name": "ATLSANAI-ATL34"
+        }
+      ],
       "categoryParameters": {
         "owningEntityList": [{
           "id": "aaa1",
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts
index 7df03fd0a..c56cc4999 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts
@@ -7,10 +7,12 @@ import {MessageBoxService} from "../../../shared/components/messageBox/messageBo
 import * as _ from "lodash";
 import {DrawingBoardModes} from "../drawing-board.modes";
 import {AuditInfoModalComponent} from "../../../shared/components/auditInfoModal/auditInfoModal.component";
-import {VnfModelInfo} from "./models/vnf/vnf.model.info";
 import {ILevelNodeInfo} from "./models/basic.model.info";
 import {ComponentInfoModel, ComponentInfoType} from "../component-info/component-info-model";
 import {ModelInformationItem} from "../../../shared/components/model-information/model-information.component";
+import {undoUpgradeService, upgradeService} from "../../../shared/storeUtil/utils/service/service.actions";
+import {VNFMethods} from "../../../shared/storeUtil/utils/vnf/vnf.actions";
+import {FeatureFlagsService, Features} from "../../../shared/services/featureFlag/feature-flags.service";
 
 @Injectable()
 export class SharedTreeService {
@@ -106,16 +108,7 @@ export class SharedTreeService {
    * should return true if can delete
    **********************************************/
   shouldShowDelete(node): boolean {
-    const mode = this._store.getState().global.drawingBoardStatus;
-    if (!_.isNil(node) && !_.isNil(node.data) && !_.isNil(node.data.action) && !_.isNil(node.data.menuActions['delete'])) {
-      if (mode !== DrawingBoardModes.EDIT || node.data.action === ServiceInstanceActions.Create) {
-        return false;
-      } else if (node.data.action === ServiceInstanceActions.None) {
-        return true
-      }
-      return false;
-    }
-    return false;
+    return this.shouldShowButtonGeneric(node, "delete")
   }
 
   /**********************************************
@@ -146,6 +139,78 @@ export class SharedTreeService {
     return false;
   }
   /**********************************************
+   * enabled only on edit/design
+   * enabled only if there's a newer version for VNF-M
+   **********************************************/
+  upgradeBottomUp(node,serviceModelId: string): void {
+    this.iterateOverTreeBranchAndRunAction(node, serviceModelId, VNFMethods.UPGRADE);
+    this._store.dispatch(upgradeService(serviceModelId));
+  }
+
+  private iterateOverTreeBranchAndRunAction(node, serviceModelId: string, actionMethod) {
+    while (_.has(node.parent, 'data') && _.has(node.parent.data, 'menuActions')
+    && !_.isNil(node.parent.data.menuActions[actionMethod])) {
+      node = node.parent;
+      node.data.menuActions[actionMethod]['method'](node, serviceModelId);
+    }
+  }
+
+  /****************************************************
+   * should return true if customer can upgrade a VFM *
+   ****************************************************/
+  shouldShowUpgrade(node, serviceModelId): boolean {
+    if (FeatureFlagsService.getFlagState(Features.FLAG_FLASH_REPLACE_VF_MODULE, this._store) &&
+      this.isThereAnUpdatedLatestVersion(serviceModelId)) {
+      return this.shouldShowButtonGeneric(node, VNFMethods.UPGRADE);
+    }
+    else {
+      return false
+    }
+  }
+
+  private isThereAnUpdatedLatestVersion(serviceModelId) : boolean{
+    let serviceInstance = this._store.getState().service.serviceInstance[serviceModelId];
+    return !_.isNil(serviceInstance.latestAvailableVersion) && (Number(serviceInstance.modelInfo.modelVersion) < serviceInstance.latestAvailableVersion);
+  }
+
+  private shouldShowButtonGeneric(node, method) {
+    const mode = this._store.getState().global.drawingBoardStatus;
+    if (!_.isNil(node) && !_.isNil(node.data) && !_.isNil(node.data.action) && !_.isNil(node.data.menuActions[method])) {
+      if (mode !== DrawingBoardModes.EDIT || node.data.action === ServiceInstanceActions.Create) {
+        return false;
+      }
+      else if (node.data.action === ServiceInstanceActions.None) {
+        return true
+      }
+    }
+    return false;
+  }
+
+  /**********************************************
+   * return boolean according to
+   * current defined action of VFModule node
+   **********************************************/
+  shouldShowUndoUpgrade(node): boolean {
+    const mode = this._store.getState().global.drawingBoardStatus;
+    if (mode === DrawingBoardModes.EDIT && !_.isNil(node.data.action) && !_.isNil(node.data.menuActions[VNFMethods.UNDO_UPGRADE])) {
+      if (node.data.action === ServiceInstanceActions.Upgrade) {
+        return false;
+      } else if (node.data.action.split('_').pop() === ServiceInstanceActions.Upgrade) {
+        return true
+      }
+      return false;
+    }
+    return false;
+  }
+  /**********************************************
+   * enabled only on edit/design
+   * enabled only if there's a newer version for VNF-M
+   **********************************************/
+  undoUpgradeBottomUp(node,serviceModelId: string): void {
+    this.iterateOverTreeBranchAndRunAction(node, serviceModelId, VNFMethods.UNDO_UPGRADE);
+    this._store.dispatch(undoUpgradeService(serviceModelId));
+  }
+  /**********************************************
    * should return true if can duplicate by mode
    **********************************************/
   shouldShowDuplicate(node): boolean {
diff --git a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/service.control.generator.spec.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/service.control.generator.spec.ts
index d90c65e38..a6a29d1df 100644
--- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/service.control.generator.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/service.control.generator.spec.ts
@@ -508,128 +508,8 @@ class MockAppStore<T> {
                 "isPermitted": true
               },
               {
-                "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",
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
                 "isPermitted": true
               },
               {
@@ -880,754 +760,6 @@ class MockAppStore<T> {
             "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/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.spec.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.spec.ts
index fbcca06a7..351f8393c 100644
--- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.spec.ts
@@ -529,128 +529,8 @@ class MockAppStore<T> {
                 "isPermitted": true
               },
               {
-                "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",
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
                 "isPermitted": true
               },
               {
@@ -659,16 +539,6 @@ class MockAppStore<T> {
                 "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
@@ -901,754 +771,6 @@ class MockAppStore<T> {
             "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/src/app/shared/components/genericForm/formControlsServices/vnfGenerator/vnf.control.generator.spec.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGenerator/vnf.control.generator.spec.ts
index a99856c52..66afac9ad 100644
--- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGenerator/vnf.control.generator.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGenerator/vnf.control.generator.spec.ts
@@ -528,128 +528,8 @@ class MockAppStore<T> {
                 "isPermitted": true
               },
               {
-                "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",
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
                 "isPermitted": true
               },
               {
@@ -658,16 +538,6 @@ class MockAppStore<T> {
                 "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
@@ -900,754 +770,6 @@ class MockAppStore<T> {
             "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/src/app/shared/components/genericFormPopup/generic-form-popup.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/generic-form-popup.service.spec.ts
index e854f8e18..fa77bed5f 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/generic-form-popup.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/generic-form-popup.service.spec.ts
@@ -539,128 +539,8 @@ class MockAppStore<T>{
                 "isPermitted": true
               },
               {
-                "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",
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
                 "isPermitted": true
               },
               {
@@ -911,754 +791,6 @@ class MockAppStore<T>{
             "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/src/app/shared/components/genericFormPopup/genericFormServices/basic.popup.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/basic.popup.service.spec.ts
index 69cb7dc9b..54af063d8 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/basic.popup.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/basic.popup.service.spec.ts
@@ -1753,124 +1753,28 @@ class MockReduxStore<T> {
               "id": "092eb9e8e4b7412e8787dd091bc58e86",
               "name": "USP-SIP-IC-24335-T-01",
               "isPermitted": true
-            }],
-            "hvf6": [{
-              "id": "bae71557c5bb4d5aac6743a4e5f1d054",
-              "name": "AIN Web Tool-15-D-testalexandria",
-              "isPermitted": true
-            }, {
-              "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
-            }, {
-              "id": "fa45ca53c80b492fa8be5477cd84fc2b",
-              "name": "ro-T112",
-              "isPermitted": true
-            }, {
-              "id": "4914ab0ab3a743e58f0eefdacc1dde77",
-              "name": "DN5242-Nov21-T1",
-              "isPermitted": true
-            }, {
-              "id": "d0a3e3f2964542259d155a81c41aadc3",
-              "name": "test-hvf6-09",
-              "isPermitted": true
-            }, {"id": "cbb99fe4ada84631b7baf046b6fd2044", "name": "DN5242-Nov16-T3", "isPermitted": true}]
+            }], "hvf6": [
+              {
+                "id": "bae71557c5bb4d5aac6743a4e5f1d054",
+                "name": "AIN Web Tool-15-D-testalexandria",
+                "isPermitted": true
+              },
+              {
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
+                "isPermitted": true
+              },
+              {
+                "id": "fa45ca53c80b492fa8be5477cd84fc2b",
+                "name": "ro-T112",
+                "isPermitted": true
+              },
+              {
+                "id": "cbb99fe4ada84631b7baf046b6fd2044",
+                "name": "DN5242-Nov16-T3",
+                "isPermitted": true
+              }
+            ]
           }
         },
         "productFamilies": [{
@@ -1977,199 +1881,28 @@ class MockReduxStore<T> {
             "isPermitted": false
           }]
         },
-        "aicZones": [{"id": "NFT1", "name": "NFTJSSSS-NFT1"}, {"id": "JAG1", "name": "YUDFJULP-JAG1"}, {
-          "id": "YYY1",
-          "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"}, {
-          "id": "ATL34",
-          "name": "ATLSANAI-ATL34"
-        }],
+        "aicZones": [
+          {
+            "id": "NFT1",
+            "name": "NFTJSSSS-NFT1"
+          },
+          {
+            "id": "JAG1",
+            "name": "YUDFJULP-JAG1"
+          },
+          {
+            "id": "YYY1",
+            "name": "UUUAIAAI-YYY1"
+          },
+          {
+            "id": "AVT1",
+            "name": "AVTRFLHD-AVT1"
+          },
+          {
+            "id": "ATL34",
+            "name": "ATLSANAI-ATL34"
+          }
+        ],
         "categoryParameters": {
           "owningEntityList": [{
             "id": "aaa1",
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/network/network.popup.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/network/network.popup.service.spec.ts
index 97d562b44..eb094abfb 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/network/network.popup.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/network/network.popup.service.spec.ts
@@ -1760,104 +1760,8 @@ class MockReduxStore<T> {
               "name": "AIN Web Tool-15-D-testalexandria",
               "isPermitted": true
             }, {
-              "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",
+              "id": "d0a3e3f2964542259d155a81c41aadc3",
+              "name": "test-hvf6-09",
               "isPermitted": true
             }, {
               "id": "fa45ca53c80b492fa8be5477cd84fc2b",
@@ -1978,199 +1882,28 @@ class MockReduxStore<T> {
             "isPermitted": false
           }]
         },
-        "aicZones": [{"id": "NFT1", "name": "NFTJSSSS-NFT1"}, {"id": "JAG1", "name": "YUDFJULP-JAG1"}, {
-          "id": "YYY1",
-          "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"}, {
-          "id": "ATL34",
-          "name": "ATLSANAI-ATL34"
-        }],
+        "aicZones": [
+          {
+            "id": "NFT1",
+            "name": "NFTJSSSS-NFT1"
+          },
+          {
+            "id": "JAG1",
+            "name": "YUDFJULP-JAG1"
+          },
+          {
+            "id": "YYY1",
+            "name": "UUUAIAAI-YYY1"
+          },
+          {
+            "id": "AVT1",
+            "name": "AVTRFLHD-AVT1"
+          },
+          {
+            "id": "ATL34",
+            "name": "ATLSANAI-ATL34"
+          }
+        ],
         "categoryParameters": {
           "owningEntityList": [{
             "id": "aaa1",
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/service/service.popup.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/service/service.popup.service.spec.ts
index 3ca3c05b4..5b5acd33b 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/service/service.popup.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/service/service.popup.service.spec.ts
@@ -1827,104 +1827,8 @@ class MockReduxStore<T> {
               "name": "AIN Web Tool-15-D-testalexandria",
               "isPermitted": true
             }, {
-              "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",
+              "id": "d0a3e3f2964542259d155a81c41aadc3",
+              "name": "test-hvf6-09",
               "isPermitted": true
             }, {
               "id": "fa45ca53c80b492fa8be5477cd84fc2b",
@@ -2045,199 +1949,28 @@ class MockReduxStore<T> {
             "isPermitted": false
           }]
         },
-        "aicZones": [{"id": "NFT1", "name": "NFTJSSSS-NFT1"}, {"id": "JAG1", "name": "YUDFJULP-JAG1"}, {
-          "id": "YYY1",
-          "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"}, {
-          "id": "ATL34",
-          "name": "ATLSANAI-ATL34"
-        }],
+        "aicZones": [
+          {
+            "id": "NFT1",
+            "name": "NFTJSSSS-NFT1"
+          },
+          {
+            "id": "JAG1",
+            "name": "YUDFJULP-JAG1"
+          },
+          {
+            "id": "YYY1",
+            "name": "UUUAIAAI-YYY1"
+          },
+          {
+            "id": "AVT1",
+            "name": "AVTRFLHD-AVT1"
+          },
+          {
+            "id": "ATL34",
+            "name": "ATLSANAI-ATL34"
+          }
+        ],
         "categoryParameters": {
           "owningEntityList": [{
             "id": "aaa1",
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service.spec.ts
index 24bbac51e..5b27b6e29 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service.spec.ts
@@ -1762,104 +1762,8 @@ class MockReduxStore<T> {
               "name": "AIN Web Tool-15-D-testalexandria",
               "isPermitted": true
             }, {
-              "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",
+              "id": "d0a3e3f2964542259d155a81c41aadc3",
+              "name": "test-hvf6-09",
               "isPermitted": true
             }, {
               "id": "fa45ca53c80b492fa8be5477cd84fc2b",
@@ -1980,196 +1884,19 @@ class MockReduxStore<T> {
             "isPermitted": false
           }]
         },
-        "aicZones": [{"id": "NFT1", "name": "NFTJSSSS-NFT1"}, {"id": "JAG1", "name": "YUDFJULP-JAG1"}, {
+        "aicZones": [{
+          "id": "NFT1",
+          "name": "NFTJSSSS-NFT1"
+        }, {
+          "id": "JAG1",
+          "name": "YUDFJULP-JAG1"
+        }, {
           "id": "YYY1",
           "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"}, {
+        }, {
+          "id": "AVT1",
+          "name": "AVTRFLHD-AVT1"
+        }, {
           "id": "ATL34",
           "name": "ATLSANAI-ATL34"
         }],
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vnf/vnf.popup.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vnf/vnf.popup.service.spec.ts
index de7aa4e22..6458e4f97 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vnf/vnf.popup.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vnf/vnf.popup.service.spec.ts
@@ -1844,128 +1844,8 @@ class MockReduxStore<T> {
                 "isPermitted": true
               },
               {
-                "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",
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
                 "isPermitted": true
               },
               {
@@ -2216,754 +2096,6 @@ class MockReduxStore<T> {
             "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/src/app/shared/components/genericFormPopup/genericFormServices/vnfGroup/vnfGroup.popup.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vnfGroup/vnfGroup.popup.service.spec.ts
index 00f979014..5397a7233 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vnfGroup/vnfGroup.popup.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vnfGroup/vnfGroup.popup.service.spec.ts
@@ -1842,128 +1842,8 @@ class MockReduxStore<T> {
                 "isPermitted": true
               },
               {
-                "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",
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
                 "isPermitted": true
               },
               {
@@ -2214,754 +2094,6 @@ class MockReduxStore<T> {
             "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/src/app/shared/models/serviceInstance.ts b/vid-webpack-master/src/app/shared/models/serviceInstance.ts
index d9167be16..cae69a6c8 100644
--- a/vid-webpack-master/src/app/shared/models/serviceInstance.ts
+++ b/vid-webpack-master/src/app/shared/models/serviceInstance.ts
@@ -19,6 +19,7 @@ export class ServiceInstance extends NodeInstance{
   projectName: string;
   owningEntityId: string;
   owningEntityName: string;
+  latestAvailableVersion: Number;
   pause: boolean;
   bulkSize: number;
   vnfs: { [vnf_module_model_name: string]: VnfInstance; };
@@ -26,6 +27,7 @@ export class ServiceInstance extends NodeInstance{
   vnfGroups : {[vnf_module_model_name: string]: VnfGroupInstance; };
   networks: { [vnf_module_model_name: string]: NetworkInstance; };
   isDirty : boolean;
+  isUpgraded : boolean;
   instanceParams: {[key: string]: string}[];
   rollbackOnFailure: boolean;
   subscriberName: string;
@@ -39,6 +41,7 @@ export class ServiceInstance extends NodeInstance{
   optionalGroupMembersMap?: { [path: string]: VnfMember[]; };
   statusMessage: string;
   vidNotions?: VidNotions;
+  upgradedVFMSonsCounter: number;
 
   constructor() {
     super();
@@ -56,6 +59,7 @@ export class ServiceInstance extends NodeInstance{
     this.networks = {};
     this.vnfGroups = {};
     this.bulkSize = 1;
+    this.isUpgraded = false;
+    this.upgradedVFMSonsCounter = 0;
   }
-
 }
diff --git a/vid-webpack-master/src/app/shared/models/serviceInstanceActions.ts b/vid-webpack-master/src/app/shared/models/serviceInstanceActions.ts
index cda2d0e88..0c8756d50 100644
--- a/vid-webpack-master/src/app/shared/models/serviceInstanceActions.ts
+++ b/vid-webpack-master/src/app/shared/models/serviceInstanceActions.ts
@@ -1,11 +1,14 @@
 export enum ServiceInstanceActions{
   Delete = "Delete",
+  Replace = "Replace",
+  Upgrade = "Upgrade",
   Update="Update",
   Create="Create",
   None="None",
   Resume = "Resume",
   Update_Delete = 'Update_Delete',
-  None_Delete = 'None_Delete'
+  None_Delete = 'None_Delete',
+  None_Upgrade = 'None_Upgrade'
 }
 export enum ServiceAction {
   INSTANTIATE = 'INSTANTIATE',
diff --git a/vid-webpack-master/src/app/shared/models/vnfInstance.ts b/vid-webpack-master/src/app/shared/models/vnfInstance.ts
index 6082de67e..60f5c48ef 100644
--- a/vid-webpack-master/src/app/shared/models/vnfInstance.ts
+++ b/vid-webpack-master/src/app/shared/models/vnfInstance.ts
@@ -8,10 +8,12 @@ export class VnfInstance extends Level1Instance {
   vnfStoreKey : string;
   position: number;
   statusMessage?: string;
+  upgradedVFMSonsCounter: number;
 
   constructor() {
     super();
     this.vfModules = {};
     this.vnfStoreKey = null;
+    this.upgradedVFMSonsCounter = 0;
   }
 }
diff --git a/vid-webpack-master/src/app/shared/resolvers/viewEdit/viewEdit.resolver.ts b/vid-webpack-master/src/app/shared/resolvers/viewEdit/viewEdit.resolver.ts
index 404f390fb..d2f76e4f6 100644
--- a/vid-webpack-master/src/app/shared/resolvers/viewEdit/viewEdit.resolver.ts
+++ b/vid-webpack-master/src/app/shared/resolvers/viewEdit/viewEdit.resolver.ts
@@ -1,11 +1,14 @@
 import {ActivatedRouteSnapshot, Resolve} from "@angular/router";
 import {Injectable} from "@angular/core";
-import {Observable} from "rxjs";
+import {from, Observable} from "rxjs";
 import {AaiService} from "../../services/aaiService/aai.service";
 import {forkJoin} from "rxjs/observable/forkJoin";
 import {AppState} from "../../store/reducers";
 import {NgRedux} from "@angular-redux/store";
 import {createServiceInstance} from "../../storeUtil/utils/service/service.actions";
+import {ServiceInstance} from "../../models/serviceInstance";
+import * as _ from "lodash";
+import {ModelInfo} from "../../models/modelInfo";
 
 @Injectable()
 export class ViewEditResolver implements Resolve<Observable<boolean>> {
@@ -14,26 +17,51 @@ export class ViewEditResolver implements Resolve<Observable<boolean>> {
   }
 
   resolve(route: ActivatedRouteSnapshot): Observable<boolean> {
-    const serviceModeId: string = route.queryParamMap.get("serviceModelId");
+    const serviceModelId: string = route.queryParamMap.get("serviceModelId");
     const serviceInstanceId: string = route.queryParamMap.get("serviceInstanceId");
     const subscriberId: string = route.queryParamMap.get("subscriberId");
     const serviceType: string = route.queryParamMap.get("serviceType");
-      let serviceModelApi = this._aaiService.getServiceModelById(serviceModeId);
-      let serviceInstanceApi = this._aaiService.retrieveAndStoreServiceInstanceTopology(serviceInstanceId, subscriberId, serviceType, serviceModeId);
-      return forkJoin([serviceModelApi, serviceInstanceApi]).map(([serviceModel, serviceInstance ]) => {
-        this.setIsALaCarte(serviceInstance,serviceModel.service.vidNotions.instantiationType );
-        this.setTestApi(serviceInstance);
-        this._store.dispatch(createServiceInstance( serviceInstance, serviceModeId));
-          return true;
-        });
+    let serviceModelApi = this._aaiService.getServiceModelById(serviceModelId);
+    let serviceInstanceApi = this._aaiService.retrieveAndStoreServiceInstanceTopology(serviceInstanceId, subscriberId, serviceType, serviceModelId);
+    let streams: Observable<any>[] = [serviceModelApi, serviceInstanceApi];
+    streams = streams.filter( stream => stream !== undefined);
+    return forkJoin(streams).switchMap(([serviceModel, serviceInstance]) => {
+      return from(this.retrieveLatestVersionAndSetServiceInstance(serviceInstance.modelInfo.modelInvariantId).then((response)=>{
+        this.setServiceLatestAvailableVersion(serviceInstance, response);
+        this.applyRequestsResponsesToStateAndInitServiceInstance(serviceModelId, serviceInstance, serviceModel);
+        return true;
+      }));
+
+    });
+  }
+
+  private retrieveLatestVersionAndSetServiceInstance(modelInvariantId: string) :Promise<ModelInfo>{
+    return this._aaiService.retrieveServiceLatestUpdateableVersion(modelInvariantId).toPromise();
+  }
+
+  applyRequestsResponsesToStateAndInitServiceInstance(serviceModelId: string,
+                                                      serviceInstance, serviceModel) {
+    this.setIsALaCarte(serviceInstance, serviceModel.service.vidNotions.instantiationType);
+    this.setTestApi(serviceInstance);
+    this._store.dispatch(createServiceInstance(serviceInstance, serviceModelId));
   }
 
-  setTestApi = (service: any) => {
+  setServiceLatestAvailableVersion(serviceInstance :ServiceInstance, modelInfoObject: ModelInfo) :void{
+    if(!_.isNil(modelInfoObject) && !_.isNil(modelInfoObject.modelVersion)){
+      serviceInstance.latestAvailableVersion = Number(modelInfoObject.modelVersion);
+    }
+    else {
+      serviceInstance.latestAvailableVersion = 0;
+    }
+  }
+
+  setTestApi(service: any) :void{
     if (this._store.getState().global.flags['FLAG_ADD_MSO_TESTAPI_FIELD'] && service.isALaCarte) {
       service.testApi = sessionStorage.getItem("msoRequestParametersTestApiValue");
     }
   };
-  setIsALaCarte = (service: any, instantiationType) => {
+
+  setIsALaCarte(service: any, instantiationType) :void{
     service.isALaCarte = instantiationType === 'ALaCarte';
   };
 
diff --git a/vid-webpack-master/src/app/shared/services/aaiService/aai.service.spec.ts b/vid-webpack-master/src/app/shared/services/aaiService/aai.service.spec.ts
index 5cff00b7e..f563cbc75 100644
--- a/vid-webpack-master/src/app/shared/services/aaiService/aai.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/services/aaiService/aai.service.spec.ts
@@ -566,6 +566,7 @@ var expectedResult =
   {
     'vnfs': {
       'DROR_vsp': {
+        'upgradedVFMSonsCounter': 0,
         'rollbackOnFailure': 'true',
         'vfModules': {},
         'isMissingData': false,
diff --git a/vid-webpack-master/src/app/shared/services/aaiService/aai.service.ts b/vid-webpack-master/src/app/shared/services/aaiService/aai.service.ts
index 4e7e4dad8..d421fe8e1 100644
--- a/vid-webpack-master/src/app/shared/services/aaiService/aai.service.ts
+++ b/vid-webpack-master/src/app/shared/services/aaiService/aai.service.ts
@@ -37,12 +37,16 @@ import {
   updateSubscribers,
   updateUserId
 } from "../../storeUtil/utils/general/general.actions";
-import {updateModel, createServiceInstance} from "../../storeUtil/utils/service/service.actions";
+import {
+  updateModel,
+  createServiceInstance,
+} from "../../storeUtil/utils/service/service.actions";
 import {FeatureFlagsService, Features} from "../featureFlag/feature-flags.service";
 import {VnfMember} from "../../models/VnfMember";
 import {setOptionalMembersVnfGroupInstance} from "../../storeUtil/utils/vnfGroup/vnfGroup.actions";
 import {Observable} from "rxjs";import {NetworkModalRow} from "../../../drawingBoard/service-planning/objectsToTree/models/vrf/vrfModal/networkStep/network.step.model";
 import {VPNModalRow} from "../../../drawingBoard/service-planning/objectsToTree/models/vrf/vrfModal/vpnStep/vpn.step.model";
+import {ModelInfo} from "../../models/modelInfo";
 
 @Injectable()
 export class AaiService {
@@ -61,6 +65,14 @@ export class AaiService {
       });
   };
 
+  retrieveServiceLatestUpdateableVersion = (modelInvariantId: string): Observable<ModelInfo> => {
+    if (this.featureFlagsService.getFlagState(Features.FLAG_FLASH_REPLACE_VF_MODULE)){
+      let pathQuery: string = Constants.Path.SERVICE_LATEST_VERSION + modelInvariantId;
+      return this.http.get<ModelInfo>(pathQuery)
+    }
+    return;
+  };
+
   getUserId = (): Observable<any> => {
     return this.http.get("../../getuserID", {responseType: 'text'}).do((res) => this.store.dispatch(updateUserId(res)));
   };
@@ -213,7 +225,7 @@ export class AaiService {
   };
 
   public extractLcpRegionName(cloudRegionId: string, cloudOwner: string):string {
-   return this.featureFlagsService.getFlagState(Features.FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST) ?
+    return this.featureFlagsService.getFlagState(Features.FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST) ?
       cloudRegionId+AaiService.formatCloudOwnerTrailer(cloudOwner) : cloudRegionId;
   };
 
@@ -271,7 +283,7 @@ export class AaiService {
   public retrieveAndStoreServiceInstanceTopology(serviceInstanceId: string, subscriberId: string, serviceType: string, serviceModeId: string):Observable<ServiceInstance> {
     return this.retrieveServiceInstanceTopology(serviceInstanceId, subscriberId, serviceType).do((service:ServiceInstance) => {
       this.store.dispatch(createServiceInstance(service, serviceModeId));
-      });
+    });
   };
 
 
@@ -296,9 +308,6 @@ export class AaiService {
       .do((res) => {
         this.store.dispatch(setOptionalMembersVnfGroupInstance(serviceModelId, pathQuery, res))
       });
-    // let res = Observable.of((JSON.parse(JSON.stringify(this.loadMockMembers()))));
-    // return  res;
-     
   }
 
   //TODO: make other places use this function
diff --git a/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts b/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts
index 01ecb2cdf..da79a1a4e 100644
--- a/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts
+++ b/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts
@@ -9,7 +9,9 @@ export enum Features {
   FLAG_VF_MODULE_RESUME_STATUS_CREATE = 'FLAG_VF_MODULE_RESUME_STATUS_CREATE',
   DRAG_AND_DROP_OPERATION = 'DRAG_AND_DROP_OPERATION',
   FLAG_1906_COMPONENT_INFO = 'FLAG_1906_COMPONENT_INFO',
-  FLAG_1908_RESUME_MACRO_SERVICE = 'FLAG_1908_RESUME_MACRO_SERVICE'
+  FLAG_1908_RESUME_MACRO_SERVICE = 'FLAG_1908_RESUME_MACRO_SERVICE',
+  FLAG_FLASH_REPLACE_VF_MODULE ='FLAG_FLASH_REPLACE_VF_MODULE',
+  FLAG_FLASH_VIEW_IN_NEW_VIEWEDIT_SCREEN ='FLAG_FLASH_VIEW_IN_NEW_VIEWEDIT_SCREEN'
 }
 
 @Injectable()
@@ -23,7 +25,11 @@ export class FeatureFlagsService {
 
   /*static method for easy refactoring of code, so no injection of FeatureFlagsService is needed*/
   public static getFlagState(flag: Features, store: NgRedux<AppState>):boolean {
-    return store.getState().global.flags[flag];
+    let storeStateGlobalFields = store.getState().global;
+    if(storeStateGlobalFields && storeStateGlobalFields.flags && storeStateGlobalFields.flags[flag] !== undefined){
+      return storeStateGlobalFields.flags[flag];
+    }
+    return false;
   }
 
 
diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/reducersHelper.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/reducersHelper.ts
index 5722811ce..c192ece48 100644
--- a/vid-webpack-master/src/app/shared/storeUtil/utils/reducersHelper.ts
+++ b/vid-webpack-master/src/app/shared/storeUtil/utils/reducersHelper.ts
@@ -3,8 +3,7 @@ import {ActionOnFirstLevel} from "./firstLevel/firstLevel.actions";
 import {ServiceInstanceActions} from "../../models/serviceInstanceActions";
 import {ServiceState} from "./main.reducer";
 
-export function deleteFirstLevel(state: ServiceState, action: ActionOnFirstLevel,shouldUpdateServiceValidationCounter: boolean)
-{
+export function deleteFirstLevel(state: ServiceState, action: ActionOnFirstLevel,shouldUpdateServiceValidationCounter: boolean){
   let newState = _.cloneDeep(state);
   let firstLevel = newState.serviceInstance[action.serviceId][action.firstLevelName][action.storeKey];
   let oldAction = firstLevel.action;
@@ -22,4 +21,10 @@ export function updateServiceValidationCounter(newState: any, oldValidationState
   } else if (!oldValidationState && newValidationState) {
     newState.serviceInstance[serviceUuid].validationCounter++;
   }
+  resetUpgradeStatus(newState, serviceUuid);
 };
+
+function resetUpgradeStatus(newState: any, serviceUuid: string){
+  newState.serviceInstance[serviceUuid].upgradedVFMSonsCounter = 0;
+  newState.serviceInstance[serviceUuid].isUpgraded = false;
+}
diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/service/service.actions.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/service/service.actions.ts
index e4e7e494e..069ef82e8 100644
--- a/vid-webpack-master/src/app/shared/storeUtil/utils/service/service.actions.ts
+++ b/vid-webpack-master/src/app/shared/storeUtil/utils/service/service.actions.ts
@@ -10,7 +10,9 @@ export enum ServiceActions {
   ADD_SERVICE_ACTION = 'ADD_SERVICE_ACTION',
   DELETE_ACTION_SERVICE_INSTANCE = "DELETE_ACTION_SERVICE_INSTANCE",
   UNDO_DELETE_ACTION_SERVICE_INSTANCE = "UNDO_DELETE_ACTION_SERVICE_INSTANCE",
-  CHANGE_SERVICE_IS_DIRTY = "CHANGE_SERVICE_IS_DIRTY"
+  CHANGE_SERVICE_IS_DIRTY = "CHANGE_SERVICE_IS_DIRTY",
+  UPGRADE_SERVICE_ACTION = "UPGRADE_SERVICE_ACTION",
+  UNDO_UPGRADE_SERVICE_ACTION = "UNDO_UPGRADE_SERVICE_ACTION"
 }
 
 export interface CreateServiceInstanceAction extends Action {
@@ -40,6 +42,13 @@ export interface AddServiceAction extends Action{
   action: ServiceInstanceActions;
 }
 
+export interface UpgradeServiceAction extends Action{
+  serviceUuid: string;
+}
+
+export interface UndoUpgradeServiceAction extends Action{
+  serviceUuid: string;
+}
 
 export interface DeleteActionServiceInstanceAction extends Action {
   serviceId?: string;
@@ -99,4 +108,12 @@ export const changeServiceIsDirty: ActionCreator<ChangeServiceDirty> = (nodes, s
   serviceId : serviceId
 });
 
+export const upgradeService: ActionCreator<UpgradeServiceAction> = (serviceUuid : string) => ({
+  type: ServiceActions.UPGRADE_SERVICE_ACTION,
+  serviceUuid
+});
 
+export const undoUpgradeService: ActionCreator<UndoUpgradeServiceAction> = (serviceUuid : string) => ({
+  type: ServiceActions.UNDO_UPGRADE_SERVICE_ACTION,
+  serviceUuid
+});
diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/service/service.reducers.spec.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/service/service.reducers.spec.ts
index cff944563..ba8b3826e 100644
--- a/vid-webpack-master/src/app/shared/storeUtil/utils/service/service.reducers.spec.ts
+++ b/vid-webpack-master/src/app/shared/storeUtil/utils/service/service.reducers.spec.ts
@@ -6,7 +6,7 @@ import {
   DeleteServiceInstanceAction,
   ServiceActions,
   UpdateServiceInstanceAction,
-  UpdateServiceModelAction
+  UpdateServiceModelAction, UpgradeServiceAction
 } from "./service.actions";
 import {serviceReducer} from "./service.reducers";
 import {ServiceInstanceActions} from "../../../models/serviceInstanceActions";
@@ -513,7 +513,62 @@ describe('serviceReducer', () => {
     expect(state.serviceInstance['serviceId'].isDirty).toBeTruthy();
   });
 
-});
+  test('#UPGRADE_SERVICE should update service action to _Upgrade', () => {
+    const state = serviceReducer(<any>{
+        serviceInstance: {
+          'serviceId': {
+            action: ServiceInstanceActions.None,
+            upgradedVFMSonsCounter: 0,
+            'vnfs': {
+              'vnf1': {
+                action: ServiceInstanceActions.None
+              },
+              'vnf2': {
+                action: ServiceInstanceActions.Create
+              }
+            }
+
+          }
+        }
+      },
+      <UpgradeServiceAction> {
+        type: ServiceActions.UPGRADE_SERVICE_ACTION,
+        serviceUuid: 'serviceId'
+      });
+
+    expect(state.serviceInstance['serviceId'].isUpgraded).toBeTruthy();
+    expect(state.serviceInstance['serviceId'].action).toEqual(ServiceInstanceActions.None_Upgrade);
+    expect(state.serviceInstance['serviceId'].upgradedVFMSonsCounter).toEqual(1);
 
+  });
 
+  test('#UNDO_UPGRADE_SERVICE should cancel the upgrade action back to None', () => {
+    const state = serviceReducer(<any>{
+        serviceInstance: {
+          'serviceId': {
+            isUpgraded: true,
+            upgradedVFMSonsCounter: 1,
+            action: ServiceInstanceActions.None_Upgrade,
+            'vnfs': {
+              'vnf1': {
+                action: ServiceInstanceActions.None_Upgrade
+              },
+              'vnf2': {
+                action: ServiceInstanceActions.Create
+              }
+            }
 
+          }
+        }
+      },
+      <UpgradeServiceAction> {
+        type: ServiceActions.UNDO_UPGRADE_SERVICE_ACTION,
+        serviceUuid: 'serviceId'
+      });
+
+    expect(state.serviceInstance['serviceId'].isUpgraded).toBeFalsy();
+    expect(state.serviceInstance['serviceId'].action).toEqual(ServiceInstanceActions.None);
+    expect(state.serviceInstance['serviceId'].upgradedVFMSonsCounter).toEqual(0);
+  });
+
+});
diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/service/service.reducers.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/service/service.reducers.ts
index c6d3da52a..811238385 100644
--- a/vid-webpack-master/src/app/shared/storeUtil/utils/service/service.reducers.ts
+++ b/vid-webpack-master/src/app/shared/storeUtil/utils/service/service.reducers.ts
@@ -4,8 +4,10 @@ import {
   ChangeServiceDirty,
   CreateServiceInstanceAction,
   ServiceActions,
+  UndoUpgradeServiceAction,
   UpdateServiceInstanceAction,
-  UpdateServiceModelAction
+  UpdateServiceModelAction,
+  UpgradeServiceAction
 } from "./service.actions";
 import {ServiceInstance} from "../../../models/serviceInstance";
 import {ServiceState} from "../main.reducer";
@@ -13,84 +15,99 @@ import {ServiceInstanceActions} from "../../../models/serviceInstanceActions";
 import * as _ from "lodash";
 
 export function serviceReducer(state: ServiceState, action: Action) : ServiceState{
-    switch (action.type) {
-      case ServiceActions.UPDATE_SERVICE_INSTANCE : {
-        let newState = _.cloneDeep(state);
-        const updateServiceInstanceAction = <UpdateServiceInstanceAction>action;
-        const uuid = updateServiceInstanceAction.serviceUuid;
-        const serviceInstance = updateServiceInstanceAction.serviceInstance;
 
+  switch (action.type) {
+    case ServiceActions.UPDATE_SERVICE_INSTANCE : {
+      let newState = _.cloneDeep(state);
+      const updateServiceInstanceAction = <UpdateServiceInstanceAction>action;
+      const uuid = updateServiceInstanceAction.serviceUuid;
+      const serviceInstance = updateServiceInstanceAction.serviceInstance;
 
-        updateUniqueNames(serviceInstance.instanceName, updateServiceInstanceAction.serviceInstance.instanceName, newState.serviceInstance[uuid]);
+      updateUniqueNames(serviceInstance.instanceName, updateServiceInstanceAction.serviceInstance.instanceName, newState.serviceInstance[uuid]);
 
-        newState.serviceInstance[uuid] = _.merge(newState.serviceInstance[uuid], serviceInstance);
-        return newState;
-      }
-      case ServiceActions.CREATE_SERVICE_INSTANCE : {
-        const updateServiceInstanceAction = <CreateServiceInstanceAction>action;
-        const uuid = updateServiceInstanceAction.serviceUuid;
-        let newState = _.cloneDeep(state);
+      newState.serviceInstance[uuid] = _.merge(newState.serviceInstance[uuid], serviceInstance);
+      return newState;
+    }
+    case ServiceActions.CREATE_SERVICE_INSTANCE : {
+      const updateServiceInstanceAction = <CreateServiceInstanceAction>action;
+      const uuid = updateServiceInstanceAction.serviceUuid;
+      let newState = _.cloneDeep(state);
 
-        const serviceInstance: ServiceInstance =  new ServiceInstance();
-        const currentInstaceName = state.serviceInstance[uuid] ? serviceInstance.instanceName : null;
+      const serviceInstance: ServiceInstance =  new ServiceInstance();
+      const currentInstaceName = state.serviceInstance[uuid] ? serviceInstance.instanceName : null;
 
-        newState.serviceInstance[uuid] = Object.assign(serviceInstance, updateServiceInstanceAction.serviceInstance);
-        newState.serviceInstance[uuid].vidNotions = _.get(state,`serviceHierarchy[${uuid}].service.vidNotions`);
-        if (!_.isNil(updateServiceInstanceAction.serviceInstance)) {
-          updateUniqueNames(currentInstaceName, updateServiceInstanceAction.serviceInstance.instanceName, newState.serviceInstance[uuid]);
-        }
-        return newState;
-      }
-      case ServiceActions.DELETE_ALL_SERVICE_INSTANCES: {
-        if (state.serviceInstance) {
-          let newState = _.cloneDeep(state);
-          newState.serviceInstance = {};
-          return Object.assign({}, state, newState);
-        }
-        return Object.assign({}, state);
+      newState.serviceInstance[uuid] = Object.assign(serviceInstance, updateServiceInstanceAction.serviceInstance);
+      newState.serviceInstance[uuid].vidNotions = _.get(state,`serviceHierarchy[${uuid}].service.vidNotions`);
+      if (!_.isNil(updateServiceInstanceAction.serviceInstance)) {
+        updateUniqueNames(currentInstaceName, updateServiceInstanceAction.serviceInstance.instanceName, newState.serviceInstance[uuid]);
       }
-      case ServiceActions.UPDATE_MODEL: {
-        let uuid = (<UpdateServiceModelAction>action).serviceHierarchy.service.uuid;
-        state.serviceHierarchy[uuid] = _.cloneDeep((<UpdateServiceModelAction>action).serviceHierarchy);
-        return Object.assign({}, state);
+      return newState;
+    }
+    case ServiceActions.DELETE_ALL_SERVICE_INSTANCES: {
+      if (state.serviceInstance) {
+        let newState = _.cloneDeep(state);
+        newState.serviceInstance = {};
+        return Object.assign({}, state, newState);
       }
-      case ServiceActions.ADD_SERVICE_ACTION: {
-        const uuid: string = (<AddServiceAction>action).serviceUuid;
-        const actionToAdd: ServiceInstanceActions =  (<AddServiceAction>action).action;
-        state.serviceInstance[uuid].action =  actionToAdd;
-        return Object.assign({}, state);
+      return Object.assign({}, state);
+    }
+    case ServiceActions.UPDATE_MODEL: {
+      let uuid = (<UpdateServiceModelAction>action).serviceHierarchy.service.uuid;
+      state.serviceHierarchy[uuid] = _.cloneDeep((<UpdateServiceModelAction>action).serviceHierarchy);
+      return Object.assign({}, state);
+    }
+    case ServiceActions.ADD_SERVICE_ACTION: {
+      const uuid: string = (<AddServiceAction>action).serviceUuid;
+      const actionToAdd: ServiceInstanceActions =  (<AddServiceAction>action).action;
+      state.serviceInstance[uuid].action =  actionToAdd;
+      return Object.assign({}, state);
+    }
+    case ServiceActions.CHANGE_SERVICE_IS_DIRTY : {
+      let newState = _.cloneDeep(state);
+      let serviceInstanceAction: ServiceInstanceActions = newState.serviceInstance[(<ChangeServiceDirty>action).serviceId].action;
+
+      if(serviceInstanceAction !== ServiceInstanceActions.None){
+        newState.serviceInstance[(<ChangeServiceDirty>action).serviceId].isDirty = true;
+        return newState;
       }
-      case ServiceActions.CHANGE_SERVICE_IS_DIRTY : {
-        let newState = _.cloneDeep(state);
-        let serviceInstanceAction: ServiceInstanceActions = newState.serviceInstance[(<ChangeServiceDirty>action).serviceId].action;
 
-        if(serviceInstanceAction !== ServiceInstanceActions.None){
+      const nodes =  (<ChangeServiceDirty>action).nodes;
+      for(let node of nodes){
+        const dirty = isDirty(node);
+        if(dirty) {
           newState.serviceInstance[(<ChangeServiceDirty>action).serviceId].isDirty = true;
           return newState;
         }
+      }
+      newState.serviceInstance[(<ChangeServiceDirty>action).serviceId].isDirty = false;
+      return newState;
+    }
+    case ServiceActions.UPGRADE_SERVICE_ACTION: {
+      let clonedState = _.cloneDeep(state);
+      let oldServiceAction: string = ServiceInstanceActions.None;
+      const castingAction = <UpgradeServiceAction>action;
+      const uuid: string = castingAction.serviceUuid;
+      return upgradeServiceInstance(clonedState, uuid, oldServiceAction);
+    }
 
-        const nodes =  (<ChangeServiceDirty>action).nodes;
-        for(let node of nodes){
-          const dirty = isDirty(node);
-          if(dirty) {
-            newState.serviceInstance[(<ChangeServiceDirty>action).serviceId].isDirty = true;
-            return newState;
-          }
-        }
-
-        newState.serviceInstance[(<ChangeServiceDirty>action).serviceId].isDirty = false;
-        return newState;
+    case ServiceActions.UNDO_UPGRADE_SERVICE_ACTION: {
+      let clonedState = _.cloneDeep(state);
+      const castingAction = <UndoUpgradeServiceAction>action;
+      const uuid: string = castingAction.serviceUuid;
+      if(!_.isNil(clonedState.serviceInstance[uuid].action) && clonedState.serviceInstance[uuid].action.includes("Upgrade")) {
+        return undoUpgradeServiceInstance(clonedState, uuid);
       }
     }
+  }
 }
 
 const isDirty = (node) : boolean => {
   if(node.action !== ServiceInstanceActions.None) return true;
   if(!_.isNil(node.children) && node.children.length > 0){
-      for(let child of node.children){
-        const dirty: boolean = isDirty(child);
-        if(dirty) return true;
-      }
+    for(let child of node.children){
+      const dirty: boolean = isDirty(child);
+      if(dirty) return true;
+    }
   }
   return false;
 };
@@ -105,5 +122,23 @@ const updateUniqueNames = (oldName : string, newName : string, serviceInstance :
   }
 };
 
+function upgradeServiceInstance(clonedState, uuid: string, oldServiceAction: string) {
+  if(!clonedState.serviceInstance[uuid].action.includes("Upgrade")){
+    clonedState.serviceInstance[uuid].action = (`${oldServiceAction}_Upgrade`) as ServiceInstanceActions;
+  }
+  clonedState.serviceInstance[uuid].isUpgraded = true;
+  clonedState.serviceInstance[uuid].upgradedVFMSonsCounter++;
+  return clonedState;
+}
+
+function undoUpgradeServiceInstance(clonedState, uuid: string) {
+  clonedState.serviceInstance[uuid].upgradedVFMSonsCounter--;
+  if(clonedState.serviceInstance[uuid].upgradedVFMSonsCounter == 0){
+    clonedState.serviceInstance[uuid].action = ServiceInstanceActions.None;
+    clonedState.serviceInstance[uuid].isUpgraded = false;
+  }
+  return clonedState;
+}
+
 
 
diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.actions.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.actions.ts
index a3f0f4009..59e5ee1fa 100644
--- a/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.actions.ts
+++ b/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.actions.ts
@@ -6,7 +6,9 @@ export enum VfModuleActions {
   UPDATE_VF_MODULE = 'UPDATE_VF_MODULE',
   DELETE_ACTION_VF_MODULE_INSTANCE = "DELETE_ACTION_VF_MODULE_INSTANCE",
   UNDO_DELETE_ACTION_VF_MODULE_INSTANCE = "UNDO_DELETE_ACTION_VF_MODULE_INSTANCE",
-  UPDATE_VFMODULE_POSITION = "UPDATE_VFMODULE_POSITION"
+  UPDATE_VFMODULE_POSITION = "UPDATE_VFMODULE_POSITION",
+  UPGRADE_VFMODULE = "UPGRADE_VFMODULE",
+  UNDO_UPGRADE_VFMODULE_ACTION = "UNDO_UPGRADE_VFMODULE_ACTION",
 }
 
 
@@ -47,6 +49,19 @@ export interface DeleteActionVfModuleInstanceAction extends Action {
   serviceId?: string;
 }
 
+export interface UpgradeVfModuleInstanceAction extends Action {
+  modelName : string;
+  vnfStoreKey : string;
+  serviceId?: string;
+  dynamicModelName: string;
+}
+export interface UndoUpgradeVfModuleInstanceAction extends Action {
+  modelName : string;
+  vnfStoreKey : string;
+  serviceId?: string;
+  dynamicModelName: string;
+}
+
 export interface UndoDeleteActionVfModuleInstanceAction extends Action {
   dynamicModelName: string;
   vnfStoreKey : string;
@@ -95,7 +110,6 @@ export const undoDeleteVfModuleInstance: ActionCreator<UndoDeleteActionVfModuleI
   serviceId: serviceId
 });
 
-
 export const updateVFModulePosition: ActionCreator<UpdateVFModluePosition> = (node, instanceId, vnfStoreKey) => ({
   type: VfModuleActions.UPDATE_VFMODULE_POSITION,
   node: node,
@@ -103,3 +117,18 @@ export const updateVFModulePosition: ActionCreator<UpdateVFModluePosition> = (no
   vnfStoreKey : vnfStoreKey
 });
 
+export const upgradeVFModule: ActionCreator<UpgradeVfModuleInstanceAction> = (modelName, vnfStoreKey, serviceId, dynamicModelName) => ({
+  type: VfModuleActions.UPGRADE_VFMODULE,
+  dynamicModelName,
+  modelName,
+  vnfStoreKey,
+  serviceId
+});
+
+export const undoUgradeVFModule: ActionCreator<UndoUpgradeVfModuleInstanceAction> = (modelName, vnfStoreKey, serviceId, dynamicModelName) => ({
+  type: VfModuleActions.UNDO_UPGRADE_VFMODULE_ACTION,
+  dynamicModelName,
+  modelName,
+  vnfStoreKey,
+  serviceId
+});
diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.spec.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.spec.ts
index de6d2142c..ee0edb0a7 100644
--- a/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.spec.ts
+++ b/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.spec.ts
@@ -1,7 +1,10 @@
 import {
   CreateVFModuleInstanceAction,
   DeleteActionVfModuleInstanceAction,
-  DeleteVfModuleInstanceAction, UndoDeleteActionVfModuleInstanceAction, UpdateVFModluePosition,
+  DeleteVfModuleInstanceAction,
+  UndoDeleteActionVfModuleInstanceAction,
+  UpdateVFModluePosition,
+  UpgradeVfModuleInstanceAction,
   VfModuleActions
 } from "./vfModule.actions";
 import {vfModuleReducer} from "./vfModule.reducers";
@@ -102,10 +105,10 @@ describe('vfModuleReducer', () => {
     vfModuleInstance.isMissingData = false;
     vfModuleInstance.volumeGroupName = 'volumeGroupName';
     let vfModule = vfModuleReducer(<any>{
-      serviceHierarchy : {
-        'serviceModelId' : {}
-      },
-      serviceInstance : {
+        serviceHierarchy : {
+          'serviceModelId' : {}
+        },
+        serviceInstance : {
           'serviceModelId' : {
             vnfs : {
               'vfName' : {
@@ -169,16 +172,16 @@ describe('vfModuleReducer', () => {
 
       }).serviceInstance['serviceModelId'].vnfs['vfName'].vfModules["modelName"]["dynamicModelName"];
 
-      expect(vfModule.position).toEqual(1);
+    expect(vfModule.position).toEqual(1);
   });
 
 
   test('#DELETE_ACTION_VF_MODULE_INSTANCE', ()=>{
     let vfModule = vfModuleReducer(<any>{
-      serviceHierarchy : {
-        'serviceModelId' : {}
-      },
-      serviceInstance : {
+        serviceHierarchy : {
+          'serviceModelId' : {}
+        },
+        serviceInstance : {
           'serviceModelId' : {
             vnfs : {
               'vnfStoreKey' : {
@@ -242,7 +245,70 @@ describe('vfModuleReducer', () => {
     expect(vfModule.action).toEqual(ServiceInstanceActions.None);
   });
 
-});
+  test('#UPGRADE_VFMODULE', ()=>{
+    let vfModule = vfModuleReducer(<any>{
+        serviceHierarchy : {
+          'serviceModelId' : {}
+        },
+        serviceInstance : {
+          'serviceModelId' : {
+            vnfs : {
+              'vnfStoreKey' : {
+                vfModules : {
+                  'modelName' : {
+                    'dynamicModelName1': {
+                      isMissingData : true,
+                      action : 'None'
+                    },
+                    'dynamicModelName2': {},
+                  }
+                }
+              }
+            }
+          }
+        }},
+      <UpgradeVfModuleInstanceAction>{
+        type: VfModuleActions.UPGRADE_VFMODULE,
+        dynamicModelName: 'dynamicModelName1',
+        vnfStoreKey : 'vnfStoreKey',
+        serviceId: 'serviceModelId',
+        modelName: 'modelName'
+      }).serviceInstance['serviceModelId'].vnfs['vnfStoreKey'].vfModules['modelName']['dynamicModelName1'];
+
+    expect(vfModule.action).toEqual(ServiceInstanceActions.None_Upgrade);
+  });
 
+  test('#UNDO_UPGRADE_VFMODULE', ()=>{
+    let vfModule = vfModuleReducer(<any>{
+        serviceHierarchy : {
+          'serviceModelId' : {}
+        },
+        serviceInstance : {
+          'serviceModelId' : {
+            vnfs : {
+              'vnfStoreKey' : {
+                vfModules : {
+                  'modelName' : {
+                    'dynamicModelName1': {
+                      isMissingData : true,
+                      action : 'None_Upgrade'
+                    },
+                    'dynamicModelName2': {},
+                  }
+                }
+              }
+            }
+          }
+        }},
+      <UpgradeVfModuleInstanceAction>{
+        type: VfModuleActions.UNDO_UPGRADE_VFMODULE_ACTION,
+        dynamicModelName: 'dynamicModelName1',
+        vnfStoreKey : 'vnfStoreKey',
+        serviceId: 'serviceModelId',
+        modelName: 'modelName'
+      }).serviceInstance['serviceModelId'].vnfs['vnfStoreKey'].vfModules['modelName']['dynamicModelName1'];
 
+    expect(vfModule.action).toEqual(ServiceInstanceActions.None);
+  });
 
+});
diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.ts
index 05319c0fb..a7aadba41 100644
--- a/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.ts
+++ b/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.ts
@@ -3,7 +3,7 @@ import * as _ from "lodash";
 import {
   CreateVFModuleInstanceAction, DeleteActionVfModuleInstanceAction,
   DeleteVfModuleInstanceAction, UndoDeleteActionVfModuleInstanceAction, UpdateVFModluePosition,
-  UpdateVFModuleInstanceAction,
+  UpdateVFModuleInstanceAction, UpgradeVfModuleInstanceAction,
   VfModuleActions
 } from "./vfModule.actions";
 import {ServiceInstance} from "../../../models/serviceInstance";
@@ -26,6 +26,7 @@ export function vfModuleReducer(state: ServiceState , action: Action) : ServiceS
 
       let vfModulesMap = newState.serviceInstance[serviceUuid].vnfs[vnfStoreKey].vfModules[vfModuleId] || new VfModuleMap();
       let randomId = generateId();
+      vfInstance.action = ServiceInstanceActions.Create;
       vfModulesMap[vfModuleId + randomId] = vfInstance;
       updateUniqueNames(null, vfInstance.instanceName, newState.serviceInstance[serviceUuid]);
       updateUniqueNames(null, vfInstance.volumeGroupName, newState.serviceInstance[serviceUuid]);
@@ -110,6 +111,40 @@ export function vfModuleReducer(state: ServiceState , action: Action) : ServiceS
       newState.serviceInstance[serviceUuid].vnfs[updateVFModluePosition.vnfStoreKey].vfModules[modelName][dynamicModelName].position = updateVFModluePosition.node.position;
       return newState;
     }
+
+    case VfModuleActions.UPGRADE_VFMODULE : {
+      let clonedState = _.cloneDeep(state);
+      const upgradeAction = (<UpgradeVfModuleInstanceAction>action);
+      let oldAction = clonedState
+        .serviceInstance[upgradeAction.serviceId]
+        .vnfs[upgradeAction.vnfStoreKey]
+        .vfModules[upgradeAction.modelName][upgradeAction.dynamicModelName]
+        .action;
+      if(!_.isNil(oldAction) && oldAction.includes("Upgrade")) {
+        return clonedState;
+      }
+      clonedState.serviceInstance[upgradeAction.serviceId]
+        .vnfs[upgradeAction.vnfStoreKey]
+        .vfModules[upgradeAction.modelName][upgradeAction.dynamicModelName]
+        .action = (`${oldAction}_Upgrade`) as ServiceInstanceActions;
+      return clonedState;
+    }
+    case VfModuleActions.UNDO_UPGRADE_VFMODULE_ACTION : {
+      let clonedState = _.cloneDeep(state);
+      const upgradeAction = (<UpgradeVfModuleInstanceAction>action);
+      let oldAction = clonedState
+        .serviceInstance[upgradeAction.serviceId]
+        .vnfs[upgradeAction.vnfStoreKey]
+        .vfModules[upgradeAction.modelName][upgradeAction.dynamicModelName]
+        .action;
+      if(!_.isNil(oldAction) && oldAction.includes("Upgrade")) {
+        clonedState.serviceInstance[upgradeAction.serviceId]
+          .vnfs[upgradeAction.vnfStoreKey]
+          .vfModules[upgradeAction.modelName][upgradeAction.dynamicModelName]
+          .action = ServiceInstanceActions.None;
+      }
+      return clonedState;
+    }
   }
 }
 
diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/vnf/vnf.actions.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/vnf/vnf.actions.ts
index 25179fe2e..6fb844e52 100644
--- a/vid-webpack-master/src/app/shared/storeUtil/utils/vnf/vnf.actions.ts
+++ b/vid-webpack-master/src/app/shared/storeUtil/utils/vnf/vnf.actions.ts
@@ -8,7 +8,14 @@ export enum VNFActions {
   REMOVE_VNF_INSTANCE = "REMOVE_VNF_INSTANCE",
   DELETE_ACTION_VNF_INSTANCE = "DELETE_VNF_INSTANCE",
   UNDO_DELETE_ACTION_VNF_INSTANCE = "UNDO_DELETE_VNF_INSTANCE",
-  UPDATE_VNF_POSITION = "UPDATE_VNF_POISTION"
+  UPDATE_VNF_POSITION = "UPDATE_VNF_POISTION",
+  UPGRADE_VNF_ACTION = "UPGRADE_VNF_ACTION",
+  UNDO_UPGRADE_VNF_ACTION = "UNDO_UPGRADE_VNF_ACTION"
+}
+
+export enum VNFMethods{
+  UPGRADE = "upgrade",
+  UNDO_UPGRADE = "undoUpgrade"
 }
 
 
@@ -32,6 +39,16 @@ export interface UpdateVnfInstanceAction extends Action {
   vnfStoreKey?:string;
 }
 
+export interface UpgradeVnfAction extends Action {
+  serviceUuid: string;
+  vnfStoreKey:string;
+}
+
+export interface UndoUpgradeVnfAction extends Action {
+  serviceUuid: string;
+  vnfStoreKey:string;
+}
+
 export interface RemoveVnfInstanceAction extends Action {
   vnfStoreKey: string;
   serviceId?: string;
@@ -82,9 +99,14 @@ export const updateVnfPosition: ActionCreator<UpdateVnfPosition> = (node, instan
   vnfStoreKey : vnfStoreKey
 });
 
+export const upgradeVnf: ActionCreator<UpgradeVnfAction> = (vnfStoreKey, serviceUuid) => ({
+  type: VNFActions.UPGRADE_VNF_ACTION,
+  serviceUuid,
+  vnfStoreKey
+});
 
-
-
-
-
-
+export const undoUpgradeVnf: ActionCreator<UndoUpgradeVnfAction> = (vnfStoreKey, serviceUuid) => ({
+  type: VNFActions.UNDO_UPGRADE_VNF_ACTION,
+  serviceUuid,
+  vnfStoreKey
+});
diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/vnf/vnf.reducers.spec.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/vnf/vnf.reducers.spec.ts
index a5e37fcab..502777518 100644
--- a/vid-webpack-master/src/app/shared/storeUtil/utils/vnf/vnf.reducers.spec.ts
+++ b/vid-webpack-master/src/app/shared/storeUtil/utils/vnf/vnf.reducers.spec.ts
@@ -2,7 +2,7 @@ import {VnfInstance} from "../../../models/vnfInstance";
 import {
   CreateVnfInstanceAction,
   RemoveVnfInstanceAction,
-  UpdateVnfPosition,
+  UpdateVnfPosition, UpgradeVnfAction,
   VNFActions
 } from "./vnf.actions";
 import {vnfReducer} from "./vnf.reducers";
@@ -15,7 +15,7 @@ describe('vnfReducer', () => {
     vnfInstance.isMissingData = false;
     vnfInstance.instanceName = 'instanceName';
     let vnfState = vnfReducer(<any>{
-      serviceInstance : {
+        serviceInstance : {
           'serviceModelId' : {
             vnfs : {
               "vnfStoreKey" : {
@@ -129,7 +129,49 @@ describe('vnfReducer', () => {
     expect(vnfs['vnfStoreKey']).toBeUndefined();
   });
 
-});
+  test('#UPGRADE_VNF_ACTION', () => {
+    const vnfStoreKey: string  = 'vnfStoreKey';
+    const serviceModelId: string  = 'serviceModelId';
+    let vnfs = vnfReducer(<any>{serviceInstance : {
+          [serviceModelId] : {
+            vnfs : {
+              [vnfStoreKey] : {
+                isMissingData : true,
+                action : 'None'
+              }
+            }
+          }
+        }},
+      <UpgradeVnfAction>{
+        type: VNFActions.UPGRADE_VNF_ACTION,
+        vnfStoreKey: vnfStoreKey,
+        serviceUuid: serviceModelId
+      }).serviceInstance[serviceModelId].vnfs[vnfStoreKey];
 
+    expect(vnfs).toBeDefined();
+    expect(vnfs[vnfStoreKey]).toBeUndefined();
+  });
+  test('#UNDO_UPGRADE_VNF_ACTION', () => {
+    const vnfStoreKey: string  = 'vnfStoreKey';
+    const serviceModelId: string  = 'serviceModelId';
+    let vnfs = vnfReducer(<any>{serviceInstance : {
+          [serviceModelId] : {
+            vnfs : {
+              [vnfStoreKey] : {
+                isMissingData : true,
+                action : 'None_Upgrade'
+              }
+            }
+          }
+        }},
+      <UpgradeVnfAction>{
+        type: VNFActions.UNDO_UPGRADE_VNF_ACTION,
+        vnfStoreKey: vnfStoreKey,
+        serviceUuid: serviceModelId
+      }).serviceInstance[serviceModelId].vnfs[vnfStoreKey];
 
+    expect(vnfs).toBeDefined();
+    expect(vnfs[vnfStoreKey]).toBeUndefined();
+  });
 
+});
diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/vnf/vnf.reducers.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/vnf/vnf.reducers.ts
index 072634f2b..c5cd88aa7 100644
--- a/vid-webpack-master/src/app/shared/storeUtil/utils/vnf/vnf.reducers.ts
+++ b/vid-webpack-master/src/app/shared/storeUtil/utils/vnf/vnf.reducers.ts
@@ -3,7 +3,7 @@ import {VnfInstance} from "../../../models/vnfInstance";
 import {
   CreateVnfInstanceAction,
   RemoveVnfInstanceAction,
-  UpdateVnfInstanceAction, UpdateVnfPosition,
+  UpdateVnfInstanceAction, UpdateVnfPosition, UpgradeVnfAction,
   VNFActions
 } from "./vnf.actions";
 import * as _ from "lodash";
@@ -55,7 +55,6 @@ export function vnfReducer(state: ServiceState, action: Action): ServiceState {
 
     case VNFActions.DELETE_ACTION_VNF_INSTANCE : {
       return deleteFirstLevel(state, <ActionOnFirstLevel>action,true);
-
     }
 
     case VNFActions.UNDO_DELETE_ACTION_VNF_INSTANCE : {
@@ -77,13 +76,56 @@ export function vnfReducer(state: ServiceState, action: Action): ServiceState {
 
     case VNFActions.UPDATE_VNF_POSITION : {
       let newState = _.cloneDeep(state);
-      newState.serviceInstance[(<UpdateVnfPosition>action).instanceId].vnfs[(<UpdateVnfPosition>action).vnfStoreKey].position = (<UpdateVnfPosition>action).node.position;
+      newState.serviceInstance[(<UpdateVnfPosition>action).instanceId]
+        .vnfs[(<UpdateVnfPosition>action).vnfStoreKey]
+        .position = (<UpdateVnfPosition>action).node.position;
       return newState;
     }
-  }
-}
 
+    case VNFActions.UPGRADE_VNF_ACTION: {
+      let clonedState = _.cloneDeep(state);
+      const castingAction = <UpgradeVnfAction>action;
+      let oldAction = clonedState
+        .serviceInstance[castingAction.serviceUuid]
+        .vnfs[castingAction.vnfStoreKey].action;
+      if(!oldAction.includes("Upgrade")) {
+        clonedState.serviceInstance[castingAction.serviceUuid]
+          .vnfs[castingAction.vnfStoreKey]
+          .action = (`${oldAction}_Upgrade`) as ServiceInstanceActions;
+      }
+
+      if(_.isNil(clonedState.serviceInstance[castingAction.serviceUuid]
+        .vnfs[castingAction.vnfStoreKey].upgradedVFMSonsCounter)) {
+        clonedState.serviceInstance[castingAction.serviceUuid]
+          .vnfs[castingAction.vnfStoreKey].upgradedVFMSonsCounter = 1;
+        return clonedState;
+      }
+      clonedState.serviceInstance[castingAction.serviceUuid]
+        .vnfs[castingAction.vnfStoreKey].upgradedVFMSonsCounter++;
+      return clonedState;
+    }
 
+    case VNFActions.UNDO_UPGRADE_VNF_ACTION: {
+      let clonedState = _.cloneDeep(state);
+      const castingAction = <UpgradeVnfAction>action;
+      if(clonedState.serviceInstance[castingAction.serviceUuid]
+        .vnfs[castingAction.vnfStoreKey]
+        .action.includes("Upgrade")) {
+        clonedState
+          .serviceInstance[castingAction.serviceUuid]
+          .vnfs[castingAction.vnfStoreKey].upgradedVFMSonsCounter--;
+        if(clonedState.serviceInstance[castingAction.serviceUuid].vnfs[castingAction.vnfStoreKey]
+          .upgradedVFMSonsCounter === 0){
+          clonedState.serviceInstance[castingAction.serviceUuid]
+            .vnfs[castingAction.vnfStoreKey]
+            .action = ServiceInstanceActions.None;
+        }
+      }
+      return clonedState;
+    }
+
+  }
+}
 
 
 const updateUniqueNames = (oldName: string, newName: string, serviceInstance: ServiceInstance): void => {
@@ -108,8 +150,3 @@ export const calculateNextUniqueModelName = (vnfModelName: string, serviceId: st
     }
   }
 };
-
-
-
-
-
diff --git a/vid-webpack-master/src/app/shared/utils/constants.ts b/vid-webpack-master/src/app/shared/utils/constants.ts
index ef289df29..400a4d8dc 100644
--- a/vid-webpack-master/src/app/shared/utils/constants.ts
+++ b/vid-webpack-master/src/app/shared/utils/constants.ts
@@ -82,6 +82,7 @@ export module Constants {
     public static SERVICE_MODLES_INSTANCES_SUBSCRIBERS_PATH = 'serviceModels.htm#/instances/subscribers';
     public static SERVICES_DIST_STATUS_PATH = '../../rest/models/services?distributionStatus=';
     public static SERVICES_PATH = '../../rest/models/services/';
+    public static SERVICE_LATEST_VERSION = '../../aai_get_newest_model_version_by_invariant/';
     public static SERVICETYPE_SUB_PATH = '&serviceType=';
     public static SERVICEINSTANCEID_SUB_PATH = '&serviceInstanceId=';
     public static SERVICEMODELS_INSTANCES_SERVICES_PATH = 'serviceModels.htm#/instances/services';