fix backupmanagertest

Author: abh1sar

server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java

@@ -403,7 +403,7 @@ public String getBackupNameFromVM(VirtualMachine vm) {
     @Override
     public String createVolumeInfoFromVolumes(List<Volume> vmVolumes) {
         List<Backup.VolumeInfo> list = new ArrayList<>();
-        vmVolumes.sort(Comparator.comparing(VolumeVO::getDeviceId));
+        vmVolumes.sort(Comparator.comparing(Volume::getDeviceId));
         for (Volume vol : vmVolumes) {
             DiskOfferingVO diskOffering = diskOfferingDao.findById(vol.getDiskOfferingId());
             Backup.VolumeInfo volumeInfo = new Backup.VolumeInfo(vol.getUuid(), vol.getPath(), vol.getVolumeType(), vol.getSize(),

server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java

@@ -1134,11 +1134,11 @@ public void testCreateVolumeInfoFromVolumes() {
                 diskOfferingId, null, 2048L, 1000L, 2000L, null);
         volume2.setUuid("uuid2");
         volume2.setPath("path2");
-        volume1.setDeviceId(1L);
+        volume2.setDeviceId(1L);
         volume2.setVolumeType(Volume.Type.DATADISK);
         volumes.add(volume2);
 
-        String expectedJson = "[{\"uuid\":\"uuid1\",\"type\":\"ROOT\",\"size\":1024,\"path\":\"path1\",\"deviceId\":1,\"diskOfferingId\":\"disk-offering-uuid\"},{\"uuid\":\"uuid2\",\"type\":\"DATADISK\",\"size\":2048,\"path\":\"path2\",\"diskOfferingId\":\"disk-offering-uuid\",\"minIops\":1000,\"maxIops\":2000}]";
+        String expectedJson = "[{\"uuid\":\"uuid1\",\"type\":\"ROOT\",\"size\":1024,\"path\":\"path1\",\"deviceId\":0,\"diskOfferingId\":\"disk-offering-uuid\"},{\"uuid\":\"uuid2\",\"type\":\"DATADISK\",\"size\":2048,\"path\":\"path2\",\"deviceId\":1,\"diskOfferingId\":\"disk-offering-uuid\",\"minIops\":1000,\"maxIops\":2000}]";
         String actualJson = backupManager.createVolumeInfoFromVolumes(new ArrayList<>(volumes));
 
         assertEquals(expectedJson, actualJson);