refactor: rename CD-ROM references to ISO and update related logic

Author: Damans227

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

@@ -170,9 +170,9 @@ public class UserVmResponse extends BaseResponseWithTagInformation implements Co
     @Param(description = "All ISOs attached to the Instance, keyed by cdrom slot. The first entry mirrors isoid/isoname for back-compat.", responseObject = AttachedIsoResponse.class, since = "4.23.0")
     private List<AttachedIsoResponse> isos;
 
-    @SerializedName("cdrommaxcount")
-    @Param(description = "Maximum number of CD-ROM drives this Instance may have, after applying the cluster-scoped vm.cdrom.max.count and the hypervisor's own cap.", since = "4.23.0")
-    private Integer cdromMaxCount;
+    @SerializedName("isomaxcount")
+    @Param(description = "Maximum number of ISOs that may be attached to this Instance, after applying the cluster-scoped vm.iso.max.count and the hypervisor's own cap.", since = "4.23.0")
+    private Integer isoMaxCount;
 
     @SerializedName(ApiConstants.SERVICE_OFFERING_ID)
     @Param(description = "The ID of the service offering of the Instance")
@@ -887,12 +887,12 @@ public List<AttachedIsoResponse> getIsos() {
         return isos;
     }
 
-    public void setCdromMaxCount(Integer cdromMaxCount) {
-        this.cdromMaxCount = cdromMaxCount;
+    public void setIsoMaxCount(Integer isoMaxCount) {
+        this.isoMaxCount = isoMaxCount;
     }
 
-    public Integer getCdromMaxCount() {
-        return cdromMaxCount;
+    public Integer getIsoMaxCount() {
+        return isoMaxCount;
     }
 
     public void setIsoName(String isoName) {

engine/components-api/src/main/java/com/cloud/template/TemplateManager.java

@@ -64,10 +64,10 @@ public interface TemplateManager {
             true,
             ConfigKey.Scope.Global);
 
-    ConfigKey<Integer> VmCdromMaxCount = new ConfigKey<Integer>("Advanced",
+    ConfigKey<Integer> VmIsoMaxCount = new ConfigKey<Integer>("Advanced",
             Integer.class,
-            "vm.cdrom.max.count", "1",
-            "Maximum number of CD-ROM drives per VM.",
+            "vm.iso.max.count", "1",
+            "Maximum number of ISOs that may be attached to a VM.",
             true,
             ConfigKey.Scope.Cluster);
 

server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java

@@ -269,7 +269,7 @@ public UserVmResponse newUserVmResponse(ResponseView view, String objectName, Us
                 }
             }
             userVmResponse.setIsos(attachedIsos);
-            userVmResponse.setCdromMaxCount(effectiveCdromMaxCount(userVm));
+            userVmResponse.setIsoMaxCount(effectiveCdromMaxCount(userVm));
         }
         if (details.contains(VMDetails.all) || details.contains(VMDetails.servoff)) {
             userVmResponse.setServiceOfferingId(userVm.getServiceOfferingUuid());
@@ -564,7 +564,7 @@ private long computeLeaseDurationFromExpiryDate(Date created, Date leaseExpiryDa
     }
 
     int effectiveCdromMaxCount(UserVmJoinVO userVm) {
-        int configuredCap = TemplateManager.VmCdromMaxCount.valueIn(userVm.getClusterId());
+        int configuredCap = TemplateManager.VmIsoMaxCount.valueIn(userVm.getClusterId());
         int hypervisorCap = advertisedCdromCap(userVm.getHostId() != null ? userVm.getHostId() : userVm.getLastHostId());
         // List endpoint clamps for display robustness; the action paths in TemplateManagerImpl
         // throw on misconfiguration so operators still see the loud error when they try to attach.

server/src/main/java/com/cloud/template/TemplateManagerImpl.java

@@ -1559,12 +1559,12 @@ void enforceCdromAttachLimits(long vmId, UserVm vm, long isoId) {
     int effectiveMaxCdroms(VirtualMachine vm, Long hostId) {
         HostVO host = hostId != null ? _hostDao.findById(hostId) : null;
         Long clusterId = host != null ? host.getClusterId() : null;
-        int configuredCap = VmCdromMaxCount.valueIn(clusterId);
+        int configuredCap = VmIsoMaxCount.valueIn(clusterId);
         int hypervisorCap = advertisedCdromCap(hostId);
         if (configuredCap > hypervisorCap) {
             String message = String.format(
                     "%s is set to %d but the placement host supports a maximum of %d CD-ROM(s) per Instance; lower %s to %d or less.",
-                    VmCdromMaxCount.key(), configuredCap, hypervisorCap, VmCdromMaxCount.key(), hypervisorCap);
+                    VmIsoMaxCount.key(), configuredCap, hypervisorCap, VmIsoMaxCount.key(), hypervisorCap);
             logger.error(message);
             throw new InvalidParameterValueException(message);
         }
@@ -2713,7 +2713,7 @@ public ConfigKey<?>[] getConfigKeys() {
                 TemplatePreloaderPoolSize,
                 ValidateUrlIsResolvableBeforeRegisteringTemplate,
                 TemplateDeleteFromPrimaryStorage,
-                VmCdromMaxCount};
+                VmIsoMaxCount};
     }
 
     public List<TemplateAdapter> getTemplateAdapters() {

ui/src/config/section/compute.js

@@ -23,10 +23,10 @@ import { getLatestKubernetesIsoParams } from '@/utils/acsrepo'
 import kubernetesIcon from '@/assets/icons/kubernetes.svg?inline'
 
 const attachedIsoCount = (record) => (record.isos && record.isos.length) || (record.isoid ? 1 : 0)
-// Server pre-computes the effective cap (cluster-scoped vm.cdrom.max.count clamped to the
+// Server pre-computes the effective cap (cluster-scoped vm.iso.max.count clamped to the
 // hypervisor's own limit). Fall back to the hypervisor floor for older servers.
-const cdromMaxCount = (record) => record.cdrommaxcount != null
-  ? record.cdrommaxcount
+const isoMaxCount = (record) => record.isomaxcount != null
+  ? record.isomaxcount
   : (record.hypervisor === 'KVM' ? 2 : 1)
 const isoActionAvailable = (record) =>
   record.hypervisor !== 'External' && ['Running', 'Stopped'].includes(record.state) && record.vmtype !== 'sharedfsvm'
@@ -308,7 +308,7 @@ export default {
           docHelp: 'adminguide/templates.html#attaching-an-iso-to-a-vm',
           dataView: true,
           popup: true,
-          show: (record) => isoActionAvailable(record) && attachedIsoCount(record) < cdromMaxCount(record),
+          show: (record) => isoActionAvailable(record) && attachedIsoCount(record) < isoMaxCount(record),
           disabled: (record) => { return record.hostcontrolstate === 'Offline' || record.hostcontrolstate === 'Maintenance' },
           component: shallowRef(defineAsyncComponent(() => import('@/views/compute/AttachIso.vue')))
         },

ui/src/views/compute/AttachIso.vue

@@ -103,10 +103,10 @@ export default {
   },
   methods: {
     computeMaxSelections () {
-      // Server pre-computes the effective cap (cluster-scoped vm.cdrom.max.count clamped to
-      // the hypervisor's own limit) and exposes it on the VM as cdrommaxcount.
-      const effectiveCap = this.resource.cdrommaxcount != null
-        ? this.resource.cdrommaxcount
+      // Server pre-computes the effective cap (cluster-scoped vm.iso.max.count clamped to
+      // the hypervisor's own limit) and exposes it on the VM as isomaxcount.
+      const effectiveCap = this.resource.isomaxcount != null
+        ? this.resource.isomaxcount
         : (this.resource.hypervisor === 'KVM' ? 2 : 1)
       const alreadyAttached = (this.resource.isos && this.resource.isos.length) ||
         (this.resource.isoid ? 1 : 0)