diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java index 1314d7dd574..e618c17d3cf 100644 --- a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java @@ -540,7 +540,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C } protected boolean canIpUsedForNonConserveService(PublicIp ip, Service service) { - // If it's non-conserve mode, then the new ip should not be used by any other services + // If it's non-conserve mode, then the new IP should not be used by any other services List ipList = new ArrayList(); ipList.add(ip); Map> ipToServices = getIpToServices(ipList, false, false); @@ -549,7 +549,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C if (services == null || services.isEmpty()) { return true; } - // Since it's non-conserve mode, only one service should used for IP + // Since it's non-conserve mode, only one service should be used for IP if (services.size() != 1) { throw new InvalidParameterException("There are multiple services used ip " + ip.getAddress() + "."); } @@ -920,7 +920,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C ip6addr = ipv6AddrMgr.allocateGuestIpv6(network, ipv6Address); } } else if (network.getGuestType() == Network.GuestType.Shared) { - //for basic zone, need to provide the podId to ensure proper ip alloation + //for basic zone, need to provide the podId to ensure proper IP allocation Long podId = null; DataCenter dc = _dcDao.findById(network.getDataCenterId()); @@ -951,7 +951,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C } if (!StringUtils.isAllBlank(ipaddr, ip6addr)) { - // we got the ip addr so up the nics table and secodary ip + // we got the IP addr so up the nics table and secondary IP final String ip4AddrFinal = ipaddr; final String ip6AddrFinal = ip6addr; long id = Transaction.execute(new TransactionCallback() { @@ -1016,7 +1016,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C List ipList = _nicSecondaryIpDao.listByNicId(nicId); boolean lastIp = false; if (ipList.size() == 1) { - // this is the last secondary ip to nic + // this is the last secondary IP to NIC lastIp = true; } @@ -1027,7 +1027,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C logger.debug("Calling secondary ip " + secIpVO.getIp4Address() + " release "); if (dc.getNetworkType() == NetworkType.Advanced && network.getGuestType() == Network.GuestType.Isolated) { - //check PF or static NAT is configured on this ip address + //check PF or static NAT is configured on this IP address String secondaryIp = secIpVO.getIp4Address(); List fwRulesList = _firewallDao.listByNetworkAndPurpose(network.getId(), Purpose.PortForwarding); @@ -1039,7 +1039,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C } } } - //check if the secondary ip associated with any static nat rule + //check if the secondary IP associated with any static nat rule IPAddressVO publicIpVO = _ipAddressDao.findByIpAndNetworkId(secIpVO.getNetworkId(), secondaryIp); if (publicIpVO != null) { logger.debug("VM nic IP " + secondaryIp + " is associated with the static NAT rule public IP address id " + publicIpVO.getId()); @@ -1290,7 +1290,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C throw new IllegalArgumentException("only ip addresses that belong to a virtual network may be disassociated."); } - // don't allow releasing system ip address + // don't allow releasing system IP address if (ipVO.getSystem()) { throwInvalidIdException("Can't release system IP address with specified id", ipVO.getUuid(), "systemIpAddrId"); } @@ -1729,7 +1729,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C domainId, isDomainSpecific, subdomainAccess, vpcId, startIPv6, endIPv6, ip6Gateway, ip6Cidr, displayNetwork, aclId, secondaryVlanId, privateVlanType, ntwkOff, pNtwk, aclType, owner, cidr, createVlan, externalId, routerIPv4, routerIPv6, associatedNetwork, ip4Dns1, ip4Dns2, ip6Dns1, ip6Dns2, interfaceMTUs); - // retrieve, acquire and associate the correct ip adresses + // retrieve, acquire and associate the correct IP addresses checkAndSetRouterSourceNatIp(owner, cmd, network); if (hideIpAddressUsage) { @@ -1787,7 +1787,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C if (! userIps.isEmpty()) { try { _ipAddrMgr.updateSourceNatIpAddress(requestedIp, userIps); - } catch (Exception e) { // pokemon execption from transaction + } catch (Exception e) { // pokemon exception from transaction String msg = String.format("Update of source NAT ip to %s for network \"%s\"/%s failed due to %s", requestedIp.getAddress().addr(), network.getName(), network.getUuid(), e.getLocalizedMessage()); logger.error(msg); @@ -1806,7 +1806,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C } else { logger.info(String.format("updating network %s to have source NAT ip %s", cmd.getNetworkName(), sourceNatIp)); } - // check if the address is already aqcuired for this network + // check if the address is already acquired for this network IPAddressVO requestedIp = _ipAddressDao.findByIp(sourceNatIp); if (requestedIp == null || requestedIp.getAssociatedWithNetworkId() == null || ! requestedIp.getAssociatedWithNetworkId().equals(network.getId())) { logger.warn(String.format("Source NAT IP %s is not associated with network %s/%s. It cannot be used as source NAT IP.", @@ -1815,7 +1815,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C } // check if it is the current source NAT address if (requestedIp.isSourceNat()) { - logger.info(String.format("IP address %s is allready the source Nat address. Not updating!", sourceNatIp)); + logger.info(String.format("IP address %s is already the source Nat address. Not updating!", sourceNatIp)); return null; } return requestedIp; @@ -3051,7 +3051,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C // network offering and domain suffix can be updated for Isolated networks only in 3.0 if ((networkOfferingId != null || domainSuffix != null) && network.getGuestType() != GuestType.Isolated) { - throw new InvalidParameterValueException("NetworkOffering and domain suffix upgrade can be perfomed for Isolated networks only"); + throw new InvalidParameterValueException("NetworkOffering and domain suffix upgrade can be performed for Isolated networks only"); } boolean networkOfferingChanged = false; @@ -3953,7 +3953,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C return false; } - // Check all ips + // Check all IPs List userIps = _ipAddressDao.listByAssociatedNetwork(network.getId(), null); List publicIps = new ArrayList(); if (userIps != null && !userIps.isEmpty()) { @@ -4103,10 +4103,10 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C // add security group provider to the physical network addDefaultSecurityGroupProviderToPhysicalNetwork(pNetwork.getId()); - // add VPCVirtualRouter as the defualt network service provider + // add VPCVirtualRouter as the default network service provider addDefaultVpcVirtualRouterToPhysicalNetwork(pNetwork.getId()); - // add baremetal as the defualt network service provider + // add baremetal as the default network service provider addDefaultBaremetalProvidersToPhysicalNetwork(pNetwork.getId()); //Add Internal Load Balancer element as a default network service provider @@ -4187,7 +4187,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C } // If tags are null, then check if there are any other networks with null tags - // of the same traffic type. If so then dont update the tags + // of the same traffic type. If so then don't update the tags if (tags != null && tags.size() == 0) { checkForPhysicalNetworksWithoutTag(network); } @@ -4272,7 +4272,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C vnetsInDb.addAll(tempVnets); } - //sorting the vnets in Db to generate a comma separated list of the vnet string. + //sorting the vnets in Db to generate a comma separated list of the vnet string. if (vnetsInDb.size() != 0) { commaSeparatedStringOfVnetRanges = generateVnetString(new ArrayList(vnetsInDb)); } @@ -4316,7 +4316,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C // for GRE phynets allow up to 32bits // TODO: Not happy about this test. - // What about guru-like objects for physical networs? + // What about guru-like objects for physical networks? logger.debug("ISOLATION METHODS:" + network.getIsolationMethods()); // Java does not have unsigned types... if (network.getIsolationMethods().contains("GRE")) { @@ -5070,7 +5070,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C } if (enabledServices != null) { - // check if services can be turned of + // check if services can be turned off if (!element.canEnableIndividualServices()) { throw new InvalidParameterValueException("Cannot update set of Services for this Service Provider '" + provider.getProviderName() + "'"); } @@ -5228,7 +5228,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C } // Check if there are more than 1 physical network with null tags in same traffic type. - // If so then dont allow to add traffic type. + // If so then don't allow to add traffic type. List tags = network.getTags(); if (CollectionUtils.isEmpty(tags)) { checkForPhysicalNetworksWithoutTag(network, trafficType); @@ -5578,14 +5578,14 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C Network network = _networksDao.findById(networkId); if (network == null) { - // release the acquired IP addrress before throwing the exception + // release the acquired IP address before throwing the exception // else it will always be in allocating state releaseIpAddress(ipId); throw new InvalidParameterValueException("Invalid network id is given"); } if (network.getVpcId() != null) { - // release the acquired IP addrress before throwing the exception + // release the acquired IP address before throwing the exception // else it will always be in allocating state releaseIpAddress(ipId); throw new InvalidParameterValueException("Can't assign ip to the network directly when network belongs" + " to VPC.Specify vpcId to associate ip address to VPC"); @@ -5622,7 +5622,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C } // VALIDATE IP INFO - // if end ip is not specified, default it to startIp + // if end IP is not specified, default it to startIp if (!NetUtils.isValidIp4(startIp)) { throw new InvalidParameterValueException("Invalid format for the ip address parameter"); } @@ -5646,7 +5646,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C URI uri = BroadcastDomainType.fromString(broadcastUriString); uriString = uri.toString(); BroadcastDomainType tiep = BroadcastDomainType.getSchemeValue(uri); - // numeric vlan or vlan uri are ok for now + // numeric vlan or vlan URI are ok for now // TODO make a test for any supported scheme if (!(tiep == BroadcastDomainType.Vlan || tiep == BroadcastDomainType.Lswitch)) { throw new InvalidParameterValueException("unsupported type of broadcastUri specified: " + broadcastUriString); diff --git a/server/src/main/java/com/cloud/user/AccountManagerImpl.java b/server/src/main/java/com/cloud/user/AccountManagerImpl.java index d996b684b25..d1894b8fc47 100644 --- a/server/src/main/java/com/cloud/user/AccountManagerImpl.java +++ b/server/src/main/java/com/cloud/user/AccountManagerImpl.java @@ -863,7 +863,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M _messageBus.publish(_name, MESSAGE_REMOVE_ACCOUNT_EVENT, PublishScope.LOCAL, accountId); } - // delete all vm groups belonging to accont + // delete all vm groups belonging to account List groups = _vmGroupDao.listByAccountId(accountId); for (InstanceGroupVO group : groups) { if (!_vmMgr.deleteVmGroup(group.getId())) { diff --git a/systemvm/debian/opt/cloud/templates/conntrackd.conf.templ b/systemvm/debian/opt/cloud/templates/conntrackd.conf.templ index 9443db24743..3f64da4064b 100644 --- a/systemvm/debian/opt/cloud/templates/conntrackd.conf.templ +++ b/systemvm/debian/opt/cloud/templates/conntrackd.conf.templ @@ -22,7 +22,7 @@ Sync { # # Size of the resend queue (in objects). This is the maximum # number of objects that can be stored waiting to be confirmed - # via acknoledgment. If you keep this value low, the daemon + # via acknowledgment. If you keep this value low, the daemon # will have less chances to recover state-changes under message # omission. On the other hand, if you keep this value high, # the daemon will consume more memory to store dead objects. diff --git a/test/integration/component/maint/testpath_disable_enable_zone.py b/test/integration/component/maint/testpath_disable_enable_zone.py index 216161f1c6b..63642c0fd25 100644 --- a/test/integration/component/maint/testpath_disable_enable_zone.py +++ b/test/integration/component/maint/testpath_disable_enable_zone.py @@ -1273,7 +1273,7 @@ class TestDisableEnableCluster(cloudstackTestCase): self.assertEqual(len(exception_list), 0, - "Check if vm's are accesible" + "Check if vm's are accessible" ) # non-admin user should fail to create vm, snap, temp etc diff --git a/test/integration/component/test_acl_sharednetwork.py b/test/integration/component/test_acl_sharednetwork.py index 42f4a899e12..52209a378ab 100644 --- a/test/integration/component/test_acl_sharednetwork.py +++ b/test/integration/component/test_acl_sharednetwork.py @@ -949,7 +949,7 @@ class TestSharedNetwork(cloudstackTestCase): Validate that any other user in same domain is NOT allowed to deploy VM in a shared network created with scope="account" for an account """ - # deploy VM as user under the same domain but belonging to a different account from the acount that has a shared network with scope=account + # deploy VM as user under the same domain but belonging to a different account from the account that has a shared network with scope=account self.apiclient.connection.apiKey = self.user_d111b_apikey self.apiclient.connection.securityKey = self.user_d111b_secretkey diff --git a/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py b/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py index 36b71defadb..609af80b66c 100644 --- a/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py +++ b/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py @@ -1613,7 +1613,7 @@ class TestSharedNetworkImpersonation(cloudstackTestCase): Valiate that Domain admin is NOT able to deploy a VM for user in the same domain but belonging to a different account in a shared network with scope=account """ - # Deploy VM as user in a domain under the same domain but different account from the acount that has a shared network with scope=account + # Deploy VM as user in a domain under the same domain but different account from the account that has a shared network with scope=account self.apiclient.connection.apiKey = self.user_d1_apikey self.apiclient.connection.securityKey = self.user_d1_secretkey self.vmdata["name"] = self.acldata["vmD111B"]["name"] + "-shared-scope-domain-withsubdomainaccess-domain-admin" diff --git a/test/integration/component/test_advancedsg_networks.py b/test/integration/component/test_advancedsg_networks.py index 4b3b8a32fa1..60567ae82fd 100644 --- a/test/integration/component/test_advancedsg_networks.py +++ b/test/integration/component/test_advancedsg_networks.py @@ -611,7 +611,7 @@ class TestNetworksInAdvancedSG(cloudstackTestCase): with same subnet and vlan""" # Steps, - # 1. create two different accouts + # 1. create two different accounts # 2. create account specific shared networks in both accounts with same subnet and vlan id # Validations, diff --git a/test/integration/component/test_project_limits.py b/test/integration/component/test_project_limits.py index 87bbcf70784..74c231e6b8e 100644 --- a/test/integration/component/test_project_limits.py +++ b/test/integration/component/test_project_limits.py @@ -1066,7 +1066,7 @@ class TestMaxProjectNetworks(cloudstackTestCase): # Steps for validation # 1. Fetch max.account.networks from configurations - # 2. Create an account. Create account more that max.accout.network + # 2. Create an account. Create account more that max.account.network # 3. Create network should fail self.debug("Creating project with '%s' as admin" % diff --git a/test/integration/component/test_resource_limits.py b/test/integration/component/test_resource_limits.py index e2efc4344a9..25518257a33 100644 --- a/test/integration/component/test_resource_limits.py +++ b/test/integration/component/test_resource_limits.py @@ -1435,7 +1435,7 @@ class TestMaxAccountNetworks(cloudstackTestCase): # Steps for validation # 1. Fetch max.account.networks from configurations - # 2. Create an account. Create account more that max.accout.network + # 2. Create an account. Create account more that max.account.network # 3. Create network should fail config = Configurations.list( diff --git a/test/integration/component/test_snapshots_improvement.py b/test/integration/component/test_snapshots_improvement.py index c95d8205ee7..fde81025bca 100644 --- a/test/integration/component/test_snapshots_improvement.py +++ b/test/integration/component/test_snapshots_improvement.py @@ -542,7 +542,7 @@ class TestCreateSnapshot(cloudstackTestCase): def verify_Snapshots(self): try: - self.debug("Listing snapshots for accout : %s" % self.account.name) + self.debug("Listing snapshots for account : %s" % self.account.name) snapshots = self.get_Snapshots_For_Account( self.account.name, self.account.domainid) diff --git a/test/integration/smoke/test_attach_multiple_volumes.py b/test/integration/smoke/test_attach_multiple_volumes.py index 939764dc010..81199bcfdfa 100644 --- a/test/integration/smoke/test_attach_multiple_volumes.py +++ b/test/integration/smoke/test_attach_multiple_volumes.py @@ -211,7 +211,7 @@ class TestMultipleVolumeAttach(cloudstackTestCase): clusterid = host.clusterid storage_pools = StoragePool.list(self.apiClient, clusterid=clusterid) if len(storage_pools) < 2: - self.skipTest("at least two accesible primary storage pools needed for the vm to perform this test") + self.skipTest("at least two accessible primary storage pools needed for the vm to perform this test") return storage_pools diff --git a/test/integration/smoke/test_enable_account_settings_for_domain.py b/test/integration/smoke/test_enable_account_settings_for_domain.py index 09550ed1e27..fea80ee1297 100644 --- a/test/integration/smoke/test_enable_account_settings_for_domain.py +++ b/test/integration/smoke/test_enable_account_settings_for_domain.py @@ -391,7 +391,7 @@ class TestDedicatePublicIPRange(cloudstackTestCase): # (8) change domain setting (3) to original +30 # (9) list domain settings with name=(3), value should be same as (8) # (10) list account settings with name=(3), value should be same as (9)=(8) - # (11) change acount setting (3) to original +50 + # (11) change account setting (3) to original +50 # (12) list account settings with name=(3), value should be same as (10) """ @@ -484,7 +484,7 @@ class TestDedicatePublicIPRange(cloudstackTestCase): account_value = int(configs[0].value) self.assertEqual(new_domain_value, account_value, "Account setting is not equal to new value of global setting") - # (11) change acount setting (3) to original +50 + # (11) change account setting (3) to original +50 new_account_value = account_value + 50 Configurations.update( self.apiclient, diff --git a/tools/ngui/static/js/lib/angular.js b/tools/ngui/static/js/lib/angular.js index e960afe36d7..74e036b6c90 100644 --- a/tools/ngui/static/js/lib/angular.js +++ b/tools/ngui/static/js/lib/angular.js @@ -6428,11 +6428,11 @@ function setter(obj, path, setValue) { } /** - * Return the value accesible from the object by path. Any undefined traversals are ignored + * Return the value accessible from the object by path. Any undefined traversals are ignored * @param {Object} obj starting object * @param {string} path path to traverse * @param {boolean=true} bindFnToScope - * @returns value as accesbile by path + * @returns value as accessible by path */ //TODO(misko): this function needs to be removed function getter(obj, path, bindFnToScope) {