From 0dc959c23ffba53e152c545f52c46851afb78c6f Mon Sep 17 00:00:00 2001 From: abhishek Date: Fri, 21 Jan 2011 17:02:37 -0800 Subject: [PATCH] removing guest ip address during ip assoc from java layer --- .../cloud/hypervisor/xen/resource/CitrixResourceBase.java | 5 ----- .../network/router/VirtualNetworkApplianceManagerImpl.java | 3 --- 2 files changed, 8 deletions(-) diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index 474f426bf65..d1e6acbcc21 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -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."); diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index 1b38fdf2156..eeb1f6faaa6 100644 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -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());