You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ap...@apache.org on 2013/07/29 15:05:51 UTC
git commit: updated refs/heads/4.2 to 03176e2
Updated Branches:
refs/heads/4.2 78781ff7b -> 03176e285
Cloudstack-2622 createipAlias.sh/deleteipAliash.sh should not be allowed with Isolated Guest Networks
Signed-off-by: Abhinandan Prateek <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/03176e28
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/03176e28
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/03176e28
Branch: refs/heads/4.2
Commit: 03176e28597b606f78385382842f389178729e92
Parents: 78781ff
Author: Bharat Kumar <bh...@citrix.com>
Authored: Sun Jul 28 14:56:03 2013 +0530
Committer: Abhinandan Prateek <ap...@apache.org>
Committed: Mon Jul 29 18:26:19 2013 +0530
----------------------------------------------------------------------
.../cloud/network/router/VirtualNetworkApplianceManagerImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/03176e28/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 2a8a6e2..477b086 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -2482,7 +2482,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
}
}
//Reapply dhcp and dns configuration.
- if (_networkModel.isProviderSupportServiceInNetwork(guestNetworkId, Service.Dhcp, provider)) {
+ Network guestNetwork = _networkDao.findById(guestNetworkId);
+ if (guestNetwork.getGuestType()==GuestType.Shared && _networkModel.isProviderSupportServiceInNetwork(guestNetworkId, Service.Dhcp, provider)) {
Map<Network.Capability, String> dhcpCapabilities = _networkSvc.getNetworkOfferingServiceCapabilities(_networkOfferingDao.findById(_networkDao.findById(guestNetworkId).getNetworkOfferingId()), Service.Dhcp);
String supportsMultipleSubnets = dhcpCapabilities.get(Network.Capability.DhcpAccrossMultipleSubnets);
if (supportsMultipleSubnets != null && Boolean.valueOf(supportsMultipleSubnets)) {