Updated Branches: refs/heads/master 0a4e65126 -> b3fb4851e
Fix regression of return Userdata provider when caller asked for DHCP It's introduced by: commit 052c24c4d1c881f791b804dbb9c2fc083af7da36 Author: Bharat Kumar <[email protected]> Date: Mon May 13 17:02:27 2013 +0530 CLOUDSTACK-702: Multiple ip ranges in different subnets. This commit get userdata provider when caller asked for dhcp provider, thus result in trouble e.g. ERROR [cloud.async.AsyncJobManagerImpl] (Job-Executor-11:job-10) Unexpected exception while executing org.apache.cloudstack.api.command.user.network.DeleteNetworkCmd java.lang.ClassCastException: com.cloud.baremetal.networkservice.BaremetalUserdataElement_EnhancerByCloudStack_5dee69d2 cannot be cast to com.cloud.network.element.DhcpServiceProvider at com.cloud.network.NetworkManagerImpl.getDhcpServiceProvider(NetworkManagerImpl.java:3309) ... Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b3fb4851 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b3fb4851 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b3fb4851 Branch: refs/heads/master Commit: b3fb4851ee204b1be514e389c66fd6e08d4b7fa4 Parents: 0a4e651 Author: Sheng Yang <[email protected]> Authored: Wed Jun 19 17:06:06 2013 -0700 Committer: Sheng Yang <[email protected]> Committed: Wed Jun 19 17:06:06 2013 -0700 ---------------------------------------------------------------------- server/src/com/cloud/network/NetworkManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b3fb4851/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 745fe23..61c5639 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -3299,7 +3299,7 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L @Override public DhcpServiceProvider getDhcpServiceProvider(Network network) { - String DhcpProvider = _ntwkSrvcDao.getProviderForServiceInNetwork(network.getId(), Service.UserData); + String DhcpProvider = _ntwkSrvcDao.getProviderForServiceInNetwork(network.getId(), Service.Dhcp); if (DhcpProvider == null) { s_logger.debug("Network " + network + " doesn't support service " + Service.Dhcp.getName());
