X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fcaas-ingress%2Fcaas-ingress.datasource.ts;h=637de03e434733db54210a15b8c08e79f1305524;hb=b7d7982bbfbf3a1333feb8b811f99497752d3722;hp=d823c0db2afaa18107efee8f9a3bfa8ce0e35838;hpb=59f2bcb96fad2d6faee48b4ca65da36249ec5297;p=portal%2Fric-dashboard.git diff --git a/webapp-frontend/src/app/caas-ingress/caas-ingress.datasource.ts b/webapp-frontend/src/app/caas-ingress/caas-ingress.datasource.ts index d823c0db..637de03e 100644 --- a/webapp-frontend/src/app/caas-ingress/caas-ingress.datasource.ts +++ b/webapp-frontend/src/app/caas-ingress/caas-ingress.datasource.ts @@ -46,9 +46,9 @@ export class CaasIngressDataSource extends DataSource { super(); } - loadTable(cluster: string, namespace: string) { + loadTable(instanceKey: string, cluster: string, namespace: string) { this.loadingSubject.next(true); - this.caasIngressService.getPodList(cluster, namespace) + this.caasIngressService.getPodList(instanceKey, cluster, namespace) .pipe( catchError((her: HttpErrorResponse) => { console.log('CaasIngressDataSource failed: ' + her.message); @@ -59,10 +59,14 @@ export class CaasIngressDataSource extends DataSource { ) .subscribe((pl: V1PodList) => { this.rowCount = pl.items.length; - // precompute the restart count to keep HTML simple + // precompute container ready, restart counts to keep HTML simple for (const v1pod of pl.items) { + v1pod['readyCount'] = 0; v1pod['restartCount'] = 0; for (const cs of v1pod.status.containerStatuses) { + if (cs.ready) { + v1pod['readyCount'] = v1pod['readyCount'] + 1; + } v1pod['restartCount'] = v1pod['restartCount'] + cs.restartCount; } }