From a98253296ad8d66d19c519305cc90e3af5354aa5 Mon Sep 17 00:00:00 2001
From: Antonio Fornie <afornie@schubergphilis.com>
Date: Tue, 15 Jul 2014 04:54:58 -0500
Subject: [PATCH] Temporary put state info in a state object

---
 .../router/VirtualNetworkApplianceManagerImpl.java       | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 49f13044eee..1ca99f2f5be 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -436,8 +436,6 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> {
     ScheduledExecutorService _networkStatsUpdateExecutor;
     ExecutorService _rvrStatusUpdateExecutor;
 
-    Account _systemAcct;
-
     BlockingQueue<Long> _vrUpdateQueue = null;
 
     @Override
@@ -751,7 +749,7 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> {
             throw new ConfigurationException(msg);
         }
 
-        _systemAcct = _accountMgr.getSystemAccount();
+        VirtualNwStatus.account = _accountMgr.getSystemAccount();
 
         final String aggregationRange = configs.get("usage.stats.job.aggregation.range");
         _usageAggregationRange = NumbersUtil.parseInt(aggregationRange, 1440);
@@ -1789,7 +1787,7 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> {
         s_logger.debug("Adding nic for Virtual Router in Control network ");
         final List<? extends NetworkOffering> offerings = _networkModel.getSystemAccountNetworkOfferings(NetworkOffering.SystemControlNetwork);
         final NetworkOffering controlOffering = offerings.get(0);
-        final Network controlConfig = _networkMgr.setupNetwork(_systemAcct, controlOffering, routerDeploymentDefinition.getPlan(), null, null, false).get(0);
+        final Network controlConfig = _networkMgr.setupNetwork(VirtualNwStatus.account, controlOffering, routerDeploymentDefinition.getPlan(), null, null, false).get(0);
         networks.put(controlConfig, new ArrayList<NicProfile>());
         // 3) Public network
         if (setupPublicNetwork) {
@@ -1818,7 +1816,8 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> {
                 defaultNic.setDeviceId(2);
             }
             final NetworkOffering publicOffering = _networkModel.getSystemAccountNetworkOfferings(NetworkOffering.SystemPublicNetwork).get(0);
-            final List<? extends Network> publicNetworks = _networkMgr.setupNetwork(_systemAcct, publicOffering, routerDeploymentDefinition.getPlan(), null, null, false);
+            final List<? extends Network> publicNetworks = _networkMgr.setupNetwork(VirtualNwStatus.account, publicOffering, routerDeploymentDefinition.getPlan(), null, null,
+                    false);
             final String publicIp = defaultNic.getIp4Address();
             // We want to use the identical MAC address for RvR on public
             // interface if possible