You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2014/03/06 00:47:16 UTC
git commit: updated refs/heads/4.3-forward to d009c8c
Repository: cloudstack
Updated Branches:
refs/heads/4.3-forward 844ebab3f -> d009c8c7b
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/d009c8c7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d009c8c7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d009c8c7
Branch: refs/heads/4.3-forward
Commit: d009c8c7b229a1bb02834f52d9cac17f46e33349
Parents: 844ebab
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Wed Mar 5 15:38:45 2014 -0800
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Wed Mar 5 15:40:25 2014 -0800
----------------------------------------------------------------------
.../network/router/VpcVirtualNetworkApplianceManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d009c8c7/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)));
}