giving diff ip to VR

JayapalUradi · Abhinandan Prateek · commit 98ae204972e9 · 2012-08-17T13:49:39.000+05:30
Signed-off-by: Abhinandan Prateek &lt;aprateek@apache.org&gt;
diff --git a/server/src/com/cloud/network/guru/GuestNetworkGuru.java b/server/src/com/cloud/network/guru/GuestNetworkGuru.java
@@ -73,6 +73,8 @@
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.dao.NicDao;
+import com.cloud.network.Network.Provider;
+import com.cloud.network.Network.Service;
 
 @Local(value = NetworkGuru.class)
 public abstract class GuestNetworkGuru extends AdapterBase implements NetworkGuru {
@@ -361,16 +363,29 @@ public NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfil
         if (nic.getIp4Address() == null) {
             nic.setBroadcastUri(network.getBroadcastUri());
             nic.setIsolationUri(network.getBroadcastUri());
+            nic.setGateway(network.getGateway()); 
 
             String guestIp = null;
             if (network.getSpecifyIpRanges()) {
                 _networkMgr.allocateDirectIp(nic, dc, vm, network, nic.getRequestedIp());
             } else {
-                //if Vm is router vm, set ip4 to the network gateway
+                //if Vm is router vm and source nat is enabled in the network, set ip4 to the network gateway
+                boolean isGateway = false;
                 if (vm.getVirtualMachine().getType() == VirtualMachine.Type.DomainRouter) {
+                    if (network.getVpcId() != null) {
+                        if (_networkMgr.isProviderSupportServiceInNetwork(nic.getNetworkId(), Service.SourceNat, Provider.VPCVirtualRouter)) {
+                            isGateway = true;
+                        }
+                    } else {
+                        if (_networkMgr.isProviderSupportServiceInNetwork(nic.getNetworkId(), Service.SourceNat, Provider.VirtualRouter)) {
+                            isGateway = true;
+                        }
+                    }
+                }
+                
+                if (isGateway) {
                     guestIp = network.getGateway();
                 } else {
-                    nic.setGateway(network.getGateway());
                     guestIp = _networkMgr.acquireGuestIpAddress(network, nic.getRequestedIp());
                     if (guestIp == null) {
                         throw new InsufficientVirtualNetworkCapcityException("Unable to acquire Guest IP" +
