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:06:29 UTC
git commit: updated refs/heads/master to 4dc874f
Updated Branches:
refs/heads/master fd32c33d6 -> 4dc874fef
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/4dc874fe
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4dc874fe
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4dc874fe
Branch: refs/heads/master
Commit: 4dc874fefc0068993a2358706411b5a601b3c7fc
Parents: fd32c33
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:36:20 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/4dc874fe/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 d43007a..8262ace 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -2480,7 +2480,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)) {