From 4ce137ef2e3e4403068a35c3d18d2eff54567df6 Mon Sep 17 00:00:00 2001 From: keshav Date: Thu, 21 Jul 2011 16:44:13 -0700 Subject: [PATCH] Added account ID to IpAddressTO and NetworkElementCommand. --- .../cloud/agent/api/routing/NetworkElementCommand.java | 2 ++ api/src/com/cloud/agent/api/to/IpAddressTO.java | 10 ++++++++-- .../router/VirtualNetworkApplianceManagerImpl.java | 6 ++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/api/src/com/cloud/agent/api/routing/NetworkElementCommand.java b/api/src/com/cloud/agent/api/routing/NetworkElementCommand.java index ba812dadda3..9f40e657411 100644 --- a/api/src/com/cloud/agent/api/routing/NetworkElementCommand.java +++ b/api/src/com/cloud/agent/api/routing/NetworkElementCommand.java @@ -24,6 +24,8 @@ import com.cloud.agent.api.Command; public abstract class NetworkElementCommand extends Command { HashMap accessDetails = new HashMap(0); + public static final String ACCOUNT_ID = "account.id"; + public static final String GUEST_NETWORK_CIDR = "guest.network.cidr"; public static final String ROUTER_NAME = "router.name"; public static final String ROUTER_IP = "router.ip"; public static final String ROUTER_GUEST_IP = "router.guest.ip"; diff --git a/api/src/com/cloud/agent/api/to/IpAddressTO.java b/api/src/com/cloud/agent/api/to/IpAddressTO.java index 750757ffa54..9995367cff9 100644 --- a/api/src/com/cloud/agent/api/to/IpAddressTO.java +++ b/api/src/com/cloud/agent/api/to/IpAddressTO.java @@ -25,6 +25,7 @@ import com.cloud.network.Networks.TrafficType; public class IpAddressTO { + private long accountId; private String publicIp; private boolean sourceNat; private boolean add; @@ -39,8 +40,9 @@ public class IpAddressTO { private TrafficType trafficType; private String[] networkTags; - public IpAddressTO(String ipAddress, boolean add, boolean firstIP, boolean sourceNat, String vlanId, String vlanGateway, String vlanNetmask, String vifMacAddress, String guestIp, Integer networkRate) { - this.publicIp = ipAddress; + public IpAddressTO(long accountId, String ipAddress, boolean add, boolean firstIP, boolean sourceNat, String vlanId, String vlanGateway, String vlanNetmask, String vifMacAddress, String guestIp, Integer networkRate) { + this.accountId = accountId; + this.publicIp = ipAddress; this.add = add; this.firstIP = firstIP; this.sourceNat = sourceNat; @@ -54,6 +56,10 @@ public class IpAddressTO { protected IpAddressTO() { } + + public long getAccountId() { + return accountId; + } public String getGuestIp(){ return guestIp; diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index ce3d3ea4aec..485b01ce326 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -1646,8 +1646,10 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian removeUsers.add(user); } } - + VpnUsersCfgCommand cmd = new VpnUsersCfgCommand(addUsers, removeUsers); + cmd.setAccessDetail(NetworkElementCommand.ACCOUNT_ID, String.valueOf(router.getAccountId())); + cmd.setAccessDetail(NetworkElementCommand.GUEST_NETWORK_CIDR, network.getCidr()); cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, router.getPrivateIpAddress()); cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, router.getGuestIpAddress()); cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName()); @@ -1780,7 +1782,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian String vmGuestAddress = null; - IpAddressTO ip = new IpAddressTO(ipAddr.getAddress().addr(), add, firstIP, sourceNat, vlanId, vlanGateway, vlanNetmask, vifMacAddress, vmGuestAddress, networkRate); + IpAddressTO ip = new IpAddressTO(ipAddr.getAccountId(), ipAddr.getAddress().addr(), add, firstIP, sourceNat, vlanId, vlanGateway, vlanNetmask, vifMacAddress, vmGuestAddress, networkRate); ip.setTrafficType(network.getTrafficType()); ip.setNetworkTags(network.getTags()); ipsToSend[i++] = ip;