Skip to content

Commit 6e19c07

Browse files
Fixed typos (#10882)
1 parent 4748c3f commit 6e19c07

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw
252252
private boolean _fullCloneFlag;
253253
private boolean _instanceNameFlag;
254254
private String _serviceConsoleName;
255-
private String _managemetPortGroupName;
255+
private String _managementPortGroupName;
256256
private String _defaultSystemVmNicAdapterType = VirtualEthernetCardType.E1000.toString();
257257
private String _recycleHungWorker = "false";
258258
private int _additionalPortRangeStart;
@@ -350,9 +350,9 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
350350
_serviceConsoleName = "Service Console";
351351
}
352352

353-
_managemetPortGroupName = _configDao.getValue(Config.VmwareManagementPortGroup.key());
354-
if (_managemetPortGroupName == null) {
355-
_managemetPortGroupName = "Management Network";
353+
_managementPortGroupName = _configDao.getValue(Config.VmwareManagementPortGroup.key());
354+
if (_managementPortGroupName == null) {
355+
_managementPortGroupName = "Management Network";
356356
}
357357

358358
_defaultSystemVmNicAdapterType = _configDao.getValue(Config.VmwareSystemVmNicDeviceType.key());
@@ -617,13 +617,13 @@ public String getServiceConsolePortGroupName() {
617617

618618
@Override
619619
public String getManagementPortGroupName() {
620-
return _managemetPortGroupName;
620+
return _managementPortGroupName;
621621
}
622622

623623
@Override
624624
public String getManagementPortGroupByHost(HostMO hostMo) throws Exception {
625625
if (hostMo.getHostType() == VmwareHostType.ESXi) {
626-
return _managemetPortGroupName;
626+
return _managementPortGroupName;
627627
}
628628
return _serviceConsoleName;
629629
}
@@ -633,7 +633,7 @@ public void setupResourceStartupParams(Map<String, Object> params) {
633633
params.put("vmware.create.full.clone", _fullCloneFlag);
634634
params.put("vm.instancename.flag", _instanceNameFlag);
635635
params.put("service.console.name", _serviceConsoleName);
636-
params.put("management.portgroup.name", _managemetPortGroupName);
636+
params.put("management.portgroup.name", _managementPortGroupName);
637637
params.put("vmware.root.disk.controller", _rootDiskController);
638638
params.put("vmware.data.disk.controller", _dataDiskController);
639639
params.put("vmware.recycle.hung.wokervm", _recycleHungWorker);

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4733,7 +4733,7 @@ public NetUtils.SupersetOrSubset checkIfSubsetOrSuperset(String vlanGateway, Str
47334733
final String cidrnew = NetUtils.getCidrFromGatewayAndNetmask(newVlanGateway, newVlanNetmask);
47344734
final String existing_cidr = NetUtils.getCidrFromGatewayAndNetmask(vlanGateway, vlanNetmask);
47354735

4736-
return NetUtils.isNetowrkASubsetOrSupersetOfNetworkB(cidrnew, existing_cidr);
4736+
return NetUtils.isNetworkASubsetOrSupersetOfNetworkB(cidrnew, existing_cidr);
47374737
}
47384738

47394739
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,

utils/src/main/java/com/cloud/utils/net/NetUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ public static enum SupersetOrSubset {
844844
isSuperset, isSubset, neitherSubetNorSuperset, sameSubnet, errorInCidrFormat
845845
}
846846

847-
public static SupersetOrSubset isNetowrkASubsetOrSupersetOfNetworkB(final String cidrA, final String cidrB) {
847+
public static SupersetOrSubset isNetworkASubsetOrSupersetOfNetworkB(final String cidrA, final String cidrB) {
848848
if (!areCidrsNotEmpty(cidrA, cidrB)) {
849849
return SupersetOrSubset.errorInCidrFormat;
850850
}

utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -561,8 +561,8 @@ public void testIsCidrsNotEmpty() {
561561
}
562562

563563
@Test
564-
public void testIsNetowrkASubsetOrSupersetOfNetworkBWithEmptyValues() {
565-
assertEquals(SupersetOrSubset.errorInCidrFormat, NetUtils.isNetowrkASubsetOrSupersetOfNetworkB("", null));
564+
public void testIsNetworkASubsetOrSupersetOfNetworkBWithEmptyValues() {
565+
assertEquals(SupersetOrSubset.errorInCidrFormat, NetUtils.isNetworkASubsetOrSupersetOfNetworkB("", null));
566566
}
567567

568568
@Test

0 commit comments

Comments
 (0)