merge from ecomp a88f0072 - Modern UI

Issue-ID: VID-378
Change-Id: Ibcb23dd27f550cf32ce2fe0239f0f496ae014ff6
Signed-off-by: Ittay Stern <ittay.stern@att.com>

10 files changed, 0 insertions, 1268 deletions

diff --git a/vid-webpack-master/src/app/components/vnf-popup/vnf-instance-details/vnf-instance-details.component.ts b/vid-webpack-master/src/app/components/vnf-popup/vnf-instance-details/vnf-instance-details.component.ts
deleted file mode 100644
index 725e44293..000000000
--- a/vid-webpack-master/src/app/components/vnf-popup/vnf-instance-details/vnf-instance-details.component.ts
+++ /dev/null
@@ -1,275 +0,0 @@
-import {Component, EventEmitter, Input, OnInit, Output, ViewChild} from '@angular/core';
-import {FormControl, FormGroup, Validators} from "@angular/forms";
-import {VNFPopupDataModel} from './vnfPopupDataModel';
-import {AaiService} from '../../../services/aaiService/aai.service';
-import { createVFModuleInstance, updateVFModuleInstance, updateVNFInstance } from '../../../service.actions';
-import {VnfInstance} from "../../../shared/models/vnfInstance";
-import {ServiceInstance} from "../../../shared/models/serviceInstance";
-import {VNFModel} from "../../../shared/models/vnfModel";
-import {InputType} from "../../../shared/models/inputTypes";
-import {ModelInfo} from "../../../shared/models/modelInfo";
-import {VfModuleInstance} from "../../../shared/models/vfModuleInstance";
-import {NgRedux, select} from "@angular-redux/store";
-import {AppState} from "../../../store/reducers";
-import {SelectOptionInterface} from "../../../shared/models/selectOption";
-import {Observable} from "rxjs/Observable";
-import {loadProductFamiliesAction} from "../../../services/aaiService/aai.actions";
-import {VnfInstanceDetailsService} from "./vnf-instance-details.service";
-import {isNullOrUndefined} from 'util';
-import {NumbersLettersUnderscoreValidator} from '../../../shared/components/validators/numbersLettersUnderscore/numbersLettersUnderscore.validator';
-import * as _ from "lodash";
-import {ServiceNodeTypes} from "../../../shared/models/ServiceNodeTypes";
-
-@Component({
-  selector: 'vnf-instance-details',
-  templateUrl: 'vnf-instance-details.html',
-  styleUrls: ['vnf-instance-details.scss'],
-  providers: [AaiService]
-})
-
-export class VnfInstanceDetailsComponent implements OnInit {
-  @ViewChild('vnfForm') vnfForm: 'VnfForm';
-  _vnfModel: VNFModel;
-  @Input ()
-  set vnfModel(vnfModel: VNFModel) {
-    this._vnfModel = vnfModel;
-    this.updateFormGroupControlsFromVNFModel();
-  }
-  @Input() vnfInstance: any;
-  @Input() serviceInstance: ServiceInstance;
-  @Input() dynamicInputs;
-  @Input() modelName: string;
-  @Input() serviceUuid: string;
-  @Input() userProvidedNaming: boolean;
-  _modelType: string;
-  @Input()
-  set modelType(modelType: string) {
-    this._modelType = modelType;
-    this.updateFormGroupControlsFromVNFModel();
-  }
-
-  @Input() parentModelName: string;
-  @Input() isNewVfModule : boolean;
-
-
-  @Output() onSubmitClick: EventEmitter<any> = new EventEmitter<any>();
-  @Output() onServiceInstanceNameChanged :  EventEmitter<boolean> = new EventEmitter<boolean>();
-  @Output() onVolumeGroupNameChanged :  EventEmitter<boolean> = new EventEmitter<boolean>();
-
-@Output() onDataChanged: EventEmitter<any> = new EventEmitter<any>();
-  @select(['service','productFamilies'])
-  readonly productFamilies : Observable<SelectOptionInterface[]>;
-
-  vnfPopupDataModel: VNFPopupDataModel = new VNFPopupDataModel();
-  lcpRegionsThatEnableLegacyRegionField = ['AAIAIC25', 'rdm3', 'rdm5a'];
-  shouldShowLegacyRegion: boolean;
-  instanceFormGroup: FormGroup = null;
-  inputType = InputType;
-  isNotUniqueInstanceName : boolean = false;
-  isNotUniqueVolumeGroupName : boolean = false;
-
-  constructor(private _aaiService: AaiService, private store: NgRedux<AppState>,
-              private _vnfInstanceDetailsService : VnfInstanceDetailsService) {
-    this.store.subscribe(() => {
-      this.updateFormData()
-    });
-  }
-
-  ngOnInit() {
-    this.updateFormGroup();
-    this.subscribeToFormChanges();
-    this._aaiService.getCategoryParameters(null).subscribe();
-    this._aaiService.getLcpRegionsAndTenants(this.serviceInstance.globalSubscriberId, this.serviceInstance.subscriptionServiceType).subscribe();
-    this.updateLegacyRegionVisibility();
-    this.store.dispatch(loadProductFamiliesAction());
-  }
-
-  isInputShouldBeShown(inputType: any) {
-    let vnfInputs = [InputType.LCP_REGION, InputType.LOB, InputType.TENANT, InputType.PRODUCT_FAMILY, InputType.PLATFORM, InputType.ROLLBACK];
-    let vfInputs = [InputType.VG];
-    let exist = false;
-    if (this._modelType === 'VF') {
-      exist = vnfInputs.indexOf(inputType) > -1;
-    }
-    else {
-      exist = vfInputs.indexOf(inputType) > -1;
-    }
-    return exist;
-  }
-
-  updateFormGroupControlsFromVNFModel() {
-    if (this._vnfModel && this._modelType) {
-      if (this._modelType === ServiceNodeTypes.VF) {
-        const vnfInstance = <VnfInstance>this.vnfInstance;
-        if (this.instanceFormGroup && this.userProvidedNaming
-          && !this.instanceFormGroup.get('instanceName')) {
-          const initialInstanceName = vnfInstance.instanceName || (!isNullOrUndefined(this._vnfModel.name) ? this._vnfModel.name.replace(/[-]/g, "") : this._vnfModel.name);
-          this.instanceFormGroup.addControl('instanceName', new FormControl(initialInstanceName, Validators.compose([Validators.required, NumbersLettersUnderscoreValidator.valid])))
-        }
-      }
-      else if (this._modelType === ServiceNodeTypes.VFmodule) {
-        const vfInstance = <VfModuleInstance>this.vnfInstance;
-        if (this.instanceFormGroup && this.userProvidedNaming && !this.instanceFormGroup.get('instanceName')) {
-          this.instanceFormGroup.addControl('instanceName', new FormControl(vfInstance.instanceName, Validators.required));
-
-          let vfModule = this.extractVfAccordingToVfModuleUuid(this.store.getState(), this._vnfModel.uuid);
-          if (vfModule.volumeGroupAllowed && !this.instanceFormGroup.get('volumeGroupName')) {
-            this.instanceFormGroup.addControl('volumeGroupName', new FormControl(vfInstance.volumeGroupName));
-          }
-        }
-      }
-    }
-  }
-
-  updateFormGroup() {
-    const tenantDisabled = !this.vnfInstance.lcpCloudRegionId;
-
-    if (this._modelType === ServiceNodeTypes.VF) {
-      const vnfInstance = <VnfInstance>this.vnfInstance;
-      this.instanceFormGroup = new FormGroup({
-        productFamilyId: new FormControl(vnfInstance.productFamilyId),
-        lcpCloudRegionId: new FormControl(vnfInstance.lcpCloudRegionId, Validators.required),
-        tenantId: new FormControl({value: vnfInstance.tenantId, disabled: tenantDisabled}, Validators.required),
-        legacyRegion: new FormControl(vnfInstance.legacyRegion),
-        lineOfBusiness: new FormControl(vnfInstance.lineOfBusiness),
-        platformName: new FormControl(vnfInstance.platformName, Validators.required),
-      });
-    }
-    else if (this._modelType === ServiceNodeTypes.VFmodule) {
-      const vfInstance = <VfModuleInstance>this.vnfInstance;
-      this.instanceFormGroup = new FormGroup({
-      });
-    }
-
-    this.instanceFormGroup.valueChanges.subscribe(()=> {
-      this.checkForUniqueInstanceName();
-      this.onDataChanged.next();
-    });
-
-    this.updateFormGroupControlsFromVNFModel();
-  }
-
-  private getParentVnfModel(): VNFModel {
-    const rawModel = _.get(this.store.getState().service.serviceHierarchy[this.serviceUuid], ['vnfs', this.parentModelName]);
-    return new VNFModel(rawModel);
-  }
-
-  extractVfAccordingToVfModuleUuid(state : any,vfModuleUuid : string) {
-    const vnfs = this.store.getState().service.serviceHierarchy[this.serviceUuid].vnfs;
-    const vnfsArray = Object.values(vnfs);
-    for (let i = 0; i<vnfsArray.length;i++){
-      let vfModules = Object.values(vnfsArray[i].vfModules);
-      for (let j = 0; j<vfModules.length;j++){
-        if (vfModules[j].uuid === vfModuleUuid){
-          return vfModules[j];
-        }
-      }
-    }
-  }
-
-  updateFormData() {
-    let service = this.store.getState().service;
-    this.vnfPopupDataModel.lcpRegions = service.lcpRegionsAndTenants.lcpRegionList;
-    if (this.vnfInstance && this.vnfInstance.lcpCloudRegionId) {
-      this.vnfPopupDataModel.tenants = service.lcpRegionsAndTenants.lcpRegionsTenantsMap[this.vnfInstance.lcpCloudRegionId];
-      console.log('setting vnf instances tenant: ' + JSON.stringify(this.vnfPopupDataModel.tenants));
-    }
-    this.vnfPopupDataModel.platforms = service.categoryParameters.platformList;
-    this.vnfPopupDataModel.lineOfBusinesses = service.categoryParameters.lineOfBusinessList;
-    this.onDataChanged.next();
-  }
-
-  subscribeToFormChanges(): void {
-    if (this.instanceFormGroup.get('lcpCloudRegionId') !== null) {
-      this.instanceFormGroup.get('lcpCloudRegionId').valueChanges.subscribe(val => {
-        this.setDisabledState(val, 'tenantId');
-        this.updateTenantList(val);
-        this.updateLegacyRegionVisibility();
-        this.onDataChanged.next();
-      });
-    }
-  }
-
-  setDisabledState(val, field: string): void {
-    if (val) {
-      this.instanceFormGroup.controls[field].enable();
-    }
-  }
-
-  updateLegacyRegionVisibility() {
-    if (this.instanceFormGroup.get('lcpCloudRegionId') !== null) {
-      this.shouldShowLegacyRegion = this.lcpRegionsThatEnableLegacyRegionField.indexOf(this.instanceFormGroup.get('lcpCloudRegionId').value) > -1;
-      if (!this.shouldShowLegacyRegion) {
-        this.instanceFormGroup.controls.legacyRegion.setValue(undefined);
-      }
-    }
-  }
-
-  updateTenantList(cloudRegionId) {
-    this.resetTenantSelection();
-    const tenantsForCloudRegionId = this.store.getState().service.lcpRegionsAndTenants.lcpRegionsTenantsMap[cloudRegionId];
-    console.log('tenants for selected cloud region id: ' + JSON.stringify(tenantsForCloudRegionId));
-    this.vnfPopupDataModel.tenants = tenantsForCloudRegionId;
-  }
-
-  resetTenantSelection() {
-    this.instanceFormGroup.controls.tenantId.setValue(undefined);
-  }
-
-  checkForUniqueInstanceName() {
-    let currentName = !isNullOrUndefined(this.instanceFormGroup.get('instanceName')) ? this.instanceFormGroup.get('instanceName').value : null;
-
-    if(currentName && !this._vnfInstanceDetailsService.isUnique(this.store.getState().service.serviceInstance, this.serviceUuid, currentName, currentName === this.serviceInstance.instanceName) && this.userProvidedNaming){
-      this.isNotUniqueInstanceName = true;
-      this.onServiceInstanceNameChanged.emit(true);
-    }else {
-      this.isNotUniqueInstanceName = false;
-      this.onServiceInstanceNameChanged.emit(false);
-    }
-  }
-
-  checkForUniqueGroupName(){
-    let currentName = this.instanceFormGroup.get('volumeGroupName').value;
-    if( !this._vnfInstanceDetailsService.isUnique(this.store.getState().service.serviceInstance, this.serviceUuid, currentName, currentName === this.serviceInstance['volumeGroupName'])){
-      this.isNotUniqueVolumeGroupName = true;
-      this.onVolumeGroupNameChanged.emit(true);
-    }else {
-      this.isNotUniqueVolumeGroupName = false;
-      this.onVolumeGroupNameChanged.emit(false);
-    }
-  }
-
-  onSubmit(formValues): void {
-    formValues.modelInfo = new ModelInfo(this._vnfModel);
-    if (this._modelType === 'VFmodule') {
-      let dynamicFields: { [dynamicField: string]: string; };
-      dynamicFields = {};
-      if(!_.isEmpty(this.dynamicInputs)) {
-        this.dynamicInputs.map(function (x) {
-          let dynamicField: string = x.id;
-          dynamicFields[dynamicField] = formValues[dynamicField];
-          delete formValues[dynamicField];
-        });
-      }
-      formValues.instanceParams = [];
-      formValues.instanceParams.push(dynamicFields);
-      if(this.isNewVfModule){
-        this.store.dispatch(createVFModuleInstance(formValues, this.modelName, this.serviceUuid));
-      }else {
-        this.store.dispatch(updateVFModuleInstance(formValues, this.modelName, this.serviceUuid));
-      }
-
-    }
-    else {
-      formValues.isUserProvidedNaming = this.userProvidedNaming;
-      this.store.dispatch(updateVNFInstance(formValues, this.modelName, this.serviceUuid));
-    }
-    window.parent.postMessage({
-      eventId: 'submitIframe',
-      data: {
-        serviceModelId: this.serviceUuid
-      }
-    }, "*");
-    this.onSubmitClick.emit(this.serviceUuid);
-  }
-}
diff --git a/vid-webpack-master/src/app/components/vnf-popup/vnf-instance-details/vnf-instance-details.html b/vid-webpack-master/src/app/components/vnf-popup/vnf-instance-details/vnf-instance-details.html
deleted file mode 100644
index ccdaac53b..000000000
--- a/vid-webpack-master/src/app/components/vnf-popup/vnf-instance-details/vnf-instance-details.html
+++ /dev/null
@@ -1,114 +0,0 @@
-
-<div id="vnf-instance-details">
-  <form id="vnfForm" #vnfForm="ngForm" (ngSubmit)="onSubmit(vnfForm.value)" [formGroup]="instanceFormGroup">
-
-    <div class="details-item" *ngIf="instanceFormGroup.get('instanceName')">
-      <label class="required">Instance name:</label>
-      <input patternInput
-             pattern="^[a-zA-Z0-9_]*$"
-            [attr.data-tests-id]="'instanceName'"
-             [ngClass]="{'error-style' : _vnfInstanceDetailsService.hasInstanceNameError(instanceFormGroup) || _vnfInstanceDetailsService.hasUniqueError(isNotUniqueInstanceName)}"
-             id="instance-name" name="instance-name"
-             [formControlName]="'instanceName'"
-             class="form-control input-text"
-             placeholder="Type Instance Name"
-             type="text"
-             (blur)="checkForUniqueInstanceName()">
-      <form-control-error *ngIf="_vnfInstanceDetailsService.hasUniqueError(isNotUniqueInstanceName)" [message]="'Instance name is already in use, please pick another name.'"></form-control-error>
-      <form-control-error *ngIf="_vnfInstanceDetailsService.hasInstanceNameError(instanceFormGroup)" [message]="'Instance name may include only alphanumeric characters and underscore.'"></form-control-error>
-    </div>
-
-    <div *ngIf="isInputShouldBeShown(inputType.PRODUCT_FAMILY)" class="details-item">
-      <label>Product family:</label>
-      <select class="form-control input-text"
-              [ngClass]="{'error-style' :_vnfInstanceDetailsService.hasApiError('productFamilyId',productFamilies, instanceFormGroup)}"
-              data-tests-id="productFamily"
-              id="product-family-select"
-              [formControlName]="'productFamilyId'"
-              name="product-family-select" >
-        <option [value]="null" disabled>Select Product Family</option>
-        <option *ngFor="let productFamily of productFamilies | async" [value]="productFamily.id"
-                [disabled]="!productFamily.isPermitted">{{productFamily.name}}</option>
-      </select>
-      <form-control-error *ngIf="_vnfInstanceDetailsService.hasApiError('productFamilyId',productFamilies, instanceFormGroup)" [message]="'No results for this request. Please change criteria.'"></form-control-error>
-    </div>
-
-    <div *ngIf="isInputShouldBeShown(inputType.LCP_REGION)" class="details-item">
-      <label class="required">LCP region:</label>
-      <select
-        [ngClass]="{'error-style' :_vnfInstanceDetailsService.hasApiError('lcpCloudRegionId',vnfPopupDataModel?.lcpRegions, instanceFormGroup)}"
-        class="form-control input-text"
-        [formControlName]="'lcpCloudRegionId'"
-        name="lcpRegion" id="lcpRegion-select"
-        data-tests-id="lcpRegion">
-        <option [value]="null" disabled>Select LCP Region</option>
-        <option *ngFor="let lcpRegion of vnfPopupDataModel.lcpRegions" [value]="lcpRegion.id" [disabled]="!lcpRegion.isPermitted" class="lcpRegionOption">{{lcpRegion.id}}</option>
-      </select>
-      <form-control-error *ngIf="_vnfInstanceDetailsService.hasApiError('lcpCloudRegionId',vnfPopupDataModel?.lcpRegions, instanceFormGroup)" [message]="'No results for this request. Please change criteria.'"></form-control-error>
-    </div>
-
-    <div class="details-item" *ngIf="shouldShowLegacyRegion">
-      <label>Legacy Region:</label>
-      <input
-        [attr.data-tests-id]="'lcpRegionText'"
-        id="legacy-region"
-        name="legacy-region"
-        [formControlName]="'legacyRegion'"
-        class="form-control input-text"
-             placeholder="Type Legacy Region" type="text">
-    </div>
-
-    <div *ngIf="isInputShouldBeShown(inputType.TENANT)" class="details-item">
-      <label class="required">Tenant:</label>
-      <select class="form-control input-text"
-              [ngClass]="{'error-style' :_vnfInstanceDetailsService.hasApiError('tenantId',vnfPopupDataModel?.tenants, instanceFormGroup)}"
-              [formControlName]="'tenantId'"
-              name="tenant" id="tenant-select" data-tests-id="tenant">
-        <option [value]="undefined" disabled>Select Tenant</option>
-        <option *ngFor="let tenant of vnfPopupDataModel.tenants" [value]="tenant.id" [disabled]="!tenant.isPermitted">{{tenant.name}}</option>
-      </select>
-      <form-control-error *ngIf="_vnfInstanceDetailsService.hasApiError('tenantId',vnfPopupDataModel?.tenants, instanceFormGroup)" [message]="'No results for this request. Please change criteria.'"></form-control-error>
-    </div>
-
-    <div *ngIf="isInputShouldBeShown(inputType.LOB)"  class="details-item">
-      <label>Line of business:</label>
-      <select [attr.data-tests-id]="'lineOfBusiness'"
-              class="form-control input-text"
-              [ngClass]="{'error-style' :_vnfInstanceDetailsService.hasApiError('lineOfBusiness',vnfPopupDataModel?.lineOfBusinesses, instanceFormGroup)}"
-              name="lineOfBusiness" id="lineOfBusiness"
-              [formControlName]="'lineOfBusiness'">
-        <option [value]="null" disabled>Select Line Of Business</option>
-        <option *ngFor="let project of vnfPopupDataModel.lineOfBusinesses" [value]="project.id">{{project.name}}</option>
-      </select>
-      <form-control-error *ngIf="_vnfInstanceDetailsService.hasApiError('lineOfBusiness',vnfPopupDataModel?.lineOfBusinesses, instanceFormGroup)" [message]="'No results for this request. Please change criteria.'"></form-control-error>
-    </div>
-
-    <div *ngIf="isInputShouldBeShown(inputType.PLATFORM)" class="details-item">
-      <label class="required">Platform:</label>
-      <select
-        [attr.data-tests-id]="'platform'"
-        [ngClass]="{'error-style' :_vnfInstanceDetailsService.hasApiError('platformName',vnfPopupDataModel?.platforms, instanceFormGroup)}"
-        class="form-control input-text"
-        [formControlName]="'platformName'"
-        name="platform" id="platform">
-        <option [value]="null" disabled>Select Platform</option>
-        <option *ngFor="let platform of vnfPopupDataModel.platforms" [value]="platform.id">{{platform.name}}</option>
-      </select>
-      <form-control-error *ngIf="_vnfInstanceDetailsService.hasApiError('platformName',vnfPopupDataModel?.platforms, instanceFormGroup)" [message]="'No results for this request. Please change criteria.'"></form-control-error>
-    </div>
-
-
-    <div *ngIf="isInputShouldBeShown(inputType.VG) && instanceFormGroup.get('volumeGroupName')" class="details-item" >
-      <label class="required">Volume Group Name:</label>
-      <input [attr.data-tests-id]="'volumeGroupName'"
-             id="vgName" name="vgName"
-             [ngClass]="{'error-style' :isNotUniqueVolumeGroupName}"
-             [formControlName]="'volumeGroupName'"
-             class="form-control input-text"
-             placeholder="Type Instance Name" type="text" (blur)="checkForUniqueGroupName()">
-      <form-control-error *ngIf="isNotUniqueVolumeGroupName" [message]="'Volume Group instance name is already in use, please pick another name.'"></form-control-error>
-    </div>
-
-    <dynamic-inputs *ngIf="dynamicInputs != undefined && dynamicInputs.length>0" [group]="instanceFormGroup" [list]="dynamicInputs"></dynamic-inputs>
-  </form>
-</div>
diff --git a/vid-webpack-master/src/app/components/vnf-popup/vnf-instance-details/vnf-instance-details.scss b/vid-webpack-master/src/app/components/vnf-popup/vnf-instance-details/vnf-instance-details.scss
deleted file mode 100644
index 080540a57..000000000
--- a/vid-webpack-master/src/app/components/vnf-popup/vnf-instance-details/vnf-instance-details.scss
+++ /dev/null
@@ -1,64 +0,0 @@
-#vnf-instance-details {
-  position: relative;
-
-  #notification-area {
-    color: #959595;
-    font-size: 12px;
-    position: absolute;
-    top: 3px;
-    left: 30px;
-  }
-
-  height: 100%;
-  overflow: auto;
-  padding: 30px;
-
-  /deep/ {
-    .form-control {
-      border-radius: 2px;
-      box-shadow: none;
-      border-color: #D2D2D2;
-    }
-
-    label {
-      font-family: OpenSans-Semibold;
-      font-size: 12px;
-    }
-
-    select {
-      @extend .form-control;
-      -webkit-appearance: none;
-      -moz-appearance: none;
-      appearance: none;
-      background: url('../../../../assets/img/chevron.svg') 0 0 no-repeat;
-      background-size: 24px;
-      background-position-x: right;
-      background-position-y: center;
-      font-family: OpenSans-Italic;
-      font-size: 14px;
-      color: #959595;
-      height: 38px;
-    }
-
-    input:not([type='checkbox']) {
-      @extend .form-control;
-      height: 38px;
-    }
-
-    .form-control[disabled], fieldset[disabled] .form-control {
-      opacity: 0.5;
-    }
-    .input-text {
-      border: 1px solid #D2D2D2;
-      border-radius: 2px;
-    }
-
-    .details-item {
-      margin-bottom: 20px;
-    }
-  }
-
-    .checkbox-label {
-      font-family: OpenSans-Regular;
-    }
-}
diff --git a/vid-webpack-master/src/app/components/vnf-popup/vnf-instance-details/vnf-instance-details.service.spec.ts b/vid-webpack-master/src/app/components/vnf-popup/vnf-instance-details/vnf-instance-details.service.spec.ts
deleted file mode 100644
index 41ddb4372..000000000
--- a/vid-webpack-master/src/app/components/vnf-popup/vnf-instance-details/vnf-instance-details.service.spec.ts
+++ /dev/null
@@ -1,241 +0,0 @@
-import { TestBed, getTestBed } from '@angular/core/testing';
-import {
-  HttpClientTestingModule,
-  HttpTestingController
-} from '@angular/common/http/testing';
-import { VnfInstanceDetailsService } from './vnf-instance-details.service';
-import { FormControl, FormGroup, Validators } from '@angular/forms';
-import { NumbersLettersUnderscoreValidator } from '../../../shared/components/validators/numbersLettersUnderscore/numbersLettersUnderscore.validator';
-
-describe('Vnf Instance Details Service', () => {
-  let injector;
-  let service: VnfInstanceDetailsService;
-  let httpMock: HttpTestingController;
-
-  let SERVICE_ID: string = '1a80c596-27e5-4ca9-b5bb-e03a7fd4c0fd';
-  let serviceHierarchy;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
-      providers: [VnfInstanceDetailsService]
-    });
-
-    injector = getTestBed();
-    service = injector.get(VnfInstanceDetailsService);
-    httpMock = injector.get(HttpTestingController);
-    serviceHierarchy = getServiceServiceHierarchy();
-  });
-
-
-  describe('#hasInstanceNameError', ()=> {
-    it('hasInstanceNameError should return true if instanceName is illegal and enabled', (done: DoneFn) => {
-      let form = generateFormGroup();
-      form.controls['instanceName'].setValue('----');
-      form.controls['instanceName'].setErrors({
-        pattern : true
-      });
-      form.controls['instanceName'].markAsTouched();
-      let result = service.hasInstanceNameError(form);
-      expect(result).toBeTruthy();
-      done();
-    });
-
-    it('hasInstanceNameError should return false if instanceName is illegal and enabled and pattern is ok', (done: DoneFn) => {
-      let form = generateFormGroup();
-      form.controls['instanceName'].setValue('----');
-      form.controls['instanceName'].setErrors({
-        otherError : true
-      });
-      form.controls['instanceName'].markAsTouched();
-      let result = service.hasInstanceNameError(form);
-      expect(result).toBeFalsy();
-      done();
-    });
-  });
-
-  describe('#isUnique', () => {
-    it('Create Mode: should return false if instanceName exist', (done: DoneFn) => {
-      serviceHierarchy = getServiceServiceHierarchy();
-      let result = service.isUnique(serviceHierarchy, SERVICE_ID, 'uniqueInstanceName', false);
-      expect(result).toBeFalsy();
-      done();
-    });
-
-    it('Update Mode: should return true if instanceName exist once', (done: DoneFn) => {
-      let result = service.isUnique(serviceHierarchy, SERVICE_ID, 'uniqueInstanceName', true);
-      expect(result).toBeTruthy()
-      done();
-    });
-
-    it('Create Mode: should return true if instanceName not exist', (done: DoneFn) => {
-      let result = service.isUnique(serviceHierarchy, SERVICE_ID, 'uniqueInstanceNameNotExist', false);
-      expect(result).toBeTruthy();
-      done();
-    });
-
-    it('Create Mode: should return false if instanceName exist inside vf modules', (done: DoneFn) => {
-      let result = service.isUnique(serviceHierarchy, SERVICE_ID, 'uniqueInstanceNameVfModule', false);
-      expect(result).toBeFalsy();
-      done();
-    });
-
-    it('Update Mode: should return true if instanceName  exist once inside vf modules', (done: DoneFn) => {
-      let result = service.isUnique(serviceHierarchy, SERVICE_ID, 'uniqueInstanceNameVfModule', true);
-      expect(result).toBeTruthy();
-      done();
-    });
-
-    it('Create Mode: should return true if instanceName is not exist at vf modules and vnfs', (done: DoneFn) => {
-      let result = service.isUnique(serviceHierarchy, SERVICE_ID, 'uniqueInstanceNameVfModuleNotExist', false);
-      expect(result).toBeTruthy();
-      done();
-    });
-
-    it('Create Mode: should return false if instanceName exist service name', (done: DoneFn) => {
-      let result = service.isUnique(serviceHierarchy, SERVICE_ID, 'Instance-Name', false);
-      expect(result).toBeFalsy();
-      done();
-    });
-
-    it('Create Mode: should return false if volumeGroupName exist service name', (done: DoneFn) => {
-      let result = service.isUnique(serviceHierarchy, SERVICE_ID, 'volumeGroupNameExist', false);
-      expect(result).toBeFalsy();
-      done();
-    });
-
-    it('Create Mode: should return true if volumeGroupName not exist service name', (done: DoneFn) => {
-      let result = service.isUnique(serviceHierarchy, SERVICE_ID, 'volumeGroupNameNotExist', false);
-      expect(result).toBeTruthy();
-      done();
-    });
-  });
-
-  function getServiceServiceHierarchy() {
-    return JSON.parse(JSON.stringify(
-      {
-        "1a80c596-27e5-4ca9-b5bb-e03a7fd4c0fd": {
-          "vnfs": {
-            "2017-388_ADIOD-vPE 1": {
-              "rollbackOnFailure": "true",
-              "vfModules": {},
-              "instanceParams": [
-                {}
-              ],
-              "productFamilyId": "a4f6f2ae-9bf5-4ed7-b904-06b2099c4bd7",
-              "lcpCloudRegionId": "AAIAIC25",
-              "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
-              "lineOfBusiness": "zzz1",
-              "platformName": "platform",
-              "instanceName": "uniqueInstanceName",
-              "modelInfo": {
-                "modelInvariantId": "00beb8f9-6d39-452f-816d-c709b9cbb87d",
-                "modelVersionId": "0903e1c0-8e03-4936-b5c2-260653b96413",
-                "modelName": "2017-388_ADIOD-vPE",
-                "modelVersion": "1.0",
-                "modelCustomizationId": "280dec31-f16d-488b-9668-4aae55d6648a",
-                "modelCustomizationName": "2017-388_ADIOD-vPE 1"
-              },
-              "isUserProvidedNaming": true
-            },
-            "2017-388_ADIOD-vPE 0": {
-              "rollbackOnFailure": "true",
-              "vfModules": {},
-              "instanceParams": [
-                {}
-              ],
-              "productFamilyId": null,
-              "lcpCloudRegionId": "mtn6",
-              "tenantId": "1178612d2b394be4834ad77f567c0af2",
-              "lineOfBusiness": "ECOMP",
-              "platformName": "xxx1",
-              "instanceName": "blaaa",
-              "modelInfo": {
-                "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-                "modelVersionId": "afacccf6-397d-45d6-b5ae-94c39734b168",
-                "modelName": "2017-388_ADIOD-vPE",
-                "modelVersion": "4.0",
-                "modelCustomizationId": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c",
-                "modelCustomizationName": "2017-388_ADIOD-vPE 0"
-              },
-              "isUserProvidedNaming": true
-            },
-            "2017488_ADIODvPE 0": {
-              "rollbackOnFailure": "true",
-              "vfModules": {
-                "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
-                  "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
-                    "rollbackOnFailure": "true",
-                    "instanceName": "uniqueInstanceNameVfModule",
-                    "volumeGroupName": "volumeGroupNameExist",
-                    "modelInfo": {
-                      "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
-                      "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5",
-                      "modelName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
-                      "modelVersion": "6"
-                    }
-                  }
-                }
-              },
-              "instanceParams": [
-                {}
-              ],
-              "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-              "lcpCloudRegionId": "mtn6",
-              "tenantId": "19c5ade915eb461e8af52fb2fd8cd1f2",
-              "lineOfBusiness": "zzz1",
-              "platformName": "platform",
-              "instanceName": "2017488_ADIODvPE",
-              "modelInfo": {
-                "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-                "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
-                "modelName": "2017488_ADIODvPE",
-                "modelVersion": "5.0",
-                "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45",
-                "modelCustomizationName": "2017488_ADIODvPE 0"
-              },
-              "isUserProvidedNaming": true
-            }
-          },
-          "instanceParams": [
-            {}
-          ],
-          "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
-          "productFamilyId": "17cc1042-527b-11e6-beb8-9e71128cae77",
-          "subscriptionServiceType": "VIRTUAL USP",
-          "lcpCloudRegionId": "AAIAIC25",
-          "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
-          "aicZoneId": "DKJ1",
-          "projectName": "DFW",
-          "owningEntityId": "aaa1",
-          "instanceName": "Instance-Name",
-          "bulkSize": 1,
-          "modelInfo": {
-            "modelInvariantId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
-            "modelVersionId": "1a80c596-27e5-4ca9-b5bb-e03a7fd4c0fd",
-            "modelName": "action-data",
-            "modelVersion": "1.0"
-          },
-          "tenantName": "USP-SIP-IC-24335-T-01",
-          "aicZoneName": "DKJSJDKA-DKJ1",
-          "isUserProvidedNaming": true
-        }
-      }
-    ));
-  }
-
-  function generateFormGroup() {
-    return new FormGroup({
-      productFamilyId: new FormControl(),
-      lcpCloudRegionId: new FormControl(Validators.required),
-      tenantId: new FormControl({value: null, disabled: false}, Validators.required),
-      legacyRegion: new FormControl(),
-      lineOfBusiness: new FormControl(),
-      platformName: new FormControl(Validators.required),
-      rollbackOnFailure: new FormControl(Validators.required),
-      instanceName: new FormControl({value: null}, Validators.compose([Validators.required, NumbersLettersUnderscoreValidator.valid]))
-
-    });
-  }
-
-});
diff --git a/vid-webpack-master/src/app/components/vnf-popup/vnf-instance-details/vnf-instance-details.service.ts b/vid-webpack-master/src/app/components/vnf-popup/vnf-instance-details/vnf-instance-details.service.ts
deleted file mode 100644
index 677895e72..000000000
--- a/vid-webpack-master/src/app/components/vnf-popup/vnf-instance-details/vnf-instance-details.service.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { Injectable } from '@angular/core';
-import { isNullOrUndefined } from "util";
-import { FormGroup } from '@angular/forms';
-@Injectable()
-export class VnfInstanceDetailsService {
-  isUnique(serviceInstance : any, serviceId : string, name: string, isEqualToOriginalInstanceName : boolean) : boolean {
-    const service = serviceInstance[serviceId];
-    let countInstanceName = 0;
-    let countVolumeGroupName = 0;
-    if(service){
-      if(service.instanceName === name) return false;
-      if(service.vnfs){
-        for(let key in service.vnfs){
-          if(service.vnfs[key].instanceName === name) {
-            countInstanceName++;
-            if((isEqualToOriginalInstanceName && countInstanceName > 1) || (!isEqualToOriginalInstanceName)) return false;
-          }
-          if(service.vnfs[key].vfModules){
-            for(let vfModule in service.vnfs[key].vfModules){
-              if(service.vnfs[key].vfModules[vfModule]) {
-                for(let module in service.vnfs[key].vfModules[vfModule]){
-                  if(service.vnfs[key].vfModules[vfModule][module].instanceName === name ) {
-                    countInstanceName++;
-                    if((isEqualToOriginalInstanceName && countInstanceName > 1) || (!isEqualToOriginalInstanceName)) return false;
-                  }
-
-                  if(service.vnfs[key].vfModules[vfModule][module].volumeGroupName === name ) {
-                    countVolumeGroupName++;
-                    if((isEqualToOriginalInstanceName && countVolumeGroupName > 1) || (!isEqualToOriginalInstanceName)) return false;
-                  }
-                }
-              }
-            }
-          }
-
-        }
-      }
-    }
-    return true;
-  }
-
-  hasApiError(controlName: string, data: Array<any>, form: FormGroup) {
-    if (!isNullOrUndefined(data)) {
-      if (!form.controls[controlName].disabled && data.length === 0) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  hasInstanceNameError(form : FormGroup) : boolean {
-    if(!isNullOrUndefined(form) && !isNullOrUndefined(form.controls['instanceName'])){
-      if (form.controls['instanceName'].touched && form.controls['instanceName'].errors && form.controls['instanceName'].errors.pattern) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  hasUniqueError(isNotUniqueInstanceName) : boolean {
-    return isNotUniqueInstanceName;
-  }
-
-}
diff --git a/vid-webpack-master/src/app/components/vnf-popup/vnf-instance-details/vnfPopupDataModel.ts b/vid-webpack-master/src/app/components/vnf-popup/vnf-instance-details/vnfPopupDataModel.ts
deleted file mode 100644
index 9a2694c70..000000000
--- a/vid-webpack-master/src/app/components/vnf-popup/vnf-instance-details/vnfPopupDataModel.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import {Project} from "../../../shared/models/project";
-import {LcpRegion} from "../../../shared/models/lcpRegion";
-import {Tenant} from "../../../shared/models/tenant";
-import {ProductFamily} from "../../../shared/models/productFamily";
-import {SelectOption, SelectOptionInterface} from "../../../shared/models/selectOption";
-
-export class VNFPopupDataModel {
-  productFamilies: ProductFamily[];
-  lcpRegions: LcpRegion[];
-  lcpRegionsTenantsMap: any;
-  tenants: Tenant[];
-  projects: Project[];
-  lineOfBusinesses: SelectOption[];
-  platforms: SelectOptionInterface[];
-  globalCustomerId: string;
-
-
-  constructor(){
-      this.lcpRegions = [];
-      this.lcpRegionsTenantsMap = {};
-      this.tenants = [];
-      this.productFamilies = [];
-      this.lineOfBusinesses = [];
-      this.platforms = [];
-  }
-}
diff --git a/vid-webpack-master/src/app/components/vnf-popup/vnf-popup-service.ts b/vid-webpack-master/src/app/components/vnf-popup/vnf-popup-service.ts
deleted file mode 100644
index 7dbe9b11b..000000000
--- a/vid-webpack-master/src/app/components/vnf-popup/vnf-popup-service.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import {Injectable} from "@angular/core";
-import {ServiceNodeTypeToModelKeyMapper} from "../../shared/models/serviceNodeTypeToModelKeyMapper";
-import {ServiceNodeTypes} from "../../shared/models/ServiceNodeTypes";
-import {VfModule} from "../../shared/models/vfModule";
-import {ServicePlanningService} from "../../services/service-planning.service";
-import {VNFModel} from "../../shared/models/vnfModel";
-import * as _ from 'lodash';
-import {isNullOrUndefined} from "util";
-import {NumbersLettersUnderscoreValidator} from '../../shared/components/validators/numbersLettersUnderscore/numbersLettersUnderscore.validator';
-import {FormGroup} from '@angular/forms';
-import {VnfInstanceDetailsComponent} from './vnf-instance-details/vnf-instance-details.component';
-import {VnfInstanceDetailsService} from './vnf-instance-details/vnf-instance-details.service';
-
-@Injectable()
-export class VnfPopupService {
-
-  constructor(private _servicePlanningService : ServicePlanningService, private _vnfInstanceDetailsService : VnfInstanceDetailsService) {
-  }
-
-  public getModelFromResponse(result : any, modelType : string, modelName:string) {
-    let model = null;
-    let rawModel = _.get(result, [ServiceNodeTypeToModelKeyMapper[modelType], modelName]);
-    if (!rawModel) return;
-
-    if (modelType === ServiceNodeTypes.VFmodule) {
-      model = new VfModule(rawModel);
-    }
-    else {
-      model = new VNFModel(rawModel);
-    }
-    return model;
-  }
-
-  onControlError(servicePopupDataModel : VnfInstanceDetailsComponent, serviceInstanceDetailsFormGroup : FormGroup, isNotUniqueInstanceName : boolean, isNotUniqueVolumeGroupName : boolean) : boolean{
-    if(this._vnfInstanceDetailsService.hasUniqueError(isNotUniqueInstanceName) || isNotUniqueVolumeGroupName){
-      return true;
-    }
-    if(!isNullOrUndefined(serviceInstanceDetailsFormGroup.controls['instanceName']) && NumbersLettersUnderscoreValidator.valid(serviceInstanceDetailsFormGroup.controls['instanceName'].value) && serviceInstanceDetailsFormGroup.controls['instanceName'].value != null && serviceInstanceDetailsFormGroup.controls['instanceName'].value.length > 0){
-      return true;
-    }
-
-    const controlName : Array<string> =  ['lcpCloudRegionId', 'tenantId', 'lineOfBusiness', 'platformName'];
-    const selectDataName : Array<string> = ['lcpRegions', 'tenants', 'lineOfBusinesses', 'platforms', 'projects'];
-
-    for(let i = 0 ; i < controlName.length ; i++){
-      if (!isNullOrUndefined(servicePopupDataModel.vnfPopupDataModel) && !isNullOrUndefined(servicePopupDataModel.vnfPopupDataModel[selectDataName[i]])) {
-        if (!isNullOrUndefined(serviceInstanceDetailsFormGroup.controls[controlName[i]]) && !serviceInstanceDetailsFormGroup.controls[controlName[i]].disabled && servicePopupDataModel.vnfPopupDataModel[selectDataName[i]].length === 0) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-
-}
diff --git a/vid-webpack-master/src/app/components/vnf-popup/vnf-popup.components.ts b/vid-webpack-master/src/app/components/vnf-popup/vnf-popup.components.ts
deleted file mode 100644
index 26e667d4c..000000000
--- a/vid-webpack-master/src/app/components/vnf-popup/vnf-popup.components.ts
+++ /dev/null
@@ -1,190 +0,0 @@
-import {Component, OnInit, ViewChild} from "@angular/core";
-import {AaiService} from "../../services/aaiService/aai.service";
-import {ModelInformationItem} from "../../shared/components/model-information/model-information.component";
-import {ActivatedRoute} from "@angular/router";
-import {DialogComponent, DialogService} from "ng2-bootstrap-modal";
-import {InstancePopup} from "../instance-popup/instance-popup.components";
-import {ServiceModel} from "../../shared/models/serviceModel";
-import {Constants} from "../../shared/utils/constants";
-import * as _ from "lodash";
-import {VnfInstance} from "../../shared/models/vnfInstance";
-import {ServiceInstance} from "../../shared/models/serviceInstance";
-import {VnfInstanceDetailsComponent} from "./vnf-instance-details/vnf-instance-details.component";
-import {Subscriber} from "../../shared/models/subscriber";
-import {ServiceNodeTypes} from "../../shared/models/ServiceNodeTypes";
-import {AppState} from "../../store/reducers";
-import {NgRedux} from "@angular-redux/store";
-import {VfModuleInstance} from "../../shared/models/vfModuleInstance";
-import {VnfPopupService} from './vnf-popup-service';
-import {IframeService} from "../../shared/utils/iframe.service";
-
-export interface VnfPopupModel {
-  serviceModelId: string;
-  modelName: string;
-  parentModelName: string;
-  modelType: string;
-  dynamicInputs: any;
-  userProvidedNaming: boolean;
-  isNewVfModule : boolean;
-}
-
-@Component({
-  selector: 'vnf-popup',
-  templateUrl: 'vnf-popup.html',
-  styleUrls: ['vnf-popup.scss'],
-  providers: [AaiService, VnfPopupService]
-})
-
-export class VnfPopupComponent extends DialogComponent<VnfPopupModel, boolean> implements VnfPopupModel, InstancePopup, OnInit {
-
-  @ViewChild(VnfInstanceDetailsComponent) vnfInstanceDetails: VnfInstanceDetailsComponent;
-
-  serviceModelId: string;
-  modelName: string;
-  parentModelName: string;
-  modelType: string;
-  isNewVfModule : boolean;
-  model: any;
-  serviceModel: ServiceModel;
-  popupTypeName: string;
-  serviceInstance: ServiceInstance;
-  vnfInstance: VnfInstance;
-  dynamicInputs;
-  userProvidedNaming: boolean;
-  typeMapperForTitle = {
-    VF: "VNF",
-    VFmodule: "Module (Heat stack)"
-  };
-
-  modelInformationItems: Array<ModelInformationItem> = [];
-  isNotUniqueInstanceName : boolean = false;
-  isNotUniqueVolumeGroupName : boolean = false;
-  hasGeneralApiError : boolean = false;
-
-  parentElementClassName = 'content';
-
-  constructor(dialogService: DialogService, protected route: ActivatedRoute, protected _aaiService: AaiService,
-              private store: NgRedux<AppState>,
-              private _iframeService : IframeService,
-              private _vnfPopupService: VnfPopupService) {
-    super(dialogService);
-    this.vnfInstance = new VnfInstance();
-  }
-
-  updateGeneralErrorSection() : void {
-    this.hasGeneralApiError = this._vnfPopupService.onControlError(
-      this.vnfInstanceDetails,
-      this.vnfInstanceDetails.instanceFormGroup,
-      this.vnfInstanceDetails.isNotUniqueInstanceName,
-      this.vnfInstanceDetails.isNotUniqueVolumeGroupName);
-  }
-
-  ngOnInit(): void {
-    this.updateServiceModelById();
-    this.popupTypeName = this.getModelTypeForPopupTitle();
-    this.updateServiceModelById();
-    this.updateInstanceFromStore();
-  }
-
-  onCancelClick() {
-    this._iframeService.removeClassCloseModal(this.parentElementClassName);
-    super.close();
-  }
-
-  onServiceInstanceNameChanged(isNotUniqueInstanceName: boolean) : void {
-    this.isNotUniqueInstanceName = isNotUniqueInstanceName;
-  }
-
-  onVolumeGroupNameChanged(isNotUniqueVolumeGroupName: boolean) : void {
-    this.isNotUniqueVolumeGroupName = isNotUniqueVolumeGroupName;
-  }
-
-  onSetClick() {
-      this._iframeService.removeClassCloseModal(this.parentElementClassName);
-      this.result = true;
-      super.close();
-  }
-
-  updateServiceModelById() {
-    this._aaiService.getServiceModelById(this.serviceModelId).subscribe(
-      result => {
-        this.serviceModel = new ServiceModel(result);
-        this.model = this._vnfPopupService.getModelFromResponse(result, this.modelType, this.modelName);
-        this.modelInformationItems = this.createModelInformationItems();
-      },
-      error => {
-        console.log('error is ', error)
-      }
-    );
-  }
-
-  updateInstanceFromStore() {
-    let instance;
-    const serviceInstance = this.store.getState().service.serviceInstance[this.serviceModelId];
-    if (this.modelType === ServiceNodeTypes.VF) {
-      instance = serviceInstance.vnfs[this.modelName] || new VnfInstance();
-    } else {
-      instance = new VfModuleInstance();
-    }
-
-    if (instance.instanceParams && instance.instanceParams[0]) {
-      this.dynamicInputs = this.dynamicInputs.map(x => {
-        x.value = (instance.instanceParams[0][x.id]) ? instance.instanceParams[0][x.id] : x.value;
-        return x;
-      });
-    }
-    this.vnfInstance = instance;
-  }
-
-  getModelName(): string {
-    return this.modelName;
-  }
-
-  getModelTypeForPopupTitle(): string {
-    if (_.has(this.typeMapperForTitle, this.modelType)) {
-      return this.typeMapperForTitle[this.modelType];
-    }
-    return this.modelType;
-  }
-
-  extractSubscriberNameBySubscriberId(subsriberId: string) {
-    var result: string = null;
-    var filteredArray: any = _.filter(this.store.getState().service.subscribers, function (o: Subscriber) {
-      return o.id === subsriberId
-    })
-    if (filteredArray.length > 0) {
-      result = filteredArray[0].name;
-    }
-    return result;
-  }
-
-  createModelInformationItems(): Array<ModelInformationItem> {
-    var serviceInstance = this.store.getState().service.serviceInstance[this.serviceModelId];
-
-    let items = [
-      new ModelInformationItem("Subscriber Name", "subscriberName", [this.extractSubscriberNameBySubscriberId(serviceInstance.globalSubscriberId)], "", true),
-      new ModelInformationItem("Service Name", "serviceModelName", [this.serviceModel.name], "", true),
-
-      new ModelInformationItem("Service Instance Name", "serviceName", [serviceInstance.instanceName], "", false),
-      new ModelInformationItem("Model Name", "modelName", [this.model.name], "", true),
-      new ModelInformationItem("Model version", "modelVersion", [this.model.version], "", true),
-      new ModelInformationItem("Description", "description", [this.model.description]),
-      new ModelInformationItem("Category", "category", [this.model.category]),
-      new ModelInformationItem("Sub Category", "subCategory",[this.model.subCategory]),
-      new ModelInformationItem("UUID", "uuid", [this.model.uuid], Constants.ServicePopup.TOOLTIP_UUID, true),
-      new ModelInformationItem("Invariant UUID", "invariantUuid", [this.model.invariantUuid], Constants.ServicePopup.TOOLTIP_INVARIANT_UUID, true),
-      new ModelInformationItem("Service type", "serviceType", [this.serviceModel.serviceType]),
-      new ModelInformationItem("Service role", "serviceRole", [this.serviceModel.serviceRole]),
-
-
-    ];
-    if (this.modelType === 'VFmodule') {
-      items.push(new ModelInformationItem("Minimum to instantiate", "min", [this.model.min], "", true),
-        new ModelInformationItem("Maximum to instantiate", "max", this.model.max == undefined ? [1] : [this.model.max], "", true),
-        new ModelInformationItem("Recommended to instantiate", "initial", [this.model.initial]));
-
-    }
-
-    return items;
-  }
-}
diff --git a/vid-webpack-master/src/app/components/vnf-popup/vnf-popup.html b/vid-webpack-master/src/app/components/vnf-popup/vnf-popup.html
deleted file mode 100644
index d2e043b18..000000000
--- a/vid-webpack-master/src/app/components/vnf-popup/vnf-popup.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<div id="instance-popup" class="modal-dialog">
-  <div class="modal-content">
-    <div class="modal-header">
-      <button type="button" class="close" (click)="onCancelClick()" >&times;</button>
-      <span [attr.data-tests-id]="'create-modal-title'" class="modal-title">Set a new {{popupTypeName}}</span>
-    </div>
-    <div class="modal-body popup-content">
-
-      <div class="header-left">
-        <div>MODEL: <span>"{{popupTypeName}}"</span></div>
-      </div>
-
-      <div class="header-right">
-        {{getModelTypeForPopupTitle()}} Instance Details
-      </div>
-
-      <div class="model-information">
-        <model-information [modelInformationItems]="modelInformationItems"></model-information>
-      </div>
-
-      <div class="instance-form">
-        <vnf-instance-details [dynamicInputs]="dynamicInputs"
-                              [vnfModel]="model"
-                              [modelType]="modelType"
-                              [modelName]="modelName"
-                              [parentModelName]="parentModelName"
-                              [isNewVfModule]="isNewVfModule"
-                              [serviceInstance]="vnfInstance"
-                              [vnfInstance]="vnfInstance"
-                              [serviceUuid]="serviceModelId"
-                              [userProvidedNaming]="userProvidedNaming"
-                              (onSubmitClick)="onSetClick($event)"
-                              (onDataChanged)="updateGeneralErrorSection()"
-                              (onServiceInstanceNameChanged)="onServiceInstanceNameChanged($event)"
-                              (onVolumeGroupNameChanged)="onVolumeGroupNameChanged($event)"
-
-                              ></vnf-instance-details>
-      </div>
-
-    </div>
-    <div class="modal-footer row" style="padding: 0">
-      <div class="col-md-6">
-        <div *ngIf="hasGeneralApiError == true">
-          <form-general-error [message]="'Page contains errors. Please see details next to the relevant fields.'"></form-general-error>
-        </div>
-      </div>
-      <div class="col-md-6" style="padding: 15px;padding-right: 35px;">
-        <button [attr.data-tests-id]="'cancelButton'"  type="button" class="btn btn-default cancel" (click)="onCancelClick()"><span>Cancel</span></button>
-        <input type="submit" value="Set" form="vnfForm" data-tests-id="vnf-form-set"
-               class="btn btn-success submit" [disabled]="!vnfInstanceDetails?.vnfForm?.valid || isNotUniqueInstanceName || isNotUniqueVolumeGroupName">
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/vid-webpack-master/src/app/components/vnf-popup/vnf-popup.scss b/vid-webpack-master/src/app/components/vnf-popup/vnf-popup.scss
deleted file mode 100644
index 6e606dbb9..000000000
--- a/vid-webpack-master/src/app/components/vnf-popup/vnf-popup.scss
+++ /dev/null
@@ -1,185 +0,0 @@
-$grid-border: 1px #d2d2d2 solid;
-
-#instance-popup {
-  color: #191919;
-
-  .left-panel {
-    background: #f2f2f2;
-    border-right: $grid-border;
-  }
-
-  .header-common {
-    height: 100%;
-    align-items: center;
-    display: flex;
-    font-family: OpenSans-Semibold;
-    font-size: 12px;
-  }
-
-  .header-text {
-    padding-left: 30px;
-    @extend .header-common;
-  }
-
-  .header-left {
-    grid-area: header-left;
-    @extend .header-text;
-    @extend .left-panel;
-    border-bottom: $grid-border;
-
-    span {
-      font-family: OpenSans-Regular;
-      font-size: 14px;
-    };
-  }
-
-  .header-right {
-    grid-area: header-right;
-
-    @extend .header-text;
-    border-bottom: $grid-border;
-  }
-
-  .quantity-label {
-    grid-area: quantity-label;
-    @extend .header-common;
-    border-bottom: $grid-border;
-    height: 100%;
-    font-family: OpenSans-Regular;
-  }
-
-  .quantity {
-    grid-area: quantity;
-    border-left: $grid-border;
-    border-bottom: $grid-border;
-    border-top-style: none;
-    font-family: OpenSans-Semibold;
-    text-align: start;
-    text-indent: 10px;
-  }
-
-  .quantity-select {
-    width: 78px;
-    height: 100%;
-    border: 0;
-    background: white;
-    outline: none;
-    -webkit-appearance: none;
-    -moz-appearance: none;
-    appearance: none;
-    background: url('../../../assets/img/chevron.svg') 0 0 no-repeat;
-    background-size: 24px;
-    background-position-x: right;
-    background-position-y: center;
-  }
-  input[type="number"]:hover::-webkit-inner-spin-button {
-    height: 20px;
-  }
-
-  .model-information {
-    grid-area: model-information;
-
-    padding: 30px;
-    overflow: auto;
-    @extend .left-panel;
-  }
-
-  .instance-form {
-    grid-area: instance-form;
-  }
-
-  .popup-content {
-    display: grid;
-    grid-template-columns: 400px auto 30px 93px;
-    grid-template-rows: 50px calc(100vh - 180px);
-    grid-template-areas:
-      "header-left header-right header-right header-right"
-      "model-information instance-form instance-form instance-form";
-    padding: 0;
-  }
-}
-
-.modal {
-  background-color: #191919;
-  opacity: 0.8;
-}
-
-.modal-dialog {
-  position: relative;
-  width: auto;
-  margin: 0;
-}
-@media (min-width: 1150px) {
-  .popup-content {
-    grid-template-rows: 30px 680px;
-  }
-}
-
-.modal-content {
-  border-radius: 0;
-  box-shadow: none;
-  border: none;
-}
-
-.modal-footer {
-  .cancel {
-    width: 120px;
-    height: 36px;
-    background: #ffffff;
-    border: 1px solid  #009fdb;
-    border-radius: 2px;
-    span {
-      font-family: OpenSans-Regular;
-      font-size: 14px;
-      color: #009fdb;
-      line-height: 16px;
-    }
-  }
-
-  .submit {
-    width: 120px;
-    height: 36px;
-    background: #009fdb;
-    border-radius: 2px;
-    border-color: #009fdb;
-    span {
-      font-family: OpenSans-Regular;
-      font-size: 14px;
-      color: #FFFFFF;
-      line-height: 16px;
-    }
-  }
-}
-
-.modal-header {
-  background-color: #009fdb;
-
-  padding-bottom: 13px;
-  padding-top: 13px;
-  padding-left: 29px;
-  padding-right: 21px;
-
-  .close {
-    font-size: 32px;
-    font-weight: 200;
-    color: #d8d8d8;
-    text-shadow: none;
-    filter: none;
-    opacity: 1;
-  }
-
-  .modal-title {
-    font-family: OpenSans-Regular;
-    font-size: 24px;
-    color: #fff;
-    line-height: 34px;
-  }
-}
-//
-//@media (min-width: 1200px) {
-//  .service-model,
-//  .service-instance {
-//    width: 1050px;
-//    margin: 30px auto;
-//  }
-//}