add createCrossZoneInstnaceEnabled to BackupOfferingResponse

Author: abh1sar

api/src/main/java/org/apache/cloudstack/api/response/BackupOfferingResponse.java

@@ -61,6 +61,10 @@ public class BackupOfferingResponse extends BaseResponse {
     @Param(description = "zone name")
     private String zoneName;
 
+    @SerializedName(ApiConstants.CROSS_ZONE_INSTANCE_CREATION)
+    @Param(description = "the backups with this offering can be used to create Instances on all Zones")
+    private Boolean crossZoneInstanceCreation;
+
     @SerializedName(ApiConstants.CREATED)
     @Param(description = "the date this backup offering was created")
     private Date created;
@@ -97,6 +101,10 @@ public void setZoneName(String zoneName) {
         this.zoneName = zoneName;
     }
 
+    public void setCrossZoneInstanceCreation(Boolean crossZoneInstanceCreation) {
+        this.crossZoneInstanceCreation = crossZoneInstanceCreation;
+    }
+
     public void setCreated(Date created) {
         this.created = created;
     }

engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupOfferingDao.java

@@ -24,7 +24,7 @@
 import com.cloud.utils.db.GenericDao;
 
 public interface BackupOfferingDao extends GenericDao<BackupOfferingVO, Long> {
-    BackupOfferingResponse newBackupOfferingResponse(BackupOffering policy);
+    BackupOfferingResponse newBackupOfferingResponse(BackupOffering policy, Boolean crossZoneInstanceCreation);
     BackupOffering findByExternalId(String externalId, Long zoneId);
     BackupOffering findByName(String name, Long zoneId);
 }

engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupOfferingDaoImpl.java

@@ -50,7 +50,7 @@ protected void init() {
     }
 
     @Override
-    public BackupOfferingResponse newBackupOfferingResponse(BackupOffering offering) {
+    public BackupOfferingResponse newBackupOfferingResponse(BackupOffering offering, Boolean crossZoneInstanceCreation) {
         DataCenterVO zone = dataCenterDao.findById(offering.getZoneId());
 
         BackupOfferingResponse response = new BackupOfferingResponse();
@@ -64,6 +64,9 @@ public BackupOfferingResponse newBackupOfferingResponse(BackupOffering offering)
             response.setZoneId(zone.getUuid());
             response.setZoneName(zone.getName());
         }
+        if (crossZoneInstanceCreation) {
+            response.setCrossZoneInstanceCreation(true);
+        }
         response.setCreated(offering.getCreated());
         response.setObjectName("backupoffering");
         return response;

server/src/main/java/com/cloud/api/ApiDBUtils.java

@@ -75,9 +75,11 @@
 import org.apache.cloudstack.api.response.VpcOfferingResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
 import org.apache.cloudstack.backup.BackupOffering;
+import org.apache.cloudstack.backup.BackupRepository;
 import org.apache.cloudstack.backup.BackupSchedule;
 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.backup.dao.BackupScheduleDao;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
@@ -493,6 +495,7 @@ public class ApiDBUtils {
     static BackupDao s_backupDao;
     static BackupScheduleDao s_backupScheduleDao;
     static BackupOfferingDao s_backupOfferingDao;
+    static BackupRepositoryDao s_backupRepositoryDao;
     static NicDao s_nicDao;
     static ResourceManagerUtil s_resourceManagerUtil;
     static SnapshotPolicyDetailsDao s_snapshotPolicyDetailsDao;
@@ -751,6 +754,8 @@ public class ApiDBUtils {
     @Inject
     private BackupOfferingDao backupOfferingDao;
     @Inject
+    private BackupRepositoryDao backupRepositoryDao;
+    @Inject
     private BackupScheduleDao backupScheduleDao;
     @Inject
     private NicDao nicDao;
@@ -899,6 +904,7 @@ void init() {
         s_backupDao = backupDao;
         s_backupScheduleDao = backupScheduleDao;
         s_backupOfferingDao = backupOfferingDao;
+        s_backupRepositoryDao = backupRepositoryDao;
         s_resourceIconDao = resourceIconDao;
         s_resourceManagerUtil = resourceManagerUtil;
         s_objectStoreDao = objectStoreDao;
@@ -2297,8 +2303,10 @@ public static BackupScheduleResponse newBackupScheduleResponse(BackupSchedule sc
         return s_backupScheduleDao.newBackupScheduleResponse(schedule);
     }
 
-    public static BackupOfferingResponse newBackupOfferingResponse(BackupOffering policy) {
-        return s_backupOfferingDao.newBackupOfferingResponse(policy);
+    public static BackupOfferingResponse newBackupOfferingResponse(BackupOffering offering) {
+        BackupRepository repository = s_backupRepositoryDao.findByUuid(offering.getExternalId());
+        Boolean crossZoneInstanceCreationEnabled = repository != null ? repository.crossZoneInstanceCreationEnabled() : false;
+        return s_backupOfferingDao.newBackupOfferingResponse(offering, crossZoneInstanceCreationEnabled);
     }
 
     public static NicVO findByIp4AddressAndNetworkId(String ip4Address, long networkId) {

server/src/main/java/com/cloud/api/ApiResponseHelper.java

@@ -5079,8 +5079,8 @@ public BackupScheduleResponse createBackupScheduleResponse(BackupSchedule schedu
     }
 
     @Override
-    public BackupOfferingResponse createBackupOfferingResponse(BackupOffering policy) {
-        return ApiDBUtils.newBackupOfferingResponse(policy);
+    public BackupOfferingResponse createBackupOfferingResponse(BackupOffering offering) {
+        return ApiDBUtils.newBackupOfferingResponse(offering);
     }
 
     public ManagementServerResponse createManagementResponse(ManagementServerHost mgmt) {

ui/src/views/storage/CreateVMFromBackup.vue

@@ -91,16 +91,16 @@ export default {
       required: true
     }
   },
-  created () {
-    this.fetchServiceOffering()
-    this.fetchBackupOffering().then(() => {
-      this.fetchBackupRepository()
-      this.loading = false
-    })
+  async created () {
+    await Promise.all[(
+      this.fetchServiceOffering(),
+      this.fetchBackupOffering()
+    )]
+    this.loading = false
   },
   methods: {
     fetchServiceOffering () {
-      getAPI('listServiceOfferings', {
+      return getAPI('listServiceOfferings', {
         zoneid: this.resource.zoneid,
         id: this.resource.vmdetails.serviceofferingid,
         listall: true
@@ -118,21 +118,10 @@ export default {
         this.backupOffering = backupOfferings[0]
       })
     },
-    fetchBackupRepository () {
-      if (this.backupOffering.provider !== 'nas') {
-        return
-      }
-      getAPI('listBackupRepositories', {
-        id: this.backupOffering.externalid
-      }).then(response => {
-        const backupRepositories = response.listbackuprepositoriesresponse.backuprepository || []
-        this.backupRepository = backupRepositories[0]
-      })
-    },
     populatePreFillData () {
       this.vmdetails = this.resource.vmdetails
       this.dataPreFill.zoneid = this.resource.zoneid
-      this.dataPreFill.crosszoneinstancecreation = this.backupRepository?.crosszoneinstancecreation || this.backupOffering.provider === 'dummy'
+      this.dataPreFill.crosszoneinstancecreation = this.backupOffering?.crosszoneinstancecreation || this.backupOffering.provider === 'dummy'
       this.dataPreFill.isIso = (this.vmdetails.isiso === 'true')
       this.dataPreFill.backupid = this.resource.id
       this.dataPreFill.computeofferingid = this.vmdetails.serviceofferingid