From 48f1264a80ddf95dd573c1a10e88211c88dd22db Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Wed, 6 Oct 2010 18:16:19 -0700
Subject: [PATCH]     bug 6446: do not pass private, guest, public network in
 host_detail to CitrixResourceBase.configure

    status 6446: resolved fixed
---
 .../xen/resource/CitrixResourceBase.java      |  5 ++++-
 .../cloud/agent/manager/AgentManagerImpl.java | 22 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index c4715640ea1..a4cd31e5ab6 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -3901,7 +3901,10 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
                     s_logger.warn("Unable to get private network " + name);
                     return false;
                 }
-            }         
+            } else {
+                _privateNetworkName = name;
+            }
+
             _host.privatePif = privateNic.pr.uuid;
             _host.privateNetwork = privateNic.nr.uuid;
 
diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
index f33ba2ee421..cd8cf1f5007 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -70,6 +70,7 @@ import com.cloud.agent.transport.Response;
 import com.cloud.alert.AlertManager;
 import com.cloud.capacity.CapacityVO;
 import com.cloud.capacity.dao.CapacityDao;
+import com.cloud.configuration.Config;
 import com.cloud.configuration.dao.ConfigurationDao;
 import com.cloud.dc.ClusterVO;
 import com.cloud.dc.DataCenter;
@@ -213,6 +214,13 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory {
     @Inject
     protected UpgradeManager _upgradeMgr = null;
 
+
+    private String _publicNic;
+    private String _privateNic;
+    private String _guestNic;
+    private String _storageNic1;
+    private String _storageNic2;
+
     protected int _retry = 2;
 
     protected String _name;
@@ -252,6 +260,14 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory {
 
         final Map<String, String> configs = configDao.getConfiguration("AgentManager", params);
 
+        _publicNic = configDao.getValue(Config.XenPublicNetwork.key());
+        _privateNic = configDao.getValue(Config.XenPrivateNetwork.key());
+        _guestNic = configDao.getValue(Config.XenGuestNetwork.key());       
+        _storageNic1 = configDao.getValue(Config.XenStorageNetwork1.key());
+        _storageNic2 = configDao.getValue(Config.XenStorageNetwork2.key());
+
+
+
         _port = NumbersUtil.parseInt(configs.get("port"), 8250);
         final int workers = NumbersUtil.parseInt(configs.get("workers"), 5);
 
@@ -986,6 +1002,12 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory {
         params.putAll(host.getDetails());
         // private.network.device may change when reconnect
         params.remove("private.network.device");
+        params.put("private.network.device", _privateNic);
+        params.remove("public.network.device");
+        params.put("public.network.device", _publicNic);
+        params.remove("guest.network.device");
+        params.put("guest.network.device", _guestNic);
+
         params.put("guid", host.getGuid());
         params.put("zone", Long.toString(host.getDataCenterId()));
         if (host.getPodId() != null) {