Advacned Cluster Management Enhancements
- Added force dleete support in KSU, OKA, Profile and cluster
- Integrated upgrade api in cluster
Change-Id: Iaa0b342ce5e33b239e2f76622f3f837961e1cd8c
Signed-off-by: SANDHYA.JS <sandhya.j@tataelxsi.co.in>
diff --git a/src/app/utilities/delete/DeleteComponent.ts b/src/app/utilities/delete/DeleteComponent.ts
index 9a8a0d8..f65712d 100644
--- a/src/app/utilities/delete/DeleteComponent.ts
+++ b/src/app/utilities/delete/DeleteComponent.ts
@@ -229,18 +229,25 @@
this.deleteURL = environment.NSCONFIGTEMPLATE_URL;
this.notifyMessage = 'DELETEDSUCCESSFULLY';
} else if (data.page === 'k8-infra-profile') {
+ this.forceDelete = this.params.forceDeleteType;
this.deleteURL = environment.K8SINFRACONFIGPROFILE_URL;
} else if (data.page === 'k8-infra-controller') {
+ this.forceDelete = this.params.forceDeleteType;
this.deleteURL = environment.K8SINFRACONTROLLERPROFILE_URL;
} else if (data.page === 'k8-app-profile') {
+ this.forceDelete = this.params.forceDeleteType;
this.deleteURL = environment.K8SAPPPROFILE_URL;
} else if (data.page === 'k8-resource-profile') {
+ this.forceDelete = this.params.forceDeleteType;
this.deleteURL = environment.K8SRESOURCEPROFILE_URL;
} else if (data.page === 'oka-packages') {
+ this.forceDelete = this.params.forceDeleteType;
this.deleteURL = environment.OKAPACKAGES_URL;
} else if (data.page === 'k8-ksu') {
+ this.forceDelete = this.params.forceDeleteType;
this.deleteURL = environment.KSU_URL;
} else if (data.page === 'k8-cluster') {
+ this.forceDelete = this.params.forceDeleteType;
this.page = data.page;
}
}
@@ -252,6 +259,11 @@
};
let deletingURl: string = '';
if (this.forceDelete) {
+ if (this.page === 'k8-cluster') {
+ if (this.createdbyosm === 'true') {
+ this.deleteURL = environment.K8SCREATECLUSTER_URL;
+ }
+ }
deletingURl = this.deleteURL + '/' + this.id + '?FORCE=true';
this.notifyMessage = 'DELETEDSUCCESSFULLY';
} else if (this.page === 'k8-cluster') {