Fix Backup Storage capacity and NAS backup without mount options

Author: abh1sar

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

@@ -61,8 +61,8 @@ public Answer execute(GetBackupStorageStatsCommand command, LibvirtComputingReso
         BackupStorageStatsAnswer answer = new BackupStorageStatsAnswer(command, false, result.second());
 
         String [] stats = result.second().split("\\s+");
-        Long total = Long.parseLong(stats[1]);
-        Long used = Long.parseLong(stats[2]);
+        Long total = Long.parseLong(stats[1]) * 1024;
+        Long used = Long.parseLong(stats[2]) * 1024;
         answer.setTotalSize(total);
         answer.setUsedSize(used);
 

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

@@ -151,16 +151,12 @@ private String mountBackupDirectory(String backupRepoAddress, String backupRepoT
         String mountDirectory = String.format("%s.%s",BACKUP_TEMP_FILE_PREFIX , randomChars);
         try {
             mountDirectory = Files.createTempDirectory(mountDirectory).toString();
-            String mountOpts = null;
-            if (Objects.nonNull(mountOptions)) {
-                mountOpts = mountOptions;
-                if ("cifs".equals(backupRepoType)) {
-                    mountOpts += ",nobrl";
-                }
-            }
             String mount = String.format(MOUNT_COMMAND, backupRepoType, backupRepoAddress, mountDirectory);
-            if (Objects.nonNull(mountOpts)) {
-                mount += " -o " + mountOpts;
+            if ("cifs".equals(backupRepoType)) {
+                mountOptions += ",nobrl";
+            }
+            if (!mountOptions.trim().isEmpty()) {
+                mount += " -o " + mountOptions;
             }
             Script.runSimpleBashScript(mount);
         } catch (Exception e) {