From 4748c3fd4d2e1037e0acbb595e3e1123b17f7441 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 22 May 2025 08:10:08 +0200 Subject: [PATCH 1/2] test: cleanup acl in test_global_acls.py (#10893) --- test/integration/smoke/test_global_acls.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/integration/smoke/test_global_acls.py b/test/integration/smoke/test_global_acls.py index 47db858c121..2a7aabe2004 100644 --- a/test/integration/smoke/test_global_acls.py +++ b/test/integration/smoke/test_global_acls.py @@ -141,6 +141,7 @@ class TestGlobalACLs(cloudstackTestCase): # Creating ACL list acl = NetworkACLList.create(apiclient=self.apiclient, services={}, name="acl", description="acl") + self.cleanup.append(acl) # Creating tier on VPC with ACL list network = Network.create( From 6e19c07da10b5e8a10fbbc0eb02fb1f9d7130edb Mon Sep 17 00:00:00 2001 From: Suresh Kumar Anaparti Date: Thu, 22 May 2025 11:41:04 +0530 Subject: [PATCH 2/2] Fixed typos (#10882) --- .../vmware/manager/VmwareManagerImpl.java | 14 +++++++------- .../configuration/ConfigurationManagerImpl.java | 2 +- .../main/java/com/cloud/utils/net/NetUtils.java | 2 +- .../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> validateIpRange(final String startIP, final String endIP, final String newVlanGateway, final String newVlanNetmask, final List 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