VPC: CS-15548 - don't plug the nic for guest network to router when network not in Implemented state
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5923659d Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5923659d Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5923659d Branch: refs/heads/vpc Commit: 5923659dba909010d18037df0fde99c248ef8d91 Parents: b15c257 Author: Alena Prokharchyk <[email protected]> Authored: Wed Jul 11 15:03:57 2012 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Fri Jul 13 13:25:56 2012 -0700 ---------------------------------------------------------------------- .../VpcVirtualNetworkApplianceManagerImpl.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5923659d/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 e81a637..e3db7c1 100644 --- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java @@ -1192,8 +1192,10 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian //2) allocate nic for guest gateway if needed List<? extends Network> guestNetworks = _vpcMgr.getVpcNetworks(vpcId); for (Network guestNetwork : guestNetworks) { - NicProfile guestNic = createGuestNicProfileForVpcRouter(guestNetwork); - networks.add(new Pair<NetworkVO, NicProfile>((NetworkVO) guestNetwork, guestNic)); + if (guestNetwork.getState() == Network.State.Implemented) { + NicProfile guestNic = createGuestNicProfileForVpcRouter(guestNetwork); + networks.add(new Pair<NetworkVO, NicProfile>((NetworkVO) guestNetwork, guestNic)); + } } return networks;
