From 5923659dba909010d18037df0fde99c248ef8d91 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Wed, 11 Jul 2012 15:03:57 -0700 Subject: [PATCH] VPC: CS-15548 - don't plug the nic for guest network to router when network not in Implemented state --- .../router/VpcVirtualNetworkApplianceManagerImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java index e81a6376014..e3db7c1c486 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 guestNetworks = _vpcMgr.getVpcNetworks(vpcId); for (Network guestNetwork : guestNetworks) { - NicProfile guestNic = createGuestNicProfileForVpcRouter(guestNetwork); - networks.add(new Pair((NetworkVO) guestNetwork, guestNic)); + if (guestNetwork.getState() == Network.State.Implemented) { + NicProfile guestNic = createGuestNicProfileForVpcRouter(guestNetwork); + networks.add(new Pair((NetworkVO) guestNetwork, guestNic)); + } } return networks;