From: Ricardo Marques <rimarques@suse.com>
Date: Mon, 4 Jun 2018 19:44:21 +0000 (+0100)
Subject: mgr/dashboard: Do not fetch pool list on RBD edit
X-Git-Tag: v14.0.1~1176^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b9be812c71b45de864ee25885e570678d616f36e;p=ceph.git

mgr/dashboard: Do not fetch pool list on RBD edit

Signed-off-by: Ricardo Marques <rimarques@suse.com>
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html
index 5fc0f3f2d316..5e4f4af377a0 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html
@@ -73,10 +73,17 @@
             <span class="required"></span>
           </label>
           <div class="col-sm-9">
+            <input class="form-control"
+                   type="text"
+                   id="pool"
+                   name="pool"
+                   formControlName="pool"
+                   *ngIf="mode === 'editing'">
             <select id="pool"
                     name="pool"
                     class="form-control"
-                    formControlName="pool">
+                    formControlName="pool"
+                    *ngIf="mode !== 'editing'">
               <option *ngIf="pools === null"
                       [ngValue]="null">Loading...
               </option>
@@ -125,11 +132,18 @@
             </cd-helper>
           </label>
           <div class="col-sm-9">
+            <input class="form-control"
+                   type="text"
+                   id="dataPool"
+                   name="dataPool"
+                   formControlName="dataPool"
+                   *ngIf="mode === 'editing'">
             <select id="dataPool"
                     name="dataPool"
                     class="form-control"
                     formControlName="dataPool"
-                    (change)="onDataPoolChange($event.target.value)">
+                    (change)="onDataPoolChange($event.target.value)"
+                    *ngIf="mode !== 'editing'">
               <option *ngIf="dataPools === null"
                       [ngValue]="null">Loading...
               </option>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.ts
index 2a7333cbf531..be8d5922e599 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.ts
@@ -219,32 +219,34 @@ export class RbdFormComponent implements OnInit {
           this.setFeatures(defaultFeatures);
         });
     }
-    this.poolService.list(['pool_name', 'type', 'flags_names', 'application_metadata']).then(
-      resp => {
-        const pools = [];
-        const dataPools = [];
-        for (const pool of resp) {
-          if (_.indexOf(pool.application_metadata, 'rbd') !== -1) {
-            if (pool.type === 'replicated') {
-              pools.push(pool);
-              dataPools.push(pool);
-            } else if (pool.type === 'erasure' &&
-              pool.flags_names.indexOf('ec_overwrites') !== -1) {
-              dataPools.push(pool);
+    if (this.mode !== this.rbdFormMode.editing) {
+      this.poolService.list(['pool_name', 'type', 'flags_names', 'application_metadata']).then(
+        resp => {
+          const pools = [];
+          const dataPools = [];
+          for (const pool of resp) {
+            if (_.indexOf(pool.application_metadata, 'rbd') !== -1) {
+              if (pool.type === 'replicated') {
+                pools.push(pool);
+                dataPools.push(pool);
+              } else if (pool.type === 'erasure' &&
+                pool.flags_names.indexOf('ec_overwrites') !== -1) {
+                dataPools.push(pool);
+              }
             }
           }
+          this.pools = pools;
+          this.allPools = pools;
+          this.dataPools = dataPools;
+          this.allDataPools = dataPools;
+          if (this.pools.length === 1) {
+            const poolName = this.pools[0]['pool_name'];
+            this.rbdForm.get('pool').setValue(poolName);
+            this.onPoolChange(poolName);
+          }
         }
-        this.pools = pools;
-        this.allPools = pools;
-        this.dataPools = dataPools;
-        this.allDataPools = dataPools;
-        if (this.pools.length === 1) {
-          const poolName = this.pools[0]['pool_name'];
-          this.rbdForm.get('pool').setValue(poolName);
-          this.onPoolChange(poolName);
-        }
-      }
-    );
+      );
+    }
     this.deepFlattenFormControl.valueChanges.subscribe((value) => {
       this.watchDataFeatures('deep-flatten', value);
     });