You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/07/21 02:09:34 UTC
[4/5] git commit: CS-15622: always get router info from the DB
CS-15622: always get router info from the DB
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/cf895d34
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/cf895d34
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/cf895d34
Branch: refs/heads/vpc
Commit: cf895d34d286443a806795506776a2cec78ad456
Parents: 2b7ec3f
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Fri Jul 20 14:35:39 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Fri Jul 20 17:12:34 2012 -0700
----------------------------------------------------------------------
.../router/VirtualNetworkApplianceManagerImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf895d34/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 9c52a2a..93f1baf 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -2629,11 +2629,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);
@@ -2643,7 +2643,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());