cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 0c52f70
Date Mon, 02 Nov 2015 13:18:46 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 3d213b66e -> 0c52f70b4


CLOUDSTACk-9002: VM deployment is successful even when dhcp entry command fails - Fixed


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/301ea330
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/301ea330
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/301ea330

Branch: refs/heads/master
Commit: 301ea330ce11cb415cef66401e9dc46a9b6c1471
Parents: 535ab51
Author: Kshitij Kansal <kansal.k@gmail.com>
Authored: Wed Oct 28 11:49:10 2015 +0530
Committer: Kshitij Kansal <kansal.k@gmail.com>
Committed: Wed Oct 28 11:51:25 2015 +0530

----------------------------------------------------------------------
 .../engine/orchestration/NetworkOrchestrator.java         | 10 +++++++---
 .../cloudstack/network/topology/BasicNetworkTopology.java |  3 +--
 2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/301ea330/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index 2a87bf5..e60e346 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -744,7 +744,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
 
                         Pair<NicProfile, Integer> vmNicPair = allocateNic(requested,
config, isDefaultNic, deviceId, vm);
                         NicProfile vmNic = null;
-                        if(vmNicPair != null) {
+                        if (vmNicPair != null) {
                             vmNic = vmNicPair.first();
                             if (vmNic == null) {
                                 continue;
@@ -1244,12 +1244,16 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
                         return false;
                     }
                 }
-                sp.addDhcpEntry(network, profile, vmProfile, dest, context);
+                if(!sp.addDhcpEntry(network, profile, vmProfile, dest, context)) {
+                    return false;
+                }
             }
             if (_networkModel.areServicesSupportedInNetwork(network.getId(), Service.UserData)
                     && _networkModel.isProviderSupportServiceInNetwork(network.getId(),
Service.UserData, element.getProvider()) && element instanceof UserDataServiceProvider)
{
                 UserDataServiceProvider sp = (UserDataServiceProvider)element;
-                sp.addPasswordAndUserdata(network, profile, vmProfile, dest, context);
+                if(!sp.addPasswordAndUserdata(network, profile, vmProfile, dest, context)){
+                    return false;
+                }
             }
         }
         return true;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/301ea330/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
----------------------------------------------------------------------
diff --git a/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java b/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
index 1f488e1..83b47a0 100644
--- a/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
+++ b/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
@@ -384,8 +384,7 @@ public class BasicNetworkTopology implements NetworkTopology {
                 }
 
                 try {
-                    ruleApplier.accept(getVisitor(), router);
-
+                    result = ruleApplier.accept(getVisitor(), router);
                     connectedRouters.add(router);
                 } catch (final AgentUnavailableException e) {
                     s_logger.warn(msg + router.getInstanceName(), e);


Mime
View raw message