Skip to content

Commit def65ec

Browse files
yadvryadvr
committed
Merge remote-tracking branch 'origin/4.15'
2 parents d4635e3 + 0942838 commit def65ec

File tree

4 files changed

+24
-18
lines changed

4 files changed

+24
-18
lines changed

‎plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4302,8 +4302,8 @@ public void setBackingFileFormat(String volPath) {
43024302
QemuImg qemu = new QemuImg(timeout);
43034303
try{
43044304
Map<String, String> info = qemu.info(file);
4305-
String backingFilePath = info.get(new String("backing_file"));
4306-
String backingFileFormat = info.get(new String("backing_file_format"));
4305+
String backingFilePath = info.get(QemuImg.BACKING_FILE);
4306+
String backingFileFormat = info.get(QemuImg.BACKING_FILE_FORMAT);
43074307
if (org.apache.commons.lang.StringUtils.isNotBlank(backingFilePath)
43084308
&& org.apache.commons.lang.StringUtils.isBlank(backingFileFormat)) {
43094309
// VMs which are created in CloudStack 4.14 and before cannot be started or migrated
@@ -4312,7 +4312,7 @@ public void setBackingFileFormat(String volPath) {
43124312
s_logger.info("Setting backing file format of " + volPath);
43134313
QemuImgFile backingFile = new QemuImgFile(backingFilePath);
43144314
Map<String, String> backingFileinfo = qemu.info(backingFile);
4315-
String backingFileFmt = backingFileinfo.get(new String("file_format"));
4315+
String backingFileFmt = backingFileinfo.get(QemuImg.FILE_FORMAT);
43164316
qemu.rebase(file, backingFile, backingFileFmt, false);
43174317
}
43184318
} catch (QemuImgException | LibvirtException e) {

‎plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ private KVMPhysicalDisk createPhysicalDiskByQemuImg(String name, KVMStoragePool
808808
try{
809809
qemu.create(destFile, options);
810810
Map<String, String> info = qemu.info(destFile);
811-
virtualSize = Long.parseLong(info.get(new String("virtual_size")));
811+
virtualSize = Long.parseLong(info.get(QemuImg.VIRTUAL_SIZE));
812812
actualSize = new File(destFile.getFileName()).length();
813813
} catch (QemuImgException | LibvirtException e) {
814814
s_logger.error("Failed to create " + volPath +
@@ -1285,7 +1285,7 @@ public KVMPhysicalDisk copyPhysicalDisk(KVMPhysicalDisk disk, String name, KVMSt
12851285
srcFile = new QemuImgFile(sourcePath, sourceFormat);
12861286
try {
12871287
Map<String, String> info = qemu.info(srcFile);
1288-
String backingFile = info.get(new String("backing_file"));
1288+
String backingFile = info.get(QemuImg.BACKING_FILE);
12891289
// qcow2 templates can just be copied into place
12901290
if (sourceFormat.equals(destFormat) && backingFile == null && sourcePath.endsWith(".qcow2")) {
12911291
String result = Script.runSimpleBashScript("cp -f " + sourcePath + " " + destPath, timeout);
@@ -1297,7 +1297,7 @@ public KVMPhysicalDisk copyPhysicalDisk(KVMPhysicalDisk disk, String name, KVMSt
12971297
try {
12981298
qemu.convert(srcFile, destFile);
12991299
Map<String, String> destInfo = qemu.info(destFile);
1300-
Long virtualSize = Long.parseLong(destInfo.get(new String("virtual_size")));
1300+
Long virtualSize = Long.parseLong(destInfo.get(QemuImg.VIRTUAL_SIZE));
13011301
newDisk.setVirtualSize(virtualSize);
13021302
newDisk.setSize(virtualSize);
13031303
} catch (QemuImgException | LibvirtException e) {

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929
import org.libvirt.LibvirtException;
3030

3131
public class QemuImg {
32+
public final static String BACKING_FILE = "backing_file";
33+
public final static String BACKING_FILE_FORMAT = "backing_file_format";
34+
public final static String CLUSTER_SIZE = "cluster_size";
35+
public final static String FILE_FORMAT = "file_format";
36+
public final static String IMAGE = "image";
37+
public final static String VIRTUAL_SIZE = "virtual_size";
3238

3339
/* The qemu-img binary. We expect this to be in $PATH */
3440
public String _qemuImgPath = "qemu-img";

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ public void testCreateAndInfo() throws QemuImgException, LibvirtException {
5252
fail("We didn't get any information back from qemu-img");
5353
}
5454

55-
Long infoSize = Long.parseLong(info.get(new String("virtual_size")));
55+
Long infoSize = Long.parseLong(info.get(QemuImg.VIRTUAL_SIZE));
5656
assertEquals(Long.valueOf(size), Long.valueOf(infoSize));
5757

58-
String infoPath = info.get(new String("image"));
58+
String infoPath = info.get(QemuImg.IMAGE);
5959
assertEquals(filename, infoPath);
6060

6161
File f = new File(filename);
@@ -79,13 +79,13 @@ public void testCreateAndInfoWithOptions() throws QemuImgException, LibvirtExcep
7979
qemu.create(file, options);
8080
Map<String, String> info = qemu.info(file);
8181

82-
Long infoSize = Long.parseLong(info.get(new String("virtual_size")));
82+
Long infoSize = Long.parseLong(info.get(QemuImg.VIRTUAL_SIZE));
8383
assertEquals(Long.valueOf(size), Long.valueOf(infoSize));
8484

85-
String infoPath = info.get(new String("image"));
85+
String infoPath = info.get(QemuImg.IMAGE);
8686
assertEquals(filename, infoPath);
8787

88-
String infoClusterSize = info.get(new String("cluster_size"));
88+
String infoClusterSize = info.get(QemuImg.CLUSTER_SIZE);
8989
assertEquals(clusterSize, infoClusterSize);
9090

9191
File f = new File(filename);
@@ -136,7 +136,7 @@ public void testCreateAndResize() throws QemuImgException, LibvirtException {
136136
fail("We didn't get any information back from qemu-img");
137137
}
138138

139-
Long infoSize = Long.parseLong(info.get(new String("virtual_size")));
139+
Long infoSize = Long.parseLong(info.get(QemuImg.VIRTUAL_SIZE));
140140
assertEquals(Long.valueOf(endSize), Long.valueOf(infoSize));
141141
} catch (QemuImgException e) {
142142
fail(e.getMessage());
@@ -165,7 +165,7 @@ public void testCreateAndResizeDeltaPositive() throws QemuImgException, LibvirtE
165165
fail("We didn't get any information back from qemu-img");
166166
}
167167

168-
Long infoSize = Long.parseLong(info.get(new String("virtual_size")));
168+
Long infoSize = Long.parseLong(info.get(QemuImg.VIRTUAL_SIZE));
169169
assertEquals(Long.valueOf(startSize + increment), Long.valueOf(infoSize));
170170
} catch (QemuImgException e) {
171171
fail(e.getMessage());
@@ -193,7 +193,7 @@ public void testCreateAndResizeDeltaNegative() throws QemuImgException, LibvirtE
193193
fail("We didn't get any information back from qemu-img");
194194
}
195195

196-
Long infoSize = Long.parseLong(info.get(new String("virtual_size")));
196+
Long infoSize = Long.parseLong(info.get(QemuImg.VIRTUAL_SIZE));
197197
assertEquals(Long.valueOf(startSize + increment), Long.valueOf(infoSize));
198198
} catch (QemuImgException e) {
199199
fail(e.getMessage());
@@ -256,7 +256,7 @@ public void testCreateWithBackingFile() throws QemuImgException, LibvirtExceptio
256256
fail("We didn't get any information back from qemu-img");
257257
}
258258

259-
String backingFile = info.get(new String("backing_file"));
259+
String backingFile = info.get(QemuImg.BACKING_FILE);
260260
if (backingFile == null) {
261261
fail("The second file does not have a property backing_file! Create failed?");
262262
}
@@ -304,10 +304,10 @@ public void testConvertAdvanced() throws QemuImgException, LibvirtException {
304304

305305
Map<String, String> info = qemu.info(destFile);
306306

307-
PhysicalDiskFormat infoFormat = PhysicalDiskFormat.valueOf(info.get(new String("format")).toUpperCase());
307+
PhysicalDiskFormat infoFormat = PhysicalDiskFormat.valueOf(info.get(QemuImg.FILE_FORMAT).toUpperCase());
308308
assertEquals(destFormat, infoFormat);
309309

310-
Long infoSize = Long.parseLong(info.get(new String("virtual_size")));
310+
Long infoSize = Long.parseLong(info.get(QemuImg.VIRTUAL_SIZE));
311311
assertEquals(Long.valueOf(srcSize), Long.valueOf(infoSize));
312312

313313
File sf = new File(srcFileName);
@@ -317,4 +317,4 @@ public void testConvertAdvanced() throws QemuImgException, LibvirtException {
317317
df.delete();
318318

319319
}
320-
}
320+
}

0 commit comments

Comments
 (0)