You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/01/27 16:26:51 UTC
[1/2] git commit: updated refs/heads/master to de436ac
Repository: cloudstack
Updated Branches:
refs/heads/master 32fe308ed -> de436acac
Removed unused variables from class NetworkStateListener
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5d3adb3a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5d3adb3a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5d3adb3a
Branch: refs/heads/master
Commit: 5d3adb3a2da6aea6fba8f563548de14cdcca7625
Parents: 94a1448
Author: pedro-martins <ph...@gmail.com>
Authored: Sat Dec 19 15:54:26 2015 -0200
Committer: pedro-martins <ph...@gmail.com>
Committed: Sat Dec 19 15:54:26 2015 -0200
----------------------------------------------------------------------
.../com/cloud/network/NetworkStateListener.java | 21 ++++++--------------
.../orchestration/NetworkOrchestrator.java | 2 +-
.../com/cloud/network/IpAddressManagerImpl.java | 2 +-
3 files changed, 8 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d3adb3a/engine/components-api/src/com/cloud/network/NetworkStateListener.java
----------------------------------------------------------------------
diff --git a/engine/components-api/src/com/cloud/network/NetworkStateListener.java b/engine/components-api/src/com/cloud/network/NetworkStateListener.java
index 0ed1d9e..ef8dddc 100644
--- a/engine/components-api/src/com/cloud/network/NetworkStateListener.java
+++ b/engine/components-api/src/com/cloud/network/NetworkStateListener.java
@@ -24,38 +24,29 @@ import java.util.Map;
import javax.inject.Inject;
-import com.cloud.utils.fsm.StateMachine2;
-import org.apache.log4j.Logger;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.framework.events.EventBus;
import org.apache.cloudstack.framework.events.EventBusException;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import com.cloud.event.EventCategory;
-import com.cloud.event.dao.UsageEventDao;
import com.cloud.network.Network.Event;
import com.cloud.network.Network.State;
-import com.cloud.network.dao.NetworkDao;
import com.cloud.utils.component.ComponentContext;
import com.cloud.utils.fsm.StateListener;
+import com.cloud.utils.fsm.StateMachine2;
public class NetworkStateListener implements StateListener<State, Event, Network> {
@Inject
- protected UsageEventDao _usageEventDao;
- @Inject
- protected NetworkDao _networkDao;
- @Inject
- protected ConfigurationDao _configDao;
+ private ConfigurationDao _configDao;
- protected static EventBus s_eventBus = null;
+ private static EventBus s_eventBus = null;
private static final Logger s_logger = Logger.getLogger(NetworkStateListener.class);
- public NetworkStateListener(UsageEventDao usageEventDao, NetworkDao networkDao, ConfigurationDao configDao) {
- _usageEventDao = usageEventDao;
- _networkDao = networkDao;
+ public NetworkStateListener(ConfigurationDao configDao) {
_configDao = configDao;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d3adb3a/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 d99c9ef..0bfd947 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -575,7 +575,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
_agentMgr.registerForHostEvents(this, true, false, true);
- Network.State.getStateMachine().registerListener(new NetworkStateListener(_usageEventDao, _networksDao, _configDao));
+ Network.State.getStateMachine().registerListener(new NetworkStateListener(_configDao));
s_logger.info("Network Manager is configured.");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d3adb3a/server/src/com/cloud/network/IpAddressManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/IpAddressManagerImpl.java b/server/src/com/cloud/network/IpAddressManagerImpl.java
index d4da5fa..e65adb6 100644
--- a/server/src/com/cloud/network/IpAddressManagerImpl.java
+++ b/server/src/com/cloud/network/IpAddressManagerImpl.java
@@ -401,7 +401,7 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
AssignIpAddressFromPodVlanSearch.join("vlan", podVlanSearch, podVlanSearch.entity().getId(), AssignIpAddressFromPodVlanSearch.entity().getVlanId(), JoinType.INNER);
AssignIpAddressFromPodVlanSearch.done();
- Network.State.getStateMachine().registerListener(new NetworkStateListener(_usageEventDao, _networksDao, _configDao));
+ Network.State.getStateMachine().registerListener(new NetworkStateListener(_configDao));
s_logger.info("Network Manager is configured.");
[2/2] git commit: updated refs/heads/master to de436ac
Posted by bh...@apache.org.
Merge pull request #1261 from rafaelweingartner/lrg-cs-hackday-19
Removed unused variables from "NetworkStateListener" classWe removed the following variables from "com.cloud.network.NetworkStateListener"
. UsageEventDao _usageEventDao
. NetworkDao _networkDao
We changed the EventBus s_eventBus variable to private, the constructor not to use those variables and applied this change in classes com.cloud.network.IpAddressManagerImpl and org.apache.cloudstack.engine.orchestration.NetworkOrchestrator
* pr/1261:
Removed unused variables from class NetworkStateListener
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/de436aca
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/de436aca
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/de436aca
Branch: refs/heads/master
Commit: de436acac8a7c8cf6193a377cc0b00e4377b8a0e
Parents: 32fe308 5d3adb3
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Jan 27 16:26:44 2016 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Jan 27 16:26:45 2016 +0100
----------------------------------------------------------------------
.../com/cloud/network/NetworkStateListener.java | 21 ++++++--------------
.../orchestration/NetworkOrchestrator.java | 2 +-
.../com/cloud/network/IpAddressManagerImpl.java | 2 +-
3 files changed, 8 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de436aca/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
----------------------------------------------------------------------