apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.19' into 4.20

Browse Source
This commit is contained in:
Rohit Yadav 2025-05-22 11:46:59 +05:30
commit f99fb3ecde
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -253,7 +253,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw
private boolean _fullCloneFlag; private boolean _fullCloneFlag;
private boolean _instanceNameFlag; private boolean _instanceNameFlag;
private String _serviceConsoleName; private String _serviceConsoleName;
private String _managemetPortGroupName; private String _managementPortGroupName;
private String _defaultSystemVmNicAdapterType = VirtualEthernetCardType.E1000.toString(); private String _defaultSystemVmNicAdapterType = VirtualEthernetCardType.E1000.toString();
private String _recycleHungWorker = "false"; private String _recycleHungWorker = "false";
private int _additionalPortRangeStart; private int _additionalPortRangeStart;
@ -351,9 +351,9 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw
_serviceConsoleName = "Service Console"; _serviceConsoleName = "Service Console";
} }
_managemetPortGroupName = _configDao.getValue(Config.VmwareManagementPortGroup.key()); _managementPortGroupName = _configDao.getValue(Config.VmwareManagementPortGroup.key());
if (_managemetPortGroupName == null) { if (_managementPortGroupName == null) {
_managemetPortGroupName = "Management Network"; _managementPortGroupName = "Management Network";
} }
_defaultSystemVmNicAdapterType = _configDao.getValue(Config.VmwareSystemVmNicDeviceType.key()); _defaultSystemVmNicAdapterType = _configDao.getValue(Config.VmwareSystemVmNicDeviceType.key());
@ -618,13 +618,13 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw
@Override @Override
public String getManagementPortGroupName() { public String getManagementPortGroupName() {
return _managemetPortGroupName; return _managementPortGroupName;
} }
@Override @Override
public String getManagementPortGroupByHost(HostMO hostMo) throws Exception { public String getManagementPortGroupByHost(HostMO hostMo) throws Exception {
if (hostMo.getHostType() == VmwareHostType.ESXi) { if (hostMo.getHostType() == VmwareHostType.ESXi) {
return _managemetPortGroupName; return _managementPortGroupName;
} }
return _serviceConsoleName; return _serviceConsoleName;
} }
@ -634,7 +634,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw
params.put("vmware.create.full.clone", _fullCloneFlag); params.put("vmware.create.full.clone", _fullCloneFlag);
params.put("vm.instancename.flag", _instanceNameFlag); params.put("vm.instancename.flag", _instanceNameFlag);
params.put("service.console.name", _serviceConsoleName); 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.root.disk.controller", _rootDiskController);
params.put("vmware.data.disk.controller", _dataDiskController); params.put("vmware.data.disk.controller", _dataDiskController);
params.put("vmware.recycle.hung.wokervm", _recycleHungWorker); params.put("vmware.recycle.hung.wokervm", _recycleHungWorker);

2
server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -4878,7 +4878,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
final String cidrnew = NetUtils.getCidrFromGatewayAndNetmask(newVlanGateway, newVlanNetmask); final String cidrnew = NetUtils.getCidrFromGatewayAndNetmask(newVlanGateway, newVlanNetmask);
final String existing_cidr = NetUtils.getCidrFromGatewayAndNetmask(vlanGateway, vlanNetmask); 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, 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,

1
test/integration/smoke/test_global_acls.py
View File

@ -141,6 +141,7 @@ class TestGlobalACLs(cloudstackTestCase):
# Creating ACL list # Creating ACL list
acl = NetworkACLList.create(apiclient=self.apiclient, services={}, name="acl", description="acl") acl = NetworkACLList.create(apiclient=self.apiclient, services={}, name="acl", description="acl")
self.cleanup.append(acl)
# Creating tier on VPC with ACL list # Creating tier on VPC with ACL list
network = Network.create( network = Network.create(

2
utils/src/main/java/com/cloud/utils/net/NetUtils.java
View File

@ -847,7 +847,7 @@ public class NetUtils {
isSuperset, isSubset, neitherSubetNorSuperset, sameSubnet, errorInCidrFormat 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)) { if (!areCidrsNotEmpty(cidrA, cidrB)) {
return SupersetOrSubset.errorInCidrFormat; return SupersetOrSubset.errorInCidrFormat;
} }

4
utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java
View File

@ -562,8 +562,8 @@ public class NetUtilsTest {
} }
@Test @Test
public void testIsNetowrkASubsetOrSupersetOfNetworkBWithEmptyValues() { public void testIsNetworkASubsetOrSupersetOfNetworkBWithEmptyValues() {
assertEquals(SupersetOrSubset.errorInCidrFormat, NetUtils.isNetowrkASubsetOrSupersetOfNetworkB("", null)); assertEquals(SupersetOrSubset.errorInCidrFormat, NetUtils.isNetworkASubsetOrSupersetOfNetworkB("", null));
} }
@Test @Test