You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2013/02/07 05:13:27 UTC
[1/2] git commit: refs/heads/network-refactor - IPv6: One network can
have more than one vlans
IPv6: One network can have more than one vlans
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/42283457
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/42283457
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/42283457
Branch: refs/heads/network-refactor
Commit: 422834578f14b9620679eb07d3756c99d747762b
Parents: 6d41fe0
Author: Sheng Yang <sh...@citrix.com>
Authored: Wed Feb 6 19:46:58 2013 -0800
Committer: Sheng Yang <sh...@citrix.com>
Committed: Wed Feb 6 19:46:58 2013 -0800
----------------------------------------------------------------------
api/src/com/cloud/network/NetworkModel.java | 4 +-
.../com/cloud/network/Ipv6AddressManagerImpl.java | 49 ++++++++++-----
.../src/com/cloud/network/NetworkManagerImpl.java | 6 +--
server/src/com/cloud/network/NetworkModelImpl.java | 31 +++++-----
.../com/cloud/network/dao/UserIpv6AddressDao.java | 2 +
.../cloud/network/dao/UserIpv6AddressDaoImpl.java | 8 +++
.../com/cloud/network/MockNetworkModelImpl.java | 6 +-
7 files changed, 65 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/42283457/api/src/com/cloud/network/NetworkModel.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/NetworkModel.java b/api/src/com/cloud/network/NetworkModel.java
index 5d7dc60..d74a74e 100644
--- a/api/src/com/cloud/network/NetworkModel.java
+++ b/api/src/com/cloud/network/NetworkModel.java
@@ -247,7 +247,7 @@ public interface NetworkModel {
PublicIpAddress getSourceNatIpAddressForGuestNetwork(Account owner, Network guestNetwork);
- Vlan getVlanForNetwork(long networkId);
+ boolean isIP6AddressAvailableInNetwork(long networkId);
- boolean isIP6AddressAvailable(long networkId);
+ boolean isIP6AddressAvailableInVlan(long vlanId);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/42283457/server/src/com/cloud/network/Ipv6AddressManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/Ipv6AddressManagerImpl.java b/server/src/com/cloud/network/Ipv6AddressManagerImpl.java
index 6633018..d6f6258 100644
--- a/server/src/com/cloud/network/Ipv6AddressManagerImpl.java
+++ b/server/src/com/cloud/network/Ipv6AddressManagerImpl.java
@@ -17,6 +17,7 @@
package com.cloud.network;
+import java.util.List;
import java.util.Map;
import javax.ejb.Local;
@@ -29,6 +30,7 @@ import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenterVO;
import com.cloud.dc.Vlan;
+import com.cloud.dc.VlanVO;
import com.cloud.dc.dao.DataCenterDao;
import com.cloud.dc.dao.VlanDao;
import com.cloud.exception.InsufficientAddressCapacityException;
@@ -93,25 +95,34 @@ public class Ipv6AddressManagerImpl implements Ipv6AddressManager {
if (network == null) {
return null;
}
- Vlan vlan = _networkModel.getVlanForNetwork(networkId);
- if (vlan == null) {
+ List<VlanVO> vlans = _vlanDao.listVlansByNetworkId(networkId);
+ if (vlans == null) {
s_logger.debug("Cannot find related vlan or too many vlan attached to network " + networkId);
return null;
}
String ip = null;
+ Vlan ipVlan = null;
if (requestedIp6 == null) {
- if (!_networkModel.isIP6AddressAvailable(networkId)) {
+ if (!_networkModel.isIP6AddressAvailableInNetwork(networkId)) {
throw new InsufficientAddressCapacityException("There is no more address available in the network " + network.getName(), DataCenter.class, network.getDataCenterId());
}
- ip = NetUtils.getIp6FromRange(vlan.getIp6Range());
- int count = 0;
- while (_ipv6Dao.findByNetworkIdAndIp(networkId, ip) != null) {
- ip = NetUtils.getNextIp6InRange(ip, vlan.getIp6Range());
- count ++;
- // It's an arbitrate number to prevent the infinite loop
- if (count > _ipv6RetryMax) {
- ip = null;
- break;
+ for (Vlan vlan : vlans) {
+ if (!_networkModel.isIP6AddressAvailableInVlan(vlan.getId())) {
+ continue;
+ }
+ ip = NetUtils.getIp6FromRange(vlan.getIp6Range());
+ int count = 0;
+ while (_ipv6Dao.findByNetworkIdAndIp(networkId, ip) != null) {
+ ip = NetUtils.getNextIp6InRange(ip, vlan.getIp6Range());
+ count ++;
+ // It's an arbitrate number to prevent the infinite loop
+ if (count > _ipv6RetryMax) {
+ ip = null;
+ break;
+ }
+ }
+ if (ip != null) {
+ ipVlan = vlan;
}
}
if (ip == null) {
@@ -119,7 +130,13 @@ public class Ipv6AddressManagerImpl implements Ipv6AddressManager {
DataCenter.class, network.getDataCenterId());
}
} else {
- if (!NetUtils.isIp6InRange(requestedIp6, vlan.getIp6Range())) {
+ for (Vlan vlan : vlans) {
+ if (NetUtils.isIp6InRange(requestedIp6, vlan.getIp6Range())) {
+ ipVlan = vlan;
+ break;
+ }
+ }
+ if (ipVlan == null) {
throw new CloudRuntimeException("Requested IPv6 is not in the predefined range!");
}
ip = requestedIp6;
@@ -134,9 +151,9 @@ public class Ipv6AddressManagerImpl implements Ipv6AddressManager {
_dcDao.update(dc.getId(), dc);
String macAddress = NetUtils.long2Mac(NetUtils.createSequenceBasedMacAddress(mac));
- UserIpv6AddressVO ipVO = new UserIpv6AddressVO(ip, dcId, macAddress, vlan.getId());
- ipVO.setPhysicalNetworkId(vlan.getPhysicalNetworkId());
- ipVO.setSourceNetworkId(vlan.getNetworkId());
+ UserIpv6AddressVO ipVO = new UserIpv6AddressVO(ip, dcId, macAddress, ipVlan.getId());
+ ipVO.setPhysicalNetworkId(network.getPhysicalNetworkId());
+ ipVO.setSourceNetworkId(networkId);
ipVO.setState(UserIpv6Address.State.Allocated);
ipVO.setDomainId(owner.getDomainId());
ipVO.setAccountId(owner.getAccountId());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/42283457/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 47c96f8..f5d847c 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -3402,11 +3402,7 @@ public class NetworkManagerImpl implements NetworkManager, Manager, Listener {
if (nic.getIp6Address() == null) {
ipv6 = true;
UserIpv6Address ip = _ipv6Mgr.assignDirectIp6Address(dc.getId(), vm.getOwner(), network.getId(), requestedIpv6);
- Vlan vlan = _networkModel.getVlanForNetwork(network.getId());
- if (vlan == null) {
- s_logger.debug("Cannot find related vlan or too many vlan attached to network " + network.getId());
- return;
- }
+ Vlan vlan = _vlanDao.findById(ip.getVlanId());
nic.setIp6Address(ip.getAddress().toString());
nic.setIp6Gateway(vlan.getIp6Gateway());
nic.setIp6Cidr(vlan.getIp6Cidr());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/42283457/server/src/com/cloud/network/NetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java
index 70debc0..ac11a19 100644
--- a/server/src/com/cloud/network/NetworkModelImpl.java
+++ b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -521,7 +521,7 @@ public class NetworkModelImpl implements NetworkModel, Manager{
return false;
}
if (network.getIp6Gateway() != null) {
- hasFreeIps = isIP6AddressAvailable(network.getId());
+ hasFreeIps = isIP6AddressAvailableInNetwork(network.getId());
}
} else {
hasFreeIps = (getAvailableIps(network, null)).size() > 0;
@@ -531,17 +531,7 @@ public class NetworkModelImpl implements NetworkModel, Manager{
}
@Override
- public Vlan getVlanForNetwork(long networkId) {
- List<VlanVO> vlans = _vlanDao.listVlansByNetworkId(networkId);
- if (vlans == null || vlans.size() > 1) {
- s_logger.debug("Cannot find related vlan or too many vlan attached to network " + networkId);
- return null;
- }
- return vlans.get(0);
- }
-
- @Override
- public boolean isIP6AddressAvailable(long networkId) {
+ public boolean isIP6AddressAvailableInNetwork(long networkId) {
Network network = _networksDao.findById(networkId);
if (network == null) {
return false;
@@ -549,13 +539,24 @@ public class NetworkModelImpl implements NetworkModel, Manager{
if (network.getIp6Gateway() == null) {
return false;
}
- Vlan vlan = getVlanForNetwork(network.getId());
- long existedCount = _ipv6Dao.countExistedIpsInNetwork(network.getId());
+ List<VlanVO> vlans = _vlanDao.listVlansByNetworkId(networkId);
+ for (Vlan vlan : vlans) {
+ if (isIP6AddressAvailableInVlan(vlan.getId())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public boolean isIP6AddressAvailableInVlan(long vlanId) {
+ VlanVO vlan = _vlanDao.findById(vlanId);
+ long existedCount = _ipv6Dao.countExistedIpsInVlan(vlanId);
BigInteger existedInt = BigInteger.valueOf(existedCount);
BigInteger rangeInt = NetUtils.countIp6InRange(vlan.getIp6Range());
return (existedInt.compareTo(rangeInt) < 0);
}
-
+
@Override
public Map<Service, Map<Capability, String>> getNetworkCapabilities(long networkId) {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/42283457/server/src/com/cloud/network/dao/UserIpv6AddressDao.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/UserIpv6AddressDao.java b/server/src/com/cloud/network/dao/UserIpv6AddressDao.java
index 0e245ef..1f06d53 100644
--- a/server/src/com/cloud/network/dao/UserIpv6AddressDao.java
+++ b/server/src/com/cloud/network/dao/UserIpv6AddressDao.java
@@ -20,4 +20,6 @@ public interface UserIpv6AddressDao extends GenericDao<UserIpv6AddressVO, Long>
List<UserIpv6AddressVO> listByPhysicalNetworkId(long physicalNetworkId);
long countExistedIpsInNetwork(long networkId);
+
+ long countExistedIpsInVlan(long vlanId);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/42283457/server/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java b/server/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java
index 6989c40..d1e541e 100644
--- a/server/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java
+++ b/server/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java
@@ -41,6 +41,7 @@ public class UserIpv6AddressDaoImpl extends GenericDaoBase<UserIpv6AddressVO, Lo
CountFreePublicIps = createSearchBuilder(Long.class);
CountFreePublicIps.select(null, Func.COUNT, null);
CountFreePublicIps.and("networkId", CountFreePublicIps.entity().getSourceNetworkId(), SearchCriteria.Op.EQ);
+ CountFreePublicIps.and("vlanId", CountFreePublicIps.entity().getSourceNetworkId(), SearchCriteria.Op.EQ);
CountFreePublicIps.done();
}
@@ -93,4 +94,11 @@ public class UserIpv6AddressDaoImpl extends GenericDaoBase<UserIpv6AddressVO, Lo
sc.setParameters("networkId", networkId);
return customSearch(sc, null).get(0);
}
+
+ @Override
+ public long countExistedIpsInVlan(long vlanId) {
+ SearchCriteria<Long> sc = CountFreePublicIps.create();
+ sc.setParameters("vlanId", vlanId);
+ return customSearch(sc, null).get(0);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/42283457/server/test/com/cloud/network/MockNetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/network/MockNetworkModelImpl.java b/server/test/com/cloud/network/MockNetworkModelImpl.java
index 1963455..5c1343f 100644
--- a/server/test/com/cloud/network/MockNetworkModelImpl.java
+++ b/server/test/com/cloud/network/MockNetworkModelImpl.java
@@ -798,13 +798,13 @@ public class MockNetworkModelImpl implements NetworkModel, Manager {
}
@Override
- public Vlan getVlanForNetwork(long networkId) {
+ public boolean isIP6AddressAvailableInNetwork(long networkId) {
// TODO Auto-generated method stub
- return null;
+ return false;
}
@Override
- public boolean isIP6AddressAvailable(long networkId) {
+ public boolean isIP6AddressAvailableInVlan(long vlanId) {
// TODO Auto-generated method stub
return false;
}