From f8d4a23343d963ec9d2b9eec8e29f965c2e2198d Mon Sep 17 00:00:00 2001 From: Likitha Shetty Date: Fri, 19 Apr 2013 07:00:26 +0530 Subject: [PATCH] CLOUDSTACK-2088. Dedicated Public IP Addresses per tenant. Guest Network in a project acquires IPs at random even from the IP ranges which are dedicated to other accounts. Modified search to return only IP's belonging to system pool --- server/src/com/cloud/dc/dao/VlanDao.java | 2 ++ server/src/com/cloud/dc/dao/VlanDaoImpl.java | 19 +++++++++++++++++++ .../com/cloud/network/NetworkManagerImpl.java | 16 ++++++++++------ 3 files changed, 31 insertions(+), 6 deletions(-) mode change 100644 => 100755 server/src/com/cloud/dc/dao/VlanDao.java mode change 100644 => 100755 server/src/com/cloud/dc/dao/VlanDaoImpl.java diff --git a/server/src/com/cloud/dc/dao/VlanDao.java b/server/src/com/cloud/dc/dao/VlanDao.java old mode 100644 new mode 100755 index 6423688386c..cc82632e9e3 --- a/server/src/com/cloud/dc/dao/VlanDao.java +++ b/server/src/com/cloud/dc/dao/VlanDao.java @@ -50,4 +50,6 @@ public interface VlanDao extends GenericDao { List listVlansByNetworkId(long networkId); List listVlansByPhysicalNetworkId(long physicalNetworkId); + + List listZoneWideNonDedicatedVlans(long zoneId); } diff --git a/server/src/com/cloud/dc/dao/VlanDaoImpl.java b/server/src/com/cloud/dc/dao/VlanDaoImpl.java old mode 100644 new mode 100755 index c5a635fd0c0..100295b4b5f --- a/server/src/com/cloud/dc/dao/VlanDaoImpl.java +++ b/server/src/com/cloud/dc/dao/VlanDaoImpl.java @@ -58,6 +58,9 @@ public class VlanDaoImpl extends GenericDaoBase implements VlanDao protected SearchBuilder ZoneVlanSearch; protected SearchBuilder NetworkVlanSearch; protected SearchBuilder PhysicalNetworkVlanSearch; + protected SearchBuilder ZoneWideNonDedicatedVlanSearch; + + protected SearchBuilder AccountVlanMapSearch; @Inject protected PodVlanMapDao _podVlanMapDao; @Inject protected AccountVlanMapDao _accountVlanMapDao; @@ -198,6 +201,14 @@ public class VlanDaoImpl extends GenericDaoBase implements VlanDao PodVlanSearch2.done(); ZoneTypePodSearch.done(); + ZoneWideNonDedicatedVlanSearch = createSearchBuilder(); + ZoneWideNonDedicatedVlanSearch.and("zoneId", ZoneWideNonDedicatedVlanSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ); + AccountVlanMapSearch = _accountVlanMapDao.createSearchBuilder(); + AccountVlanMapSearch.and("accountId", AccountVlanMapSearch.entity().getAccountId(), SearchCriteria.Op.NULL); + ZoneWideNonDedicatedVlanSearch.join("AccountVlanMapSearch", AccountVlanMapSearch, ZoneWideNonDedicatedVlanSearch.entity().getId(), AccountVlanMapSearch.entity().getVlanDbId(), JoinBuilder.JoinType.LEFTOUTER); + ZoneWideNonDedicatedVlanSearch.done(); + AccountVlanMapSearch.done(); + return result; } @@ -312,4 +323,12 @@ public class VlanDaoImpl extends GenericDaoBase implements VlanDao sc.setParameters("physicalNetworkId", physicalNetworkId); return listBy(sc); } + + @Override + public List listZoneWideNonDedicatedVlans(long zoneId) { + SearchCriteria sc = ZoneWideNonDedicatedVlanSearch.create(); + sc.setParameters("ZoneWideNonDedicatedVlanSearch", "zoneId", zoneId); + return listBy(sc); + } + } diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 7332ef3e9cf..114402bb114 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -581,6 +581,8 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L VlanType vlanType = VlanType.VirtualNetwork; boolean assign = false; boolean allocateFromDedicatedRange = false; + List dedicatedVlanDbIds = new ArrayList(); + List nonDedicatedVlanDbIds = new ArrayList(); if (Grouping.AllocationState.Disabled == zone.getAllocationState() && !_accountMgr.isRootAdmin(caller.getType())) { // zone is of type DataCenter. See DataCenterVO.java. @@ -615,18 +617,17 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L txn.start(); // If account has dedicated Public IP ranges, allocate IP from the dedicated range - List vlanDbIds = new ArrayList(); List maps = _accountVlanMapDao.listAccountVlanMapsByAccount(ipOwner.getId()); for (AccountVlanMapVO map : maps) { - vlanDbIds.add(map.getVlanDbId()); + dedicatedVlanDbIds.add(map.getVlanDbId()); } - if (vlanDbIds != null && !vlanDbIds.isEmpty()) { + if (dedicatedVlanDbIds != null && !dedicatedVlanDbIds.isEmpty()) { allocateFromDedicatedRange = true; } try { if (allocateFromDedicatedRange) { - ip = fetchNewPublicIp(zone.getId(), null, vlanDbIds, ipOwner, vlanType, null, + ip = fetchNewPublicIp(zone.getId(), null, dedicatedVlanDbIds, ipOwner, vlanType, null, false, assign, null, isSystem, null); } } catch(InsufficientAddressCapacityException e) { @@ -637,12 +638,15 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L } if (!allocateFromDedicatedRange) { - ip = fetchNewPublicIp(zone.getId(), null, null, ipOwner, vlanType, null, false, assign, null, + List nonDedicatedVlans = _vlanDao.listZoneWideNonDedicatedVlans(zone.getId()); + for (VlanVO nonDedicatedVlan : nonDedicatedVlans) { + nonDedicatedVlanDbIds.add(nonDedicatedVlan.getId()); + } + ip = fetchNewPublicIp(zone.getId(), null, nonDedicatedVlanDbIds, ipOwner, vlanType, null, false, assign, null, isSystem, null); } if (ip == null) { - InsufficientAddressCapacityException ex = new InsufficientAddressCapacityException ("Unable to find available public IP addresses", DataCenter.class, zone.getId()); ex.addProxyObject(ApiDBUtils.findZoneById(zone.getId()).getUuid());