Updated Branches: refs/heads/master 200703e9b -> e24456f48
[CLOUDSTACK-415] Workaround this problem for now Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e24456f4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e24456f4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e24456f4 Branch: refs/heads/master Commit: e24456f487994f0939e5221665e2f4d7cdaf36da Parents: 200703e Author: Hugo Trippaers <[email protected]> Authored: Mon Oct 29 09:26:14 2012 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Mon Oct 29 09:26:14 2012 +0100 ---------------------------------------------------------------------- .../src/com/cloud/network/NetworkManagerImpl.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e24456f4/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 8c91495..7506985 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -3817,6 +3817,15 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag if (!(network.getState() == Network.State.Implemented || network.getState() == Network.State.Setup)) { throw new InvalidParameterValueException("Network is not in the right state to be restarted. Correct states are: " + Network.State.Implemented + ", " + Network.State.Setup); } + + if (network.getBroadcastDomainType() == BroadcastDomainType.Lswitch ) { + /** + * Unable to restart these networks now. + * TODO Restarting a SDN based network requires updating the nics and the configuration + * in the controller. This requires a non-trivial rewrite of the restart procedure. + */ + throw new InvalidParameterException("Unable to restart a running SDN network."); + } _accountMgr.checkAccess(callerAccount, null, true, network);
