Updated Branches: refs/heads/4.2-forward af2951ad5 -> b96aefee2
CLOUDSTACK-4698: Check DHCP service in the network before get dhcp service provider Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b96aefee Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b96aefee Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b96aefee Branch: refs/heads/4.2-forward Commit: b96aefee2fcf07f18c8259364dc68a2503ff5207 Parents: af2951a Author: Sheng Yang <[email protected]> Authored: Tue Sep 17 15:12:53 2013 -0700 Committer: Sheng Yang <[email protected]> Committed: Tue Sep 17 16:01:01 2013 -0700 ---------------------------------------------------------------------- server/src/com/cloud/network/NetworkManagerImpl.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b96aefee/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 fb1dcb1..2c00c5b 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -2519,6 +2519,10 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L } public boolean isDhcpAccrossMultipleSubnetsSupported(Network network) { + if (!_networkModel.areServicesSupportedInNetwork(network.getId(), Service.Dhcp)) { + return false; + } + DhcpServiceProvider dhcpServiceProvider = getDhcpServiceProvider(network); Map <Network.Capability, String> capabilities = dhcpServiceProvider.getCapabilities().get(Network.Service.Dhcp); String supportsMultipleSubnets = capabilities.get(Network.Capability.DhcpAccrossMultipleSubnets);
