From 6401c850b76331347a8bb88e8fee10314da9cc43 Mon Sep 17 00:00:00 2001 From: John Bampton Date: Wed, 9 Mar 2022 02:02:35 +1000 Subject: [PATCH] Fix spelling (#6064) * Fix spelling - `interupted` to `interrupted` - `paramter` to `parameter` * Fix more typos --- agent/conf/agent.properties | 4 ++-- .../main/java/com/cloud/agent/AgentShell.java | 2 +- .../api/command/user/vm/DeployVMCmd.java | 2 +- .../security/dao/VmRulesetLogDaoImpl.java | 2 +- .../manager/StorageCacheManagerImpl.java | 2 +- .../ClusterServiceServletContainer.java | 2 +- .../java/com/cloud/utils/db/Merovingian2.java | 2 +- .../com/cloud/utils/db/GlobalLockTest.java | 2 +- .../framework/messagebus/MessageBusBase.java | 2 +- .../framework/messagebus/MessageDetector.java | 2 +- .../com/cloud/utils/db/StaticStrategy.java | 2 +- .../networkservice/BareMetalResourceBase.java | 2 +- .../resource/HypervDirectConnectResource.java | 4 ++-- .../LibvirtBackupSnapshotCommandWrapper.java | 2 +- .../LibvirtManageSnapshotCommandWrapper.java | 2 +- .../storage/IscsiStorageCleanupMonitor.java | 4 ++-- .../kvm/storage/KVMStoragePoolManager.java | 2 +- .../kvm/storage/KVMStorageProcessor.java | 2 +- .../kvm/storage/LibvirtStorageAdaptor.java | 20 +++++++++---------- .../kvm/storage/ScaleIOStorageAdaptor.java | 4 ++-- .../vmware/resource/VmwareResource.java | 6 +++--- .../resource/XenServerStorageProcessor.java | 2 +- .../xenbase/CitrixCreateCommandWrapper.java | 2 +- .../network/resource/NetscalerResource.java | 2 +- .../datastore/util/ElastistorUtil.java | 2 +- scripts/vm/hypervisor/kvm/setup_agent.sh | 8 ++++---- .../main/java/com/cloud/api/ApiDBUtils.java | 2 +- .../network/NetworkMigrationManagerImpl.java | 4 ++-- ...VpcVirtualNetworkApplianceManagerImpl.java | 2 +- .../cloud/network/rules/RulesManagerImpl.java | 2 +- .../com/cloud/network/vpc/VpcManagerImpl.java | 8 ++++---- .../storage/snapshot/SnapshotManagerImpl.java | 2 +- .../com/cloud/vm/SystemVmLoadScanner.java | 2 +- .../vm/UnmanagedVMsManagerImpl.java | 2 +- .../src/main/java/streamer/SyncLink.java | 2 +- .../main/java/streamer/debug/FakeSource.java | 2 +- .../consoleproxy/ConsoleProxyClientBase.java | 4 ++-- .../consoleproxy/ConsoleProxyGCThread.java | 2 +- .../test_zone_level_local_storage_setting.py | 2 +- .../component/test_acl_listsnapshot.py | 6 +++--- test/integration/component/test_acl_listvm.py | 6 +++--- .../component/test_acl_listvolume.py | 6 +++--- .../component/test_blocker_bugs.py | 2 +- test/integration/component/test_haproxy.py | 2 +- .../component/test_rootvolume_resize.py | 2 +- .../component/test_vpc_network_pfrules.py | 4 ++-- .../test_vpc_network_staticnatrule.py | 2 +- test/integration/smoke/test_accounts.py | 4 ++-- .../testpaths/testpath_snapshot_hadrning.py | 4 ++-- .../testpaths/testpath_volumelifecycle.py | 8 ++++---- .../com/cloud/test/regression/ApiCommand.java | 2 +- .../test/stress/StressTestDirectAttach.java | 2 +- .../cloud/test/stress/TestClientWithAPI.java | 2 +- .../com/cloud/test/utils/ConsoleProxy.java | 2 +- tools/ngui/static/js/lib/angular.js | 2 +- .../vmware/mo/HypervisorHostHelper.java | 2 +- .../vmware/mo/VirtualMachineMO.java | 8 ++++---- .../hypervisor/vmware/util/VmwareContext.java | 2 +- 58 files changed, 96 insertions(+), 96 deletions(-) diff --git a/agent/conf/agent.properties b/agent/conf/agent.properties index dafe7086d98..da9f20f2a51 100644 --- a/agent/conf/agent.properties +++ b/agent/conf/agent.properties @@ -119,11 +119,11 @@ domr.scripts.dir=scripts/network/domr/kvm # agent.hooks.libvirt_vm_xml_transformer.script=libvirt-vm-xml-transformer.groovy # agent.hooks.libvirt_vm_xml_transformer.method=transform # -# The hook is called right after libvirt successfuly launched VM +# The hook is called right after libvirt successfully launched VM # agent.hooks.libvirt_vm_on_start.script=libvirt-vm-state-change.groovy # agent.hooks.libvirt_vm_on_start.method=onStart # -# The hook is called right after libvirt successfuly stopped VM +# The hook is called right after libvirt successfully stopped VM # agent.hooks.libvirt_vm_on_stop.script=libvirt-vm-state-change.groovy # agent.hooks.libvirt_vm_on_stop.method=onStop # diff --git a/agent/src/main/java/com/cloud/agent/AgentShell.java b/agent/src/main/java/com/cloud/agent/AgentShell.java index d87f51444cd..f5920a8e037 100644 --- a/agent/src/main/java/com/cloud/agent/AgentShell.java +++ b/agent/src/main/java/com/cloud/agent/AgentShell.java @@ -513,7 +513,7 @@ public class AgentShell implements IAgentShell, Daemon { while (!_exit) Thread.sleep(1000); } catch (InterruptedException e) { - s_logger.debug("[ignored] AgentShell was interupted."); + s_logger.debug("[ignored] AgentShell was interrupted."); } } catch (final ConfigurationException e) { diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java index 2451198f4e8..88f4a3f54b5 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java @@ -607,7 +607,7 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd implements SecurityG public Map getDataDiskTemplateToDiskOfferingMap() { if (diskOfferingId != null && dataDiskTemplateToDiskOfferingList != null) { - throw new InvalidParameterValueException("diskofferingid paramter can't be specified along with datadisktemplatetodiskofferinglist parameter"); + throw new InvalidParameterValueException("diskofferingid parameter can't be specified along with datadisktemplatetodiskofferinglist parameter"); } if (MapUtils.isEmpty(dataDiskTemplateToDiskOfferingList)) { return new HashMap(); diff --git a/engine/schema/src/main/java/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java index 7620b15b930..d4d4f606a9a 100644 --- a/engine/schema/src/main/java/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java @@ -102,7 +102,7 @@ public class VmRulesetLogDaoImpl extends GenericDaoBase im try { Thread.sleep(delayMs); } catch (InterruptedException ie) { - s_logger.debug("[ignored] interupted while inserting security group rule log."); + s_logger.debug("[ignored] interrupted while inserting security group rule log."); } } else s_logger.warn("Caught another deadlock exception while retrying inserting security group rule log, giving up"); 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 40eeafef692..0abdf2ee00b 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 @@ -275,7 +275,7 @@ public class StorageCacheManagerImpl implements StorageCacheManager, Manager { try { lock.wait(miliSeconds); } catch (InterruptedException e) { - s_logger.debug("[ignored] interupted while waiting for cache copy completion."); + s_logger.debug("[ignored] interrupted while waiting for cache copy completion."); } s_logger.debug("waken up"); diff --git a/framework/cluster/src/main/java/com/cloud/cluster/ClusterServiceServletContainer.java b/framework/cluster/src/main/java/com/cloud/cluster/ClusterServiceServletContainer.java index 08f5dba69f6..69cc871dc64 100644 --- a/framework/cluster/src/main/java/com/cloud/cluster/ClusterServiceServletContainer.java +++ b/framework/cluster/src/main/java/com/cloud/cluster/ClusterServiceServletContainer.java @@ -171,7 +171,7 @@ public class ClusterServiceServletContainer { try { Thread.sleep(1000); } catch (InterruptedException e1) { - s_logger.debug("[ignored] interupted while waiting to retry running the servlet container."); + s_logger.debug("[ignored] interrupted while waiting to retry running the servlet container."); } } } diff --git a/framework/db/src/main/java/com/cloud/utils/db/Merovingian2.java b/framework/db/src/main/java/com/cloud/utils/db/Merovingian2.java index 956430f5c8b..485a68ab313 100644 --- a/framework/db/src/main/java/com/cloud/utils/db/Merovingian2.java +++ b/framework/db/src/main/java/com/cloud/utils/db/Merovingian2.java @@ -144,7 +144,7 @@ public class Merovingian2 extends StandardMBean implements MerovingianMBean { } Thread.sleep(5000); } catch (InterruptedException e) { - s_logger.debug("[ignored] interupted while aquiring " + key); + s_logger.debug("[ignored] interrupted while aquiring " + key); } } String msg = "Timed out on acquiring lock " + key + " . Waited for " + ((InaccurateClock.getTime() - startTime)/1000) + "seconds"; diff --git a/framework/db/src/test/java/com/cloud/utils/db/GlobalLockTest.java b/framework/db/src/test/java/com/cloud/utils/db/GlobalLockTest.java index 79f96707bf0..19927edb81c 100644 --- a/framework/db/src/test/java/com/cloud/utils/db/GlobalLockTest.java +++ b/framework/db/src/test/java/com/cloud/utils/db/GlobalLockTest.java @@ -54,7 +54,7 @@ public class GlobalLockTest { Thread.sleep(jobDuration * 1000); } } catch (InterruptedException e) { - s_logger.debug("[ignored] interupted while testing global lock."); + s_logger.debug("[ignored] interrupted while testing global lock."); } finally { if (locked) { boolean unlocked = WorkLock.unlock(); diff --git a/framework/ipc/src/main/java/org/apache/cloudstack/framework/messagebus/MessageBusBase.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/messagebus/MessageBusBase.java index 3579690aa95..c0713567cd6 100644 --- a/framework/ipc/src/main/java/org/apache/cloudstack/framework/messagebus/MessageBusBase.java +++ b/framework/ipc/src/main/java/org/apache/cloudstack/framework/messagebus/MessageBusBase.java @@ -326,7 +326,7 @@ public class MessageBusBase implements MessageBus { try { wait(); } catch (InterruptedException e) { - s_logger.debug("[ignored] interupted while guarding re-entrance on message bus."); + s_logger.debug("[ignored] interrupted while guarding re-entrance on message bus."); } } else { break; diff --git a/framework/ipc/src/main/java/org/apache/cloudstack/framework/messagebus/MessageDetector.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/messagebus/MessageDetector.java index 774b99969aa..c771d6b9993 100644 --- a/framework/ipc/src/main/java/org/apache/cloudstack/framework/messagebus/MessageDetector.java +++ b/framework/ipc/src/main/java/org/apache/cloudstack/framework/messagebus/MessageDetector.java @@ -41,7 +41,7 @@ public class MessageDetector implements MessageSubscriber { try { wait(timeoutInMiliseconds); } catch (InterruptedException e) { - s_logger.debug("[ignored] interupted while waiting on any message."); + s_logger.debug("[ignored] interrupted while waiting on any message."); } } } diff --git a/plugins/database/mysql-ha/src/main/java/com/cloud/utils/db/StaticStrategy.java b/plugins/database/mysql-ha/src/main/java/com/cloud/utils/db/StaticStrategy.java index 90a6dad1674..67e7190a1a8 100644 --- a/plugins/database/mysql-ha/src/main/java/com/cloud/utils/db/StaticStrategy.java +++ b/plugins/database/mysql-ha/src/main/java/com/cloud/utils/db/StaticStrategy.java @@ -84,7 +84,7 @@ public class StaticStrategy implements BalanceStrategy { try { Thread.sleep(250); } catch (InterruptedException e) { - s_logger.debug("[ignored] interupted while fail over in progres."); + s_logger.debug("[ignored] interrupted while fail over in progres."); } // start fresh 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 74360fe9cb5..cc419f4158f 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 @@ -303,7 +303,7 @@ public class BareMetalResourceBase extends ManagerBase implements ServerResource try { TimeUnit.SECONDS.sleep(1); } catch (InterruptedException e) { - s_logger.debug("[ignored] interupted while waiting to retry running script."); + s_logger.debug("[ignored] interrupted while waiting to retry running script."); } continue; } else if (res == null) { diff --git a/plugins/hypervisors/hyperv/src/main/java/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java b/plugins/hypervisors/hyperv/src/main/java/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java index 14d3c09f98a..45382013ffc 100644 --- a/plugins/hypervisors/hyperv/src/main/java/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java +++ b/plugins/hypervisors/hyperv/src/main/java/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java @@ -2371,7 +2371,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S try { Thread.sleep(5000); } catch (final InterruptedException ex) { - s_logger.debug("[ignored] interupted while waiting to retry connecting to vm after exception: "+e.getLocalizedMessage()); + s_logger.debug("[ignored] interrupted while waiting to retry connecting to vm after exception: "+e.getLocalizedMessage()); } } } @@ -2379,7 +2379,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S try { Thread.sleep(1000); } catch (final InterruptedException ex) { - s_logger.debug("[ignored] interupted while connecting to vm."); + s_logger.debug("[ignored] interrupted while connecting to vm."); } } diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtBackupSnapshotCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtBackupSnapshotCommandWrapper.java index 70dce768f8b..780fc35b563 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtBackupSnapshotCommandWrapper.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtBackupSnapshotCommandWrapper.java @@ -104,7 +104,7 @@ public final class LibvirtBackupSnapshotCommandWrapper extends CommandWrapper template.getVirtualSize()) { RbdImage diskImage = rbd.open(disk.getName()); @@ -1176,14 +1176,14 @@ public class LibvirtStorageAdaptor implements StorageAdaptor { rSrc.confSet("key", srcPool.getAuthSecret()); rSrc.confSet("client_mount_timeout", "30"); rSrc.connect(); - s_logger.debug("Succesfully connected to source Ceph cluster at " + rSrc.confGet("mon_host")); + s_logger.debug("Successfully connected to source Ceph cluster at " + rSrc.confGet("mon_host")); Rados rDest = new Rados(destPool.getAuthUserName()); rDest.confSet("mon_host", destPool.getSourceHost() + ":" + destPool.getSourcePort()); rDest.confSet("key", destPool.getAuthSecret()); rDest.confSet("client_mount_timeout", "30"); rDest.connect(); - s_logger.debug("Succesfully connected to source Ceph cluster at " + rDest.confGet("mon_host")); + s_logger.debug("Successfully connected to source Ceph cluster at " + rDest.confGet("mon_host")); IoCTX sIO = rSrc.ioCtxCreate(srcPool.getSourceDir()); Rbd sRbd = new Rbd(sIO); @@ -1343,7 +1343,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor { s_logger.debug("Starting copy from source image " + srcFile.getFileName() + " to RBD image " + rbdDestPath); qemu.convert(srcFile, destFile); - s_logger.debug("Succesfully converted source image " + srcFile.getFileName() + " to RBD image " + rbdDestPath); + s_logger.debug("Successfully converted source image " + srcFile.getFileName() + " to RBD image " + rbdDestPath); /* We have to stat the RBD image to see how big it became afterwards */ Rados r = new Rados(destPool.getAuthUserName()); @@ -1351,7 +1351,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor { r.confSet("key", destPool.getAuthSecret()); r.confSet("client_mount_timeout", "30"); r.connect(); - s_logger.debug("Succesfully connected to Ceph cluster at " + r.confGet("mon_host")); + s_logger.debug("Successfully connected to Ceph cluster at " + r.confGet("mon_host")); IoCTX io = r.ioCtxCreate(destPool.getSourceDir()); Rbd rbd = new Rbd(io); diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptor.java index 00411f5e1a2..6151c906f78 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptor.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptor.java @@ -271,7 +271,7 @@ public class ScaleIOStorageAdaptor implements StorageAdaptor { LOGGER.debug("Starting copy from source disk image " + srcFile.getFileName() + " to PowerFlex volume: " + destDisk.getPath()); qemu.convert(srcFile, destFile, true); - LOGGER.debug("Succesfully converted source disk image " + srcFile.getFileName() + " to PowerFlex volume: " + destDisk.getPath()); + LOGGER.debug("Successfully converted source disk image " + srcFile.getFileName() + " to PowerFlex volume: " + destDisk.getPath()); } catch (QemuImgException | LibvirtException e) { try { Map srcInfo = qemu.info(srcFile); @@ -373,7 +373,7 @@ public class ScaleIOStorageAdaptor implements StorageAdaptor { LOGGER.debug("Starting copy from source downloaded template " + srcFile.getFileName() + " to PowerFlex template volume: " + destDisk.getPath()); QemuImg qemu = new QemuImg(timeout); qemu.convert(srcFile, destFile); - LOGGER.debug("Succesfully converted source downloaded template " + srcFile.getFileName() + " to PowerFlex template volume: " + destDisk.getPath()); + LOGGER.debug("Successfully converted source downloaded template " + srcFile.getFileName() + " to PowerFlex template volume: " + destDisk.getPath()); } catch (QemuImgException | LibvirtException e) { LOGGER.error("Failed to convert from " + srcFile.getFileName() + " to " + destFile.getFileName() + " the error was: " + e.getMessage(), e); destDisk = null; 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 50c7c4dd89b..74a797de685 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 @@ -1158,7 +1158,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa Thread.currentThread(); Thread.sleep(1000); } catch (InterruptedException e) { - s_logger.debug("[ignored] interupted while trying to get mac."); + s_logger.debug("[ignored] interrupted while trying to get mac."); } } @@ -6496,7 +6496,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa try { Thread.sleep(5000); } catch (InterruptedException ex) { - s_logger.debug("[ignored] interupted while waiting to retry connect after failure.", e); + s_logger.debug("[ignored] interrupted while waiting to retry connect after failure.", e); } } } @@ -6504,7 +6504,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa try { Thread.sleep(1000); } catch (InterruptedException ex) { - s_logger.debug("[ignored] interupted while waiting to retry connect."); + s_logger.debug("[ignored] interrupted while waiting to retry connect."); } } 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 69f60c5f543..7c289de80c7 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 @@ -853,7 +853,7 @@ public class XenServerStorageProcessor implements StorageProcessor { VDI.Record vdir; vdir = vdi.getRecord(conn); - s_logger.debug("Succesfully created VDI: Uuid = " + vdir.uuid); + s_logger.debug("Successfully created VDI: Uuid = " + vdir.uuid); final VolumeObjectTO newVol = new VolumeObjectTO(); newVol.setName(vdir.nameLabel); diff --git a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateCommandWrapper.java index 50bbe45a4a6..c6af9ff16b9 100644 --- a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateCommandWrapper.java @@ -72,7 +72,7 @@ public final class CitrixCreateCommandWrapper extends CommandWrapper> getCommandParameters(); /* - * Adds new key-value pair to the query paramters lists. + * Adds new key-value pair to the query parameters lists. */ public void putCommandParameter(String key, String value); diff --git a/scripts/vm/hypervisor/kvm/setup_agent.sh b/scripts/vm/hypervisor/kvm/setup_agent.sh index d55c6adfde2..4ebd6d005c4 100755 --- a/scripts/vm/hypervisor/kvm/setup_agent.sh +++ b/scripts/vm/hypervisor/kvm/setup_agent.sh @@ -206,15 +206,15 @@ done #install_cloud_agent $dflag #install_cloud_consoleP $dflag -paramters= +parameters= if [ -n "$pubNic" ] then - paramters=" --pubNic=$pubNic" + parameters=" --pubNic=$pubNic" fi if [ -n "$prvNic" ] then - paramters=" --prvNic=$prvNic $paramters" + parameters=" --prvNic=$prvNic $parameters" fi selenabled=`cat /selinux/enforce` @@ -224,5 +224,5 @@ then setenforce 0 fi -cloudstack-setup-agent --host=$host --zone=$zone --pod=$pod --cluster=$cluster --guid=$guid $paramters -a > /dev/null +cloudstack-setup-agent --host=$host --zone=$zone --pod=$pod --cluster=$cluster --guid=$guid $parameters -a > /dev/null #cloud_consoleP_setup $host $zone $pod diff --git a/server/src/main/java/com/cloud/api/ApiDBUtils.java b/server/src/main/java/com/cloud/api/ApiDBUtils.java index e6413a61ba4..4e74f0d9738 100644 --- a/server/src/main/java/com/cloud/api/ApiDBUtils.java +++ b/server/src/main/java/com/cloud/api/ApiDBUtils.java @@ -1250,7 +1250,7 @@ public class ApiDBUtils { // Currently, KVM only supports RBD and PowerFlex images of type RAW. // This results in a weird collision with OVM volumes which // can only be raw, thus making KVM RBD volumes show up as OVM - // rather than RBD. This block of code can (hopefuly) by checking to + // rather than RBD. This block of code can (hopefully) by checking to // see if the pool is using either RBD or NFS. However, it isn't // quite clear what to do if both storage types are used. If the image // format is RAW, it narrows the hypervisor choice down to OVM and KVM / RBD or KVM / CLVM diff --git a/server/src/main/java/com/cloud/network/NetworkMigrationManagerImpl.java b/server/src/main/java/com/cloud/network/NetworkMigrationManagerImpl.java index a5f56d65f90..ce66d97945d 100644 --- a/server/src/main/java/com/cloud/network/NetworkMigrationManagerImpl.java +++ b/server/src/main/java/com/cloud/network/NetworkMigrationManagerImpl.java @@ -239,7 +239,7 @@ public class NetworkMigrationManagerImpl implements NetworkMigrationManager { assignRouterNicsToNewNetwork(network.getId(), networkCopyId); if (s_logger.isDebugEnabled()) { - s_logger.debug("Succesfully created a copy of network " + originalNetwork.getName() + "(" + originalNetwork.getUuid() + ") id is " + originalNetwork.getId() + " for migration. The network copy has uuid " + network.getUuid() + " and id " + network.getId()); + s_logger.debug("Successfully created a copy of network " + originalNetwork.getName() + "(" + originalNetwork.getUuid() + ") id is " + originalNetwork.getId() + " for migration. The network copy has uuid " + network.getUuid() + " and id " + network.getId()); } return networkCopyId; } @@ -311,7 +311,7 @@ public class NetworkMigrationManagerImpl implements NetworkMigrationManager { reassignGatewayToNewVpc(vpcId, copyOfVpcId); copyVpcResourceTagsToNewVpc(vpcId, copyOfVpcId); if (s_logger.isDebugEnabled()) { - s_logger.debug("Succesfully created a copy of network " + vpc.getName() + "(" + vpc.getUuid() + ") id is " + vpc.getId() + " for migration. The network copy has uuid " + copyVpcVO.getUuid() + " and id " + copyOfVpc.getId()); + s_logger.debug("Successfully created a copy of network " + vpc.getName() + "(" + vpc.getUuid() + ") id is " + vpc.getId() + " for migration. The network copy has uuid " + copyVpcVO.getUuid() + " and id " + copyOfVpc.getId()); } } catch (ResourceAllocationException e) { throw new CloudRuntimeException(e.getMessage()); diff --git a/server/src/main/java/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/main/java/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java index b6eddca6390..1d1b9494d76 100644 --- a/server/src/main/java/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java +++ b/server/src/main/java/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java @@ -175,7 +175,7 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian s_logger.warn("Failed to remove the router " + router + " from network " + network + " as a part of cleanup"); } } else { - s_logger.debug("Succesfully added router " + router + " to guest network " + network); + s_logger.debug("Successfully added router " + router + " to guest network " + network); } } diff --git a/server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java b/server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java index b18fe10a041..c16eeb61c21 100644 --- a/server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java +++ b/server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java @@ -1528,7 +1528,7 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules _ipAddrMgr.handleSystemIpRelease(ip); throw new CloudRuntimeException("Failed to enable static nat on system ip for the vm " + vm); } else { - s_logger.warn("Succesfully enabled static nat on system ip " + ip + " for the vm " + vm); + s_logger.warn("Successfully enabled static nat on system ip " + ip + " for the vm " + vm); } } } diff --git a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java index 5752da2bf91..ba8fc611163 100644 --- a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java @@ -1141,7 +1141,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis // update the instance with removed flag only when the cleanup is // executed successfully if (_vpcDao.remove(vpc.getId())) { - s_logger.debug("Vpc " + vpc + " is destroyed succesfully"); + s_logger.debug("Vpc " + vpc + " is destroyed successfully"); return true; } else { s_logger.warn("Vpc " + vpc + " failed to destroy"); @@ -1433,7 +1433,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis for (final VpcProvider element : getVpcElements()) { if (providersToImplement.contains(element.getProvider())) { if (element.shutdownVpc(vpc, context)) { - s_logger.debug("Vpc " + vpc + " has been shutdown succesfully"); + s_logger.debug("Vpc " + vpc + " has been shutdown successfully"); } else { s_logger.warn("Vpc " + vpc + " failed to shutdown"); success = false; @@ -1961,7 +1961,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis } } if (success) { - s_logger.debug("Private gateway " + gateway + " was applied succesfully on the backend"); + s_logger.debug("Private gateway " + gateway + " was applied successfully on the backend"); if (vo.getState() != VpcGateway.State.Ready) { vo.setState(VpcGateway.State.Ready); _vpcGatewayDao.update(vo.getId(), vo); @@ -2029,7 +2029,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis for (final VpcProvider provider : getVpcElements()) { if (providersToImplement.contains(provider.getProvider())) { if (provider.deletePrivateGateway(gateway)) { - s_logger.debug("Private gateway " + gateway + " was applied succesfully on the backend"); + s_logger.debug("Private gateway " + gateway + " was applied successfully on the backend"); } else { s_logger.warn("Private gateway " + gateway + " failed to apply on the backend"); gatewayVO.setState(VpcGateway.State.Ready); diff --git a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java index 368265ef3f8..e3d030ac7d0 100755 --- a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java +++ b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java @@ -256,7 +256,7 @@ public class SnapshotManagerImpl extends MutualExclusiveIdsManagerBase implement try { Thread.sleep(_pauseInterval * 1000); } catch (InterruptedException e) { - s_logger.debug("[ignored] interupted while retry cmd."); + s_logger.debug("[ignored] interrupted while retry cmd."); } s_logger.debug("Retrying..."); diff --git a/server/src/main/java/com/cloud/vm/SystemVmLoadScanner.java b/server/src/main/java/com/cloud/vm/SystemVmLoadScanner.java index c1a875871f0..42f96b6adee 100644 --- a/server/src/main/java/com/cloud/vm/SystemVmLoadScanner.java +++ b/server/src/main/java/com/cloud/vm/SystemVmLoadScanner.java @@ -61,7 +61,7 @@ public class SystemVmLoadScanner { try { _capacityScanScheduler.awaitTermination(1000, TimeUnit.MILLISECONDS); } catch (InterruptedException e) { - s_logger.debug("[ignored] interupted while stopping systemvm load scanner."); + s_logger.debug("[ignored] interrupted while stopping systemvm load scanner."); } _capacityScanLock.releaseRef(); diff --git a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java index fed9ee75c55..dbdd81a39ae 100644 --- a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java +++ b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java @@ -1127,7 +1127,7 @@ public class UnmanagedVMsManagerImpl implements UnmanagedVMsManager { if (template == null) { template = createDefaultDummyVmImportTemplate(); if (template == null) { - throw new InvalidParameterValueException(String.format("Default VM import template with unique name: %s for hypervisor: %s cannot be created. Please use templateid paramter for import", VM_IMPORT_DEFAULT_TEMPLATE_NAME, cluster.getHypervisorType().toString())); + throw new InvalidParameterValueException(String.format("Default VM import template with unique name: %s for hypervisor: %s cannot be created. Please use templateid parameter for import", VM_IMPORT_DEFAULT_TEMPLATE_NAME, cluster.getHypervisorType().toString())); } } } else { diff --git a/services/console-proxy/rdpconsole/src/main/java/streamer/SyncLink.java b/services/console-proxy/rdpconsole/src/main/java/streamer/SyncLink.java index 77810f4d6e1..444ef30b7da 100644 --- a/services/console-proxy/rdpconsole/src/main/java/streamer/SyncLink.java +++ b/services/console-proxy/rdpconsole/src/main/java/streamer/SyncLink.java @@ -264,7 +264,7 @@ public class SyncLink implements Link { try { Thread.sleep(100); } catch (InterruptedException e) { - s_logger.info("[ignored] interupted during pull", e); + s_logger.info("[ignored] interrupted during pull", e); } } diff --git a/services/console-proxy/rdpconsole/src/main/java/streamer/debug/FakeSource.java b/services/console-proxy/rdpconsole/src/main/java/streamer/debug/FakeSource.java index 41d6485be72..85ae8235d48 100644 --- a/services/console-proxy/rdpconsole/src/main/java/streamer/debug/FakeSource.java +++ b/services/console-proxy/rdpconsole/src/main/java/streamer/debug/FakeSource.java @@ -69,7 +69,7 @@ public class FakeSource extends BaseElement { try { Thread.sleep(delay); } catch (InterruptedException e) { - s_logger.info("[ignored] interupted while creating latency", e); + s_logger.info("[ignored] interrupted while creating latency", e); } } diff --git a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyClientBase.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyClientBase.java index bc2230b7aa9..1c0f28d0a21 100644 --- a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyClientBase.java +++ b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyClientBase.java @@ -230,7 +230,7 @@ public abstract class ConsoleProxyClientBase implements ConsoleProxyClient, Cons try { Thread.sleep(100); } catch (InterruptedException e) { - s_logger.debug("[ignored] Console proxy was interupted while waiting for viewer to become ready."); + s_logger.debug("[ignored] Console proxy was interrupted while waiting for viewer to become ready."); } } return false; @@ -343,7 +343,7 @@ public abstract class ConsoleProxyClientBase implements ConsoleProxyClient, Cons try { tileDirtyEvent.wait(3000); } catch (InterruptedException e) { - s_logger.debug("[ignored] Console proxy ajax update was interupted while waiting for viewer to become ready."); + s_logger.debug("[ignored] Console proxy ajax update was interrupted while waiting for viewer to become ready."); } } } diff --git a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyGCThread.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyGCThread.java index 2e987d707e5..2ddb2c7a1d5 100644 --- a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyGCThread.java +++ b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyGCThread.java @@ -111,7 +111,7 @@ public class ConsoleProxyGCThread extends Thread { try { Thread.sleep(5000); } catch (InterruptedException ex) { - s_logger.debug("[ignored] Console proxy was interupted during GC."); + s_logger.debug("[ignored] Console proxy was interrupted during GC."); } } } 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 6d3ecd875c5..9be0da3efbc 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 @@ -494,7 +494,7 @@ class TestSystemVmLocalStorage(cloudstackTestCase): name = 'secstorage.service.offering' else: raise Exception( - "type paramter is not correct it should be system vm " + "type parameter is not correct it should be system vm " "type{console proxy,secsroragevm}") # 3-update global settings with system offering uuid diff --git a/test/integration/component/test_acl_listsnapshot.py b/test/integration/component/test_acl_listsnapshot.py index 8bf674ba688..9e6a8d02cf4 100644 --- a/test/integration/component/test_acl_listsnapshot.py +++ b/test/integration/component/test_acl_listsnapshot.py @@ -562,7 +562,7 @@ class TestSnapshotList(cloudstackTestCase): True, "Account access check failed!!") - ## Domain Admin - Test cases without passing listall paramter + ## Domain Admin - Test cases without passing listall parameter @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_listSnapshot_as_domainadmin(self): @@ -1308,7 +1308,7 @@ class TestSnapshotList(cloudstackTestCase): True, "Account access check failed!!") - ## ROOT Admin - Test cases without passing listall paramter + ## ROOT Admin - Test cases without passing listall parameter @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_listSnapshot_as_rootadmin(self): @@ -2022,7 +2022,7 @@ class TestSnapshotList(cloudstackTestCase): True, "Account access check failed!!") - ## Regular User - Test cases without passing listall paramter + ## Regular User - Test cases without passing listall parameter @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_listSnapshot_as_regularuser(self): diff --git a/test/integration/component/test_acl_listvm.py b/test/integration/component/test_acl_listvm.py index b49461617c0..5c27f29314e 100644 --- a/test/integration/component/test_acl_listvm.py +++ b/test/integration/component/test_acl_listvm.py @@ -535,7 +535,7 @@ class TestVMList(cloudstackTestCase): True, "Account access check failed!!") - ## Domain Admin - Test cases without passing listall paramter + ## Domain Admin - Test cases without passing listall parameter @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_listVM_as_domainadmin(self): @@ -1281,7 +1281,7 @@ class TestVMList(cloudstackTestCase): True, "Account access check failed!!") - ## ROOT Admin - Test cases without passing listall paramter + ## ROOT Admin - Test cases without passing listall parameter @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_listVM_as_rootadmin(self): @@ -1996,7 +1996,7 @@ class TestVMList(cloudstackTestCase): True, "Account access check failed!!") - ## Regular User - Test cases without passing listall paramter + ## Regular User - Test cases without passing listall parameter @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_listVM_as_regularuser(self): diff --git a/test/integration/component/test_acl_listvolume.py b/test/integration/component/test_acl_listvolume.py index be79da8e529..c63bfe23405 100644 --- a/test/integration/component/test_acl_listvolume.py +++ b/test/integration/component/test_acl_listvolume.py @@ -548,7 +548,7 @@ class TestVolumeList(cloudstackTestCase): True, "Account access check failed!!") - ## Domain Admin - Test cases without passing listall paramter + ## Domain Admin - Test cases without passing listall parameter @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_listVolume_as_domainadmin(self): @@ -1290,7 +1290,7 @@ class TestVolumeList(cloudstackTestCase): True, "Account access check failed!!") - ## ROOT Admin - Test cases without passing listall paramter + ## ROOT Admin - Test cases without passing listall parameter @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_listVolume_as_rootadmin(self): @@ -2004,7 +2004,7 @@ class TestVolumeList(cloudstackTestCase): True, "Account access check failed!!") - ## Regular User - Test cases without passing listall paramter + ## Regular User - Test cases without passing listall parameter @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_listVolume_as_regularuser(self): diff --git a/test/integration/component/test_blocker_bugs.py b/test/integration/component/test_blocker_bugs.py index cffb488e3ba..c71ca4245f4 100644 --- a/test/integration/component/test_blocker_bugs.py +++ b/test/integration/component/test_blocker_bugs.py @@ -940,7 +940,7 @@ class TestTemplates(cloudstackTestCase): # 2. Perform snapshot on the root disk of this VM. # 3. Create a template from snapshot. # 4. Delete the template and create a new template with same name - # 5. Template should be created succesfully + # 5. Template should be created successfully # Create a snapshot from the ROOTDISK if self.hypervisor.lower() in ['hyperv']: diff --git a/test/integration/component/test_haproxy.py b/test/integration/component/test_haproxy.py index 5728ef07591..e17fbcf30f5 100644 --- a/test/integration/component/test_haproxy.py +++ b/test/integration/component/test_haproxy.py @@ -858,7 +858,7 @@ class TestHAProxyStickyness(cloudstackTestCase): # * by passing the Invlaid parameter # * Invalid method name # * required parameter not present - # * passing invalid values to valid paramters. + # * passing invalid values to valid parameters. self.debug("Creating LB rule for account: %s" % self.account.name) lb_rule = self.create_LB_Rule( diff --git a/test/integration/component/test_rootvolume_resize.py b/test/integration/component/test_rootvolume_resize.py index ab2e754fdf9..1b1a6fe6db1 100644 --- a/test/integration/component/test_rootvolume_resize.py +++ b/test/integration/component/test_rootvolume_resize.py @@ -851,7 +851,7 @@ class TestResizeVolume(cloudstackTestCase): except Exception as e: raise Exception("Warning: Exception during" " VM deployment with new" - " rootdisk paramter : %s" % e) + " rootdisk parameter : %s" % e) @attr(tags=["advanced"], required_hardware="true") diff --git a/test/integration/component/test_vpc_network_pfrules.py b/test/integration/component/test_vpc_network_pfrules.py index 0015bed0ce8..19a21c014e1 100644 --- a/test/integration/component/test_vpc_network_pfrules.py +++ b/test/integration/component/test_vpc_network_pfrules.py @@ -604,7 +604,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase): # 7. Use the Create PF rule ssh and http for vm1 and vm2 in network1. # 8. Use the Create PF rule ssh and http for vm3 and vm4 in network2. # 9. Successfully ssh into the Guest vm1, vm2, vm3 and vm4 using the PF rule. - # 10. Succesfully wget a file from http server present on vm1, vm2, vm3 and vm4. + # 10. Successfully wget a file from http server present on vm1, vm2, vm3 and vm4. # 11. Stop VPC Virtual Router. # 12. Delete all PF rultes for vm1, vm2, vm3 and vm4. # 12. Start VPC Virtual Router. @@ -684,7 +684,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase): # 7. Use the Create PF rule ssh and http for vm1 and vm2 in network1. # 8. Use the Create PF rule ssh and http for vm3 and vm4 in network2. # 9. Successfully ssh into the Guest vm1, vm2, vm3 and vm4 using the PF rule. - # 10. Succesfully wget a file from http server present on vm1, vm2, vm3 and vm4. + # 10. Successfully wget a file from http server present on vm1, vm2, vm3 and vm4. # 12. Delete all PF rultes for vm1, vm2, vm3 and vm4. # 13. Fail to ssh and http to vm1, vm2, vm3 and vm4. """ diff --git a/test/integration/component/test_vpc_network_staticnatrule.py b/test/integration/component/test_vpc_network_staticnatrule.py index 124eb7e5d9b..bba725083f2 100644 --- a/test/integration/component/test_vpc_network_staticnatrule.py +++ b/test/integration/component/test_vpc_network_staticnatrule.py @@ -549,7 +549,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase): # 7. Use the Create PF rule ssh and http for vm1 and vm2 in network1. # 8. Use the Create PF rule ssh and http for vm3 and vm4 in network2. # 9. Successfully ssh into the Guest vm1, vm2, vm3 and vm4 using the PF rule. - # 10. Succesfully wget a file from http server present on vm1, vm2, vm3 and vm4. + # 10. Successfully wget a file from http server present on vm1, vm2, vm3 and vm4. # 12. Delete all PF rultes for vm1, vm2, vm3 and vm4. # 13. Fail to ssh and http to vm1, vm2, vm3 and vm4. """ diff --git a/test/integration/smoke/test_accounts.py b/test/integration/smoke/test_accounts.py index 277e649d563..3684d9c6f58 100644 --- a/test/integration/smoke/test_accounts.py +++ b/test/integration/smoke/test_accounts.py @@ -1542,7 +1542,7 @@ class TestUserLogin(cloudstackTestCase): parentdomainid=self.domain.id ) self.cleanup.append(domain) - self.debug("Domain: %s is created succesfully." % domain.name) + self.debug("Domain: %s is created successfully." % domain.name) self.debug( "Checking if the created domain is listed in list domains API") domains = Domain.list(self.apiclient, id=domain.id, listall=True) @@ -1818,7 +1818,7 @@ class TestDomainForceRemove(cloudstackTestCase): parentdomainid=self.domain.id ) self.cleanup.append(self.child_domain) - self.debug("Domain is created succesfully.") + self.debug("Domain is created successfully.") self.debug( "Checking if the created domain is listed in list domains API") domains = Domain.list(self.apiclient, id=self.child_domain.id, listall=True) diff --git a/test/integration/testpaths/testpath_snapshot_hadrning.py b/test/integration/testpaths/testpath_snapshot_hadrning.py index feca9373e40..91f12763f71 100755 --- a/test/integration/testpaths/testpath_snapshot_hadrning.py +++ b/test/integration/testpaths/testpath_snapshot_hadrning.py @@ -448,7 +448,7 @@ class TestSnapshotsHardning(cloudstackTestCase): """snapshot hardning 1. Take VM snapshot then migrate the VM to another host and again take volume snapshot and check its integrity - 2. Verify that snapshot gets created successfuly while VM + 2. Verify that snapshot gets created successfully while VM is getting Migrated to another host 3. Verify that snapshot should succeed after vm's are HA-ed to different host and also check its integrity @@ -860,7 +860,7 @@ class TestSnapshotsHardning(cloudstackTestCase): 1. Take VM snapshot then migrate the VM to another host and again take volume snapshot and check its intigrity - 2. Verify that snapshot gets created successfuly + 2. Verify that snapshot gets created successfully while VM is getting Migrated to another host 3. Verify that snapshot should succeed after vm's are diff --git a/test/integration/testpaths/testpath_volumelifecycle.py b/test/integration/testpaths/testpath_volumelifecycle.py index 78733fcc968..e896f6e5962 100644 --- a/test/integration/testpaths/testpath_volumelifecycle.py +++ b/test/integration/testpaths/testpath_volumelifecycle.py @@ -471,7 +471,7 @@ class TestPathVolume(cloudstackTestCase): self.cluster_volume.id), "volume does not exist %s" % self.cluster_volume.id) self.debug( - "volume id %s got created successfuly" % + "volume id %s got created successfully" % list_cluster_volume[0].id) self.virtual_machine_zone_4.attach_volume(self.userapiclient, self.cluster_volume @@ -634,7 +634,7 @@ class TestPathVolume(cloudstackTestCase): self.template_from_vm1_root_disk.delete(self.userapiclient ) self.debug( - "Template id: %s got deleted successfuly" % + "Template id: %s got deleted successfully" % self.template_from_vm1_root_disk.id) except Exception as e: raise Exception("Template deletion failed with error %s" % e) @@ -690,7 +690,7 @@ class TestPathVolume(cloudstackTestCase): list_volume[0].id, str( self.migrate_volume.id), "volume does not exist %s" % self.migrate_volume.id) - self.debug("volume id %s got created successfuly" % list_volume[0].id) + self.debug("volume id %s got created successfully" % list_volume[0].id) self.virtual_machine_1.attach_volume(self.userapiclient, self.migrate_volume @@ -720,7 +720,7 @@ class TestPathVolume(cloudstackTestCase): list_volume[0].id, str( self.migrate_volume.id), "volume does not exist %s" % self.migrate_volume.id) - self.debug("volume id %s got created successfuly" % list_volume[0].id) + self.debug("volume id %s got created successfully" % list_volume[0].id) list_pool = StoragePool.list(self.apiclient, id=list_volume[0].storageid ) diff --git a/test/src-not-used/main/java/com/cloud/test/regression/ApiCommand.java b/test/src-not-used/main/java/com/cloud/test/regression/ApiCommand.java index b9229963f68..9c9fc83bce9 100644 --- a/test/src-not-used/main/java/com/cloud/test/regression/ApiCommand.java +++ b/test/src-not-used/main/java/com/cloud/test/regression/ApiCommand.java @@ -802,7 +802,7 @@ public class ApiCommand { try { Thread.sleep(1000); } catch (InterruptedException e) { - s_logger.debug("[ignored] interupted while during async job result query."); + s_logger.debug("[ignored] interrupted while during async job result query."); } } else { break; diff --git a/test/src-not-used/main/java/com/cloud/test/stress/StressTestDirectAttach.java b/test/src-not-used/main/java/com/cloud/test/stress/StressTestDirectAttach.java index d72a78a61e3..a974d735c71 100644 --- a/test/src-not-used/main/java/com/cloud/test/stress/StressTestDirectAttach.java +++ b/test/src-not-used/main/java/com/cloud/test/stress/StressTestDirectAttach.java @@ -1337,7 +1337,7 @@ public class StressTestDirectAttach { try { Thread.sleep(1000); } catch (InterruptedException e) { - s_logger.debug("[ignored] interupted while during async job result query."); + s_logger.debug("[ignored] interrupted while during async job result query."); } } else { break; diff --git a/test/src-not-used/main/java/com/cloud/test/stress/TestClientWithAPI.java b/test/src-not-used/main/java/com/cloud/test/stress/TestClientWithAPI.java index 7232e3d7a7b..57d3ff75677 100644 --- a/test/src-not-used/main/java/com/cloud/test/stress/TestClientWithAPI.java +++ b/test/src-not-used/main/java/com/cloud/test/stress/TestClientWithAPI.java @@ -2273,7 +2273,7 @@ public class TestClientWithAPI { try { Thread.sleep(1000); } catch (InterruptedException e) { - s_logger.debug("[ignored] interupted while during async job result query."); + s_logger.debug("[ignored] interrupted while during async job result query."); } } else { break; diff --git a/test/src-not-used/main/java/com/cloud/test/utils/ConsoleProxy.java b/test/src-not-used/main/java/com/cloud/test/utils/ConsoleProxy.java index 35de0773593..8c10d75a5c1 100644 --- a/test/src-not-used/main/java/com/cloud/test/utils/ConsoleProxy.java +++ b/test/src-not-used/main/java/com/cloud/test/utils/ConsoleProxy.java @@ -67,7 +67,7 @@ public class ConsoleProxy implements Runnable { try { Thread.sleep(1000); } catch (InterruptedException e) { - s_logger.debug("[ignored] interupted."); + s_logger.debug("[ignored] interrupted."); } } diff --git a/tools/ngui/static/js/lib/angular.js b/tools/ngui/static/js/lib/angular.js index e3ab8842893..2bac570a8c3 100644 --- a/tools/ngui/static/js/lib/angular.js +++ b/tools/ngui/static/js/lib/angular.js @@ -3339,7 +3339,7 @@ function Browser(window, document, $log, $sniffer) { * Cancels a defered task identified with `deferId`. * * @param {*} deferId Token returned by the `$browser.defer` function. - * @returns {boolean} Returns `true` if the task hasn't executed yet and was successfuly canceled. + * @returns {boolean} Returns `true` if the task hasn't executed yet and was successfully canceled. */ self.defer.cancel = function(deferId) { if (pendingDeferIds[deferId]) { diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java index 6ccd5825cdb..9f950024f13 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java @@ -1759,7 +1759,7 @@ public class HypervisorHostHelper { try { Thread.sleep(1000); } catch (InterruptedException e) { - s_logger.debug("[ignored] interupted while waiting to config vm."); + s_logger.debug("[ignored] interrupted while waiting to config vm."); } } } diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java index 5ad1f91621a..c5ec5b4d9d1 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java @@ -275,7 +275,7 @@ public class VirtualMachineMO extends BaseMO { try { Thread.sleep(1000); } catch (InterruptedException e) { - s_logger.debug("[ignored] interupted while dealing with vm questions."); + s_logger.debug("[ignored] interrupted while dealing with vm questions."); } } s_logger.info("VM Question monitor stopped"); @@ -544,7 +544,7 @@ public class VirtualMachineMO extends BaseMO { try { Thread.sleep(1000); } catch (InterruptedException e) { - s_logger.debug("[ignored] interupted while waiting for snapshot to be done."); + s_logger.debug("[ignored] interrupted while waiting for snapshot to be done."); } } @@ -1651,7 +1651,7 @@ public class VirtualMachineMO extends BaseMO { try { Thread.sleep(1000); } catch (InterruptedException e) { - s_logger.debug("[ignored] interupted while handling vm question about iso detach."); + s_logger.debug("[ignored] interrupted while handling vm question about iso detach."); } } s_logger.info("VM Question monitor stopped"); @@ -3367,7 +3367,7 @@ public class VirtualMachineMO extends BaseMO { try { Thread.sleep(1000); } catch (InterruptedException e) { - s_logger.debug("[ignored] interupted while handling vm question about umount tools install."); + s_logger.debug("[ignored] interrupted while handling vm question about umount tools install."); } } diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareContext.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareContext.java index af44962322e..14c8667cbd6 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareContext.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareContext.java @@ -681,7 +681,7 @@ public class VmwareContext { try { Thread.sleep(CONNECT_RETRY_INTERVAL); } catch (InterruptedException ex) { - s_logger.debug("[ignored] interupted while connecting."); + s_logger.debug("[ignored] interrupted while connecting."); } } }