This is an automated email from the ASF dual-hosted git repository.
vishesh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new 0108ffd1b00 java: fix one typo in many files (#11284)
0108ffd1b00 is described below
commit 0108ffd1b0063acbd7ca6484f0dc44a88a40e85b
Author: John Bampton <[email protected]>
AuthorDate: Thu Sep 18 02:35:38 2025 +1000
java: fix one typo in many files (#11284)
---
.../java/com/cloud/storage/resource/StorageProcessor.java | 4 ++--
.../resource/StorageSubsystemCommandHandlerBase.java | 6 +++---
...a => CheckDataStoreStoragePolicyComplianceCommand.java} | 4 ++--
.../storage/allocator/AbstractStoragePoolAllocator.java | 2 +-
.../cloud/hypervisor/kvm/storage/KVMStorageProcessor.java | 6 +++---
.../hypervisor/ovm3/resources/Ovm3StorageProcessor.java | 6 +++---
.../java/com/cloud/resource/SimulatorStorageProcessor.java | 4 ++--
.../cloud/hypervisor/vmware/manager/VmwareManagerImpl.java | 4 ++--
.../com/cloud/storage/resource/VmwareStorageProcessor.java | 8 ++++----
.../xenserver/resource/XenServerStorageProcessor.java | 6 +++---
.../xenserver/resource/Xenserver625StorageProcessor.java | 6 +++---
.../com/cloud/deploy/DeploymentPlanningManagerImpl.java | 12 ++++++------
.../main/java/com/cloud/storage/StorageManagerImpl.java | 4 ++--
.../main/java/com/cloud/storage/VolumeApiServiceImpl.java | 4 ++--
.../java/com/cloud/storage/StorageManagerImplTest.java | 14 +++++++-------
15 files changed, 45 insertions(+), 45 deletions(-)
diff --git
a/core/src/main/java/com/cloud/storage/resource/StorageProcessor.java
b/core/src/main/java/com/cloud/storage/resource/StorageProcessor.java
index b7cd5b8eb5e..dd8e2abcd64 100644
--- a/core/src/main/java/com/cloud/storage/resource/StorageProcessor.java
+++ b/core/src/main/java/com/cloud/storage/resource/StorageProcessor.java
@@ -21,7 +21,7 @@ package com.cloud.storage.resource;
import org.apache.cloudstack.agent.directdownload.DirectDownloadCommand;
import org.apache.cloudstack.storage.command.AttachCommand;
-import
org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplainceCommand;
+import
org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplianceCommand;
import org.apache.cloudstack.storage.command.CopyCommand;
import org.apache.cloudstack.storage.command.CreateObjectCommand;
import org.apache.cloudstack.storage.command.DeleteCommand;
@@ -82,7 +82,7 @@ public interface StorageProcessor {
Answer copyVolumeFromPrimaryToPrimary(CopyCommand cmd);
- public Answer
checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplainceCommand
cmd);
+ public Answer
checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplianceCommand
cmd);
public Answer syncVolumePath(SyncVolumePathCommand cmd);
}
diff --git
a/core/src/main/java/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java
b/core/src/main/java/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java
index 58885210120..318c069b0b0 100644
---
a/core/src/main/java/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java
+++
b/core/src/main/java/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java
@@ -21,7 +21,7 @@ package com.cloud.storage.resource;
import org.apache.cloudstack.agent.directdownload.DirectDownloadCommand;
import org.apache.cloudstack.storage.command.AttachCommand;
-import
org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplainceCommand;
+import
org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplianceCommand;
import org.apache.cloudstack.storage.command.CopyCommand;
import org.apache.cloudstack.storage.command.CreateObjectAnswer;
import org.apache.cloudstack.storage.command.CreateObjectCommand;
@@ -79,8 +79,8 @@ public class StorageSubsystemCommandHandlerBase implements
StorageSubsystemComma
return processor.resignature((ResignatureCommand) command);
} else if (command instanceof DirectDownloadCommand) {
return
processor.handleDownloadTemplateToPrimaryStorage((DirectDownloadCommand)
command);
- } else if (command instanceof
CheckDataStoreStoragePolicyComplainceCommand) {
- return
processor.checkDataStoreStoragePolicyCompliance((CheckDataStoreStoragePolicyComplainceCommand)
command);
+ } else if (command instanceof
CheckDataStoreStoragePolicyComplianceCommand) {
+ return
processor.checkDataStoreStoragePolicyCompliance((CheckDataStoreStoragePolicyComplianceCommand)
command);
} else if (command instanceof SyncVolumePathCommand) {
return processor.syncVolumePath((SyncVolumePathCommand) command);
} else if (command instanceof QuerySnapshotZoneCopyCommand) {
diff --git
a/core/src/main/java/org/apache/cloudstack/storage/command/CheckDataStoreStoragePolicyComplainceCommand.java
b/core/src/main/java/org/apache/cloudstack/storage/command/CheckDataStoreStoragePolicyComplianceCommand.java
similarity index 93%
rename from
core/src/main/java/org/apache/cloudstack/storage/command/CheckDataStoreStoragePolicyComplainceCommand.java
rename to
core/src/main/java/org/apache/cloudstack/storage/command/CheckDataStoreStoragePolicyComplianceCommand.java
index f9544b873ef..4544e98451f 100644
---
a/core/src/main/java/org/apache/cloudstack/storage/command/CheckDataStoreStoragePolicyComplainceCommand.java
+++
b/core/src/main/java/org/apache/cloudstack/storage/command/CheckDataStoreStoragePolicyComplianceCommand.java
@@ -21,12 +21,12 @@ package org.apache.cloudstack.storage.command;
import com.cloud.agent.api.to.StorageFilerTO;
-public class CheckDataStoreStoragePolicyComplainceCommand extends
StorageSubSystemCommand {
+public class CheckDataStoreStoragePolicyComplianceCommand extends
StorageSubSystemCommand {
String storagePolicyId;
private StorageFilerTO storagePool;
- public CheckDataStoreStoragePolicyComplainceCommand(String
storagePolicyId, StorageFilerTO storagePool) {
+ public CheckDataStoreStoragePolicyComplianceCommand(String
storagePolicyId, StorageFilerTO storagePool) {
super();
this.storagePolicyId = storagePolicyId;
diff --git
a/engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java
b/engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java
index 4b259760915..e0e244d53d3 100644
---
a/engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java
+++
b/engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java
@@ -378,7 +378,7 @@ public abstract class AbstractStoragePoolAllocator extends
AdapterBase implement
return false;
}
} catch (StorageUnavailableException e) {
- logger.warn(String.format("Could not verify storage policy
complaince against storage pool %s due to exception %s", pool.getUuid(),
e.getMessage()));
+ logger.warn(String.format("Could not verify storage policy
compliance against storage pool %s due to exception %s", pool.getUuid(),
e.getMessage()));
return false;
}
}
diff --git
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
index 3d95157d45c..6aa5b0c0931 100644
---
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
+++
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
@@ -62,7 +62,7 @@ import
org.apache.cloudstack.direct.download.DirectTemplateDownloader;
import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo;
import org.apache.cloudstack.storage.command.AttachAnswer;
import org.apache.cloudstack.storage.command.AttachCommand;
-import
org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplainceCommand;
+import
org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplianceCommand;
import org.apache.cloudstack.storage.command.CopyCmdAnswer;
import org.apache.cloudstack.storage.command.CopyCommand;
import org.apache.cloudstack.storage.command.CreateObjectAnswer;
@@ -3116,8 +3116,8 @@ public class KVMStorageProcessor implements
StorageProcessor {
}
@Override
- public Answer
checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplainceCommand
cmd) {
- logger.info("'CheckDataStoreStoragePolicyComplainceCommand' not
currently applicable for KVMStorageProcessor");
+ public Answer
checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplianceCommand
cmd) {
+ logger.info("'CheckDataStoreStoragePolicyComplianceCommand' not
currently applicable for KVMStorageProcessor");
return new Answer(cmd,false,"Not currently applicable for
KVMStorageProcessor");
}
diff --git
a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessor.java
b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessor.java
index d7c2c214f22..800df1db91f 100644
---
a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessor.java
+++
b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessor.java
@@ -24,7 +24,7 @@ import java.util.UUID;
import org.apache.cloudstack.agent.directdownload.DirectDownloadCommand;
import org.apache.cloudstack.storage.command.AttachAnswer;
import org.apache.cloudstack.storage.command.AttachCommand;
-import
org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplainceCommand;
+import
org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplianceCommand;
import org.apache.cloudstack.storage.command.CopyCmdAnswer;
import org.apache.cloudstack.storage.command.CopyCommand;
import org.apache.cloudstack.storage.command.CreateObjectAnswer;
@@ -830,8 +830,8 @@ public class Ovm3StorageProcessor implements
StorageProcessor {
}
@Override
- public Answer
checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplainceCommand
cmd) {
- logger.info("'CheckDataStoreStoragePolicyComplainceCommand' not
applicable used for Ovm3StorageProcessor");
+ public Answer
checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplianceCommand
cmd) {
+ logger.info("'CheckDataStoreStoragePolicyComplianceCommand' not
applicable used for Ovm3StorageProcessor");
return new Answer(cmd,false,"Not applicable used for
Ovm3StorageProcessor");
}
diff --git
a/plugins/hypervisors/simulator/src/main/java/com/cloud/resource/SimulatorStorageProcessor.java
b/plugins/hypervisors/simulator/src/main/java/com/cloud/resource/SimulatorStorageProcessor.java
index 5e0ee17bb8a..3614154f334 100644
---
a/plugins/hypervisors/simulator/src/main/java/com/cloud/resource/SimulatorStorageProcessor.java
+++
b/plugins/hypervisors/simulator/src/main/java/com/cloud/resource/SimulatorStorageProcessor.java
@@ -32,7 +32,7 @@ import org.apache.cloudstack.storage.command.CopyCmdAnswer;
import org.apache.cloudstack.storage.command.CopyCommand;
import org.apache.cloudstack.storage.command.CreateObjectAnswer;
import org.apache.cloudstack.storage.command.CreateObjectCommand;
-import
org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplainceCommand;
+import
org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplianceCommand;
import org.apache.cloudstack.storage.command.DeleteCommand;
import org.apache.cloudstack.storage.command.DettachAnswer;
import org.apache.cloudstack.storage.command.DettachCommand;
@@ -274,7 +274,7 @@ public class SimulatorStorageProcessor implements
StorageProcessor {
}
@Override
- public Answer
checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplainceCommand
cmd) {
+ public Answer
checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplianceCommand
cmd) {
return new Answer(cmd, true, null);
}
diff --git
a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
index 669381884c5..d58af62d5cc 100644
---
a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
+++
b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
@@ -60,7 +60,7 @@ import org.apache.cloudstack.framework.config.Configurable;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.framework.jobs.impl.AsyncJobManagerImpl;
import org.apache.cloudstack.management.ManagementServerHost;
-import
org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplainceCommand;
+import
org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplianceCommand;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.apache.cloudstack.utils.identity.ManagementServerNode;
@@ -1574,7 +1574,7 @@ public class VmwareManagerImpl extends ManagerBase
implements VmwareManager, Vmw
continue;
}
Collections.shuffle(hostIds);
- CheckDataStoreStoragePolicyComplainceCommand command = new
CheckDataStoreStoragePolicyComplainceCommand(storagePolicy.getPolicyId(),
storageFilerTO);
+ CheckDataStoreStoragePolicyComplianceCommand command = new
CheckDataStoreStoragePolicyComplianceCommand(storagePolicy.getPolicyId(),
storageFilerTO);
long targetHostId =
hypervisorGuruManager.getGuruProcessedCommandTargetHost(hostIds.get(0),
command);
try {
Answer answer = _agentMgr.send(targetHostId, command);
diff --git
a/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java
b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java
index e4fd5d24f43..af44d9d1476 100644
---
a/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java
+++
b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -37,7 +37,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.cloudstack.agent.directdownload.DirectDownloadCommand;
import org.apache.cloudstack.storage.command.AttachAnswer;
import org.apache.cloudstack.storage.command.AttachCommand;
-import
org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplainceCommand;
+import
org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplianceCommand;
import org.apache.cloudstack.storage.command.CopyCmdAnswer;
import org.apache.cloudstack.storage.command.CopyCommand;
import org.apache.cloudstack.storage.command.CreateObjectAnswer;
@@ -3776,7 +3776,7 @@ public class VmwareStorageProcessor implements
StorageProcessor {
}
@Override
- public Answer
checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplainceCommand
cmd) {
+ public Answer
checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplianceCommand
cmd) {
String primaryStorageNameLabel = cmd.getStoragePool().getUuid();
String storagePolicyId = cmd.getStoragePolicyId();
VmwareContext context = hostService.getServiceContext(cmd);
@@ -3792,14 +3792,14 @@ public class VmwareStorageProcessor implements
StorageProcessor {
DatastoreMO primaryDsMo = new DatastoreMO(hyperHost.getContext(),
morPrimaryDs);
boolean isDatastoreStoragePolicyComplaint =
primaryDsMo.isDatastoreStoragePolicyComplaint(storagePolicyId);
- String failedMessage = String.format("DataStore %s is not
complaince with storage policy id %s", primaryStorageNameLabel,
storagePolicyId);
+ String failedMessage = String.format("DataStore %s is not
compliance with storage policy id %s", primaryStorageNameLabel,
storagePolicyId);
if (!isDatastoreStoragePolicyComplaint)
return new Answer(cmd, isDatastoreStoragePolicyComplaint,
failedMessage);
else
return new Answer(cmd, isDatastoreStoragePolicyComplaint,
null);
} catch (Throwable e) {
hostService.createLogMessageException(e, cmd);
- String details = String.format("Exception while checking if
datastore [%s] is storage policy [%s] complaince due to: [%s]",
primaryStorageNameLabel, storagePolicyId, VmwareHelper.getExceptionMessage(e));
+ String details = String.format("Exception while checking if
datastore [%s] is storage policy [%s] compliance due to: [%s]",
primaryStorageNameLabel, storagePolicyId, VmwareHelper.getExceptionMessage(e));
return new Answer(cmd, false, details);
}
}
diff --git
a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
index a214131c47d..55cae3aaa0f 100644
---
a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
+++
b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
@@ -36,7 +36,7 @@ import java.util.UUID;
import org.apache.cloudstack.agent.directdownload.DirectDownloadCommand;
import org.apache.cloudstack.storage.command.AttachAnswer;
import org.apache.cloudstack.storage.command.AttachCommand;
-import
org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplainceCommand;
+import
org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplianceCommand;
import org.apache.cloudstack.storage.command.CopyCmdAnswer;
import org.apache.cloudstack.storage.command.CopyCommand;
import org.apache.cloudstack.storage.command.CreateObjectAnswer;
@@ -221,8 +221,8 @@ public class XenServerStorageProcessor implements
StorageProcessor {
}
@Override
- public Answer
checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplainceCommand
cmd) {
- logger.info("'CheckDataStoreStoragePolicyComplainceCommand' not
applicable used for XenServerStorageProcessor");
+ public Answer
checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplianceCommand
cmd) {
+ logger.info("'CheckDataStoreStoragePolicyComplianceCommand' not
applicable used for XenServerStorageProcessor");
return new Answer(cmd,false,"Not applicable used for
XenServerStorageProcessor");
}
diff --git
a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
index c7b288ef8c7..3ecbafc0926 100644
---
a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
+++
b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
@@ -27,7 +27,7 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
-import
org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplainceCommand;
+import
org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplianceCommand;
import org.apache.cloudstack.storage.command.CopyCmdAnswer;
import org.apache.cloudstack.storage.command.CopyCommand;
import org.apache.cloudstack.storage.command.SyncVolumePathCommand;
@@ -919,8 +919,8 @@ public class Xenserver625StorageProcessor extends
XenServerStorageProcessor {
}
@Override
- public Answer
checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplainceCommand
cmd) {
- logger.info("'CheckDataStoreStoragePolicyComplainceCommand' not
applicable used for XenServerStorageProcessor");
+ public Answer
checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplianceCommand
cmd) {
+ logger.info("'CheckDataStoreStoragePolicyComplianceCommand' not
applicable used for XenServerStorageProcessor");
return new Answer(cmd,false,"Not applicable used for
XenServerStorageProcessor");
}
diff --git
a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
index daaebb42a34..bb165e0529d 100644
--- a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -1538,12 +1538,12 @@ StateListener<State, VirtualMachine.Event,
VirtualMachine>, Configurable {
hostCanAccessPool = true;
if (potentialHost.getHypervisorType() ==
HypervisorType.VMware) {
try {
- boolean isStoragePoolStoragepolicyComplaince =
_storageMgr.isStoragePoolCompliantWithStoragePolicy(volumeDiskProfilePair,
storagePool);
- if (!isStoragePoolStoragepolicyComplaince) {
+ boolean isStoragePoolStoragepolicyCompliance =
_storageMgr.isStoragePoolCompliantWithStoragePolicy(volumeDiskProfilePair,
storagePool);
+ if (!isStoragePoolStoragepolicyCompliance) {
continue;
}
} catch (StorageUnavailableException e) {
- logger.warn("Could not verify storage policy
complaince against storage pool {} due to exception {}", storagePool,
e.getMessage());
+ logger.warn("Could not verify storage policy
compliance against storage pool {} due to exception {}", storagePool,
e.getMessage());
continue;
}
haveEnoughSpace = true;
@@ -1577,12 +1577,12 @@ StateListener<State, VirtualMachine.Event,
VirtualMachine>, Configurable {
List<Pair<Volume, DiskProfile>>
volumeDiskProfilePair = getVolumeDiskProfilePairs(requestVolumes);
if (potentialHost.getHypervisorType() ==
HypervisorType.VMware) {
try {
- boolean
isStoragePoolStoragepolicyComplaince =
_storageMgr.isStoragePoolCompliantWithStoragePolicy(volumeDiskProfilePair,
potentialSPool);
- if
(!isStoragePoolStoragepolicyComplaince) {
+ boolean
isStoragePoolStoragepolicyCompliance =
_storageMgr.isStoragePoolCompliantWithStoragePolicy(volumeDiskProfilePair,
potentialSPool);
+ if
(!isStoragePoolStoragepolicyCompliance) {
continue;
}
} catch (StorageUnavailableException e) {
- logger.warn("Could not verify storage
policy complaince against storage pool {} due to exception {}", potentialSPool,
e.getMessage());
+ logger.warn("Could not verify storage
policy compliance against storage pool {} due to exception {}", potentialSPool,
e.getMessage());
continue;
}
}
diff --git a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
index e1833397e99..cbeec1a60b3 100644
--- a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
@@ -122,7 +122,7 @@ import org.apache.cloudstack.secstorage.HeuristicVO;
import org.apache.cloudstack.secstorage.dao.SecondaryStorageHeuristicDao;
import org.apache.cloudstack.secstorage.heuristics.Heuristic;
import org.apache.cloudstack.secstorage.heuristics.HeuristicType;
-import
org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplainceCommand;
+import
org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplianceCommand;
import org.apache.cloudstack.storage.command.DettachCommand;
import org.apache.cloudstack.storage.command.SyncVolumePathAnswer;
import org.apache.cloudstack.storage.command.SyncVolumePathCommand;
@@ -3614,7 +3614,7 @@ public class StorageManagerImpl extends ManagerBase
implements StorageManager, C
}
try {
StorageFilerTO storageFilerTO = new StorageFilerTO(pool);
- CheckDataStoreStoragePolicyComplainceCommand cmd = new
CheckDataStoreStoragePolicyComplainceCommand(storagePolicyVO.getPolicyId(),
storageFilerTO);
+ CheckDataStoreStoragePolicyComplianceCommand cmd = new
CheckDataStoreStoragePolicyComplianceCommand(storagePolicyVO.getPolicyId(),
storageFilerTO);
long targetHostId =
_hvGuruMgr.getGuruProcessedCommandTargetHost(hostIds.get(0), cmd);
return _agentMgr.send(targetHostId, cmd);
} catch (AgentUnavailableException e) {
diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
index eaedaefdae7..f4536e8549f 100644
--- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
@@ -3507,8 +3507,8 @@ public class VolumeApiServiceImpl extends ManagerBase
implements VolumeApiServic
if (hypervisorType.equals(HypervisorType.VMware)) {
try {
- boolean isStoragePoolStoragepolicyComplaince =
storageMgr.isStoragePoolCompliantWithStoragePolicy(Arrays.asList(volumeDiskProfilePair),
destPool);
- if (!isStoragePoolStoragepolicyComplaince) {
+ boolean isStoragePoolStoragepolicyCompliance =
storageMgr.isStoragePoolCompliantWithStoragePolicy(Arrays.asList(volumeDiskProfilePair),
destPool);
+ if (!isStoragePoolStoragepolicyCompliance) {
throw new CloudRuntimeException(String.format("Storage
pool %s is not storage policy compliance with the volume %s", poolUuid,
vol.getUuid()));
}
} catch (StorageUnavailableException e) {
diff --git a/server/src/test/java/com/cloud/storage/StorageManagerImplTest.java
b/server/src/test/java/com/cloud/storage/StorageManagerImplTest.java
index 6eb8bd04f46..576c32c08ba 100644
--- a/server/src/test/java/com/cloud/storage/StorageManagerImplTest.java
+++ b/server/src/test/java/com/cloud/storage/StorageManagerImplTest.java
@@ -43,7 +43,7 @@ import org.apache.cloudstack.framework.config.ConfigDepot;
import org.apache.cloudstack.framework.config.ConfigKey;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.resourcedetail.dao.DiskOfferingDetailsDao;
-import
org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplainceCommand;
+import
org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplianceCommand;
import org.apache.cloudstack.storage.datastore.db.ObjectStoreDao;
import org.apache.cloudstack.storage.datastore.db.ObjectStoreVO;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
@@ -453,7 +453,7 @@ public class StorageManagerImplTest {
}
try {
Mockito.doReturn(new com.cloud.agent.api.Answer(
-
Mockito.mock(CheckDataStoreStoragePolicyComplainceCommand.class)))
+
Mockito.mock(CheckDataStoreStoragePolicyComplianceCommand.class)))
.when(storageManagerImpl).getCheckDatastorePolicyComplianceAnswer("policy",
pool);
assertTrue(storageManagerImpl.isStoragePoolCompliantWithStoragePolicy(1L,
pool));
} catch (StorageUnavailableException e) {
@@ -461,7 +461,7 @@ public class StorageManagerImplTest {
}
try {
com.cloud.agent.api.Answer answer =
- new
com.cloud.agent.api.Answer(Mockito.mock(CheckDataStoreStoragePolicyComplainceCommand.class),
+ new
com.cloud.agent.api.Answer(Mockito.mock(CheckDataStoreStoragePolicyComplianceCommand.class),
false, "");
Mockito.doReturn(answer)
.when(storageManagerImpl).getCheckDatastorePolicyComplianceAnswer("policy",
pool);
@@ -502,7 +502,7 @@ public class StorageManagerImplTest {
.thenReturn(policy);
Mockito.doReturn(new ArrayList<>(List.of(1L,
2L))).when(storageManagerImpl).getUpHostsInPool(Mockito.anyLong());
Mockito.when(hvGuruMgr.getGuruProcessedCommandTargetHost(Mockito.anyLong(),
-
Mockito.any(CheckDataStoreStoragePolicyComplainceCommand.class))).thenReturn(1L);
+
Mockito.any(CheckDataStoreStoragePolicyComplianceCommand.class))).thenReturn(1L);
try {
Mockito.when(agentManager.send(Mockito.anyLong(),
Mockito.any(Command.class)))
.thenThrow(AgentUnavailableException.class);
@@ -529,12 +529,12 @@ public class StorageManagerImplTest {
.thenReturn(policy);
Mockito.doReturn(new ArrayList<>(List.of(1L,
2L))).when(storageManagerImpl).getUpHostsInPool(Mockito.anyLong());
Mockito.when(hvGuruMgr.getGuruProcessedCommandTargetHost(Mockito.anyLong(),
-
Mockito.any(CheckDataStoreStoragePolicyComplainceCommand.class))).thenReturn(1L);
+
Mockito.any(CheckDataStoreStoragePolicyComplianceCommand.class))).thenReturn(1L);
try {
Mockito.when(agentManager.send(Mockito.anyLong(),
-
Mockito.any(CheckDataStoreStoragePolicyComplainceCommand.class)))
+
Mockito.any(CheckDataStoreStoragePolicyComplianceCommand.class)))
.thenReturn(new com.cloud.agent.api.Answer(
-
Mockito.mock(CheckDataStoreStoragePolicyComplainceCommand.class)));
+
Mockito.mock(CheckDataStoreStoragePolicyComplianceCommand.class)));
} catch (AgentUnavailableException | OperationTimedoutException e) {
Assert.fail(e.getMessage());
}
