Merge with Backroll + bug backup

Author: PeterBackroll

plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/BackrollBackupProvider.java

@@ -43,7 +43,6 @@
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.ParseException;
-import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.joda.time.DateTime;
 
@@ -220,6 +219,7 @@ public boolean takeBackup(VirtualMachine vm) {
                 return result;
             }
         } catch (ParseException | BackrollApiException | IOException e) {
+            logger.debug(e.getMessage());
             throw new CloudRuntimeException("Failed to take backup");
         }
         return false;

plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/BackrollClient.java

@@ -72,7 +72,8 @@ public String startBackupJob(final String jobId) throws IOException, BackrollApi
         logger.info("Trying to start backup for Backroll job: {}", jobId);
         String backupJob = "";
         BackrollTaskRequestResponse requestResponse = httpProvider.post(String.format("/tasks/singlebackup/%s", jobId), null, BackrollTaskRequestResponse.class);
-        backupJob = requestResponse.location.replace("/api/v1/status/", "");
+        logger.info("BackupJob status link: {}", requestResponse.location);
+        backupJob = requestResponse.location.replace("/api/v1", "");
         return StringUtils.isEmpty(backupJob) ? null : backupJob;
     }
 

plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/BackrollService.java

@@ -20,12 +20,11 @@
 import static org.mockito.Mockito.mock;
 
 import java.io.IOException;
-import java.net.URISyntaxException;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 import org.apache.cloudstack.backup.backroll.BackrollClient;
@@ -35,6 +34,7 @@
 import org.apache.cloudstack.backup.backroll.model.BackrollBackupMetrics;
 import org.apache.cloudstack.backup.backroll.model.response.TaskState;
 import org.apache.cloudstack.backup.dao.BackupDao;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.ParseException;
 import org.apache.logging.log4j.Logger;
 import org.junit.Before;
@@ -46,10 +46,14 @@
 
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.VMInstanceVO;
+
+import net.bytebuddy.agent.VirtualMachine;
 import com.cloud.vm.dao.VMInstanceDao;
 
 import net.bytebuddy.agent.VirtualMachine;
 
+import net.bytebuddy.agent.VirtualMachine;
+
 public class BackrollBackupProviderTest {
     @Mock
     BackrollClient clientMock;
@@ -75,18 +79,38 @@ public void setUp() throws Exception {
         backupProviderMock = mock(BackrollBackupProvider.class);
         backupProvider = new BackrollBackupProvider(backupDao, vmInstanceDao, clientMock, Mockito.mock(Logger.class));
     }
+
+    @Test
+    public void listBackupOfferings_Test() {
+
+    }
+
+    @Test
+    public void takeBackup_Test() {
+    }
+
+    @Test
+    public void getBackupMetrics_Test() {
+    }
+
+    @Test
+    public void restoreVMFromBackup_Test() {
+
+    }
+
+
     @Test
      public void syncBackups_Test() throws BackrollApiException, IOException  {
         VMInstanceVO vmInstanceVO = new VMInstanceVO();
         vmInstanceVO.setInstanceName("test");
-        vmInstanceVO.setDataCenterId(2l);        
+        vmInstanceVO.setDataCenterId(2l);
         vmInstanceVO.setBackupOfferingId(2l);
         Backup.Metric metric = new Backup.Metric(2L, 3L);
 
         BackupVO backupBackingUp = new BackupVO();
         backupBackingUp.setVmId(1l);
         backupBackingUp.setExternalId("abc,defgh");
-        backupBackingUp.setType("Full");        
+        backupBackingUp.setType("Full");
         backupBackingUp.setSize(2L);
         backupBackingUp.setZoneId(2l);
         backupBackingUp.setStatus(Backup.Status.BackingUp);
@@ -95,15 +119,15 @@ public void syncBackups_Test() throws BackrollApiException, IOException  {
         backupBackedUp.setVmId(6l);
         backupBackedUp.setExternalId("abc,defgh");
         backupBackedUp.setType("Full");
-        backupBackedUp.setZoneId(2l);       
+        backupBackedUp.setZoneId(2l);
         backupBackedUp.setSize(2L);
         backupBackedUp.setStatus(Backup.Status.BackedUp);
 
         BackupVO backupFailed = new BackupVO();
         backupFailed.setVmId(6l);
         backupFailed.setExternalId("abc,defgh");
         backupFailed.setType("Full");
-        backupFailed.setZoneId(2l);       
+        backupFailed.setZoneId(2l);
         backupFailed.setSize(2L);
         backupFailed.setStatus(Backup.Status.Failed);