From 5d75d51ccb3f4450764c975d8a1f07097f27416f Mon Sep 17 00:00:00 2001 From: Barath Kumar R Date: Wed, 2 Sep 2020 17:00:07 +0530 Subject: [PATCH] Added KDU Level exection in UI * Provision to perform the KDU Level execution action in NG-UI Change-Id: Ide6e335b41268c75ad4b4efd8ef4aa0a14c6b6ee Signed-off-by: Barath Kumar R --- .../ns-primitive/NSPrimitiveComponent.html | 38 ++++----- .../ns-primitive/NSPrimitiveComponent.ts | 85 ++++++++++++++----- .../NSInstancesActionComponent.html | 24 ++---- src/assets/i18n/de.json | 5 +- src/assets/i18n/en.json | 5 +- src/assets/i18n/es.json | 5 +- src/assets/i18n/pt.json | 5 +- src/assets/scss/app.scss | 4 + src/models/NSDModel.ts | 7 ++ src/services/RestService.ts | 1 + 10 files changed, 112 insertions(+), 67 deletions(-) diff --git a/src/app/instances/ns-primitive/NSPrimitiveComponent.html b/src/app/instances/ns-primitive/NSPrimitiveComponent.html index 324642a..82e3992 100644 --- a/src/app/instances/ns-primitive/NSPrimitiveComponent.html +++ b/src/app/instances/ns-primitive/NSPrimitiveComponent.html @@ -21,42 +21,39 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i -
+
-
-
+
-
- + +
+
+
+ +
+
- +
@@ -71,21 +68,16 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
- +
- +
-
diff --git a/src/app/instances/ns-primitive/NSPrimitiveComponent.ts b/src/app/instances/ns-primitive/NSPrimitiveComponent.ts index 1086f49..d5cf565 100644 --- a/src/app/instances/ns-primitive/NSPrimitiveComponent.ts +++ b/src/app/instances/ns-primitive/NSPrimitiveComponent.ts @@ -26,7 +26,7 @@ import { NotifierService } from 'angular-notifier'; import { APIURLHEADER, ERRORDATA, URLPARAMS } from 'CommonModel'; import { DataService } from 'DataService'; import { environment } from 'environment'; -import { NSData, VDUPRIMITIVELEVEL } from 'NSDModel'; +import { KDUPRIMITIVELEVEL, NSData, VDUPRIMITIVELEVEL } from 'NSDModel'; import { NSPrimitiveParams } from 'NSInstanceModel'; import { RestService } from 'RestService'; import { SharedService } from 'SharedService'; @@ -84,6 +84,9 @@ export class NSPrimitiveComponent implements OnInit { /** Contains list of VDU primitive lists @public */ public vduList: {}[]; + /** Contains list of KDU primitive lists @public */ + public kduList: {}[]; + /** FormBuilder instance added to the formBuilder @private */ private formBuilder: FormBuilder; @@ -126,6 +129,10 @@ export class NSPrimitiveComponent implements OnInit { { title: this.translateService.instant('VDUPRIMITIVE'), value: 'VDU_Primitive' + }, + { + title: this.translateService.instant('KDUPRIMITIVE'), + value: 'KDU_Primitive' } ]; } @@ -152,6 +159,7 @@ export class NSPrimitiveComponent implements OnInit { primitive: [null, [Validators.required]], vnf_member_index: [null, [Validators.required]], vdu_id: [null, [Validators.required]], + kdu_name: [null, [Validators.required]], primitive_params: this.formBuilder.array([this.primitiveParamsBuilder()]) }); } @@ -180,8 +188,8 @@ 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); @@ -206,6 +214,12 @@ export class NSPrimitiveComponent implements OnInit { // 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['vnf_member_index'] = this.primitiveForm.value.vnf_member_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' }; @@ -226,18 +240,19 @@ export class NSPrimitiveComponent implements OnInit { this.initializeForm(); if (data.value === 'NS_Primitive') { this.getNSInfo(this.params.name); - this.getFormControl('vnf_member_index').setValidators([]); - this.getFormControl('vnf_member_index').updateValueAndValidity(); - this.getFormControl('vdu_id').setValidators([]); - this.getFormControl('vdu_id').updateValueAndValidity(); - } else if (data.value === 'VNF_Primitive') { - this.getFormControl('vdu_id').setValidators([]); - this.getFormControl('vdu_id').updateValueAndValidity(); + this.setUpdateValueandValidation('vnf_member_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: {}, getType?: string): void { this.getFormControl('vdu_id').setValue(null); + this.getFormControl('kdu_name').setValue(null); if (data) { this.getVnfdInfo(data['vnfd-id-ref'], getType); } else { @@ -246,9 +261,9 @@ export class NSPrimitiveComponent implements OnInit { this.primitiveParameter = []; } } - /** Get VDU Primitive from selected VDU id/name change event */ - public getVDUPrimitive(data: {}): void { - this.primitiveList = data['vdu-configuration']['config-primitive']; + /** 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 { @@ -268,6 +283,19 @@ export class NSPrimitiveComponent implements OnInit { 'vdu-configuration': vduData['vdu-configuration'] }; } + /** 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 { if (primitive.parameter) { @@ -294,17 +322,34 @@ export class NSPrimitiveComponent implements OnInit { .subscribe((vnfdInfo: {}) => { if (vnfdInfo[0]['vnf-configuration'] !== undefined && vnfdInfo[0]['vnf-configuration']) { this.getFormControl('vdu_id').setValidators([]); + this.getFormControl('kdu_name').setValidators([]); this.primitiveList = vnfdInfo[0]['vnf-configuration']['config-primitive']; } if (getType === 'VDU_Primitive') { + this.kduList = []; + this.vduList = []; + this.primitiveList = []; + if (!isNullOrUndefined(vnfdInfo[0].vdu)) { + vnfdInfo[0].vdu.forEach((vduData: VDUPRIMITIVELEVEL) => { + if (vduData['vdu-configuration']) { + const vduDataObj: VDUPRIMITIVELEVEL = this.generateVDUData(vduData); + this.vduList.push(vduDataObj); + } + }); + } + } + if (getType === 'KDU_Primitive') { + this.kduList = []; this.vduList = []; this.primitiveList = []; - vnfdInfo[0].vdu.forEach((vduData: VDUPRIMITIVELEVEL) => { - if (vduData['vdu-configuration']) { - const vduDataObj: VDUPRIMITIVELEVEL = this.generateVDUData(vduData); - this.vduList.push(vduDataObj); - } - }); + if (!isNullOrUndefined(vnfdInfo[0].kdu)) { + vnfdInfo[0].kdu.forEach((kduData: KDUPRIMITIVELEVEL) => { + if (kduData['kdu-configuration']) { + const kduDataObj: KDUPRIMITIVELEVEL = this.generateKDUData(kduData); + this.kduList.push(kduDataObj); + } + }); + } } this.isLoadingResults = false; }, (error: ERRORDATA) => { @@ -323,7 +368,7 @@ export class NSPrimitiveComponent implements OnInit { .subscribe((nsdInfo: {}) => { if (!isNullOrUndefined(nsdInfo[0]['ns-configuration'])) { this.primitiveList = !isNullOrUndefined(nsdInfo[0]['ns-configuration']['config-primitive']) ? - nsdInfo[0]['ns-configuration']['config-primitive'] : []; + nsdInfo[0]['ns-configuration']['config-primitive'] : []; } else { this.primitiveList = []; } diff --git a/src/app/utilities/ns-instances-action/NSInstancesActionComponent.html b/src/app/utilities/ns-instances-action/NSInstancesActionComponent.html index 2879d8b..823d99f 100644 --- a/src/app/utilities/ns-instances-action/NSInstancesActionComponent.html +++ b/src/app/utilities/ns-instances-action/NSInstancesActionComponent.html @@ -16,16 +16,13 @@ limitations under the License. Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.in), BARATH KUMAR R (barath.r@tataelxsi.co.in) -->
- - -
@@ -33,21 +30,16 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i {{'ACTION' | translate}}
- - - -
diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 27cf950..1351aa5 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -95,11 +95,12 @@ "VALUE": "Wert", "PERFORMACTION": "Aktion ausführen", "EXECUTE": "Execute", - "EXECNSPRIMITIVE": "Exec NS Primitive", + "EXECPRIMITIVE": "Exec Primitive", "PRIMITIVETYPE": "Primitiver Typ", "VDUPRIMITIVE": "VDU Level Primitive", "VNFPRIMITIVE": "VNF Level Primitive", "NSPRIMITIVE": "NS Level Primitive", + "KDUPRIMITIVE": "KDU Level Primitive", "DESCRIPTOR": "Deskriptor", "ERROR": "Etwas ist schief gelaufen. Bitte versuche es erneut", "SHOWGRAPH": "Grafik anzeigen", @@ -426,7 +427,7 @@ "EDITOSMREPO": "Bearbeiten Sie OSM-Repositorys", "OSMREPOTITLE": "Registriertes OSM-Repository", "CREATEDSUCCESSFULLY": "OSM-Repository erfolgreich hinzugefügt", - "UPDATEDSUCCESSFULLY" : "OSM-Repository erfolgreich aktualisiert" + "UPDATEDSUCCESSFULLY": "OSM-Repository erfolgreich aktualisiert" } }, "HTTPERROR": { diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index af4b196..73b11ba 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -95,11 +95,12 @@ "VALUE": "Value", "PERFORMACTION": "Perform Action", "EXECUTE": "Execute", - "EXECNSPRIMITIVE": "Exec NS Primitive", + "EXECPRIMITIVE": "Exec Primitive", "PRIMITIVETYPE": "Primitive Type", "VDUPRIMITIVE": "VDU Level Primitive", "VNFPRIMITIVE": "VNF Level Primitive", "NSPRIMITIVE": "NS Level Primitive", + "KDUPRIMITIVE": "KDU Level Primitive", "DESCRIPTOR": "Descriptor", "ERROR": "Something Went wrong please try again", "SHOWGRAPH": "Show Graph", @@ -426,7 +427,7 @@ "EDITOSMREPO": "Edit OSM Repositories", "OSMREPOTITLE": "Registered OSM repository", "CREATEDSUCCESSFULLY": "OSM Repository Added Successfully", - "UPDATEDSUCCESSFULLY" : "OSM Repository Updated Successfully" + "UPDATEDSUCCESSFULLY": "OSM Repository Updated Successfully" } }, "HTTPERROR": { diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index c5796ea..94ff2dc 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -95,11 +95,12 @@ "VALUE": "Valor", "PERFORMACTION": "Realizar una acción", "EXECUTE": "Ejecutar", - "EXECNSPRIMITIVE": "Ejecutar NS Primitiva", + "EXECPRIMITIVE": "Ejecutar Primitiva", "PRIMITIVETYPE": "Tipo primitivo", "VDUPRIMITIVE": "Primitiva a nivel de VDU", "VNFPRIMITIVE": "Nivel VNF Primitivo", "NSPRIMITIVE": "NS Level Primitive", + "KDUPRIMITIVE": "Primitiva de nivel KDU", "DESCRIPTOR": "Descriptora", "ERROR": "Algo salió mal. Por favor, vuelva a intentarlo", "SHOWGRAPH": "Mostrar gráfico", @@ -426,7 +427,7 @@ "EDITOSMREPO": "Editar repositorios de OSM", "OSMREPOTITLE": "Repositorio OSM registrado", "CREATEDSUCCESSFULLY": "registrado OSM agregado con éxito", - "UPDATEDSUCCESSFULLY" : "El registrado de OSM se actualizó correctamente" + "UPDATEDSUCCESSFULLY": "El registrado de OSM se actualizó correctamente" } }, "HTTPERROR": { diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index 496d330..71ce69f 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -95,11 +95,12 @@ "VALUE": "Valor", "PERFORMACTION": "Executar a ação", "EXECUTE": "Executar", - "EXECNSPRIMITIVE": "Exec NS Primitive", + "EXECPRIMITIVE": "Exec Primitive", "PRIMITIVETYPE": "Tipo primitivo", "VDUPRIMITIVE": "Primitivo de nível VDU", "VNFPRIMITIVE": "Primitivo de nível VNF", "NSPRIMITIVE": "NS Level Primitive", + "KDUPRIMITIVE": "Nível KDU Primitivo", "DESCRIPTOR": "Descritora", "ERROR": "Alguma coisa deu errado. Por favor tente outra vez", "SHOWGRAPH": "Mostrar gráfico", @@ -426,7 +427,7 @@ "EDITOSMREPO": "Editar repositórios OSM", "OSMREPOTITLE": "Repositório OSM registrado", "CREATEDSUCCESSFULLY": "registrado OSM adicionado com sucesso", - "UPDATEDSUCCESSFULLY" : "registrado OSM atualizado com sucesso" + "UPDATEDSUCCESSFULLY": "registrado OSM atualizado com sucesso" } }, "HTTPERROR": { diff --git a/src/assets/scss/app.scss b/src/assets/scss/app.scss index 9e8948d..3f976be 100644 --- a/src/assets/scss/app.scss +++ b/src/assets/scss/app.scss @@ -71,6 +71,10 @@ body { &:focus { text-decoration: none; } + &:not([href]), + &:not([href]):hover { + color: inherit; + } } .badge { @include line-height(normal); diff --git a/src/models/NSDModel.ts b/src/models/NSDModel.ts index e4f94b0..c8aa257 100644 --- a/src/models/NSDModel.ts +++ b/src/models/NSDModel.ts @@ -174,3 +174,10 @@ export interface VDUPRIMITIVELEVEL { name: string; 'vdu-configuration': {}; } + +/** Interface for the KDU Primitive Levels */ +export interface KDUPRIMITIVELEVEL { + name: string; + 'juju-bundle': string; + 'kdu-configuration': {}; +} diff --git a/src/services/RestService.ts b/src/services/RestService.ts index 464cc0f..708d91b 100644 --- a/src/services/RestService.ts +++ b/src/services/RestService.ts @@ -127,6 +127,7 @@ export class RestService { return this.http.delete(getRequest.url, getRequest.httpOptions); } } + /** * Handle Error response based on the status. * @param error The error response reecieved from API call. -- 2.17.1