Advanced Cluster Management Enhancements
- Chnaged cluster page design from switch to single page
- Added bootstrap option in creation and registration
- Added horizontal scaling, vertical scaling and upgrade in
cluster action
- In cluster page, for list combined two apis to show list done
temporary fix from UI
Change-Id: Ie4d30f5db28025ec92398cc60fc50ab7030f8f9b
Signed-off-by: SANDHYA.JS <sandhya.j@tataelxsi.co.in>
diff --git a/src/app/utilities/show-info/ShowInfoComponent.ts b/src/app/utilities/show-info/ShowInfoComponent.ts
index 015d50c..6c21ac5 100644
--- a/src/app/utilities/show-info/ShowInfoComponent.ts
+++ b/src/app/utilities/show-info/ShowInfoComponent.ts
@@ -98,6 +98,9 @@
/** Reading the page Name @public */
public titleName: string;
+ /** Contains url @public */
+ public url: string;
+
/** Check the loading results @public */
public isLoadingResults: Boolean = false;
@@ -193,15 +196,25 @@
this.isLoadingResults = false;
});
} else if (this.params.page === 'k8s-cluster') {
- this.restService.getResource(environment.K8SCLUSTER_URL + '/' +
- this.params.id).subscribe((k8sclusterOpn: {}[]) => {
- this.defaults['text/json'] = JSON.stringify(k8sclusterOpn, null, '\t');
- }, (error: ERRORDATA) => {
- this.isLoadingResults = false;
- this.restService.handleError(error, 'get');
- }, () => {
- this.isLoadingResults = false;
- });
+ if (this.params.createdbyosm === 'true') {
+ this.url = environment.K8SCREATECLUSTER_URL + '/' + this.params.id;
+ } else {
+ if (this.params.bootstrap === true) {
+ this.url = environment.K8SCREATECLUSTER_URL + '/' + this.params.id;
+ } else if (this.params.bootstrap === false && this.params.key === false) {
+ this.url = environment.K8SCREATECLUSTER_URL + '/' + this.params.id;
+ } else if (this.params.bootstrap === false && this.params.key === true) {
+ this.url = environment.K8SCLUSTER_URL + '/' + this.params.id;
+ }
+ }
+ this.restService.getResource(this.url).subscribe((k8sclusterOpn: {}[]) => {
+ this.defaults['text/json'] = JSON.stringify(k8sclusterOpn, null, '\t');
+ }, (error: ERRORDATA) => {
+ this.isLoadingResults = false;
+ this.restService.handleError(error, 'get');
+ }, () => {
+ this.isLoadingResults = false;
+ });
} else if (this.params.page === 'k8s-repo') {
this.restService.getResource(environment.K8REPOS_URL + '/' +
this.params.id).subscribe((k8srepoOpn: {}[]) => {