diff --git a/api/src/main/java/com/cloud/configuration/ConfigurationService.java b/api/src/main/java/com/cloud/configuration/ConfigurationService.java index 97d4b42974b3..586daadb59b7 100644 --- a/api/src/main/java/com/cloud/configuration/ConfigurationService.java +++ b/api/src/main/java/com/cloud/configuration/ConfigurationService.java @@ -282,7 +282,7 @@ public interface ConfigurationService { /** * Deletes a zone from the database. Will not allow you to delete zones that are being used anywhere in the system. * - * @param cmd command object containg the zoneid + * @param cmd command object containing the zoneid */ boolean deleteZone(DeleteZoneCmd cmd); diff --git a/api/src/main/java/org/apache/cloudstack/acl/RoleType.java b/api/src/main/java/org/apache/cloudstack/acl/RoleType.java index ec82cd6605bb..15cad10e7ab9 100644 --- a/api/src/main/java/org/apache/cloudstack/acl/RoleType.java +++ b/api/src/main/java/org/apache/cloudstack/acl/RoleType.java @@ -102,12 +102,12 @@ public static Long getRoleByAccountType(final Long roleId, final Account.Type ac /** * This method returns the role account type if the role isn't null, else it returns the default account type. * */ - public static Account.Type getAccountTypeByRole(final Role role, final Account.Type defautAccountType) { + public static Account.Type getAccountTypeByRole(final Role role, final Account.Type defaultAccountType) { if (role != null) { - logger.debug(String.format("Role [%s] is not null; therefore, we use its account type [%s].", role, defautAccountType)); + logger.debug(String.format("Role [%s] is not null; therefore, we use its account type [%s].", role, defaultAccountType)); return role.getRoleType().getAccountType(); } - logger.debug(String.format("Role is null; therefore, we use the default account type [%s] value.", defautAccountType)); - return defautAccountType; + logger.debug(String.format("Role is null; therefore, we use the default account type [%s] value.", defaultAccountType)); + return defaultAccountType; } } diff --git a/api/src/main/java/org/apache/cloudstack/alert/AlertService.java b/api/src/main/java/org/apache/cloudstack/alert/AlertService.java index 5b29426e6eb9..50e48526d26c 100644 --- a/api/src/main/java/org/apache/cloudstack/alert/AlertService.java +++ b/api/src/main/java/org/apache/cloudstack/alert/AlertService.java @@ -52,7 +52,7 @@ private AlertType(short type, String name, boolean isDefault) { public static final AlertType ALERT_TYPE_ROUTING = new AlertType((short)11, "ALERT.NETWORK.ROUTING", true); public static final AlertType ALERT_TYPE_STORAGE_MISC = new AlertType((short)12, "ALERT.STORAGE.MISC", true); public static final AlertType ALERT_TYPE_USAGE_SERVER = new AlertType((short)13, "ALERT.USAGE", true); - public static final AlertType ALERT_TYPE_MANAGMENT_NODE = new AlertType((short)14, "ALERT.MANAGEMENT", true); + public static final AlertType ALERT_TYPE_MANAGEMENT_NODE = new AlertType((short)14, "ALERT.MANAGEMENT", true); public static final AlertType ALERT_TYPE_DOMAIN_ROUTER_MIGRATE = new AlertType((short)15, "ALERT.NETWORK.DOMAINROUTERMIGRATE", true); public static final AlertType ALERT_TYPE_CONSOLE_PROXY_MIGRATE = new AlertType((short)16, "ALERT.SERVICE.CONSOLEPROXYMIGRATE", true); public static final AlertType ALERT_TYPE_USERVM_MIGRATE = new AlertType((short)17, "ALERT.USERVM.MIGRATE", true); diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java index 6151b6f59453..afd1e1f6147c 100644 --- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java +++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java @@ -619,7 +619,7 @@ public class ApiConstants { public static final String SERVICE_NAME = "servicename"; public static final String DHCP_RANGE = "dhcprange"; public static final String UUID = "uuid"; - public static final String SECURITY_GROUP_EANBLED = "securitygroupenabled"; + public static final String SECURITY_GROUP_ENABLED = "securitygroupenabled"; public static final String LOCAL_STORAGE_ENABLED = "localstorageenabled"; public static final String GUEST_IP_TYPE = "guestiptype"; public static final String GUEST_IP6_PREFIX = "guestip6prefix"; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java index 02cdf1a0717c..7269c3f17e20 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java @@ -45,7 +45,7 @@ public class UpdateHypervisorCapabilitiesCmd extends BaseCmd { @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = HypervisorCapabilitiesResponse.class, description = "ID of the hypervisor capability") private Long id; - @Parameter(name = ApiConstants.SECURITY_GROUP_EANBLED, type = CommandType.BOOLEAN, description = "set true to enable security group for this hypervisor.") + @Parameter(name = ApiConstants.SECURITY_GROUP_ENABLED, type = CommandType.BOOLEAN, description = "set true to enable security group for this hypervisor.") private Boolean securityGroupEnabled; @Parameter(name = ApiConstants.MAX_GUESTS_LIMIT, type = CommandType.LONG, description = "the max number of Guest VMs per host for this hypervisor.") diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java index d947f6f06599..8f27b1612acf 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java @@ -79,7 +79,7 @@ public class CreateServiceOfferingCmd extends BaseCmd { @Parameter(name = ApiConstants.IS_VOLATILE, type = CommandType.BOOLEAN, - description = "true if the virtual machine needs to be volatile so that on every reboot of VM, original root disk is dettached then destroyed and a fresh root disk is created and attached to VM") + description = "true if the virtual machine needs to be volatile so that on every reboot of VM, original root disk is detached then destroyed and a fresh root disk is created and attached to VM") private Boolean isVolatile; @Parameter(name = ApiConstants.STORAGE_TYPE, type = CommandType.STRING, description = "the storage type of the service offering. Values are local and shared.") diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java index aca3e00d0957..858b25ef7932 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java @@ -81,7 +81,7 @@ public class CreateZoneCmd extends BaseCmd { @Parameter(name = ApiConstants.ALLOCATION_STATE, type = CommandType.STRING, description = "Allocation state of this Zone for allocation of new resources") private String allocationState; - @Parameter(name = ApiConstants.SECURITY_GROUP_EANBLED, type = CommandType.BOOLEAN, description = "true if network is security group enabled, false otherwise") + @Parameter(name = ApiConstants.SECURITY_GROUP_ENABLED, type = CommandType.BOOLEAN, description = "true if network is security group enabled, false otherwise") private Boolean securitygroupenabled; @Parameter(name = ApiConstants.LOCAL_STORAGE_ENABLED, type = CommandType.BOOLEAN, description = "true if local storage offering enabled, false otherwise") diff --git a/api/src/main/java/org/apache/cloudstack/api/response/AlertResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AlertResponse.java index faa64b0c0909..5c86e33e0779 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/AlertResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/AlertResponse.java @@ -39,7 +39,7 @@ public class AlertResponse extends BaseResponse { + "MEMORY = 0, CPU = 1, STORAGE = 2, STORAGE_ALLOCATED = 3, PUBLIC_IP = 4, PRIVATE_IP = 5, SECONDARY_STORAGE = 6, " + "HOST = 7, USERVM = 8, DOMAIN_ROUTER = 9, CONSOLE_PROXY = 10, " + "ROUTING = 11: lost connection to default route (to the gateway), " - + "STORAGE_MISC = 12, USAGE_SERVER = 13, MANAGMENT_NODE = 14, DOMAIN_ROUTER_MIGRATE = 15, CONSOLE_PROXY_MIGRATE = 16, " + + "STORAGE_MISC = 12, USAGE_SERVER = 13, MANAGEMENT_NODE = 14, DOMAIN_ROUTER_MIGRATE = 15, CONSOLE_PROXY_MIGRATE = 16, " + "USERVM_MIGRATE = 17, VLAN = 18, SSVM = 19, USAGE_SERVER_RESULT = 20, STORAGE_DELETE = 21, UPDATE_RESOURCE_COUNT = 22, " + "USAGE_SANITY_RESULT = 23, DIRECT_ATTACHED_PUBLIC_IP = 24, LOCAL_STORAGE = 25, RESOURCE_LIMIT_EXCEEDED = 26, " + "SYNC = 27, UPLOAD_FAILED = 28, OOBM_AUTH_ERROR = 29") diff --git a/api/src/main/java/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java index c19397e0c835..2660b7e9fa3b 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java @@ -42,7 +42,7 @@ public class HypervisorCapabilitiesResponse extends BaseResponse { @Param(description = "the maximum number of guest vms recommended for this hypervisor") private Long maxGuestsLimit; - @SerializedName(ApiConstants.SECURITY_GROUP_EANBLED) + @SerializedName(ApiConstants.SECURITY_GROUP_ENABLED) @Param(description = "true if security group is supported") private boolean isSecurityGroupEnabled; diff --git a/core/src/main/java/com/cloud/agent/api/AttachOrDettachConfigDriveCommand.java b/core/src/main/java/com/cloud/agent/api/AttachOrDetachConfigDriveCommand.java similarity index 89% rename from core/src/main/java/com/cloud/agent/api/AttachOrDettachConfigDriveCommand.java rename to core/src/main/java/com/cloud/agent/api/AttachOrDetachConfigDriveCommand.java index ebf5d0b746ff..5c712df903a0 100644 --- a/core/src/main/java/com/cloud/agent/api/AttachOrDettachConfigDriveCommand.java +++ b/core/src/main/java/com/cloud/agent/api/AttachOrDetachConfigDriveCommand.java @@ -21,14 +21,14 @@ import java.util.List; -public class AttachOrDettachConfigDriveCommand extends Command { +public class AttachOrDetachConfigDriveCommand extends Command { String vmName; List vmData; String configDriveLabel; boolean isAttach = false; - public AttachOrDettachConfigDriveCommand(String vmName, List vmData, String label, boolean attach) { + public AttachOrDetachConfigDriveCommand(String vmName, List vmData, String label, boolean attach) { this.vmName = vmName; this.vmData = vmData; this.configDriveLabel = label; 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 b7cd5b8eb5ee..fe7c821b0967 100644 --- a/core/src/main/java/com/cloud/storage/resource/StorageProcessor.java +++ b/core/src/main/java/com/cloud/storage/resource/StorageProcessor.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.storage.command.CopyCommand; import org.apache.cloudstack.storage.command.CreateObjectCommand; import org.apache.cloudstack.storage.command.DeleteCommand; -import org.apache.cloudstack.storage.command.DettachCommand; +import org.apache.cloudstack.storage.command.DetachCommand; import org.apache.cloudstack.storage.command.ForgetObjectCmd; import org.apache.cloudstack.storage.command.IntroduceObjectCmd; import org.apache.cloudstack.storage.command.ResignatureCommand; @@ -56,9 +56,9 @@ public interface StorageProcessor { public Answer attachVolume(AttachCommand cmd); - public Answer dettachIso(DettachCommand cmd); + public Answer detachIso(DetachCommand cmd); - public Answer dettachVolume(DettachCommand cmd); + public Answer detachVolume(DetachCommand cmd); public Answer createVolume(CreateObjectCommand 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 75d5f49d4c6c..9217c8b69256 100644 --- a/core/src/main/java/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java +++ b/core/src/main/java/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.storage.command.CreateObjectAnswer; import org.apache.cloudstack.storage.command.CreateObjectCommand; import org.apache.cloudstack.storage.command.DeleteCommand; -import org.apache.cloudstack.storage.command.DettachCommand; +import org.apache.cloudstack.storage.command.DetachCommand; import org.apache.cloudstack.storage.command.IntroduceObjectCmd; import org.apache.cloudstack.storage.command.QuerySnapshotZoneCopyAnswer; import org.apache.cloudstack.storage.command.QuerySnapshotZoneCopyCommand; @@ -68,8 +68,8 @@ public Answer handleStorageCommands(StorageSubSystemCommand command) { return execute((DeleteCommand)command); } else if (command instanceof AttachCommand) { return execute((AttachCommand)command); - } else if (command instanceof DettachCommand) { - return execute((DettachCommand)command); + } else if (command instanceof DetachCommand) { + return execute((DetachCommand)command); } else if (command instanceof IntroduceObjectCmd) { return processor.introduceObject((IntroduceObjectCmd)command); } else if (command instanceof SnapshotAndCopyCommand) { @@ -169,12 +169,12 @@ protected Answer execute(AttachCommand cmd) { } } - protected Answer execute(DettachCommand cmd) { + protected Answer execute(DetachCommand cmd) { DiskTO disk = cmd.getDisk(); if (disk.getType() == Volume.Type.ISO) { - return processor.dettachIso(cmd); + return processor.detachIso(cmd); } else { - return processor.dettachVolume(cmd); + return processor.detachVolume(cmd); } } diff --git a/core/src/main/java/org/apache/cloudstack/storage/command/DettachAnswer.java b/core/src/main/java/org/apache/cloudstack/storage/command/DetachAnswer.java similarity index 88% rename from core/src/main/java/org/apache/cloudstack/storage/command/DettachAnswer.java rename to core/src/main/java/org/apache/cloudstack/storage/command/DetachAnswer.java index a28f47cd95ca..21c5e430b358 100644 --- a/core/src/main/java/org/apache/cloudstack/storage/command/DettachAnswer.java +++ b/core/src/main/java/org/apache/cloudstack/storage/command/DetachAnswer.java @@ -22,19 +22,19 @@ import com.cloud.agent.api.Answer; import com.cloud.agent.api.to.DiskTO; -public final class DettachAnswer extends Answer { +public final class DetachAnswer extends Answer { private DiskTO disk; - public DettachAnswer() { + public DetachAnswer() { super(null); } - public DettachAnswer(DiskTO disk) { + public DetachAnswer(DiskTO disk) { super(null); setDisk(disk); } - public DettachAnswer(String errMsg) { + public DetachAnswer(String errMsg) { super(null, false, errMsg); } diff --git a/core/src/main/java/org/apache/cloudstack/storage/command/DettachCommand.java b/core/src/main/java/org/apache/cloudstack/storage/command/DetachCommand.java similarity index 92% rename from core/src/main/java/org/apache/cloudstack/storage/command/DettachCommand.java rename to core/src/main/java/org/apache/cloudstack/storage/command/DetachCommand.java index ff7e1f1f64ed..fe85e9dbd95b 100644 --- a/core/src/main/java/org/apache/cloudstack/storage/command/DettachCommand.java +++ b/core/src/main/java/org/apache/cloudstack/storage/command/DetachCommand.java @@ -23,7 +23,7 @@ import com.cloud.agent.api.to.DiskTO; -public class DettachCommand extends StorageSubSystemCommand { +public class DetachCommand extends StorageSubSystemCommand { private DiskTO disk; private String vmName; private boolean _managed; @@ -34,13 +34,13 @@ public class DettachCommand extends StorageSubSystemCommand { private boolean forced; private long waitDetachDevice; - public DettachCommand(final DiskTO disk, final String vmName) { + public DetachCommand(final DiskTO disk, final String vmName) { super(); this.disk = disk; this.vmName = vmName; } - public DettachCommand(final DiskTO disk, final String vmName, Map params) { + public DetachCommand(final DiskTO disk, final String vmName, Map params) { super(); this.disk = disk; this.vmName = vmName; diff --git a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java index b2eaaf7ea6e5..9922d1399755 100755 --- a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java @@ -94,7 +94,7 @@ import com.cloud.agent.api.AgentControlAnswer; import com.cloud.agent.api.AgentControlCommand; import com.cloud.agent.api.Answer; -import com.cloud.agent.api.AttachOrDettachConfigDriveCommand; +import com.cloud.agent.api.AttachOrDetachConfigDriveCommand; import com.cloud.agent.api.CheckVirtualMachineAnswer; import com.cloud.agent.api.CheckVirtualMachineCommand; import com.cloud.agent.api.ClusterVMMetaDataSyncAnswer; @@ -3223,12 +3223,12 @@ private void orchestrateMigrateWithStorage(final String vmUuid, final long srcHo profile.setConfigDriveIsoRootFolder(configDriveIsoRootFolder); profile.setConfigDriveIsoFile(isoFile); - AttachOrDettachConfigDriveCommand dettachCommand = new AttachOrDettachConfigDriveCommand(vm.getInstanceName(), vmData, VmConfigDriveLabel.value(), false); + AttachOrDetachConfigDriveCommand detachCommand = new AttachOrDetachConfigDriveCommand(vm.getInstanceName(), vmData, VmConfigDriveLabel.value(), false); try { - _agentMgr.send(srcHost.getId(), dettachCommand); + _agentMgr.send(srcHost.getId(), detachCommand); s_logger.debug("Deleted config drive ISO for vm " + vm.getInstanceName() + " In host " + srcHost); } catch (OperationTimedoutException e) { - s_logger.error("TIme out occurred while exeuting command AttachOrDettachConfigDrive " + e.getMessage(), e); + s_logger.error("TIme out occurred while exeuting command AttachOrDetachConfigDrive " + e.getMessage(), e); } } diff --git a/engine/schema/src/main/resources/META-INF/db/schema-421to430.sql b/engine/schema/src/main/resources/META-INF/db/schema-421to430.sql index 80d32dab3fb3..fdbca92a13ef 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-421to430.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-421to430.sql @@ -76,7 +76,7 @@ CREATE TABLE `cloud`.`async_job_journal` ( `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', `job_id` bigint unsigned NOT NULL, `journal_type` varchar(32), - `journal_text` varchar(1024) COMMENT 'journal descriptive informaton', + `journal_text` varchar(1024) COMMENT 'journal descriptive information', `journal_obj` varchar(1024) COMMENT 'journal strutural information, JSON encoded object', `created` datetime NOT NULL COMMENT 'date created', PRIMARY KEY (`id`), diff --git a/engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java b/engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java index a687ddfc4371..f5011e42bb1d 100644 --- a/engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java +++ b/engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java @@ -208,8 +208,8 @@ protected void runInContext() { public boolean start() { if (cacheReplacementEnabled) { Random generator = new Random(); - int initalDelay = generator.nextInt(cacheReplaceMentInterval); - executors.scheduleWithFixedDelay(new CacheReplacementRunner(), initalDelay, cacheReplaceMentInterval, TimeUnit.SECONDS); + int initialDelay = generator.nextInt(cacheReplaceMentInterval); + executors.scheduleWithFixedDelay(new CacheReplacementRunner(), initialDelay, cacheReplaceMentInterval, TimeUnit.SECONDS); } return true; } diff --git a/framework/db/src/main/java/com/cloud/utils/db/TransactionLegacy.java b/framework/db/src/main/java/com/cloud/utils/db/TransactionLegacy.java index df0df60f5194..15128b56f94f 100644 --- a/framework/db/src/main/java/com/cloud/utils/db/TransactionLegacy.java +++ b/framework/db/src/main/java/com/cloud/utils/db/TransactionLegacy.java @@ -583,7 +583,7 @@ public Connection getConnection() throws SQLException { // // MySQL default transaction isolation level is REPEATABLE READ, - // to reduce chances of DB deadlock, we will use READ COMMITED isolation level instead + // to reduce chances of DB deadlock, we will use READ COMMITTED isolation level instead // see http://dev.mysql.com/doc/refman/5.0/en/innodb-deadlocks.html // _stack.push(new StackElement(CREATE_CONN, null)); diff --git a/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java index fc7596a9dd66..e85fabf4ce82 100644 --- a/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java +++ b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java @@ -199,7 +199,7 @@ public BaremetalPxeVO addPxeServer(AddBaremetalPxeCmd cmd) { } String pingDir = pcmd.getPingDir(); if (pingDir == null) { - throw new IllegalArgumentException("No direcotry for storage server specified"); + throw new IllegalArgumentException("No directory for storage server specified"); } String tftpDir = pcmd.getTftpDir(); if (tftpDir == null) { diff --git a/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BareMetalResourceBase.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BareMetalResourceBase.java index 0cdd0f128224..7c3fba3b34b2 100644 --- a/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BareMetalResourceBase.java +++ b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BareMetalResourceBase.java @@ -313,7 +313,7 @@ protected boolean doScript(Script cmd, OutputInterpreter interpreter, int retry) } } - s_logger.warn("IPMI Scirpt failed due to " + res + "(" + cmd.toString() + ")"); + s_logger.warn("IPMI Script failed due to " + res + "(" + cmd.toString() + ")"); return false; } diff --git a/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalPingPxeResource.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalPingPxeResource.java index 416b3d0e3b3b..89807bf75358 100644 --- a/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalPingPxeResource.java +++ b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalPingPxeResource.java @@ -91,7 +91,7 @@ public boolean configure(String name, Map params) throws Configu String pingDirs[] = _pingDir.split("/"); if (pingDirs.length != 2) { - throw new ConfigurationException("PING dir should have format like myshare/direcotry, eg: windows/64bit"); + throw new ConfigurationException("PING dir should have format like myshare/directory, eg: windows/64bit"); } _share = pingDirs[0]; _dir = pingDirs[1]; diff --git a/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java index fdc64de25d71..d91c4276e275 100644 --- a/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java +++ b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java @@ -90,7 +90,7 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE response.setObjectName("baremetaldhcps"); this.setResponseObject(response); } catch (Exception e) { - s_logger.debug("Exception happend while executing ListBaremetalDhcpCmd"); + s_logger.debug("Exception happened while executing ListBaremetalDhcpCmd"); throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); } diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs index 306bc96f8c9a..8ad7719688aa 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs @@ -871,8 +871,8 @@ public class CloudStackTypes public const string CreateObjectAnswer = "org.apache.cloudstack.storage.command.CreateObjectAnswer"; public const string CreateObjectCommand = "org.apache.cloudstack.storage.command.CreateObjectCommand"; public const string DeleteCommand = "org.apache.cloudstack.storage.command.DeleteCommand"; - public const string DettachAnswer = "org.apache.cloudstack.storage.command.DettachAnswer"; - public const string DettachCommand = "org.apache.cloudstack.storage.command.DettachCommand"; + public const string DetachAnswer = "org.apache.cloudstack.storage.command.DetachAnswer"; + public const string DetachCommand = "org.apache.cloudstack.storage.command.DetachCommand"; public const string HostVmStateReportCommand = "org.apache.cloudstack.HostVmStateReportCommand"; } } diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs index 59397e8fba8e..63c0610c567a 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs @@ -270,12 +270,12 @@ public JContainer AttachCommand([FromBody]dynamic cmd) // POST api/HypervResource/DetachCommand [HttpPost] - [ActionName(CloudStackTypes.DettachCommand)] + [ActionName(CloudStackTypes.DetachCommand)] public JContainer DetachCommand([FromBody]dynamic cmd) { using (log4net.NDC.Push(Guid.NewGuid().ToString())) { - logger.Info(CloudStackTypes.DettachCommand + Utils.CleanString(cmd.ToString())); + logger.Info(CloudStackTypes.DetachCommand + Utils.CleanString(cmd.ToString())); string details = null; bool result = false; @@ -302,12 +302,12 @@ public JContainer DetachCommand([FromBody]dynamic cmd) } else { - details = "Invalid disk type to be dettached from vm " + vmName; + details = "Invalid disk type to be detached from vm " + vmName; } } catch (Exception sysEx) { - details = CloudStackTypes.DettachCommand + " failed due to " + sysEx.Message; + details = CloudStackTypes.DetachCommand + " failed due to " + sysEx.Message; logger.Error(details, sysEx); } @@ -318,7 +318,7 @@ public JContainer DetachCommand([FromBody]dynamic cmd) contextMap = contextMap }; - return ReturnCloudStackTypedJArray(ansContent, CloudStackTypes.DettachAnswer); + return ReturnCloudStackTypedJArray(ansContent, CloudStackTypes.DetachAnswer); } } @@ -1823,7 +1823,7 @@ private static bool VerifyChecksum(string destFile, string checksum) } /// - /// Match implmentation of DownloadManagerImpl.computeCheckSum + /// Match implementation of DownloadManagerImpl.computeCheckSum /// /// /// diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/Utils.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/Utils.cs index 1751f31af827..7183f43b42cf 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/Utils.cs +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/Utils.cs @@ -51,7 +51,7 @@ public static JObject CreateCloudStackObject(string objType, object objValue) } /// - /// serialize dictonary to map json type + /// serialize dictionary to map json type /// /// Object's data, can be an anonymous object, e.g. /// diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs index d385a8e67abb..7271becbfe1f 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs @@ -406,7 +406,7 @@ public ComputerSystem DeployVirtualMachine(dynamic jsonObj, string systemVmIso) } int tmp; if (vlan.Equals("untagged", StringComparison.CurrentCultureIgnoreCase) ) { - // recevied vlan is untagged, don't parse for the vlan in the isolation uri + // received vlan is untagged, don't parse for the vlan in the isolation uri vlan = null; } else if (!int.TryParse(vlan, out tmp)) @@ -529,7 +529,7 @@ private EthernetPortAllocationSettingData AttachNicToPort(ComputerSystem newVm, { // Get the virtual switch VirtualEthernetSwitch vSwitch = GetExternalVirtSwitch(vSwitchName); - //check the recevied vSwitch is the same as vSwitchName. + //check the received vSwitch is the same as vSwitchName. if (!vSwitchName.Equals("") && !vSwitch.ElementName.Equals(vSwitchName)) { var errMsg = string.Format("Internal error, coudl not find Virtual Switch with the name : " +vSwitchName); @@ -949,7 +949,7 @@ public void ModifyVmVLan(string vmName, String vlanid, String mac) if (vlanid.Equals("untagged", StringComparison.CurrentCultureIgnoreCase)) { - // recevied vlan is untagged, don't parse for the vlan in the isolation uri + // received vlan is untagged, don't parse for the vlan in the isolation uri vlanid = null; } @@ -1113,7 +1113,7 @@ public void ModifyVmVLan(string vmName, String vlanid, uint pos, bool enable, st if (vlanid.Equals("untagged", StringComparison.CurrentCultureIgnoreCase)) { - // recevied vlan is untagged, don't parse for the vlan in the isolation uri + // received vlan is untagged, don't parse for the vlan in the isolation uri vlanid = null; } diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/WmiWrappers/ROOT.virtualization.v2.Msvm_SummaryInformation.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/WmiWrappers/ROOT.virtualization.v2.Msvm_SummaryInformation.cs index a9523b79851c..0e23d3e8a1f6 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/WmiWrappers/ROOT.virtualization.v2.Msvm_SummaryInformation.cs +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/WmiWrappers/ROOT.virtualization.v2.Msvm_SummaryInformation.cs @@ -778,7 +778,7 @@ public bool IsSwapFilesInUseNull { [Browsable(true)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - [Description("Indecates if smart paging is active.")] + [Description("Indicates if smart paging is active.")] [TypeConverter(typeof(WMIValueTypeConverter))] public bool SwapFilesInUse { get { diff --git a/plugins/hypervisors/hyperv/src/test/java/com/cloud/hypervisor/hyperv/test/HypervDirectConnectResourceTest.java b/plugins/hypervisors/hyperv/src/test/java/com/cloud/hypervisor/hyperv/test/HypervDirectConnectResourceTest.java index bf069183cd92..9cd8a7c1340f 100644 --- a/plugins/hypervisors/hyperv/src/test/java/com/cloud/hypervisor/hyperv/test/HypervDirectConnectResourceTest.java +++ b/plugins/hypervisors/hyperv/src/test/java/com/cloud/hypervisor/hyperv/test/HypervDirectConnectResourceTest.java @@ -340,7 +340,7 @@ public final void testModifyStoragePoolCommand2() { } // Use same spec for pool - s_logger.info("Createing pool at : " + folderName); + s_logger.info("Creating pool at : " + folderName); StoragePoolVO pool = new StoragePoolVO(StoragePoolType.Filesystem, "127.0.0.1", -1, folderName); pool.setUuid(s_testLocalStoreUUID); @@ -363,7 +363,7 @@ public final StoragePoolVO createTestStoragePoolVO(final String folderName) { } // Use same spec for pool - s_logger.info("Createing pool at : " + folderName); + s_logger.info("Creating pool at : " + folderName); StoragePoolVO pool = new StoragePoolVO(StoragePoolType.Filesystem, "127.0.0.1", -1, folderName); return pool; diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java index d31a6ab38dbe..182d4d1f5764 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java @@ -610,7 +610,7 @@ public String toString() { } public enum DiskType { - FILE("file"), BLOCK("block"), DIRECTROY("dir"), NETWORK("network"); + FILE("file"), BLOCK("block"), DIRECTORY("dir"), NETWORK("network"); String _diskType; DiskType(String type) { diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtFreezeThawVMCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtFreezeThawVMCommandWrapper.java index 808d3a20bfbe..63970989cb5a 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtFreezeThawVMCommandWrapper.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtFreezeThawVMCommandWrapper.java @@ -83,7 +83,7 @@ public Answer execute(FreezeThawVMCommand command, LibvirtComputingResource serv try { domain.free(); } catch (LibvirtException e) { - s_logger.trace("Ingore error ", e); + s_logger.trace("Ignore error ", e); } } } diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/IscsiStorageCleanupMonitor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/IscsiStorageCleanupMonitor.java index da2be68d0b75..cb4293f0816e 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/IscsiStorageCleanupMonitor.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/IscsiStorageCleanupMonitor.java @@ -130,7 +130,7 @@ private void updateDiskStatusMapWithInactiveIscsiSessions(Connect conn){ /** * When the state is false, the iscsi sessions are stale. They may be * removed. We go through each volume which is false, check iscsiadm, - * if the volume still exisits, logout of that volume and remove it from the map + * if the volume still exists, logout of that volume and remove it from the map * XXX: It is possible that someone had manually added an iSCSI volume. * we would not be able to detect that 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 dd31025d35fd..a6d6530c6166 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 @@ -54,8 +54,8 @@ import org.apache.cloudstack.storage.command.CreateObjectAnswer; import org.apache.cloudstack.storage.command.CreateObjectCommand; import org.apache.cloudstack.storage.command.DeleteCommand; -import org.apache.cloudstack.storage.command.DettachAnswer; -import org.apache.cloudstack.storage.command.DettachCommand; +import org.apache.cloudstack.storage.command.DetachAnswer; +import org.apache.cloudstack.storage.command.DetachCommand; import org.apache.cloudstack.storage.command.ForgetObjectCmd; import org.apache.cloudstack.storage.command.IntroduceObjectCmd; import org.apache.cloudstack.storage.command.ResignatureAnswer; @@ -1130,7 +1130,7 @@ public Answer attachIso(final AttachCommand cmd) { } @Override - public Answer dettachIso(final DettachCommand cmd) { + public Answer detachIso(final DetachCommand cmd) { final DiskTO disk = cmd.getDisk(); final TemplateObjectTO isoTO = (TemplateObjectTO)disk.getData(); final DataStoreTO store = isoTO.getDataStore(); @@ -1529,7 +1529,7 @@ public Answer attachVolume(final AttachCommand cmd) { } @Override - public Answer dettachVolume(final DettachCommand cmd) { + public Answer detachVolume(final DetachCommand cmd) { final DiskTO disk = cmd.getDisk(); final VolumeObjectTO vol = (VolumeObjectTO)disk.getData(); final PrimaryDataStoreTO primaryStore = (PrimaryDataStoreTO)vol.getDataStore(); @@ -1550,16 +1550,16 @@ public Answer dettachVolume(final DettachCommand cmd) { storagePoolMgr.disconnectPhysicalDisk(primaryStore.getPoolType(), primaryStore.getUuid(), vol.getPath()); - return new DettachAnswer(disk); + return new DetachAnswer(disk); } catch (final LibvirtException e) { s_logger.debug("Failed to detach volume: " + vol.getPath() + ", due to ", e); - return new DettachAnswer(e.toString()); + return new DetachAnswer(e.toString()); } catch (final InternalErrorException e) { s_logger.debug("Failed to detach volume: " + vol.getPath() + ", due to ", e); - return new DettachAnswer(e.toString()); + return new DetachAnswer(e.toString()); } catch (final CloudRuntimeException e) { s_logger.debug("Failed to detach volume: " + vol.getPath() + ", due to ", e); - return new DettachAnswer(e.toString()); + return new DetachAnswer(e.toString()); } finally { vol.clearPassphrase(); } diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageResource.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageResource.java index d83528f57701..eabd8507f2ce 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageResource.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageResource.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.storage.command.CreateObjectCommand; import org.apache.cloudstack.storage.command.CreatePrimaryDataStoreCmd; import org.apache.cloudstack.storage.command.DeleteCommand; -import org.apache.cloudstack.storage.command.DettachCommand; +import org.apache.cloudstack.storage.command.DetachCommand; import org.apache.cloudstack.storage.command.StorageSubSystemCommand; import com.cloud.agent.api.Answer; @@ -51,8 +51,8 @@ public Answer handleStorageCommands(StorageSubSystemCommand command) { return execute((DeleteCommand)command); } else if (command instanceof AttachCommand) { return execute((AttachCommand)command); - } else if (command instanceof DettachCommand) { - return execute((DettachCommand)command); + } else if (command instanceof DetachCommand) { + return execute((DetachCommand)command); } return new Answer((Command)command, false, "not implemented yet"); } @@ -81,7 +81,7 @@ protected Answer execute(AttachCommand cmd) { return new Answer(cmd, false, "not implemented yet"); } - protected Answer execute(DettachCommand cmd) { + protected Answer execute(DetachCommand cmd) { return new Answer(cmd, false, "not implemented yet"); } diff --git a/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/hypervisor/OvmResourceBase.java b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/hypervisor/OvmResourceBase.java index cf2f1fbed64d..833ea1af7096 100644 --- a/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/hypervisor/OvmResourceBase.java +++ b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/hypervisor/OvmResourceBase.java @@ -1056,7 +1056,7 @@ protected CreatePrivateTemplateAnswer execute(final CreatePrivateTemplateFromVol Long templateId = cmd.getTemplateId(); int wait = cmd.getWait(); if (wait == 0) { - /* Defaut timeout 2 hours */ + /* Default timeout 2 hours */ wait = 7200; } diff --git a/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmSecurityGroupModule.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmSecurityGroupModule.py index c7c83cb87bc3..4faec823a175 100755 --- a/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmSecurityGroupModule.py +++ b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmSecurityGroupModule.py @@ -329,7 +329,7 @@ def delete_all_network_rules_for_vm(vm_name, vif = None): try: execute("iptables -t nat " + dnat) except: - logging.debug("Igoring failure to delete dnat: " + dnat) + logging.debug("Ignoring failure to delete dnat: " + dnat) except: pass diff --git a/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmVmModule.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmVmModule.py index e713f623edb1..cbf521e702cc 100755 --- a/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmVmModule.py +++ b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmVmModule.py @@ -425,7 +425,7 @@ def getVcpuNumAndUtils(): xmInfo = successToMap(xen_get_xm_info()) nCpus = int(xmInfo['nr_cpus']) totalUtils = 0.0 - # CPU utlization of VM = (total cpu utilization of each vcpu) / number of physical cpu + # CPU utilization of VM = (total cpu utilization of each vcpu) / number of physical cpu for num, util in items: totalUtils += float(util) avgUtils = float(totalUtils/nCpus) * 100 diff --git a/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/configureOvm.sh b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/configureOvm.sh index 2cc3a0c9f260..756a4cea2b0c 100755 --- a/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/configureOvm.sh +++ b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/configureOvm.sh @@ -69,7 +69,7 @@ applyPatch() { else rm $tmp -f popd &>/dev/null - errExit "Can not apply $patchFile beacuse $test" + errExit "Can not apply $patchFile because $test" fi fi patch -p$level < $patchFile diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/StoragePlugin.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/StoragePlugin.java index 5bfacd275a7f..d7af12592e11 100644 --- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/StoragePlugin.java +++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/StoragePlugin.java @@ -711,7 +711,7 @@ public FileProperties storagePluginGetFileInfo(String poolUuid, String host, * Should do some input checking of ss and base * storage_plugin_getFileSystemInfo, * argument: impl_name - - * default: None requires a minumum of uuid, access_host, storage_type + * default: None requires a minimum of uuid, access_host, storage_type * ss_uuid, access_path, uuid (the ss */ public StorageDetails storagePluginGetFileSystemInfo(String propUuid, 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 f30df5d74443..dcd00b5229c8 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 @@ -30,7 +30,7 @@ import org.apache.cloudstack.storage.command.CreateObjectAnswer; import org.apache.cloudstack.storage.command.CreateObjectCommand; import org.apache.cloudstack.storage.command.DeleteCommand; -import org.apache.cloudstack.storage.command.DettachCommand; +import org.apache.cloudstack.storage.command.DetachCommand; import org.apache.cloudstack.storage.command.ForgetObjectCmd; import org.apache.cloudstack.storage.command.IntroduceObjectCmd; import org.apache.cloudstack.storage.command.ResignatureAnswer; @@ -413,8 +413,8 @@ public AttachAnswer attachIso(AttachCommand cmd) { * Detach an iso */ @Override - public AttachAnswer dettachIso(DettachCommand cmd) { - LOGGER.debug("execute dettachIso: "+ cmd.getClass()); + public AttachAnswer detachIso(DetachCommand cmd) { + LOGGER.debug("execute detachIso: "+ cmd.getClass()); String vmName = cmd.getVmName(); DiskTO disk = cmd.getDisk(); return attachDetach(cmd, vmName, disk, false); @@ -469,7 +469,7 @@ public String getVirtualDiskPath(DiskTO disk, String storeUuid) throws Ovm3Resou private AttachAnswer attachDetach(Command cmd, String vmName, DiskTO disk, boolean isAttach) { Xen xen = new Xen(c); - String doThis = (isAttach) ? "Attach" : "Dettach"; + String doThis = (isAttach) ? "Attach" : "Detach"; LOGGER.debug(doThis + " volume type " + disk.getType() + " " + vmName); String msg = ""; String path = ""; @@ -528,8 +528,8 @@ public AttachAnswer attachVolume(AttachCommand cmd) { * Detach a volume */ @Override - public AttachAnswer dettachVolume(DettachCommand cmd) { - LOGGER.debug("execute dettachVolume: "+ cmd.getClass()); + public AttachAnswer detachVolume(DetachCommand cmd) { + LOGGER.debug("execute detachVolume: "+ cmd.getClass()); String vmName = cmd.getVmName(); DiskTO disk = cmd.getDisk(); return attachDetach(cmd, vmName, disk, false); @@ -704,7 +704,7 @@ public CreatePrivateTemplateAnswer execute( Long templateId = cmd.getTemplateId(); int wait = cmd.getWait(); if (wait == 0) { - /* Defaut timeout 2 hours */ + /* Default timeout 2 hours */ wait = 7200; } @@ -862,7 +862,7 @@ public Answer execute(AttachCommand cmd) { * @param cmd * @return */ - public Answer execute(DettachCommand cmd) { + public Answer execute(DetachCommand cmd) { LOGGER.debug("execute: "+ cmd.getClass()); String vmName = cmd.getVmName(); DiskTO disk = cmd.getDisk(); diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3HypervisorNetwork.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3HypervisorNetwork.java index 387e8bdf1547..6883e77b8732 100644 --- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3HypervisorNetwork.java +++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3HypervisorNetwork.java @@ -106,7 +106,7 @@ private boolean isNetworkSetupByName(String nameTag) { return true; } } catch (Ovm3ResourceException e) { - LOGGER.debug("Unxpected error looking for name: " + nameTag, e); + LOGGER.debug("Unexpected error looking for name: " + nameTag, e); return false; } } diff --git a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessorTest.java b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessorTest.java index a64a09e05e03..73e611a46a17 100644 --- a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessorTest.java +++ b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessorTest.java @@ -307,7 +307,7 @@ public void createSnapshotObjectCommandTest() throws ConfigurationException { * } */ @Test - public void isoDettachTest() throws ConfigurationException { + public void isoDetachTest() throws ConfigurationException { con = prepare(); } diff --git a/plugins/hypervisors/ovm3/src/test/resources/scripts/repo_pool.py b/plugins/hypervisors/ovm3/src/test/resources/scripts/repo_pool.py index f9a47dbf68c0..5a6d8c67ff64 100755 --- a/plugins/hypervisors/ovm3/src/test/resources/scripts/repo_pool.py +++ b/plugins/hypervisors/ovm3/src/test/resources/scripts/repo_pool.py @@ -177,7 +177,7 @@ def is_it_up(host, port): # add member to ip list ? poolMembers.append(ip) - print "mambers for pool: %s" % poolMembers + print "members for pool: %s" % poolMembers print xserver.set_pool_member_ip_list(poolMembers) print server.discover_server_pool() diff --git a/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockStorageManagerImpl.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockStorageManagerImpl.java index 27b4a716af1b..66944af577d1 100644 --- a/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockStorageManagerImpl.java +++ b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockStorageManagerImpl.java @@ -1093,7 +1093,7 @@ public Answer ComputeChecksum(ComputeChecksumCommand cmd) { MessageDigest md = MessageDigest.getInstance("md5"); md5 = String.format("%032x", new BigInteger(1, md.digest(cmd.getTemplatePath().getBytes()))); } catch (NoSuchAlgorithmException e) { - s_logger.debug("failed to gernerate md5:" + e.toString()); + s_logger.debug("failed to generate md5:" + e.toString()); } txn.commit(); return new Answer(cmd, true, md5); 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 8c8815cc08ac..8293f4046386 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 @@ -33,8 +33,8 @@ import org.apache.cloudstack.storage.command.CreateObjectCommand; import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplainceCommand; import org.apache.cloudstack.storage.command.DeleteCommand; -import org.apache.cloudstack.storage.command.DettachAnswer; -import org.apache.cloudstack.storage.command.DettachCommand; +import org.apache.cloudstack.storage.command.DetachAnswer; +import org.apache.cloudstack.storage.command.DetachCommand; import org.apache.cloudstack.storage.command.ForgetObjectCmd; import org.apache.cloudstack.storage.command.IntroduceObjectCmd; import org.apache.cloudstack.storage.command.ResignatureAnswer; @@ -201,7 +201,7 @@ public Answer attachVolume(AttachCommand cmd) { } @Override - public Answer dettachIso(DettachCommand cmd) { + public Answer detachIso(DetachCommand cmd) { DiskTO disk = cmd.getDisk(); TemplateObjectTO isoTO = (TemplateObjectTO)disk.getData(); DataStoreTO store = isoTO.getDataStore(); @@ -212,9 +212,9 @@ public Answer dettachIso(DettachCommand cmd) { } @Override - public Answer dettachVolume(DettachCommand cmd) { + public Answer detachVolume(DetachCommand cmd) { DiskTO disk = cmd.getDisk(); - return new DettachAnswer(disk); + return new DetachAnswer(disk); } @Override 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 b5f4cf3a93f0..9e81afc56461 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 @@ -1397,7 +1397,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) { // Reset custom field property cloud.zone over this DC dcMo.setCustomFieldValue(CustomFieldConstants.CLOUD_ZONE, "false"); - s_logger.info("Sucessfully reset custom field property cloud.zone over DC " + vmwareDcName); + s_logger.info("Successfully reset custom field property cloud.zone over DC " + vmwareDcName); } catch (Exception e) { String msg = "Unable to reset custom field property cloud.zone over DC " + vmwareDcName + " due to : " + VmwareHelper.getExceptionMessage(e); s_logger.error(msg); diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java index 3e14c0eb975e..e0212de47ea6 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -3046,7 +3046,7 @@ protected List copyVAppConfigProductSectionFromOVF(VmConfigInfo /** * Set the vApp configuration to vmConfig spec, copying existing configuration from vAppConfig - * and seting properties values from ovfProperties + * and setting properties values from ovfProperties */ protected void setVAppPropertiesToConfigSpec(VmConfigInfo vAppConfig, Map ovfProperties, @@ -4928,7 +4928,7 @@ private Answer migrateVolume(MigrateVolumeCommand cmd) { try { // OfflineVmwareMigration: worker *may* have been renamed vmName = vmMo.getVmName(); - s_logger.info("Dettaching disks before destroying worker VM '" + vmName + "' after volume migration"); + s_logger.info("Detaching disks before destroying worker VM '" + vmName + "' after volume migration"); VirtualDisk[] disks = vmMo.getAllDiskDevice(); String format = "disk %d was migrated to %s"; for (VirtualDisk disk : disks) { 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 2cf1663e6777..c742ea7d01dc 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 @@ -43,7 +43,7 @@ import org.apache.cloudstack.storage.command.CreateObjectAnswer; import org.apache.cloudstack.storage.command.CreateObjectCommand; import org.apache.cloudstack.storage.command.DeleteCommand; -import org.apache.cloudstack.storage.command.DettachCommand; +import org.apache.cloudstack.storage.command.DetachCommand; import org.apache.cloudstack.storage.command.ForgetObjectCmd; import org.apache.cloudstack.storage.command.IntroduceObjectCmd; import org.apache.cloudstack.storage.command.ResignatureAnswer; @@ -1748,7 +1748,7 @@ public Answer createTemplateFromSnapshot(CopyCommand cmd) { } } - // return Pair + // return Pair private Pair exportVolumeToSecondaryStorage(VmwareContext context, VirtualMachineMO vmMo, VmwareHypervisorHost hyperHost, String volumePath, String secStorageUrl, String secStorageDir, String exportName, String workerVmName, String nfsVersion, boolean clonedWorkerVMNeeded) throws Exception { @@ -2399,12 +2399,12 @@ private Answer attachIso(DiskTO disk, boolean isAttach, String vmName, boolean f } @Override - public Answer dettachIso(DettachCommand cmd) { + public Answer detachIso(DetachCommand cmd) { return this.attachIso(cmd.getDisk(), false, cmd.getVmName(), cmd.isForced()); } @Override - public Answer dettachVolume(DettachCommand cmd) { + public Answer detachVolume(DetachCommand cmd) { return this.attachVolume(cmd, cmd.getDisk(), false, cmd.isManaged(), cmd.getVmName(), cmd.get_iScsiName(), cmd.getStorageHost(), cmd.getStoragePort(), null); } diff --git a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/XenServerGuru.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/XenServerGuru.java index 9de6ba8ab4f7..b972a29b2565 100644 --- a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/XenServerGuru.java +++ b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/XenServerGuru.java @@ -28,7 +28,7 @@ import org.apache.cloudstack.hypervisor.xenserver.XenserverConfigs; import org.apache.cloudstack.resourcedetail.dao.GuestOsDetailsDao; import org.apache.cloudstack.storage.command.CopyCommand; -import org.apache.cloudstack.storage.command.DettachCommand; +import org.apache.cloudstack.storage.command.DetachCommand; import org.apache.cloudstack.storage.command.StorageSubSystemCommand; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; @@ -148,7 +148,7 @@ public List finalizeExpungeVolumes(VirtualMachine vm) { DataTO volTO = volFactory.getVolume(volume.getId()).getTO(); DiskTO disk = new DiskTO(volTO, volume.getDeviceId(), volume.getPath(), volume.getVolumeType()); - DettachCommand cmd = new DettachCommand(disk, vm.getInstanceName()); + DetachCommand cmd = new DetachCommand(disk, vm.getInstanceName()); cmd.setManaged(true); diff --git a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java index 90473705a53e..15d1e99e9422 100644 --- a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java +++ b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java @@ -1317,7 +1317,7 @@ public VM createVmFromTemplate(final Connection conn, final VirtualMachineTO vmS vmr.otherConfig.put("vm_uuid", vmSpec.getUuid()); vmr.VCPUsMax = (long)vmSpec.getCpus(); // FIX ME: In case of dynamic // scaling this VCPU max should - // be the minumum of + // be the minimum of // recommended value for that template and capacity remaining on host long recommendedMemoryMin = 0l; @@ -5577,7 +5577,7 @@ public SR createLocalIsoSR(final Connection conn, final String srName) throws Xe SR sr = getSRByNameLabelandHost(conn, srName); if (sr != null) { - s_logger.debug("Config drive SR already exist, returing it"); + s_logger.debug("Config drive SR already exist, returning it"); return sr; } 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 cb226ed7d9bf..f1b6e9021744 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 @@ -41,8 +41,8 @@ import org.apache.cloudstack.storage.command.CreateObjectAnswer; import org.apache.cloudstack.storage.command.CreateObjectCommand; import org.apache.cloudstack.storage.command.DeleteCommand; -import org.apache.cloudstack.storage.command.DettachAnswer; -import org.apache.cloudstack.storage.command.DettachCommand; +import org.apache.cloudstack.storage.command.DetachAnswer; +import org.apache.cloudstack.storage.command.DetachCommand; import org.apache.cloudstack.storage.command.ForgetObjectCmd; import org.apache.cloudstack.storage.command.IntroduceObjectAnswer; import org.apache.cloudstack.storage.command.IntroduceObjectCmd; @@ -384,7 +384,7 @@ public AttachAnswer attachVolume(final AttachCommand cmd) { } @Override - public Answer dettachIso(final DettachCommand cmd) { + public Answer detachIso(final DetachCommand cmd) { final DiskTO disk = cmd.getDisk(); final DataTO data = disk.getData(); final DataStoreTO store = data.getDataStore(); @@ -435,20 +435,20 @@ public Answer dettachIso(final DettachCommand cmd) { hypervisorResource.removeSR(conn, sr); } - return new DettachAnswer(disk); + return new DetachAnswer(disk); } catch (final XenAPIException e) { final String msg = "Failed to detach volume" + " for uuid: " + data.getPath() + " due to " + e.toString(); s_logger.warn(msg, e); - return new DettachAnswer(msg); + return new DetachAnswer(msg); } catch (final Exception e) { final String msg = "Failed to detach volume" + " for uuid: " + data.getPath() + " due to " + e.getMessage(); s_logger.warn(msg, e); - return new DettachAnswer(msg); + return new DetachAnswer(msg); } } @Override - public Answer dettachVolume(final DettachCommand cmd) { + public Answer detachVolume(final DetachCommand cmd) { final DiskTO disk = cmd.getDisk(); final DataTO data = disk.getData(); @@ -472,7 +472,7 @@ public Answer dettachVolume(final DettachCommand cmd) { // if the VM is not running and we're not dealing with managed storage, just return success (nothing to do here) // this should probably never actually happen if (vmNotRunning && !cmd.isManaged()) { - return new DettachAnswer(disk); + return new DetachAnswer(disk); } if (!vmNotRunning) { @@ -499,10 +499,10 @@ public Answer dettachVolume(final DettachCommand cmd) { hypervisorResource.handleSrAndVdiDetach(cmd.get_iScsiName(), conn); } - return new DettachAnswer(disk); + return new DetachAnswer(disk); } catch (final Exception e) { - s_logger.warn("Failed dettach volume: " + data.getPath()); - return new DettachAnswer("Failed dettach volume: " + data.getPath() + ", due to " + e.toString()); + s_logger.warn("Failed detach volume: " + data.getPath()); + return new DetachAnswer("Failed detach volume: " + data.getPath() + ", due to " + e.toString()); } } diff --git a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixAttachOrDettachConfigDriveCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixAttachOrDetachConfigDriveCommandWrapper.java similarity index 86% rename from plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixAttachOrDettachConfigDriveCommandWrapper.java rename to plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixAttachOrDetachConfigDriveCommandWrapper.java index 08da7ae07cce..d1682ec449de 100644 --- a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixAttachOrDettachConfigDriveCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixAttachOrDetachConfigDriveCommandWrapper.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Set; -import com.cloud.agent.api.AttachOrDettachConfigDriveCommand; +import com.cloud.agent.api.AttachOrDetachConfigDriveCommand; import com.cloud.resource.ResourceWrapper; import com.xensource.xenapi.Connection; import com.xensource.xenapi.VBD; @@ -36,13 +36,13 @@ import com.cloud.resource.CommandWrapper; import org.apache.xmlrpc.XmlRpcException; -@ResourceWrapper(handles = AttachOrDettachConfigDriveCommand.class) -public final class CitrixAttachOrDettachConfigDriveCommandWrapper extends CommandWrapper { +@ResourceWrapper(handles = AttachOrDetachConfigDriveCommand.class) +public final class CitrixAttachOrDetachConfigDriveCommandWrapper extends CommandWrapper { - private static final Logger s_logger = Logger.getLogger(CitrixAttachOrDettachConfigDriveCommandWrapper.class); + private static final Logger s_logger = Logger.getLogger(CitrixAttachOrDetachConfigDriveCommandWrapper.class); @Override - public Answer execute(final AttachOrDettachConfigDriveCommand command, final CitrixResourceBase citrixResourceBase) { + public Answer execute(final AttachOrDetachConfigDriveCommand command, final CitrixResourceBase citrixResourceBase) { final Connection conn = citrixResourceBase.getConnection(); String vmName = command.getVmName(); @@ -79,7 +79,7 @@ public Answer execute(final AttachOrDettachConfigDriveCommand command, final Cit vdi.destroy(conn); } - s_logger.debug("Successfully dettached config drive iso from the VM " + vmName); + s_logger.debug("Successfully detached config drive iso from the VM " + vmName); } } }catch (Types.XenAPIException ex) { diff --git a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStartCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStartCommandWrapper.java index ad76b7f4541a..409a0ad9c676 100644 --- a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStartCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStartCommandWrapper.java @@ -78,7 +78,7 @@ public Answer execute(final StartCommand command, final CitrixResourceBase citri v.destroy(conn); } else if (vRec.powerState == VmPowerState.RUNNING) { final String host = vRec.residentOn.getUuid(conn); - final String msg = "VM " + vmName + " is runing on host " + host; + final String msg = "VM " + vmName + " is running on host " + host; s_logger.debug(msg); return new StartAnswer(command, msg, host); } else { diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java index 726aadff4d06..bfd97b4a39cf 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java +++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java @@ -186,7 +186,7 @@ private String getKubernetesNodeConfig(final String joinIp, final boolean ejectI } protected String updateKubeConfigWithRegistryDetails(String k8sConfig) { - /* genarate /etc/containerd/config.toml file on the nodes only if Kubernetes cluster is created to + /* generate /etc/containerd/config.toml file on the nodes only if Kubernetes cluster is created to * use docker private registry */ String registryUsername = null; String registryPassword = null; diff --git a/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbelement/InternalLbElementServiceTest.java b/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbelement/InternalLbElementServiceTest.java index 7bb4db1bb80f..f9d3d3d3a226 100644 --- a/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbelement/InternalLbElementServiceTest.java +++ b/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbelement/InternalLbElementServiceTest.java @@ -150,7 +150,7 @@ public void enableProvider() { provider = _lbElSvc.configureInternalLoadBalancerElement(validElId, true); } finally { assertNotNull("Test failed. Couldn't find the VR provider by the valid id ", provider); - assertTrue("Test failed. The provider wasn't eanbled ", provider.isEnabled()); + assertTrue("Test failed. The provider wasn't enabled ", provider.isEnabled()); } } diff --git a/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/model/VirtualMachineModelTest.java b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/model/VirtualMachineModelTest.java index dec4a409aea3..54d47f770660 100644 --- a/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/model/VirtualMachineModelTest.java +++ b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/model/VirtualMachineModelTest.java @@ -60,7 +60,7 @@ public void testVirtualMachineDBLookup() { VirtualMachineModel vm2 = new VirtualMachineModel(vm, "fbc1f8fa-4b78-45ee-bba0-b551dbf94575"); db.getVirtualMachines().add(vm2); - s_logger.debug("No of Vitual Machines added to database : " + db.getVirtualMachines().size()); + s_logger.debug("No of Virtual Machines added to database : " + db.getVirtualMachines().size()); assertEquals(3, db.getVirtualMachines().size()); diff --git a/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/model/VirtualNetworkModelTest.java b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/model/VirtualNetworkModelTest.java index e4abfc97711e..d2ba19871ee2 100644 --- a/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/model/VirtualNetworkModelTest.java +++ b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/model/VirtualNetworkModelTest.java @@ -145,7 +145,7 @@ public void testDBLookup() { VirtualNetworkModel guestModel2 = new VirtualNetworkModel(network, UUID.randomUUID().toString(), "test", TrafficType.Guest); db.getVirtualNetworks().add(guestModel2); s_logger.debug("networks: " + db.getVirtualNetworks().size()); - s_logger.debug("No of Vitual Networks added to database : " + db.getVirtualNetworks().size()); + s_logger.debug("No of Virtual Networks added to database : " + db.getVirtualNetworks().size()); assertEquals(4, db.getVirtualNetworks().size()); assertSame(storageModel, db.lookupVirtualNetwork(null, storageModel.getName(), TrafficType.Storage)); assertSame(mgmtModel, db.lookupVirtualNetwork(null, mgmtModel.getName(), TrafficType.Management)); diff --git a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/AddOpenDaylightControllerCmd.java b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/AddOpenDaylightControllerCmd.java index ad92a22411ad..2cee63c50f1c 100644 --- a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/AddOpenDaylightControllerCmd.java +++ b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/AddOpenDaylightControllerCmd.java @@ -38,7 +38,7 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -@APICommand(name = "addOpenDaylightController", responseObject = OpenDaylightControllerResponse.class, description = "Adds an OpenDyalight controler", +@APICommand(name = "addOpenDaylightController", responseObject = OpenDaylightControllerResponse.class, description = "Adds an OpenDaylight controller", requestHasSensitiveInfo = true, responseHasSensitiveInfo = false) public class AddOpenDaylightControllerCmd extends BaseAsyncCmd { diff --git a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/DeleteOpenDaylightControllerCmd.java b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/DeleteOpenDaylightControllerCmd.java index ce02e64fdd14..52afd97bbaf0 100644 --- a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/DeleteOpenDaylightControllerCmd.java +++ b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/DeleteOpenDaylightControllerCmd.java @@ -40,7 +40,7 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -@APICommand(name = "deleteOpenDaylightController", responseObject = OpenDaylightControllerResponse.class, description = "Removes an OpenDyalight controler", +@APICommand(name = "deleteOpenDaylightController", responseObject = OpenDaylightControllerResponse.class, description = "Removes an OpenDaylight controller", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteOpenDaylightControllerCmd extends BaseAsyncCmd { @Inject diff --git a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/ListOpenDaylightControllersCmd.java b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/ListOpenDaylightControllersCmd.java index 9737114d2f68..a4e80b291a8a 100644 --- a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/ListOpenDaylightControllersCmd.java +++ b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/ListOpenDaylightControllersCmd.java @@ -42,7 +42,7 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -@APICommand(name = "listOpenDaylightControllers", responseObject = OpenDaylightControllerResponse.class, description = "Lists OpenDyalight controllers", +@APICommand(name = "listOpenDaylightControllers", responseObject = OpenDaylightControllerResponse.class, description = "Lists OpenDaylight controllers", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListOpenDaylightControllersCmd extends BaseCmd { @Inject diff --git a/plugins/network-elements/palo-alto/src/main/java/com/cloud/network/resource/PaloAltoResource.java b/plugins/network-elements/palo-alto/src/main/java/com/cloud/network/resource/PaloAltoResource.java index ca45ddb66473..59c989f21100 100644 --- a/plugins/network-elements/palo-alto/src/main/java/com/cloud/network/resource/PaloAltoResource.java +++ b/plugins/network-elements/palo-alto/src/main/java/com/cloud/network/resource/PaloAltoResource.java @@ -1803,7 +1803,7 @@ private synchronized boolean requestWithCommit(ArrayList comma throw new ExecutionException(e.getCause().getMessage()); } if (pending_changes.equals("yes")) { - throw new ExecutionException("The Palo Alto has uncommited changes, so no changes can be made. Try again later or contact your administrator."); + throw new ExecutionException("The Palo Alto has uncommitted changes, so no changes can be made. Try again later or contact your administrator."); } else { // ADD A CONFIG LOCK TO CAPTURE THE PALO ALTO RESOURCE String add_lock_status; diff --git a/plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java b/plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java index 9ede8cc5a3e6..05356e506495 100644 --- a/plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java +++ b/plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java @@ -70,11 +70,11 @@ protected boolean canHandle(NetworkOffering offering, NetworkType networkType, P } if (setting != null) { if (networkType != NetworkType.Advanced) { - s_logger.info("SSP enebled by " + setting + " but not active because networkType was " + networkType); + s_logger.info("SSP enabled by " + setting + " but not active because networkType was " + networkType); } else if (!isMyTrafficType(offering.getTrafficType())) { s_logger.info("SSP enabled by " + setting + " but not active because traffic type not Guest"); } else if (offering.getGuestType() != Network.GuestType.Isolated) { - s_logger.info("SSP works for network isolatation."); + s_logger.info("SSP works for network isolation."); } else if (!_sspMgr.canHandle(physicalNetwork)) { s_logger.info("SSP manager not ready"); } else { diff --git a/plugins/network-elements/stratosphere-ssp/src/test/java/org/apache/cloudstack/network/element/SspElementTest.java b/plugins/network-elements/stratosphere-ssp/src/test/java/org/apache/cloudstack/network/element/SspElementTest.java index d0aaffada7f0..c06868d6797d 100644 --- a/plugins/network-elements/stratosphere-ssp/src/test/java/org/apache/cloudstack/network/element/SspElementTest.java +++ b/plugins/network-elements/stratosphere-ssp/src/test/java/org/apache/cloudstack/network/element/SspElementTest.java @@ -90,7 +90,7 @@ public void fullyConfigured() { when(_element._physicalNetworkServiceProviderDao.findByServiceProvider(physicalNetworkId, "StratosphereSsp")).thenReturn(nspvo); - // and zone api server, credentail is configured + // and zone api server, credential is configured when(credential.getUsername()).thenReturn("foo"); when(credential.getPassword()).thenReturn("bar"); diff --git a/plugins/network-elements/tungsten/src/main/java/org/apache/cloudstack/network/tungsten/service/TungstenGuestNetworkGuru.java b/plugins/network-elements/tungsten/src/main/java/org/apache/cloudstack/network/tungsten/service/TungstenGuestNetworkGuru.java index 12fe160f979e..824d96a792fe 100644 --- a/plugins/network-elements/tungsten/src/main/java/org/apache/cloudstack/network/tungsten/service/TungstenGuestNetworkGuru.java +++ b/plugins/network-elements/tungsten/src/main/java/org/apache/cloudstack/network/tungsten/service/TungstenGuestNetworkGuru.java @@ -269,7 +269,7 @@ public Network implement(Network network, NetworkOffering offering, DeployDestin // add default tungsten guest network policy tungstenService.addTungstenDefaultNetworkPolicy(zoneId, tungstenProjectFqn, TungstenUtils.getVirtualNetworkPolicyName(network.getId()), network.getUuid(), - getDefautlGuestNetworkPolicyRule(network), 100, 0); + getDefaultGuestNetworkPolicyRule(network), 100, 0); IPAddressVO ipAddressVO = ipAddressDao.findByIpAndDcId(network.getDataCenterId(), natIp); Pair pair = NetUtils.getCidr(network.getCidr()); @@ -469,7 +469,7 @@ private void createTungstenVmiGateway(Network network, String tungstenProjectFqn tungstenFabricUtils.sendTungstenCommand(setTungstenNetworkGatewayCommand, network.getDataCenterId()); } - private List getDefautlGuestNetworkPolicyRule(Network network) { + private List getDefaultGuestNetworkPolicyRule(Network network) { Pair pair = NetUtils.getCidr(network.getCidr()); List tungstenRuleList = new ArrayList<>(); tungstenRuleList.add( diff --git a/python/lib/cloud_utils.py b/python/lib/cloud_utils.py index d424bf1f023e..2f620dcac86c 100644 --- a/python/lib/cloud_utils.py +++ b/python/lib/cloud_utils.py @@ -282,7 +282,7 @@ def replace_or_add_line(f,startswith,stanza): # ==================================== CHECK FUNCTIONS ========================== # If they return without exception, it's okay. If they raise a CheckFailed exception, that means a condition -# (generallly one that needs administrator intervention) was detected. +# (generally one that needs administrator intervention) was detected. class CheckFailed(Exception): pass diff --git a/scripts/storage/secondary/cloud-install-sys-tmplt.py b/scripts/storage/secondary/cloud-install-sys-tmplt.py index 4950908201bb..546faf21879c 100644 --- a/scripts/storage/secondary/cloud-install-sys-tmplt.py +++ b/scripts/storage/secondary/cloud-install-sys-tmplt.py @@ -150,7 +150,7 @@ def report(tmp, blocknr, blocksize, size): def installTemplate(self): destDir = self.mountpoint + os.sep + "template" + os.sep + "tmpl" + os.sep + "1" + os.sep + str(self.template) self.destDir = destDir - print 'The desination Directory is : %s' % destDir + print 'The destination Directory is : %s' % destDir try: if self.forcecleanup: if os.path.exists(destDir): diff --git a/scripts/vm/hypervisor/ovm3/storagehealth.py b/scripts/vm/hypervisor/ovm3/storagehealth.py index 46779e1ded8f..cf5509f4ccbe 100755 --- a/scripts/vm/hypervisor/ovm3/storagehealth.py +++ b/scripts/vm/hypervisor/ovm3/storagehealth.py @@ -192,7 +192,7 @@ def Logger(level=logging.DEBUG): --primary|-p: match for primary storage to monitor. --failcmd|-f: executed on timeout. --cmd|-c: command to execute next to hb file(s) on primary. - --timeout|-t: excute failcmd after timeout(s) is hit. + --timeout|-t: execute failcmd after timeout(s) is hit. --interval|-i: run the checks every %ss> --state|-s check state""" sys.exit() diff --git a/scripts/vm/hypervisor/xenserver/s3xenserver b/scripts/vm/hypervisor/xenserver/s3xenserver index dba06d87e183..03a3946bf7ee 100644 --- a/scripts/vm/hypervisor/xenserver/s3xenserver +++ b/scripts/vm/hypervisor/xenserver/s3xenserver @@ -275,14 +275,14 @@ class S3Client(object): def multiUpload(self, bucket, key, src_fileName, chunkSize=5 * 1024 * 1024): uploadId={} - def readInitalMultipart(response): + def readInitialMultipart(response): data = response.read() xmlResult = parseString(data) result = xmlResult.getElementsByTagName("InitiateMultipartUploadResult")[0] upload = result.getElementsByTagName("UploadId")[0] uploadId["0"] = upload.childNodes[0].data - self.do_operation('POST', bucket, key + "?uploads", fn_read=readInitalMultipart) + self.do_operation('POST', bucket, key + "?uploads", fn_read=readInitialMultipart) fileSize = os.path.getsize(src_fileName) parts = fileSize / chunkSize + ((fileSize % chunkSize) and 1) diff --git a/scripts/vm/hypervisor/xenserver/xenserver56/InterfaceReconfigure.py b/scripts/vm/hypervisor/xenserver/xenserver56/InterfaceReconfigure.py index 2807f706ff50..f3b751882911 100755 --- a/scripts/vm/hypervisor/xenserver/xenserver56/InterfaceReconfigure.py +++ b/scripts/vm/hypervisor/xenserver/xenserver56/InterfaceReconfigure.py @@ -261,7 +261,7 @@ def _otherconfig_from_xml(n, attrs): # Each object is defined by a dictionary mapping an attribute name in # the xapi database to a tuple containing two items: # - a function which takes this attribute and encodes it as XML. -# - a function which takes XML and decocdes it into a value. +# - a function which takes XML and decodes it into a value. # # other-config attributes are specified as a simple array of strings diff --git a/server/src/main/java/com/cloud/alert/AlertManagerImpl.java b/server/src/main/java/com/cloud/alert/AlertManagerImpl.java index ca26de5cf218..f550d80b51a7 100644 --- a/server/src/main/java/com/cloud/alert/AlertManagerImpl.java +++ b/server/src/main/java/com/cloud/alert/AlertManagerImpl.java @@ -727,7 +727,7 @@ public void sendAlert(AlertType alertType, long dataCenterId, Long podId, Long c if ((alertType != AlertManager.AlertType.ALERT_TYPE_HOST) && (alertType != AlertManager.AlertType.ALERT_TYPE_USERVM) && (alertType != AlertManager.AlertType.ALERT_TYPE_DOMAIN_ROUTER) && (alertType != AlertManager.AlertType.ALERT_TYPE_CONSOLE_PROXY) && (alertType != AlertManager.AlertType.ALERT_TYPE_SSVM) && (alertType != AlertManager.AlertType.ALERT_TYPE_STORAGE_MISC) - && (alertType != AlertManager.AlertType.ALERT_TYPE_MANAGMENT_NODE) && (alertType != AlertManager.AlertType.ALERT_TYPE_RESOURCE_LIMIT_EXCEEDED) + && (alertType != AlertManager.AlertType.ALERT_TYPE_MANAGEMENT_NODE) && (alertType != AlertManager.AlertType.ALERT_TYPE_RESOURCE_LIMIT_EXCEEDED) && (alertType != AlertManager.AlertType.ALERT_TYPE_UPLOAD_FAILED) && (alertType != AlertManager.AlertType.ALERT_TYPE_OOBM_AUTH_ERROR) && (alertType != AlertManager.AlertType.ALERT_TYPE_HA_ACTION) && (alertType != AlertManager.AlertType.ALERT_TYPE_CA_CERT)) { alert = _alertDao.getLastAlert(alertType.getType(), dataCenterId, podId, clusterId); diff --git a/server/src/main/java/com/cloud/alert/ClusterAlertAdapter.java b/server/src/main/java/com/cloud/alert/ClusterAlertAdapter.java index 16e87b40bd83..4d5246bf91ba 100644 --- a/server/src/main/java/com/cloud/alert/ClusterAlertAdapter.java +++ b/server/src/main/java/com/cloud/alert/ClusterAlertAdapter.java @@ -70,7 +70,7 @@ private void onClusterNodeJoined(Object sender, ClusterNodeJoinEventArgs args) { s_logger.debug("Management server node " + mshost.getServiceIP() + " is up, send alert"); } - _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_MANAGMENT_NODE, 0, new Long(0), "Management server node " + mshost.getServiceIP() + " is up", ""); + _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_MANAGEMENT_NODE, 0, new Long(0), "Management server node " + mshost.getServiceIP() + " is up", ""); break; } } @@ -90,7 +90,7 @@ private void onClusterNodeLeft(Object sender, ClusterNodeLeftEventArgs args) { if (s_logger.isDebugEnabled()) { s_logger.debug("Detected management server node " + mshost.getServiceIP() + " is down, send alert"); } - _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_MANAGMENT_NODE, 0, new Long(0), "Management server node " + mshost.getServiceIP() + " is down", + _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_MANAGEMENT_NODE, 0, new Long(0), "Management server node " + mshost.getServiceIP() + " is down", ""); } else { if (s_logger.isDebugEnabled()) { diff --git a/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java b/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java index 6926f67daea7..09939f565412 100644 --- a/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java +++ b/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java @@ -716,7 +716,7 @@ public void updateCapacityForHost(final Host host, final Map 0) { s_logger.warn("Management network CIDR is not configured originally. Set it default to " + localCidrs[0]); - _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_MANAGMENT_NODE, 0, new Long(0), "Management network CIDR is not configured originally. Set it default to " + _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_MANAGEMENT_NODE, 0, new Long(0), "Management network CIDR is not configured originally. Set it default to " + localCidrs[0], ""); _configDao.update(Config.ManagementNetwork.key(), Config.ManagementNetwork.getCategory(), localCidrs[0]); } else { s_logger.warn("Management network CIDR is not properly configured and we are not able to find a default setting"); - _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_MANAGMENT_NODE, 0, new Long(0), + _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_MANAGEMENT_NODE, 0, new Long(0), "Management network CIDR is not properly configured and we are not able to find a default setting", ""); } } diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java index 18f98e6f99f1..b6a83008143a 100644 --- a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java @@ -929,7 +929,7 @@ public NicSecondaryIp allocateSecondaryGuestIP(final long nicId, IpAddresses req } if (!StringUtils.isAllBlank(ipaddr, ip6addr)) { - // we got the ip addr so up the nics table and secodary ip + // we got the ip addr so up the nics table and secondary ip final String ip4AddrFinal = ipaddr; final String ip6AddrFinal = ip6addr; long id = Transaction.execute(new TransactionCallback() { @@ -4011,10 +4011,10 @@ public PhysicalNetworkVO doInTransaction(TransactionStatus status) { // add security group provider to the physical network addDefaultSecurityGroupProviderToPhysicalNetwork(pNetwork.getId()); - // add VPCVirtualRouter as the defualt network service provider + // add VPCVirtualRouter as the default network service provider addDefaultVpcVirtualRouterToPhysicalNetwork(pNetwork.getId()); - // add baremetal as the defualt network service provider + // add baremetal as the default network service provider addDefaultBaremetalProvidersToPhysicalNetwork(pNetwork.getId()); //Add Internal Load Balancer element as a default network service provider diff --git a/server/src/main/java/com/cloud/network/element/VirtualRouterElement.java b/server/src/main/java/com/cloud/network/element/VirtualRouterElement.java index 839ab9ae0af2..07d477c74b8f 100644 --- a/server/src/main/java/com/cloud/network/element/VirtualRouterElement.java +++ b/server/src/main/java/com/cloud/network/element/VirtualRouterElement.java @@ -300,7 +300,7 @@ public boolean applyFWRules(final Network network, final List void collectNetworkStatistics(final T router, f } try { if (answer.getBytesReceived() == 0 && answer.getBytesSent() == 0) { - s_logger.debug("Recieved and Sent bytes are both 0. Not updating user_statistics"); + s_logger.debug("Received and Sent bytes are both 0. Not updating user_statistics"); continue; } diff --git a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java index 1f99d1646254..eb33c89897fd 100644 --- a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java @@ -1806,7 +1806,7 @@ public void validateNtwkOffForVpc(final NetworkOffering guestNtwkOff, final List * TODO This should have never been hardcoded like this in the first * place if (guestNtwkOff.getRedundantRouter()) { throw new * InvalidParameterValueException - * ("No redunant router support when network belnogs to VPC"); } + * ("No redundant router support when network belongs to VPC"); } */ // 4) Conserve mode should be off diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java index 9e88b6f1a1a7..d4cef08e0d8f 100644 --- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java +++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java @@ -3208,7 +3208,7 @@ public List listTopConsumedResources(final ListCapacityCmd cmd) { final Boolean fetchLatest = cmd.getFetchLatest(); if (clusterId != null) { - throw new InvalidParameterValueException("Currently clusterId param is not suppoerted"); + throw new InvalidParameterValueException("Currently clusterId param is not supported"); } zoneId = _accountMgr.checkAccessAndSpecifyAuthority(CallContext.current().getCallingAccount(), zoneId); diff --git a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java index 481c200c49d0..d4f083590001 100644 --- a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java @@ -106,7 +106,7 @@ 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.DettachCommand; +import org.apache.cloudstack.storage.command.DetachCommand; import org.apache.cloudstack.storage.command.SyncVolumePathAnswer; import org.apache.cloudstack.storage.command.SyncVolumePathCommand; import org.apache.cloudstack.storage.datastore.db.ImageStoreDao; @@ -1696,7 +1696,7 @@ private void handleManagedStorage(Volume volume) { DataTO volTO = volFactory.getVolume(volume.getId()).getTO(); DiskTO disk = new DiskTO(volTO, volume.getDeviceId(), volume.getPath(), volume.getVolumeType()); - DettachCommand cmd = new DettachCommand(disk, null); + DetachCommand cmd = new DetachCommand(disk, null); cmd.setManaged(true); diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java index 69b5f9840814..c1c41d9bc186 100644 --- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java +++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java @@ -92,7 +92,7 @@ import org.apache.cloudstack.snapshot.SnapshotHelper; import org.apache.cloudstack.storage.command.AttachAnswer; import org.apache.cloudstack.storage.command.AttachCommand; -import org.apache.cloudstack.storage.command.DettachCommand; +import org.apache.cloudstack.storage.command.DetachCommand; import org.apache.cloudstack.storage.command.TemplateOrVolumePostUploadCommand; import org.apache.cloudstack.storage.datastore.db.ImageStoreDao; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; @@ -2854,7 +2854,7 @@ private Volume orchestrateDetachVolumeFromVM(long vmId, long volumeId) { } } - DettachCommand cmd = new DettachCommand(disk, vm.getInstanceName()); + DetachCommand cmd = new DetachCommand(disk, vm.getInstanceName()); cmd.setManaged(volumePool.isManaged()); diff --git a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java index 2ed420870208..832d7ffb175d 100755 --- a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java @@ -91,7 +91,7 @@ import org.apache.cloudstack.snapshot.SnapshotHelper; import org.apache.cloudstack.storage.command.AttachCommand; import org.apache.cloudstack.storage.command.CommandResult; -import org.apache.cloudstack.storage.command.DettachCommand; +import org.apache.cloudstack.storage.command.DetachCommand; import org.apache.cloudstack.storage.command.TemplateOrVolumePostUploadCommand; import org.apache.cloudstack.storage.datastore.db.ImageStoreDao; import org.apache.cloudstack.storage.datastore.db.ImageStoreVO; @@ -1299,8 +1299,8 @@ private boolean attachISOToVM(long vmId, long isoId, boolean attach, boolean for cmd = new AttachCommand(disk, vmName, vmTO.getDetails()); ((AttachCommand)cmd).setForced(forced); } else { - cmd = new DettachCommand(disk, vmName, vmTO.getDetails()); - ((DettachCommand)cmd).setForced(forced); + cmd = new DetachCommand(disk, vmName, vmTO.getDetails()); + ((DetachCommand)cmd).setForced(forced); } Answer a = _agentMgr.easySend(vm.getHostId(), cmd); return (a != null && a.getResult()); diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java index 158fc38b9796..c28c29c22b37 100644 --- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java @@ -119,7 +119,7 @@ import org.apache.cloudstack.reservation.dao.ReservationDao; import org.apache.cloudstack.snapshot.SnapshotHelper; import org.apache.cloudstack.storage.command.DeleteCommand; -import org.apache.cloudstack.storage.command.DettachCommand; +import org.apache.cloudstack.storage.command.DetachCommand; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; @@ -7928,9 +7928,9 @@ private void handleManagedStorage(UserVmVO vm, VolumeVO root) { // it's OK in this case to send a detach command to the host for a root volume as this // will simply lead to the SR that supports the root volume being removed - cmd = new DettachCommand(disk, vm.getInstanceName()); + cmd = new DetachCommand(disk, vm.getInstanceName()); - DettachCommand detachCommand = (DettachCommand)cmd; + DetachCommand detachCommand = (DetachCommand)cmd; detachCommand.setManaged(true); diff --git a/server/src/test/java/com/cloud/user/AccountManagerImplTest.java b/server/src/test/java/com/cloud/user/AccountManagerImplTest.java index 6d9211dd526d..7f6bd41c80bb 100644 --- a/server/src/test/java/com/cloud/user/AccountManagerImplTest.java +++ b/server/src/test/java/com/cloud/user/AccountManagerImplTest.java @@ -563,19 +563,19 @@ public void validateAndUpdateUsernameIfNeededTestNoDuplicatedUserNames() { } @Test - public void valiateUserPasswordAndUpdateIfNeededTestPasswordNull() { + public void validateUserPasswordAndUpdateIfNeededTestPasswordNull() { accountManagerImpl.validateUserPasswordAndUpdateIfNeeded(null, userVoMock, null); Mockito.verify(userVoMock, Mockito.times(0)).setPassword(Mockito.anyString()); } @Test(expected = InvalidParameterValueException.class) - public void valiateUserPasswordAndUpdateIfNeededTestBlankPassword() { + public void validateUserPasswordAndUpdateIfNeededTestBlankPassword() { accountManagerImpl.validateUserPasswordAndUpdateIfNeeded(" ", userVoMock, null); } @Test(expected = InvalidParameterValueException.class) - public void valiateUserPasswordAndUpdateIfNeededTestNoAdminAndNoCurrentPasswordProvided() { + public void validateUserPasswordAndUpdateIfNeededTestNoAdminAndNoCurrentPasswordProvided() { Mockito.doReturn(accountMock).when(accountManagerImpl).getCurrentCallingAccount(); Mockito.doReturn(false).when(accountManagerImpl).isRootAdmin(accountMockId); Mockito.doReturn(false).when(accountManagerImpl).isDomainAdmin(accountMockId); @@ -589,7 +589,7 @@ public void valiateUserPasswordAndUpdateIfNeededTestNoAdminAndNoCurrentPasswordP } @Test(expected = CloudRuntimeException.class) - public void valiateUserPasswordAndUpdateIfNeededTestNoUserAuthenticatorsConfigured() { + public void validateUserPasswordAndUpdateIfNeededTestNoUserAuthenticatorsConfigured() { Mockito.doReturn(accountMock).when(accountManagerImpl).getCurrentCallingAccount(); Mockito.doReturn(true).when(accountManagerImpl).isRootAdmin(accountMockId); Mockito.doReturn(false).when(accountManagerImpl).isDomainAdmin(accountMockId); diff --git a/services/console-proxy/rdpconsole/src/main/java/common/BufferedImageCopyRectAdapter.java b/services/console-proxy/rdpconsole/src/main/java/common/BufferedImageCopyRectAdapter.java index 804cab710969..e020a7371e60 100644 --- a/services/console-proxy/rdpconsole/src/main/java/common/BufferedImageCopyRectAdapter.java +++ b/services/console-proxy/rdpconsole/src/main/java/common/BufferedImageCopyRectAdapter.java @@ -99,7 +99,7 @@ public static void main(String args[]) { // 3 13, 14, 15, 16}; - // Initalize image + // Initialize image int[] data = ((DataBufferInt)canvas.getOfflineImage().getRaster().getDataBuffer()).getData(); System.arraycopy(pixelsBeforeCopy, 0, data, 0, pixelsBeforeCopy.length); diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java index cc17e48fe079..748f7e6935eb 100644 --- a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java +++ b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java @@ -2998,7 +2998,7 @@ private String configureIpFirewall(List ipList, boolean isAppend) { * options such as domain,user,password are passed as query parameters. * * @param uri - * crresponding to the remote device. Will throw for unsupported + * corresponding to the remote device. Will throw for unsupported * scheme. * @param nfsVersion NFS version to use in mount command * @return name of folder in _parent that device was mounted. diff --git a/systemvm/agent/noVNC/app/images/icons/Makefile b/systemvm/agent/noVNC/app/images/icons/Makefile index 03eaed0711d4..6fc48a186360 100644 --- a/systemvm/agent/noVNC/app/images/icons/Makefile +++ b/systemvm/agent/noVNC/app/images/icons/Makefile @@ -17,7 +17,7 @@ ALL_ICONS := \ all: $(ALL_ICONS) # Our testing shows that the ICO file need to be sorted in largest to -# smallest to get the apporpriate behviour +# smallest to get the appropriate behaviour WEB_ICON_SIZES_REVERSE := $(shell echo $(WEB_ICON_SIZES) | tr ' ' '\n' | sort -nr | tr '\n' ' ') WEB_BASE_ICONS := $(WEB_ICON_SIZES_REVERSE:%=novnc-%.png) .INTERMEDIATE: $(WEB_BASE_ICONS) diff --git a/systemvm/agent/noVNC/core/rfb.js b/systemvm/agent/noVNC/core/rfb.js index 228340a2decb..2527abedbdde 100644 --- a/systemvm/agent/noVNC/core/rfb.js +++ b/systemvm/agent/noVNC/core/rfb.js @@ -1625,7 +1625,7 @@ export default class RFB extends EventTargetMixin { this._rfbVeNCryptState = 2; } - // must fall through here (i.e. no "else if"), beacause we may have already received + // must fall through here (i.e. no "else if"), because we may have already received // the subtypes length and won't be called again if (this._rfbVeNCryptState == 2) { // waiting for subtypes length diff --git a/systemvm/debian/opt/cloud/bin/cs_loadbalancer.py b/systemvm/debian/opt/cloud/bin/cs_loadbalancer.py index 777130974b04..81a3c6140517 100755 --- a/systemvm/debian/opt/cloud/bin/cs_loadbalancer.py +++ b/systemvm/debian/opt/cloud/bin/cs_loadbalancer.py @@ -19,7 +19,7 @@ def merge(dbag, data): - """ Simply overwrite the existsing bag as, the whole configuration is sent every time """ + """ Simply overwrite the existing bag as, the whole configuration is sent every time """ if "rules" not in data: return dbag dbag['config'] = data['rules'] diff --git a/test/integration/broken/maint/test_escalations_hosts.py b/test/integration/broken/maint/test_escalations_hosts.py index 4d07517a2585..b31e9f496c60 100644 --- a/test/integration/broken/maint/test_escalations_hosts.py +++ b/test/integration/broken/maint/test_escalations_hosts.py @@ -294,7 +294,7 @@ def test_03_op_host_capacity_disable_zone(self): "Host state not correct" ) check_db(self, host_state) - # disbale the zone and check op_host_capacity table + # disable the zone and check op_host_capacity table zone_state = "Disabled" zone_allocationstate = update_zone( self.apiclient, diff --git a/test/integration/broken/maint/test_zone_level_local_storage_setting.py b/test/integration/broken/maint/test_zone_level_local_storage_setting.py index c8e1946d28cd..be71d5a5de97 100644 --- a/test/integration/broken/maint/test_zone_level_local_storage_setting.py +++ b/test/integration/broken/maint/test_zone_level_local_storage_setting.py @@ -214,7 +214,7 @@ def restart_ms(self): def update_global_settings(self, value, name, zoneid=None): - """Update Gloabal/zonelevel settings and verify + """Update Global/zonelevel settings and verify #1-Update configuration #2-Restart ms if zone id is None""" Configurations.update(self.apiclient, diff --git a/test/integration/component/maint/test_dedicate_public_ip_range.py b/test/integration/component/maint/test_dedicate_public_ip_range.py index cde2b789c1d8..e1512cf8d46b 100644 --- a/test/integration/component/maint/test_dedicate_public_ip_range.py +++ b/test/integration/component/maint/test_dedicate_public_ip_range.py @@ -1316,7 +1316,7 @@ def test_18_delete_network(self): account.domainid, networkofferingid=self.isolated_network_offering.id) - # Acuiring IP for source nat purpose + # Acquiring IP for source nat purpose PublicIPAddress.create( self.apiclient, accountid=account.name, diff --git a/test/integration/component/maint/test_host_high_availability.py b/test/integration/component/maint/test_host_high_availability.py index c335c66b481f..75d97e33909e 100644 --- a/test/integration/component/maint/test_host_high_availability.py +++ b/test/integration/component/maint/test_host_high_availability.py @@ -598,7 +598,7 @@ def test_04_cant_migrate_vm_to_host_with_ha_negative(self): self.assertEqual( list_vm_response[0].hostid, notSuitableHost.id, - "The detination host id of migrated VM is not matching." + "The destination host id of migrated VM is not matching." ) @attr(configuration="ha.tag") diff --git a/test/integration/component/maint/test_redundant_router_network_rules.py b/test/integration/component/maint/test_redundant_router_network_rules.py index 7348d1629530..14c50d24bece 100644 --- a/test/integration/component/maint/test_redundant_router_network_rules.py +++ b/test/integration/component/maint/test_redundant_router_network_rules.py @@ -1249,7 +1249,7 @@ def test_applyNetworkRules_PrimaryDown_deleteNetworkRules(self): try: Router.stop(self.apiclient, id=primary_router.id) except Exception as e: - self.fail("Failed to stop primary router becaues of %s" % e) + self.fail("Failed to stop primary router because of %s" % e) self.debug("Associating public IP for network: %s" % network.name) public_ip = PublicIPAddress.create( diff --git a/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py b/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py index 36b71defadbb..3ed898dab821 100644 --- a/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py +++ b/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py @@ -344,7 +344,7 @@ def tearDown(cls): @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_all_domainuser(self): """ - Valiate that ROOT admin is able to deploy a VM for other users in a shared network with scope=all + Validate that ROOT admin is able to deploy a VM for other users in a shared network with scope=all """ # Deploy VM for a user in a domain under ROOT as admin @@ -372,7 +372,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_all_domainuser(self): @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_all_domainadminuser(self): """ - Valiate that ROOT admin is able to deploy a VM for a domain admin users in a shared network with scope=all + Validate that ROOT admin is able to deploy a VM for a domain admin users in a shared network with scope=all """ # Deploy VM for an admin user in a domain under ROOT as admin @@ -400,7 +400,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_all_domainadminuser(self): @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_all_subdomainuser(self): """ - Valiate that ROOT admin is able to deploy a VM for any user in a subdomain in a shared network with scope=all + Validate that ROOT admin is able to deploy a VM for any user in a subdomain in a shared network with scope=all """ # Deploy VM as user in a subdomain under ROOT @@ -426,7 +426,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_all_subdomainuser(self): @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_all_subdomainadminuser(self): """ - Valiate that ROOT admin is able to deploy a VM for admin user in a domain in a shared network with scope=all + Validate that ROOT admin is able to deploy a VM for admin user in a domain in a shared network with scope=all """ # Deploy VM as an admin user in a subdomain under ROOT @@ -453,7 +453,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_all_subdomainadminuser(self): @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_all_ROOTuser(self): """ - Valiate that ROOT admin is able to deploy a VM for user in ROOT domain in a shared network with scope=all + Validate that ROOT admin is able to deploy a VM for user in ROOT domain in a shared network with scope=all """ # Deploy VM as user in ROOT domain @@ -482,7 +482,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_all_ROOTuser(self): @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_domainuser(self): """ - Valiate that ROOT admin is able to deploy a VM for domain user in a shared network with scope=domain with no subdomain access + Validate that ROOT admin is able to deploy a VM for domain user in a shared network with scope=domain with no subdomain access """ # Deploy VM as user in a domain that has shared network with no subdomain access @@ -510,7 +510,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_domai @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_domainadminuser(self): """ - Valiate that ROOT admin is able to deploy a VM for domain admin user in a shared network with scope=domain with no subdomain access + Validate that ROOT admin is able to deploy a VM for domain admin user in a shared network with scope=domain with no subdomain access """ # Deploy VM as an admin user in a domain that has shared network with no subdomain access @@ -538,7 +538,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_domai @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_subdomainuser(self): """ - Valiate that ROOT admin is NOT able to deploy a VM for sub domain user in a shared network with scope=domain with no subdomain access + Validate that ROOT admin is NOT able to deploy a VM for sub domain user in a shared network with scope=domain with no subdomain access """ # Deploy VM as user in a subdomain under a domain that has shared network with no subdomain access @@ -569,7 +569,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_subdo @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_subdomainadminuser(self): """ - Valiate that ROOT admin is NOT able to deploy a VM for sub domain admin user in a shared network with scope=domain with no subdomain access + Validate that ROOT admin is NOT able to deploy a VM for sub domain admin user in a shared network with scope=domain with no subdomain access """ # Deploy VM as an admin user in a subdomain under a domain that has shared network with no subdomain access @@ -599,7 +599,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_subdo @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_parentdomainuser(self): """ - Valiate that ROOT admin is NOT able to deploy a VM for parent domain user in a shared network with scope=domain with no subdomain access + Validate that ROOT admin is NOT able to deploy a VM for parent domain user in a shared network with scope=domain with no subdomain access """ # Deploy VM as user in parentdomain of a domain that has shared network with no subdomain access @@ -629,7 +629,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_paren @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_parentdomainadminuser(self): """ - Valiate that ROOT admin is NOT able to deploy a VM for parent domain admin user in a shared network with scope=domain with no subdomain access + Validate that ROOT admin is NOT able to deploy a VM for parent domain admin user in a shared network with scope=domain with no subdomain access """ # Deploy VM as an admin user in parentdomain of a domain that has shared network with no subdomain access @@ -659,7 +659,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_paren @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_ROOTuser(self): """ - Valiate that ROOT admin is NOT able to deploy a VM for parent domain admin user in a shared network with scope=domain with no subdomain access + Validate that ROOT admin is NOT able to deploy a VM for parent domain admin user in a shared network with scope=domain with no subdomain access """ # Deploy VM as user in ROOT domain @@ -691,7 +691,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_ROOTu @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_domainuser(self): """ - Valiate that ROOT admin is able to deploy a VM for domain user in a shared network with scope=domain with subdomain access + Validate that ROOT admin is able to deploy a VM for domain user in a shared network with scope=domain with subdomain access """ # Deploy VM as user in a domain that has shared network with subdomain access @@ -719,7 +719,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_dom @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_domainadminuser(self): """ - Valiate that ROOT admin is able to deploy a VM for domain admin user in a shared network with scope=domain with subdomain access + Validate that ROOT admin is able to deploy a VM for domain admin user in a shared network with scope=domain with subdomain access """ # Deploy VM as an admin user in a domain that has shared network with subdomain access @@ -747,7 +747,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_dom @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_subdomainuser(self): """ - Valiate that ROOT admin is able to deploy a VM for subdomain user in a shared network with scope=domain with subdomain access + Validate that ROOT admin is able to deploy a VM for subdomain user in a shared network with scope=domain with subdomain access """ # Deploy VM as user in a subdomain under a domain that has shared network with subdomain access @@ -774,7 +774,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_sub @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_subdomainadminuser(self): """ - Valiate that ROOT admin is able to deploy a VM for subdomain admin user in a shared network with scope=domain with subdomain access + Validate that ROOT admin is able to deploy a VM for subdomain admin user in a shared network with scope=domain with subdomain access """ # Deploy VM as an admin user in a subdomain under a domain that has shared network with subdomain access @@ -801,7 +801,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_sub @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_parentdomainuser(self): """ - Valiate that ROOT admin is NOT able to deploy a VM for parent domain user in a shared network with scope=domain with subdomain access + Validate that ROOT admin is NOT able to deploy a VM for parent domain user in a shared network with scope=domain with subdomain access """ # Deploy VM as user in parentdomain of a domain that has shared network with subdomain access @@ -831,7 +831,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_par @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_parentdomainadminuser(self): """ - Valiate that ROOT admin is NOT able to deploy a VM for parent domain admin user in a shared network with scope=domain with subdomain access + Validate that ROOT admin is NOT able to deploy a VM for parent domain admin user in a shared network with scope=domain with subdomain access """ # Deploy VM as an admin user in parentdomain of a domain that has shared network with subdomain access @@ -861,7 +861,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_par @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_ROOTuser(self): """ - Valiate that ROOT admin is NOT able to deploy a VM for user in ROOT domain in a shared network with scope=domain with subdomain access + Validate that ROOT admin is NOT able to deploy a VM for user in ROOT domain in a shared network with scope=domain with subdomain access """ # Deploy VM as user in ROOT domain @@ -893,7 +893,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_ROO @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_account_domainuser(self): """ - Valiate that ROOT admin is NOT able to deploy a VM for user in the same domain but in a different account in a shared network with scope=account + Validate that ROOT admin is NOT able to deploy a VM for user in the same domain but in a different account in a shared network with scope=account """ # Deploy VM as user in a domain under the same domain but different account from the account that has a shared network with scope=account @@ -923,7 +923,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_account_domainuser(self): @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_account_domainadminuser(self): """ - Valiate that ROOT admin is NOT able to deploy a VM for admin user in the same domain but in a different account in a shared network with scope=account + Validate that ROOT admin is NOT able to deploy a VM for admin user in the same domain but in a different account in a shared network with scope=account """ # Deploy VM as admin user for a domain that has an account with shared network with scope=account @@ -953,7 +953,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_account_domainadminuser(self): @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_account_user(self): """ - Valiate that ROOT admin is able to deploy a VM for regular user in a shared network with scope=account + Validate that ROOT admin is able to deploy a VM for regular user in a shared network with scope=account """ # Deploy VM as account with shared network with scope=account @@ -981,7 +981,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_account_user(self): @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_account_differentdomain(self): """ - Valiate that ROOT admin is NOT able to deploy a VM for a admin user in a shared network with scope=account which the admin user does not have access to + Validate that ROOT admin is NOT able to deploy a VM for a admin user in a shared network with scope=account which the admin user does not have access to """ # Deploy VM as an admin user in a subdomain under ROOT @@ -1011,7 +1011,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_account_differentdomain(self): @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_account_ROOTuser(self): """ - Valiate that ROOT admin is NOT able to deploy a VM for a user in ROOT domain in a shared network with scope=account which the user does not have access to + Validate that ROOT admin is NOT able to deploy a VM for a user in ROOT domain in a shared network with scope=account which the user does not have access to """ # Deploy VM as user in ROOT domain @@ -1043,7 +1043,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_account_ROOTuser(self): @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_all_domainuser(self): """ - Valiate that Domain admin is able to deploy a VM for a domain user in a shared network with scope=all + Validate that Domain admin is able to deploy a VM for a domain user in a shared network with scope=all """ # Deploy VM for a user in a domain under ROOT as admin @@ -1070,7 +1070,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_all_domainuser(self): @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_all_domainadminuser(self): """ - Valiate that Domain admin is able to deploy a VM for a domain admin user in a shared network with scope=all + Validate that Domain admin is able to deploy a VM for a domain admin user in a shared network with scope=all """ # Deploy VM for an admin user in a domain under ROOT as admin @@ -1097,7 +1097,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_all_domainadminuser(self @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_all_subdomainuser(self): """ - Valiate that Domain admin is able to deploy a VM for a sub domain user in a shared network with scope=all + Validate that Domain admin is able to deploy a VM for a sub domain user in a shared network with scope=all """ # Deploy VM as user in a subdomain under ROOT @@ -1123,7 +1123,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_all_subdomainuser(self): @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_all_subdomainadminuser(self): """ - Valiate that Domain admin is able to deploy a VM for a sub domain admin user in a shared network with scope=all + Validate that Domain admin is able to deploy a VM for a sub domain admin user in a shared network with scope=all """ # Deploy VM as an admin user in a subdomain under ROOT @@ -1149,7 +1149,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_all_subdomainadminuser(s @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_all_ROOTuser(self): """ - Valiate that Domain admin is NOT able to deploy a VM for user in ROOT domain in a shared network with scope=all + Validate that Domain admin is NOT able to deploy a VM for user in ROOT domain in a shared network with scope=all """ # Deploy VM as user in ROOT domain @@ -1177,7 +1177,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_all_ROOTuser(self): @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_all_crossdomainuser(self): """ - Valiate that Domain admin is NOT able to deploy a VM for user in other domain in a shared network with scope=all + Validate that Domain admin is NOT able to deploy a VM for user in other domain in a shared network with scope=all """ # Deploy VM as user in ROOT domain @@ -1208,7 +1208,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_all_crossdomainuser(self @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess_domainuser(self): """ - Valiate that Domain admin is able to deploy a VM for domain user in a shared network with scope=Domain and no subdomain access + Validate that Domain admin is able to deploy a VM for domain user in a shared network with scope=Domain and no subdomain access """ # Deploy VM as user in a domain that has shared network with no subdomain access @@ -1235,7 +1235,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess_domainadminuser(self): """ - Valiate that Domain admin is able to deploy a VM for domain admin user in a shared network with scope=Domain and no subdomain access + Validate that Domain admin is able to deploy a VM for domain admin user in a shared network with scope=Domain and no subdomain access """ # Deploy VM as an admin user in a domain that has shared network with no subdomain access @@ -1263,7 +1263,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess_subdomainuser(self): """ - Valiate that Domain admin is NOT able to deploy a VM for sub domain user in a shared network with scope=Domain and no subdomain access + Validate that Domain admin is NOT able to deploy a VM for sub domain user in a shared network with scope=Domain and no subdomain access """ # Deploy VM as user in a subdomain under a domain that has shared network with no subdomain access @@ -1293,7 +1293,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess_subdomainadminuser(self): """ - Valiate that Domain admin is NOT able to deploy a VM for sub domain admin user in a shared network with scope=Domain and no subdomain access + Validate that Domain admin is NOT able to deploy a VM for sub domain admin user in a shared network with scope=Domain and no subdomain access """ # Deploy VM as an admin user in a subdomain under a domain that has shared network with no subdomain access @@ -1323,7 +1323,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess_parentdomainuser(self): """ - Valiate that Domain admin is NOT able to deploy a VM for parent domain user in a shared network with scope=Domain and no subdomain access + Validate that Domain admin is NOT able to deploy a VM for parent domain user in a shared network with scope=Domain and no subdomain access """ # Deploy VM as user in parentdomain of a domain that has shared network with no subdomain access @@ -1353,7 +1353,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess_parentdomainadminuser(self): """ - Valiate that Domain admin is NOT able to deploy a VM for parent domain admin user in a shared network with scope=Domain and no subdomain access + Validate that Domain admin is NOT able to deploy a VM for parent domain admin user in a shared network with scope=Domain and no subdomain access """ # Deploy VM as an admin user in parentdomain of a domain that has shared network with no subdomain access @@ -1383,7 +1383,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess_ROOTuser(self): """ - Valiate that Domain admin is NOT able to deploy a VM for user in ROOT domain in a shared network with scope=Domain and no subdomain access + Validate that Domain admin is NOT able to deploy a VM for user in ROOT domain in a shared network with scope=Domain and no subdomain access """ # Deploy VM as user in ROOT domain @@ -1414,7 +1414,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainaccess_domainuser(self): """ - Valiate that Domain admin is able to deploy a VM for regular user in domain in a shared network with scope=Domain and subdomain access + Validate that Domain admin is able to deploy a VM for regular user in domain in a shared network with scope=Domain and subdomain access """ # Deploy VM as user in a domain that has shared network with subdomain access @@ -1441,7 +1441,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainacce @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainaccess_domainadminuser(self): """ - Valiate that Domain admin is able to deploy a VM for admin user in domain in a shared network with scope=Domain and subdomain access + Validate that Domain admin is able to deploy a VM for admin user in domain in a shared network with scope=Domain and subdomain access """ # Deploy VM as an admin user in a domain that has shared network with subdomain access @@ -1468,7 +1468,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainacce @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainaccess_subdomainuser(self): """ - Valiate that Domain admin is able to deploy a VM for regular user in subdomain in a shared network with scope=Domain and subdomain access + Validate that Domain admin is able to deploy a VM for regular user in subdomain in a shared network with scope=Domain and subdomain access """ # Deploy VM as user in a subdomain under a domain that has shared network with subdomain access @@ -1494,7 +1494,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainacce @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainaccess_subdomainadminuser(self): """ - Valiate that Domain admin is able to deploy a VM for admin user in subdomain in a shared network with scope=Domain and subdomain access + Validate that Domain admin is able to deploy a VM for admin user in subdomain in a shared network with scope=Domain and subdomain access """ # Deploy VM as an admin user in a subdomain under a domain that has shared network with subdomain access @@ -1520,7 +1520,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainacce @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainaccess_parentdomainuser(self): """ - Valiate that Domain admin is NOT able to deploy a VM for regular user in parent domain in a shared network with scope=Domain and subdomain access + Validate that Domain admin is NOT able to deploy a VM for regular user in parent domain in a shared network with scope=Domain and subdomain access """ # Deploy VM as user in parentdomain of a domain that has shared network with subdomain access @@ -1549,7 +1549,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainacce @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainaccess_parentdomainadminuser(self): """ - Valiate that Domain admin is NOT able to deploy a VM for admin user in parent domain in a shared network with scope=Domain and subdomain access + Validate that Domain admin is NOT able to deploy a VM for admin user in parent domain in a shared network with scope=Domain and subdomain access """ # Deploy VM as an admin user in parentdomain of a domain that has shared network with subdomain access @@ -1579,7 +1579,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainacce @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainaccess_ROOTuser(self): """ - Valiate that Domain admin is NOT able to deploy a VM for user in ROOT domain in a shared network with scope=Domain and subdomain access + Validate that Domain admin is NOT able to deploy a VM for user in ROOT domain in a shared network with scope=Domain and subdomain access """ # Deploy VM as user in ROOT domain @@ -1610,7 +1610,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainacce @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_account_domainuser(self): """ - Valiate that Domain admin is NOT able to deploy a VM for user in the same domain but belonging to a different account in a shared network with scope=account + Validate that Domain admin is NOT able to deploy a VM for user in the same domain but belonging to a different account in a shared network with scope=account """ # Deploy VM as user in a domain under the same domain but different account from the acount that has a shared network with scope=account @@ -1639,7 +1639,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_account_domainuser(self) @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_account_domainadminuser(self): """ - Valiate that Domain admin is NOT able to deploy a VM for an admin user in the same domain but belonging to a different account in a shared network with scope=account + Validate that Domain admin is NOT able to deploy a VM for an admin user in the same domain but belonging to a different account in a shared network with scope=account """ # Deploy VM as admin user for a domain that has an account with shared network with scope=account @@ -1668,7 +1668,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_account_domainadminuser( @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_account_user(self): """ - Valiate that Domain admin is able to deploy a VM for an regular user in a shared network with scope=account + Validate that Domain admin is able to deploy a VM for an regular user in a shared network with scope=account """ # Deploy VM as account with shared network with scope=account @@ -1695,7 +1695,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_account_user(self): @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_account_differentdomain(self): """ - Valiate that Domain admin is able NOT able to deploy a VM for an regular user from a differnt domain in a shared network with scope=account + Validate that Domain admin is able NOT able to deploy a VM for an regular user from a different domain in a shared network with scope=account """ # Deploy VM as an admin user in a subdomain under ROOT @@ -1714,17 +1714,17 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_account_differentdomain( accountid=self.account_d2a.name, domainid=self.account_d2a.domainid ) - self.fail("Domain admin is able to deploy a VM for an regular user from a differnt domain in a shared network with scope=account") + self.fail("Domain admin is able to deploy a VM for an regular user from a different domain in a shared network with scope=account") except Exception as e: self.debug("When a user from different domain deploys a VM in a shared network with scope=account %s" % e) if not CloudstackAclException.verifyMsginException(e, CloudstackAclException.NO_PERMISSION_TO_OPERATE_DOMAIN): self.fail( - "Error message validation failed when Domain admin tries to deploy a VM for an regular user from a differnt domain in a shared network with scope=account") + "Error message validation failed when Domain admin tries to deploy a VM for an regular user from a different domain in a shared network with scope=account") @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_account_ROOTuser(self): """ - Valiate that Domain admin is NOT able to deploy a VM for an regular user in ROOT domain in a shared network with scope=account + Validate that Domain admin is NOT able to deploy a VM for an regular user in ROOT domain in a shared network with scope=account """ # Deploy VM as user in ROOT domain @@ -1754,7 +1754,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_account_ROOTuser(self): @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_regularuser_scope_all_anotherusersamedomain(self): """ - Valiate that regular user is able NOT able to deploy a VM for another user in the same domain in a shared network with scope=all + Validate that regular user is able NOT able to deploy a VM for another user in the same domain in a shared network with scope=all """ # Deploy VM for a user in a domain under ROOT as admin @@ -1782,7 +1782,7 @@ def test_deployVM_in_sharedNetwork_as_regularuser_scope_all_anotherusersamedomai @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_deployVM_in_sharedNetwork_as_regularuser_scope_all_crossdomain(self): """ - Valiate that regular user is able NOT able to deploy a VM for another user in a different domain in a shared network with scope=all + Validate that regular user is able NOT able to deploy a VM for another user in a different domain in a shared network with scope=all """ # Deploy VM for a user in a domain under ROOT as admin diff --git a/test/integration/component/test_add_remove_network.py b/test/integration/component/test_add_remove_network.py index 716ffa39258d..7c361096c86c 100644 --- a/test/integration/component/test_add_remove_network.py +++ b/test/integration/component/test_add_remove_network.py @@ -408,7 +408,7 @@ def test_03_add_nw_multiple_times(self, value): networkids=[self.defaultNetworkId]) self.cleanup.append(virtual_machine) except Exception as e: - self.fail("Failed to deply virtual machine: %s" % e) + self.fail("Failed to deploy virtual machine: %s" % e) # Adding network to vm for the first time self.addNetworkToVm(network, virtual_machine) @@ -442,7 +442,7 @@ def test_04_vpc_nw_running_vm(self, value): networkids=[self.defaultNetworkId]) self.cleanup.append(virtual_machine) except Exception as e: - self.fail("Failed to deply virtual machine: %s" % e) + self.fail("Failed to deploy virtual machine: %s" % e) network = self.isolated_network self.addNetworkToVm(network, virtual_machine) @@ -528,7 +528,7 @@ def test_06_add_nw_ipaddress_running_vm(self): networkids=[self.defaultNetworkId]) self.cleanup.append(virtual_machine) except Exception as e: - self.fail("Failed to deply virtual machine: %s" % e) + self.fail("Failed to deploy virtual machine: %s" % e) ipaddress = self.shared_nw_endip self.debug("Adding network to vm with ip address %s: " % ipaddress) diff --git a/test/integration/component/test_advancedsg_networks.py b/test/integration/component/test_advancedsg_networks.py index 4b3b8a32fa11..ed1d218e5e0f 100644 --- a/test/integration/component/test_advancedsg_networks.py +++ b/test/integration/component/test_advancedsg_networks.py @@ -760,7 +760,7 @@ def test_10_deleteSharedNwSGAccountSpecific_InUse(self): # Steps, # 1. create a user account # 2. Create account specific sg enabled shared network - # 3. Deply vm in the shared network + # 3. Deploy vm in the shared network # 4. Try to delete shared network while it's stil in use by the vm # Validations, diff --git a/test/integration/component/test_assign_vm.py b/test/integration/component/test_assign_vm.py index c2ee442e32e8..948ab7211a70 100644 --- a/test/integration/component/test_assign_vm.py +++ b/test/integration/component/test_assign_vm.py @@ -327,7 +327,7 @@ def test_07_move_across_subdomain(self): @attr(tags = ["advanced"]) @log_test_exceptions def test_08_move_across_subdomain_network_create(self): - """Test as root, stop a VM from subdomain1 and attempt to move it to subdomain2, network should get craeted + """Test as root, stop a VM from subdomain1 and attempt to move it to subdomain2, network should get created """ # Validate the following: # 1. deploy VM in sub subdomain1 diff --git a/test/integration/component/test_base_image_updation.py b/test/integration/component/test_base_image_updation.py index bd78082be3eb..b31b1a156441 100644 --- a/test/integration/component/test_base_image_updation.py +++ b/test/integration/component/test_base_image_updation.py @@ -507,7 +507,7 @@ def test_03_restore_vm_with_new_template(self): return @attr(tags=["advanced", "basic"], required_hardware="false") - def test_04_reoccuring_snapshot_rules(self): + def test_04_reoccurring_snapshot_rules(self): """ 1) Create a VM using the Service offering IsVolatile enabled 2) Apply a recurring snapshot rule on the Volume. diff --git a/test/integration/component/test_custom_hostname.py b/test/integration/component/test_custom_hostname.py index 7d71c581e95f..31d3a43c408b 100644 --- a/test/integration/component/test_custom_hostname.py +++ b/test/integration/component/test_custom_hostname.py @@ -559,7 +559,7 @@ def test_03_duplicate_name(self): "Vm state should be running after deployment" ) self.debug("Display name: %s" % vm.displayname) - self.debug("Deplying another virtual machine with same name") + self.debug("Deploying another virtual machine with same name") with self.assertRaises(Exception): VirtualMachine.create( self.apiclient, diff --git a/test/integration/component/test_escalations_instances.py b/test/integration/component/test_escalations_instances.py index 0004cce0b35d..dbe1a0ef895a 100644 --- a/test/integration/component/test_escalations_instances.py +++ b/test/integration/component/test_escalations_instances.py @@ -2072,7 +2072,7 @@ def test_13_vm_nics(self): @attr(tags=["advanced", "basic"], required_hardware="true") def test_14_Create_vm_with_same_sshkey(self): """ - @Desc: Test to verify API call Register ssh key pair fails when uses same public key for differnet key name + @Desc: Test to verify API call Register ssh key pair fails when uses same public key for different key name """ diff --git a/test/integration/component/test_escalations_networks.py b/test/integration/component/test_escalations_networks.py index 37557b729a84..a12dfb9cc42b 100644 --- a/test/integration/component/test_escalations_networks.py +++ b/test/integration/component/test_escalations_networks.py @@ -275,7 +275,7 @@ def test_02_create_network_without_sourcenat(self): @Steps Step1 : Create Network Offering without sourcenat Step2 : Enable network offering - Step3 : Create network with sourcenat diasbled network offering + Step3 : Create network with sourcenat disabled network offering Step4 : Verifying that it raises an exception """ # Create Network offering specifically sourcenat disabled diff --git a/test/integration/component/test_netscaler_configs.py b/test/integration/component/test_netscaler_configs.py index b29afd5bd789..e4f939cb22ea 100644 --- a/test/integration/component/test_netscaler_configs.py +++ b/test/integration/component/test_netscaler_configs.py @@ -486,7 +486,7 @@ def test_netscaler_dedicated_mode(self): templateid=self.template.id, zoneid=self.zone.id ) - self.debug("Deply instance in dedicated Network offering mode failed") + self.debug("Deploy instance in dedicated Network offering mode failed") class TestNetScalerShared(_NetScalerDeployVMBase): diff --git a/test/integration/component/test_netscaler_nw_off.py b/test/integration/component/test_netscaler_nw_off.py index d9f6c9724f63..627c4a01c052 100644 --- a/test/integration/component/test_netscaler_nw_off.py +++ b/test/integration/component/test_netscaler_nw_off.py @@ -802,7 +802,7 @@ def test_02_multiple_netscaler_capacilty(self): # Validate the following # 1. Add another netscaler device and spawn a new VM again - # 2. VM deployement should be successful + # 2. VM deployment should be successful self.debug("Adding another netscaler device: %s" % self.services["netscaler_2"]["ipaddress"]) @@ -1672,7 +1672,7 @@ def test_shared_to_dedicated_upgrade(self): # LB rules # 5. Deploy instance with dedicated network offering in account 3. # Create Lb rules. - # 6. Configure another instace of netscaler in dedicated mode + # 6. Configure another instance of netscaler in dedicated mode # 7. upgrade networkj for user 1 to dedicated network offering. # Create LB rules. LB rule creation should be successful @@ -2063,7 +2063,7 @@ def test_shared_to_dedicated_upgrade(self): # LB rules # 5. Deploy instance with dedicated network offering in account 3. # Create Lb rules. - # 6. Configure another instace of netscaler in dedicated mode + # 6. Configure another instance of netscaler in dedicated mode # 7. upgrade networkj for user 1 to dedicated network offering. # Create LB rules. LB rule creation should be successful diff --git a/test/integration/component/test_organization_states.py b/test/integration/component/test_organization_states.py index 0d9afd3144aa..6ff9be338523 100644 --- a/test/integration/component/test_organization_states.py +++ b/test/integration/component/test_organization_states.py @@ -16,7 +16,7 @@ # under the License. """ -Test cases relating to enabling/diabling of zone/pod/cluster/host +Test cases relating to enabling/disabling of zone/pod/cluster/host """ # Import System modules @@ -335,7 +335,7 @@ def test_24_disablePod_user_deployVM(self): @attr("disruptive", "simulator_only", tags=["advanced"], required_hardware="false") def test_25_disablePod_user_stop_startVM(self): """ - Validate that regular user is allowed to stop and start existing VMs runing in a disabled pod + Validate that regular user is allowed to stop and start existing VMs running in a disabled pod """ self.vm_user.stop(self.user_apiclient) listResp = VirtualMachine.list(self.user_apiclient, id=self.vm_user.id) diff --git a/test/integration/component/test_persistent_networks.py b/test/integration/component/test_persistent_networks.py index ea5b3cc15167..d6b1efa522a2 100644 --- a/test/integration/component/test_persistent_networks.py +++ b/test/integration/component/test_persistent_networks.py @@ -1564,7 +1564,7 @@ def test_delete_account(self): self.assertEqual( validateList(networks)[0], FAIL, - "network list should be enmpty, it is %s" % + "network list should be empty, it is %s" % networks) public_ips = PublicIPAddress.list( diff --git a/test/integration/component/test_ps_project_limits.py b/test/integration/component/test_ps_project_limits.py index 7c9c704c259c..cfc5d5b0cee1 100644 --- a/test/integration/component/test_ps_project_limits.py +++ b/test/integration/component/test_ps_project_limits.py @@ -216,7 +216,7 @@ def test_03_delete_vm(self): try: self.vm.delete(self.apiclient) except Exception as e: - self.fail("Failed to detroy VM: %s" % e) + self.fail("Failed to destroy VM: %s" % e) self.assertTrue(isVmExpunged(self.apiclient, self.vm.id, self.project.id),\ "VM not expunged") diff --git a/test/integration/component/test_ps_resize_volume.py b/test/integration/component/test_ps_resize_volume.py index 4c8b0ef82a68..d0c9cc2efbeb 100644 --- a/test/integration/component/test_ps_resize_volume.py +++ b/test/integration/component/test_ps_resize_volume.py @@ -254,7 +254,7 @@ def test_02_increase_volume_size_above_account_limit(self): # 3. Deploy a VM without any disk offering (only root disk) # 4. Create a volume of 5 GB in the account and attach it to the VM # 5. Try to (resize) the volume to 20 GB - # 6. Resize opearation should fail""" + # 6. Resize operation should fail""" # Setting up account and domain hierarchy result = self.setupAccounts() @@ -318,7 +318,7 @@ def test_03_increase_volume_size_above_domain_limit(self): # 3. Deploy a VM without any disk offering (only root disk) # 4. Create a volume of 5 GB in the account and attach it to the VM # 5. Try to (resize) the volume to 20 GB - # 6. Resize opearation should fail""" + # 6. Resize operation should fail""" # Setting up account and domain hierarchy result = self.setupAccounts() diff --git a/test/integration/component/test_redundant_router_upgrades.py b/test/integration/component/test_redundant_router_upgrades.py index 4e8454762dec..25a71df24c64 100644 --- a/test/integration/component/test_redundant_router_upgrades.py +++ b/test/integration/component/test_redundant_router_upgrades.py @@ -226,7 +226,7 @@ def test_upgradeVR_to_redundantVR(self): # 1. listNetworks should show the created network in allocated state # 2. VM should be deployed and in Running state and there should be # one Router running for this network - # 3. listNetworkOfferings should show craeted offering for RvR + # 3. listNetworkOfferings should show created offering for RvR # 4. listNetworks shows the network still successfully implemented # 5. listRouters shows two routers Up and Running (PRIMARY and BACKUP) @@ -369,11 +369,11 @@ def test_downgradeRvR_to_VR(self): # 6. listRouters in the network # 7. delete account in which resources are created # Validate the following - # 1. listNetworkOfferings should show craeted offering for RvR + # 1. listNetworkOfferings should show created offering for RvR # 2. listNetworks should show the created network in allocated state # 3. VM should be deployed and in Running state and there should be # two routers (PRIMARY and BACKUP) for this network - # 4. listNetworkOfferings should show craeted offering for VR + # 4. listNetworkOfferings should show created offering for VR # 5. listNetworks shows the network still successfully implemented # 6. listRouters shows only one router for this network in Running diff --git a/test/integration/component/test_vpc_vm_life_cycle.py b/test/integration/component/test_vpc_vm_life_cycle.py index abe6d194a54f..d487a7fa1bdb 100644 --- a/test/integration/component/test_vpc_vm_life_cycle.py +++ b/test/integration/component/test_vpc_vm_life_cycle.py @@ -1274,7 +1274,7 @@ def test_02_deploy_vm_vpcvr_stopped(self): except Exception as e: self.fail("Failed to deploy the virtual instance: %s" % e) - self.debug("Verify the deployment of virtual instace") + self.debug("Verify the deployment of virtual instance") vms = VirtualMachine.list( self.apiclient, id=vm.id, diff --git a/test/integration/testpaths/testpath_usage.py b/test/integration/testpaths/testpath_usage.py index 772611659ac2..bf3603c198d8 100644 --- a/test/integration/testpaths/testpath_usage.py +++ b/test/integration/testpaths/testpath_usage.py @@ -453,7 +453,7 @@ def test_01_positive_tests_usage(self): # 12. Start the VM # 13. Verify that the running VM usage after start operation is less than the allocated VM usage - # 14. Verify that the running VM usage after start vm opearation + # 14. Verify that the running VM usage after start vm operation is greater running VM usage after recover VM operation """ diff --git a/test/integration/testpaths/testpath_uuid_event.py b/test/integration/testpaths/testpath_uuid_event.py index 71a5abcee528..115c91ee020e 100644 --- a/test/integration/testpaths/testpath_uuid_event.py +++ b/test/integration/testpaths/testpath_uuid_event.py @@ -131,7 +131,7 @@ def test_01_verify_events_table(self): # 1. Deploy a VM. # 2. Take VM snapshot. - # 3. Verify that events table records UUID of the volume in descrption + # 3. Verify that events table records UUID of the volume in description instead of volume ID """ # Step 1 diff --git a/test/integration/testpaths/testpath_volumelifecycle.py b/test/integration/testpaths/testpath_volumelifecycle.py index 3b8350c164f0..9057ccaa3bc5 100644 --- a/test/integration/testpaths/testpath_volumelifecycle.py +++ b/test/integration/testpaths/testpath_volumelifecycle.py @@ -204,7 +204,7 @@ def setUpClass(cls): cls.apiclient, cls.testdata["service_offerings"]) cls._cleanup.append(cls.service_offering_2) - # craete a compute offering with local storage + # create a compute offering with local storage cls.testdata["disk_offering"]["storagetype"] = 'local' cls.disk_offering_local = DiskOffering.create( cls.apiclient, diff --git a/test/metadata/func/vmapi.xml b/test/metadata/func/vmapi.xml index 8c1263c77676..edbbb9ba3bc6 100644 --- a/test/metadata/func/vmapi.xml +++ b/test/metadata/func/vmapi.xml @@ -135,7 +135,7 @@ under the License. listVirtualMachines - 72 [List the Destroyed Virutal Machine] + 72 [List the Destroyed Virtual Machine] account diff --git a/test/selenium/smoke/VM_lifeCycle.py b/test/selenium/smoke/VM_lifeCycle.py index 480c45c8237c..3e45f1899f1e 100644 --- a/test/selenium/smoke/VM_lifeCycle.py +++ b/test/selenium/smoke/VM_lifeCycle.py @@ -97,7 +97,7 @@ def test_deployvm(self): ## Now we must wait for some random time (Educated guess based on experience) and check if VM has been deployed and if it is in running state. - ## Should take about 4 min to deploy VM.. but we will wait 5 mins and check the status , we will do this twice. So total 2 check within 10 mins with first check occuring at 5th min. + ## Should take about 4 min to deploy VM.. but we will wait 5 mins and check the status , we will do this twice. So total 2 check within 10 mins with first check occurring at 5th min. driver.refresh() # Refresh UI Page; This polls latest status. diff --git a/tools/docker/README.md b/tools/docker/README.md index 4384342dbf3d..00c0b063c4fb 100644 --- a/tools/docker/README.md +++ b/tools/docker/README.md @@ -102,7 +102,7 @@ tag:latest = main branch docker build -f Dockerfile.centos6 -t cloudstack/management_centos6 . ``` -2. on jenkins, database and systemvm.iso are pre-deployed. the inital start require privileged container to +2. on jenkins, database and systemvm.iso are pre-deployed. the initial start require privileged container to mount systemvm.iso and copy ssh_rsa.pub into it. ``` diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py index 39af1d4303bc..08f983631e3b 100755 --- a/tools/marvin/marvin/lib/base.py +++ b/tools/marvin/marvin/lib/base.py @@ -380,7 +380,7 @@ class VirtualMachine: STOPPING = STOPPING STARTING = STARTING - # Varibles denoting VM state - end + # Variables denoting VM state - end def __init__(self, items, services): self.__dict__.update(items) diff --git a/tools/marvin/marvin/misc/build/CI.md b/tools/marvin/marvin/misc/build/CI.md index d98685091f8e..ec0dada6a4b1 100644 --- a/tools/marvin/marvin/misc/build/CI.md +++ b/tools/marvin/marvin/misc/build/CI.md @@ -122,7 +122,7 @@ When jenkins triggers the job following sequence of actions occur on the test in 3. we fetch the last successful marvin build from builds.a.o and install it within this virtualenv. installing a new marvin on each run helps us test with the latest APIs available. -4. we fetch the latest version of the driver script from github:cloud-autodeploy. fetching the latest allows us to make adjustments to the infra without having to copy scripts in to the test infrastrcuture. +4. we fetch the latest version of the driver script from github:cloud-autodeploy. fetching the latest allows us to make adjustments to the infra without having to copy scripts in to the test infrastructure. 5. based on the hypervisor chosen we choose a profile for cobbler to reimage the hosts in the infrastructure. if xen is chosen we bring up the profile of the latest xen kickstart available in cobbler. currently - this is at xen 6.0.2. if kvm is chosen we can pick between ubuntu and rhel based host OS kickstarts. diff --git a/ui/docs/development.md b/ui/docs/development.md index e984793bc708..9290224285d6 100644 --- a/ui/docs/development.md +++ b/ui/docs/development.md @@ -207,7 +207,7 @@ The Resource View has 2 sections: with the related entities - DetailsTab to the right which provide the basic details about the resource. -Custom tabs to render custom details, addtional information of the resource +Custom tabs to render custom details, additional information of the resource The list of fields to be displayed maybe defined as an array or a function in case we need to selectively (i.e., based on certain conditions) restrict the view of certain columns. The names specified in the diff --git a/ui/public/color.less b/ui/public/color.less index 58071f04b2f5..27afa788b90e 100644 --- a/ui/public/color.less +++ b/ui/public/color.less @@ -1720,7 +1720,7 @@ this.tinycolor = tinycolor; @screen-xl : 1200px; @screen-xl-min : @screen-xl; -// Extra extra large screen / large descktop +// Extra extra large screen / large desktop @screen-xxl : 1600px; @screen-xxl-min : @screen-xxl; diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json index e6650e9bb511..b077ce4c6e08 100644 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@ -1013,8 +1013,8 @@ "label.infrastructure": "Infrastructure", "label.ingress": "Ingress", "label.ingress.rule": "Ingress Rule", -"label.initial": "Inital", -"label.initialized": "Initalized", +"label.initial": "Initial", +"label.initialized": "Initialized", "label.insideportprofile": "Inside port profile", "label.installwizard.addzoneintro.title": "Let's add a zone", "label.installwizard.subtitle": "This guide will aid you in setting up your CloudStack™ installation", diff --git a/ui/public/locales/ja_JP.json b/ui/public/locales/ja_JP.json index f1518286f80b..f566f3881480 100644 --- a/ui/public/locales/ja_JP.json +++ b/ui/public/locales/ja_JP.json @@ -800,7 +800,7 @@ "label.disabled": "無効", "label.disabling.vpn.access": "VPNアクセスを無効にしています", "label.disassociate.profile.blade": "プロファイルとブレードの関連付けの解除", - "label.disbale.vnmc.device": "VNMCデバイスの無効化", + "label.disable.vnmc.device": "VNMCデバイスの無効化", "label.disconnected": "最終切断日時", "label.disk": "ディスク", "label.disk.newoffering": "新しいディスクオファリング", diff --git a/ui/public/locales/zh_CN.json b/ui/public/locales/zh_CN.json index 91353d2f81ab..39765fd26fa6 100644 --- a/ui/public/locales/zh_CN.json +++ b/ui/public/locales/zh_CN.json @@ -922,7 +922,7 @@ "label.disabled": "\u5DF2\u7981\u7528", "label.disabling.vpn.access": "\u6B63\u5728\u7981\u7528 VPN \u8BBF\u95EE", "label.disassociate.profile.blade": "\u53D6\u6D88\u5C06\u914D\u7F6E\u6587\u4EF6\u4E0E\u5200\u7247\u5F0F\u670D\u52A1\u5668\u5173\u8054", - "label.disbale.vnmc.device": "\u7981\u7528 VNMC \u8BBE\u5907", + "label.disable.vnmc.device": "\u7981\u7528 VNMC \u8BBE\u5907", "label.disconnected": "\u4E0A\u6B21\u65AD\u5F00\u8FDE\u63A5\u65F6\u95F4", "label.disk": "\u78C1\u76D8", diff --git a/ui/src/views/compute/DeployVM.vue b/ui/src/views/compute/DeployVM.vue index a6831975e278..31a39ab95e48 100644 --- a/ui/src/views/compute/DeployVM.vue +++ b/ui/src/views/compute/DeployVM.vue @@ -1642,7 +1642,7 @@ export default { } this.fetchBootTypes() this.fetchBootModes() - this.fetchInstaceGroups() + this.fetchInstanceGroups() this.fetchIoPolicyTypes() nextTick().then(() => { ['name', 'keyboard', 'boottype', 'bootmode', 'userdata', 'iothreadsenabled', 'iodriverpolicy', 'nicmultiqueuenumber', 'nicpackedvirtqueues'].forEach(this.fillValue) @@ -1697,7 +1697,7 @@ export default { { id: 'storage_specific', description: 'storage_specific' } ] }, - fetchInstaceGroups () { + fetchInstanceGroups () { this.options.instanceGroups = [] api('listInstanceGroups', { account: this.$store.getters.userInfo.account, diff --git a/ui/src/views/compute/DeployVnfAppliance.vue b/ui/src/views/compute/DeployVnfAppliance.vue index 5e1baac3d8fb..882965ce9c24 100644 --- a/ui/src/views/compute/DeployVnfAppliance.vue +++ b/ui/src/views/compute/DeployVnfAppliance.vue @@ -1718,7 +1718,7 @@ export default { } this.fetchBootTypes() this.fetchBootModes() - this.fetchInstaceGroups() + this.fetchInstanceGroups() this.fetchIoPolicyTypes() nextTick().then(() => { ['name', 'keyboard', 'boottype', 'bootmode', 'userdata', 'iothreadsenabled', 'iodriverpolicy', 'nicmultiqueuenumber', 'nicpackedvirtqueues'].forEach(this.fillValue) @@ -1773,7 +1773,7 @@ export default { { id: 'storage_specific', description: 'storage_specific' } ] }, - fetchInstaceGroups () { + fetchInstanceGroups () { this.options.instanceGroups = [] api('listInstanceGroups', { account: this.$store.getters.userInfo.account, diff --git a/ui/src/views/compute/EditVM.vue b/ui/src/views/compute/EditVM.vue index 3601901252bf..3093ffad5101 100644 --- a/ui/src/views/compute/EditVM.vue +++ b/ui/src/views/compute/EditVM.vue @@ -185,7 +185,7 @@ export default { this.fetchZoneDetails() this.fetchSecurityGroups() this.fetchOsTypes() - this.fetchInstaceGroups() + this.fetchInstanceGroups() this.fetchServiceOfferingData() this.fetchTemplateData() this.fetchDynamicScalingVmConfig() @@ -262,7 +262,7 @@ export default { this.$notifyError(error) }).finally(() => { this.osTypes.loading = false }) }, - fetchInstaceGroups () { + fetchInstanceGroups () { this.groups.loading = true this.groups.opts = [] const params = { diff --git a/ui/src/views/iam/CreateRole.vue b/ui/src/views/iam/CreateRole.vue index e3513b62a3f5..4dc0f4d8e8b4 100644 --- a/ui/src/views/iam/CreateRole.vue +++ b/ui/src/views/iam/CreateRole.vue @@ -202,7 +202,7 @@ export default { this.$emit('refresh-data') this.$notification.success({ message: 'Create Role', - description: 'Sucessfully created role ' + params.name + description: 'Successfully created role ' + params.name }) } this.closeAction() diff --git a/ui/src/views/iam/ImportRole.vue b/ui/src/views/iam/ImportRole.vue index 857787244746..fa5ac2c70e36 100644 --- a/ui/src/views/iam/ImportRole.vue +++ b/ui/src/views/iam/ImportRole.vue @@ -213,7 +213,7 @@ export default { this.$emit('refresh-data') this.$notification.success({ message: 'Import Role', - description: 'Sucessfully imported role ' + params.name + description: 'Successfully imported role ' + params.name }) } this.closeAction() diff --git a/ui/src/views/offering/AddComputeOffering.vue b/ui/src/views/offering/AddComputeOffering.vue index 80d200f1f25d..78ba71330806 100644 --- a/ui/src/views/offering/AddComputeOffering.vue +++ b/ui/src/views/offering/AddComputeOffering.vue @@ -631,7 +631,7 @@ export default { domainLoading: false, zones: [], zoneLoading: false, - selectedDeployementPlanner: null, + selectedDeploymentPlanner: null, storagePolicies: null, storageTags: [], storageTagLoading: false, @@ -918,9 +918,9 @@ export default { this.qosType = val }, handleDeploymentPlannerChange (planner) { - this.selectedDeployementPlanner = planner + this.selectedDeploymentPlanner = planner this.plannerModeVisible = false - if (this.selectedDeployementPlanner === 'ImplicitDedicationPlanner') { + if (this.selectedDeploymentPlanner === 'ImplicitDedicationPlanner') { this.plannerModeVisible = isAdmin() } }, diff --git a/usage/src/main/java/com/cloud/usage/UsageAlertManagerImpl.java b/usage/src/main/java/com/cloud/usage/UsageAlertManagerImpl.java index aa20f52bf1f0..823d04c28c66 100644 --- a/usage/src/main/java/com/cloud/usage/UsageAlertManagerImpl.java +++ b/usage/src/main/java/com/cloud/usage/UsageAlertManagerImpl.java @@ -83,7 +83,7 @@ public void sendAlert(AlertType alertType, long dataCenterId, Long podId, String if ((alertType != AlertManager.AlertType.ALERT_TYPE_HOST) && (alertType != AlertManager.AlertType.ALERT_TYPE_USERVM) && (alertType != AlertManager.AlertType.ALERT_TYPE_DOMAIN_ROUTER) && (alertType != AlertManager.AlertType.ALERT_TYPE_CONSOLE_PROXY) && (alertType != AlertManager.AlertType.ALERT_TYPE_SSVM) && (alertType != AlertManager.AlertType.ALERT_TYPE_STORAGE_MISC) - && (alertType != AlertManager.AlertType.ALERT_TYPE_MANAGMENT_NODE)) { + && (alertType != AlertManager.AlertType.ALERT_TYPE_MANAGEMENT_NODE)) { alert = _alertDao.getLastAlert(alertType.getType(), dataCenterId, podId); } if (alert == null) { diff --git a/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java b/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java index 37906496059c..ae9e95bd87cd 100644 --- a/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java +++ b/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java @@ -1250,7 +1250,7 @@ private void createVMHelperEvent(UsageEventVO event) { List usageInstances = _usageInstanceDao.search(sc, null); if (usageInstances != null) { if (usageInstances.size() > 1) { - s_logger.warn("found multiple entries for a vm allocated with id: " + vmId + ", detroying them all..."); + s_logger.warn("found multiple entries for a vm allocated with id: " + vmId + ", destroying them all..."); } for (UsageVMInstanceVO usageInstance : usageInstances) { usageInstance.setEndDate(event.getCreateDate());