apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix spelling (#6041)

Browse Source 
Changed `occured` to `occurred`
This commit is contained in:
John Bampton 2022-03-04 02:10:14 +10:00 committed by GitHub
parent b4db3db617
commit 980c0bff03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetNetworkAclConfigItem.java
View File

@ -81,7 +81,7 @@ public class SetNetworkAclConfigItem extends AbstractConfigItemFacade {
try { try {
aclRule = new ProtocolAclRule(ruleParts[4], "ACCEPT".equals(ruleParts[5]), Integer.parseInt(ruleParts[1])); aclRule = new ProtocolAclRule(ruleParts[4], "ACCEPT".equals(ruleParts[5]), Integer.parseInt(ruleParts[1]));
} catch (final Exception e) { } 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; continue;
} }
} }

2
engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java
View File

@ -1386,7 +1386,7 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
s_logger.warn(e.getMessage()); s_logger.warn(e.getMessage());
// upgradeAgent(task.getLink(), data, e.getReason()); // upgradeAgent(task.getLink(), data, e.getReason());
} catch (final ClassNotFoundException e) { } 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); s_logger.error(message);
throw new TaskExecutionException(message, e); throw new TaskExecutionException(message, e);
} }

4
engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
View File

@ -716,11 +716,11 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
} }
} }
} catch (final ClassNotFoundException e) { } 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); s_logger.error(message);
throw new TaskExecutionException(message, e); throw new TaskExecutionException(message, e);
} catch (final UnsupportedVersionException 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); s_logger.error(message);
throw new TaskExecutionException(message, e); throw new TaskExecutionException(message, e);
} finally { } finally {

2
engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
View File

@ -3110,7 +3110,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
_agentMgr.send(srcHost.getId(), dettachCommand); _agentMgr.send(srcHost.getId(), dettachCommand);
s_logger.debug("Deleted config drive ISO for vm " + vm.getInstanceName() + " In host " + srcHost); s_logger.debug("Deleted config drive ISO for vm " + vm.getInstanceName() + " In host " + srcHost);
} catch (OperationTimedoutException e) { } 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);
} }
} }

2
framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaAlertManagerImpl.java
View File

@ -263,7 +263,7 @@ public class QuotaAlertManagerImpl extends ManagerBase implements QuotaAlertMana
s_logger.warn("Failed to lock account " + accountId + ", account not found."); s_logger.warn("Failed to lock account " + accountId + ", account not found.");
} }
} catch (Exception e) { } 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; throw e;
} finally { } finally {
TransactionLegacy.open(opendb).close(); TransactionLegacy.open(opendb).close();

8
plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/Program.cs
View File

@ -203,7 +203,7 @@ namespace CloudStack.Plugin.AgentShell
} }
catch (Exception ex) catch (Exception ex)
{ {
logger.ErrorFormat(" Error occured in installing service " + ex.Message); logger.ErrorFormat(" Error occurred in installing service " + ex.Message);
throw; throw;
} }
} }
@ -228,7 +228,7 @@ namespace CloudStack.Plugin.AgentShell
} }
catch (Exception ex) catch (Exception ex)
{ {
logger.ErrorFormat(" Error occured in uninstalling service " + ex.Message); logger.ErrorFormat(" Error occurred in uninstalling service " + ex.Message);
throw; throw;
} }
} }
@ -251,7 +251,7 @@ namespace CloudStack.Plugin.AgentShell
} }
catch (Exception ex) catch (Exception ex)
{ {
logger.ErrorFormat(" Error occured in starting service " + ex.Message); logger.ErrorFormat(" Error occurred in starting service " + ex.Message);
throw; throw;
} }
} }
@ -274,7 +274,7 @@ namespace CloudStack.Plugin.AgentShell
} }
catch (Exception ex) catch (Exception ex)
{ {
logger.ErrorFormat(" Error occured in stopping service " + ex.Message); logger.ErrorFormat(" Error occurred in stopping service " + ex.Message);
throw; throw;
} }
} }

2
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtKvmAgentHook.java
View File

@ -68,7 +68,7 @@ public class LibvirtKvmAgentHook {
Object res = cls.invokeMethod(this.method, params); Object res = cls.invokeMethod(this.method, params);
return res; return res;
} catch (MissingMethodExceptionNoStack e) { } 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; return arg;
} }
} }

2
plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Connection.java
View File

@ -123,7 +123,7 @@ public class Connection extends XmlRpcClient {
LOGGER.info("Timeout: ", e); LOGGER.info("Timeout: ", e);
throw new XmlRpcException(e.getMessage()); throw new XmlRpcException(e.getMessage());
} catch (XmlRpcException e) { } catch (XmlRpcException e) {
LOGGER.info("XML RPC Exception occured: ", e); LOGGER.info("XML RPC Exception occurred: ", e);
throw e; throw e;
} catch (RuntimeException e) { } catch (RuntimeException e) {
LOGGER.info("Runtime Exception: ", e); LOGGER.info("Runtime Exception: ", e);

2
plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
View File

@ -1324,7 +1324,7 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager {
s_logger.debug("can not find the snapshot " + vmSnapshotName + ", assume it is already removed"); s_logger.debug("can not find the snapshot " + vmSnapshotName + ", assume it is already removed");
} else { } else {
if (!vmMo.removeSnapshot(vmSnapshotName, false)) { 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); s_logger.error(msg);
return new DeleteVMSnapshotAnswer(cmd, false, msg); return new DeleteVMSnapshotAnswer(cmd, false, msg);

2
plugins/network-elements/netscaler/src/main/java/com/cloud/network/resource/NetscalerResource.java
View File

@ -3522,7 +3522,7 @@ public class NetscalerResource implements ServerResource {
try { try {
apiCallResult = nsconfig.save(_netscalerService); apiCallResult = nsconfig.save(_netscalerService);
if (apiCallResult.errorcode != 0) { 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) { } catch (final nitro_exception e) {
throw new ExecutionException("Failed to save configuration changes to Netscaler device due to " + e.getMessage()); throw new ExecutionException("Failed to save configuration changes to Netscaler device due to " + e.getMessage());

2
scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
View File

@ -454,7 +454,7 @@ def create_tunnel(bridge, remote_ip, gre_key, src_host, dst_host, network_uuid):
" with GRE key %s" %gre_key) " with GRE key %s" %gre_key)
return "SUCCESS:%s" % name return "SUCCESS:%s" % name
except: except:
logging.debug("An unexpected error occured. Rolling back") logging.debug("An unexpected error occurred. Rolling back")
if tunnel_setup: if tunnel_setup:
logging.debug("Deleting GRE interface") logging.debug("Deleting GRE interface")
# Destroy GRE port and interface # Destroy GRE port and interface

2
scripts/vm/network/vnet/ovstunnel.py
View File

@ -249,7 +249,7 @@ def create_tunnel(bridge, remote_ip, key, src_host, dst_host):
# return "SUCCESS:%s" % name # return "SUCCESS:%s" % name
return 'true' return 'true'
except: except:
logging.debug("An unexpected error occured. Rolling back") logging.debug("An unexpected error occurred. Rolling back")
if tunnel_setup: if tunnel_setup:
logging.debug("Deleting GRE interface") logging.debug("Deleting GRE interface")
# Destroy GRE port and interface # Destroy GRE port and interface

2
systemvm/debian/root/health_checks/haproxy_check.py
View File

@ -23,7 +23,7 @@ from utility import getHealthChecksData, formatPort
def checkMaxconn(haproxyData, haCfgSections): def checkMaxconn(haproxyData, haCfgSections):
if "maxconn" in haproxyData and "maxconn" in haCfgSections["global"]: if "maxconn" in haproxyData and "maxconn" in haCfgSections["global"]:
if haproxyData["maxconn"] != haCfgSections["global"]["maxconn"][0].strip(): if haproxyData["maxconn"] != haCfgSections["global"]["maxconn"][0].strip():
print "global maxconn mismatch occured" print "global maxconn mismatch occurred"
return False return False
return True return True

2
test/integration/broken/test_ss_project_limits.py
View File

@ -214,7 +214,7 @@ class TestProjectsVolumeLimits(cloudstackTestCase):
self.cleanup.insert(0, self.projectMember) self.cleanup.insert(0, self.projectMember)
self.project.addAccount(self.apiclient, account=self.projectMember.name) self.project.addAccount(self.apiclient, account=self.projectMember.name)
except Exception as e: except Exception as e:
self.fail("Exception occured: %s" % e) self.fail("Exception occurred: %s" % e)
self.services["iso"]["zoneid"] = self.zone.id self.services["iso"]["zoneid"] = self.zone.id
try: try:

2
test/integration/component/test_brocade_vcs.py
View File

@ -118,7 +118,7 @@ class TestBrocadeVcs(cloudstackTestCase):
assert cls.brocadeDeviceData["username"], "username of brocade device\ assert cls.brocadeDeviceData["username"], "username of brocade device\
not present in config file" not present in config file"
except Exception as e: 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) brocade device data from config file: %s" % e)
try: try:

2
test/integration/component/test_concurrent_snapshots_limit.py
View File

@ -95,7 +95,7 @@ class TestConcurrentSnapshotLimit(cloudstackTestCase):
volumeid volumeid
) )
except Exception as e: except Exception as e:
self.debug("Exception occured: %s" % e) self.debug("Exception occurred: %s" % e)
self.exceptionOccured = True self.exceptionOccured = True
def tearDown(self): def tearDown(self):

6
test/integration/component/test_dynamic_compute_offering.py
View File

@ -622,7 +622,7 @@ class TestScaleVmDynamicServiceOffering(cloudstackTestCase):
apiclient, apiclient,
serviceOfferingId=serviceOffering_static_2.id) serviceOfferingId=serviceOffering_static_2.id)
except Exception as e: except Exception as e:
self.fail("Exception occured: %s" % e) self.fail("Exception occurred: %s" % e)
return return
@data(ADMIN_ACCOUNT, USER_ACCOUNT) @data(ADMIN_ACCOUNT, USER_ACCOUNT)
@ -792,7 +792,7 @@ class TestScaleVmDynamicServiceOffering(cloudstackTestCase):
apiclient, apiclient,
serviceOfferingId=serviceOffering_static.id) serviceOfferingId=serviceOffering_static.id)
except Exception as e: except Exception as e:
self.fail("Exception occured: %s" % e) self.fail("Exception occurred: %s" % e)
return return
@data(ADMIN_ACCOUNT, USER_ACCOUNT) @data(ADMIN_ACCOUNT, USER_ACCOUNT)
@ -877,7 +877,7 @@ class TestScaleVmDynamicServiceOffering(cloudstackTestCase):
customcpuspeed=512, customcpuspeed=512,
custommemory=256) custommemory=256)
except Exception as e: 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 # Scale VM with dynamic service offering proving custom value
# only for cpu number # only for cpu number

2
test/integration/component/test_multiple_ips_per_nic.py
View File

@ -183,7 +183,7 @@ def createNetworkRules(
network.id, network.id,
vmguestip=vmguestip) vmguestip=vmguestip)
except Exception as e: 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 FAIL
return PASS return PASS

4
test/integration/component/test_multiple_nic_support.py
View File

@ -522,7 +522,7 @@ class TestMulipleNicSupport(cloudstackTestCase):
self.virtual_machine1.migrate(self.apiclient, host_id) self.virtual_machine1.migrate(self.apiclient, host_id)
except Exception as e: except Exception as e:
self.fail("Exception occured: %s" % e) self.fail("Exception occurred: %s" % e)
# List the vm again # List the vm again
virtual_machine = VirtualMachine.list( virtual_machine = VirtualMachine.list(
@ -618,7 +618,7 @@ class TestMulipleNicSupport(cloudstackTestCase):
try: try:
self.virtual_machine1.reboot(self.apiclient) self.virtual_machine1.reboot(self.apiclient)
except Exception as e: except Exception as e:
self.fail("Exception occured: %s" % e) self.fail("Exception occurred: %s" % e)
self.verify_network_rules(self.virtual_machine1.id) self.verify_network_rules(self.virtual_machine1.id)

20
test/integration/component/test_netscaler_lb.py
View File

@ -1433,7 +1433,7 @@ class TestMultipleLbRules(cloudstackTestCase):
"The hostname should match with atleast one of instance name" "The hostname should match with atleast one of instance name"
) )
except Exception as e: 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, public_ip_1.ipaddress.ipaddress,
e)) e))
try: try:
@ -1454,7 +1454,7 @@ class TestMultipleLbRules(cloudstackTestCase):
"The hostname should match with atleast one of instance name" "The hostname should match with atleast one of instance name"
) )
except Exception as e: 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, public_ip_2.ipaddress.ipaddress,
e)) e))
return return
@ -1750,7 +1750,7 @@ class TestMultipleLbRulesSameIp(cloudstackTestCase):
"The hostname should match with atleast one of instance name" "The hostname should match with atleast one of instance name"
) )
except Exception as e: except Exception as e:
self.fail("Exception occured during SSH: %s - %s" % ( self.fail("Exception occurred during SSH: %s - %s" % (
public_ip.ipaddress.ipaddress, public_ip.ipaddress.ipaddress,
e)) e))
try: try:
@ -1772,7 +1772,7 @@ class TestMultipleLbRulesSameIp(cloudstackTestCase):
"The hostname should match with atleast one of instance name" "The hostname should match with atleast one of instance name"
) )
except Exception as e: except Exception as e:
self.fail("Exception occured during SSH: %s - %s" % ( self.fail("Exception occurred during SSH: %s - %s" % (
public_ip.ipaddress.ipaddress, public_ip.ipaddress.ipaddress,
e)) e))
return return
@ -2340,7 +2340,7 @@ class TestVmWithLb(cloudstackTestCase):
self.lb_rule_1.assign(self.apiclient, [self.vm_1, self.vm_2]) self.lb_rule_1.assign(self.apiclient, [self.vm_1, self.vm_2])
self.vm_2.stop(self.apiclient) self.vm_2.stop(self.apiclient)
except Exception as e: except Exception as e:
self.fail("Exception occured: %s" % e) self.fail("Exception occurred: %s" % e)
try: try:
self.debug( self.debug(
@ -2369,7 +2369,7 @@ class TestVmWithLb(cloudstackTestCase):
"Hostnames must be same as another VM is stopped" "Hostnames must be same as another VM is stopped"
) )
except Exception as e: 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, self.public_ip_1.ipaddress.ipaddress,
e)) e))
self.debug("SSH into Netscaler to rules still persist") self.debug("SSH into Netscaler to rules still persist")
@ -2441,7 +2441,7 @@ class TestVmWithLb(cloudstackTestCase):
"Both request should be served by different instances" "Both request should be served by different instances"
) )
except Exception as e: 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, self.public_ip_1.ipaddress.ipaddress,
e)) e))
self.debug("SSH into Netscaler to rules still persist") self.debug("SSH into Netscaler to rules still persist")
@ -2556,7 +2556,7 @@ class TestVmWithLb(cloudstackTestCase):
"Both request should be served by different instances" "Both request should be served by different instances"
) )
except Exception as e: 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, self.public_ip_1.ipaddress.ipaddress,
e)) e))
self.debug("SSH into Netscaler to rules still persist") self.debug("SSH into Netscaler to rules still persist")
@ -2643,7 +2643,7 @@ class TestVmWithLb(cloudstackTestCase):
"Both request should be served by different instances" "Both request should be served by different instances"
) )
except Exception as e: 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, self.public_ip_1.ipaddress.ipaddress,
e)) e))
self.debug("SSH into Netscaler to rules still persist") self.debug("SSH into Netscaler to rules still persist")
@ -2715,7 +2715,7 @@ class TestVmWithLb(cloudstackTestCase):
"Both request should be served by same instance" "Both request should be served by same instance"
) )
except Exception as e: 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, self.public_ip_1.ipaddress.ipaddress,
e)) e))
delay = Configurations.list( delay = Configurations.list(

2
test/integration/component/test_persistent_networks.py
View File

@ -1784,7 +1784,7 @@ class TestAssignVirtualMachine(cloudstackTestCase):
"networks list validation failed, list is %s" % "networks list validation failed, list is %s" %
networks) networks)
except Exception as e: except Exception as e:
self.fail("Exception occured: %s" % e) self.fail("Exception occurred: %s" % e)
return return

2
test/integration/component/test_portable_ip.py
View File

@ -870,7 +870,7 @@ class TestDisassociatePublicIp(cloudstackTestCase):
) )
portableip.delete(self.apiclient) portableip.delete(self.apiclient)
except Exception as e: except Exception as e:
raise Exception("Exception occured: %s" % e) raise Exception("Exception occurred: %s" % e)
return return
@attr(tags=["advanced"], required_hardware="false") @attr(tags=["advanced"], required_hardware="false")

4
test/integration/component/test_project_resources.py
View File

@ -691,7 +691,7 @@ class TestTemplates(cloudstackTestCase):
except Exception as e: except Exception as e:
self.fail("Exception occured: %s" % e) self.fail("Exception occurred: %s" % e)
return return
@attr(tags=["advanced", "basic", "sg", "eip", "advancedns"], required_hardware="false") @attr(tags=["advanced", "basic", "sg", "eip", "advancedns"], required_hardware="false")
@ -779,7 +779,7 @@ class TestTemplates(cloudstackTestCase):
"Check VM state is Running or not" "Check VM state is Running or not"
) )
except Exception as e: except Exception as e:
self.fail("Exception occured: %s" % e) self.fail("Exception occurred: %s" % e)
return return

4
test/integration/component/test_ps_max_limits.py
View File

@ -191,7 +191,7 @@ class TestMaxPrimaryStorageLimits(cloudstackTestCase):
domainid=self.child_do_admin.domainid, domainid=self.child_do_admin.domainid,
diskofferingid=disk_offering.id) diskofferingid=disk_offering.id)
except Exception as e: except Exception as e:
self.fail("Exception occured: %s" % e) self.fail("Exception occurred: %s" % e)
with self.assertRaises(Exception): with self.assertRaises(Exception):
Volume.create(self.apiclient, Volume.create(self.apiclient,
@ -288,7 +288,7 @@ class TestMaxPrimaryStorageLimits(cloudstackTestCase):
projectid=self.project.id, projectid=self.project.id,
diskofferingid=disk_offering.id) diskofferingid=disk_offering.id)
except Exception as e: except Exception as e:
self.fail("Exception occured: %s" % e) self.fail("Exception occurred: %s" % e)
with self.assertRaises(Exception): with self.assertRaises(Exception):
Volume.create(self.apiclient, Volume.create(self.apiclient,

4
test/integration/component/test_ps_project_limits.py
View File

@ -105,7 +105,7 @@ class TestProjectsVolumeLimits(cloudstackTestCase):
self.initialResourceCount = projects[0].primarystoragetotal self.initialResourceCount = projects[0].primarystoragetotal
except Exception as e: except Exception as e:
self.tearDown() self.tearDown()
self.skipTest("Exception occured in setup: %s" % e) self.skipTest("Exception occurred in setup: %s" % e)
return return
def tearDown(self): def tearDown(self):
@ -193,7 +193,7 @@ class TestProjectsVolumeLimits(cloudstackTestCase):
host = hosts[0] host = hosts[0]
self.vm.migrate(self.apiclient, host.id) self.vm.migrate(self.apiclient, host.id)
except Exception as e: except Exception as e:
self.fail("Exception occured: %s" % e) self.fail("Exception occurred: %s" % e)
expectedCount = self.initialResourceCount expectedCount = self.initialResourceCount
response = matchResourceCount( response = matchResourceCount(

6
test/integration/component/test_resource_limits.py
View File

@ -844,7 +844,7 @@ class TestResourceLimitsAccount(cloudstackTestCase):
"Check Template is in ready state or not" "Check Template is in ready state or not"
) )
except Exception as e: 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) # Exception should be raised for second snapshot (account_1)
with self.assertRaises(Exception): with self.assertRaises(Exception):
Template.create( Template.create(
@ -908,7 +908,7 @@ class TestResourceLimitsAccount(cloudstackTestCase):
"Check Template is in ready state or not" "Check Template is in ready state or not"
) )
except Exception as e: except Exception as e:
self.fail("Exception occured: %s" % e) self.fail("Exception occurred: %s" % e)
return return
@ -1362,7 +1362,7 @@ class TestResourceLimitsDomain(cloudstackTestCase):
"Check Template is in ready state or not" "Check Template is in ready state or not"
) )
except Exception as e: except Exception as e:
self.fail("Exception occured: %s" % e) self.fail("Exception occurred: %s" % e)
# Exception should be raised for second template # Exception should be raised for second template
with self.assertRaises(Exception): with self.assertRaises(Exception):

2
test/integration/component/test_security_groups.py
View File

@ -1635,7 +1635,7 @@ class TestIngressRule(cloudstackTestCase):
# Sleep to ensure that VM is in running state # Sleep to ensure that VM is in running state
time.sleep(self.testdata["sleep"]) time.sleep(self.testdata["sleep"])
except Exception as e: 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 # SSH should be allowed on 22 port after restart
try: try:

2
test/integration/component/test_snapshot_gc.py
View File

@ -277,7 +277,7 @@ class TestAccountSnapshotClean(cloudstackTestCase):
"Snapshot was not found on NFS") "Snapshot was not found on NFS")
except Exception as e: except Exception as e:
self._cleanup.append(self.account) 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) self.debug("Deleting account: %s" % self.account.name)
# Delete account # Delete account

2
test/integration/component/test_tags.py
View File

@ -2317,7 +2317,7 @@ class TestResourceTags(cloudstackTestCase):
tags={tag_key: tag_value} tags={tag_key: tag_value}
) )
except Exception as e: except Exception as e:
self.fail("Exception occured - %s" % e) self.fail("Exception occurred - %s" % e)
return return
@attr(tags=["advanced", "basic"], required_hardware="false") @attr(tags=["advanced", "basic"], required_hardware="false")

2
tools/ngui/static/js/lib/jquery-1.7.2.js vendored
View File

@ -8249,7 +8249,7 @@ if ( jQuery.support.ajax ) {
xml; xml;
// Firefox throws exceptions when accessing properties // 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) // http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
try { try {

2
utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/NetconfHelper.java
View File

@ -267,7 +267,7 @@ public class NetconfHelper {
} }
} }
} catch (final Exception e) { } 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; return response;