incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject git commit: [CLOUDSTACK-415] Workaround this problem for now
Date Sat, 15 Dec 2012 04:58:20 GMT
Updated Branches:
  refs/heads/4.0 0e34bcc77 -> 5a484e65f


[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/5a484e65
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5a484e65
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5a484e65

Branch: refs/heads/4.0
Commit: 5a484e65f63ff10328fd6b6590e20daf44aef3b3
Parents: 0e34bcc
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Authored: Mon Oct 29 09:26:14 2012 +0100
Committer: Joe Brockmeier <jzb@zonker.net>
Committed: Fri Dec 14 22:57:18 2012 -0600

----------------------------------------------------------------------
 .../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/5a484e65/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 7a11525..b33c52b 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -3806,6 +3806,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.");
+        }
 
         // don't allow clenaup=true for the network in Basic zone
         DataCenter zone = _configMgr.getZone(network.getDataCenterId());


Mime
View raw message