DaanHoogland commented on code in PR #7810:
URL: https://github.com/apache/cloudstack/pull/7810#discussion_r1283122951
##########
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java:
##########
@@ -214,11 +214,11 @@ public void testDiskDef() {
assertEquals(bus, disk.getBusType());
assertEquals(DiskDef.DeviceType.DISK, disk.getDeviceType());
- String resultingXml = disk.toString();
+ String xmlDef = disk.toString();
String expectedXml = "<disk device='disk' type='file'>\n<driver
name='qemu' type='" + type.toString() + "' cache='" + cacheMode.toString() + "'
/>\n" +
"<source file='" + filePath + "'/>\n<target
dev='" + diskLabel + "' bus='" + bus.toString() + "'/>\n</disk>\n";
- assertEquals(expectedXml, resultingXml);
+ assertEquals(xmlDef, expectedXml);
Review Comment:
```suggestion
assertEquals(expectedXml, xmlDef);
```
##########
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java:
##########
@@ -356,29 +356,29 @@ public void testDiskDefWithBurst() {
"<read_bytes_sec_max_length>"+bytesReadRateMaxLength+"</read_bytes_sec_max_length>\n<write_bytes_sec_max_length>"+bytesWriteRateMaxLength+"</write_bytes_sec_max_length>\n"
+
"<read_iops_sec_max_length>"+iopsReadRateMaxLength+"</read_iops_sec_max_length>\n<write_iops_sec_max_length>"+iopsWriteRateMaxLength+"</write_iops_sec_max_length>\n</iotune>\n</disk>\n";
- assertEquals(expectedXml, resultingXml);
+ assertEquals(xmlDef, expectedXml);
Review Comment:
```suggestion
assertEquals(expectedXml, xmlDef);
```
##########
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java:
##########
@@ -356,29 +356,29 @@ public void testDiskDefWithBurst() {
"<read_bytes_sec_max_length>"+bytesReadRateMaxLength+"</read_bytes_sec_max_length>\n<write_bytes_sec_max_length>"+bytesWriteRateMaxLength+"</write_bytes_sec_max_length>\n"
+
"<read_iops_sec_max_length>"+iopsReadRateMaxLength+"</read_iops_sec_max_length>\n<write_iops_sec_max_length>"+iopsWriteRateMaxLength+"</write_iops_sec_max_length>\n</iotune>\n</disk>\n";
- assertEquals(expectedXml, resultingXml);
+ assertEquals(xmlDef, expectedXml);
}
@Test
public void memBalloonDefTestNone() {
- String expectedXml = "<memballoon model='none'
autodeflate='on'>\n</memballoon>";
+ String expectedXml = "<memballoon model='none'>\n</memballoon>";
MemBalloonDef memBalloonDef = new MemBalloonDef();
memBalloonDef.defNoneMemBalloon();
- String resultingXml = memBalloonDef.toString();
+ String xmlDef = memBalloonDef.toString();
- assertEquals(expectedXml, resultingXml);
+ assertEquals(xmlDef, expectedXml);
}
@Test
public void memBalloonDefTestVirtio() {
- String expectedXml = "<memballoon model='virtio'
autodeflate='on'>\n<stats period='60'/>\n</memballoon>";
+ String expectedXml = "<memballoon model='virtio'>\n<stats
period='60'/>\n</memballoon>";
MemBalloonDef memBalloonDef = new MemBalloonDef();
memBalloonDef.defVirtioMemBalloon("60");
- String resultingXml = memBalloonDef.toString();
+ String xmlDef = memBalloonDef.toString();
- assertEquals(expectedXml, resultingXml);
+ assertEquals(xmlDef, expectedXml);
Review Comment:
```suggestion
assertEquals(expectedXml, xmlDef);
```
##########
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java:
##########
@@ -453,6 +453,6 @@ public void testSCSIDef() {
"<address type='pci' domain='0x0000' bus='0x00' slot='0x09'
function='0x0'/>\n" +
"<driver queues='4'/>\n" +
"</controller>\n";
- assertEquals(expected, str);
+ assertEquals(str, expected);
Review Comment:
```suggestion
assertEquals(expected, str);
```
##########
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java:
##########
@@ -356,29 +356,29 @@ public void testDiskDefWithBurst() {
"<read_bytes_sec_max_length>"+bytesReadRateMaxLength+"</read_bytes_sec_max_length>\n<write_bytes_sec_max_length>"+bytesWriteRateMaxLength+"</write_bytes_sec_max_length>\n"
+
"<read_iops_sec_max_length>"+iopsReadRateMaxLength+"</read_iops_sec_max_length>\n<write_iops_sec_max_length>"+iopsWriteRateMaxLength+"</write_iops_sec_max_length>\n</iotune>\n</disk>\n";
- assertEquals(expectedXml, resultingXml);
+ assertEquals(xmlDef, expectedXml);
}
@Test
public void memBalloonDefTestNone() {
- String expectedXml = "<memballoon model='none'
autodeflate='on'>\n</memballoon>";
+ String expectedXml = "<memballoon model='none'>\n</memballoon>";
MemBalloonDef memBalloonDef = new MemBalloonDef();
memBalloonDef.defNoneMemBalloon();
- String resultingXml = memBalloonDef.toString();
+ String xmlDef = memBalloonDef.toString();
- assertEquals(expectedXml, resultingXml);
+ assertEquals(xmlDef, expectedXml);
Review Comment:
```suggestion
assertEquals(expectedXml, xmlDef);
```
##########
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java:
##########
@@ -413,11 +413,11 @@ public void testRngDef() {
int bytes = 2048;
LibvirtVMDef.RngDef def = new LibvirtVMDef.RngDef(path, backendModel,
bytes, period);
- assertEquals(path, def.getPath());
- assertEquals(backendModel, def.getRngBackendModel());
- assertEquals(LibvirtVMDef.RngDef.RngModel.VIRTIO, def.getRngModel());
- assertEquals(bytes, def.getRngRateBytes());
- assertEquals(period, def.getRngRatePeriod());
+ assertEquals(def.getPath(), path);
+ assertEquals(def.getRngBackendModel(), backendModel);
+ assertEquals(def.getRngModel(), LibvirtVMDef.RngDef.RngModel.VIRTIO);
+ assertEquals(def.getRngRateBytes(), bytes);
+ assertEquals(def.getRngRatePeriod(), period);
Review Comment:
```suggestion
assertEquals(path, def.getPath());
assertEquals(backendModel, def.getRngBackendModel());
assertEquals(LibvirtVMDef.RngDef.RngModel.VIRTIO, def.getRngModel());
assertEquals(bytes, def.getRngRateBytes());
assertEquals(period, def.getRngRatePeriod());
```
##########
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java:
##########
@@ -441,8 +441,8 @@ public void testWatchDogDef() {
LibvirtVMDef.WatchDogDef.WatchDogAction action =
LibvirtVMDef.WatchDogDef.WatchDogAction.RESET;
LibvirtVMDef.WatchDogDef def = new LibvirtVMDef.WatchDogDef(action,
model);
- assertEquals(model, def.getModel());
- assertEquals(action, def.getAction());
+ assertEquals(def.getModel(), model);
+ assertEquals(def.getAction(), action);
Review Comment:
```suggestion
assertEquals(model, def.getModel());
assertEquals(action, def.getAction());
```
##########
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java:
##########
@@ -236,7 +236,7 @@ public void testDiskDefWithEncryption() {
"<secret type='passphrase' uuid='" + passphraseUuid + "' />\n" +
"</encryption>\n" +
"</disk>\n";
- assertEquals(expectedXML, disk.toString());
+ assertEquals(disk.toString(), expectedXML);
Review Comment:
```suggestion
assertEquals(expectedXML, disk.toString());
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
