From 04ed3884d008870abb92972752c2826d8d35ac1c Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Fri, 20 Jul 2012 14:35:39 -0700 Subject: [PATCH] CS-15622: always get router info from the DB --- .../router/VirtualNetworkApplianceManagerImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index 43ca02663e7..1d82ba4913a 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -2610,11 +2610,11 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian LoadBalancerTO lb = new LoadBalancerTO(srcIp, srcPort, protocol, algorithm, revoked, false, destinations, stickinessPolicies); lbs[i++] = lb; } - String RouterPublicIp = null; + String routerPublicIp = null; if (router instanceof DomainRouterVO) { - DomainRouterVO domr = (DomainRouterVO)router; - RouterPublicIp = domr.getPublicIpAddress(); + DomainRouterVO domr = _routerDao.findById(router.getId()); + routerPublicIp = domr.getPublicIpAddress(); } Network guestNetwork = _networkMgr.getNetwork(guestNetworkId); @@ -2624,7 +2624,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian _networkMgr.isSecurityGroupSupportedInNetwork(guestNetwork), _networkMgr.getNetworkTag(router.getHypervisorType(), guestNetwork)); - LoadBalancerConfigCommand cmd = new LoadBalancerConfigCommand(lbs,RouterPublicIp, + LoadBalancerConfigCommand cmd = new LoadBalancerConfigCommand(lbs,routerPublicIp, getRouterIpInNetwork(guestNetworkId, router.getId()),router.getPrivateIpAddress(), _itMgr.toNicTO(nicProfile, router.getHypervisorType()), router.getVpcId());