You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2013/01/10 00:50:00 UTC
[16/16] git commit: Network-refactor: remove unused members. Makes
testing of injection a PIA.
Updated Branches:
refs/heads/network-refactor af1abe405 -> 05a85c7cd
Network-refactor: remove unused members. Makes testing of injection a PIA.
Signed-off-by: Chiradeep Vittal <ch...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1339650c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1339650c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1339650c
Branch: refs/heads/network-refactor
Commit: 1339650c2c98dd88ca4935e3c8cbf9fdd854c3ae
Parents: e057818
Author: Chiradeep Vittal <ch...@apache.org>
Authored: Tue Jan 8 23:52:19 2013 -0800
Committer: Chiradeep Vittal <ch...@apache.org>
Committed: Wed Jan 9 15:49:02 2013 -0800
----------------------------------------------------------------------
.../network/element/VirtualRouterElement.java | 4 +---
.../network/lb/LoadBalancingRulesManagerImpl.java | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1339650c/server/src/com/cloud/network/element/VirtualRouterElement.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java
index d35e358..124d029 100755
--- a/server/src/com/cloud/network/element/VirtualRouterElement.java
+++ b/server/src/com/cloud/network/element/VirtualRouterElement.java
@@ -80,7 +80,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.DomainRouterVO;
import com.cloud.vm.NicProfile;
import com.cloud.vm.ReservationContext;
-import com.cloud.vm.UserVmManager;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.VirtualMachineProfile;
@@ -113,8 +112,7 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
ConfigurationManager _configMgr;
@Inject
RulesManager _rulesMgr;
- @Inject
- UserVmManager _userVmMgr;
+
@Inject
UserVmDao _userVmDao;
@Inject
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1339650c/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
index 7bb2a25..eb75d0b 100755
--- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
+++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
@@ -119,7 +119,6 @@ import com.cloud.service.dao.ServiceOfferingDao;
import com.cloud.storage.dao.VMTemplateDao;
import com.cloud.tags.ResourceTagVO;
import com.cloud.tags.dao.ResourceTagDao;
-import com.cloud.template.TemplateManager;
import com.cloud.user.Account;
import com.cloud.user.AccountManager;
import com.cloud.user.DomainService;
@@ -197,8 +196,7 @@ public class LoadBalancingRulesManagerImpl<Type> implements LoadBalancingRulesMa
DomainService _domainMgr;
@Inject
ConfigurationManager _configMgr;
- @Inject
- TemplateManager _templateMgr;
+
@Inject
ExternalLoadBalancerUsageManager _externalLBUsageMgr;
@Inject