Merge branch 'new-auth' into Backroll-dev

Author: PeterBackroll

api/src/main/java/org/apache/cloudstack/backup/BackupProvider.java

@@ -101,15 +101,15 @@ public interface BackupProvider {
 
     /**
      * Syncs backup metrics (backup size, protected size) from the plugin and stores it within the provider
-     * @param zoneId the zone for which to return metrics
+     * @param zoneId the zone for which to synchronize metrics
      */
     void syncBackupMetrics(Long zoneId);
 
     /**
      * Returns a list of Backup.RestorePoint
      * @param vm the machine to get the restore points for
      */
-    List<Backup.RestorePoint> listRestorePoints(VirtualMachine vm);
+	List<Backup.RestorePoint> listRestorePoints(VirtualMachine vm);
 
     /**
      * Creates and returns an entry in the backups table by getting the information from restorePoint and vm.

plugins/backup/backroll/pom.xml

@@ -49,5 +49,10 @@
             <version>${cs.wiremock.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+        	<groupId>org.apache.cloudstack</groupId>
+        	<artifactId>cloud-engine-storage-volume</artifactId>
+        	<version>${project.version}</version>
+        </dependency>
     </dependencies>
 </project>

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

@@ -16,12 +16,10 @@
 // under the License.
 package org.apache.cloudstack.backup.backroll;
 
-import java.util.ArrayList;
-import java.util.List;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.cloudstack.backup.Backup;
-import org.apache.cloudstack.backup.BackupOffering;
 import org.apache.cloudstack.backup.Backup.Metric;
+import org.apache.cloudstack.backup.BackupOffering;
 import org.apache.cloudstack.backup.backroll.model.BackrollBackupMetrics;
 import org.apache.cloudstack.backup.backroll.model.BackrollOffering;
 import org.apache.cloudstack.backup.backroll.model.BackrollTaskStatus;
@@ -41,16 +39,14 @@
 import org.apache.cloudstack.backup.backroll.utils.BackrollHttpClient;
 import org.apache.cloudstack.backup.backroll.utils.BackrollHttpClient.BackrollHttpClientException;
 import org.apache.commons.lang3.StringUtils;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-
 import org.joda.time.DateTime;
-
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.ArrayList;
+import java.util.List;
 
 public class BackrollClient {
     protected Logger logger = LogManager.getLogger(BackrollClient.class);
@@ -73,26 +69,28 @@ public String startBackupJob(final String jobId) throws BackrollHttpClientExcept
         BackrollTaskRequestResponse requestResponse = backrollHttpClient.post(String.format("/tasks/singlebackup/%s", jobId),
                 null, BackrollTaskRequestResponse.class);
         logger.info("startBackupJob : BackupJob status link: {}", requestResponse.location);
-        backupJob = requestResponse.location.replace("/api/v1", "");
-        return StringUtils.isEmpty(backupJob) ? null : backupJob;
+
+        var backupExternalId = requestResponse.location.replace("/api/v1/status/", "");
+
+        return StringUtils.isEmpty(backupExternalId) ? null : backupExternalId;
     }
 
-    public String getBackupOfferingUrl() throws BackrollHttpClientException {
+    public List<BackupOffering> getBackupOfferings() throws BackrollHttpClientException {
+
         logger.info("Trying to get backroll backup policies url");
-        String url = "";
-        BackrollTaskRequestResponse requestResponse = backrollHttpClient.getParse("/backup_policies",
-                BackrollTaskRequestResponse.class);
+        String urlTask = "";
+        BackrollTaskRequestResponse requestResponse = backrollHttpClient.getParse("/backup_policies", BackrollTaskRequestResponse.class);
         logger.info("BackrollClient:getBackupOfferingUrl:Apres Parse:  " + requestResponse.location);
-        url = requestResponse.location.replace("/api/v1", "");
-        return StringUtils.isEmpty(url) ? null : url;
-    }
+        urlTask = requestResponse.location.replace("/api/v1", "");
+
+        if (StringUtils.isEmpty(urlTask)) {
+            return new ArrayList<BackupOffering>();
+        }
 
-    public List<BackupOffering> getBackupOfferings(String idTask) throws BackrollHttpClientException {
         logger.info("Trying to list backroll backup policies");
         final List<BackupOffering> policies = new ArrayList<>();
-        BackupPoliciesResponse backupPoliciesResponse = backrollHttpClient.getWaitParse(idTask, BackupPoliciesResponse.class);
-        logger.info(
-                "BackrollClient:getBackupOfferings:Apres Parse:  " + backupPoliciesResponse.backupPolicies.get(0).name);
+        BackupPoliciesResponse backupPoliciesResponse = backrollHttpClient.getWaitParse(urlTask, BackupPoliciesResponse.class);
+        logger.info("BackrollClient:getBackupOfferings:Apres Parse:  " + backupPoliciesResponse.backupPolicies.get(0).name);
         for (final BackrollBackupPolicyResponse policy : backupPoliciesResponse.backupPolicies) {
             policies.add(new BackrollOffering(policy.name, policy.id));
         }
@@ -139,16 +137,14 @@ public BackrollTaskStatus checkBackupTaskStatus(String taskId) throws BackrollCl
 
             String backupResponse = backrollHttpClient.get("/status/" + taskId);
 
-            if (backupResponse.contains(TaskState.FAILURE) || backupResponse.contains(TaskState.PENDING)) {
-                BackrollBackupStatusResponse backupStatusRequestResponse = new ObjectMapper().readValue(backupResponse,
-                        BackrollBackupStatusResponse.class);
-                status.setState(backupStatusRequestResponse.state);
-            } else {
-                BackrollBackupStatusSuccessResponse backupStatusSuccessRequestResponse = new ObjectMapper()
-                        .readValue(backupResponse, BackrollBackupStatusSuccessResponse.class);
-                status.setState(backupStatusSuccessRequestResponse.state);
-                status.setInfo(backupStatusSuccessRequestResponse.info);
-            }
+        if (backupResponse.contains(TaskState.FAILURE) || backupResponse.contains(TaskState.PENDING)) {
+            BackrollBackupStatusResponse backupStatusRequestResponse = new ObjectMapper().readValue(backupResponse, BackrollBackupStatusResponse.class);
+            status.setState(backupStatusRequestResponse.state);
+        } else {
+            BackrollBackupStatusSuccessResponse backupStatusSuccessRequestResponse = new ObjectMapper().readValue(backupResponse, BackrollBackupStatusSuccessResponse.class);
+            status.setState(backupStatusSuccessRequestResponse.state);
+            status.setInfo(backupStatusSuccessRequestResponse.info);
+        }
 
             return StringUtils.isEmpty(status.getState()) ? null : status;
         } catch (Exception exception) {
@@ -220,8 +216,7 @@ public BackrollBackupMetrics getBackupMetrics(String vmId, String backupId) thro
         BackrollBackupMetricsResponse metricsResponse = backrollHttpClient.getWaitParse(urlToRequest,
                 BackrollBackupMetricsResponse.class);
         if (metricsResponse.info != null) {
-            metrics = new BackrollBackupMetrics(Long.parseLong(metricsResponse.info.originalSize),
-                    Long.parseLong(metricsResponse.info.deduplicatedSize));
+            metrics = new BackrollBackupMetrics(Long.parseLong(metricsResponse.info.originalSize), Long.parseLong(metricsResponse.info.deduplicatedSize));
         }
         return metrics;
     }

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

@@ -16,10 +16,10 @@
 // under the License.
 package org.apache.cloudstack.backup.backroll.model;
 
-import java.util.Date;
-
 import org.apache.cloudstack.backup.BackupOffering;
 
+import java.util.Date;
+
 public class BackrollOffering implements BackupOffering {
 
     private String name;

plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/BackrollOffering.java

@@ -16,9 +16,8 @@
 // under the License.
 package org.apache.cloudstack.backup.backroll.model.response.archive;
 
-import org.joda.time.DateTime;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.joda.time.DateTime;
 
 public class BackrollArchiveResponse {
     @JsonProperty("archive")

plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/archive/BackrollArchiveResponse.java

@@ -16,11 +16,11 @@
 // under the License.
 package org.apache.cloudstack.backup.backroll.model.response.archive;
 
-import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import java.util.List;
+
 public class BackrollArchivesResponse {
     @JsonProperty("archives")
     @JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)

plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/archive/BackrollArchivesResponse.java

@@ -16,9 +16,8 @@
 // under the License.
 package org.apache.cloudstack.backup.backroll.model.response.archive;
 
-import org.apache.cloudstack.backup.backroll.model.response.BackrollAsyncResponse;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.cloudstack.backup.backroll.model.response.BackrollAsyncResponse;
 
 public class BackrollBackupsFromVMResponse extends BackrollAsyncResponse {
     @JsonProperty("info")

plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/archive/BackrollBackupsFromVMResponse.java

@@ -16,9 +16,8 @@
 // under the License.
 package org.apache.cloudstack.backup.backroll.model.response.metrics.backup;
 
-import org.apache.cloudstack.backup.backroll.model.response.BackrollAsyncResponse;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.cloudstack.backup.backroll.model.response.BackrollAsyncResponse;
 
 public class BackrollBackupMetricsResponse extends BackrollAsyncResponse {
     @JsonProperty("info")

plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/metrics/backup/BackrollBackupMetricsResponse.java

@@ -16,9 +16,8 @@
 // under the License.
 package org.apache.cloudstack.backup.backroll.model.response.metrics.virtualMachine;
 
-import org.apache.cloudstack.backup.backroll.model.response.BackrollAsyncResponse;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.cloudstack.backup.backroll.model.response.BackrollAsyncResponse;
 
 public class BackrollVmMetricsResponse extends BackrollAsyncResponse{
     @JsonProperty("info")