etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removing guest ip address during ip assoc from java layer

This commit is contained in:
abhishek 2011-01-21 17:02:37 -08:00
parent e56accb970
commit 0dc959c23f
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1330,11 +1330,6 @@ public abstract class CitrixResourceBase implements ServerResource {
args += " -g ";
args += vlanGateway;
if(guestIp!=null){
args += " -G ";
args += guestIp;
}
String result = callHostPlugin(conn, "vmops", "ipassoc", "args", args);
if (result == null || result.isEmpty()) {
throw new InternalErrorException("Xen plugin \"ipassoc\" failed.");

3
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View File

@ -1495,9 +1495,6 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
String vifMacAddress = ipAddr.getMacAddress();
String vmGuestAddress = null;
if(vmId!=0){
vmGuestAddress = _vmDao.findById(vmId).getGuestIpAddress();
}
//Get network rate - required for IpAssoc
Network network = _networkMgr.getNetwork(ipAddr.getNetworkId());