X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Fapp%2Finstances%2Fns-instances%2FNSInstancesComponent.ts;h=3f207105eb4ab834c96d14c4fa6999acec5f47a8;hb=refs%2Fchanges%2F65%2F10565%2F9;hp=07184da63a8de1a2682f812efa5cefbf16d5bc90;hpb=3b4814aa2d3dec621dadb52f058ba95a3dc3a86a;p=osm%2FNG-UI.git
diff --git a/src/app/instances/ns-instances/NSInstancesComponent.ts b/src/app/instances/ns-instances/NSInstancesComponent.ts
index 07184da..3f20710 100644
--- a/src/app/instances/ns-instances/NSInstancesComponent.ts
+++ b/src/app/instances/ns-instances/NSInstancesComponent.ts
@@ -81,6 +81,9 @@ 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;
+
/** Config State init data @public */
public configStateFirstStep: string = CONFIGCONSTANT.configStateFirstStep;
@@ -124,7 +127,7 @@ export class NSInstancesComponent implements OnInit {
this.generateTableColumn();
this.generateTableSettings();
this.generateData();
- this.generateDataSub = this.sharedService.dataEvent.subscribe(() => { this.generateData(); });
+ this.generateDataSub = this.sharedService.dataEvent.subscribe((): void => { this.generateData(); });
}
/** Generate smart table row title and filters @public */
@@ -153,7 +156,8 @@ 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 }
]
}
},
@@ -170,6 +174,10 @@ export class NSInstancesComponent implements OnInit {
return `
`;
+ } else if (row.OperationalStatus === this.operationalStateFourthStep) {
+ return `
+
+ `;
} else {
return `${row.OperationalStatus}`;
}
@@ -219,9 +227,9 @@ export class NSInstancesComponent implements OnInit {
/** generateData initiate the ns-instance list @public */
public generateData(): void {
this.isLoadingResults = true;
- this.restService.getResource(environment.NSDINSTANCES_URL).subscribe((nsdInstancesData: NSInstanceDetails[]) => {
+ this.restService.getResource(environment.NSDINSTANCES_URL).subscribe((nsdInstancesData: NSInstanceDetails[]): void => {
this.nsInstanceData = [];
- nsdInstancesData.forEach((nsdInstanceData: NSInstanceDetails) => {
+ nsdInstancesData.forEach((nsdInstanceData: NSInstanceDetails): void => {
const nsDataObj: NSDInstanceData = {
name: nsdInstanceData.name,
identifier: nsdInstanceData.id,
@@ -229,8 +237,12 @@ export class NSInstancesComponent implements OnInit {
OperationalStatus: nsdInstanceData['operational-status'],
ConfigStatus: nsdInstanceData['config-status'],
DetailedStatus: nsdInstanceData['detailed-status'],
- memberIndex: nsdInstanceData.nsd['constituent-vnfd'],
- nsConfig: nsdInstanceData.nsd['ns-configuration']
+ memberIndex: nsdInstanceData.nsd.df,
+ nsConfig: nsdInstanceData.nsd['ns-configuration'],
+ adminDetails: nsdInstanceData._admin,
+ vnfID: nsdInstanceData['vnfd-id'],
+ nsd: nsdInstanceData.nsd,
+ 'nsd-id': nsdInstanceData['nsd-id']
};
this.nsInstanceData.push(nsDataObj);
});
@@ -239,10 +251,10 @@ export class NSInstancesComponent implements OnInit {
} else {
this.checkDataClass = 'dataTables_empty';
}
- this.dataSource.load(this.nsInstanceData).then((data: {}) => {
+ this.dataSource.load(this.nsInstanceData).then((data: {}): void => {
this.isLoadingResults = false;
}).catch();
- }, (error: ERRORDATA) => {
+ }, (error: ERRORDATA): void => {
this.restService.handleError(error, 'get');
this.isLoadingResults = false;
});
@@ -262,7 +274,7 @@ export class NSInstancesComponent implements OnInit {
/** Instantiate NS using modalservice @public */
public instantiateNS(): void {
const modalRef: NgbModalRef = this.modalService.open(InstantiateNsComponent, { backdrop: 'static' });
- modalRef.result.then((result: MODALCLOSERESPONSEDATA) => {
+ modalRef.result.then((result: MODALCLOSERESPONSEDATA): void => {
if (result) {
this.generateData();
}