cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [29/50] [abbrv] git commit: updated refs/heads/vpc-refactor to a8cb7c1
Date Fri, 03 Oct 2014 11:12:07 GMT
auto wire the network helper

Conflicts:
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java


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

Branch: refs/heads/vpc-refactor
Commit: 1836e0ba5845cff937d5d6dfb168fbc86c201b9f
Parents: bc90ce0
Author: Wilder Rodrigues <wrodrigues@schubergphilis.com>
Authored: Thu Aug 21 14:50:55 2014 +0200
Committer: Wilder Rodrigues <wrodrigues@schubergphilis.com>
Committed: Fri Oct 3 06:21:28 2014 +0200

----------------------------------------------------------------------
 .../src/com/cloud/network/router/CommandSetupHelper.java  |  7 +++++--
 .../cloudstack/network/topology/BasicNetworkTopology.java | 10 +++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1836e0ba/server/src/com/cloud/network/router/CommandSetupHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/CommandSetupHelper.java b/server/src/com/cloud/network/router/CommandSetupHelper.java
index acc343a..124ed54 100644
--- a/server/src/com/cloud/network/router/CommandSetupHelper.java
+++ b/server/src/com/cloud/network/router/CommandSetupHelper.java
@@ -28,6 +28,8 @@ import javax.inject.Inject;
 
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 
 import com.cloud.agent.api.SetupGuestNetworkCommand;
 import com.cloud.agent.api.routing.CreateIpAliasCommand;
@@ -174,8 +176,9 @@ public class CommandSetupHelper {
 
     @Inject
     private RouterControlHelper _routerControlHelper;
-    @Inject
-    private NetworkHelper _networkHelper;
+    @Autowired
+    @Qualifier("networkHelper")
+    protected NetworkHelper _networkHelper;
 
     private final String _dnsBasicZoneUpdates = "all";
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1836e0ba/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 5327a5d..8560d36 100644
--- a/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
+++ b/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
@@ -90,8 +90,9 @@ public class BasicNetworkTopology implements NetworkTopology {
     @Inject
     protected HostDao _hostDao;
 
-    @Inject
-    protected NetworkHelper _nwHelper;
+    @Autowired
+    @Qualifier("networkHelper")
+    protected NetworkHelper _networkHelper;
 
     @Inject
     protected UserVmDao _userVmDao;
@@ -419,9 +420,8 @@ public class BasicNetworkTopology implements NetworkTopology {
         if (!connectedRouters.isEmpty()) {
             // Shouldn't we include this check inside the method?
             if (!isZoneBasic && !disconnectedRouters.isEmpty() && disconnectedRouters.get(0).getIsRedundantRouter())
{
-                // These disconnected redundant virtual routers are out of sync
-                // now, stop them for synchronization
-                _nwHelper.handleSingleWorkingRedundantRouter(connectedRouters, disconnectedRouters,
msg);
+                // These disconnected redundant virtual routers are out of sync now, stop
them for synchronization
+                _networkHelper.handleSingleWorkingRedundantRouter(connectedRouters, disconnectedRouters,
msg);
             }
         } else if (!disconnectedRouters.isEmpty()) {
             for (final VirtualRouter router : disconnectedRouters) {


Mime
View raw message