addressed review comments

Author: sureshanaparti

plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java

@@ -359,12 +359,13 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
         restoredVolume.setPoolType(pool.getPoolType());
         restoredVolume.setPath(restoredVolume.getUuid());
         restoredVolume.setState(Volume.State.Copying);
-        restoredVolume.setFormat(Storage.ImageFormat.QCOW2);
-        if (pool.getPoolType() == Storage.StoragePoolType.RBD) {
-            restoredVolume.setFormat(Storage.ImageFormat.RAW);
-        }
         restoredVolume.setSize(backupVolumeInfo.getSize());
         restoredVolume.setDiskOfferingId(diskOffering.getId());
+        if (pool.getPoolType() != Storage.StoragePoolType.RBD) {
+            restoredVolume.setFormat(Storage.ImageFormat.QCOW2);
+        } else {
+            restoredVolume.setFormat(Storage.ImageFormat.RAW);
+        }
 
         RestoreBackupCommand restoreCommand = new RestoreBackupCommand();
         restoreCommand.setBackupPath(backup.getExternalId());

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java

@@ -233,11 +233,11 @@ private boolean replaceRbdVolumeWithBackup(KVMStoragePoolManager storagePoolMgr,
             qemu = new QemuImg(timeout * 1000, true, false);
             if (!createTargetVolume) {
                 KVMPhysicalDisk rdbDisk = volumeStoragePool.getPhysicalDisk(volumePath);
-                logger.debug("RBD volume: {}", rdbDisk.toString());
+                logger.debug("Restoring RBD volume: {}", rdbDisk.toString());
                 qemu.setSkipTargetVolumeCreation(true);
             }
         } catch (LibvirtException ex) {
-            throw new CloudRuntimeException("Failed to create qemu-img command to replace RBD volume with backup", ex);
+            throw new CloudRuntimeException("Failed to create qemu-img command to restore RBD volume with backup", ex);
         }
 
         QemuImgFile srcBackupFile = null;