From 980c0bff036c042ee814817bd05dd75da4927d24 Mon Sep 17 00:00:00 2001 From: John Bampton Date: Fri, 4 Mar 2022 02:10:14 +1000 Subject: [PATCH] Fix spelling (#6041) Changed `occured` to `occurred` --- .../facade/SetNetworkAclConfigItem.java | 2 +- .../cloud/agent/manager/AgentManagerImpl.java | 2 +- .../manager/ClusteredAgentManagerImpl.java | 4 ++-- .../cloud/vm/VirtualMachineManagerImpl.java | 2 +- .../quota/QuotaAlertManagerImpl.java | 2 +- .../ServerResource/AgentShell/Program.cs | 8 ++++---- .../kvm/resource/LibvirtKvmAgentHook.java | 2 +- .../hypervisor/ovm3/objects/Connection.java | 2 +- .../manager/VmwareStorageManagerImpl.java | 2 +- .../network/resource/NetscalerResource.java | 2 +- .../xenserver/cloudstack_pluginlib.py | 2 +- scripts/vm/network/vnet/ovstunnel.py | 2 +- .../root/health_checks/haproxy_check.py | 2 +- .../broken/test_ss_project_limits.py | 2 +- .../integration/component/test_brocade_vcs.py | 2 +- .../test_concurrent_snapshots_limit.py | 2 +- .../test_dynamic_compute_offering.py | 6 +++--- .../component/test_multiple_ips_per_nic.py | 2 +- .../component/test_multiple_nic_support.py | 4 ++-- .../component/test_netscaler_lb.py | 20 +++++++++---------- .../component/test_persistent_networks.py | 2 +- .../integration/component/test_portable_ip.py | 2 +- .../component/test_project_resources.py | 4 ++-- .../component/test_ps_max_limits.py | 4 ++-- .../component/test_ps_project_limits.py | 4 ++-- .../component/test_resource_limits.py | 6 +++--- .../component/test_security_groups.py | 2 +- .../integration/component/test_snapshot_gc.py | 2 +- test/integration/component/test_tags.py | 2 +- tools/ngui/static/js/lib/jquery-1.7.2.js | 2 +- .../utils/cisco/n1kv/vsm/NetconfHelper.java | 2 +- 31 files changed, 52 insertions(+), 52 deletions(-) diff --git a/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetNetworkAclConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetNetworkAclConfigItem.java index c16e9265a49..3eff242f440 100644 --- a/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetNetworkAclConfigItem.java +++ b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetNetworkAclConfigItem.java @@ -81,7 +81,7 @@ public class SetNetworkAclConfigItem extends AbstractConfigItemFacade { try { aclRule = new ProtocolAclRule(ruleParts[4], "ACCEPT".equals(ruleParts[5]), Integer.parseInt(ruleParts[1])); } catch (final Exception e) { - s_logger.warn("Problem occured when reading the entries in the ruleParts array. Actual array size is '" + ruleParts.length + "', but trying to read from index 5."); + s_logger.warn("Problem occurred when reading the entries in the ruleParts array. Actual array size is '" + ruleParts.length + "', but trying to read from index 5."); continue; } } diff --git a/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java index 8d46bc8c39d..70a4fa78d5f 100644 --- a/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java +++ b/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java @@ -1386,7 +1386,7 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl s_logger.warn(e.getMessage()); // upgradeAgent(task.getLink(), data, e.getReason()); } catch (final ClassNotFoundException e) { - final String message = String.format("Exception occured when executing taks! Error '%s'", e.getMessage()); + final String message = String.format("Exception occurred when executing taks! Error '%s'", e.getMessage()); s_logger.error(message); throw new TaskExecutionException(message, e); } diff --git a/engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java index fa24df290d3..4dd044981da 100644 --- a/engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java +++ b/engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java @@ -716,11 +716,11 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust } } } catch (final ClassNotFoundException e) { - final String message = String.format("ClassNotFoundException occured when executing taks! Error '%s'", e.getMessage()); + final String message = String.format("ClassNotFoundException occurred when executing taks! Error '%s'", e.getMessage()); s_logger.error(message); throw new TaskExecutionException(message, e); } catch (final UnsupportedVersionException e) { - final String message = String.format("UnsupportedVersionException occured when executing taks! Error '%s'", e.getMessage()); + final String message = String.format("UnsupportedVersionException occurred when executing taks! Error '%s'", e.getMessage()); s_logger.error(message); throw new TaskExecutionException(message, e); } finally { 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 8dd0b247849..a17e92a97c0 100755 --- a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java @@ -3110,7 +3110,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac _agentMgr.send(srcHost.getId(), dettachCommand); s_logger.debug("Deleted config drive ISO for vm " + vm.getInstanceName() + " In host " + srcHost); } catch (OperationTimedoutException e) { - s_logger.error("TIme out occured while exeuting command AttachOrDettachConfigDrive " + e.getMessage(), e); + s_logger.error("TIme out occurred while exeuting command AttachOrDettachConfigDrive " + e.getMessage(), e); } } diff --git a/framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaAlertManagerImpl.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaAlertManagerImpl.java index d2b6dd75074..29dca9e3bd7 100644 --- a/framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaAlertManagerImpl.java +++ b/framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaAlertManagerImpl.java @@ -263,7 +263,7 @@ public class QuotaAlertManagerImpl extends ManagerBase implements QuotaAlertMana s_logger.warn("Failed to lock account " + accountId + ", account not found."); } } catch (Exception e) { - s_logger.error("Exception occured while locking account by Quota Alert Manager", e); + s_logger.error("Exception occurred while locking account by Quota Alert Manager", e); throw e; } finally { TransactionLegacy.open(opendb).close(); diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/Program.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/Program.cs index 7545644fb70..1348082328e 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/Program.cs +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/Program.cs @@ -203,7 +203,7 @@ namespace CloudStack.Plugin.AgentShell } catch (Exception ex) { - logger.ErrorFormat(" Error occured in installing service " + ex.Message); + logger.ErrorFormat(" Error occurred in installing service " + ex.Message); throw; } } @@ -228,7 +228,7 @@ namespace CloudStack.Plugin.AgentShell } catch (Exception ex) { - logger.ErrorFormat(" Error occured in uninstalling service " + ex.Message); + logger.ErrorFormat(" Error occurred in uninstalling service " + ex.Message); throw; } } @@ -251,7 +251,7 @@ namespace CloudStack.Plugin.AgentShell } catch (Exception ex) { - logger.ErrorFormat(" Error occured in starting service " + ex.Message); + logger.ErrorFormat(" Error occurred in starting service " + ex.Message); throw; } } @@ -274,7 +274,7 @@ namespace CloudStack.Plugin.AgentShell } catch (Exception ex) { - logger.ErrorFormat(" Error occured in stopping service " + ex.Message); + logger.ErrorFormat(" Error occurred in stopping service " + ex.Message); throw; } } diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtKvmAgentHook.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtKvmAgentHook.java index 3627d6e2a07..2ef65293de2 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtKvmAgentHook.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtKvmAgentHook.java @@ -68,7 +68,7 @@ public class LibvirtKvmAgentHook { Object res = cls.invokeMethod(this.method, params); return res; } catch (MissingMethodExceptionNoStack e) { - s_logger.error("Error occured when calling method from groovy script, {}", e); + s_logger.error("Error occurred when calling method from groovy script, {}", e); return arg; } } diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Connection.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Connection.java index 711e5506f04..a873be420e1 100644 --- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Connection.java +++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Connection.java @@ -123,7 +123,7 @@ public class Connection extends XmlRpcClient { LOGGER.info("Timeout: ", e); throw new XmlRpcException(e.getMessage()); } catch (XmlRpcException e) { - LOGGER.info("XML RPC Exception occured: ", e); + LOGGER.info("XML RPC Exception occurred: ", e); throw e; } catch (RuntimeException e) { LOGGER.info("Runtime Exception: ", e); diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java index cad4e263482..3ed9ffffb06 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java @@ -1324,7 +1324,7 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager { s_logger.debug("can not find the snapshot " + vmSnapshotName + ", assume it is already removed"); } else { if (!vmMo.removeSnapshot(vmSnapshotName, false)) { - String msg = "delete vm snapshot " + vmSnapshotName + " due to error occured in vmware"; + String msg = "delete vm snapshot " + vmSnapshotName + " due to error occurred in vmware"; s_logger.error(msg); return new DeleteVMSnapshotAnswer(cmd, false, msg); diff --git a/plugins/network-elements/netscaler/src/main/java/com/cloud/network/resource/NetscalerResource.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/resource/NetscalerResource.java index f93aaaf96f2..aac588e11f9 100644 --- a/plugins/network-elements/netscaler/src/main/java/com/cloud/network/resource/NetscalerResource.java +++ b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/resource/NetscalerResource.java @@ -3522,7 +3522,7 @@ public class NetscalerResource implements ServerResource { try { apiCallResult = nsconfig.save(_netscalerService); if (apiCallResult.errorcode != 0) { - throw new ExecutionException("Error occured while saving configuration changes to Netscaler device due to " + apiCallResult.message); + throw new ExecutionException("Error occurred while saving configuration changes to Netscaler device due to " + apiCallResult.message); } } catch (final nitro_exception e) { throw new ExecutionException("Failed to save configuration changes to Netscaler device due to " + e.getMessage()); diff --git a/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py b/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py index d952dd699a3..926c5c8de8e 100644 --- a/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py +++ b/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py @@ -454,7 +454,7 @@ def create_tunnel(bridge, remote_ip, gre_key, src_host, dst_host, network_uuid): " with GRE key %s" %gre_key) return "SUCCESS:%s" % name except: - logging.debug("An unexpected error occured. Rolling back") + logging.debug("An unexpected error occurred. Rolling back") if tunnel_setup: logging.debug("Deleting GRE interface") # Destroy GRE port and interface diff --git a/scripts/vm/network/vnet/ovstunnel.py b/scripts/vm/network/vnet/ovstunnel.py index b6b30c1cb53..ebb72158957 100755 --- a/scripts/vm/network/vnet/ovstunnel.py +++ b/scripts/vm/network/vnet/ovstunnel.py @@ -249,7 +249,7 @@ def create_tunnel(bridge, remote_ip, key, src_host, dst_host): # return "SUCCESS:%s" % name return 'true' except: - logging.debug("An unexpected error occured. Rolling back") + logging.debug("An unexpected error occurred. Rolling back") if tunnel_setup: logging.debug("Deleting GRE interface") # Destroy GRE port and interface diff --git a/systemvm/debian/root/health_checks/haproxy_check.py b/systemvm/debian/root/health_checks/haproxy_check.py index 56e0ce7d0b0..5e01ee3de41 100644 --- a/systemvm/debian/root/health_checks/haproxy_check.py +++ b/systemvm/debian/root/health_checks/haproxy_check.py @@ -23,7 +23,7 @@ from utility import getHealthChecksData, formatPort def checkMaxconn(haproxyData, haCfgSections): if "maxconn" in haproxyData and "maxconn" in haCfgSections["global"]: if haproxyData["maxconn"] != haCfgSections["global"]["maxconn"][0].strip(): - print "global maxconn mismatch occured" + print "global maxconn mismatch occurred" return False return True diff --git a/test/integration/broken/test_ss_project_limits.py b/test/integration/broken/test_ss_project_limits.py index 289c4c1778a..39556d4ed3d 100644 --- a/test/integration/broken/test_ss_project_limits.py +++ b/test/integration/broken/test_ss_project_limits.py @@ -214,7 +214,7 @@ class TestProjectsVolumeLimits(cloudstackTestCase): self.cleanup.insert(0, self.projectMember) self.project.addAccount(self.apiclient, account=self.projectMember.name) except Exception as e: - self.fail("Exception occured: %s" % e) + self.fail("Exception occurred: %s" % e) self.services["iso"]["zoneid"] = self.zone.id try: diff --git a/test/integration/component/test_brocade_vcs.py b/test/integration/component/test_brocade_vcs.py index 1b2dcebe66e..ab3bd313d0b 100644 --- a/test/integration/component/test_brocade_vcs.py +++ b/test/integration/component/test_brocade_vcs.py @@ -118,7 +118,7 @@ class TestBrocadeVcs(cloudstackTestCase): assert cls.brocadeDeviceData["username"], "username of brocade device\ not present in config file" except Exception as e: - raise unittest.SkipTest("Exception occured while reading\ + raise unittest.SkipTest("Exception occurred while reading\ brocade device data from config file: %s" % e) try: diff --git a/test/integration/component/test_concurrent_snapshots_limit.py b/test/integration/component/test_concurrent_snapshots_limit.py index 65a7496e410..96d936e3e12 100644 --- a/test/integration/component/test_concurrent_snapshots_limit.py +++ b/test/integration/component/test_concurrent_snapshots_limit.py @@ -95,7 +95,7 @@ class TestConcurrentSnapshotLimit(cloudstackTestCase): volumeid ) except Exception as e: - self.debug("Exception occured: %s" % e) + self.debug("Exception occurred: %s" % e) self.exceptionOccured = True def tearDown(self): diff --git a/test/integration/component/test_dynamic_compute_offering.py b/test/integration/component/test_dynamic_compute_offering.py index 1f8740c9c42..45ebb401e1d 100644 --- a/test/integration/component/test_dynamic_compute_offering.py +++ b/test/integration/component/test_dynamic_compute_offering.py @@ -622,7 +622,7 @@ class TestScaleVmDynamicServiceOffering(cloudstackTestCase): apiclient, serviceOfferingId=serviceOffering_static_2.id) except Exception as e: - self.fail("Exception occured: %s" % e) + self.fail("Exception occurred: %s" % e) return @data(ADMIN_ACCOUNT, USER_ACCOUNT) @@ -792,7 +792,7 @@ class TestScaleVmDynamicServiceOffering(cloudstackTestCase): apiclient, serviceOfferingId=serviceOffering_static.id) except Exception as e: - self.fail("Exception occured: %s" % e) + self.fail("Exception occurred: %s" % e) return @data(ADMIN_ACCOUNT, USER_ACCOUNT) @@ -877,7 +877,7 @@ class TestScaleVmDynamicServiceOffering(cloudstackTestCase): customcpuspeed=512, custommemory=256) except Exception as e: - self.fail("Exception occured: %s" % e) + self.fail("Exception occurred: %s" % e) # Scale VM with dynamic service offering proving custom value # only for cpu number diff --git a/test/integration/component/test_multiple_ips_per_nic.py b/test/integration/component/test_multiple_ips_per_nic.py index 1f4bc37a95e..fc75b552999 100644 --- a/test/integration/component/test_multiple_ips_per_nic.py +++ b/test/integration/component/test_multiple_ips_per_nic.py @@ -183,7 +183,7 @@ def createNetworkRules( network.id, vmguestip=vmguestip) except Exception as e: - self.debug("Exception occured while creating network rules: %s" % e) + self.debug("Exception occurred while creating network rules: %s" % e) return FAIL return PASS diff --git a/test/integration/component/test_multiple_nic_support.py b/test/integration/component/test_multiple_nic_support.py index fb5d5e4ae8b..098f04277a2 100644 --- a/test/integration/component/test_multiple_nic_support.py +++ b/test/integration/component/test_multiple_nic_support.py @@ -522,7 +522,7 @@ class TestMulipleNicSupport(cloudstackTestCase): self.virtual_machine1.migrate(self.apiclient, host_id) except Exception as e: - self.fail("Exception occured: %s" % e) + self.fail("Exception occurred: %s" % e) # List the vm again virtual_machine = VirtualMachine.list( @@ -618,7 +618,7 @@ class TestMulipleNicSupport(cloudstackTestCase): try: self.virtual_machine1.reboot(self.apiclient) except Exception as e: - self.fail("Exception occured: %s" % e) + self.fail("Exception occurred: %s" % e) self.verify_network_rules(self.virtual_machine1.id) diff --git a/test/integration/component/test_netscaler_lb.py b/test/integration/component/test_netscaler_lb.py index 6f1df5c1552..107b4a1d706 100644 --- a/test/integration/component/test_netscaler_lb.py +++ b/test/integration/component/test_netscaler_lb.py @@ -1433,7 +1433,7 @@ class TestMultipleLbRules(cloudstackTestCase): "The hostname should match with atleast one of instance name" ) except Exception as e: - self.fail("Exception occured during SSH: %s - %s" % ( + self.fail("Exception occurred during SSH: %s - %s" % ( public_ip_1.ipaddress.ipaddress, e)) try: @@ -1454,7 +1454,7 @@ class TestMultipleLbRules(cloudstackTestCase): "The hostname should match with atleast one of instance name" ) except Exception as e: - self.fail("Exception occured during SSH: %s - %s" % ( + self.fail("Exception occurred during SSH: %s - %s" % ( public_ip_2.ipaddress.ipaddress, e)) return @@ -1750,7 +1750,7 @@ class TestMultipleLbRulesSameIp(cloudstackTestCase): "The hostname should match with atleast one of instance name" ) except Exception as e: - self.fail("Exception occured during SSH: %s - %s" % ( + self.fail("Exception occurred during SSH: %s - %s" % ( public_ip.ipaddress.ipaddress, e)) try: @@ -1772,7 +1772,7 @@ class TestMultipleLbRulesSameIp(cloudstackTestCase): "The hostname should match with atleast one of instance name" ) except Exception as e: - self.fail("Exception occured during SSH: %s - %s" % ( + self.fail("Exception occurred during SSH: %s - %s" % ( public_ip.ipaddress.ipaddress, e)) return @@ -2340,7 +2340,7 @@ class TestVmWithLb(cloudstackTestCase): self.lb_rule_1.assign(self.apiclient, [self.vm_1, self.vm_2]) self.vm_2.stop(self.apiclient) except Exception as e: - self.fail("Exception occured: %s" % e) + self.fail("Exception occurred: %s" % e) try: self.debug( @@ -2369,7 +2369,7 @@ class TestVmWithLb(cloudstackTestCase): "Hostnames must be same as another VM is stopped" ) except Exception as e: - self.fail("Exception occured during SSH: %s - %s" % ( + self.fail("Exception occurred during SSH: %s - %s" % ( self.public_ip_1.ipaddress.ipaddress, e)) self.debug("SSH into Netscaler to rules still persist") @@ -2441,7 +2441,7 @@ class TestVmWithLb(cloudstackTestCase): "Both request should be served by different instances" ) except Exception as e: - self.fail("Exception occured during SSH: %s - %s" % ( + self.fail("Exception occurred during SSH: %s - %s" % ( self.public_ip_1.ipaddress.ipaddress, e)) self.debug("SSH into Netscaler to rules still persist") @@ -2556,7 +2556,7 @@ class TestVmWithLb(cloudstackTestCase): "Both request should be served by different instances" ) except Exception as e: - self.fail("Exception occured during SSH: %s - %s" % ( + self.fail("Exception occurred during SSH: %s - %s" % ( self.public_ip_1.ipaddress.ipaddress, e)) self.debug("SSH into Netscaler to rules still persist") @@ -2643,7 +2643,7 @@ class TestVmWithLb(cloudstackTestCase): "Both request should be served by different instances" ) except Exception as e: - self.fail("Exception occured during SSH: %s - %s" % ( + self.fail("Exception occurred during SSH: %s - %s" % ( self.public_ip_1.ipaddress.ipaddress, e)) self.debug("SSH into Netscaler to rules still persist") @@ -2715,7 +2715,7 @@ class TestVmWithLb(cloudstackTestCase): "Both request should be served by same instance" ) except Exception as e: - self.fail("Exception occured during SSH: %s - %s" % ( + self.fail("Exception occurred during SSH: %s - %s" % ( self.public_ip_1.ipaddress.ipaddress, e)) delay = Configurations.list( diff --git a/test/integration/component/test_persistent_networks.py b/test/integration/component/test_persistent_networks.py index 3becff6c5e8..1da00094b58 100644 --- a/test/integration/component/test_persistent_networks.py +++ b/test/integration/component/test_persistent_networks.py @@ -1784,7 +1784,7 @@ class TestAssignVirtualMachine(cloudstackTestCase): "networks list validation failed, list is %s" % networks) except Exception as e: - self.fail("Exception occured: %s" % e) + self.fail("Exception occurred: %s" % e) return diff --git a/test/integration/component/test_portable_ip.py b/test/integration/component/test_portable_ip.py index e3e04d4f8ac..32f8a208b35 100644 --- a/test/integration/component/test_portable_ip.py +++ b/test/integration/component/test_portable_ip.py @@ -870,7 +870,7 @@ class TestDisassociatePublicIp(cloudstackTestCase): ) portableip.delete(self.apiclient) except Exception as e: - raise Exception("Exception occured: %s" % e) + raise Exception("Exception occurred: %s" % e) return @attr(tags=["advanced"], required_hardware="false") diff --git a/test/integration/component/test_project_resources.py b/test/integration/component/test_project_resources.py index 0b7d9a7fdbe..9cd597062aa 100644 --- a/test/integration/component/test_project_resources.py +++ b/test/integration/component/test_project_resources.py @@ -691,7 +691,7 @@ class TestTemplates(cloudstackTestCase): except Exception as e: - self.fail("Exception occured: %s" % e) + self.fail("Exception occurred: %s" % e) return @attr(tags=["advanced", "basic", "sg", "eip", "advancedns"], required_hardware="false") @@ -779,7 +779,7 @@ class TestTemplates(cloudstackTestCase): "Check VM state is Running or not" ) except Exception as e: - self.fail("Exception occured: %s" % e) + self.fail("Exception occurred: %s" % e) return diff --git a/test/integration/component/test_ps_max_limits.py b/test/integration/component/test_ps_max_limits.py index d8d8992f70a..21b886c263d 100644 --- a/test/integration/component/test_ps_max_limits.py +++ b/test/integration/component/test_ps_max_limits.py @@ -191,7 +191,7 @@ class TestMaxPrimaryStorageLimits(cloudstackTestCase): domainid=self.child_do_admin.domainid, diskofferingid=disk_offering.id) except Exception as e: - self.fail("Exception occured: %s" % e) + self.fail("Exception occurred: %s" % e) with self.assertRaises(Exception): Volume.create(self.apiclient, @@ -288,7 +288,7 @@ class TestMaxPrimaryStorageLimits(cloudstackTestCase): projectid=self.project.id, diskofferingid=disk_offering.id) except Exception as e: - self.fail("Exception occured: %s" % e) + self.fail("Exception occurred: %s" % e) with self.assertRaises(Exception): Volume.create(self.apiclient, diff --git a/test/integration/component/test_ps_project_limits.py b/test/integration/component/test_ps_project_limits.py index d549467d55c..7c9c704c259 100644 --- a/test/integration/component/test_ps_project_limits.py +++ b/test/integration/component/test_ps_project_limits.py @@ -105,7 +105,7 @@ class TestProjectsVolumeLimits(cloudstackTestCase): self.initialResourceCount = projects[0].primarystoragetotal except Exception as e: self.tearDown() - self.skipTest("Exception occured in setup: %s" % e) + self.skipTest("Exception occurred in setup: %s" % e) return def tearDown(self): @@ -193,7 +193,7 @@ class TestProjectsVolumeLimits(cloudstackTestCase): host = hosts[0] self.vm.migrate(self.apiclient, host.id) except Exception as e: - self.fail("Exception occured: %s" % e) + self.fail("Exception occurred: %s" % e) expectedCount = self.initialResourceCount response = matchResourceCount( diff --git a/test/integration/component/test_resource_limits.py b/test/integration/component/test_resource_limits.py index 1bb510817bb..6a5cbe8f371 100644 --- a/test/integration/component/test_resource_limits.py +++ b/test/integration/component/test_resource_limits.py @@ -844,7 +844,7 @@ class TestResourceLimitsAccount(cloudstackTestCase): "Check Template is in ready state or not" ) except Exception as e: - self.fail("Exception occured: %s" % e) + self.fail("Exception occurred: %s" % e) # Exception should be raised for second snapshot (account_1) with self.assertRaises(Exception): Template.create( @@ -908,7 +908,7 @@ class TestResourceLimitsAccount(cloudstackTestCase): "Check Template is in ready state or not" ) except Exception as e: - self.fail("Exception occured: %s" % e) + self.fail("Exception occurred: %s" % e) return @@ -1362,7 +1362,7 @@ class TestResourceLimitsDomain(cloudstackTestCase): "Check Template is in ready state or not" ) except Exception as e: - self.fail("Exception occured: %s" % e) + self.fail("Exception occurred: %s" % e) # Exception should be raised for second template with self.assertRaises(Exception): diff --git a/test/integration/component/test_security_groups.py b/test/integration/component/test_security_groups.py index f95bd74220b..1a268d692eb 100644 --- a/test/integration/component/test_security_groups.py +++ b/test/integration/component/test_security_groups.py @@ -1635,7 +1635,7 @@ class TestIngressRule(cloudstackTestCase): # Sleep to ensure that VM is in running state time.sleep(self.testdata["sleep"]) except Exception as e: - self.fail("Exception occured: %s" % e) + self.fail("Exception occurred: %s" % e) # SSH should be allowed on 22 port after restart try: diff --git a/test/integration/component/test_snapshot_gc.py b/test/integration/component/test_snapshot_gc.py index 1e08c046e07..c162731f78c 100644 --- a/test/integration/component/test_snapshot_gc.py +++ b/test/integration/component/test_snapshot_gc.py @@ -277,7 +277,7 @@ class TestAccountSnapshotClean(cloudstackTestCase): "Snapshot was not found on NFS") except Exception as e: self._cleanup.append(self.account) - self.fail("Exception occured: %s" % e) + self.fail("Exception occurred: %s" % e) self.debug("Deleting account: %s" % self.account.name) # Delete account diff --git a/test/integration/component/test_tags.py b/test/integration/component/test_tags.py index 9e3c8a42516..79211c4ce41 100644 --- a/test/integration/component/test_tags.py +++ b/test/integration/component/test_tags.py @@ -2317,7 +2317,7 @@ class TestResourceTags(cloudstackTestCase): tags={tag_key: tag_value} ) except Exception as e: - self.fail("Exception occured - %s" % e) + self.fail("Exception occurred - %s" % e) return @attr(tags=["advanced", "basic"], required_hardware="false") diff --git a/tools/ngui/static/js/lib/jquery-1.7.2.js b/tools/ngui/static/js/lib/jquery-1.7.2.js index 3774ff98613..75ce2617772 100644 --- a/tools/ngui/static/js/lib/jquery-1.7.2.js +++ b/tools/ngui/static/js/lib/jquery-1.7.2.js @@ -8249,7 +8249,7 @@ if ( jQuery.support.ajax ) { xml; // Firefox throws exceptions when accessing properties - // of an xhr when a network error occured + // of an xhr when a network error occurred // http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE) try { diff --git a/utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/NetconfHelper.java b/utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/NetconfHelper.java index a6d905d8f8a..b0574973285 100644 --- a/utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/NetconfHelper.java +++ b/utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/NetconfHelper.java @@ -267,7 +267,7 @@ public class NetconfHelper { } } } catch (final Exception e) { - throw new CloudRuntimeException("Error occured while reading from the stream: " + e.getMessage()); + throw new CloudRuntimeException("Error occurred while reading from the stream: " + e.getMessage()); } return response;