If a custom disk size and a non-custom disk offering are passed to resizeVolume, fail the operation.

Author: Mike Tutkowski

server/src/com/cloud/storage/VolumeApiServiceImpl.java

@@ -974,6 +974,10 @@ public VolumeVO resizeVolume(ResizeVolumeCmd cmd) throws ResourceAllocationExcep
                 // convert from GiB to bytes
                 newSize = newSize << 30;
             } else {
+                if (cmd.getSize() != null) {
+                    throw new InvalidParameterValueException("You cannnot pass in a custom disk size to a non-custom disk offering.");
+                }
+
                 newSize = newDiskOffering.getDiskSize();
             }