You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2025/05/22 06:11:10 UTC
(cloudstack) branch 4.19 updated: Fixed typos (#10882)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.19 by this push:
new 6e19c07da10 Fixed typos (#10882)
6e19c07da10 is described below
commit 6e19c07da10b5e8a10fbbc0eb02fb1f9d7130edb
Author: Suresh Kumar Anaparti <su...@gmail.com>
AuthorDate: Thu May 22 11:41:04 2025 +0530
Fixed typos (#10882)
---
.../cloud/hypervisor/vmware/manager/VmwareManagerImpl.java | 14 +++++++-------
.../com/cloud/configuration/ConfigurationManagerImpl.java | 2 +-
utils/src/main/java/com/cloud/utils/net/NetUtils.java | 2 +-
utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
index 2bdd496dd92..94b73537b33 100644
--- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
+++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
@@ -252,7 +252,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw
private boolean _fullCloneFlag;
private boolean _instanceNameFlag;
private String _serviceConsoleName;
- private String _managemetPortGroupName;
+ private String _managementPortGroupName;
private String _defaultSystemVmNicAdapterType = VirtualEthernetCardType.E1000.toString();
private String _recycleHungWorker = "false";
private int _additionalPortRangeStart;
@@ -350,9 +350,9 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw
_serviceConsoleName = "Service Console";
}
- _managemetPortGroupName = _configDao.getValue(Config.VmwareManagementPortGroup.key());
- if (_managemetPortGroupName == null) {
- _managemetPortGroupName = "Management Network";
+ _managementPortGroupName = _configDao.getValue(Config.VmwareManagementPortGroup.key());
+ if (_managementPortGroupName == null) {
+ _managementPortGroupName = "Management Network";
}
_defaultSystemVmNicAdapterType = _configDao.getValue(Config.VmwareSystemVmNicDeviceType.key());
@@ -617,13 +617,13 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw
@Override
public String getManagementPortGroupName() {
- return _managemetPortGroupName;
+ return _managementPortGroupName;
}
@Override
public String getManagementPortGroupByHost(HostMO hostMo) throws Exception {
if (hostMo.getHostType() == VmwareHostType.ESXi) {
- return _managemetPortGroupName;
+ return _managementPortGroupName;
}
return _serviceConsoleName;
}
@@ -633,7 +633,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw
params.put("vmware.create.full.clone", _fullCloneFlag);
params.put("vm.instancename.flag", _instanceNameFlag);
params.put("service.console.name", _serviceConsoleName);
- params.put("management.portgroup.name", _managemetPortGroupName);
+ params.put("management.portgroup.name", _managementPortGroupName);
params.put("vmware.root.disk.controller", _rootDiskController);
params.put("vmware.data.disk.controller", _dataDiskController);
params.put("vmware.recycle.hung.wokervm", _recycleHungWorker);
diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
index b90d94dad5d..11d478ccf62 100644
--- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -4733,7 +4733,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
final String cidrnew = NetUtils.getCidrFromGatewayAndNetmask(newVlanGateway, newVlanNetmask);
final String existing_cidr = NetUtils.getCidrFromGatewayAndNetmask(vlanGateway, vlanNetmask);
- return NetUtils.isNetowrkASubsetOrSupersetOfNetworkB(cidrnew, existing_cidr);
+ return NetUtils.isNetworkASubsetOrSupersetOfNetworkB(cidrnew, existing_cidr);
}
public Pair<Boolean, Pair<String, String>> validateIpRange(final String startIP, final String endIP, final String newVlanGateway, final String newVlanNetmask, final List<VlanVO> vlans, final boolean ipv4,
diff --git a/utils/src/main/java/com/cloud/utils/net/NetUtils.java b/utils/src/main/java/com/cloud/utils/net/NetUtils.java
index 2703deaad64..47c35eaada1 100644
--- a/utils/src/main/java/com/cloud/utils/net/NetUtils.java
+++ b/utils/src/main/java/com/cloud/utils/net/NetUtils.java
@@ -844,7 +844,7 @@ public class NetUtils {
isSuperset, isSubset, neitherSubetNorSuperset, sameSubnet, errorInCidrFormat
}
- public static SupersetOrSubset isNetowrkASubsetOrSupersetOfNetworkB(final String cidrA, final String cidrB) {
+ public static SupersetOrSubset isNetworkASubsetOrSupersetOfNetworkB(final String cidrA, final String cidrB) {
if (!areCidrsNotEmpty(cidrA, cidrB)) {
return SupersetOrSubset.errorInCidrFormat;
}
diff --git a/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java b/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java
index 0f19da38922..c19ac004f11 100644
--- a/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java
+++ b/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java
@@ -561,8 +561,8 @@ public class NetUtilsTest {
}
@Test
- public void testIsNetowrkASubsetOrSupersetOfNetworkBWithEmptyValues() {
- assertEquals(SupersetOrSubset.errorInCidrFormat, NetUtils.isNetowrkASubsetOrSupersetOfNetworkB("", null));
+ public void testIsNetworkASubsetOrSupersetOfNetworkBWithEmptyValues() {
+ assertEquals(SupersetOrSubset.errorInCidrFormat, NetUtils.isNetworkASubsetOrSupersetOfNetworkB("", null));
}
@Test