CLOUDSTACK-4984: decrement MAX_VXLAN_VNI to be aligned with Linux kernel Linux vxlan interface doesn't accept VNI:16777215 now.
Signed-off-by: Toshiaki Hatano <hae...@haeena.net> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/089026f6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/089026f6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/089026f6 Branch: refs/heads/rbac Commit: 089026f6afb4de1a1f81b71d291a79d6e327a3e1 Parents: af4f78e Author: ynojima <m...@ynojima.net> Authored: Mon Oct 28 21:58:22 2013 -0600 Committer: Toshiaki Hatano <hae...@haeena.net> Committed: Thu Oct 31 00:13:54 2013 +0900 ---------------------------------------------------------------------- server/src/com/cloud/network/NetworkServiceImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/089026f6/server/src/com/cloud/network/NetworkServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java index 70f0d5a..7e971bd 100755 --- a/server/src/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/com/cloud/network/NetworkServiceImpl.java @@ -196,7 +196,9 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { private static final long MIN_GRE_KEY = 0L; private static final long MAX_GRE_KEY = 4294967295L; // 2^32 -1 private static final long MIN_VXLAN_VNI = 0L; - private static final long MAX_VXLAN_VNI = 16777215L; // 2^24 -1 + private static final long MAX_VXLAN_VNI = 16777214L; // 2^24 -2 + // MAX_VXLAN_VNI should be 16777215L (2^24-1), but Linux vxlan interface doesn't accept VNI:2^24-1 now. + // It seems a bug. @Inject DataCenterDao _dcDao = null; @@ -3781,12 +3783,12 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { PhysicalNetworkVO pvo = _physicalNetworkDao.findById(physicalNetworkId); DataCenterVO dvo = _dcDao.findById(pvo.getDataCenterId()); if (dvo.getNetworkType() == NetworkType.Basic) { - - Provider provider = Network.Provider.getProvider("BaremetalDhcpProvider"); - if (provider == null) { + + Provider provider = Network.Provider.getProvider("BaremetalDhcpProvider"); + if (provider == null) { // baremetal is not loaded return null; - } + } addProviderToPhysicalNetwork(physicalNetworkId, "BaremetalDhcpProvider", null, null); addProviderToPhysicalNetwork(physicalNetworkId, "BaremetalPxeProvider", null, null);
