rename draasenabled to crosszoneinstancecreation

abh1sar · abh1sar · commit bc7055d6310f · 2025-09-16T02:10:36.000+05:30
diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
@@ -139,6 +139,7 @@ public class ApiConstants {
     public static final String CPU_SPEED = "cpuspeed";
     public static final String CPU_LOAD_AVERAGE = "cpuloadaverage";
     public static final String CREATED = "created";
+    public static final String CROSS_ZONE_INSTANCE_CREATION = "crosszoneinstancecreation";
     public static final String CTX_ACCOUNT_ID = "ctxaccountid";
     public static final String CTX_DETAILS = "ctxDetails";
     public static final String CTX_USER_ID = "ctxuserid";
@@ -209,7 +210,6 @@ public class ApiConstants {
     public static final String DOMAIN_ID = "domainid";
     public static final String DOMAIN__ID = "domainId";
     public static final String DURATION = "duration";
-    public static final String DRAAS_ENABLED = "draasenabled";
     public static final String ELIGIBLE = "eligible";
     public static final String EMAIL = "email";
     public static final String END_ASN = "endasn";
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/repository/AddBackupRepositoryCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/repository/AddBackupRepositoryCmd.java
@@ -63,14 +63,14 @@ public class AddBackupRepositoryCmd extends BaseCmd {
             type = CommandType.UUID,
             entityType = ZoneResponse.class,
             required = true,
-            description = "ID of the zone where the backup repository is to be added")
+            description = "ID of the zone where the backup repository is to be added for taking backups")
     private Long zoneId;
 
     @Parameter(name = ApiConstants.CAPACITY_BYTES, type = CommandType.LONG, description = "capacity of this backup repository")
     private Long capacityBytes;
 
-    @Parameter(name = ApiConstants.DRAAS_ENABLED, type = CommandType.BOOLEAN, description = "the backup repository is configured to be used for disaster recovery on other Zones", since = "4.22.0")
-    private Boolean draasEnabled;
+    @Parameter(name = ApiConstants.CROSS_ZONE_INSTANCE_CREATION, type = CommandType.BOOLEAN, description = "backups on this repository can be used to create Instances on all Zones", since = "4.22.0")
+    private Boolean crossZoneInstanceCreation;
 
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
@@ -111,8 +111,8 @@ public Long getCapacityBytes() {
         return capacityBytes;
     }
 
-    public Boolean isDraasEnabled() {
-        return draasEnabled;
+    public Boolean crossZoneInstanceCreationEnabled() {
+        return crossZoneInstanceCreation;
     }
 
     /////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/repository/UpdateBackupRepositoryCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/repository/UpdateBackupRepositoryCmd.java
@@ -56,8 +56,8 @@ public class UpdateBackupRepositoryCmd extends BaseCmd {
     @Parameter(name = ApiConstants.MOUNT_OPTIONS, type = CommandType.STRING, description = "shared storage mount options")
     private String mountOptions;
 
-    @Parameter(name = ApiConstants.DRAAS_ENABLED, type = CommandType.BOOLEAN, description = "the backup repository is configured to be used for disaster recovery on other Zones")
-    private Boolean draasEnabled;
+    @Parameter(name = ApiConstants.CROSS_ZONE_INSTANCE_CREATION, type = CommandType.BOOLEAN, description = "backups in this repository can be used to create Instances on all Zones")
+    private Boolean crossZoneInstanceCreation;
 
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
@@ -83,8 +83,8 @@ public String getMountOptions() {
         return mountOptions == null ? "" : mountOptions;
     }
 
-    public Boolean isDraasEnabled() {
-        return draasEnabled;
+    public Boolean crossZoneInstanceCreationEnabled() {
+        return crossZoneInstanceCreation;
     }
 
     /////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/BackupRepositoryResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/BackupRepositoryResponse.java
@@ -61,9 +61,9 @@ public class BackupRepositoryResponse extends BaseResponse {
     @Param(description = "capacity of the backup repository")
     private Long capacityBytes;
 
-    @SerializedName(ApiConstants.DRAAS_ENABLED)
-    @Param(description = "is the backup repository configured to be used for disaster recovery on other Zones")
-    private Boolean draasEnabled;
+    @SerializedName(ApiConstants.CROSS_ZONE_INSTANCE_CREATION)
+    @Param(description = "the backups in this repository can be used to create Instances on all Zones")
+    private Boolean crossZoneInstanceCreation;
 
     @SerializedName("created")
     @Param(description = "the date and time the backup repository was added")
@@ -136,12 +136,12 @@ public void setCapacityBytes(Long capacityBytes) {
         this.capacityBytes = capacityBytes;
     }
 
-    public Boolean getDraasEnabled() {
-        return draasEnabled;
+    public Boolean getCrossZoneInstanceCreation() {
+        return crossZoneInstanceCreation;
     }
 
-    public void setDraasEnabled(Boolean draasEnabled) {
-        this.draasEnabled = draasEnabled;
+    public void setCrossZoneInstanceCreation(Boolean crossZoneInstanceCreation) {
+        this.crossZoneInstanceCreation = crossZoneInstanceCreation;
     }
 
     public Date getCreated() {
diff --git a/api/src/main/java/org/apache/cloudstack/backup/BackupProvider.java b/api/src/main/java/org/apache/cloudstack/backup/BackupProvider.java
@@ -23,7 +23,7 @@
 
 public interface BackupProvider {
 
-    Boolean isDraasEnabled(BackupOffering backupOffering);
+    Boolean crossZoneInstanceCreationEnabled(BackupOffering backupOffering);
 
     /**
      * Returns the unique name of the provider
diff --git a/api/src/main/java/org/apache/cloudstack/backup/BackupRepository.java b/api/src/main/java/org/apache/cloudstack/backup/BackupRepository.java
@@ -33,7 +33,7 @@ public interface BackupRepository extends InternalIdentity, Identity {
     Long getCapacityBytes();
     Long getUsedBytes();
     void setCapacityBytes(Long capacityBytes);
-    Boolean isDraasEnabled();
-    void setDraasEnabled(Boolean draasEnabled);
+    Boolean crossZoneInstanceCreationEnabled();
+    void setCrossZoneInstanceCreation(Boolean crossZoneInstanceCreation);
     Date getCreated();
 }
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/backup/BackupRepositoryVO.java b/engine/schema/src/main/java/org/apache/cloudstack/backup/BackupRepositoryVO.java
@@ -67,8 +67,8 @@ public class BackupRepositoryVO implements BackupRepository {
     @Column(name = "capacity_bytes", nullable = true)
     private Long capacityBytes;
 
-    @Column(name = "draas_enabled")
-    private Boolean draasEnabled;
+    @Column(name = "cross_zone_instance_creation")
+    private Boolean crossZoneInstanceCreation;
 
     @Column(name = "created")
     @Temporal(value = TemporalType.TIMESTAMP)
@@ -82,7 +82,7 @@ public BackupRepositoryVO() {
         this.uuid = UUID.randomUUID().toString();
     }
 
-    public BackupRepositoryVO(final long zoneId, final String provider, final String name, final String type, final String address, final String mountOptions, final Long capacityBytes, final Boolean draasEnabled) {
+    public BackupRepositoryVO(final long zoneId, final String provider, final String name, final String type, final String address, final String mountOptions, final Long capacityBytes, final Boolean crossZoneInstanceCreation) {
         this();
         this.zoneId = zoneId;
         this.provider = provider;
@@ -91,7 +91,7 @@ public BackupRepositoryVO(final long zoneId, final String provider, final String
         this.address = address;
         this.mountOptions = mountOptions;
         this.capacityBytes = capacityBytes;
-        this.draasEnabled = draasEnabled;
+        this.crossZoneInstanceCreation = crossZoneInstanceCreation;
         this.created = new Date();
     }
 
@@ -164,13 +164,13 @@ public Long getCapacityBytes() {
     }
 
     @Override
-    public Boolean isDraasEnabled() {
-        return draasEnabled;
+    public Boolean crossZoneInstanceCreationEnabled() {
+        return crossZoneInstanceCreation;
     }
 
     @Override
-    public void setDraasEnabled(Boolean draasEnabled) {
-        this.draasEnabled = draasEnabled;
+    public void setCrossZoneInstanceCreation(Boolean crossZoneInstanceCreation) {
+        this.crossZoneInstanceCreation = crossZoneInstanceCreation;
     }
 
     @Override
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-42100to42200.sql b/engine/schema/src/main/resources/META-INF/db/schema-42100to42200.sql
@@ -22,5 +22,5 @@
 -- Increase length of scripts_version column to 128 due to md5sum to sha512sum change
 CALL `cloud`.`IDEMPOTENT_CHANGE_COLUMN`('cloud.domain_router', 'scripts_version', 'scripts_version', 'VARCHAR(128)');
 
--- Add the column draas_enabled to cloud.backup_repository. if enabled it means that new Instance can be created on another Zones from Backups on this Repository.
-CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.backup_repository', 'draas_enabled', 'TINYINT(1) DEFAULT NULL COMMENT ''Backup Repository can be used for disaster recovery on another zone''');
+-- Add the column cross_zone_instance_creation to cloud.backup_repository. if enabled it means that new Instance can be created on all Zones from Backups on this Repository.
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.backup_repository', 'cross_zone_instance_creation', 'TINYINT(1) DEFAULT NULL COMMENT ''Backup Repository can be used for disaster recovery on another zone''');
diff --git a/plugins/backup/dummy/src/main/java/org/apache/cloudstack/backup/DummyBackupProvider.java b/plugins/backup/dummy/src/main/java/org/apache/cloudstack/backup/DummyBackupProvider.java
@@ -54,7 +54,7 @@ public class DummyBackupProvider extends AdapterBase implements BackupProvider {
     private DiskOfferingDao diskOfferingDao;
 
     @Override
-    public Boolean isDraasEnabled(BackupOffering backupOffering) {
+    public Boolean crossZoneInstanceCreationEnabled(BackupOffering backupOffering) {
         return true;
     }
 
diff --git a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
@@ -539,12 +539,12 @@ public boolean isValidProviderOffering(Long zoneId, String uuid) {
     }
 
     @Override
-    public Boolean isDraasEnabled(BackupOffering backupOffering) {
+    public Boolean crossZoneInstanceCreationEnabled(BackupOffering backupOffering) {
         final BackupRepository backupRepository = backupRepositoryDao.findByBackupOfferingId(backupOffering.getId());
         if (backupRepository == null) {
             throw new CloudRuntimeException("Backup repository not found for the backup offering" + backupOffering.getName());
         }
-        return Boolean.TRUE.equals(backupRepository.isDraasEnabled());
+        return Boolean.TRUE.equals(backupRepository.crossZoneInstanceCreationEnabled());
     }
 
     @Override
diff --git a/plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/NetworkerBackupProvider.java b/plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/NetworkerBackupProvider.java
@@ -159,7 +159,7 @@ public ConfigKey<?>[] getConfigKeys() {
     }
 
     @Override
-    public Boolean isDraasEnabled(BackupOffering backupOffering) {
+    public Boolean crossZoneInstanceCreationEnabled(BackupOffering backupOffering) {
         return false;
     }
 
diff --git a/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/VeeamBackupProvider.java b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/VeeamBackupProvider.java
@@ -359,7 +359,7 @@ public void syncBackupStorageStats(Long zoneId) {
     }
 
     @Override
-    public Boolean isDraasEnabled(BackupOffering backupOffering) {
+    public Boolean crossZoneInstanceCreationEnabled(BackupOffering backupOffering) {
         return false;
     }
 
diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -5553,7 +5553,7 @@ public BackupRepositoryResponse createBackupRepositoryResponse(BackupRepository
         response.setProviderName(backupRepository.getProvider());
         response.setType(backupRepository.getType());
         response.setCapacityBytes(backupRepository.getCapacityBytes());
-        response.setDraasEnabled(backupRepository.isDraasEnabled());
+        response.setCrossZoneInstanceCreation(backupRepository.crossZoneInstanceCreationEnabled());
         response.setObjectName("backuprepository");
         DataCenter zone = ApiDBUtils.findZoneById(backupRepository.getZoneId());
         if (zone != null) {
diff --git a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
@@ -1266,7 +1266,7 @@ public Boolean canCreateInstanceFromBackupAcrossZones(final Long backupId) {
             throw new CloudRuntimeException("Failed to find backup offering");
         }
         final BackupProvider backupProvider = getBackupProvider(offering.getProvider());
-        return backupProvider.isDraasEnabled(offering);
+        return backupProvider.crossZoneInstanceCreationEnabled(offering);
     }
 
     @Override
diff --git a/server/src/main/java/org/apache/cloudstack/backup/BackupRepositoryServiceImpl.java b/server/src/main/java/org/apache/cloudstack/backup/BackupRepositoryServiceImpl.java
@@ -57,7 +57,7 @@ public class BackupRepositoryServiceImpl extends ManagerBase implements BackupRe
     @ActionEvent(eventType = EventTypes.EVENT_BACKUP_REPOSITORY_ADD, eventDescription = "add backup repository")
     public BackupRepository addBackupRepository(AddBackupRepositoryCmd cmd) {
         BackupRepositoryVO repository = new BackupRepositoryVO(cmd.getZoneId(), cmd.getProvider(), cmd.getName(),
-                cmd.getType(), cmd.getAddress(), cmd.getMountOptions(), cmd.getCapacityBytes(), cmd.isDraasEnabled());
+                cmd.getType(), cmd.getAddress(), cmd.getMountOptions(), cmd.getCapacityBytes(), cmd.crossZoneInstanceCreationEnabled());
         return repositoryDao.persist(repository);
     }
 
@@ -68,7 +68,7 @@ public BackupRepository updateBackupRepository(UpdateBackupRepositoryCmd cmd) {
         String name = cmd.getName();
         String address = cmd.getAddress();
         String mountOptions = cmd.getMountOptions();
-        Boolean draasEnabled = cmd.isDraasEnabled();
+        Boolean crossZoneInstanceCreation = cmd.crossZoneInstanceCreationEnabled();
 
         BackupRepositoryVO backupRepository = repositoryDao.findById(id);
         if (Objects.isNull(backupRepository)) {
@@ -91,9 +91,9 @@ public BackupRepository updateBackupRepository(UpdateBackupRepositoryCmd cmd) {
             backupRepositoryVO.setMountOptions(mountOptions);
         }
 
-        if (draasEnabled != null){
-            backupRepositoryVO.setDraasEnabled(draasEnabled);
-            fields.add("draasEnabled: " + draasEnabled);
+        if (crossZoneInstanceCreation != null){
+            backupRepositoryVO.setCrossZoneInstanceCreation(crossZoneInstanceCreation);
+            fields.add("crossZoneInstanceCreation: " + crossZoneInstanceCreation);
         }
 
         if (!repositoryDao.update(id, backupRepositoryVO)) {
@@ -103,7 +103,7 @@ public BackupRepository updateBackupRepository(UpdateBackupRepositoryCmd cmd) {
 
         BackupRepositoryVO repositoryVO = repositoryDao.findById(id);
         CallContext.current().setEventDetails(String.format("Backup Repository updated [%s].",
-                ReflectionToStringBuilderUtils.reflectOnlySelectedFields(repositoryVO, "id", "name", "description", "userDrivenBackupAllowed", "externalId", "draasEnabled")));
+                ReflectionToStringBuilderUtils.reflectOnlySelectedFields(repositoryVO, "id", "name", "description", "userDrivenBackupAllowed", "externalId", "crossZoneInstanceCreation")));
         return repositoryVO;
     }
 
diff --git a/server/src/test/java/org/apache/cloudstack/backup/BackupRepositoryServiceImplTest.java b/server/src/test/java/org/apache/cloudstack/backup/BackupRepositoryServiceImplTest.java
@@ -99,7 +99,7 @@ public void testUpdateBackupRepository() {
         when(updateCmd.getName()).thenReturn("updated-repo");
         when(updateCmd.getAddress()).thenReturn("192.168.1.200:/backup");
         when(updateCmd.getMountOptions()).thenReturn("rw,noexec");
-        when(updateCmd.isDraasEnabled()).thenReturn(false);
+        when(updateCmd.crossZoneInstanceCreationEnabled()).thenReturn(false);
 
         when(repositoryDao.findById(1L)).thenReturn(repositoryVO);
         when(repositoryDao.createForUpdate(1L)).thenReturn(repositoryVO);
diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
@@ -922,7 +922,7 @@
 "label.download.setting": "Download setting",
 "label.download.state": "Download state",
 "label.dpd": "Dead peer detection",
-"label.draasenabled": "DRaaS Enabled",
+"label.crosszoneinstancecreation": "Cross-Zone Instance Creation",
 "label.driver": "Driver",
 "label.drs": "DRS",
 "label.drsimbalance": "DRS imbalance",
diff --git a/ui/src/components/view/DeployVMFromBackup.vue b/ui/src/components/view/DeployVMFromBackup.vue
@@ -46,7 +46,7 @@
                 </template>
               </a-step>
               <a-step
-                v-if="isDRaaSEnabled"
+                v-if="crossZoneInstanceCreationEnabled"
                 :title="$t('label.select.a.zone')"
                 status="process">
                 <template #description>
@@ -972,8 +972,8 @@ export default {
     isDifferentZoneFromBackup () {
       return this.selectedZone !== this.dataPreFill.zoneid
     },
-    isDRaaSEnabled () {
-      return this.dataPreFill.draasenabled
+    crossZoneInstanceCreationEnabled () {
+      return this.dataPreFill.crosszoneinstancecreation
     },
     isNormalUserOrProject () {
       return ['User'].includes(this.$store.getters.userInfo.roletype) || store.getters.project.id
diff --git a/ui/src/config/section/config.js b/ui/src/config/section/config.js
@@ -141,15 +141,15 @@ export default {
       permission: ['listBackupRepositories'],
       searchFilters: ['zoneid'],
       columns: ['name', 'provider', 'type', 'address', 'zonename'],
-      details: ['name', 'type', 'address', 'provider', 'zonename', 'draasenabled'],
+      details: ['name', 'type', 'address', 'provider', 'zonename', 'crosszoneinstancecreation'],
       actions: [
         {
           api: 'addBackupRepository',
           icon: 'plus-outlined',
           label: 'label.backup.repository.add',
           listView: true,
           args: [
-            'name', 'provider', 'address', 'type', 'mountopts', 'zoneid', 'draasenabled'
+            'name', 'provider', 'address', 'type', 'mountopts', 'zoneid', 'crosszoneinstancecreation'
           ],
           mapping: {
             type: {
@@ -165,7 +165,7 @@ export default {
           icon: 'edit-outlined',
           label: 'label.backup.repository.edit',
           message: 'message.action.edit.backup.repository',
-          args: ['name', 'address', 'mountopts', 'draasenabled'],
+          args: ['name', 'address', 'mountopts', 'crosszoneinstancecreation'],
           dataView: true,
           popup: true
         },
diff --git a/ui/src/views/storage/CreateVMFromBackup.vue b/ui/src/views/storage/CreateVMFromBackup.vue
@@ -132,7 +132,7 @@ export default {
     populatePreFillData () {
       this.vmdetails = this.resource.vmdetails
       this.dataPreFill.zoneid = this.resource.zoneid
-      this.dataPreFill.draasenabled = this.backupRepository?.draasenabled || this.backupOffering.provider === 'dummy'
+      this.dataPreFill.crosszoneinstancecreation = this.backupRepository?.crosszoneinstancecreation || this.backupOffering.provider === 'dummy'
       this.dataPreFill.isIso = (this.vmdetails.isiso === 'true')
       this.dataPreFill.backupid = this.resource.id
       this.dataPreFill.computeofferingid = this.vmdetails.serviceofferingid

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public class DummyBackupProvider extends AdapterBase implements BackupProvider {`
`54`	`54`	`private DiskOfferingDao diskOfferingDao;`
`55`	`55`
`56`	`56`	`@Override`
`57`		`- public Boolean isDraasEnabled(BackupOffering backupOffering) {`
	`57`	`+ public Boolean crossZoneInstanceCreationEnabled(BackupOffering backupOffering) {`
`58`	`58`	`return true;`
`59`	`59`	`}`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -539,12 +539,12 @@ public boolean isValidProviderOffering(Long zoneId, String uuid) {`
`539`	`539`	`}`
`540`	`540`
`541`	`541`	`@Override`
`542`		`- public Boolean isDraasEnabled(BackupOffering backupOffering) {`
	`542`	`+ public Boolean crossZoneInstanceCreationEnabled(BackupOffering backupOffering) {`
`543`	`543`	`final BackupRepository backupRepository = backupRepositoryDao.findByBackupOfferingId(backupOffering.getId());`
`544`	`544`	`if (backupRepository == null) {`
`545`	`545`	`throw new CloudRuntimeException("Backup repository not found for the backup offering" + backupOffering.getName());`
`546`	`546`	`}`
`547`		`- return Boolean.TRUE.equals(backupRepository.isDraasEnabled());`
	`547`	`+ return Boolean.TRUE.equals(backupRepository.crossZoneInstanceCreationEnabled());`
`548`	`548`	`}`
`549`	`549`
`550`	`550`	`@Override`