X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Fapp%2Finstances%2Fns-primitive%2FNSPrimitiveComponent.ts;h=bfbbe409315f7f39c156b42c3cb11d7e2d2d7486;hb=76e55f45abfebcbb817f1f0f90c067fa429f6b34;hp=02269d37cab604393b0ed2f1e9edcfa21e6b2cfe;hpb=3b4814aa2d3dec621dadb52f058ba95a3dc3a86a;p=osm%2FNG-UI.git diff --git a/src/app/instances/ns-primitive/NSPrimitiveComponent.ts b/src/app/instances/ns-primitive/NSPrimitiveComponent.ts index 02269d3..bfbbe40 100644 --- a/src/app/instances/ns-primitive/NSPrimitiveComponent.ts +++ b/src/app/instances/ns-primitive/NSPrimitiveComponent.ts @@ -23,14 +23,15 @@ import { AbstractControl, FormArray, FormBuilder, FormGroup, Validators } from ' import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { NotifierService } from 'angular-notifier'; -import { APIURLHEADER, ERRORDATA, URLPARAMS } from 'CommonModel'; +import { APIURLHEADER, ERRORDATA, PRIMITIVEDATA, PRIMITIVETYPES, URLPARAMS } from 'CommonModel'; import { DataService } from 'DataService'; import { environment } from 'environment'; -import { NSData } from 'NSDModel'; +import { KDUPRIMITIVELEVEL, NSData, VDUPRIMITIVELEVEL, VNFPROFILE } from 'NSDModel'; import { NSPrimitiveParams } from 'NSInstanceModel'; import { RestService } from 'RestService'; import { SharedService } from 'SharedService'; import { isNullOrUndefined } from 'util'; +import { CONFIGPRIMITIVE, DF, VDUCONFIG, VDUPROFILE, VNFCONFIG, VNFD } from 'VNFDModel'; /** * Creating component @@ -76,11 +77,17 @@ export class NSPrimitiveComponent implements OnInit { public primitiveList: {}[]; /** Contains objects that is used to hold types of primitive @public */ - public primitiveTypeList: {}[] = []; + public primitiveTypeList: PRIMITIVETYPES[] = []; /** Model value used to hold selected primitive type @public */ public primitiveType: string; + /** Contains list of VDU primitive lists @public */ + public vduList: VDUPROFILE[]; + + /** Contains list of KDU primitive lists @public */ + public kduList: {}[]; + /** FormBuilder instance added to the formBuilder @private */ private formBuilder: FormBuilder; @@ -111,34 +118,49 @@ export class NSPrimitiveComponent implements OnInit { this.sharedService = this.injector.get(SharedService); this.activeModal = this.injector.get(NgbActiveModal); this.formBuilder = this.injector.get(FormBuilder); - this.primitiveTypeList = [{ title: this.translateService.instant('VNFPRIMITIVE'), value: 'VNF_Primitive' }]; - this.primitiveType = 'VNF_Primitive'; + this.primitiveTypeList = [ + { + title: this.translateService.instant('NSPRIMITIVE'), + value: 'NS_Primitive' + }, + { + title: this.translateService.instant('VNFPRIMITIVE'), + value: 'VNF_Primitive' + }, + { + title: this.translateService.instant('VDUPRIMITIVE'), + value: 'VDU_Primitive' + }, + { + title: this.translateService.instant('KDUPRIMITIVE'), + value: 'KDU_Primitive' + } + ]; } + /** convenience getter for easy access to form fields */ + get f(): FormGroup['controls'] { return this.primitiveForm.controls; } + /** * Lifecyle Hooks the trigger before component is instantiate */ public ngOnInit(): void { /** Setting up initial value for NSD */ - this.dataService.currentMessage.subscribe((event: NSData) => { + this.dataService.currentMessage.subscribe((event: NSData): void => { if (event.identifier !== undefined || event.identifier !== '' || event.identifier !== null) { this.nsdId = event.identifier; } }); - if (!isNullOrUndefined(this.params.nsConfig)) { - this.primitiveTypeList.push({ title: this.translateService.instant('NSPRIMITIVE'), value: 'NS_Primitive' }); - } this.initializeForm(); } - /** convenience getter for easy access to form fields */ - get f(): FormGroup['controls'] { return this.primitiveForm.controls; } - /** initialize Forms @public */ public initializeForm(): void { this.primitiveForm = this.formBuilder.group({ primitive: [null, [Validators.required]], - vnf_member_index: [null, [Validators.required]], + member_vnf_index: [null, [Validators.required]], + vdu_id: [null, [Validators.required]], + kdu_name: [null, [Validators.required]], primitive_params: this.formBuilder.array([this.primitiveParamsBuilder()]) }); } @@ -167,13 +189,13 @@ export class NSPrimitiveComponent implements OnInit { this.primitiveParams.removeAt(index); } - /** Execute NS Primitive @public */ - public execNSPrimitive(): void { + /** Execute Primitive @public */ + public execPrimitive(): void { this.submitted = true; this.objectPrimitiveParams = {}; this.sharedService.cleanForm(this.primitiveForm); if (this.primitiveForm.invalid) { return; } // Proceed, onces form is valid - this.primitiveForm.value.primitive_params.forEach((params: NSPrimitiveParams) => { + this.primitiveForm.value.primitive_params.forEach((params: NSPrimitiveParams): void => { if (params.primitive_params_name !== null && params.primitive_params_value !== '') { this.objectPrimitiveParams[params.primitive_params_name] = params.primitive_params_value; } @@ -185,44 +207,67 @@ export class NSPrimitiveComponent implements OnInit { }; if (this.primitiveType === 'VNF_Primitive') { // tslint:disable-next-line: no-string-literal - primitiveParamsPayLoads['vnf_member_index'] = this.primitiveForm.value.vnf_member_index; + primitiveParamsPayLoads['member_vnf_index'] = this.primitiveForm.value.member_vnf_index; + } + if (this.primitiveType === 'VDU_Primitive') { + // tslint:disable-next-line: no-string-literal + primitiveParamsPayLoads['member_vnf_index'] = this.primitiveForm.value.member_vnf_index; + // tslint:disable-next-line: no-string-literal + primitiveParamsPayLoads['vdu_id'] = this.primitiveForm.value.vdu_id; + } + if (this.primitiveType === 'KDU_Primitive') { + // tslint:disable-next-line: no-string-literal + primitiveParamsPayLoads['member_vnf_index'] = this.primitiveForm.value.member_vnf_index; + // tslint:disable-next-line: no-string-literal + primitiveParamsPayLoads['kdu_name'] = this.primitiveForm.value.kdu_name; } const apiURLHeader: APIURLHEADER = { url: environment.NSDINSTANCES_URL + '/' + this.nsdId + '/action' }; this.isLoadingResults = true; - this.restService.postResource(apiURLHeader, primitiveParamsPayLoads).subscribe((result: {}) => { + this.restService.postResource(apiURLHeader, primitiveParamsPayLoads).subscribe((result: {}): void => { this.activeModal.dismiss(); this.notifierService.notify('success', this.translateService.instant('PAGE.NSPRIMITIVE.EXECUTEDSUCCESSFULLY')); this.isLoadingResults = false; - }, (error: ERRORDATA) => { + }, (error: ERRORDATA): void => { this.isLoadingResults = false; this.restService.handleError(error, 'post'); }); } /** Primitive type change event @public */ - public primitiveTypeChange(data: { value: string }): void { + public primitiveTypeChange(data: PRIMITIVETYPES): void { this.primitiveList = []; this.primitiveParameter = []; this.initializeForm(); if (data.value === 'NS_Primitive') { - this.primitiveList = !isNullOrUndefined(this.params.nsConfig['config-primitive']) ? - this.params.nsConfig['config-primitive'] : []; - this.getFormControl('vnf_member_index').setValidators([]); + this.getNSInfo(this.params.name); + this.setUpdateValueandValidation('member_vnf_index'); + } + if (data.value === 'VNF_Primitive' || data.value === 'KDU_Primitive' || data.value === 'NS_Primitive') { + this.setUpdateValueandValidation('vdu_id'); + } + if (data.value === 'VDU_Primitive' || data.value === 'VNF_Primitive' || data.value === 'NS_Primitive') { + this.setUpdateValueandValidation('kdu_name'); } } /** Member index change event */ - public indexChange(data: {}): void { - if (data) { - this.getVnfdInfo(data['vnfd-id-ref']); + public indexChange(data: VNFPROFILE, getType?: string): void { + this.getFormControl('vdu_id').setValue(null); + this.getFormControl('kdu_name').setValue(null); + if (data['vnfd-id'] !== null) { + this.getVnfdInfo(data['vnfd-id'], getType); } else { this.primitiveList = []; this.getFormControl('primitive').setValue(null); this.primitiveParameter = []; } } + /** Get VDU/KDU primitive List for the selected event @public */ + public getPrimitiveList(data: {}, selectedType: string): void { + this.primitiveList = data[selectedType + '-configuration']['config-primitive']; + } /** Primivtive change event */ - public primitiveChange(data: { parameter: {}[] }): void { + public primitiveChange(data: PRIMITIVEDATA): void { this.primitiveParameter = []; const formArr: FormArray = this.getFormControl('primitive_params') as FormArray; formArr.controls = []; @@ -231,14 +276,37 @@ export class NSPrimitiveComponent implements OnInit { this.updatePrimitive(data); } } + /** Generate vdu section @public */ + public generateVDUData(vduData: VDUPROFILE, vduConfig: VDUCONFIG[]): VDUPROFILE { + const getVDUConfig: VDUCONFIG = vduConfig.filter((itemData: VDUCONFIG): boolean => + itemData.id === vduData['vdu-configuration-id'])[0]; + return { + id: vduData.id, + name: vduData.id, + 'vdu-configuration': getVDUConfig + }; + } + /** Generate kdu section @public */ + public generateKDUData(kduData: KDUPRIMITIVELEVEL): KDUPRIMITIVELEVEL { + return { + name: kduData.name, + 'juju-bundle': kduData['juju-bundle'], + 'kdu-configuration': kduData['kdu-configuration'] + }; + } + /** Used to set the validation and value and update the validation and value @public */ + public setUpdateValueandValidation(formName: string): void { + this.getFormControl(formName).setValidators([]); + this.getFormControl(formName).updateValueAndValidity(); + } /** Update primitive value based on parameter */ - private updatePrimitive(primitive: { parameter: {}[] }): void { + private updatePrimitive(primitive: PRIMITIVEDATA): void { if (primitive.parameter) { this.primitiveParameter = primitive.parameter; } else { this.primitiveParameter = []; const formArr: AbstractControl[] = this.getControls(); - formArr.forEach((formGp: FormGroup) => { + formArr.forEach((formGp: FormGroup): void => { formGp.controls.primitive_params_name.setValidators([]); formGp.controls.primitive_params_name.updateValueAndValidity(); formGp.controls.primitive_params_value.setValidators([]); @@ -247,19 +315,77 @@ export class NSPrimitiveComponent implements OnInit { } } /** Get primivitive actions from vnfd data */ - private getVnfdInfo(vnfdRef: string): void { + private getVnfdInfo(vnfdRef: string, getType?: string): void { + this.primitiveList = []; + this.primitiveParameter = []; + this.getFormControl('primitive').setValue(null); + const apiUrl: string = environment.VNFPACKAGES_URL + '?id=' + vnfdRef; + this.isLoadingResults = true; + this.restService.getResource(apiUrl) + .subscribe((vnfdInfo: VNFD[]): void => { + const vnfInstances: VNFD = vnfdInfo[0]; + if (!isNullOrUndefined(vnfInstances.df) && !isNullOrUndefined(vnfInstances['vnf-configuration'])) { + this.getFormControl('vdu_id').setValidators([]); + this.getFormControl('kdu_name').setValidators([]); + vnfInstances.df.forEach((df: DF): void => { + if (df['vnf-configuration-id'] !== undefined) { + const vnfprimitiveList: VNFCONFIG = vnfInstances['vnf-configuration'] + .filter((itemData: VNFCONFIG): boolean => itemData.id === df['vnf-configuration-id'])[0]; + this.primitiveList = vnfprimitiveList['config-primitive']; + } + }); + } + if (getType === 'VDU_Primitive') { + this.kduList = []; + this.vduList = []; + this.primitiveList = []; + if (!isNullOrUndefined(vnfInstances.df) && !isNullOrUndefined(vnfInstances['vdu-configuration'])) { + vnfInstances.df.forEach((df: DF): void => { + if (df['vdu-profile'] !== undefined) { + df['vdu-profile'].forEach((element: VDUPROFILE): void => { + const vduDataObj: VDUPROFILE = this.generateVDUData(element, vnfInstances['vdu-configuration']); + this.vduList.push(vduDataObj); + }); + } + }); + } + } + if (getType === 'KDU_Primitive') { + this.kduList = []; + this.vduList = []; + this.primitiveList = []; + if (!isNullOrUndefined(vnfInstances.kdu)) { + vnfInstances.kdu.forEach((kduData: KDUPRIMITIVELEVEL): void => { + if (kduData['kdu-configuration']) { + const kduDataObj: KDUPRIMITIVELEVEL = this.generateKDUData(kduData); + this.kduList.push(kduDataObj); + } + }); + } + } + this.isLoadingResults = false; + }, (error: ERRORDATA): void => { + this.isLoadingResults = false; + this.restService.handleError(error, 'get'); + }); + } + /** Get primivitive actions from NSD data */ + private getNSInfo(nsdRef: string): void { this.primitiveList = []; this.primitiveParameter = []; this.getFormControl('primitive').setValue(null); - const apiUrl: string = environment.VNFPACKAGES_URL + '?short-name=' + vnfdRef; + const apiUrl: string = environment.NSDESCRIPTORS_URL + '?id=' + nsdRef; this.isLoadingResults = true; this.restService.getResource(apiUrl) - .subscribe((vnfdInfo: {}) => { - if (vnfdInfo[0]['vnf-configuration']) { - this.primitiveList = vnfdInfo[0]['vnf-configuration']['config-primitive']; + .subscribe((nsdInfo: {}): void => { + if (!isNullOrUndefined(nsdInfo[0]['ns-configuration'])) { + this.primitiveList = !isNullOrUndefined(nsdInfo[0]['ns-configuration']['config-primitive']) ? + nsdInfo[0]['ns-configuration']['config-primitive'] : []; + } else { + this.primitiveList = []; } this.isLoadingResults = false; - }, (error: ERRORDATA) => { + }, (error: ERRORDATA): void => { this.isLoadingResults = false; this.restService.handleError(error, 'get'); });