cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject [18/50] git commit: updated refs/heads/4.3 to f304df0
Date Wed, 04 Jun 2014 23:50:30 GMT
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/8fdf941c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8fdf941c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8fdf941c

Branch: refs/heads/4.3
Commit: 8fdf941cc369284029f15b1b4cd36416eb57c16d
Parents: 1e5415d
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Wed Mar 5 15:38:45 2014 -0800
Committer: ng.tuna@gmail.com <apple@Tuna.local>
Committed: Fri Mar 7 01:08:01 2014 +0700

----------------------------------------------------------------------
 .../network/router/VpcVirtualNetworkApplianceManagerImpl.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8fdf941c/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)));
             }


Mime
View raw message