You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2014/03/07 00:27:30 UTC
git commit: updated refs/heads/4.3 to 21172a2
Repository: cloudstack
Updated Branches:
refs/heads/4.3 e0e13434b -> 21172a2dc
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
(cherry picked from commit d009c8c7b229a1bb02834f52d9cac17f46e33349)
Signed-off-by: Animesh Chaturvedi <an...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/21172a2d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/21172a2d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/21172a2d
Branch: refs/heads/4.3
Commit: 21172a2dc5722fed89c345783ed1f604579d24af
Parents: e0e1343
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Wed Mar 5 15:38:45 2014 -0800
Committer: Animesh Chaturvedi <an...@apache.org>
Committed: Thu Mar 6 15:17:26 2014 -0800
----------------------------------------------------------------------
.../network/router/VpcVirtualNetworkApplianceManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/21172a2d/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 620add3..c2c0e5f 100644
--- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -1210,7 +1210,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)));
}