fix

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImg.java

@@ -717,6 +717,17 @@ protected void addScriptOptionsFromMap(Map<String, String> options, Script s) {
         s.add(optionsStr);
     }
 
+    protected void addScriptResizeOptionsFromMap(Map<String, String> options, Script s) {
+        if (MapUtils.isEmpty(options)) {
+            return;
+        }
+        if (options.containsKey(PREALLOCATION)) {
+            s.add(String.format("--%s=%s", PREALLOCATION, options.get(PREALLOCATION)));
+            options.remove(PREALLOCATION);
+        }
+        addScriptOptionsFromMap(options, s);
+    }
+
     /**
      * Rebases the backing file of the image.
      *
@@ -792,7 +803,7 @@ public void resize(final QemuImgFile file, final long size, final boolean delta,
 
         final Script s = new Script(_qemuImgPath);
         s.add("resize");
-        addScriptOptionsFromMap(options, s);
+        addScriptResizeOptionsFromMap(options, s);
         s.add(file.getFileName());
         s.add(newSize);
         s.execute();

plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/qemu/QemuImgTest.java

@@ -511,4 +511,55 @@ public void getResizeOptionsFromConvertOptionsHandlesMixedOptions() throws Libvi
         assertEquals(1, result.size());
         assertEquals("full", result.get(QemuImg.PREALLOCATION));
     }
+
+    @Test
+    public void addScriptResizeOptionsFromMapAddsPreallocationOption() throws LibvirtException, QemuImgException {
+        Script script = Mockito.mock(Script.class);
+        Map<String, String> options = new HashMap<>();
+        options.put(QemuImg.PREALLOCATION, "metadata");
+
+        QemuImg qemuImg = new QemuImg(0);
+        qemuImg.addScriptResizeOptionsFromMap(options, script);
+
+        Mockito.verify(script, Mockito.times(1)).add("--preallocation=metadata");
+        Mockito.verify(script, Mockito.never()).add("-o");
+        assertTrue(options.isEmpty());
+    }
+
+    @Test
+    public void addScriptResizeOptionsFromMapHandlesEmptyOptions() throws LibvirtException, QemuImgException {
+        Script script = Mockito.mock(Script.class);
+        Map<String, String> options = new HashMap<>();
+
+        QemuImg qemuImg = new QemuImg(0);
+        qemuImg.addScriptResizeOptionsFromMap(options, script);
+
+        Mockito.verify(script, Mockito.never()).add(Mockito.anyString());
+    }
+
+    @Test
+    public void addScriptResizeOptionsFromMapHandlesNullOptions() throws LibvirtException, QemuImgException {
+        Script script = Mockito.mock(Script.class);
+
+        QemuImg qemuImg = new QemuImg(0);
+        qemuImg.addScriptResizeOptionsFromMap(null, script);
+
+        Mockito.verify(script, Mockito.never()).add(Mockito.anyString());
+    }
+
+    @Test
+    public void addScriptResizeOptionsFromMapHandlesMixedOptions() throws LibvirtException, QemuImgException {
+        Script script = Mockito.mock(Script.class);
+        Map<String, String> options = new HashMap<>();
+        options.put(QemuImg.PREALLOCATION, "full");
+        options.put("key", "value");
+
+        QemuImg qemuImg = new QemuImg(0);
+        qemuImg.addScriptResizeOptionsFromMap(options, script);
+
+        Mockito.verify(script, Mockito.times(1)).add("--preallocation=full");
+        Mockito.verify(script, Mockito.times(1)).add("-o");
+        Mockito.verify(script, Mockito.times(1)).add("key=value");
+        assertFalse(options.containsKey(QemuImg.PREALLOCATION));
+    }
 }