diff --git a/CHANGES.md b/CHANGES.md index 47df1aaac4f..6d6a268ba08 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -180,7 +180,7 @@ Bug ID | Description [CLOUDSTACK-6099](https://issues.apache.org/jira/browse/CLOUDSTACK-6099) | live migration is failing for vm deployed using dynaic compute offerings with NP... [CLOUDSTACK-6075](https://issues.apache.org/jira/browse/CLOUDSTACK-6075) | Increase the ram size for router service offering ... [CLOUDSTACK-6036](https://issues.apache.org/jira/browse/CLOUDSTACK-6036) | CloudStack stops the machine for no reason... -[CLOUDSTACK-5992](https://issues.apache.org/jira/browse/CLOUDSTACK-5992) | [Upgrade] default values of configuraiton parameters in configuration table are ... +[CLOUDSTACK-5992](https://issues.apache.org/jira/browse/CLOUDSTACK-5992) | [Upgrade] default values of configuration parameters in configuration table are ... [CLOUDSTACK-5984](https://issues.apache.org/jira/browse/CLOUDSTACK-5984) | addvmwaredc API call is not documented ... [CLOUDSTACK-5952](https://issues.apache.org/jira/browse/CLOUDSTACK-5952) | [UI] VM ip address information is not shown after configuring static NAT... [CLOUDSTACK-5946](https://issues.apache.org/jira/browse/CLOUDSTACK-5946) | SSL: Fail to find the generated keystore. Loading fail-safe one to continue.... @@ -388,8 +388,8 @@ Bug ID | Description [CLOUDSTACK-5632](https://issues.apache.org/jira/browse/CLOUDSTACK-5632) | [Automation] XenServer - Template deletion fails with error "Please specify a te... [CLOUDSTACK-5597](https://issues.apache.org/jira/browse/CLOUDSTACK-5597) | attachVolume shouldn't create the volume on the primary storage if the vm's root... [CLOUDSTACK-5582](https://issues.apache.org/jira/browse/CLOUDSTACK-5582) | kvm - HA is not triggered when host is powered down since the host gets into "Di... -[CLOUDSTACK-5577](https://issues.apache.org/jira/browse/CLOUDSTACK-5577) | Remote Access VPN and S2S VPN should be treated as two seperate services for Net... -[CLOUDSTACK-5575](https://issues.apache.org/jira/browse/CLOUDSTACK-5575) | Remote Access VPN and S2S VPN should be treated as two seperate services on VPC... +[CLOUDSTACK-5577](https://issues.apache.org/jira/browse/CLOUDSTACK-5577) | Remote Access VPN and S2S VPN should be treated as two separate services for Net... +[CLOUDSTACK-5575](https://issues.apache.org/jira/browse/CLOUDSTACK-5575) | Remote Access VPN and S2S VPN should be treated as two separate services on VPC... [CLOUDSTACK-5563](https://issues.apache.org/jira/browse/CLOUDSTACK-5563) | path field is set to null in volumes table ... [CLOUDSTACK-5505](https://issues.apache.org/jira/browse/CLOUDSTACK-5505) | [Automation] Private gateway not getting programmed in VPC router ... [CLOUDSTACK-5501](https://issues.apache.org/jira/browse/CLOUDSTACK-5501) | Unable to create more than one vpnConnection per vpn customer gateway... @@ -617,7 +617,7 @@ Bug ID | Description [CLOUDSTACK-4061](https://issues.apache.org/jira/browse/CLOUDSTACK-4061) | UI issue with Japanese localized ui... [CLOUDSTACK-3806](https://issues.apache.org/jira/browse/CLOUDSTACK-3806) | OS Preference can not be set... [CLOUDSTACK-3664](https://issues.apache.org/jira/browse/CLOUDSTACK-3664) | scaling up vms is not considering parameter "cluster.(memory/cpu).allocated.cap... -[CLOUDSTACK-3627](https://issues.apache.org/jira/browse/CLOUDSTACK-3627) | Public IP interface(eth2) is not getting confugured with Redundant VR (State = F... +[CLOUDSTACK-3627](https://issues.apache.org/jira/browse/CLOUDSTACK-3627) | Public IP interface(eth2) is not getting configured with Redundant VR (State = F... [CLOUDSTACK-3577](https://issues.apache.org/jira/browse/CLOUDSTACK-3577) | NPE while downloading the template to secondary storage ... [CLOUDSTACK-3561](https://issues.apache.org/jira/browse/CLOUDSTACK-3561) | When inputting the nfs server in secondary storage, if once it's required, it al... [CLOUDSTACK-3364](https://issues.apache.org/jira/browse/CLOUDSTACK-3364) | normal users are not allowed to edit their own iso... @@ -682,7 +682,7 @@ Bug Fixes: * CLOUDSTACK-1600 Typo in dpkg-buildpackage command * CLOUDSTACK-1574 updateResourceCount API is failed saying to specify valida resource type even after parsing the valid resource type -* CLOUDSTACK-1562 Replace the short-cut solution of supportting @DB with the formal one +* CLOUDSTACK-1562 Replace the short-cut solution of supporting @DB with the formal one * CLOUDSTACK-1541 NPE while deleting snapshot :Unexpected exception while executing org.apache.cloudstack.api.command.user.snapshot.DeleteSnapshotCmd * CLOUDSTACK-1521 Redundant router: Services are not stopped when switch to BACKUP state * CLOUDSTACK-1509 Failed to implement network elements and resources while provisioning for persistent network(createVlanIpRange to an account] diff --git a/api/src/main/java/com/cloud/agent/api/Answer.java b/api/src/main/java/com/cloud/agent/api/Answer.java index 17bba76e14d..4a32705dc37 100644 --- a/api/src/main/java/com/cloud/agent/api/Answer.java +++ b/api/src/main/java/com/cloud/agent/api/Answer.java @@ -57,7 +57,7 @@ public class Answer extends Command { } public static UnsupportedAnswer createUnsupportedVersionAnswer(final Command cmd) { - return new UnsupportedAnswer(cmd, "Unsuppored Version."); + return new UnsupportedAnswer(cmd, "Unsupported Version."); } @Override diff --git a/api/src/main/java/com/cloud/network/Networks.java b/api/src/main/java/com/cloud/network/Networks.java index f892e253b35..6a6ff3539f9 100644 --- a/api/src/main/java/com/cloud/network/Networks.java +++ b/api/src/main/java/com/cloud/network/Networks.java @@ -194,7 +194,7 @@ public class Networks { /** * converts a String to a BroadcastDomainType * - * @param scheme convert a string representation to a BroacastDomainType + * @param scheme convert a string representation to a BroadcastDomainType * @return the value of this */ public static BroadcastDomainType toEnumValue(String scheme) { diff --git a/api/src/main/java/com/cloud/network/lb/LoadBalancingRulesService.java b/api/src/main/java/com/cloud/network/lb/LoadBalancingRulesService.java index 975fb38c46d..5a2f3d21916 100644 --- a/api/src/main/java/com/cloud/network/lb/LoadBalancingRulesService.java +++ b/api/src/main/java/com/cloud/network/lb/LoadBalancingRulesService.java @@ -70,7 +70,7 @@ public interface LoadBalancingRulesService { * the command specifying the stickiness method name, params (name,value pairs), policy name and * description. * @return the newly created stickiness policy if successful, null otherwise - * @thows NetworkRuleConflictException + * @throws NetworkRuleConflictException */ public StickinessPolicy createLBStickinessPolicy(CreateLBStickinessPolicyCmd cmd) throws NetworkRuleConflictException; @@ -87,7 +87,7 @@ public interface LoadBalancingRulesService { * (name,value pairs), policy name and description. * @return the newly created stickiness policy if successful, null * otherwise - * @thows NetworkRuleConflictException + * @throws NetworkRuleConflictException */ public HealthCheckPolicy createLBHealthCheckPolicy(CreateLBHealthCheckPolicyCmd cmd); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java index 76c89c2ae86..97d24ed9384 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java @@ -85,7 +85,7 @@ public class ListAnnotationsCmd extends BaseListCmd { // preconditions to check: // if entity type is null entity uuid can not have a value Preconditions.checkArgument(StringUtils.isNotBlank(entityType) ? StringUtils.isBlank(uuid) : true, - "I can search for an anotation on an entity or for a specific annotation, not both"); + "I can search for an annotation on an entity or for a specific annotation, not both"); // if uuid has a value entity type and entity uuid can not have a value Preconditions.checkArgument(StringUtils.isNotBlank(uuid) ? entityType == null && entityUuid == null : true, "I will either search for a specific annotation or for annotations on an entity, not both"); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java index 492eaccefa5..eb876c602b4 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java @@ -57,7 +57,7 @@ public class ListRemoteAccessVpnsCmd extends BaseListProjectAndAccountResourcesC @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, - description = "list remote access VPNs for ceratin network", + description = "list remote access VPNs for certain network", since = "4.3") private Long networkId; diff --git a/core/src/test/java/org/apache/cloudstack/api/agent/test/AnswerTest.java b/core/src/test/java/org/apache/cloudstack/api/agent/test/AnswerTest.java index 608791736ac..783e4926184 100644 --- a/core/src/test/java/org/apache/cloudstack/api/agent/test/AnswerTest.java +++ b/core/src/test/java/org/apache/cloudstack/api/agent/test/AnswerTest.java @@ -70,6 +70,6 @@ public class AnswerTest { assertFalse(b); d = usa.getDetails(); - assertTrue(d.equals("Unsuppored Version.")); + assertTrue(d.equals("Unsupported Version.")); } } diff --git a/engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java b/engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java index 7b8ae5790a1..35c36d35cd9 100644 --- a/engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java +++ b/engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java @@ -93,7 +93,7 @@ public interface VirtualMachineManager extends Manager { * * @param vmInstanceName Instance name of the VM. This name uniquely * a VM in CloudStack's deploy environment. The caller gets to - * define this VM but it must be unqiue for all of CloudStack. + * define this VM but it must be unique for all of CloudStack. * @param template The template this VM is based on. * @param serviceOffering The service offering that specifies the offering this VM should provide. * @param defaultNetwork The default network for the VM. diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataMotionStrategy.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataMotionStrategy.java index 2afece483c6..695621a6331 100644 --- a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataMotionStrategy.java +++ b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataMotionStrategy.java @@ -26,7 +26,7 @@ import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.host.Host; /** - * Interface to query how to move data around and to commision the moving + * Interface to query how to move data around and to commission the moving */ public interface DataMotionStrategy { /** diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java index fcacc14d35c..bf7978e8abd 100644 --- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java +++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java @@ -952,7 +952,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra * @param nics the list of nics present * @param finalNetwork the network to add the nics to * @throws InsufficientVirtualNetworkCapacityException great - * @throws InsufficientAddressCapacityException also magnificent, as the name sugests + * @throws InsufficientAddressCapacityException also magnificent, as the name suggests */ private void createExtraNics(int size, List nics, Network finalNetwork) throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException { if (nics.size() != size) { diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade2214to30.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade2214to30.java index 27304953d1a..d806490d87d 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade2214to30.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade2214to30.java @@ -79,7 +79,7 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade { encryptData(conn); // drop keys dropKeysIfExist(conn); - //update templete ID for system Vms + //update template ID for system Vms //updateSystemVms(conn); This is not required as system template update is handled during 4.2 upgrade // update domain network ref updateDomainNetworkRef(conn); diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade304to305.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade304to305.java index dbb7187507f..a8009630976 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade304to305.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade304to305.java @@ -113,7 +113,7 @@ public class Upgrade304to305 extends Upgrade30xBase { pstmt.setLong(1, templateId); pstmt.executeUpdate(); pstmt.close(); - // update templete ID of system Vms + // update template ID of system Vms pstmt = conn.prepareStatement("update `cloud`.`vm_instance` set vm_template_id = ? where type <> 'User' and hypervisor_type = 'VMware'"); pstmt.setLong(1, templateId); pstmt.executeUpdate(); diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade430to440.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade430to440.java index 77070ae8f49..43d4d877361 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade430to440.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade430to440.java @@ -224,7 +224,7 @@ public class Upgrade430to440 implements DbUpgrade { } catch (SQLException e) { throw new CloudRuntimeException("Unable to update vlan URIs ", e); } - s_logger.debug("Done updateing vlan URIs"); + s_logger.debug("Done updating vlan URIs"); } @Override diff --git a/engine/schema/src/main/resources/META-INF/db/schema-2211to2212.sql b/engine/schema/src/main/resources/META-INF/db/schema-2211to2212.sql index 4b0c4957b4c..71eca10158f 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-2211to2212.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-2211to2212.sql @@ -44,7 +44,7 @@ ALTER TABLE `cloud`.`host` MODIFY COLUMN `storage_ip_address` char(40); ALTER TABLE `cloud`.`resource_count` ADD UNIQUE `i_resource_count__type_accountId`(`type`, `account_id`); ALTER TABLE `cloud`.`resource_count` ADD UNIQUE `i_resource_count__type_domaintId`(`type`, `domain_id`); -UPDATE configuration set description='Load Balancer(haproxy) stats visibilty, the value can be one of the following six parameters : global,guest-network,link-local,disabled,all,default' WHERE name='network.loadbalancer.haproxy.stats.visibility' ; +UPDATE configuration set description='Load Balancer(haproxy) stats visibility, the value can be one of the following six parameters : global,guest-network,link-local,disabled,all,default' WHERE name='network.loadbalancer.haproxy.stats.visibility' ; UPDATE nics SET strategy="Managed" WHERE (ip4_address, network_id) IN (SELECT public_ip_address, source_network_id FROM user_ip_address WHERE source_nat=1) AND vm_type="DomainRouter"; diff --git a/engine/schema/src/main/resources/META-INF/db/schema-228to229.sql b/engine/schema/src/main/resources/META-INF/db/schema-228to229.sql index 97791fcb006..d448f03ca29 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-228to229.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-228to229.sql @@ -66,7 +66,7 @@ ALTER TABLE `cloud`.`configuration` ADD INDEX `i_configuration__component` (`com ALTER TABLE `cloud`.`port_forwarding_rules` ADD CONSTRAINT `fk_port_forwarding_rules__instance_id` FOREIGN KEY `fk_port_forwarding_rules__instance_id` (`instance_id`) REFERENCES `vm_instance` (`id`) ON DELETE CASCADE; INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'management-server', 'agent.load.threshold', '0.70', 'Percentage (as a value between 0 and 1) of connected agents after which agent load balancing will start happening'); -INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.stats.visibility', 'global', 'Load Balancer(haproxy) stats visibilty, it can take the following four parameters : global,guest-network,link-local,disabled'); +INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.stats.visibility', 'global', 'Load Balancer(haproxy) stats visibility, it can take the following four parameters : global,guest-network,link-local,disabled'); INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.stats.uri','/admin?stats','Load Balancer(haproxy) uri.'); INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.stats.auth','admin1:AdMiN123','Load Balancer(haproxy) authetication string in the format username:password'); INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.stats.port','8081','Load Balancer(haproxy) stats port number.'); diff --git a/engine/schema/src/main/resources/META-INF/db/schema-229to2210.sql b/engine/schema/src/main/resources/META-INF/db/schema-229to2210.sql index 86224ba0f58..d549e680370 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-229to2210.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-229to2210.sql @@ -48,7 +48,7 @@ INSERT IGNORE INTO `cloud`.`configuration` (category, instance, name, value, des INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'management-server', 'agent.load.threshold', '0.70', 'Percentage (as a value between 0 and 1) of connected agents after which agent load balancing will start happening'); -INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.stats.visibility', 'global', 'Load Balancer(haproxy) stats visibilty, it can take the following four parameters : global,guest-network,link-local,disabled'); +INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.stats.visibility', 'global', 'Load Balancer(haproxy) stats visibility, it can take the following four parameters : global,guest-network,link-local,disabled'); INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.stats.uri','/admin?stats','Load Balancer(haproxy) uri.'); INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.stats.auth','admin1:AdMiN123','Load Balancer(haproxy) authetication string in the format username:password'); INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.stats.port','8081','Load Balancer(haproxy) stats port number.'); diff --git a/engine/schema/src/main/resources/META-INF/db/schema-305to306.sql b/engine/schema/src/main/resources/META-INF/db/schema-305to306.sql index 1980b260086..b1294a21054 100755 --- a/engine/schema/src/main/resources/META-INF/db/schema-305to306.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-305to306.sql @@ -91,6 +91,6 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'Agent UPDATE `cloud`.`networks` set name='Shared SG enabled network', display_text='Shared SG enabled network' WHERE name IS null AND traffic_type='Guest' AND data_center_id IN (select id from data_center where networktype='Advanced' and is_security_group_enabled=1) AND acl_type='Domain'; -# patch UUID colomn with ID for volumes and snapshot_policy tables +# patch UUID column with ID for volumes and snapshot_policy tables UPDATE `cloud`.`volumes` set uuid=id WHERE uuid is NULL; UPDATE `cloud`.`snapshot_policy` set uuid=id WHERE uuid is NULL; diff --git a/engine/schema/src/main/resources/META-INF/db/schema-410to420.sql b/engine/schema/src/main/resources/META-INF/db/schema-410to420.sql index 3dd28f58d17..5fd1ee7ffcc 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-410to420.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-410to420.sql @@ -1484,7 +1484,7 @@ UPDATE `cloud`.`load_balancing_rules` SET `scheme`='Public'; --- Add details talbe for the network offering +-- Add details table for the network offering CREATE TABLE `cloud`.`network_offering_details` ( `id` bigint unsigned NOT NULL auto_increment, `network_offering_id` bigint unsigned NOT NULL COMMENT 'network offering id', diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql b/engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql index f51f88aef84..68c2e344fa7 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql @@ -23,7 +23,7 @@ ALTER TABLE cloud.remote_access_vpn MODIFY ipsec_psk text NOT NULL; --- PR#5832 Fix 'endpointe.url' global settings configruation typo. +-- PR#5832 Fix 'endpointe.url' global settings configuration typo. UPDATE `cloud`.`configuration` SET name='endpoint.url' WHERE name='endpointe.url'; diff --git a/engine/schema/src/main/resources/META-INF/db/schema-420to421.sql b/engine/schema/src/main/resources/META-INF/db/schema-420to421.sql index 78687f22fec..bf1acc17bc2 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-420to421.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-420to421.sql @@ -237,7 +237,7 @@ CREATE VIEW `cloud`.`user_vm_view` AS update `cloud`.`volumes` v, `cloud`.`volume_host_ref` vhr set v.format=vhr.format where v.id=vhr.volume_id and v.format is null; -INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'baremetal.ipmi.lan.interface', 'default', 'option specified in -I option of impitool. candidates are: open/bmc/lipmi/lan/lanplus/free/imb, see ipmitool man page for details. default valule "default" means using default option of ipmitool'); +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'baremetal.ipmi.lan.interface', 'default', 'option specified in -I option of impitool. candidates are: open/bmc/lipmi/lan/lanplus/free/imb, see ipmitool man page for details. default value "default" means using default option of ipmitool'); INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'baremetal.ipmi.fail.retry', 'default', "ipmi interface will be temporary out of order after power opertions(e.g. cycle, on), it leads following commands fail immediately. The value specifies retry times before accounting it as real failure"); INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'vmware.hung.wokervm.timeout', '7200', 'Worker VM timeout in seconds'); INSERT IGNORE INTO `cloud`.`configuration` VALUES ("Alert", 'DEFAULT', 'management-server', "alert.smtp.connectiontimeout", "30000", "Socket connection timeout value in milliseconds. -1 for infinite timeout."); diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java index 777eb376cb6..460f869bebf 100644 --- a/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java +++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java @@ -138,7 +138,7 @@ public class DataObjectManagerImpl implements DataObjectManager { try { objectInDataStoreMgr.update(objInStore, ObjectInDataStoreStateMachine.Event.OperationFailed); } catch (Exception e1) { - s_logger.debug("state transation failed", e1); + s_logger.debug("state transaction failed", e1); } CreateCmdResult result = new CreateCmdResult(null, null); result.setSuccess(false); @@ -149,7 +149,7 @@ public class DataObjectManagerImpl implements DataObjectManager { try { objectInDataStoreMgr.update(objInStore, ObjectInDataStoreStateMachine.Event.OperationFailed); } catch (Exception e1) { - s_logger.debug("state transation failed", e1); + s_logger.debug("state transaction failed", e1); } CreateCmdResult result = new CreateCmdResult(null, null); result.setSuccess(false); diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs index 6ce8a456910..59397e8fba8 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs @@ -389,7 +389,7 @@ namespace HypervResource } // Assert - errMsg = "No valide path in DestroyCommand in " + CloudStackTypes.DestroyCommand + " " + (String)cmd.ToString(); + errMsg = "No valid path in DestroyCommand in " + CloudStackTypes.DestroyCommand + " " + (String)cmd.ToString(); if (cmd.volume.path == null) { logger.Error(errMsg); diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/WmiWrappers/ROOT.virtualization.v2.Msvm_VirtualSystemMigrationSettingData.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/WmiWrappers/ROOT.virtualization.v2.Msvm_VirtualSystemMigrationSettingData.cs index de5bea5d8b8..f7642dffa28 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/WmiWrappers/ROOT.virtualization.v2.Msvm_VirtualSystemMigrationSettingData.cs +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/WmiWrappers/ROOT.virtualization.v2.Msvm_VirtualSystemMigrationSettingData.cs @@ -410,7 +410,7 @@ wants a VM from source to migrate into this planned VM.")] [Browsable(true)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] [Description("For storage migration, this could be set to TRUE or FALSE\nto determine wheither, " + - "at the end of a storage migration, when the\nsource host is beeing clean up, the " + + "at the end of a storage migration, when the\nsource host is being clean up, the " + "read only VHDs should be removedor not.")] [TypeConverter(typeof(WMIValueTypeConverter))] public bool RetainVhdCopiesOnSource { diff --git a/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/OvmVm.java b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/OvmVm.java index 6bbc33f91f6..7897427c5f1 100644 --- a/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/OvmVm.java +++ b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/OvmVm.java @@ -68,7 +68,7 @@ public class OvmVm extends OvmObject { public static void stop(Connection c, String vmName) throws XmlRpcException { Object[] params = {vmName}; - /* Agent will destroy vm if vm shutdowns failed due to timout after 10 mins, so we set timeout to 20 mins here*/ + /* Agent will destroy vm if vm shutdowns failed due to timeout after 10 mins, so we set timeout to 20 mins here*/ c.callTimeoutInSec("OvmVm.stop", params, 1200); } diff --git a/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmDispatcher.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmDispatcher.py index d5c4f9818e9..da77b064184 100755 --- a/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmDispatcher.py +++ b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmDispatcher.py @@ -45,17 +45,17 @@ def OvmDispatch(methodName, *params): global ExposedClass p = methodName.split('.') if len(p) != 2: - logger.error(OvmDispatch, "%s is not a vaild format, should be classname.methodname"%p) - raise Fault(dispatchErrCode('InvalidCallMethodFormat'), "%s is not a vaild format, should be classname.methodname"%p) + logger.error(OvmDispatch, "%s is not a valid format, should be classname.methodname"%p) + raise Fault(dispatchErrCode('InvalidCallMethodFormat'), "%s is not a valid format, should be classname.methodname"%p) clzName = p[0] funcName = p[1] if clzName not in ExposedClass.keys(): logger.error(OvmDispatch, "class %s is not exposed by agent"%clzName) - raise Fault(dispatchErrCode('InvaildClass'), "class %s is not exposed by agent"%clzName) + raise Fault(dispatchErrCode('InvalidClass'), "class %s is not exposed by agent"%clzName) clz = ExposedClass[clzName] if not hasattr(clz, funcName): logger.error(OvmDispatch, "class %s has no function %s"%(clzName, funcName)) - raise Fault(dispatchErrCode('InvaildFunction'), "class %s has no function %s"%(clzName, funcName)) + raise Fault(dispatchErrCode('InvalidFunction'), "class %s has no function %s"%(clzName, funcName)) logger.debug(OvmDispatch, "Entering %s.%s ===>"%(clzName, funcName)) rs = getattr(clz, funcName)(*params) logger.debug(OvmDispatch, "Exited %s.%s <==="%(clzName, funcName)) diff --git a/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmFaultConstants.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmFaultConstants.py index 9599586f1e8..80b9c66cf9e 100755 --- a/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmFaultConstants.py +++ b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmFaultConstants.py @@ -37,8 +37,8 @@ class ShellExceutedFailedException(Exception): errCode = { # OvmDispatch is not class, these error codes are reserved "OvmDispatch.InvalidCallMethodFormat":OvmDispatcherStub+1, - "OvmDispatch.InvaildClass":OvmDispatcherStub+2, - "OvmDispatch.InvaildFunction":OvmDispatcherStub+3, + "OvmDispatch.InvalidClass":OvmDispatcherStub+2, + "OvmDispatch.InvalidFunction":OvmDispatcherStub+3, "OvmVm.reboot":OvmDispatcherStub+4, "OvmHost.registerAsPrimary":OvmHostErrCodeStub+1, 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 1f57e00979d..5a601aed433 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 @@ -133,7 +133,7 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager { command.add(name + ".ovf"); // OVF file should be the first file in OVA archive command.add(name + "-disk0.vmdk"); - s_logger.info("Package OVA with commmand: " + command.toString()); + s_logger.info("Package OVA with command: " + command.toString()); command.execute(); } 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 04e9dd4cc96..fe469b08e7a 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 @@ -3858,7 +3858,7 @@ public class VmwareResource extends ServerResourceBase implements StoragePoolRes // BroadcastDomainType recogniizes and handles this. return BroadcastDomainType.getValue(nicTo.getBroadcastUri()); else - // for pvlan, the broacast uri will be of the form pvlan://-i + // for pvlan, the broadcast uri will be of the form pvlan://-i // TODO consider the spread of functionality between BroadcastDomainType and NetUtils return NetUtils.getPrimaryPvlanFromUri(nicTo.getBroadcastUri()); } else { diff --git a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsCreateGreTunnelCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsCreateGreTunnelCommandWrapper.java index e9b0035da1d..a27c42ffc92 100644 --- a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsCreateGreTunnelCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsCreateGreTunnelCommandWrapper.java @@ -43,7 +43,7 @@ public final class CitrixOvsCreateGreTunnelCommandWrapper extends CommandWrapper citrixResourceBase.setIsOvs(true); final Connection conn = citrixResourceBase.getConnection(); - String bridge = "unkonwn"; + String bridge = "unknown"; try { final Network nw = citrixResourceBase.setupvSwitchNetwork(conn); bridge = nw.getBridge(conn); diff --git a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixSetupCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixSetupCommandWrapper.java index 2d2fb5d4749..85db4f941c3 100644 --- a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixSetupCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixSetupCommandWrapper.java @@ -69,7 +69,7 @@ public final class CitrixSetupCommandWrapper extends CommandWrapper 0) { throw new InvalidParameterValueException("Can't delete network offering " + offeringId + " as its used by " + networkCount + " networks. " - + "To make the network offering unavaiable, disable it"); + + "To make the network offering unavailable, disable it"); } annotationDao.removeByEntityType(AnnotationService.EntityType.NETWORK_OFFERING.name(), offering.getUuid()); diff --git a/server/src/main/java/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java b/server/src/main/java/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java index b015eedf9ed..df8e371e8bc 100644 --- a/server/src/main/java/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java +++ b/server/src/main/java/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java @@ -254,7 +254,7 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase ExternalLoadBalancerDeviceVO zoneGslbProvider = _externalLoadBalancerDeviceDao.findGslbServiceProvider(physicalNetworkId, ntwkDevice.getNetworkServiceProvder()); if (zoneGslbProvider != null) { - throw new CloudRuntimeException("There is a GSLB service provider configured in the zone alredy."); + throw new CloudRuntimeException("There is a GSLB service provider configured in the zone already."); } } 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 5489fb3e246..1065a10fb22 100644 --- a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java @@ -825,7 +825,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis final int vpcCount = _vpcDao.getVpcCountByOfferingId(offId); if (vpcCount > 0) { throw new InvalidParameterValueException("Can't delete vpc offering " + offId + " as its used by " + vpcCount + " vpcs. " - + "To make the network offering unavaiable, disable it"); + + "To make the network offering unavailable, disable it"); } if (_vpcOffDao.remove(offId)) { diff --git a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java index b31f7eceadd..34629082748 100755 --- a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java @@ -2921,7 +2921,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, return result; } } catch (final AgentUnavailableException e) { - s_logger.error("Agent is not availbale!", e); + s_logger.error("Agent is not available!", e); } final boolean shouldUpdateHostPasswd = command.getUpdatePasswdOnHost(); diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java index 55bd8c119d8..5c5fdd34e4a 100644 --- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java +++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java @@ -4224,7 +4224,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe } if (cmd.getCertIndex() == null) { - throw new InvalidParameterValueException("index can't be empty, if it's a certifciation chain"); + throw new InvalidParameterValueException("index can't be empty, if it's a certification chain"); } } diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java index bb4da36dd98..f23579809ce 100644 --- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java +++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java @@ -1153,7 +1153,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic newSize = newSize << 30; } else { if (cmd.getSize() != null) { - throw new InvalidParameterValueException("You cannnot pass in a custom disk size to a non-custom disk offering."); + throw new InvalidParameterValueException("You cannot pass in a custom disk size to a non-custom disk offering."); } newSize = newDiskOffering.getDiskSize(); diff --git a/server/src/main/java/com/cloud/test/PodZoneConfig.java b/server/src/main/java/com/cloud/test/PodZoneConfig.java index ee017d55223..7cd6cb11871 100644 --- a/server/src/main/java/com/cloud/test/PodZoneConfig.java +++ b/server/src/main/java/com/cloud/test/PodZoneConfig.java @@ -263,7 +263,7 @@ public class PodZoneConfig { return genReturnList("true", "Successfully added VLAN."); } else { - return genReturnList("false", "That operation is not suppored."); + return genReturnList("false", "That operation is not supported."); } /* diff --git a/server/src/main/java/com/cloud/user/AccountManagerImpl.java b/server/src/main/java/com/cloud/user/AccountManagerImpl.java index 3c1e2618df9..cdc98d28385 100644 --- a/server/src/main/java/com/cloud/user/AccountManagerImpl.java +++ b/server/src/main/java/com/cloud/user/AccountManagerImpl.java @@ -2049,7 +2049,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M private void checkIfNotMovingAcrossDomains(long domainId, Account newAccount) { if (newAccount.getDomainId() != domainId) { // not in scope - throw new InvalidParameterValueException("moving a user from an account in one domain to an account in annother domain is not supported!"); + throw new InvalidParameterValueException("moving a user from an account in one domain to an account in another domain is not supported!"); } } diff --git a/server/src/main/java/com/cloud/vm/UserVmManager.java b/server/src/main/java/com/cloud/vm/UserVmManager.java index 98246396f8a..37338b9755f 100644 --- a/server/src/main/java/com/cloud/vm/UserVmManager.java +++ b/server/src/main/java/com/cloud/vm/UserVmManager.java @@ -90,7 +90,7 @@ public interface UserVmManager extends UserVmService { HashMap> getVmDiskStatistics(long hostId, String hostName, List vmIds); - HashMap getVolumeStatistics(long clusterId, String poolUuid, StoragePoolType poolType, int timout); + HashMap getVolumeStatistics(long clusterId, String poolUuid, StoragePoolType poolType, int timeout); boolean deleteVmGroup(long groupId); diff --git a/server/src/test/java/com/cloud/network/element/VirtualRouterElementTest.java b/server/src/test/java/com/cloud/network/element/VirtualRouterElementTest.java index 47b11a0d0ef..592332b5cec 100644 --- a/server/src/test/java/com/cloud/network/element/VirtualRouterElementTest.java +++ b/server/src/test/java/com/cloud/network/element/VirtualRouterElementTest.java @@ -249,7 +249,7 @@ public class VirtualRouterElementTest { public void testGetRouters2(){ Network networkUpdateInprogress=new NetworkVO(2l,null,null,null,1l,1l,1l,1l,"d","d","d",null,1l,1l,null,true,null,true); mockDAOs((NetworkVO)networkUpdateInprogress,testOffering); - //alwyas return backup routers first when both primary and backup need update. + //always return backup routers first when both primary and backup need update. List routers=virtualRouterElement.getRouters(networkUpdateInprogress); assertTrue(routers.size()==1); assertTrue(routers.get(0).getRedundantState()==RedundantState.BACKUP && routers.get(0).getUpdateState()==VirtualRouter.UpdateState.UPDATE_IN_PROGRESS); @@ -259,7 +259,7 @@ public class VirtualRouterElementTest { public void testGetRouters3(){ Network network=new NetworkVO(3l,null,null,null,1l,1l,1l,1l,"d","d","d",null,1l,1l,null,true,null,true); mockDAOs((NetworkVO)network,testOffering); - //alwyas return backup routers first when both primary and backup need update. + //always return backup routers first when both primary and backup need update. List routers=virtualRouterElement.getRouters(network); assertTrue(routers.size()==4); } diff --git a/services/console-proxy/rdpconsole/README.txt b/services/console-proxy/rdpconsole/README.txt index aa4d9488d5e..d067ef9a559 100644 --- a/services/console-proxy/rdpconsole/README.txt +++ b/services/console-proxy/rdpconsole/README.txt @@ -21,7 +21,7 @@ Usage: Common options: --help|-h Show this help text. - --debug-link|-DL Print debugging messages when packets are trasnferred via links. + --debug-link|-DL Print debugging messages when packets are transferred via links. --debug-element|-DE Print debugging messages when packets are received or sent by elements. --debug-pipeline|-DP Print debugging messages in pipelines. --host|-n|--host-name VALUE Name or IP address of host to connect to. Required. diff --git a/services/console-proxy/rdpconsole/src/main/java/common/Client.java b/services/console-proxy/rdpconsole/src/main/java/common/Client.java index eb345a2230d..742f5c9f0cd 100644 --- a/services/console-proxy/rdpconsole/src/main/java/common/Client.java +++ b/services/console-proxy/rdpconsole/src/main/java/common/Client.java @@ -59,7 +59,7 @@ public class Client { { name = "--debug-link"; alias = "-DL"; - description = "Print debugging messages when packets are trasnferred via links."; + description = "Print debugging messages when packets are transferred via links."; } }; private final Option debugElement = new Option() { diff --git a/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSChannelJoinRequestServerMCSChannelConfirmPDUs.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSChannelJoinRequestServerMCSChannelConfirmPDUs.java index 12d94381310..8213b74a14f 100644 --- a/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSChannelJoinRequestServerMCSChannelConfirmPDUs.java +++ b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSChannelJoinRequestServerMCSChannelConfirmPDUs.java @@ -74,7 +74,7 @@ public class ClientMCSChannelJoinRequestServerMCSChannelConfirmPDUs extends OneT // Channel Join Request PDU the connection SHOULD be dropped. // Initiator: 1007 (6+1001) - // int initator=buf.readUnsignedShort(); + // int initiator=buf.readUnsignedShort(); buf.skipBytes(2); // Requested channel diff --git a/services/console-proxy/rdpconsole/src/main/java/streamer/debug/MockSink.java b/services/console-proxy/rdpconsole/src/main/java/streamer/debug/MockSink.java index 2e1485c283f..7c096fbe15c 100644 --- a/services/console-proxy/rdpconsole/src/main/java/streamer/debug/MockSink.java +++ b/services/console-proxy/rdpconsole/src/main/java/streamer/debug/MockSink.java @@ -65,7 +65,7 @@ public class MockSink extends BaseElement { ByteBuffer expectedBuf = bufs[packetNumber]; if (!Arrays.equals(expectedBuf.toByteArray(), buf.toByteArray())) { dump(buf, expectedBuf); - throw new AssertionError("[" + this + "] Incoming buffer #" + packetNumber + " is not equal to expected buffer.\n Actual bufer: " + buf + throw new AssertionError("[" + this + "] Incoming buffer #" + packetNumber + " is not equal to expected buffer.\n Actual buffer: " + buf + ",\n expected buffer: " + expectedBuf + "."); } diff --git a/systemvm/agent/js/ajaxviewer.js b/systemvm/agent/js/ajaxviewer.js index 1a44b3e7c1f..2525ae57949 100644 --- a/systemvm/agent/js/ajaxviewer.js +++ b/systemvm/agent/js/ajaxviewer.js @@ -94,7 +94,7 @@ function KeyboardMapper() { // shift : , -- match on shift state // guestos : , -- match on guestos type // browser: , -- match on browser -// browserVersion: -- match on browser version +// browserVersion: -- match on browser version // } // KeyboardMapper.KEYBOARD_TYPE_RAW = 0; diff --git a/systemvm/debian/etc/vpcdnsmasq.conf b/systemvm/debian/etc/vpcdnsmasq.conf index 4016374caa2..0850167a297 100644 --- a/systemvm/debian/etc/vpcdnsmasq.conf +++ b/systemvm/debian/etc/vpcdnsmasq.conf @@ -319,7 +319,7 @@ dhcp-option=vendor:MSFT,2,1i # Enable dnsmasq's built-in TFTP server #enable-tftp -# Set the root directory for files availble via FTP. +# Set the root directory for files available via FTP. #tftp-root=/var/ftpd # Make the TFTP server more secure: with this set, only files owned by diff --git a/systemvm/debian/opt/cloud/bin/dnsmasq.sh b/systemvm/debian/opt/cloud/bin/dnsmasq.sh index 11c0ffe351b..d675e08c75b 100755 --- a/systemvm/debian/opt/cloud/bin/dnsmasq.sh +++ b/systemvm/debian/opt/cloud/bin/dnsmasq.sh @@ -95,7 +95,7 @@ log="${log}"`grep "^dhcp-range=" "$DHCP_CONFIG_MAIN"`"\n" if [ "$log" != '\n\n\n' ] then - #Cleaning the existing dhcp confgiuration + #Cleaning the existing dhcp configuration logger -t cloud "dnsmasq.sh: remvoing the primaryip confg from dnsmasq.conf and adding it to /etc/dnsmaq.d/multiple_ranges.conf" logger -t cloud "dnsmasq.sh: config removed from dnsmasq.conf is $log" sed -i -e '/dhcp-option=6/d' "$DHCP_CONFIG_MAIN" @@ -103,7 +103,7 @@ then sed -i -e '/^dhcp-range=/d' "$DHCP_CONFIG_MAIN" fi -#wrting the new config into the config file. +#writing the new config into the config file. echo -e "$dhcp_range" >> "$DHCP_CONFIG" echo -e "$dhcp_gateway" >> "$DHCP_CONFIG" echo -e "$dhcp_netmask" >> "$DHCP_CONFIG" diff --git a/systemvm/debian/opt/cloud/bin/loadbalancer.sh b/systemvm/debian/opt/cloud/bin/loadbalancer.sh index 34b3bf72543..6a2dc6c20d6 100755 --- a/systemvm/debian/opt/cloud/bin/loadbalancer.sh +++ b/systemvm/debian/opt/cloud/bin/loadbalancer.sh @@ -144,7 +144,7 @@ fw_entry() { local lb_vif_list=$(get_lb_vif_list) for vif in $lb_vif_list; do -#TODO : The below delete will be used only when we upgrade the from older verion to the newer one , the below delete become obsolute in the future. +#TODO : The below delete will be used only when we upgrade the from older version to the newer one , the below delete become obsolute in the future. sudo iptables -D INPUT -i $vif -p tcp -d $pubIp --dport $dport -j ACCEPT 2> /dev/null sudo iptables -A load_balancer_$vif -p tcp -d $pubIp --dport $dport -j ACCEPT @@ -161,7 +161,7 @@ fw_entry() { sudo iptables -A lb_stats -s $cidrs -p tcp -m state --state NEW -d $pubIp --dport $dport -j ACCEPT -#TODO : The below delete in the for-loop will be used only when we upgrade the from older verion to the newer one , the below delete become obsolute in the future. +#TODO : The below delete in the for-loop will be used only when we upgrade the from older version to the newer one , the below delete become obsolute in the future. for i in $r do local pubIp=$(echo $i | cut -d: -f1) diff --git a/systemvm/debian/opt/cloud/bin/vr_cfg.sh b/systemvm/debian/opt/cloud/bin/vr_cfg.sh index 8447947bd3b..23954070b9e 100755 --- a/systemvm/debian/opt/cloud/bin/vr_cfg.sh +++ b/systemvm/debian/opt/cloud/bin/vr_cfg.sh @@ -41,7 +41,7 @@ cat $cfg | while read line; do elif [ "$line" == "" ]; then read line version=$line - log_it "VR config: configuation format version $version" + log_it "VR config: configuration format version $version" #skip read line diff --git a/systemvm/debian/root/func.sh b/systemvm/debian/root/func.sh index 17963458e36..d293dc8c939 100644 --- a/systemvm/debian/root/func.sh +++ b/systemvm/debian/root/func.sh @@ -118,7 +118,7 @@ unlock_exit() { exit $1 } -# calcuate the ip & network mask +# calculate the ip & network mask rangecalc(){ local IFS='.' local -a oct mask ip 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 9be0da3efbc..19d3ed5f9ae 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 @@ -173,7 +173,7 @@ def restart_ms(self): #1-ssh into m/c running MS #2-restart ms #3-verify the response - #4-loop unitl you get list_zone api answer """ + #4-loop until you get list_zone api answer """ sshClient = SshClient( self.mgtSvrDetails["mgtSvrIp"], 22, @@ -209,7 +209,7 @@ def restart_ms(self): self.debug("list zone response is not available due to %s" % e) if timeout == 0: - raise Exception("Ms is not comming up !") + raise Exception("Ms is not coming up !") timeout = timeout - 1 @@ -320,7 +320,7 @@ class TestSystemVmLocalStorage(cloudstackTestCase): e) if timeout == 0: - raise Exception("Ms is not comming up !") + raise Exception("Ms is not coming up !") time.sleep(cls.testdata["sleep"]) timeout = timeout - 1 diff --git a/test/integration/component/maint/test_redundant_router.py b/test/integration/component/maint/test_redundant_router.py index 23971a2f795..902633c511e 100644 --- a/test/integration/component/maint/test_redundant_router.py +++ b/test/integration/component/maint/test_redundant_router.py @@ -1641,7 +1641,7 @@ class TestRvRRedundancy(cloudstackTestCase): if retry == 0: break time.sleep(self.testdata["sleep"]) - self.info("wating for backup router to become primary router name:"+new_backup_router.name) + self.info("waiting for backup router to become primary router name:"+new_backup_router.name) primary_router, backup_router = self.get_primary_and_backupRouter() if retry == 0: self.fail("timed out while waiting for new backup router to change state to PRIMARY.") diff --git a/test/integration/component/test_advancedsg_networks.py b/test/integration/component/test_advancedsg_networks.py index 924d9888ad3..4b3b8a32fa1 100644 --- a/test/integration/component/test_advancedsg_networks.py +++ b/test/integration/component/test_advancedsg_networks.py @@ -578,7 +578,7 @@ class TestNetworksInAdvancedSG(cloudstackTestCase): domainid=self.parent_domain.id,networkofferingid=self.shared_network_offering_sg.id, zoneid=self.zone.id,subdomainaccess=True) except Exception as e: - self.fail("Exception whle creating domain wide shared network: %s" % e) + self.fail("Exception while creating domain wide shared network: %s" % e) self.debug("Created shared network: %s" % self.shared_network_sg.id) diff --git a/test/integration/component/test_cpu_limits.py b/test/integration/component/test_cpu_limits.py index 15a31f8a2c7..f885039114f 100644 --- a/test/integration/component/test_cpu_limits.py +++ b/test/integration/component/test_cpu_limits.py @@ -300,7 +300,7 @@ class TestCPULimits(cloudstackTestCase): expected_resource_count = int(self.service_offering.cpunumber) * 4 #Total 4 Vms self.assertTrue(resource_count == expected_resource_count, - "Resource count does not match the expected vavlue") + "Resource count does not match the expected value") return class TestDomainCPULimitsConfiguration(cloudstackTestCase): diff --git a/test/integration/component/test_escalations_instances.py b/test/integration/component/test_escalations_instances.py index 20f398c77bb..f2f11679fb9 100644 --- a/test/integration/component/test_escalations_instances.py +++ b/test/integration/component/test_escalations_instances.py @@ -4279,7 +4279,7 @@ class TestInstances(cloudstackTestCase): def test_25_ip_reallocation_ES1377(self): """ @Desc: Test to verify dnsmasq dhcp conflict issue due to - /ect/hosts not getting udpated + /ect/hosts not getting updated @Steps: Step1: Create a network for the user Step2: List the network and check that it is created for the user diff --git a/test/integration/component/test_escalations_ipaddresses.py b/test/integration/component/test_escalations_ipaddresses.py index 059843ad504..54e86cd8b0a 100644 --- a/test/integration/component/test_escalations_ipaddresses.py +++ b/test/integration/component/test_escalations_ipaddresses.py @@ -1479,7 +1479,7 @@ class TestIpAddresses(cloudstackTestCase): self.assertEqual( vm_created.id, list_lbruleinstance_applied_false[0].id, - "Failed to list Instance available to asign a Load Balancer Rule" + "Failed to list Instance available to assign a Load Balancer Rule" ) # Assigning Instance created to Load Balancer Rule LoadBalancerRule.assign( @@ -1566,7 +1566,7 @@ class TestIpAddresses(cloudstackTestCase): self.assertEqual( vm_created.id, list_lbruleinstance_applied_false[0].id, - "Failed to list Instance available to asign a Load Balancer Rule" + "Failed to list Instance available to assign a Load Balancer Rule" ) # Destroying the VM Launched vm_created.delete(self.apiClient) diff --git a/test/integration/component/test_haproxy.py b/test/integration/component/test_haproxy.py index 961864c6e62..3f951c0b20a 100644 --- a/test/integration/component/test_haproxy.py +++ b/test/integration/component/test_haproxy.py @@ -815,7 +815,7 @@ class TestHAProxyStickyness(cloudstackTestCase): # 1. create an account # 2. using that account,create an instances # 3. select the Source NAT IP and configure the stikiness policy - # 4. enable /disable the VPN. It should not impact the ceated rules + # 4. enable /disable the VPN. It should not impact the created rules # listLBStickinessPolicies Api should show created stikiness policy self.debug("Creating LB rule for account: %s" % self.account.name) @@ -850,7 +850,7 @@ class TestHAProxyStickyness(cloudstackTestCase): @attr(tags=["advanced", "advancedns"], required_hardware="false") def test_11_invalid_params(self): - """Test verfify functionality syncronous and asyncronous validations""" + """Test verify functionality syncronous and asyncronous validations""" # Validate the following # verify the validation while creating or attaching stikiness policy diff --git a/test/integration/component/test_tags.py b/test/integration/component/test_tags.py index 3a1de84809b..c89399b7227 100644 --- a/test/integration/component/test_tags.py +++ b/test/integration/component/test_tags.py @@ -1612,7 +1612,7 @@ class TestResourceTags(cloudstackTestCase): Tag.create(self.apiclient, resourceIds=self.vm_1.id, resourceType='UserVm', - tags={tag_key.upper(): tag_value.uppper()}) + tags={tag_key.upper(): tag_value.upper()}) except Exception as e: pass else: diff --git a/test/integration/component/test_vpc_offerings.py b/test/integration/component/test_vpc_offerings.py index 064c68c9878..fbfb61fd30e 100644 --- a/test/integration/component/test_vpc_offerings.py +++ b/test/integration/component/test_vpc_offerings.py @@ -905,7 +905,7 @@ class TestVPCOffering(cloudstackTestCase): # 4. Enable the VPC offering again and create VPC. VPC should be # created successfully # 5. Change name and displaytext of the VPCOffering. Name and - # displaytext chnages should be reflected in listVPCPffering call + # displaytext changes should be reflected in listVPCPffering call self.logger.debug("Creating a VPC offering..") vpc_off = VpcOffering.create( diff --git a/test/integration/component/test_vpc_vms_deployment.py b/test/integration/component/test_vpc_vms_deployment.py index 94c5dde34be..5ddee47c65e 100644 --- a/test/integration/component/test_vpc_vms_deployment.py +++ b/test/integration/component/test_vpc_vms_deployment.py @@ -2314,7 +2314,7 @@ class TestVMDeployVPC(cloudstackTestCase): @attr(tags=["advanced", "intervlan"], required_hardware="true") def test_08_ip_reallocation_CS5986(self): """ - @Desc: Test to verify dnsmasq dhcp conflict issue due to /ect/hosts not getting udpated + @Desc: Test to verify dnsmasq dhcp conflict issue due to /ect/hosts not getting updated @Steps: Step1: Create a VPC Step2: Create one network in vpc diff --git a/test/integration/smoke/test_pvlan.py b/test/integration/smoke/test_pvlan.py index 45b001a2718..8aaef44fb59 100644 --- a/test/integration/smoke/test_pvlan.py +++ b/test/integration/smoke/test_pvlan.py @@ -71,10 +71,10 @@ class TestPVLAN(cloudstackTestCase): self.broadcasttype = createNetworkResponse.broadcastdomaintype self.broadcasturi = createNetworkResponse.broadcasturi - braodcasturi = "pvlan://{0}-i{1}".format(self.vlan, self.isolatedpvlan) + broadcasturi = "pvlan://{0}-i{1}".format(self.vlan, self.isolatedpvlan) self.assertIsNotNone(createNetworkResponse.id, "Network failed to create") self.assertTrue(createNetworkResponse.broadcastdomaintype, "Pvlan") - self.assertTrue(createNetworkResponse.broadcasturi, braodcasturi) + self.assertTrue(createNetworkResponse.broadcasturi, broadcasturi) self.debug("Clean up test pvlan network") deleteNetworkCmd = deleteNetwork.deleteNetworkCmd() diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py index 012ec277613..d9878b09765 100644 --- a/test/integration/smoke/test_vm_life_cycle.py +++ b/test/integration/smoke/test_vm_life_cycle.py @@ -635,7 +635,7 @@ class TestVMLifeCycle(cloudstackTestCase): if self.hypervisor.lower() in ["kvm", "simulator"]: # identify suitable host clusters = [h.clusterid for h in hosts] - # find hosts withe same clusterid + # find hosts with same clusterid clusters = [cluster for index, cluster in enumerate(clusters) if clusters.count(cluster) > 1] if len(clusters) <= 1: diff --git a/test/metadata/func/regression.xml b/test/metadata/func/regression.xml index c25ae29ac95..2b47dadcfcf 100644 --- a/test/metadata/func/regression.xml +++ b/test/metadata/func/regression.xml @@ -2472,7 +2472,7 @@ under the License. - + rebootVirtualMachine 16 diff --git a/test/metadata/func/regression_new.xml b/test/metadata/func/regression_new.xml index 3d14dcfe5d8..8db3593c0cd 100644 --- a/test/metadata/func/regression_new.xml +++ b/test/metadata/func/regression_new.xml @@ -2366,7 +2366,7 @@ under the License. diff --git a/test/metadata/func/regression_test.xml b/test/metadata/func/regression_test.xml index a2e9413183e..18dc7856d9c 100644 --- a/test/metadata/func/regression_test.xml +++ b/test/metadata/func/regression_test.xml @@ -1518,7 +1518,7 @@ under the License. - + rebootVirtualMachine 16 diff --git a/test/metadata/func/regression_user.xml b/test/metadata/func/regression_user.xml index 97f3f80b1b4..aac4d585f07 100644 --- a/test/metadata/func/regression_user.xml +++ b/test/metadata/func/regression_user.xml @@ -1324,7 +1324,7 @@ under the License. - + rebootVirtualMachine true diff --git a/test/metadata/func/regression_works.xml b/test/metadata/func/regression_works.xml index 4119e08b35e..731f498ccac 100644 --- a/test/metadata/func/regression_works.xml +++ b/test/metadata/func/regression_works.xml @@ -3112,7 +3112,7 @@ under the License. diff --git a/test/metadata/func/vmapi.xml b/test/metadata/func/vmapi.xml index 1dcf5a3cb13..8c1263c7767 100644 --- a/test/metadata/func/vmapi.xml +++ b/test/metadata/func/vmapi.xml @@ -695,10 +695,10 @@ under the License. - + rebootVirtualMachine - 90 [Try to reboot stopped vitrual machine - Negative case] + 90 [Try to reboot stopped virtual machine - Negative case] true diff --git a/test/src-not-used/main/java/com/cloud/test/utils/TestClient.java b/test/src-not-used/main/java/com/cloud/test/utils/TestClient.java index a32a34be49e..20df29147e3 100644 --- a/test/src-not-used/main/java/com/cloud/test/utils/TestClient.java +++ b/test/src-not-used/main/java/com/cloud/test/utils/TestClient.java @@ -198,7 +198,7 @@ public class TestClient { client.executeMethod(new GetMethod(url)); } catch (Exception e1) { s_logger.info("[ignored]" - + "error while executing last resort stop attampt: " + e1.getLocalizedMessage()); + + "error while executing last resort stop attempt: " + e1.getLocalizedMessage()); } } finally { NDC.clear(); diff --git a/tools/docker/README.md b/tools/docker/README.md index 4e2cb779ff5..cecf7b74850 100644 --- a/tools/docker/README.md +++ b/tools/docker/README.md @@ -63,7 +63,7 @@ Deploy Cloud using marvin: docker run -ti --rm --link simulator:8096 cloudstack/marvin python /marvin/marvin/deployDataCenter.py -i /marvin/dev/advanced.cfg ``` -Perform Smoke tests against CloudStack Simulator containter: +Perform Smoke tests against CloudStack Simulator container: ``` docker run -ti --rm --link simulator:8096 \ nosetests-2.7 -v --with-marvin \ diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py index b01335a150f..a8d30228494 100644 --- a/tools/marvin/marvin/config/test_data.py +++ b/tools/marvin/marvin/config/test_data.py @@ -1055,7 +1055,7 @@ test_data = { "value": "test" }, { - "key": "usefull.property", + "key": "useful.property", "value": "True" } ], diff --git a/tools/marvin/marvin/lib/utils.py b/tools/marvin/marvin/lib/utils.py index 19ffe34908e..89898121230 100644 --- a/tools/marvin/marvin/lib/utils.py +++ b/tools/marvin/marvin/lib/utils.py @@ -480,7 +480,7 @@ def checkVolumeSize(ssh_handle=None, @Desc : provides facility to verify the volume size against the size to verify @Input: 1. ssh_handle : machine against which to execute the disk size cmd 2. volume_name : The name of the volume against which to verify the size - 3. cmd_inp : Input command used to veify the size + 3. cmd_inp : Input command used to verify the size 4. size_to_verify: size against which to compare. @Output: Returns FAILED in case of an issue, else SUCCESS ''' diff --git a/tools/ngui/static/js/lib/angular.js b/tools/ngui/static/js/lib/angular.js index 2bac570a8c3..4a17e648b7a 100644 --- a/tools/ngui/static/js/lib/angular.js +++ b/tools/ngui/static/js/lib/angular.js @@ -844,7 +844,7 @@ function toKeyValue(obj) { /** - * We need our custom method because encodeURIComponent is too agressive and doesn't follow + * We need our custom method because encodeURIComponent is too aggressive and doesn't follow * http://www.ietf.org/rfc/rfc3986.txt with regards to the character set (pchar) allowed in path * segments: * segment = *pchar @@ -864,7 +864,7 @@ function encodeUriSegment(val) { /** * This method is intended for encoding *key* or *value* parts of query component. We need a custom - * method becuase encodeURIComponent is too agressive and encodes stuff that doesn't have to be + * method because encodeURIComponent is too aggressive and encodes stuff that doesn't have to be * encoded per http://tools.ietf.org/html/rfc3986: * query = *( pchar / "/" / "?" ) * pchar = unreserved / pct-encoded / sub-delims / ":" / "@" diff --git a/tools/transifex/README-transifex.txt b/tools/transifex/README-transifex.txt index 469554385a2..7079331f848 100644 --- a/tools/transifex/README-transifex.txt +++ b/tools/transifex/README-transifex.txt @@ -46,7 +46,7 @@ with the translatons from traductors. The sync-transifex-ui provide too the ability to : * Download from Transifex the source language resource files. Be carrefully, -with this, you can remove some transation on Transifex if some keys has +with this, you can remove some transaction on Transifex if some keys has been removed inside the source language resource files. ./sync-transifex-ui.sh download-source-language CloudStack_UI.410_messagesjson diff --git a/tools/utils/database_comparision_during_upgrade/README b/tools/utils/database_comparision_during_upgrade/README index abe44d0a4f9..2c4251d00bb 100644 --- a/tools/utils/database_comparision_during_upgrade/README +++ b/tools/utils/database_comparision_during_upgrade/README @@ -28,11 +28,11 @@ The usage is as follows 4. After upgrade run usage_schema_comparision.sh to compare cloud usage all tables schema between fresh and upgraded setup NOTE: this script requires step 1 output in current working directory -5. Run test_config_between_fresh_and_upgraded_setup.sh to comapre table global configuration values between fresh and upgraded setup +5. Run test_config_between_fresh_and_upgraded_setup.sh to compare table global configuration values between fresh and upgraded setup NOTE: this script requires step 1 output in current working directory -6. Run test_config_before_and_after_upgrade.sh to comapre table global configuration values between before upgraded and after upgraded setup +6. Run test_config_before_and_after_upgrade.sh to compare table global configuration values between before upgraded and after upgraded setup NOTE: this script requires step 2 output in current working directory diff --git a/tools/whisker/LICENSE b/tools/whisker/LICENSE index de896208c86..af091a44127 100644 --- a/tools/whisker/LICENSE +++ b/tools/whisker/LICENSE @@ -249,7 +249,7 @@ Within the deps/awsapi-lib directory We reserve no legal rights to the ANTLR--it is fully in the public domain. An individual or company may do whatever they wish with source code distributed with ANTLR or the code generated by ANTLR, including the incorporation of ANTLR, - or its output, into commerical software. We encourage users to develop software + or its output, into commercial software. We encourage users to develop software with ANTLR. However, we do ask that credit is given to us for developing ANTLR. By "credit", we mean that if you use ANTLR or incorporate any source code into one of your programs (commercial product, research project, or otherwise) that diff --git a/tools/whisker/descriptor-for-packaging.xml b/tools/whisker/descriptor-for-packaging.xml index be02601e99d..41423332b7b 100644 --- a/tools/whisker/descriptor-for-packaging.xml +++ b/tools/whisker/descriptor-for-packaging.xml @@ -1435,7 +1435,7 @@ ANTLR 2 License We reserve no legal rights to the ANTLR--it is fully in the public domain. An individual or company may do whatever they wish with source code distributed with ANTLR or the code generated by ANTLR, including the incorporation of ANTLR, -or its output, into commerical software. We encourage users to develop software +or its output, into commercial software. We encourage users to develop software with ANTLR. However, we do ask that credit is given to us for developing ANTLR. By "credit", we mean that if you use ANTLR or incorporate any source code into one of your programs (commercial product, research project, or otherwise) that diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml index c64913c5f08..ff592a7e900 100644 --- a/tools/whisker/descriptor.xml +++ b/tools/whisker/descriptor.xml @@ -1435,7 +1435,7 @@ ANTLR 2 License We reserve no legal rights to the ANTLR--it is fully in the public domain. An individual or company may do whatever they wish with source code distributed with ANTLR or the code generated by ANTLR, including the incorporation of ANTLR, -or its output, into commerical software. We encourage users to develop software +or its output, into commercial software. We encourage users to develop software with ANTLR. However, we do ask that credit is given to us for developing ANTLR. By "credit", we mean that if you use ANTLR or incorporate any source code into one of your programs (commercial product, research project, or otherwise) that diff --git a/ui/public/locales/de_DE.json b/ui/public/locales/de_DE.json index 33db9494fef..9cb29350d60 100644 --- a/ui/public/locales/de_DE.json +++ b/ui/public/locales/de_DE.json @@ -1934,8 +1934,8 @@ "message.error.version.for.cluster": "Bitte Kubernetes Version für Kubernetes Cluster eingeben", "message.error.vlan.range": "Bitte einen gültigen VLAN/VNI-Bereich eingeben", "message.error.volume.name": "Bitte einen Namen für den Speicher eingeben", -"message.error.volumne": "Bitte geben Sie den Speicher ein", -"message.error.volumne.group": "Bitte wählen Sie die Speichergruppe", +"message.error.volume": "Bitte geben Sie den Speicher ein", +"message.error.volume.group": "Bitte wählen Sie die Speichergruppe", "message.error.zone": "Bitte wählen Sie eine Zone aus", "message.error.zone.combined": "Eine Zone kann mit keiner weiteren Zone kombiniert werden", "message.error.zone.for.cluster": "Bitte wählen Sie die Zone für das Kubernetes Cluster", @@ -2062,7 +2062,7 @@ "message.success.add.vpc.network": "VPC-Network erfolgreich hinzugefügt", "message.success.add.vpn.customer.gateway": "VPN Customer Gateway erfolgreich hinzugefügt", "message.success.add.vpn.gateway": "VPN-Gateway erfolgreich hinzugefügt", -"message.success.asign.vm": "VM erfolgreich zugeordnet", +"message.success.assign.vm": "VM erfolgreich zugeordnet", "message.success.assigned.vms": "VMs erfolgreich zugeordnet", "message.success.certificate.upload": "Zertifikat erfolgreich hochgeladen", "message.success.change.affinity.group": "Affinitätsgruppen erfolgreich geändert", diff --git a/ui/public/locales/el_GR.json b/ui/public/locales/el_GR.json index 7bcf8142012..db0ad72b394 100644 --- a/ui/public/locales/el_GR.json +++ b/ui/public/locales/el_GR.json @@ -2355,8 +2355,8 @@ "message.error.version.for.cluster": "Επιλέξτε την έκδοση Κυβερνητών για την ομάδα Κυβερνητών", "message.error.vlan.range": "Πληκτρολογήστε μια έγκυρη περιοχή VLAN/VNI", "message.error.volume.name": "Πληκτρολογήστε το όνομα τόμου", -"message.error.volumne": "Πληκτρολογήστε Τόμος", -"message.error.volumne.group": "Εισαγάγετε την ομάδα τόμων", +"message.error.volume": "Πληκτρολογήστε Τόμος", +"message.error.volume.group": "Εισαγάγετε την ομάδα τόμων", "message.error.zone": "Επιλέξτε μια ζώνη", "message.error.zone.combined": "Όλες οι ζώνες δεν μπορούν να συνδυαστούν με οποιαδήποτε άλλη ζώνη", "message.error.zone.for.cluster": "Επιλέξτε ζώνη για σύμπλεγμα Κυβερνητών", @@ -2553,7 +2553,7 @@ "message.success.add.vpc.network": "Προστέθηκε με επιτυχία δίκτυο VPC", "message.success.add.vpn.customer.gateway": "Προστέθηκε με επιτυχία πύλη πελάτη Εικον. Ιδιωτ. Δίκτυο", "message.success.add.vpn.gateway": "Προστέθηκε με επιτυχία πύλη Εικον. Ιδιωτ. Δίκτυο", -"message.success.asign.vm": "Η εικονική μηχανή που εκχωρήθηκαν με επιτυχία ολοκληρώθηκε με επιτυχία", +"message.success.assign.vm": "Η εικονική μηχανή που εκχωρήθηκαν με επιτυχία ολοκληρώθηκε με επιτυχία", "message.success.assigned.vms": "Η αντιστοίχιση εικονικής μηχανής ολοκληρώθηκε με επιτυχία", "message.success.certificate.upload": "Η αποστολή του πιστοποιητικού ολοκληρώθηκε με επιτυχία", "message.success.change.affinity.group": "Η αλλαγή ομάδων συνάφειας ολοκληρώθηκε με επιτυχία", diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json index f4ce9510f2a..a3b163187e3 100644 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@ -2331,8 +2331,8 @@ "message.error.version.for.cluster": "Please select Kubernetes version for Kubernetes cluster.", "message.error.vlan.range": "Please enter a valid VLAN/VNI range.", "message.error.volume.name": "Please enter volume name.", -"message.error.volumne": "Please enter volume.", -"message.error.volumne.group": "Please enter volume group.", +"message.error.volume": "Please enter volume.", +"message.error.volume.group": "Please enter volume group.", "message.error.zone": "Please select a zone.", "message.error.zone.combined": "All zones cannot be combined with any other zone.", "message.error.zone.for.cluster": "Please select zone for Kubernetes cluster.", @@ -2523,7 +2523,7 @@ "message.success.add.vpc.network": "Successfully added VPC network", "message.success.add.vpn.customer.gateway": "Successfully added VPN customer gateway", "message.success.add.vpn.gateway": "Successfully added VPN gateway", -"message.success.asign.vm": "Successfully assigned VM", +"message.success.assign.vm": "Successfully assigned VM", "message.success.assigned.vms": "Successfully assigned VMs", "message.success.certificate.upload": "Certificate successfully uploaded", "message.success.change.affinity.group": "Successfully changed affinity groups", diff --git a/ui/public/locales/ja_JP.json b/ui/public/locales/ja_JP.json index 13db223c7c2..dd162bc0a6b 100644 --- a/ui/public/locales/ja_JP.json +++ b/ui/public/locales/ja_JP.json @@ -3025,8 +3025,8 @@ "message.error.version.for.cluster": "KubernetesクラスターのKubernetesバージョンを選択してください", "message.error.vlan.range": "有効なVLAN/VNI範囲を入力してください", "message.error.volume.name": "ボリューム名を入力してください", - "message.error.volumne": "音量を入力してください", - "message.error.volumne.group": "ボリュームグループを入力してください", + "message.error.volume": "音量を入力してください", + "message.error.volume.group": "ボリュームグループを入力してください", "message.error.zone": "ゾーンを選択してください", "message.error.zone.combined": "すべてのゾーンを他のゾーンと組み合わせることはできません", "message.error.zone.for.cluster": "Kubernetesクラスターのゾーンを選択してください", @@ -3315,7 +3315,7 @@ "message.success.add.vpc.network": "VPCネットワークが正常に追加されました", "message.success.add.vpn.customer.gateway": "VPNカスタマーゲートウェイが正常に追加されました", "message.success.add.vpn.gateway": "VPNゲートウェイが正常に追加されました", - "message.success.asign.vm": "正常に割り当てられたVM", + "message.success.assign.vm": "正常に割り当てられたVM", "message.success.assigned.vms": "正常に割り当てられたVM", "message.success.certificate.upload": "証明書が正常にアップロードされました", "message.success.change.affinity.group": "アフィニティグループが正常に変更されました", diff --git a/ui/public/locales/ko_KR.json b/ui/public/locales/ko_KR.json index 6dbf008c859..640f17a6798 100644 --- a/ui/public/locales/ko_KR.json +++ b/ui/public/locales/ko_KR.json @@ -2029,8 +2029,8 @@ "message.error.version.for.cluster": "\ucfe0\ubc84\ub124\ud14c\uc2a4 \ud074\ub7ec\uc2a4\ud130 \uc6a9 \ucfe0\ubc84\ub124\ud14c\uc2a4 \ubc84\uc804\uc744 \uc120\ud0dd\ud558\uc2ed\uc2dc\uc624.", "message.error.vlan.range": "\uc720\ud6a8\ud55c VLAN/VNI \ubc94\uc704\ub97c \uc785\ub825\ud558\uc2ed\uc2dc\uc624.", "message.error.volume.name": "\ubcfc\ub968 \uc774\ub984\uc744 \uc785\ub825\ud558\uc2ed\uc2dc\uc624.", -"message.error.volumne": "\ubcfc\ub968\uc744 \uc785\ub825\ud558\uc2ed\uc2dc\uc624.", -"message.error.volumne.group": "\ubcfc\ub968 \uadf8\ub8f9\uc744 \uc785\ub825\ud558\uc2ed\uc2dc\uc624.", +"message.error.volume": "\ubcfc\ub968\uc744 \uc785\ub825\ud558\uc2ed\uc2dc\uc624.", +"message.error.volume.group": "\ubcfc\ub968 \uadf8\ub8f9\uc744 \uc785\ub825\ud558\uc2ed\uc2dc\uc624.", "message.error.zone": "Zone\uc744 \uc120\ud0dd\ud558\uc138\uc694.", "message.error.zone.combined": "\ubaa8\ub4e0 Zone\uc740 \ub2e4\ub978 Zone\uacfc \uacb0\ud569 \ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.", "message.error.zone.for.cluster": "\ucfe0\ubc84\ub124\ud14c\uc2a4 \ud074\ub7ec\uc2a4\ud130\uc5d0 \ub300\ud55c Zone\uc744 \uc120\ud0dd\ud558\uc2ed\uc2dc\uc624.", @@ -2178,7 +2178,7 @@ "message.success.add.vpc.network": "VPC \ub124\ud2b8\uc6cc\ud06c\ub97c \ucd94\uac00\ud588\uc2b5\ub2c8\ub2e4.", "message.success.add.vpn.customer.gateway": "VPN \uace0\uac1d \uac8c\uc774\ud2b8\uc6e8\uc774\ub97c \ucd94\uac00\ud588\uc2b5\ub2c8\ub2e4.", "message.success.add.vpn.gateway": "VPN \uac8c\uc774\ud2b8\uc6e8\uc774\ub97c \ucd94\uac00\ud588\uc2b5\ub2c8\ub2e4.", -"message.success.asign.vm": "VM \ud560\ub2f9 \uc131\uacf5", +"message.success.assign.vm": "VM \ud560\ub2f9 \uc131\uacf5", "message.success.assigned.vms": "VM\uc744 \ud560\ub2f9\ud588\uc2b5\ub2c8\ub2e4.", "message.success.certificate.upload": "\uc778\uc99d\uc11c\uac00 \uc5c5\ub85c\ub4dc\ub418\uc5c8\uc2b5\ub2c8\ub2e4.", "message.success.change.affinity.group": "Affinity \uadf8\ub8f9\uc744 \ubcc0\uacbd\ud588\uc2b5\ub2c8\ub2e4.", diff --git a/ui/public/locales/pt_BR.json b/ui/public/locales/pt_BR.json index 58251378142..c85a5f4d801 100644 --- a/ui/public/locales/pt_BR.json +++ b/ui/public/locales/pt_BR.json @@ -2166,8 +2166,8 @@ "message.error.version.for.cluster": "Por favor, selecionar a vers\u00e3o Kubernetes para o cluster Kubernetes", "message.error.vlan.range": "Por favor, insira um intervalo VLAN/VNI v\u00e1lido", "message.error.volume.name": "Por favor, insira o nome do volume", -"message.error.volumne": "Por favor, insira o volume", -"message.error.volumne.group": "Por favor, insira o grupo de volume", +"message.error.volume": "Por favor, insira o volume", +"message.error.volume.group": "Por favor, insira o grupo de volume", "message.error.zone": "Por favor, selecione uma zona", "message.error.zone.combined": "Todas as zonas n\u00e3o podem ser combinadas com nenhuma outra zona", "message.error.zone.for.cluster": "Por favor, selecionar a zona para o cluster Kubernetes", @@ -2341,7 +2341,7 @@ "message.success.add.vpc.network": "Rede VPC adicionada com sucesso", "message.success.add.vpn.customer.gateway": "Gateway da VPN do cliente adicionado com sucesso", "message.success.add.vpn.gateway": "Gateway da VPN adicionado com sucesso", -"message.success.asign.vm": "VM atribu\u00edda com sucesso", +"message.success.assign.vm": "VM atribu\u00edda com sucesso", "message.success.assigned.vms": "VMs atribu\u00eddas com sucesso", "message.success.certificate.upload": "Certificado carregado com sucesso", "message.success.change.affinity.group": "Grupos de afinidade alterados com sucesso", diff --git a/ui/public/locales/zh_CN.json b/ui/public/locales/zh_CN.json index 11a641d6d08..4ef642607a4 100644 --- a/ui/public/locales/zh_CN.json +++ b/ui/public/locales/zh_CN.json @@ -3331,7 +3331,7 @@ "message.enabling.zone": "\u6B63\u5728\u542F\u7528\u8D44\u6E90\u57DF", "message.enabling.zone.dots": "\u6B63\u5728\u542F\u7528\u8D44\u6E90\u57DF...", - "message.enter.seperated.list.multiple.cidrs": "\u5982\u679C\u5B58\u5728\u591A\u4E2A CIDR\uFF0C\u8BF7\u8F93\u5165\u7528\u9017\u53F7\u5206\u9694\u7684 CIDR \u5217\u8868", + "message.enter.separated.list.multiple.cidrs": "\u5982\u679C\u5B58\u5728\u591A\u4E2A CIDR\uFF0C\u8BF7\u8F93\u5165\u7528\u9017\u53F7\u5206\u9694\u7684 CIDR \u5217\u8868", "message.enter.token": "\u8BF7\u8F93\u5165\u60A8\u5728\u9080\u8BF7\u7535\u5B50\u90AE\u4EF6\u4E2D\u6536\u5230\u7684\u4EE4\u724C\u3002", "message.enter.valid.nic.ip": "\u8BF7\u8F93\u5165\u7F51\u5361\u6709\u6548\u7684 IP \u5730\u5740", @@ -3454,8 +3454,8 @@ "message.error.vlan.range": "\u8BF7\u8F93\u5165\u6709\u6548\u7684 VLAN/VNI \u8303\u56F4", "message.error.volume.name": "\u8BF7\u8F93\u5165\u5377\u540D", - "message.error.volumne": "\u8BF7\u8F93\u5165\u5377\u5BB9\u91CF", - "message.error.volumne.group": "\u8BF7\u8F93\u5165\u5377\u7EC4", + "message.error.volume": "\u8BF7\u8F93\u5165\u5377\u5BB9\u91CF", + "message.error.volume.group": "\u8BF7\u8F93\u5165\u5377\u7EC4", "message.error.zone": "\u8BF7\u9009\u62E9\u4E00\u4E2A\u8D44\u6E90\u57DF", "message.error.zone.combined": "\u6240\u6709\u5206\u533A\u4E0D\u80FD\u4E0E\u4EFB\u4F55\u5176\u4ED6\u5206\u533A\u5408\u5E76", "message.error.zone.for.cluster": "\u8BF7\u4E3A Kubernetes \u96C6\u7FA4\u9009\u62E9\u533A\u57DF", @@ -3778,7 +3778,7 @@ "message.success.add.vpn.customer.gateway": "\u5DF2\u6210\u529F\u6DFB\u52A0 VPN \u5BA2\u6237\u7F51\u5173", "message.success.add.vpn.gateway": "\u5DF2\u6210\u529F\u6DFB\u52A0 VPN \u7F51\u5173", - "message.success.asign.vm": "\u5DF2\u6210\u529F\u5206\u914D\u865A\u62DF\u673A", + "message.success.assign.vm": "\u5DF2\u6210\u529F\u5206\u914D\u865A\u62DF\u673A", "message.success.assigned.vms": "\u5DF2\u6210\u529F\u5206\u914D\u865A\u62DF\u673A", "message.success.certificate.upload": "\u8BC1\u4E66\u5DF2\u6210\u529F\u4E0A\u8F7D", "message.success.change.affinity.group": "\u5DF2\u6210\u529F\u66F4\u6539\u5173\u8054\u7EC4", diff --git a/ui/src/style/README.md b/ui/src/style/README.md index d60ceb3425f..391c66565d4 100644 --- a/ui/src/style/README.md +++ b/ui/src/style/README.md @@ -36,7 +36,7 @@ 6. objects - repeatly used elements like buttons, inputs 7. components - - complex elements like dropdown, forms, table, search (usualy include this to components/FooterToolbar/ folder) + - complex elements like dropdown, forms, table, search (usually include this to components/FooterToolbar/ folder) # The "/deep/" combinator diff --git a/ui/src/views/infra/zone/ZoneWizardAddResources.vue b/ui/src/views/infra/zone/ZoneWizardAddResources.vue index 073be20d06d..6baef88e1a9 100644 --- a/ui/src/views/infra/zone/ZoneWizardAddResources.vue +++ b/ui/src/views/infra/zone/ZoneWizardAddResources.vue @@ -485,7 +485,7 @@ export default { { title: 'label.volgroup', key: 'primaryStorageVolumeGroup', - placeHolder: 'message.error.volumne.group', + placeHolder: 'message.error.volume.group', required: true, display: { primaryStorageProtocol: 'clvm' @@ -494,7 +494,7 @@ export default { { title: 'label.volume', key: 'primaryStorageVolume', - placeHolder: 'message.error.volumne', + placeHolder: 'message.error.volume', required: true, display: { primaryStorageProtocol: 'gluster' diff --git a/ui/src/views/network/LoadBalancing.vue b/ui/src/views/network/LoadBalancing.vue index 12246d8a039..a41366bdbde 100644 --- a/ui/src/views/network/LoadBalancing.vue +++ b/ui/src/views/network/LoadBalancing.vue @@ -1280,7 +1280,7 @@ export default { }).then(response => { this.$pollJob({ jobId: response.assigntoloadbalancerruleresponse.jobid, - successMessage: this.$t('message.success.asign.vm'), + successMessage: this.$t('message.success.assign.vm'), successMethod: () => { this.parentToggleLoading() this.fetchData() diff --git a/utils/src/main/java/com/cloud/utils/rest/HttpUriRequestBuilder.java b/utils/src/main/java/com/cloud/utils/rest/HttpUriRequestBuilder.java index 4fb3a1d5229..47ac06af111 100644 --- a/utils/src/main/java/com/cloud/utils/rest/HttpUriRequestBuilder.java +++ b/utils/src/main/java/com/cloud/utils/rest/HttpUriRequestBuilder.java @@ -102,7 +102,7 @@ public class HttpUriRequestBuilder { private void validate() { Assert.notNull(method, "HTTP Method cannot be null"); Assert.hasText(path, "target path must be defined"); - Assert.isTrue(path.startsWith("/"), "targte path must start with a '/' character"); + Assert.isTrue(path.startsWith("/"), "target path must start with a '/' character"); } private URI buildUri() { diff --git a/utils/src/test/java/com/cloud/utils/ScriptTest.java b/utils/src/test/java/com/cloud/utils/ScriptTest.java index 99059bf926c..e6ed64a013d 100644 --- a/utils/src/test/java/com/cloud/utils/ScriptTest.java +++ b/utils/src/test/java/com/cloud/utils/ScriptTest.java @@ -42,7 +42,7 @@ public class ScriptTest { script.add("bar"); OutputInterpreter.AllLinesParser resultParser = new OutputInterpreter.AllLinesParser(); String result = script.execute(resultParser); - // With allLinesParser, result is not comming from the return value + // With allLinesParser, result is not coming from the return value Assert.assertNull(result); Assert.assertEquals("bar\n", resultParser.getLines()); }