apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 6446: do not pass private, guest, public network in host_detail to CitrixResourceBase.configure

Browse Source 
status 6446: resolved fixed
This commit is contained in:
anthony 2010-10-06 18:16:19 -07:00
parent 62a2732c19
commit 48f1264a80
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -3901,7 +3901,10 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
s_logger.warn("Unable to get private network " + name); s_logger.warn("Unable to get private network " + name);
return false; return false;
} }
} else {
_privateNetworkName = name;
} }
_host.privatePif = privateNic.pr.uuid; _host.privatePif = privateNic.pr.uuid;
_host.privateNetwork = privateNic.nr.uuid; _host.privateNetwork = privateNic.nr.uuid;

22
server/src/com/cloud/agent/manager/AgentManagerImpl.java
View File

@ -70,6 +70,7 @@ import com.cloud.agent.transport.Response;
import com.cloud.alert.AlertManager; import com.cloud.alert.AlertManager;
import com.cloud.capacity.CapacityVO; import com.cloud.capacity.CapacityVO;
import com.cloud.capacity.dao.CapacityDao; import com.cloud.capacity.dao.CapacityDao;
import com.cloud.configuration.Config;
import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.dc.ClusterVO; import com.cloud.dc.ClusterVO;
import com.cloud.dc.DataCenter; import com.cloud.dc.DataCenter;
@ -213,6 +214,13 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory {
@Inject @Inject
protected UpgradeManager _upgradeMgr = null; protected UpgradeManager _upgradeMgr = null;
private String _publicNic;
private String _privateNic;
private String _guestNic;
private String _storageNic1;
private String _storageNic2;
protected int _retry = 2; protected int _retry = 2;
protected String _name; protected String _name;
@ -252,6 +260,14 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory {
final Map<String, String> configs = configDao.getConfiguration("AgentManager", params); 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); _port = NumbersUtil.parseInt(configs.get("port"), 8250);
final int workers = NumbersUtil.parseInt(configs.get("workers"), 5); final int workers = NumbersUtil.parseInt(configs.get("workers"), 5);
@ -986,6 +1002,12 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory {
params.putAll(host.getDetails()); params.putAll(host.getDetails());
// private.network.device may change when reconnect // private.network.device may change when reconnect
params.remove("private.network.device"); 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("guid", host.getGuid());
params.put("zone", Long.toString(host.getDataCenterId())); params.put("zone", Long.toString(host.getDataCenterId()));
if (host.getPodId() != null) { if (host.getPodId() != null) {