CLOUDSTACK-4698: Check DHCP service in the network before get dhcp service provider

This commit is contained in:
Sheng Yang 2013-09-17 15:12:53 -07:00
parent 6fccd74ae8
commit 37f4a120fd

View File

@ -1535,6 +1535,10 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
}
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);