Repository: cloudstack Updated Branches: refs/heads/master 922cdc0dd -> d1c0b81dc
CLOUDSTACK-6205: VPC VR start - when create guest nics for the VR, consider networks not only in Implemented state, but in Setup state as well Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d1c0b81d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d1c0b81d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d1c0b81d Branch: refs/heads/master Commit: d1c0b81dc1b11b1039627d0c400e9e6bfc70d2a8 Parents: 922cdc0 Author: Alena Prokharchyk <alena.prokharc...@citrix.com> Authored: Wed Mar 5 15:38:45 2014 -0800 Committer: Alena Prokharchyk <alena.prokharc...@citrix.com> Committed: Wed Mar 5 15:39:34 2014 -0800 ---------------------------------------------------------------------- .../network/router/VpcVirtualNetworkApplianceManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d1c0b81d/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 f6bd9e1..bed30df 100644 --- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java @@ -1178,7 +1178,7 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian //3) allocate nic for guest gateway if needed List<? extends Network> guestNetworks = _vpcMgr.getVpcNetworks(vpcId); for (Network guestNetwork : guestNetworks) { - if (guestNetwork.getState() == Network.State.Implemented) { + if (guestNetwork.getState() == Network.State.Implemented || guestNetwork.getState() == Network.State.Setup) { NicProfile guestNic = createGuestNicProfileForVpcRouter(guestNetwork); networks.put(guestNetwork, new ArrayList<NicProfile>(Arrays.asList(guestNic))); }
