diff --git a/api/src/main/java/com/cloud/configuration/ConfigurationService.java b/api/src/main/java/com/cloud/configuration/ConfigurationService.java index 729f72b23ca2..1e6d3ff11fb3 100644 --- a/api/src/main/java/com/cloud/configuration/ConfigurationService.java +++ b/api/src/main/java/com/cloud/configuration/ConfigurationService.java @@ -279,7 +279,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 c33488cd9239..d385967b1363 100644 --- a/api/src/main/java/org/apache/cloudstack/acl/RoleType.java +++ b/api/src/main/java/org/apache/cloudstack/acl/RoleType.java @@ -130,12 +130,12 @@ public static Set fromCombinedMask(int combinedMask) { /** * 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("Role [{}] is not null; therefore, we use its Account type [{}].", role, defautAccountType); + LOGGER.debug("Role [{}] is not null; therefore, we use its Account type [{}].", role, defaultAccountType); return role.getRoleType().getAccountType(); } - LOGGER.debug("Role is null; therefore, we use the default Account type [{}] value.", defautAccountType); - return defautAccountType; + LOGGER.debug("Role is null; therefore, we use the default Account type [{}] value.", defaultAccountType); + return defaultAccountType; } } 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 0711444c061b..be5d9ccd84ad 100644 --- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java +++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java @@ -875,7 +875,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 d7342654ec40..0be846e9cfb0 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 @@ -49,7 +49,7 @@ public class UpdateHypervisorCapabilitiesCmd extends BaseCmd { @Parameter(name = ApiConstants.HYPERVISOR_VERSION, type = CommandType.STRING, description = "The hypervisor version for which the hypervisor capabilities are to be updated", since = "4.19.1") private String hypervisorVersion; - @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 maximum number of Guest Instances per host for this hypervisor.") 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 d7f448d6ece6..cba0db449c64 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 00c94a6fd0e7..2b7ee0fd0f9f 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 a835b2376272..63806b7963e7 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 Instances 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 31c384eab3a0..b09a9fa4a33e 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 3d2608c0c4b8..a1c418fa96d6 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; @@ -69,8 +69,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) { @@ -172,12 +172,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 cd5cac7228eb..3f64191f9287 100755 --- a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java @@ -116,7 +116,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; @@ -3829,12 +3829,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); logger.debug("Deleted config drive ISO for vm {} in host {}", vm.getInstanceName(), srcHost); } catch (OperationTimedoutException e) { - logger.error("TIme out occurred while exeuting command AttachOrDettachConfigDrive {}", e.getMessage(), e); + 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 21ef851fb2f2..2698cadc9090 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 @@ -209,8 +209,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 42a8b27fa854..160a32fc370e 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 @@ -588,7 +588,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 509fd340dae4..bced4dafda3b 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 @@ -197,7 +197,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 007640e8aad3..70c35e77aefd 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 @@ -311,7 +311,7 @@ protected boolean doScript(Script cmd, OutputInterpreter interpreter, int retry) } } - logger.warn("IPMI Scirpt failed due to " + res + "(" + cmd.toString() + ")"); + 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 a54cd4a1a118..e87bd391c2a7 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 @@ -89,7 +89,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 4c2ca1a61ba3..44b2b5c8f74c 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 @@ -88,7 +88,7 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE response.setObjectName("baremetaldhcps"); this.setResponseObject(response); } catch (Exception e) { - logger.debug("Exception happend while executing ListBaremetalDhcpCmd"); + 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 5d2e909dd119..43ee9dc6d527 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 84c67d7a9650..8072acdaaea3 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); } } @@ -1827,7 +1827,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 6f0327845a03..84e02f7ef825 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 343f4122eb0f..1982c129faf3 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 6610985d5841..006139510528 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 @@ -344,7 +344,7 @@ public final void testModifyStoragePoolCommand2() { } // Use same spec for pool - logger.info("Createing pool at : " + folderName); + logger.info("Creating pool at : " + folderName); StoragePoolVO pool = new StoragePoolVO(StoragePoolType.Filesystem, "127.0.0.1", -1, folderName); pool.setUuid(s_testLocalStoreUUID); @@ -367,7 +367,7 @@ public final StoragePoolVO createTestStoragePoolVO(final String folderName) { } // Use same spec for pool - logger.info("Createing pool at : " + folderName); + 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 af87dc08287f..62e52f0c1d31 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 @@ -850,7 +850,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 a6f2bcc93408..d54f7b86aff6 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 @@ -81,7 +81,7 @@ public Answer execute(FreezeThawVMCommand command, LibvirtComputingResource serv try { domain.free(); } catch (LibvirtException e) { - logger.trace("Ingore error ", e); + 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 f37ae3d2a3c4..3a5102fd0690 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 @@ -131,7 +131,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 235949502c71..acf861fa61b5 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 @@ -75,8 +75,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; @@ -1423,7 +1423,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(); @@ -1877,7 +1877,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(); @@ -1901,10 +1901,10 @@ public Answer dettachVolume(final DettachCommand cmd) { resource.removeCheckpointsOnVm(vmName, vol.getUuid(), vol.getCheckpointPaths()); - return new DettachAnswer(disk); + return new DetachAnswer(disk); } catch (final LibvirtException | InternalErrorException | CloudRuntimeException e) { logger.debug(String.format("Failed to detach volume [id: %d, uuid: %s, name: %s, path: %s], due to ", vol.getId(), vol.getUuid(), vol.getName(), vol.getPath()), 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 514554290392..f4ec007e4568 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 @@ -1057,7 +1057,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 ccd1704b3225..698172bbfe22 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 800df1db91fe..8c49bd1ab499 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; @@ -414,8 +414,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); @@ -470,7 +470,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 = ""; @@ -529,8 +529,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); @@ -705,7 +705,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; } @@ -863,7 +863,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 6c2f48dbf8de..2d38108d9819 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 90a6ab94d44d..96172a422141 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 @@ -1098,7 +1098,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) { - logger.debug("failed to gernerate md5:" + e.toString()); + 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 e19b0fa01c39..aca9c0dd543c 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 @@ -34,8 +34,8 @@ import org.apache.cloudstack.storage.command.CreateObjectCommand; import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplianceCommand; import org.apache.cloudstack.storage.command.DeleteCommand; -import org.apache.cloudstack.storage.command.DettachAnswer; -import org.apache.cloudstack.storage.command.DettachCommand; +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; @@ -202,7 +202,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(); @@ -213,9 +213,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/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java index 89b5b111e14f..e1ffbeeda4ae 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 @@ -3061,7 +3061,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, @@ -5023,7 +5023,7 @@ private Answer migrateVolume(MigrateVolumeCommand cmd) { try { // OfflineVmwareMigration: worker *may* have been renamed vmName = vmMo.getVmName(); - logger.info("Dettaching disks before destroying worker VM '" + vmName + "' after volume migration"); + 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 253bbf2d0930..fd44d251ffbe 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; @@ -1750,7 +1750,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 { @@ -2385,12 +2385,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 373bcce5cb2d..3e381fe0a368 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; @@ -147,7 +147,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 cdb4d7434aef..51eb21ae6dd2 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 @@ -1314,7 +1314,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; @@ -5530,7 +5530,7 @@ public SR createLocalIsoSR(final Connection conn, final String srName) throws Xe SR sr = getSRByNameLabelandHost(conn, srName); if (sr != null) { - logger.debug("Config drive SR already exist, returing it"); + 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 a1d27b65abac..38707606aecb 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 @@ -42,8 +42,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; @@ -387,7 +387,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(); @@ -438,20 +438,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(); 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(); 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(); @@ -475,7 +475,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) { @@ -502,10 +502,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) { - logger.warn("Failed dettach volume: " + data.getPath()); - return new DettachAnswer("Failed dettach volume: " + data.getPath() + ", due to " + e.toString()); + 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 89% 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 e735e96efe3f..31164b720733 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; @@ -35,12 +35,12 @@ 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 { @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(); 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 5c2355a4cec3..693a9a577fd2 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 @@ -77,7 +77,7 @@ public Answer execute(final StartCommand command, final CitrixResourceBase citri citrixResourceBase.destroyVm(v, conn, true); } 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; logger.debug(msg); return new StartAnswer(command, msg, host); } else { 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 8643ea4ac74a..9f2be2ff6e9c 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/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 19129e19ae9b..c62df4d0e27e 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 188830e13249..06db710a1b97 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 4bbc2ffb0469..fbe2eeb1c8d8 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 9e60db93efd5..14294f0eb8cc 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 @@ -1804,7 +1804,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 894c258939e2..c01df0530141 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 @@ -68,11 +68,11 @@ protected boolean canHandle(NetworkOffering offering, NetworkType networkType, P } if (setting != null) { if (networkType != NetworkType.Advanced) { - logger.info("SSP enebled by " + setting + " but not active because networkType was " + networkType); + logger.info("SSP enabled by " + setting + " but not active because networkType was " + networkType); } else if (!isMyTrafficType(offering.getTrafficType())) { logger.info("SSP enabled by " + setting + " but not active because traffic type not Guest"); } else if (offering.getGuestType() != Network.GuestType.Isolated) { - logger.info("SSP works for network isolatation."); + logger.info("SSP works for network isolation."); } else if (!_sspMgr.canHandle(physicalNetwork)) { logger.info("SSP manager not ready"); } else { 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 38eb6c34da2e..4d7d3da4ee67 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 @@ -266,7 +266,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()); @@ -466,7 +466,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 16d9f17e8b44..d3aced88a2a8 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/capacity/CapacityManagerImpl.java b/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java index 3be7384ffb71..1f4052f7e20a 100644 --- a/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java +++ b/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java @@ -739,7 +739,7 @@ public void updateCapacityForHost(final Host host) { String vmDetailCpu = vmDetails.get(VmDetailConstants.CPU_OVER_COMMIT_RATIO); String vmDetailRam = vmDetails.get(VmDetailConstants.MEMORY_OVER_COMMIT_RATIO); if (vmDetailCpu != null) { - //if vmDetail_cpu is not null it means it is running in a overcommited cluster. + //if vmDetail_cpu is not null it means it is running in a overcommitted cluster. cpuOvercommitRatio = Float.parseFloat(vmDetailCpu); } if (vmDetailRam != null) { 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 c08246c5a15b..c3144eeb168c 100644 --- a/server/src/main/java/com/cloud/network/element/VirtualRouterElement.java +++ b/server/src/main/java/com/cloud/network/element/VirtualRouterElement.java @@ -289,7 +289,7 @@ public boolean applyFWRules(final Network network, final List void collectNetworkStatistics(final T router, f } try { if (answer.getBytesReceived() == 0 && answer.getBytesSent() == 0) { - logger.debug("Recieved and Sent bytes are both 0. Not updating user_statistics"); + logger.debug("Received and Sent bytes are both 0. Not updating user_statistics"); continue; } diff --git a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java index 8557b91850d7..4061afe4c75d 100644 --- a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java @@ -121,7 +121,7 @@ import org.apache.cloudstack.secstorage.heuristics.Heuristic; import org.apache.cloudstack.secstorage.heuristics.HeuristicType; import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplianceCommand; -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; @@ -2393,7 +2393,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 11b24a9beef6..de97a78523e8 100644 --- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java +++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java @@ -103,7 +103,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; @@ -3601,7 +3601,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 86bcb8a76d79..0c35074032cd 100755 --- a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java @@ -95,7 +95,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; @@ -1550,8 +1550,8 @@ private boolean attachISOToVM(long vmId, long isoId, int deviceSeq, boolean atta 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 689b748379f7..543346fe4b9f 100644 --- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java @@ -155,7 +155,7 @@ import org.apache.cloudstack.resourcelimit.Reserver; 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; @@ -9837,9 +9837,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 a2cc9495405e..06b67be81cc4 100644 --- a/server/src/test/java/com/cloud/user/AccountManagerImplTest.java +++ b/server/src/test/java/com/cloud/user/AccountManagerImplTest.java @@ -944,19 +944,19 @@ public void validateAndUpdateUsernameIfNeededTestNoDuplicatedUserNames() { } @Test - public void valiateUserPasswordAndUpdateIfNeededTestPasswordNull() { + public void validateUserPasswordAndUpdateIfNeededTestPasswordNull() { accountManagerImpl.validateUserPasswordAndUpdateIfNeeded(null, userVoMock, null, false); Mockito.verify(userVoMock, Mockito.times(0)).setPassword(Mockito.anyString()); } @Test(expected = InvalidParameterValueException.class) - public void valiateUserPasswordAndUpdateIfNeededTestBlankPassword() { + public void validateUserPasswordAndUpdateIfNeededTestBlankPassword() { accountManagerImpl.validateUserPasswordAndUpdateIfNeeded(" ", userVoMock, null, false); } @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); @@ -970,7 +970,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 4345ff24e3c5..5138ccc76f3a 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 @@ -3118,7 +3118,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 59218b136b94..3147999707f4 100644 --- a/systemvm/agent/noVNC/core/rfb.js +++ b/systemvm/agent/noVNC/core/rfb.js @@ -1856,7 +1856,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_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 4a12345b6e80..0f9c1d30b905 100644 --- a/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py +++ b/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py @@ -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): """ - Validate 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,12 +1714,12 @@ 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_SOURCE): 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): 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 fb9e146eb076..cfffb7715072 100644 --- a/test/integration/component/test_advancedsg_networks.py +++ b/test/integration/component/test_advancedsg_networks.py @@ -784,7 +784,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 e01f6fbc686e..19fbe57fe1d7 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 9398f883c2d8..13d4a68e95a2 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 4aea35850d07..4893b64e8d55 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_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_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/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 e4ac392c28aa..a5948e748c1b 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/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py index f554a332e0e1..0811871d7b1c 100755 --- a/tools/marvin/marvin/lib/base.py +++ b/tools/marvin/marvin/lib/base.py @@ -381,7 +381,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/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/ja_JP.json b/ui/public/locales/ja_JP.json index 3272c52d9822..774a94229b60 100644 --- a/ui/public/locales/ja_JP.json +++ b/ui/public/locales/ja_JP.json @@ -803,7 +803,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 689b026cb427..fc26f5d6abd6 100644 --- a/ui/public/locales/zh_CN.json +++ b/ui/public/locales/zh_CN.json @@ -925,7 +925,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",