Merge pull request #588 from jschoiRR/mold-main#2025

[Mold API] 20250114일자 신규소스 반영 후 빌드 오류 수정

Author: jschoiRR

engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java

@@ -476,6 +476,7 @@ public void setVmSnapshotName(String vmSnapshotName) {
     @Override
     public String getVmSnapshotName() {
         return vmSnapshotName;
+    }
 
     @Override
     public String toString() {

engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java

@@ -998,7 +998,8 @@ public Long getUsedPhysicalSize() {
     @Override
     public void setUsedPhysicalSize(Long usedPhysicalSize) {
         volumeVO.setUsedPhysicalSize(usedPhysicalSize);
-    
+    }
+
     @Override
     public String toString() {
         return String.format("VolumeObject %s",

plugins/integrations/automation-service/src/main/java/com/cloud/automation/controller/actionworkers/AutomationControllerActionWorker.java

@@ -403,7 +403,7 @@ protected DeployDestination plan(final long nodesCount, final DataCenter zone, f
                 if (logger.isDebugEnabled()) {
                     logger.debug(String.format("Checking host : %s for capacity already reserved %d", h.getName(), reserved));
                 }
-                if (capacityManager.checkIfHostHasCapacity(h.getId(), cpu_requested * reserved, ram_requested * reserved, false, cpuOvercommitRatio, memoryOvercommitRatio, true)) {
+                if (capacityManager.checkIfHostHasCapacity(h, cpu_requested * reserved, ram_requested * reserved, false, cpuOvercommitRatio, memoryOvercommitRatio, true)) {
                     if (logger.isDebugEnabled()) {
                         logger.debug(String.format("Found host : %s for with enough capacity, CPU=%d RAM=%s", h.getName(), cpu_requested * reserved, toHumanReadableSize(ram_requested * reserved)));
                     }

plugins/integrations/automation-service/src/main/java/com/cloud/automation/controller/actionworkers/AutomationControllerResourceModifierActionWorker.java

@@ -157,7 +157,7 @@ protected DeployDestination plan(final long nodesCount, final DataCenter zone, f
                 if (logger.isDebugEnabled()) {
                     logger.debug(String.format("Checking host : %s for capacity already reserved %d", h.getName(), reserved));
                 }
-                if (capacityManager.checkIfHostHasCapacity(h.getId(), cpu_requested * reserved, ram_requested * reserved, false, cpuOvercommitRatio, memoryOvercommitRatio, true)) {
+                if (capacityManager.checkIfHostHasCapacity(h, cpu_requested * reserved, ram_requested * reserved, false, cpuOvercommitRatio, memoryOvercommitRatio, true)) {
                     if (logger.isDebugEnabled()) {
                         logger.debug(String.format("Found host : %s for with enough capacity, CPU=%d RAM=%s", h.getName(), cpu_requested * reserved, toHumanReadableSize(ram_requested * reserved)));
                     }

plugins/integrations/desktop-service/src/main/java/com/cloud/desktop/cluster/actionworkers/DesktopClusterResourceModifierActionWorker.java

@@ -160,7 +160,7 @@ protected DeployDestination plan(final long nodesCount, final DataCenter zone, f
                 if (logger.isDebugEnabled()) {
                     logger.debug(String.format("Checking host : %s for capacity already reserved %d", h.getName(), reserved));
                 }
-                if (capacityManager.checkIfHostHasCapacity(h.getId(), cpu_requested * reserved, ram_requested * reserved, false, cpuOvercommitRatio, memoryOvercommitRatio, true)) {
+                if (capacityManager.checkIfHostHasCapacity(h, cpu_requested * reserved, ram_requested * reserved, false, cpuOvercommitRatio, memoryOvercommitRatio, true)) {
                     if (logger.isDebugEnabled()) {
                         logger.debug(String.format("Found host : %s for with enough capacity, CPU=%d RAM=%s", h.getName(), cpu_requested * reserved, toHumanReadableSize(ram_requested * reserved)));
                     }

plugins/storage/volume/ablestack/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/AblestackPrimaryDataStoreLifeCycleImpl.java

@@ -234,7 +234,7 @@ public boolean attachCluster(DataStore store, ClusterScope scope) {
         List<HostVO> poolHosts = new ArrayList<HostVO>();
         for (HostVO h : allHosts) {
             try {
-                storageMgr.connectHostToSharedPool(h.getId(), primarystore.getId());
+                storageMgr.connectHostToSharedPool(h, primarystore.getId());
                 poolHosts.add(h);
             } catch (StorageConflictException se) {
                 primaryDataStoreDao.expunge(primarystore.getId());
@@ -261,7 +261,7 @@ public boolean attachZone(DataStore dataStore, ZoneScope scope, HypervisorType h
         List<HostVO> poolHosts = new ArrayList<HostVO>();
         for (HostVO host : hosts) {
             try {
-                storageMgr.connectHostToSharedPool(host.getId(), dataStore.getId());
+                storageMgr.connectHostToSharedPool(host, dataStore.getId());
                 poolHosts.add(host);
             } catch (StorageConflictException se) {
                     primaryDataStoreDao.expunge(dataStore.getId());

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -331,6 +331,7 @@
 import com.cloud.storage.StoragePoolStatus;
 import com.cloud.storage.VMTemplateStorageResourceAssoc;
 import com.cloud.storage.VMTemplateVO;
+import com.cloud.storage.VMTemplateZoneVO;
 import com.cloud.storage.Volume;
 import com.cloud.storage.VolumeApiService;
 import com.cloud.storage.VolumeVO;
@@ -4411,7 +4412,6 @@ private UserVm getUncheckedUserVmResource(DataCenter zone, String hostName, Stri
             if (template.getTemplateType().equals(TemplateType.SYSTEM) && !CKS_NODE.equals(vmType) && !SHAREDFSVM.equals(vmType)) {
                 throw new InvalidParameterValueException(String.format("Unable to use system template %s to deploy a user vm", template));
             }
-            
             List<VMTemplateZoneVO> listZoneTemplate = _templateZoneDao.listByZoneTemplate(zone.getId(), template.getId());
             if (listZoneTemplate == null || listZoneTemplate.isEmpty()) {
                 throw new InvalidParameterValueException(String.format("The template %s is not available for use", template));

ui/public/locales/ko_KR.json

@@ -1350,6 +1350,7 @@
 "label.lbprovider": "\ub85c\ub4dc \ubc38\ub7f0\uc11c \uc81c\uacf5\uc790",
 "label.lbruleid": "\ub85c\ub4dc \ubc38\ub7f0\uc11c ID",
 "label.lbtype": "\ub85c\ub4dc \ubc38\ub7f0\uc11c \uc720\ud615",
+"label.ldap": "LDAP",
 "label.ldap.configuration": "LDAP \uad6c\uc131",
 "label.ldap.group.name": "LDAP \uadf8\ub8f9",
 "label.level": "\ub808\ubca8",
@@ -1537,6 +1538,7 @@
 "label.name.optional": "\uc774\ub984(\uc635\uc158)",
 "label.diskofferingname": "\ub514\uc2a4\ud06c \uc624\ud37c\ub9c1 \uc774\ub984",
 "label.nat": "BigSwitch BCF NAT \uc0ac\uc6a9",
+"label.native": "Native",
 "label.ncc": "NCC",
 "label.netmask": "\ub137\ub9c8\uc2a4\ud06c",
 "label.netscaler": "NetScaler",
@@ -1579,6 +1581,7 @@
 "label.networkspeed": "\ub124\ud2b8\uc6cc\ud06c \uc18d\ub3c4",
 "label.networktype": "\ub124\ud2b8\uc6cc\ud06c \uc720\ud615",
 "label.networkwrite": "\ub124\ud2b8\uc6cc\ud06c \uc4f0\uae30",
+"label.never": "\uc5c6\uc74c",
 "label.new": "\uc2e0\uaddc",
 "label.new.autoscale.vmgroup": "\uc0c8 \uc624\ud1a0\uc2a4\ucf00\uc77c VM \uadf8\ub8f9",
 "label.new.instance.group": "\uc0c8 \uac00\uc0c1\uba38\uc2e0 \uadf8\ub8f9",
@@ -2036,7 +2039,9 @@
 "label.s3.secret.key": "\ube44\ubc00 \ud0a4",
 "label.s3.socket.timeout": "\uc18c\ucf13 \uc2dc\uac04\ucd08\uacfc",
 "label.s3.use.https": "HTTPS \uc0ac\uc6a9",
+"label.saml": "SAML",
 "label.saml.disable": "SAML \ube44\ud65c\uc131\ud654",
+"label.saml.disabled": "SAML \ube44\ud65c\uc131\ud654\ub428",
 "label.saml.enable": "SAML \ud65c\uc131\ud654",
 "label.samlenable": "SAML SSO \uc2b9\uc778",
 "label.samlentity": "\uc544\uc774\ub374\ud2f0\ud2f0 \uc81c\uacf5\uc790",
@@ -2186,6 +2191,7 @@
 "label.srx.firewall": "Juniper SRX \ubc29\ud654\ubcbd",
 "label.ssh.key.pairs": "SSH \ud0a4 \uc30d",
 "label.uefi.supported": "\uc9c0\uc6d0\ub418\ub294 UEFI",
+"label.usediops": "\uc0ac\uc6a9\ub41c IOPS",
 "label.userdataid": "\uc0ac\uc6a9\uc790 \ub370\uc774\ud130 ID",
 "label.userdataname": "\uc0ac\uc6a9\uc790 \ub370\uc774\ud130 \uc774\ub984",
 "label.userdatadetails": "\uc0ac\uc6a9\uc790 \ub370\uc774\ud130 \uc138\ubd80 \uc815\ubcf4",