diff --git a/api/src/com/cloud/network/vpc/VpcOffering.java b/api/src/com/cloud/network/vpc/VpcOffering.java index fb4b151fb4c..c0da6bf967a 100644 --- a/api/src/com/cloud/network/vpc/VpcOffering.java +++ b/api/src/com/cloud/network/vpc/VpcOffering.java @@ -52,7 +52,7 @@ public interface VpcOffering extends InternalIdentity, Identity { boolean isDefault(); /** - * @return service offering id used by VPC virutal router + * @return service offering id used by VPC virtual router */ Long getServiceOfferingId(); diff --git a/api/src/org/apache/cloudstack/api/response/AcquireIPAddressResponse.java b/api/src/org/apache/cloudstack/api/response/AcquireIPAddressResponse.java index 70cbd7ffe05..a74c95780d1 100644 --- a/api/src/org/apache/cloudstack/api/response/AcquireIPAddressResponse.java +++ b/api/src/org/apache/cloudstack/api/response/AcquireIPAddressResponse.java @@ -96,19 +96,19 @@ public class AcquireIPAddressResponse extends BaseResponse implements Controlle private Boolean isSystem; @SerializedName(ApiConstants.VIRTUAL_MACHINE_ID) - @Param(description = "virutal machine id the ip address is assigned to (not null only for static nat Ip)") + @Param(description = "virtual machine id the ip address is assigned to (not null only for static nat Ip)") private String virtualMachineId; @SerializedName("vmipaddress") - @Param(description = "virutal machine (dnat) ip address (not null only for static nat Ip)") + @Param(description = "virtual machine (dnat) ip address (not null only for static nat Ip)") private String virtualMachineIp; @SerializedName("virtualmachinename") - @Param(description = "virutal machine name the ip address is assigned to (not null only for static nat Ip)") + @Param(description = "virtual machine name the ip address is assigned to (not null only for static nat Ip)") private String virtualMachineName; @SerializedName("virtualmachinedisplayname") - @Param(description = "virutal machine display name the ip address is assigned to (not null only for static nat Ip)") + @Param(description = "virtual machine display name the ip address is assigned to (not null only for static nat Ip)") private String virtualMachineDisplayName; @SerializedName(ApiConstants.ASSOCIATED_NETWORK_ID) diff --git a/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java b/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java index 3c03247eddb..d3d98c87f17 100644 --- a/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java +++ b/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java @@ -96,19 +96,19 @@ public class IPAddressResponse extends BaseResponse implements ControlledEntityR private Boolean isSystem; @SerializedName(ApiConstants.VIRTUAL_MACHINE_ID) - @Param(description = "virutal machine id the ip address is assigned to (not null only for static nat Ip)") + @Param(description = "virtual machine id the ip address is assigned to (not null only for static nat Ip)") private String virtualMachineId; @SerializedName("vmipaddress") - @Param(description = "virutal machine (dnat) ip address (not null only for static nat Ip)") + @Param(description = "virtual machine (dnat) ip address (not null only for static nat Ip)") private String virtualMachineIp; @SerializedName("virtualmachinename") - @Param(description = "virutal machine name the ip address is assigned to (not null only for static nat Ip)") + @Param(description = "virtual machine name the ip address is assigned to (not null only for static nat Ip)") private String virtualMachineName; @SerializedName("virtualmachinedisplayname") - @Param(description = "virutal machine display name the ip address is assigned to (not null only for static nat Ip)") + @Param(description = "virtual machine display name the ip address is assigned to (not null only for static nat Ip)") private String virtualMachineDisplayName; @SerializedName(ApiConstants.ASSOCIATED_NETWORK_ID) diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index f5365eb71f7..3591e603b0a 100644 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -765,7 +765,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir // Need to reboot the virtual machine so that the password gets // redownloaded from the DomR, and reset on the VM if (!result) { - s_logger.debug("Failed to reset password for the virutal machine; no need to reboot the vm"); + s_logger.debug("Failed to reset password for the virtual machine; no need to reboot the vm"); return false; } else { if (vmInstance.getState() == State.Stopped) { @@ -874,7 +874,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir // Need to reboot the virtual machine so that the password gets redownloaded from the DomR, and reset on the VM if (!result) { - s_logger.debug("Failed to reset SSH Key for the virutal machine; no need to reboot the vm"); + s_logger.debug("Failed to reset SSH Key for the virtual machine; no need to reboot the vm"); return false; } else { if (vmInstance.getState() == State.Stopped) { diff --git a/test/metadata/func/flatnetwork.xml b/test/metadata/func/flatnetwork.xml index e5eec995c48..60866537b01 100644 --- a/test/metadata/func/flatnetwork.xml +++ b/test/metadata/func/flatnetwork.xml @@ -496,7 +496,7 @@ under the License. destroyVirtualMachine true - Destroying virutal machine + Destroying virtual machine id diff --git a/test/metadata/func/roughflatstress.xml b/test/metadata/func/roughflatstress.xml index 9580212d2c5..841190c496f 100644 --- a/test/metadata/func/roughflatstress.xml +++ b/test/metadata/func/roughflatstress.xml @@ -619,7 +619,7 @@ under the License. destroyVirtualMachine true - Destroying virutal machine + Destroying virtual machine id @@ -643,7 +643,7 @@ under the License. destroyVirtualMachine true - Destroying virutal machine + Destroying virtual machine id diff --git a/test/metadata/func/securitygroups.xml b/test/metadata/func/securitygroups.xml index 58108fd6213..3ecffbf8467 100644 --- a/test/metadata/func/securitygroups.xml +++ b/test/metadata/func/securitygroups.xml @@ -733,7 +733,7 @@ under the License. destroyVirtualMachine true - Destroying virutal machine + Destroying virtual machine id