bug 7237: disk size is passed in diskProfile, no need size parameter in createcommand

edisonSu · edisonSu · commit 0c35f2f743c9 · 2010-11-19T11:55:27.000-08:00
status 7237: rresolved fixed
diff --git a/api/src/com/cloud/agent/api/storage/CreateCommand.java b/api/src/com/cloud/agent/api/storage/CreateCommand.java
@@ -27,7 +27,6 @@ public class CreateCommand extends Command {
     private StorageFilerTO pool;
     private DiskProfile diskCharacteristics;
     private String templateUrl;
-    private long size;
     
     protected CreateCommand() {
         super();
@@ -43,7 +42,7 @@ protected CreateCommand() {
      * @param pool
      */
     public CreateCommand(DiskProfile diskCharacteristics, String templateUrl, StorageFilerTO pool) {
-        this(diskCharacteristics, pool, 0);
+        this(diskCharacteristics, pool);
         this.templateUrl = templateUrl;
     }
 
@@ -55,20 +54,19 @@ public CreateCommand(DiskProfile diskCharacteristics, String templateUrl, Storag
      * @param diskCharacteristics
      * @param pool
      */
-    public CreateCommand(DiskProfile diskCharacteristics, StorageFilerTO pool, long size) {
+    public CreateCommand(DiskProfile diskCharacteristics, StorageFilerTO pool) {
         this.volId = diskCharacteristics.getVolumeId();
         this.diskCharacteristics = diskCharacteristics;        
         this.pool = pool;
         this.templateUrl = null;
-        this.size = size;
     }
     
     public CreateCommand(DiskProfile diskCharacteristics, String templateUrl, StoragePool pool) {
         this(diskCharacteristics, templateUrl, new StorageFilerTO(pool));
     }
     
-    public CreateCommand(DiskProfile diskCharacteristics, StoragePool pool, long size) {
-        this(diskCharacteristics, new StorageFilerTO(pool), size);
+    public CreateCommand(DiskProfile diskCharacteristics, StoragePool pool) {
+        this(diskCharacteristics, new StorageFilerTO(pool));
     }
     
     @Override
@@ -92,10 +90,6 @@ public long getVolumeId() {
         return volId;
     }
     
-    public long getSize(){
-    	return this.size;
-    }
-    
     @Deprecated
     public String getInstanceName() {
         return null;
diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -4695,11 +4695,8 @@ public CreateAnswer execute(CreateCommand cmd) {
                 vdir.nameLabel = dskch.getName();
                 vdir.SR = poolSr;
                 vdir.type = Types.VdiType.USER;
-                
-                if(cmd.getSize()!=0)
-                	vdir.virtualSize = (cmd.getSize()*1024*1024*1L);
-                else
-                	vdir.virtualSize = dskch.getSize();
+                            
+                vdir.virtualSize = dskch.getSize();
                 vdi = VDI.create(conn, vdir);
             }
 
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -791,7 +791,7 @@ public VolumeVO createVolume(VolumeVO volume, VMInstanceVO vm, VMTemplateVO temp
                 }
                 cmd = new CreateCommand(dskCh, tmpltStoredOn.getLocalDownloadPath(), new StorageFilerTO(pool));
             } else {
-                cmd = new CreateCommand(dskCh, new StorageFilerTO(pool), size);
+                cmd = new CreateCommand(dskCh, new StorageFilerTO(pool));
             }
             
             Answer answer = sendToPool(pool, cmd);
@@ -2813,7 +2813,7 @@ public Pair<VolumeTO, StoragePool> createVolume(VolumeVO toBeCreated, DiskOfferi
                 }
                 cmd = new CreateCommand(diskProfile, tmpltStoredOn.getLocalDownloadPath(), new StorageFilerTO(pool));
             } else {
-                cmd = new CreateCommand(diskProfile, new StorageFilerTO(pool), diskProfile.getSize());
+                cmd = new CreateCommand(diskProfile, new StorageFilerTO(pool));
             }
             Answer answer = sendToPool(pool, cmd);
             if (answer.getResult()) {

Original file line number	Diff line number	Diff line change
`@@ -791,7 +791,7 @@ public VolumeVO createVolume(VolumeVO volume, VMInstanceVO vm, VMTemplateVO temp`
`791`	`791`	`}`
`792`	`792`	`cmd = new CreateCommand(dskCh, tmpltStoredOn.getLocalDownloadPath(), new StorageFilerTO(pool));`
`793`	`793`	`} else {`
`794`		`- cmd = new CreateCommand(dskCh, new StorageFilerTO(pool), size);`
	`794`	`+ cmd = new CreateCommand(dskCh, new StorageFilerTO(pool));`
`795`	`795`	`}`
`796`	`796`
`797`	`797`	`Answer answer = sendToPool(pool, cmd);`
`@@ -2813,7 +2813,7 @@ public Pair<VolumeTO, StoragePool> createVolume(VolumeVO toBeCreated, DiskOfferi`
`2813`	`2813`	`}`
`2814`	`2814`	`cmd = new CreateCommand(diskProfile, tmpltStoredOn.getLocalDownloadPath(), new StorageFilerTO(pool));`
`2815`	`2815`	`} else {`
`2816`		`- cmd = new CreateCommand(diskProfile, new StorageFilerTO(pool), diskProfile.getSize());`
	`2816`	`+ cmd = new CreateCommand(diskProfile, new StorageFilerTO(pool));`
`2817`	`2817`	`}`
`2818`	`2818`	`Answer answer = sendToPool(pool, cmd);`
`2819`	`2819`	`if (answer.getResult()) {`