Updated Branches: refs/heads/vpc ef8208af0 -> 4dd71cb63
VPC: CS-15562 - get info about VR's guest networks from nics table Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4dd71cb6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4dd71cb6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4dd71cb6 Branch: refs/heads/vpc Commit: 4dd71cb63594771249e28315595dc4d722d96da8 Parents: 534e6d4 Author: Alena Prokharchyk <[email protected]> Authored: Fri Jul 13 13:06:36 2012 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Fri Jul 13 13:35:18 2012 -0700 ---------------------------------------------------------------------- .../network/firewall/FirewallManagerImpl.java | 2 +- .../VpcVirtualNetworkApplianceManagerImpl.java | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4dd71cb6/server/src/com/cloud/network/firewall/FirewallManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java index aa29740..53741b9 100644 --- a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java +++ b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java @@ -585,7 +585,7 @@ public class FirewallManagerImpl implements FirewallService, FirewallManager, Ma for (FirewallRuleVO rule : fwRules) { // Mark all Firewall rules as Revoke, but don't revoke them yet - we have to revoke all rules for ip, no -// need to send them one by one + // need to send them one by one revokeFirewallRule(rule.getId(), false, caller, Account.ACCOUNT_ID_SYSTEM); } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4dd71cb6/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java index e3db7c1..d893510 100644 --- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java @@ -776,7 +776,6 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian finalizeSshAndVersionAndNetworkUsageOnStart(cmds, profile, router, controlNic); - //2) FORM PLUG NIC COMMANDS Map<Nic, Network> guestNics = new HashMap<Nic, Network>(); Map<Nic, Network> publicNics = new HashMap<Nic, Network>(); @@ -894,14 +893,13 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian throw new CloudRuntimeException("Cannot find related provider of virtual router provider: " + vrProvider.getType().toString()); } - List<Long> routerGuestNtwkIds = _routerDao.getRouterNetworks(router.getId()); - for (Long guestNetworkId : routerGuestNtwkIds) { + for (Nic nic : guestNics.keySet()) { if (reprogramGuestNtwks) { - finalizeIpAssocForNetwork(cmds, router, provider, guestNetworkId); - finalizeNetworkRulesForNetwork(cmds, router, provider, guestNetworkId); + finalizeIpAssocForNetwork(cmds, router, provider, nic.getNetworkId()); + finalizeNetworkRulesForNetwork(cmds, router, provider, nic.getNetworkId()); } - finalizeUserDataAndDhcpOnStart(cmds, router, provider, guestNetworkId); + finalizeUserDataAndDhcpOnStart(cmds, router, provider, nic.getNetworkId()); } return true;
