CLOUDSTACK-1761 - Available local storage disk capacity incorrectly reported in

Marcus Sorensen · Marcus Sorensen · commit ff6177d119bb · 2013-03-22T09:30:35.000-06:00
KVM to manager. This adds collection of available storage to KVM, not
     just used.

Bugfix-for: 4.0.2, 4.1, master
Submitted-by: Ted Smith &lt;darnoth@gmail.com&gt;
Signed-off-by: Marcus Sorensen &lt;marcus@betterservers.com&gt; 1363966235 -0600
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -3559,7 +3559,7 @@ public StartupCommand[] initialize() {
                     localStoragePool.getUuid(), cmd.getPrivateIpAddress(),
                     _localStoragePath, _localStoragePath,
                     StoragePoolType.Filesystem, localStoragePool.getCapacity(),
-                    localStoragePool.getUsed());
+                    localStoragePool.getAvailable());
 
             sscmd = new StartupStorageCommand();
             sscmd.setPoolInfo(pi);
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePool.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePool.java
@@ -39,6 +39,8 @@ public KVMPhysicalDisk createPhysicalDisk(String name,
 
     public long getUsed();
 
+    public long getAvailable();
+
     public boolean refresh();
 
     public boolean isExternalSnapshot();
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
@@ -351,6 +351,7 @@ public KVMStoragePool getStoragePool(String uuid) {
             pool.refresh();
             pool.setCapacity(storage.getInfo().capacity);
             pool.setUsed(storage.getInfo().allocation);
+            pool.setAvailable(storage.getInfo().available);
 
             return pool;
         } catch (LibvirtException e) {
@@ -483,6 +484,7 @@ public KVMStoragePool createStoragePool(String name, String host, int port,
 
             pool.setCapacity(sp.getInfo().capacity);
             pool.setUsed(sp.getInfo().allocation);
+            pool.setAvailable(sp.getInfo().available);
   
             return pool;
         } catch (LibvirtException e) {
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
@@ -28,6 +28,7 @@ public class LibvirtStoragePool implements KVMStoragePool {
     protected String uri;
     protected long capacity;
     protected long used;
+    protected long available;
     protected String name;
     protected String localPath;
     protected PhysicalDiskFormat defaultFormat;
@@ -48,6 +49,7 @@ public LibvirtStoragePool(String uuid, String name, StoragePoolType type,
         this._storageAdaptor = adaptor;
         this.capacity = 0;
         this.used = 0;
+        this.available = 0;
         this._pool = pool;
 
     }
@@ -65,11 +67,19 @@ public void setUsed(long used) {
         this.used = used;
     }
 
+    public void setAvailable(long available) {
+        this.available = available;
+    }
+
     @Override
     public long getUsed() {
         return this.used;
     }
 
+    public long getAvailable() {
+        return this.available;
+    }
+
     public StoragePoolType getStoragePoolType() {
         return this.type;
     }
