CLOUDSTACK-7186: Revert "CLOUDSTACK-7182: NPE while trying to deploy VMs in parallel in isolated network"

Sheng Yang · Sheng Yang · commit f47cfc6eb16b · 2014-07-28T16:02:21.000-07:00
This reverts commit 47d6a64, which broke VPC completely.
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -925,7 +925,7 @@ protected NicTO toNicTO(NicVO nic, NicProfile profile, NetworkVO config) {
 
     boolean isNetworkImplemented(NetworkVO network) {
         Network.State state = network.getState();
-        if (state == Network.State.Implemented) {
+        if (state == Network.State.Implemented || state == Network.State.Implementing) {
             return true;
         } else if (state == Network.State.Setup) {
             DataCenterVO zone = _dcDao.findById(network.getDataCenterId());
@@ -1277,19 +1277,7 @@ public int compare(NicVO nic1, NicVO nic2) {
         });
 
         for (NicVO nic : nics) {
-            Pair<NetworkGuru, NetworkVO> implemented = null;
-            if (vmProfile.getVirtualMachine().getType() != Type.DomainRouter) {
-                implemented = implementNetwork(nic.getNetworkId(), dest, context);
-            } else {
-                // At the time of implementing network (using implementNetwork() method), if the VR needs to be deployed then
-                // it follows the same path of regular VM deployment. This leads to a nested call to implementNetwork() while
-                // preparing VR nics. This flow creates issues in dealing with network state transitions. The original call
-                // puts network in "Implementing" state and then the nested call again tries to put it into same state resulting
-                // in issues. In order to avoid it, implementNetwork() call for VR is replaced with below code.
-                NetworkVO network = _networksDao.findById(nic.getNetworkId());
-                NetworkGuru guru = AdapterBase.getAdapterByName(networkGurus, network.getGuruName());
-                implemented = new Pair<NetworkGuru, NetworkVO>(guru, network);
-            }
+            Pair<NetworkGuru, NetworkVO> implemented = implementNetwork(nic.getNetworkId(), dest, context);
             if (implemented == null || implemented.first() == null) {
                 s_logger.warn("Failed to implement network id=" + nic.getNetworkId() + " as a part of preparing nic id=" + nic.getId());
                 throw new CloudRuntimeException("Failed to implement network id=" + nic.getNetworkId() + " as a part preparing nic id=" + nic.getId());
