shwstppr commented on code in PR #9451:
URL: https://github.com/apache/cloudstack/pull/9451#discussion_r1735973652


##########
plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java:
##########
@@ -0,0 +1,434 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.backup;
+
+import com.cloud.agent.AgentManager;
+import com.cloud.dc.dao.ClusterDao;
+import com.cloud.exception.AgentUnavailableException;
+import com.cloud.exception.OperationTimedoutException;
+import com.cloud.host.Host;
+import com.cloud.host.HostVO;
+import com.cloud.host.Status;
+import com.cloud.host.dao.HostDao;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.storage.ScopeType;
+import com.cloud.storage.StoragePoolHostVO;
+import com.cloud.storage.Volume;
+import com.cloud.storage.VolumeVO;
+import com.cloud.storage.dao.StoragePoolHostDao;
+import com.cloud.storage.dao.VolumeDao;
+import com.cloud.utils.Pair;
+import com.cloud.utils.component.AdapterBase;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.dao.VMInstanceDao;
+import org.apache.cloudstack.backup.dao.BackupDao;
+import org.apache.cloudstack.backup.dao.BackupOfferingDao;
+import org.apache.cloudstack.backup.dao.BackupRepositoryDao;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import javax.inject.Inject;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
+
+public class NASBackupProvider extends AdapterBase implements BackupProvider, 
Configurable {
+    private static final Logger LOG = 
LogManager.getLogger(NASBackupProvider.class);
+
+    @Inject
+    private BackupDao backupDao;
+
+    @Inject
+    private BackupRepositoryDao backupRepositoryDao;
+
+    @Inject
+    private BackupOfferingDao backupOfferingDao;
+
+    @Inject
+    private HostDao hostDao;
+
+    @Inject
+    private ClusterDao clusterDao;
+
+    @Inject
+    private VolumeDao volumeDao;
+
+    @Inject
+    private StoragePoolHostDao storagePoolHostDao;
+
+    @Inject
+    private VMInstanceDao vmInstanceDao;
+
+    @Inject
+    private PrimaryDataStoreDao primaryDataStoreDao;
+
+    @Inject
+    private AgentManager agentManager;
+
+    protected Host getLastVMHypervisorHost(VirtualMachine vm) {
+        Long hostId = vm.getLastHostId();
+        if (hostId == null) {
+            LOG.debug("Cannot find last host for vm. This should never happen, 
please check your database.");

Review Comment:
   Not sure if relevant but I think it can happen in case of cross-cluster 
migrations



##########
plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java:
##########
@@ -0,0 +1,434 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.backup;
+
+import com.cloud.agent.AgentManager;
+import com.cloud.dc.dao.ClusterDao;
+import com.cloud.exception.AgentUnavailableException;
+import com.cloud.exception.OperationTimedoutException;
+import com.cloud.host.Host;
+import com.cloud.host.HostVO;
+import com.cloud.host.Status;
+import com.cloud.host.dao.HostDao;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.storage.ScopeType;
+import com.cloud.storage.StoragePoolHostVO;
+import com.cloud.storage.Volume;
+import com.cloud.storage.VolumeVO;
+import com.cloud.storage.dao.StoragePoolHostDao;
+import com.cloud.storage.dao.VolumeDao;
+import com.cloud.utils.Pair;
+import com.cloud.utils.component.AdapterBase;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.dao.VMInstanceDao;
+import org.apache.cloudstack.backup.dao.BackupDao;
+import org.apache.cloudstack.backup.dao.BackupOfferingDao;
+import org.apache.cloudstack.backup.dao.BackupRepositoryDao;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import javax.inject.Inject;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
+
+public class NASBackupProvider extends AdapterBase implements BackupProvider, 
Configurable {
+    private static final Logger LOG = 
LogManager.getLogger(NASBackupProvider.class);
+
+    @Inject
+    private BackupDao backupDao;
+
+    @Inject
+    private BackupRepositoryDao backupRepositoryDao;
+
+    @Inject
+    private BackupOfferingDao backupOfferingDao;
+
+    @Inject
+    private HostDao hostDao;
+
+    @Inject
+    private ClusterDao clusterDao;
+
+    @Inject
+    private VolumeDao volumeDao;
+
+    @Inject
+    private StoragePoolHostDao storagePoolHostDao;
+
+    @Inject
+    private VMInstanceDao vmInstanceDao;
+
+    @Inject
+    private PrimaryDataStoreDao primaryDataStoreDao;
+
+    @Inject
+    private AgentManager agentManager;
+
+    protected Host getLastVMHypervisorHost(VirtualMachine vm) {
+        Long hostId = vm.getLastHostId();
+        if (hostId == null) {
+            LOG.debug("Cannot find last host for vm. This should never happen, 
please check your database.");
+            return null;
+        }
+        Host host = hostDao.findById(hostId);
+
+        if (host.getStatus() == Status.Up) {
+            return host;
+        } else {
+            // Try to find any Up host in the same cluster
+            for (final Host hostInCluster : 
hostDao.findHypervisorHostInCluster(host.getClusterId())) {
+                if (hostInCluster.getStatus() == Status.Up) {
+                    LOG.debug("Found Host " + hostInCluster.getName());
+                    return hostInCluster;
+                }
+            }
+        }
+        // Try to find any Host in the zone
+        for (final HostVO hostInZone : 
hostDao.listByDataCenterIdAndHypervisorType(host.getDataCenterId(), 
Hypervisor.HypervisorType.KVM)) {
+            if (hostInZone.getStatus() == Status.Up) {
+                LOG.debug("Found Host " + hostInZone.getName());
+                return hostInZone;
+            }
+        }
+        return null;
+    }
+
+    protected Host getVMHypervisorHost(VirtualMachine vm) {
+        Long hostId = vm.getHostId();
+        if (hostId == null && 
VirtualMachine.State.Running.equals(vm.getState())) {
+            throw new CloudRuntimeException(String.format("Unable to find the 
hypervisor host for %s. Make sure the virtual machine is running", 
vm.getName()));
+        }
+        if (VirtualMachine.State.Stopped.equals(vm.getState())) {
+            hostId = vm.getLastHostId();
+        }
+        if (hostId == null) {
+            throw new CloudRuntimeException(String.format("Unable to find the 
hypervisor host for stopped VM: %s", vm));
+        }
+        final Host host = hostDao.findById(hostId);
+        if (host == null || !Status.Up.equals(host.getStatus()) || 
!Hypervisor.HypervisorType.KVM.equals(host.getHypervisorType())) {
+            throw new CloudRuntimeException("Unable to contact backend control 
plane to initiate backup");
+        }
+        return host;
+    }
+
+    @Override
+    public boolean takeBackup(final VirtualMachine vm) {
+        final Host host = getVMHypervisorHost(vm);
+
+        final BackupRepository backupRepository = 
backupRepositoryDao.findByBackupOfferingId(vm.getBackupOfferingId());
+        if (backupRepository == null) {
+            throw new CloudRuntimeException("No valid backup repository found 
for the VM, please check the attached backup offering");
+        }
+
+        final Date creationDate = new Date();
+        final String backupPath = String.format("%s/%s", vm.getInstanceName(),
+                new 
SimpleDateFormat("yyyy.MM.dd.HH.mm.ss").format(creationDate));
+
+        TakeBackupCommand command = new 
TakeBackupCommand(vm.getInstanceName(), backupPath);
+        command.setBackupRepoType(backupRepository.getType());
+        command.setBackupRepoAddress(backupRepository.getAddress());
+        command.setMountOptions(backupRepository.getMountOptions());
+
+        if (VirtualMachine.State.Stopped.equals(vm.getState())) {
+            List<VolumeVO> vmVolumes = volumeDao.findByInstance(vm.getId());
+            List<String> volumePaths = getVolumePaths(vmVolumes);
+            command.setVolumePaths(volumePaths);
+        }
+
+        BackupAnswer answer = null;
+        try {
+            answer = (BackupAnswer) agentManager.send(host.getId(), command);
+        } catch (AgentUnavailableException e) {
+            throw new CloudRuntimeException("Unable to contact backend control 
plane to initiate backup");
+        } catch (OperationTimedoutException e) {
+            throw new CloudRuntimeException("Operation to initiate backup 
timed out, please try again");
+        }
+
+        if (answer != null && answer.getResult()) {
+            BackupVO backup = new BackupVO();
+            backup.setVmId(vm.getId());
+            backup.setExternalId(backupPath);
+            backup.setType("FULL");
+            backup.setDate(creationDate);
+            backup.setSize(answer.getSize());
+            long virtualSize = 0L;
+            for (final Volume volume: volumeDao.findByInstance(vm.getId())) {
+                if (Volume.State.Ready.equals(volume.getState())) {
+                    virtualSize += volume.getSize();
+                }
+            }
+            backup.setProtectedSize(Long.valueOf(virtualSize));
+            backup.setStatus(Backup.Status.BackedUp);
+            backup.setBackupOfferingId(vm.getBackupOfferingId());
+            backup.setAccountId(vm.getAccountId());
+            backup.setDomainId(vm.getDomainId());
+            backup.setZoneId(vm.getDataCenterId());
+            return backupDao.persist(backup) != null;
+        }
+
+        return answer.getResult();
+    }
+
+    @Override
+    public boolean restoreVMFromBackup(VirtualMachine vm, Backup backup) {
+        List<VolumeVO> volumes = volumeDao.findByInstance(vm.getId());
+        volumes.sort(Comparator.comparing(VolumeVO::getDeviceId));
+
+        LOG.debug(String.format("Restoring vm %s from backup %s on the NAS 
Backup Provider", vm.getUuid(), backup.getUuid()));
+        BackupRepository backupRepository = getBackupRepository(vm, backup);
+
+        final Host host = getLastVMHypervisorHost(vm);
+        RestoreBackupCommand restoreCommand = new RestoreBackupCommand();
+        restoreCommand.setBackupPath(backup.getExternalId());
+        restoreCommand.setBackupRepoType(backupRepository.getType());
+        restoreCommand.setBackupRepoAddress(backupRepository.getAddress());
+        restoreCommand.setVmName(vm.getName());
+        restoreCommand.setVolumePaths(getVolumePaths(volumes));
+        restoreCommand.setVmExists(vm.getRemoved() == null);
+
+        BackupAnswer answer = null;
+        try {
+            answer = (BackupAnswer) agentManager.send(host.getId(), 
restoreCommand);
+        } catch (AgentUnavailableException e) {
+            throw new CloudRuntimeException("Unable to contact backend control 
plane to initiate backup");
+        } catch (OperationTimedoutException e) {
+            throw new CloudRuntimeException("Operation to initiate backup 
timed out, please try again");
+        }
+        return answer.getResult();
+    }
+
+    private List<String> getVolumePaths(List<VolumeVO> volumes) {
+        List<String> volumePaths = new ArrayList<>();
+        for (VolumeVO volume : volumes) {
+            StoragePoolVO storagePool = 
primaryDataStoreDao.findById(volume.getPoolId());
+            if (Objects.isNull(storagePool)) {
+                throw new CloudRuntimeException("Unable to find storage pool 
associated to the volume");
+            }
+            String volumePathPrefix = String.format("/mnt/%s", 
storagePool.getUuid());
+            if (ScopeType.HOST.equals(storagePool.getScope())) {
+                volumePathPrefix = storagePool.getPath();
+            }
+            volumePaths.add(String.format("%s/%s", volumePathPrefix, 
volume.getPath()));
+        }
+        return volumePaths;
+    }
+
+    @Override
+    public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, String 
volumeUuid, String hostIp, String dataStoreUuid) {
+        final VolumeVO volume = volumeDao.findByUuid(volumeUuid);
+        final VirtualMachine backupSourceVm = 
vmInstanceDao.findById(backup.getVmId());
+        final StoragePoolHostVO dataStore = 
storagePoolHostDao.findByUuid(dataStoreUuid);
+        final HostVO hostVO = hostDao.findByIp(hostIp);
+        final Long zoneId = backup.getZoneId();
+
+        // TODO: Find volume from backup volumes
+        Optional<Backup.VolumeInfo> matchingVolume = 
getBackedUpVolumeInfo(backupSourceVm.getBackupVolumeList(), volumeUuid);
+        Long backedUpVolumeSize = matchingVolume.isPresent() ? 
matchingVolume.get().getSize() : 0L;
+
+        LOG.debug("Restoring vm volume" + volumeUuid + "from backup " + 
backup.getUuid() + " on the NAS Backup Provider");
+        BackupRepository backupRepository = 
getBackupRepository(backupSourceVm, backup);
+
+        VolumeVO restoredVolume = new VolumeVO(Volume.Type.DATADISK, null, 
backup.getZoneId(),
+                backup.getDomainId(), backup.getAccountId(), 0, null,
+                backup.getSize(), null, null, null);
+        String volumeUUID = UUID.randomUUID().toString();
+        restoredVolume.setName("RestoredVol-"+volume.getName());
+        restoredVolume.setProvisioningType(volume.getProvisioningType());
+        restoredVolume.setUpdated(new Date());
+        restoredVolume.setUuid(volumeUUID);
+        restoredVolume.setRemoved(null);
+        restoredVolume.setDisplayVolume(true);
+        restoredVolume.setPoolId(dataStore.getPoolId());
+        restoredVolume.setPath(restoredVolume.getUuid());
+        restoredVolume.setState(Volume.State.Copying);
+        restoredVolume.setSize(backedUpVolumeSize);
+        restoredVolume.setDiskOfferingId(volume.getDiskOfferingId());
+
+        RestoreBackupCommand restoreCommand = new RestoreBackupCommand();
+        restoreCommand.setBackupPath(backup.getExternalId());
+        restoreCommand.setBackupRepoType(backupRepository.getType());
+        restoreCommand.setBackupRepoAddress(backupRepository.getAddress());
+        restoreCommand.setVmName(backupSourceVm.getName());
+        
restoreCommand.setVolumePaths(Collections.singletonList(String.format("%s/%s", 
dataStore.getLocalPath(), volumeUUID)));
+        
restoreCommand.setDiskType(volume.getVolumeType().name().toLowerCase(Locale.ROOT));
+        restoreCommand.setDeviceId(volume.getDeviceId());
+        restoreCommand.setVmExists(null);
+        restoreCommand.setRestoreVolumeUUID(volumeUuid);
+
+        BackupAnswer answer = null;
+        try {
+            answer = (BackupAnswer) agentManager.send(hostVO.getId(), 
restoreCommand);
+        } catch (AgentUnavailableException e) {
+            throw new CloudRuntimeException("Unable to contact backend control 
plane to initiate backup");
+        } catch (OperationTimedoutException e) {
+            throw new CloudRuntimeException("Operation to initiate backup 
timed out, please try again");
+        }
+
+        if (answer.getResult()) {
+            try {
+                volumeDao.persist(restoredVolume);
+            } catch (Exception e) {
+                throw new CloudRuntimeException("Unable to create restored 
volume due to: " + e);
+            }
+        }
+
+        return new Pair<>(answer.getResult(), answer.getDetails());
+    }
+
+    private BackupRepository getBackupRepository(VirtualMachine vm, Backup 
backup) {
+        BackupRepository backupRepository = 
backupRepositoryDao.findByBackupOfferingId(vm.getBackupOfferingId());
+        final String errorMessage = "No valid backup repository found for the 
VM, please check the attached backup offering";
+        if (backupRepository == null) {
+            logger.warn(errorMessage + "Re-attempting with the backup offering 
associated with the backup");
+        }
+        backupRepository = 
backupRepositoryDao.findByBackupOfferingId(backup.getBackupOfferingId());
+        if (backupRepository == null) {
+            throw new CloudRuntimeException(errorMessage);
+        }
+        return backupRepository;
+    }
+
+    private Optional<Backup.VolumeInfo> 
getBackedUpVolumeInfo(List<Backup.VolumeInfo> backedUpVolumes, String 
volumeUuid) {
+        return backedUpVolumes.stream()
+                .filter(v -> v.getUuid().equals(volumeUuid))
+                .findFirst();
+    }
+
+    @Override
+    public boolean deleteBackup(Backup backup, boolean forced) {
+        final BackupRepository backupRepository = 
backupRepositoryDao.findByBackupOfferingId(backup.getBackupOfferingId());
+        if (backupRepository == null) {
+            throw new CloudRuntimeException("No valid backup repository found 
for the VM, please check the attached backup offering");
+        }
+
+        // TODO: this can be any host in the cluster or last host

Review Comment:
   This need to be addressed?



##########
ui/src/components/view/ListView.vue:
##########
@@ -174,7 +174,7 @@
       <template v-if="record.clustertype === 'ExternalManaged' && 
$route.path.split('/')[1] === 'kubernetes' && ['kubernetesversionname', 
'cpunumber', 'memory', 'size'].includes(column.key)">
         <span>{{ text <= 0 || !text ? 'N/A' : text }}</span>
       </template>
-      <template v-else-if="column.key === 'size'">
+      <template v-else-if="column.key === 'size' || column.key === 
'virtualsize'">

Review Comment:
   minor (presentational)
   ```suggestion
         <template v-else-if="['size', 'virtualsize'].includes(column.key)">
   ```



##########
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java:
##########
@@ -0,0 +1,181 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.resource.CommandWrapper;
+import com.cloud.resource.ResourceWrapper;
+import com.cloud.utils.Pair;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.script.Script;
+import org.apache.cloudstack.backup.BackupAnswer;
+import org.apache.cloudstack.backup.RestoreBackupCommand;
+import org.apache.commons.lang3.RandomStringUtils;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+
+@ResourceWrapper(handles = RestoreBackupCommand.class)
+public class LibvirtRestoreBackupCommandWrapper extends 
CommandWrapper<RestoreBackupCommand, Answer, LibvirtComputingResource> {
+    private static final String BACKUP_TEMP_FILE_PREFIx = "csbackup";
+    private static final String MOUNT_COMMAND = "sudo mount -t %s %s %s";
+    private static final String UMOUNT_COMMAND = "sudo umount %s";
+    private static final String FILE_PATH_PLACEHOLDER = "%s/%s";
+
+    @Override
+    public Answer execute(RestoreBackupCommand command, 
LibvirtComputingResource serverResource) {
+        String vmName = command.getVmName();
+        String backupPath = command.getBackupPath();
+        String backupRepoAddress = command.getBackupRepoAddress();
+        String backupRepoType = command.getBackupRepoType();
+        String mountOptions = command.getMountOptions();
+        Boolean vmExists = command.isVmExists();
+        String diskType = command.getDiskType();
+        Long deviceId = command.getDeviceId();
+        List<String> volumePaths = command.getVolumePaths();
+        String restoreVolumeUuid = command.getRestoreVolumeUUID();
+
+        String newVolumeId = null;
+        if (Objects.isNull(vmExists)) {
+            String volumePath = volumePaths.get(0);
+            int lastIndex = volumePath.lastIndexOf("/");
+            newVolumeId = volumePath.substring(lastIndex + 1);
+            restoreVolume(backupPath, backupRepoType, backupRepoAddress, 
volumePath, diskType, deviceId, restoreVolumeUuid);
+        } else if (vmExists) {
+            restoreVolumesOfExistingVM(volumePaths, backupPath, 
backupRepoType, backupRepoAddress, mountOptions);
+        } else {
+            restoreVolumesOfDestroyedVMs(volumePaths, vmName, backupPath, 
backupRepoType, backupRepoAddress, mountOptions);
+        }
+
+        return new BackupAnswer(command, true, newVolumeId);
+    }
+
+    private void restoreVolumesOfExistingVM(List<String> volumePaths, String 
backupPath,
+                                             String backupRepoType, String 
backupRepoAddress, String mountOptions) {
+        String diskType = "root";
+        String mountDirectory = mountBackupDirectory(backupRepoAddress, 
backupRepoType);
+        try {
+            for (int idx = 0; idx < volumePaths.size(); idx++) {
+                String volumePath = volumePaths.get(idx);
+                Pair<String, String> bkpPathAndVolUuid = 
getBackupPath(mountDirectory, volumePath, backupPath, diskType, idx, null);
+                diskType = "datadisk";
+                try {
+                    replaceVolumeWithBackup(volumePath, 
bkpPathAndVolUuid.first());
+                } catch (IOException e) {
+                    throw new CloudRuntimeException(String.format("Unable to 
revert backup for volume [%s] due to [%s].", bkpPathAndVolUuid.second(), 
e.getMessage()), e);

Review Comment:
   Any handling needed if there are multiple volumes and the replace operations 
fails after some



##########
server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java:
##########
@@ -749,20 +759,26 @@ public boolean restoreBackupVolumeAndAttachToVM(final 
String backedUpVolumeUuid,
             throw new CloudRuntimeException("VM reference for the provided VM 
backup not found");
         }
         accountManager.checkAccess(CallContext.current().getCallingAccount(), 
null, true, vmFromBackup);
+        final BackupOffering offering = 
backupOfferingDao.findByIdIncludingRemoved(backup.getBackupOfferingId());
+        if (offering == null) {
+            throw new CloudRuntimeException("Failed to find VM backup 
offering");
+        }
+
+        BackupProvider backupProvider = 
getBackupProvider(offering.getProvider());
+        VolumeVO backedUpVolume = volumeDao.findByUuid(backedUpVolumeUuid);
+        Pair<HostVO, StoragePoolVO> restoreInfo;
+        if (!Objects.equals(offering.getProvider(), "nas")) {

Review Comment:
   ```suggestion
           if (!"nas".equals(offering.getProvider())) {
   ```



##########
plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java:
##########
@@ -0,0 +1,434 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.backup;
+
+import com.cloud.agent.AgentManager;
+import com.cloud.dc.dao.ClusterDao;
+import com.cloud.exception.AgentUnavailableException;
+import com.cloud.exception.OperationTimedoutException;
+import com.cloud.host.Host;
+import com.cloud.host.HostVO;
+import com.cloud.host.Status;
+import com.cloud.host.dao.HostDao;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.storage.ScopeType;
+import com.cloud.storage.StoragePoolHostVO;
+import com.cloud.storage.Volume;
+import com.cloud.storage.VolumeVO;
+import com.cloud.storage.dao.StoragePoolHostDao;
+import com.cloud.storage.dao.VolumeDao;
+import com.cloud.utils.Pair;
+import com.cloud.utils.component.AdapterBase;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.dao.VMInstanceDao;
+import org.apache.cloudstack.backup.dao.BackupDao;
+import org.apache.cloudstack.backup.dao.BackupOfferingDao;
+import org.apache.cloudstack.backup.dao.BackupRepositoryDao;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import javax.inject.Inject;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
+
+public class NASBackupProvider extends AdapterBase implements BackupProvider, 
Configurable {
+    private static final Logger LOG = 
LogManager.getLogger(NASBackupProvider.class);
+
+    @Inject
+    private BackupDao backupDao;
+
+    @Inject
+    private BackupRepositoryDao backupRepositoryDao;
+
+    @Inject
+    private BackupOfferingDao backupOfferingDao;
+
+    @Inject
+    private HostDao hostDao;
+
+    @Inject
+    private ClusterDao clusterDao;
+
+    @Inject
+    private VolumeDao volumeDao;
+
+    @Inject
+    private StoragePoolHostDao storagePoolHostDao;
+
+    @Inject
+    private VMInstanceDao vmInstanceDao;
+
+    @Inject
+    private PrimaryDataStoreDao primaryDataStoreDao;
+
+    @Inject
+    private AgentManager agentManager;
+
+    protected Host getLastVMHypervisorHost(VirtualMachine vm) {
+        Long hostId = vm.getLastHostId();
+        if (hostId == null) {
+            LOG.debug("Cannot find last host for vm. This should never happen, 
please check your database.");
+            return null;
+        }
+        Host host = hostDao.findById(hostId);
+
+        if (host.getStatus() == Status.Up) {
+            return host;
+        } else {
+            // Try to find any Up host in the same cluster
+            for (final Host hostInCluster : 
hostDao.findHypervisorHostInCluster(host.getClusterId())) {
+                if (hostInCluster.getStatus() == Status.Up) {
+                    LOG.debug("Found Host " + hostInCluster.getName());
+                    return hostInCluster;
+                }
+            }
+        }
+        // Try to find any Host in the zone
+        for (final HostVO hostInZone : 
hostDao.listByDataCenterIdAndHypervisorType(host.getDataCenterId(), 
Hypervisor.HypervisorType.KVM)) {
+            if (hostInZone.getStatus() == Status.Up) {
+                LOG.debug("Found Host " + hostInZone.getName());
+                return hostInZone;
+            }
+        }
+        return null;
+    }
+
+    protected Host getVMHypervisorHost(VirtualMachine vm) {
+        Long hostId = vm.getHostId();
+        if (hostId == null && 
VirtualMachine.State.Running.equals(vm.getState())) {
+            throw new CloudRuntimeException(String.format("Unable to find the 
hypervisor host for %s. Make sure the virtual machine is running", 
vm.getName()));
+        }
+        if (VirtualMachine.State.Stopped.equals(vm.getState())) {
+            hostId = vm.getLastHostId();
+        }
+        if (hostId == null) {
+            throw new CloudRuntimeException(String.format("Unable to find the 
hypervisor host for stopped VM: %s", vm));
+        }
+        final Host host = hostDao.findById(hostId);
+        if (host == null || !Status.Up.equals(host.getStatus()) || 
!Hypervisor.HypervisorType.KVM.equals(host.getHypervisorType())) {
+            throw new CloudRuntimeException("Unable to contact backend control 
plane to initiate backup");
+        }
+        return host;
+    }
+
+    @Override
+    public boolean takeBackup(final VirtualMachine vm) {
+        final Host host = getVMHypervisorHost(vm);
+
+        final BackupRepository backupRepository = 
backupRepositoryDao.findByBackupOfferingId(vm.getBackupOfferingId());
+        if (backupRepository == null) {
+            throw new CloudRuntimeException("No valid backup repository found 
for the VM, please check the attached backup offering");
+        }
+
+        final Date creationDate = new Date();
+        final String backupPath = String.format("%s/%s", vm.getInstanceName(),
+                new 
SimpleDateFormat("yyyy.MM.dd.HH.mm.ss").format(creationDate));
+
+        TakeBackupCommand command = new 
TakeBackupCommand(vm.getInstanceName(), backupPath);
+        command.setBackupRepoType(backupRepository.getType());
+        command.setBackupRepoAddress(backupRepository.getAddress());
+        command.setMountOptions(backupRepository.getMountOptions());
+
+        if (VirtualMachine.State.Stopped.equals(vm.getState())) {
+            List<VolumeVO> vmVolumes = volumeDao.findByInstance(vm.getId());
+            List<String> volumePaths = getVolumePaths(vmVolumes);
+            command.setVolumePaths(volumePaths);
+        }

Review Comment:
   ISO attached to the VM needs to be considered?



##########
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java:
##########
@@ -0,0 +1,181 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.resource.CommandWrapper;
+import com.cloud.resource.ResourceWrapper;
+import com.cloud.utils.Pair;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.script.Script;
+import org.apache.cloudstack.backup.BackupAnswer;
+import org.apache.cloudstack.backup.RestoreBackupCommand;
+import org.apache.commons.lang3.RandomStringUtils;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+
+@ResourceWrapper(handles = RestoreBackupCommand.class)
+public class LibvirtRestoreBackupCommandWrapper extends 
CommandWrapper<RestoreBackupCommand, Answer, LibvirtComputingResource> {
+    private static final String BACKUP_TEMP_FILE_PREFIx = "csbackup";

Review Comment:
   ```suggestion
       private static final String BACKUP_TEMP_FILE_PREFIX = "csbackup";
   ```



##########
ui/src/components/view/ListResourceTable.vue:
##########
@@ -50,6 +50,10 @@
             {{ $toLocaleDate(text) }}
           </template>
 
+          <template v-else-if="column.key === 'size' || column.key === 
'virtualsize'">
+            {{ parseFloat(text / (1024.0 * 1024.0 * 1024.0)).toFixed(2) }} GB
+          </template>
+

Review Comment:
   would it be better to use - `bytesToHumanReadableSize` method?



##########
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java:
##########
@@ -0,0 +1,181 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.resource.CommandWrapper;
+import com.cloud.resource.ResourceWrapper;
+import com.cloud.utils.Pair;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.script.Script;
+import org.apache.cloudstack.backup.BackupAnswer;
+import org.apache.cloudstack.backup.RestoreBackupCommand;
+import org.apache.commons.lang3.RandomStringUtils;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+
+@ResourceWrapper(handles = RestoreBackupCommand.class)
+public class LibvirtRestoreBackupCommandWrapper extends 
CommandWrapper<RestoreBackupCommand, Answer, LibvirtComputingResource> {
+    private static final String BACKUP_TEMP_FILE_PREFIx = "csbackup";
+    private static final String MOUNT_COMMAND = "sudo mount -t %s %s %s";
+    private static final String UMOUNT_COMMAND = "sudo umount %s";
+    private static final String FILE_PATH_PLACEHOLDER = "%s/%s";
+
+    @Override
+    public Answer execute(RestoreBackupCommand command, 
LibvirtComputingResource serverResource) {
+        String vmName = command.getVmName();
+        String backupPath = command.getBackupPath();
+        String backupRepoAddress = command.getBackupRepoAddress();
+        String backupRepoType = command.getBackupRepoType();
+        String mountOptions = command.getMountOptions();
+        Boolean vmExists = command.isVmExists();
+        String diskType = command.getDiskType();
+        Long deviceId = command.getDeviceId();
+        List<String> volumePaths = command.getVolumePaths();
+        String restoreVolumeUuid = command.getRestoreVolumeUUID();
+
+        String newVolumeId = null;
+        if (Objects.isNull(vmExists)) {
+            String volumePath = volumePaths.get(0);
+            int lastIndex = volumePath.lastIndexOf("/");
+            newVolumeId = volumePath.substring(lastIndex + 1);
+            restoreVolume(backupPath, backupRepoType, backupRepoAddress, 
volumePath, diskType, deviceId, restoreVolumeUuid);
+        } else if (vmExists) {
+            restoreVolumesOfExistingVM(volumePaths, backupPath, 
backupRepoType, backupRepoAddress, mountOptions);
+        } else {
+            restoreVolumesOfDestroyedVMs(volumePaths, vmName, backupPath, 
backupRepoType, backupRepoAddress, mountOptions);
+        }
+
+        return new BackupAnswer(command, true, newVolumeId);
+    }
+
+    private void restoreVolumesOfExistingVM(List<String> volumePaths, String 
backupPath,
+                                             String backupRepoType, String 
backupRepoAddress, String mountOptions) {
+        String diskType = "root";
+        String mountDirectory = mountBackupDirectory(backupRepoAddress, 
backupRepoType);
+        try {
+            for (int idx = 0; idx < volumePaths.size(); idx++) {
+                String volumePath = volumePaths.get(idx);
+                Pair<String, String> bkpPathAndVolUuid = 
getBackupPath(mountDirectory, volumePath, backupPath, diskType, idx, null);
+                diskType = "datadisk";
+                try {
+                    replaceVolumeWithBackup(volumePath, 
bkpPathAndVolUuid.first());
+                } catch (IOException e) {
+                    throw new CloudRuntimeException(String.format("Unable to 
revert backup for volume [%s] due to [%s].", bkpPathAndVolUuid.second(), 
e.getMessage()), e);
+                }
+            }
+        } finally {
+            unmountBackupDirectory(mountDirectory);
+            deleteTemporaryDirectory(mountDirectory);
+        }
+
+    }
+
+    private void restoreVolumesOfDestroyedVMs(List<String> volumePaths, String 
vmName, String backupPath,
+                                              String backupRepoType, String 
backupRepoAddress, String mountOptions) {
+        String mountDirectory = mountBackupDirectory(backupRepoAddress, 
backupRepoType);
+        String diskType = "root";
+        try {
+            for (int i = 0; i < volumePaths.size(); i++) {
+                String volumePath = volumePaths.get(i);
+                Pair<String, String> bkpPathAndVolUuid = 
getBackupPath(mountDirectory, volumePath, backupPath, diskType, i, null);
+                diskType = "datadisk";
+                try {
+                    replaceVolumeWithBackup(volumePath, 
bkpPathAndVolUuid.first());
+                } catch (IOException e) {
+                    throw new CloudRuntimeException(String.format("Unable to 
revert backup for volume [%s] due to [%s].", bkpPathAndVolUuid.second(), 
e.getMessage()), e);
+                }
+            }
+        } finally {
+            unmountBackupDirectory(mountDirectory);
+            deleteTemporaryDirectory(mountDirectory);
+        }
+    }
+
+    private void restoreVolume(String backupPath, String backupRepoType, 
String backupRepoAddress, String volumePath,
+                               String diskType, Long deviceId, String 
volumeUUID) {
+        String mountDirectory = mountBackupDirectory(backupRepoAddress, 
backupRepoType);
+        Pair<String, String> bkpPathAndVolUuid;
+        try {
+            bkpPathAndVolUuid = getBackupPath(mountDirectory, volumePath, 
backupPath, diskType, deviceId.intValue(), volumeUUID);
+            try {
+                replaceVolumeWithBackup(volumePath, bkpPathAndVolUuid.first());
+            } catch (IOException e) {
+                throw new CloudRuntimeException(String.format("Unable to 
revert backup for volume [%s] due to [%s].", bkpPathAndVolUuid.second(), 
e.getMessage()), e);
+            }
+        } catch (Exception e) {
+            throw new CloudRuntimeException("Failed to restore volume", e);
+        } finally {
+            unmountBackupDirectory(mountDirectory);
+            deleteTemporaryDirectory(mountDirectory);
+        }
+    }
+
+
+    private String mountBackupDirectory(String backupRepoAddress, String 
backupRepoType) {
+        String randomChars = RandomStringUtils.random(5, true, false);
+        String mountDirectory = String.format("%s.%s",BACKUP_TEMP_FILE_PREFIx 
, randomChars);
+        try {
+            mountDirectory = 
Files.createTempDirectory(mountDirectory).toString();
+            String mount = String.format(MOUNT_COMMAND, backupRepoType, 
backupRepoAddress, mountDirectory);
+            Script.runSimpleBashScript(mount);

Review Comment:
   It may be better to use `Script.executeCommand*`



##########
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java:
##########
@@ -0,0 +1,181 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.resource.CommandWrapper;
+import com.cloud.resource.ResourceWrapper;
+import com.cloud.utils.Pair;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.script.Script;
+import org.apache.cloudstack.backup.BackupAnswer;
+import org.apache.cloudstack.backup.RestoreBackupCommand;
+import org.apache.commons.lang3.RandomStringUtils;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+
+@ResourceWrapper(handles = RestoreBackupCommand.class)
+public class LibvirtRestoreBackupCommandWrapper extends 
CommandWrapper<RestoreBackupCommand, Answer, LibvirtComputingResource> {
+    private static final String BACKUP_TEMP_FILE_PREFIx = "csbackup";
+    private static final String MOUNT_COMMAND = "sudo mount -t %s %s %s";
+    private static final String UMOUNT_COMMAND = "sudo umount %s";
+    private static final String FILE_PATH_PLACEHOLDER = "%s/%s";
+
+    @Override
+    public Answer execute(RestoreBackupCommand command, 
LibvirtComputingResource serverResource) {
+        String vmName = command.getVmName();
+        String backupPath = command.getBackupPath();
+        String backupRepoAddress = command.getBackupRepoAddress();
+        String backupRepoType = command.getBackupRepoType();
+        String mountOptions = command.getMountOptions();
+        Boolean vmExists = command.isVmExists();
+        String diskType = command.getDiskType();
+        Long deviceId = command.getDeviceId();
+        List<String> volumePaths = command.getVolumePaths();
+        String restoreVolumeUuid = command.getRestoreVolumeUUID();
+
+        String newVolumeId = null;
+        if (Objects.isNull(vmExists)) {
+            String volumePath = volumePaths.get(0);
+            int lastIndex = volumePath.lastIndexOf("/");
+            newVolumeId = volumePath.substring(lastIndex + 1);
+            restoreVolume(backupPath, backupRepoType, backupRepoAddress, 
volumePath, diskType, deviceId, restoreVolumeUuid);
+        } else if (vmExists) {
+            restoreVolumesOfExistingVM(volumePaths, backupPath, 
backupRepoType, backupRepoAddress, mountOptions);
+        } else {
+            restoreVolumesOfDestroyedVMs(volumePaths, vmName, backupPath, 
backupRepoType, backupRepoAddress, mountOptions);
+        }
+
+        return new BackupAnswer(command, true, newVolumeId);
+    }
+
+    private void restoreVolumesOfExistingVM(List<String> volumePaths, String 
backupPath,
+                                             String backupRepoType, String 
backupRepoAddress, String mountOptions) {
+        String diskType = "root";
+        String mountDirectory = mountBackupDirectory(backupRepoAddress, 
backupRepoType);
+        try {
+            for (int idx = 0; idx < volumePaths.size(); idx++) {
+                String volumePath = volumePaths.get(idx);
+                Pair<String, String> bkpPathAndVolUuid = 
getBackupPath(mountDirectory, volumePath, backupPath, diskType, idx, null);
+                diskType = "datadisk";
+                try {
+                    replaceVolumeWithBackup(volumePath, 
bkpPathAndVolUuid.first());
+                } catch (IOException e) {
+                    throw new CloudRuntimeException(String.format("Unable to 
revert backup for volume [%s] due to [%s].", bkpPathAndVolUuid.second(), 
e.getMessage()), e);
+                }
+            }
+        } finally {
+            unmountBackupDirectory(mountDirectory);
+            deleteTemporaryDirectory(mountDirectory);
+        }
+
+    }
+
+    private void restoreVolumesOfDestroyedVMs(List<String> volumePaths, String 
vmName, String backupPath,
+                                              String backupRepoType, String 
backupRepoAddress, String mountOptions) {
+        String mountDirectory = mountBackupDirectory(backupRepoAddress, 
backupRepoType);
+        String diskType = "root";
+        try {
+            for (int i = 0; i < volumePaths.size(); i++) {
+                String volumePath = volumePaths.get(i);
+                Pair<String, String> bkpPathAndVolUuid = 
getBackupPath(mountDirectory, volumePath, backupPath, diskType, i, null);
+                diskType = "datadisk";
+                try {
+                    replaceVolumeWithBackup(volumePath, 
bkpPathAndVolUuid.first());
+                } catch (IOException e) {
+                    throw new CloudRuntimeException(String.format("Unable to 
revert backup for volume [%s] due to [%s].", bkpPathAndVolUuid.second(), 
e.getMessage()), e);
+                }
+            }
+        } finally {
+            unmountBackupDirectory(mountDirectory);
+            deleteTemporaryDirectory(mountDirectory);
+        }
+    }
+
+    private void restoreVolume(String backupPath, String backupRepoType, 
String backupRepoAddress, String volumePath,
+                               String diskType, Long deviceId, String 
volumeUUID) {
+        String mountDirectory = mountBackupDirectory(backupRepoAddress, 
backupRepoType);
+        Pair<String, String> bkpPathAndVolUuid;
+        try {
+            bkpPathAndVolUuid = getBackupPath(mountDirectory, volumePath, 
backupPath, diskType, deviceId.intValue(), volumeUUID);
+            try {
+                replaceVolumeWithBackup(volumePath, bkpPathAndVolUuid.first());
+            } catch (IOException e) {
+                throw new CloudRuntimeException(String.format("Unable to 
revert backup for volume [%s] due to [%s].", bkpPathAndVolUuid.second(), 
e.getMessage()), e);
+            }
+        } catch (Exception e) {
+            throw new CloudRuntimeException("Failed to restore volume", e);
+        } finally {
+            unmountBackupDirectory(mountDirectory);
+            deleteTemporaryDirectory(mountDirectory);
+        }
+    }
+
+
+    private String mountBackupDirectory(String backupRepoAddress, String 
backupRepoType) {
+        String randomChars = RandomStringUtils.random(5, true, false);
+        String mountDirectory = String.format("%s.%s",BACKUP_TEMP_FILE_PREFIx 
, randomChars);
+        try {
+            mountDirectory = 
Files.createTempDirectory(mountDirectory).toString();
+            String mount = String.format(MOUNT_COMMAND, backupRepoType, 
backupRepoAddress, mountDirectory);
+            Script.runSimpleBashScript(mount);
+        } catch (Exception e) {
+            throw new CloudRuntimeException(String.format("Failed to mount %s 
to %s", backupRepoType, backupRepoAddress), e);
+        }
+        return mountDirectory;
+    }
+
+    private void unmountBackupDirectory(String backupDirectory) {
+        try {
+            String umountCmd = String.format(UMOUNT_COMMAND, backupDirectory);
+            Script.runSimpleBashScript(umountCmd);

Review Comment:
   same as above



##########
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtTakeBackupCommandWrapper.java:
##########
@@ -0,0 +1,83 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.resource.CommandWrapper;
+import com.cloud.resource.ResourceWrapper;
+import com.cloud.utils.Pair;
+import com.cloud.utils.script.Script;
+import org.apache.cloudstack.backup.BackupAnswer;
+import org.apache.cloudstack.backup.TakeBackupCommand;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+@ResourceWrapper(handles = TakeBackupCommand.class)
+public class LibvirtTakeBackupCommandWrapper extends 
CommandWrapper<TakeBackupCommand, Answer, LibvirtComputingResource> {
+    @Override
+    public Answer execute(TakeBackupCommand command, LibvirtComputingResource 
libvirtComputingResource) {
+        final String vmName = command.getVmName();
+        final String backupPath = command.getBackupPath();
+        final String backupRepoType = command.getBackupRepoType();
+        final String backupRepoAddress = command.getBackupRepoAddress();
+        final String mountOptions = command.getMountOptions();
+        final List<String> diskPaths = command.getVolumePaths();
+
+        List<String[]> commands = new ArrayList<>();
+        commands.add(new String[]{
+                libvirtComputingResource.getNasBackupPath(),
+                "-o", "backup",
+                "-v", vmName,
+                "-t", backupRepoType,
+                "-s", backupRepoAddress,
+                "-m", Objects.nonNull(mountOptions) ? mountOptions : "",
+                "-p", backupPath,
+                "-d", (Objects.nonNull(diskPaths) && !diskPaths.isEmpty()) ? 
String.join(",", diskPaths) : ""
+        });
+
+        Pair<Integer, String> result = Script.executePipedCommands(commands, 
libvirtComputingResource.getCmdsTimeout());
+
+        if (result.first() != 0) {
+            logger.debug("Failed to take VM backup: " + result.second());
+            return new BackupAnswer(command, false, result.second().trim());
+        }
+
+        long backupSize = 0L;
+        if (Objects.isNull(diskPaths) || diskPaths.isEmpty()) {

Review Comment:
   use CollectionUtils?



##########
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java:
##########
@@ -0,0 +1,181 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.resource.CommandWrapper;
+import com.cloud.resource.ResourceWrapper;
+import com.cloud.utils.Pair;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.script.Script;
+import org.apache.cloudstack.backup.BackupAnswer;
+import org.apache.cloudstack.backup.RestoreBackupCommand;
+import org.apache.commons.lang3.RandomStringUtils;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+
+@ResourceWrapper(handles = RestoreBackupCommand.class)
+public class LibvirtRestoreBackupCommandWrapper extends 
CommandWrapper<RestoreBackupCommand, Answer, LibvirtComputingResource> {
+    private static final String BACKUP_TEMP_FILE_PREFIx = "csbackup";
+    private static final String MOUNT_COMMAND = "sudo mount -t %s %s %s";
+    private static final String UMOUNT_COMMAND = "sudo umount %s";
+    private static final String FILE_PATH_PLACEHOLDER = "%s/%s";
+
+    @Override
+    public Answer execute(RestoreBackupCommand command, 
LibvirtComputingResource serverResource) {
+        String vmName = command.getVmName();
+        String backupPath = command.getBackupPath();
+        String backupRepoAddress = command.getBackupRepoAddress();
+        String backupRepoType = command.getBackupRepoType();
+        String mountOptions = command.getMountOptions();
+        Boolean vmExists = command.isVmExists();
+        String diskType = command.getDiskType();
+        Long deviceId = command.getDeviceId();
+        List<String> volumePaths = command.getVolumePaths();
+        String restoreVolumeUuid = command.getRestoreVolumeUUID();
+
+        String newVolumeId = null;
+        if (Objects.isNull(vmExists)) {
+            String volumePath = volumePaths.get(0);
+            int lastIndex = volumePath.lastIndexOf("/");
+            newVolumeId = volumePath.substring(lastIndex + 1);
+            restoreVolume(backupPath, backupRepoType, backupRepoAddress, 
volumePath, diskType, deviceId, restoreVolumeUuid);
+        } else if (vmExists) {
+            restoreVolumesOfExistingVM(volumePaths, backupPath, 
backupRepoType, backupRepoAddress, mountOptions);
+        } else {
+            restoreVolumesOfDestroyedVMs(volumePaths, vmName, backupPath, 
backupRepoType, backupRepoAddress, mountOptions);
+        }
+
+        return new BackupAnswer(command, true, newVolumeId);
+    }
+
+    private void restoreVolumesOfExistingVM(List<String> volumePaths, String 
backupPath,
+                                             String backupRepoType, String 
backupRepoAddress, String mountOptions) {
+        String diskType = "root";
+        String mountDirectory = mountBackupDirectory(backupRepoAddress, 
backupRepoType);
+        try {
+            for (int idx = 0; idx < volumePaths.size(); idx++) {
+                String volumePath = volumePaths.get(idx);
+                Pair<String, String> bkpPathAndVolUuid = 
getBackupPath(mountDirectory, volumePath, backupPath, diskType, idx, null);
+                diskType = "datadisk";
+                try {
+                    replaceVolumeWithBackup(volumePath, 
bkpPathAndVolUuid.first());
+                } catch (IOException e) {
+                    throw new CloudRuntimeException(String.format("Unable to 
revert backup for volume [%s] due to [%s].", bkpPathAndVolUuid.second(), 
e.getMessage()), e);
+                }
+            }
+        } finally {
+            unmountBackupDirectory(mountDirectory);
+            deleteTemporaryDirectory(mountDirectory);
+        }
+
+    }
+
+    private void restoreVolumesOfDestroyedVMs(List<String> volumePaths, String 
vmName, String backupPath,
+                                              String backupRepoType, String 
backupRepoAddress, String mountOptions) {
+        String mountDirectory = mountBackupDirectory(backupRepoAddress, 
backupRepoType);
+        String diskType = "root";
+        try {
+            for (int i = 0; i < volumePaths.size(); i++) {
+                String volumePath = volumePaths.get(i);
+                Pair<String, String> bkpPathAndVolUuid = 
getBackupPath(mountDirectory, volumePath, backupPath, diskType, i, null);
+                diskType = "datadisk";
+                try {
+                    replaceVolumeWithBackup(volumePath, 
bkpPathAndVolUuid.first());
+                } catch (IOException e) {
+                    throw new CloudRuntimeException(String.format("Unable to 
revert backup for volume [%s] due to [%s].", bkpPathAndVolUuid.second(), 
e.getMessage()), e);
+                }
+            }
+        } finally {
+            unmountBackupDirectory(mountDirectory);
+            deleteTemporaryDirectory(mountDirectory);
+        }
+    }
+
+    private void restoreVolume(String backupPath, String backupRepoType, 
String backupRepoAddress, String volumePath,
+                               String diskType, Long deviceId, String 
volumeUUID) {
+        String mountDirectory = mountBackupDirectory(backupRepoAddress, 
backupRepoType);
+        Pair<String, String> bkpPathAndVolUuid;
+        try {
+            bkpPathAndVolUuid = getBackupPath(mountDirectory, volumePath, 
backupPath, diskType, deviceId.intValue(), volumeUUID);
+            try {
+                replaceVolumeWithBackup(volumePath, bkpPathAndVolUuid.first());
+            } catch (IOException e) {
+                throw new CloudRuntimeException(String.format("Unable to 
revert backup for volume [%s] due to [%s].", bkpPathAndVolUuid.second(), 
e.getMessage()), e);
+            }
+        } catch (Exception e) {
+            throw new CloudRuntimeException("Failed to restore volume", e);
+        } finally {
+            unmountBackupDirectory(mountDirectory);
+            deleteTemporaryDirectory(mountDirectory);
+        }
+    }
+
+
+    private String mountBackupDirectory(String backupRepoAddress, String 
backupRepoType) {
+        String randomChars = RandomStringUtils.random(5, true, false);
+        String mountDirectory = String.format("%s.%s",BACKUP_TEMP_FILE_PREFIx 
, randomChars);
+        try {
+            mountDirectory = 
Files.createTempDirectory(mountDirectory).toString();
+            String mount = String.format(MOUNT_COMMAND, backupRepoType, 
backupRepoAddress, mountDirectory);
+            Script.runSimpleBashScript(mount);
+        } catch (Exception e) {
+            throw new CloudRuntimeException(String.format("Failed to mount %s 
to %s", backupRepoType, backupRepoAddress), e);
+        }
+        return mountDirectory;
+    }
+
+    private void unmountBackupDirectory(String backupDirectory) {
+        try {
+            String umountCmd = String.format(UMOUNT_COMMAND, backupDirectory);
+            Script.runSimpleBashScript(umountCmd);
+        } catch (Exception e) {
+            throw new CloudRuntimeException(String.format("Failed to unmount 
backup directory: %s", backupDirectory), e);
+        }
+    }
+
+    private void deleteTemporaryDirectory(String backupDirectory) {
+        try {
+            Files.deleteIfExists(Paths.get(backupDirectory));
+        } catch (IOException e) {
+            throw new CloudRuntimeException(String.format("Failed to delete 
backup directory: %s", backupDirectory), e);
+        }
+    }
+
+    private Pair<String, String> getBackupPath(String mountDirectory, String 
volumePath, String backupPath, String diskType, int deviceId, String 
volumeUuid) {
+        String bkpPath = String.format(FILE_PATH_PLACEHOLDER, mountDirectory, 
backupPath);
+        int lastIndex = volumePath.lastIndexOf("/");

Review Comment:
   maybe?
   ```suggestion
           int lastIndex = volumePath.lastIndexOf(File.separator);
   ```



##########
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java:
##########
@@ -0,0 +1,181 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.resource.CommandWrapper;
+import com.cloud.resource.ResourceWrapper;
+import com.cloud.utils.Pair;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.script.Script;
+import org.apache.cloudstack.backup.BackupAnswer;
+import org.apache.cloudstack.backup.RestoreBackupCommand;
+import org.apache.commons.lang3.RandomStringUtils;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+
+@ResourceWrapper(handles = RestoreBackupCommand.class)
+public class LibvirtRestoreBackupCommandWrapper extends 
CommandWrapper<RestoreBackupCommand, Answer, LibvirtComputingResource> {
+    private static final String BACKUP_TEMP_FILE_PREFIx = "csbackup";
+    private static final String MOUNT_COMMAND = "sudo mount -t %s %s %s";
+    private static final String UMOUNT_COMMAND = "sudo umount %s";
+    private static final String FILE_PATH_PLACEHOLDER = "%s/%s";
+
+    @Override
+    public Answer execute(RestoreBackupCommand command, 
LibvirtComputingResource serverResource) {
+        String vmName = command.getVmName();
+        String backupPath = command.getBackupPath();
+        String backupRepoAddress = command.getBackupRepoAddress();
+        String backupRepoType = command.getBackupRepoType();
+        String mountOptions = command.getMountOptions();
+        Boolean vmExists = command.isVmExists();
+        String diskType = command.getDiskType();
+        Long deviceId = command.getDeviceId();
+        List<String> volumePaths = command.getVolumePaths();
+        String restoreVolumeUuid = command.getRestoreVolumeUUID();
+
+        String newVolumeId = null;
+        if (Objects.isNull(vmExists)) {
+            String volumePath = volumePaths.get(0);
+            int lastIndex = volumePath.lastIndexOf("/");
+            newVolumeId = volumePath.substring(lastIndex + 1);
+            restoreVolume(backupPath, backupRepoType, backupRepoAddress, 
volumePath, diskType, deviceId, restoreVolumeUuid);
+        } else if (vmExists) {
+            restoreVolumesOfExistingVM(volumePaths, backupPath, 
backupRepoType, backupRepoAddress, mountOptions);
+        } else {
+            restoreVolumesOfDestroyedVMs(volumePaths, vmName, backupPath, 
backupRepoType, backupRepoAddress, mountOptions);
+        }
+
+        return new BackupAnswer(command, true, newVolumeId);
+    }
+
+    private void restoreVolumesOfExistingVM(List<String> volumePaths, String 
backupPath,
+                                             String backupRepoType, String 
backupRepoAddress, String mountOptions) {
+        String diskType = "root";
+        String mountDirectory = mountBackupDirectory(backupRepoAddress, 
backupRepoType);
+        try {
+            for (int idx = 0; idx < volumePaths.size(); idx++) {
+                String volumePath = volumePaths.get(idx);
+                Pair<String, String> bkpPathAndVolUuid = 
getBackupPath(mountDirectory, volumePath, backupPath, diskType, idx, null);
+                diskType = "datadisk";
+                try {
+                    replaceVolumeWithBackup(volumePath, 
bkpPathAndVolUuid.first());
+                } catch (IOException e) {
+                    throw new CloudRuntimeException(String.format("Unable to 
revert backup for volume [%s] due to [%s].", bkpPathAndVolUuid.second(), 
e.getMessage()), e);
+                }
+            }
+        } finally {
+            unmountBackupDirectory(mountDirectory);
+            deleteTemporaryDirectory(mountDirectory);
+        }
+
+    }
+
+    private void restoreVolumesOfDestroyedVMs(List<String> volumePaths, String 
vmName, String backupPath,
+                                              String backupRepoType, String 
backupRepoAddress, String mountOptions) {
+        String mountDirectory = mountBackupDirectory(backupRepoAddress, 
backupRepoType);
+        String diskType = "root";
+        try {
+            for (int i = 0; i < volumePaths.size(); i++) {
+                String volumePath = volumePaths.get(i);
+                Pair<String, String> bkpPathAndVolUuid = 
getBackupPath(mountDirectory, volumePath, backupPath, diskType, i, null);
+                diskType = "datadisk";

Review Comment:
   Can these be taken from some constants?



##########
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java:
##########
@@ -0,0 +1,181 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.resource.CommandWrapper;
+import com.cloud.resource.ResourceWrapper;
+import com.cloud.utils.Pair;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.script.Script;
+import org.apache.cloudstack.backup.BackupAnswer;
+import org.apache.cloudstack.backup.RestoreBackupCommand;
+import org.apache.commons.lang3.RandomStringUtils;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+
+@ResourceWrapper(handles = RestoreBackupCommand.class)
+public class LibvirtRestoreBackupCommandWrapper extends 
CommandWrapper<RestoreBackupCommand, Answer, LibvirtComputingResource> {
+    private static final String BACKUP_TEMP_FILE_PREFIx = "csbackup";
+    private static final String MOUNT_COMMAND = "sudo mount -t %s %s %s";
+    private static final String UMOUNT_COMMAND = "sudo umount %s";
+    private static final String FILE_PATH_PLACEHOLDER = "%s/%s";
+
+    @Override
+    public Answer execute(RestoreBackupCommand command, 
LibvirtComputingResource serverResource) {
+        String vmName = command.getVmName();
+        String backupPath = command.getBackupPath();
+        String backupRepoAddress = command.getBackupRepoAddress();
+        String backupRepoType = command.getBackupRepoType();
+        String mountOptions = command.getMountOptions();
+        Boolean vmExists = command.isVmExists();
+        String diskType = command.getDiskType();
+        Long deviceId = command.getDeviceId();
+        List<String> volumePaths = command.getVolumePaths();
+        String restoreVolumeUuid = command.getRestoreVolumeUUID();
+
+        String newVolumeId = null;
+        if (Objects.isNull(vmExists)) {
+            String volumePath = volumePaths.get(0);
+            int lastIndex = volumePath.lastIndexOf("/");
+            newVolumeId = volumePath.substring(lastIndex + 1);
+            restoreVolume(backupPath, backupRepoType, backupRepoAddress, 
volumePath, diskType, deviceId, restoreVolumeUuid);
+        } else if (vmExists) {
+            restoreVolumesOfExistingVM(volumePaths, backupPath, 
backupRepoType, backupRepoAddress, mountOptions);
+        } else {
+            restoreVolumesOfDestroyedVMs(volumePaths, vmName, backupPath, 
backupRepoType, backupRepoAddress, mountOptions);
+        }
+
+        return new BackupAnswer(command, true, newVolumeId);
+    }
+
+    private void restoreVolumesOfExistingVM(List<String> volumePaths, String 
backupPath,
+                                             String backupRepoType, String 
backupRepoAddress, String mountOptions) {
+        String diskType = "root";
+        String mountDirectory = mountBackupDirectory(backupRepoAddress, 
backupRepoType);
+        try {
+            for (int idx = 0; idx < volumePaths.size(); idx++) {
+                String volumePath = volumePaths.get(idx);
+                Pair<String, String> bkpPathAndVolUuid = 
getBackupPath(mountDirectory, volumePath, backupPath, diskType, idx, null);
+                diskType = "datadisk";
+                try {
+                    replaceVolumeWithBackup(volumePath, 
bkpPathAndVolUuid.first());
+                } catch (IOException e) {
+                    throw new CloudRuntimeException(String.format("Unable to 
revert backup for volume [%s] due to [%s].", bkpPathAndVolUuid.second(), 
e.getMessage()), e);
+                }
+            }
+        } finally {
+            unmountBackupDirectory(mountDirectory);
+            deleteTemporaryDirectory(mountDirectory);
+        }
+
+    }
+
+    private void restoreVolumesOfDestroyedVMs(List<String> volumePaths, String 
vmName, String backupPath,
+                                              String backupRepoType, String 
backupRepoAddress, String mountOptions) {
+        String mountDirectory = mountBackupDirectory(backupRepoAddress, 
backupRepoType);
+        String diskType = "root";
+        try {
+            for (int i = 0; i < volumePaths.size(); i++) {
+                String volumePath = volumePaths.get(i);
+                Pair<String, String> bkpPathAndVolUuid = 
getBackupPath(mountDirectory, volumePath, backupPath, diskType, i, null);
+                diskType = "datadisk";
+                try {
+                    replaceVolumeWithBackup(volumePath, 
bkpPathAndVolUuid.first());
+                } catch (IOException e) {
+                    throw new CloudRuntimeException(String.format("Unable to 
revert backup for volume [%s] due to [%s].", bkpPathAndVolUuid.second(), 
e.getMessage()), e);
+                }
+            }
+        } finally {
+            unmountBackupDirectory(mountDirectory);
+            deleteTemporaryDirectory(mountDirectory);
+        }
+    }
+
+    private void restoreVolume(String backupPath, String backupRepoType, 
String backupRepoAddress, String volumePath,
+                               String diskType, Long deviceId, String 
volumeUUID) {
+        String mountDirectory = mountBackupDirectory(backupRepoAddress, 
backupRepoType);
+        Pair<String, String> bkpPathAndVolUuid;
+        try {
+            bkpPathAndVolUuid = getBackupPath(mountDirectory, volumePath, 
backupPath, diskType, deviceId.intValue(), volumeUUID);
+            try {
+                replaceVolumeWithBackup(volumePath, bkpPathAndVolUuid.first());
+            } catch (IOException e) {
+                throw new CloudRuntimeException(String.format("Unable to 
revert backup for volume [%s] due to [%s].", bkpPathAndVolUuid.second(), 
e.getMessage()), e);
+            }
+        } catch (Exception e) {
+            throw new CloudRuntimeException("Failed to restore volume", e);
+        } finally {
+            unmountBackupDirectory(mountDirectory);
+            deleteTemporaryDirectory(mountDirectory);
+        }
+    }
+
+
+    private String mountBackupDirectory(String backupRepoAddress, String 
backupRepoType) {
+        String randomChars = RandomStringUtils.random(5, true, false);
+        String mountDirectory = String.format("%s.%s",BACKUP_TEMP_FILE_PREFIx 
, randomChars);
+        try {
+            mountDirectory = 
Files.createTempDirectory(mountDirectory).toString();
+            String mount = String.format(MOUNT_COMMAND, backupRepoType, 
backupRepoAddress, mountDirectory);
+            Script.runSimpleBashScript(mount);
+        } catch (Exception e) {
+            throw new CloudRuntimeException(String.format("Failed to mount %s 
to %s", backupRepoType, backupRepoAddress), e);
+        }
+        return mountDirectory;
+    }
+
+    private void unmountBackupDirectory(String backupDirectory) {
+        try {
+            String umountCmd = String.format(UMOUNT_COMMAND, backupDirectory);
+            Script.runSimpleBashScript(umountCmd);
+        } catch (Exception e) {
+            throw new CloudRuntimeException(String.format("Failed to unmount 
backup directory: %s", backupDirectory), e);
+        }
+    }
+
+    private void deleteTemporaryDirectory(String backupDirectory) {
+        try {
+            Files.deleteIfExists(Paths.get(backupDirectory));
+        } catch (IOException e) {
+            throw new CloudRuntimeException(String.format("Failed to delete 
backup directory: %s", backupDirectory), e);
+        }
+    }
+
+    private Pair<String, String> getBackupPath(String mountDirectory, String 
volumePath, String backupPath, String diskType, int deviceId, String 
volumeUuid) {
+        String bkpPath = String.format(FILE_PATH_PLACEHOLDER, mountDirectory, 
backupPath);
+        int lastIndex = volumePath.lastIndexOf("/");
+        String volUuid = Objects.isNull(volumeUuid) ? 
volumePath.substring(lastIndex + 1) : volumeUuid;
+        String backupFileName = String.format("%s.%s.%s.qcow2", deviceId, 
diskType.toLowerCase(Locale.ROOT), volUuid);

Review Comment:
   Will it always be QCOW2 even if the volume format is RAW?



-- 
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]

Reply via email to