X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Fapp%2Finstances%2Fns-instances%2FNSInstancesComponent.ts;h=14d6349b6fc620cb3202311c81d6e56ee2294a8f;hb=refs%2Fheads%2Fmaster;hp=41bb38432112b9b4a28e43f56ee726a06d88a502;hpb=063a3f1741d0cb20d5ee80590339fec54ab1acdd;p=osm%2FNG-UI.git
diff --git a/src/app/instances/ns-instances/NSInstancesComponent.ts b/src/app/instances/ns-instances/NSInstancesComponent.ts
index 41bb384..14d6349 100644
--- a/src/app/instances/ns-instances/NSInstancesComponent.ts
+++ b/src/app/instances/ns-instances/NSInstancesComponent.ts
@@ -81,6 +81,12 @@ export class NSInstancesComponent implements OnInit {
/** operational State failed data @public */
public operationalStateThirdStep: string = CONFIGCONSTANT.operationalStateThirdStep;
+ /** operational State scaling data @public */
+ public operationalStateFourthStep: string = CONFIGCONSTANT.operationalStateFourthStep;
+
+ /** operational State healing data @public */
+ public operationalStateFifthStep: string = CONFIGCONSTANT.operationalStateFifthStep;
+
/** Config State init data @public */
public configStateFirstStep: string = CONFIGCONSTANT.configStateFirstStep;
@@ -141,9 +147,13 @@ export class NSInstancesComponent implements OnInit {
/** Generate smart table row title and filters @public */
public generateTableColumn(): void {
this.columnList = {
- name: { title: this.translateService.instant('NAME'), width: '15%', sortDirection: 'asc' },
+ name: { title: this.translateService.instant('NAME'), width: '15%' },
identifier: { title: this.translateService.instant('IDENTIFIER'), width: '20%' },
NsdName: { title: this.translateService.instant('NSDNAME'), width: '15%' },
+ 'create-time': {
+ title: this.translateService.instant('DATE'), width: '15%', sortDirection: 'desc',
+ compareFunction: this.sharedService.compareFunction
+ },
OperationalStatus: {
title: this.translateService.instant('OPERATIONALSTATUS'), width: '10%', type: 'html',
filter: {
@@ -153,23 +163,34 @@ export class NSInstancesComponent implements OnInit {
list: [
{ value: this.operationalStateFirstStep, title: this.operationalStateFirstStep },
{ value: this.operationalStateSecondStep, title: this.operationalStateSecondStep },
- { value: this.operationalStateThirdStep, title: this.operationalStateThirdStep }
+ { value: this.operationalStateThirdStep, title: this.operationalStateThirdStep },
+ { value: this.operationalStateFourthStep, title: this.operationalStateFourthStep },
+ { value: this.operationalStateFifthStep, title: this.operationalStateFifthStep }
]
}
},
valuePrepareFunction: (cell: NSDInstanceData, row: NSDInstanceData): string => {
if (row.OperationalStatus === this.operationalStateFirstStep) {
return `
-
- `;
+
+ `;
} else if (row.OperationalStatus === this.operationalStateSecondStep) {
return `
-
- `;
+
+ `;
} else if (row.OperationalStatus === this.operationalStateThirdStep) {
return `
-
- `;
+
+ `;
+ } else if (row.OperationalStatus === this.operationalStateFourthStep) {
+ return `
+
+ `;
+ }
+ else if (row.OperationalStatus === this.operationalStateFifthStep) {
+ return `
+
+ `;
} else {
return `${row.OperationalStatus}`;
}
@@ -191,16 +212,16 @@ export class NSInstancesComponent implements OnInit {
valuePrepareFunction: (cell: NSDInstanceData, row: NSDInstanceData): string => {
if (row.ConfigStatus === this.configStateFirstStep) {
return `
-
- `;
+
+ `;
} else if (row.ConfigStatus === this.configStateSecondStep) {
return `
-
- `;
+
+ `;
} else if (row.ConfigStatus === this.configStateThirdStep) {
return `
-
- `;
+
+ `;
} else {
return `${row.ConfigStatus}`;
}
@@ -230,7 +251,14 @@ export class NSInstancesComponent implements OnInit {
ConfigStatus: nsdInstanceData['config-status'],
DetailedStatus: nsdInstanceData['detailed-status'],
memberIndex: nsdInstanceData.nsd.df,
- nsConfig: nsdInstanceData.nsd['ns-configuration']
+ nsConfig: nsdInstanceData.nsd['ns-configuration'],
+ adminDetails: nsdInstanceData._admin,
+ vnfID: nsdInstanceData['vnfd-id'],
+ nsd: nsdInstanceData.nsd,
+ 'nsd-id': nsdInstanceData['nsd-id'],
+ vcaStatus: nsdInstanceData.vcaStatus,
+ constituent: nsdInstanceData['constituent-vnfr-ref'],
+ 'create-time': this.sharedService.convertEpochTime(Number(nsdInstanceData['create-time']))
};
this.nsInstanceData.push(nsDataObj);
});
@@ -241,7 +269,9 @@ export class NSInstancesComponent implements OnInit {
}
this.dataSource.load(this.nsInstanceData).then((data: {}): void => {
this.isLoadingResults = false;
- }).catch();
+ }).catch((): void => {
+ // Catch Navigation Error
+ });
}, (error: ERRORDATA): void => {
this.restService.handleError(error, 'get');
this.isLoadingResults = false;
@@ -261,12 +291,15 @@ export class NSInstancesComponent implements OnInit {
/** Instantiate NS using modalservice @public */
public instantiateNS(): void {
+ // eslint-disable-next-line security/detect-non-literal-fs-filename
const modalRef: NgbModalRef = this.modalService.open(InstantiateNsComponent, { backdrop: 'static' });
modalRef.result.then((result: MODALCLOSERESPONSEDATA): void => {
if (result) {
this.generateData();
}
- }).catch();
+ }).catch((): void => {
+ // Catch Navigation Error
+ });
}
/**