You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ap...@apache.org on 2013/11/29 08:50:44 UTC
git commit: updated refs/heads/master to 36201b9
Updated Branches:
refs/heads/master 6bda2739c -> 36201b977
Fix issue with sourceCidr not being passed to the VRouter on start.
Signed-off-by: Abhinandan Prateek <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/36201b97
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/36201b97
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/36201b97
Branch: refs/heads/master
Commit: 36201b9776d3e48fd7832a4dc21136f83524379f
Parents: 6bda273
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Mon Nov 25 22:55:12 2013 +0100
Committer: Abhinandan Prateek <ap...@apache.org>
Committed: Fri Nov 29 13:20:12 2013 +0530
----------------------------------------------------------------------
.../network/router/VirtualNetworkApplianceManagerImpl.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36201b97/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 4bbc872..d5b9d3c 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -202,6 +202,7 @@ import com.cloud.network.router.VirtualRouter.Role;
import com.cloud.network.rules.FirewallRule;
import com.cloud.network.rules.FirewallRule.Purpose;
import com.cloud.network.rules.LoadBalancerContainer.Scheme;
+import com.cloud.network.rules.FirewallRuleVO;
import com.cloud.network.rules.PortForwardingRule;
import com.cloud.network.rules.RulesManager;
import com.cloud.network.rules.StaticNat;
@@ -2788,9 +2789,6 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
UserVmVO vm = _userVmDao.findById(profile.getId());
_userVmDao.loadDetails(vm);
- final boolean isZoneBasic = (dest.getDataCenter().getNetworkType() == NetworkType.Basic);
- final Long podId = isZoneBasic ? dest.getPod().getId() : null;
-
//Asuming we have only one router per network For Now.
DomainRouterVO router = routers.get(0);
if (router.getState() != State.Running) {
@@ -2820,7 +2818,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
if (ipInVmsubnet == false) {
try {
if (network.getTrafficType() == TrafficType.Guest && network.getGuestType() == GuestType.Shared) {
- Pod pod = _podDao.findById(vm.getPodIdToDeployIn());
+ _podDao.findById(vm.getPodIdToDeployIn());
Account caller = CallContext.current().getCallingAccount();
List<VlanVO> vlanList = _vlanDao.listVlansByNetworkIdAndGateway(network.getId(), nic.getGateway());
List<Long> vlanDbIdList = new ArrayList<Long>();
@@ -3471,7 +3469,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
ipList.add(DhcpTO);
ipAliasVO.setVmId(router.getId());
}
- DataCenterVO dcvo = _dcDao.findById(router.getDataCenterId());
+ _dcDao.findById(router.getDataCenterId());
DnsMasqConfigCommand dnsMasqConfigCmd = new DnsMasqConfigCommand(ipList);
dnsMasqConfigCmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, getRouterControlIp(router.getId()));
dnsMasqConfigCmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());
@@ -3719,6 +3717,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
}
rulesTO = new ArrayList<FirewallRuleTO>();
for (FirewallRule rule : rules) {
+ _rulesDao.loadSourceCidrs((FirewallRuleVO)rule);
FirewallRule.TrafficType traffictype = rule.getTrafficType();
if (traffictype == FirewallRule.TrafficType.Ingress) {
IpAddress sourceIp = _networkModel.getIp(rule.getSourceIpAddressId());