Merge pull request ceph#58167 from rhcs-dashboard/multi-cluster-cleanup

mgr/dashboard: Multi-cluster cleanup

Reviewed-by: Aashish Sharma <[email protected]>
Reviewed-by: Ankush Behl <[email protected]>
Reviewed-by: Nizamudeen A <[email protected]>

Author: nizamial09

src/pybind/mgr/dashboard/controllers/multi_cluster.py

@@ -268,12 +268,13 @@ def reconnect_cluster(self, url: str, username=None, password=None,
     @Endpoint('PUT')
     @UpdatePermission
     # pylint: disable=unused-variable
-    def edit_cluster(self, url, cluster_alias, username, verify=False, ssl_certificate=None):
+    def edit_cluster(self, name, url, cluster_alias, username, verify=False, ssl_certificate=None):
         multicluster_config = self.load_multi_cluster_config()
         if "config" in multicluster_config:
             for key, cluster_details in multicluster_config["config"].items():
                 for cluster in cluster_details:
-                    if cluster["url"] == url and cluster["user"] == username:
+                    if cluster["name"] == name and cluster["user"] == username:
+                        cluster['url'] = url
                         cluster['cluster_alias'] = cluster_alias
                         cluster['ssl_verify'] = verify
                         cluster['ssl_certificate'] = ssl_certificate if verify else ''

src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/multi-cluster/multi-cluster-form/multi-cluster-form.component.html

@@ -117,7 +117,7 @@
                 </cd-copy-2-clipboard-button>
               </span>
               <span class="invalid-feedback"
-                    *ngIf="remoteClusterForm.showError('password', frm, 'required')"
+                    *ngIf="remoteClusterForm.showError('password', frm, 'requiredNotEdit')"
                     i18n>This field is required.
               </span>
             </div>

src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/multi-cluster/multi-cluster-form/multi-cluster-form.component.ts

@@ -52,7 +52,6 @@ export class MultiClusterFormComponent implements OnInit, OnDestroy {
   ngOnInit(): void {
     if (this.action === 'edit') {
       this.remoteClusterForm.get('remoteClusterUrl').setValue(this.cluster.url);
-      this.remoteClusterForm.get('remoteClusterUrl').disable();
       this.remoteClusterForm.get('clusterAlias').setValue(this.cluster.cluster_alias);
       this.remoteClusterForm.get('ssl').setValue(this.cluster.ssl_verify);
       this.remoteClusterForm.get('ssl_cert').setValue(this.cluster.ssl_certificate);
@@ -76,7 +75,6 @@ export class MultiClusterFormComponent implements OnInit, OnDestroy {
 
   createForm() {
     this.remoteClusterForm = new CdFormGroup({
-      // showToken: new FormControl(false),
       username: new FormControl('', [
         CdValidators.custom('uniqueUrlandUser', (username: string) => {
           let remoteClusterUrl = '';
@@ -96,7 +94,12 @@ export class MultiClusterFormComponent implements OnInit, OnDestroy {
           );
         })
       ]),
-      password: new FormControl('', []),
+      password: new FormControl(
+        null,
+        CdValidators.custom('requiredNotEdit', (value: string) => {
+          return this.action !== 'edit' && !value;
+        })
+      ),
       remoteClusterUrl: new FormControl(null, {
         validators: [
           CdValidators.custom('endpoint', (value: string) => {
@@ -116,19 +119,16 @@ export class MultiClusterFormComponent implements OnInit, OnDestroy {
           Validators.required
         ]
       }),
-      // apiToken: new FormControl('', [
-      //   CdValidators.requiredIf({
-      //     showToken: true
-      //   })
-      // ]),
       clusterAlias: new FormControl(null, {
         validators: [
           Validators.required,
           CdValidators.custom('uniqueName', (clusterAlias: string) => {
             return (
               (this.action === 'connect' || this.action === 'edit') &&
               this.clusterAliasNames &&
-              this.clusterAliasNames.indexOf(clusterAlias) !== -1
+              this.clusterAliasNames.indexOf(clusterAlias) !== -1 &&
+              this.cluster?.cluster_alias &&
+              this.cluster.cluster_alias !== clusterAlias
             );
           })
         ]
@@ -197,7 +197,14 @@ export class MultiClusterFormComponent implements OnInit, OnDestroy {
       case 'edit':
         this.subs.add(
           this.multiClusterService
-            .editCluster(this.cluster.url, clusterAlias, this.cluster.user, ssl, ssl_certificate)
+            .editCluster(
+              this.cluster.name,
+              url,
+              clusterAlias,
+              this.cluster.user,
+              ssl,
+              ssl_certificate
+            )
             .subscribe({
               ...commonSubscribtion,
               complete: () => this.handleSuccess($localize`Cluster updated successfully`)

src/pybind/mgr/dashboard/frontend/src/app/shared/api/multi-cluster.service.ts

@@ -125,13 +125,15 @@ export class MultiClusterService {
   }
 
   editCluster(
+    name: string,
     url: any,
     clusterAlias: string,
     username: string,
     verify = false,
     ssl_certificate = ''
   ) {
     return this.http.put('api/multi-cluster/edit_cluster', {
+      name: name,
       url,
       cluster_alias: clusterAlias,
       username: username,

src/pybind/mgr/dashboard/openapi.yaml

@@ -7303,6 +7303,8 @@ paths:
               properties:
                 cluster_alias:
                   type: string
+                name:
+                  type: string
                 ssl_certificate:
                   type: string
                 url:
@@ -7313,6 +7315,7 @@ paths:
                   default: false
                   type: boolean
               required:
+              - name
               - url
               - cluster_alias
               - username