CLOUDSTACK-6205: VPC VR start - skip private gateway when create Guest nics as the nic for the private gateway is being created separately

Alena Prokharchyk · Alena Prokharchyk · commit d9e1c9c5025b · 2014-03-14T11:57:58.000-07:00
Conflicts:
	server/src/com/cloud/network/NetworkModelImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
diff --git a/api/src/com/cloud/network/NetworkModel.java b/api/src/com/cloud/network/NetworkModel.java
@@ -199,10 +199,10 @@ public interface NetworkModel {
     List<? extends PhysicalNetwork> getPhysicalNtwksSupportingTrafficType(long zoneId, TrafficType trafficType);
 
     /**
-     * @param guestNic
+     * @param ntwkId
      * @return
      */
-    boolean isPrivateGateway(Nic guestNic);
+    boolean isPrivateGateway(long ntwkId);
 
     Map<Service, Map<Capability, String>> getNetworkCapabilities(long networkId);
 
diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -1671,8 +1671,8 @@ public List<? extends PhysicalNetwork> getPhysicalNtwksSupportingTrafficType(lon
     }
 
     @Override
-    public boolean isPrivateGateway(Nic guestNic) {
-        Network network = getNetwork(guestNic.getNetworkId());
+    public boolean isPrivateGateway(long ntwkId) {
+        Network network = getNetwork(ntwkId);
         if (network.getTrafficType() != TrafficType.Guest || network.getNetworkOfferingId() != s_privateOfferingId.longValue()) {
             return false;
         }
diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -782,8 +782,7 @@ public boolean finalizeCommandsOnStart(Commands cmds, VirtualMachineProfile prof
                 //plug guest nic
                 PlugNicCommand plugNicCmd = new PlugNicCommand(getNicTO(router, guestNic.getNetworkId(), null), router.getInstanceName(), router.getType());
                 cmds.addCommand(plugNicCmd);
-
-                if (!_networkModel.isPrivateGateway(guestNic)) {
+                if (!_networkModel.isPrivateGateway(guestNic.getNetworkId())) {
                     //set guest network
                     VirtualMachine vm = _vmDao.findById(router.getId());
                     NicProfile nicProfile = _networkModel.getNicProfile(vm, guestNic.getNetworkId(), null);
@@ -1210,6 +1209,9 @@ protected LinkedHashMap<Network, List<? extends NicProfile>> createVpcRouterNetw
         //3) allocate nic for guest gateway if needed
         List<? extends Network> guestNetworks = _vpcMgr.getVpcNetworks(vpcId);
         for (Network guestNetwork : guestNetworks) {
+            if (_networkModel.isPrivateGateway(guestNetwork.getId())) {
+                continue;
+            }
             if (guestNetwork.getState() == Network.State.Implemented || guestNetwork.getState() == Network.State.Setup) {
                 NicProfile guestNic = createGuestNicProfileForVpcRouter(guestNetwork);
                 networks.put(guestNetwork, new ArrayList<NicProfile>(Arrays.asList(guestNic)));
diff --git a/server/test/com/cloud/network/MockNetworkModelImpl.java b/server/test/com/cloud/network/MockNetworkModelImpl.java
@@ -591,7 +591,7 @@ public List<? extends PhysicalNetwork> getPhysicalNtwksSupportingTrafficType(lon
      * @see com.cloud.network.NetworkModel#isPrivateGateway(com.cloud.vm.Nic)
      */
     @Override
-    public boolean isPrivateGateway(Nic guestNic) {
+    public boolean isPrivateGateway(long ntwkId) {
         // TODO Auto-generated method stub
         return false;
     }
diff --git a/server/test/com/cloud/vpc/MockNetworkModelImpl.java b/server/test/com/cloud/vpc/MockNetworkModelImpl.java
@@ -607,7 +607,7 @@ public List<? extends PhysicalNetwork> getPhysicalNtwksSupportingTrafficType(lon
      * @see com.cloud.network.NetworkModel#isPrivateGateway(com.cloud.vm.Nic)
      */
     @Override
-    public boolean isPrivateGateway(Nic guestNic) {
+    public boolean isPrivateGateway(long ntwkId) {
         // TODO Auto-generated method stub
         return false;
     }

Original file line number	Diff line number	Diff line change
`@@ -1671,8 +1671,8 @@ public List<? extends PhysicalNetwork> getPhysicalNtwksSupportingTrafficType(lon`
`1671`	`1671`	`}`
`1672`	`1672`
`1673`	`1673`	`@Override`
`1674`		`- public boolean isPrivateGateway(Nic guestNic) {`
`1675`		`- Network network = getNetwork(guestNic.getNetworkId());`
	`1674`	`+ public boolean isPrivateGateway(long ntwkId) {`
	`1675`	`+ Network network = getNetwork(ntwkId);`
`1676`	`1676`	`if (network.getTrafficType() != TrafficType.Guest \|\| network.getNetworkOfferingId() != s_privateOfferingId.longValue()) {`
`1677`	`1677`	`return false;`
`1678`	`1678`	`}`
Original file line number	Diff line number	Diff line change
`@@ -591,7 +591,7 @@ public List<? extends PhysicalNetwork> getPhysicalNtwksSupportingTrafficType(lon`
`591`	`591`	`* @see com.cloud.network.NetworkModel#isPrivateGateway(com.cloud.vm.Nic)`
`592`	`592`	`*/`
`593`	`593`	`@Override`
`594`		`- public boolean isPrivateGateway(Nic guestNic) {`
	`594`	`+ public boolean isPrivateGateway(long ntwkId) {`
`595`	`595`	`// TODO Auto-generated method stub`
`596`	`596`	`return false;`
`597`	`597`	`}`
Original file line number	Diff line number	Diff line change
`@@ -607,7 +607,7 @@ public List<? extends PhysicalNetwork> getPhysicalNtwksSupportingTrafficType(lon`
`607`	`607`	`* @see com.cloud.network.NetworkModel#isPrivateGateway(com.cloud.vm.Nic)`
`608`	`608`	`*/`
`609`	`609`	`@Override`
`610`		`- public boolean isPrivateGateway(Nic guestNic) {`
	`610`	`+ public boolean isPrivateGateway(long ntwkId) {`
`611`	`611`	`// TODO Auto-generated method stub`
`612`	`612`	`return false;`
`613`	`613`	`}`