Updated Branches: refs/heads/4.2 04adfe431 -> 224c48a76
Fix issue with sourceCidr not being passed to the VRouter on start Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/224c48a7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/224c48a7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/224c48a7 Branch: refs/heads/4.2 Commit: 224c48a76e3325598dda3d4eec95249fedfad5b3 Parents: 04adfe4 Author: Abhinandan Prateek <aprat...@apache.org> Authored: Fri Nov 29 14:15:12 2013 +0530 Committer: Abhinandan Prateek <aprat...@apache.org> Committed: Fri Nov 29 14:15:12 2013 +0530 ---------------------------------------------------------------------- .../network/router/VirtualNetworkApplianceManagerImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/224c48a7/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 2baf35b..13dfb01 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -189,6 +189,7 @@ import com.cloud.network.rules.StaticNat; import com.cloud.network.rules.StaticNatImpl; import com.cloud.network.rules.StaticNatRule; import com.cloud.network.rules.dao.PortForwardingRulesDao; +import com.cloud.network.rules.FirewallRuleVO; import com.cloud.network.vpn.Site2SiteVpnManager; import com.cloud.offering.NetworkOffering; import com.cloud.offering.ServiceOffering; @@ -2794,12 +2795,11 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V } @Override - public boolean configDhcpForSubnet(Network network, final NicProfile nic, VirtualMachineProfile<UserVm> profile, DeployDestination dest, List<DomainRouterVO> routers) throws ResourceUnavailableException { + public boolean configDhcpForSubnet(Network network, final NicProfile nic, VirtualMachineProfile<UserVm> profile, DeployDestination dest, List<DomainRouterVO> routers) + throws ResourceUnavailableException { _userVmDao.loadDetails((UserVmVO) profile.getVirtualMachine()); final VirtualMachineProfile<UserVm> updatedProfile = profile; - 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); @@ -3732,6 +3732,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());
