Fix restore volume powershell cmdlets

Author: nvazquez

plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/VeeamBackupProvider.java

@@ -196,6 +196,7 @@ public boolean restoreVMFromBackup(VirtualMachine vm, String backupUuid, String
     @Override
     public Pair<Boolean, String> restoreBackedUpVolume(long zoneId, String backupUuid, String restorePointId,
                                                        String volumeUuid, String hostIp, String dataStoreUuid) {
+
         return getClient(zoneId).restoreVMToDifferentLocation(restorePointId, hostIp, dataStoreUuid);
     }
 

plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/VeeamClient.java

@@ -640,7 +640,8 @@ public Pair<Boolean, String> restoreVMToDifferentLocation(String restorePointId,
         final String restoreLocation = "CS-RSTR-" + UUID.randomUUID().toString();
         final String datastoreId = dataStoreUuid.replace("-","");
         final List<String> cmds = Arrays.asList(
-                String.format("$point = Get-VBRRestorePoint | where {$_.Id -eq \"%s\"}", restorePointId),
+                "$points = Get-VBRRestorePoint",
+                String.format("foreach($point in $points) { if ($point.Id -eq '%s') { break; } }",restorePointId),
                 String.format("$server = Get-VBRServer -Name \"%s\"", hostIp),
                 String.format("$ds = Find-VBRViDatastore -Server:$server -Name \"%s\"", datastoreId),
                 String.format("Start-VBRRestoreVM -RestorePoint:$point -Server:$server -Datastore:$ds -VMName \"%s\"", restoreLocation)

plugins/backup/veeam/src/test/java/org/apache/cloudstack/backup/veeam/VeeamClientTest.java

@@ -28,6 +28,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.cloud.utils.Pair;
 import org.apache.cloudstack.backup.BackupPolicy;
 import org.apache.cloudstack.backup.VMBackup;
 import org.apache.cloudstack.backup.veeam.api.Job;
@@ -99,4 +100,9 @@ public void testVeeamPS() throws Exception {
         Job j = client.listJob("ZONE1-GOLD_clone1");
     }
 
+    public void testRestoreVolume() {
+        client.setVeeamSshCredentials("10.2.2.89", "administrator", "P@ssword123");
+        Pair<Boolean, String> booleanStringPair = client.restoreVMToDifferentLocation("362fcba7-283b-4416-9763-55ec59bd1285", "10.2.2.9", "24abcb8f-4211-374f-a2e1-e5c0b7e88a2d");
+        booleanStringPair.first();
+    }
 }