check if a source NAT IP address is needed before assigning one

Author: Daan Hoogland

server/src/main/java/com/cloud/network/IpAddressManagerImpl.java

@@ -205,20 +205,12 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
     @Inject
     AccountDao _accountDao;
     @Inject
-    DomainDao _domainDao;
-    @Inject
     UserDao _userDao;
     @Inject
     ConfigurationDao _configDao;
     @Inject
-    UserVmDao _userVmDao;
-    @Inject
-    AlertManager _alertMgr;
-    @Inject
     AccountManager _accountMgr;
     @Inject
-    ConfigurationManager _configMgr;
-    @Inject
     AccountVlanMapDao _accountVlanMapDao;
     @Inject
     DomainVlanMapDao _domainVlanMapDao;
@@ -229,8 +221,6 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
     @Inject
     NetworkDetailsDao _networkDetailsDao;
     @Inject
-    NicDao _nicDao;
-    @Inject
     RulesManager _rulesMgr;
     @Inject
     LoadBalancingRulesManager _lbMgr;
@@ -239,22 +229,10 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
     @Inject
     PodVlanMapDao _podVlanMapDao;
     @Inject
-    NetworkOfferingDetailsDao _ntwkOffDetailsDao;
-    @Inject
-    AccountGuestVlanMapDao _accountGuestVlanMapDao;
-    @Inject
-    DataCenterVnetDao _datacenterVnetDao;
-    @Inject
-    NetworkAccountDao _networkAccountDao;
-    @Inject
     protected NicIpAliasDao _nicIpAliasDao;
     @Inject
     protected IPAddressDao _publicIpAddressDao;
     @Inject
-    NetworkDomainDao _networkDomainDao;
-    @Inject
-    VMInstanceDao _vmDao;
-    @Inject
     FirewallManager _firewallMgr;
     @Inject
     FirewallRulesDao _firewallDao;
@@ -268,36 +246,10 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
     @Inject
     PhysicalNetworkDao _physicalNetworkDao;
     @Inject
-    PhysicalNetworkServiceProviderDao _pNSPDao;
-    @Inject
-    PortForwardingRulesDao _portForwardingRulesDao;
-    @Inject
-    LoadBalancerDao _lbDao;
-    @Inject
-    PhysicalNetworkTrafficTypeDao _pNTrafficTypeDao;
-    @Inject
-    AgentManager _agentMgr;
-    @Inject
-    HostDao _hostDao;
-    @Inject
-    NetworkServiceMapDao _ntwkSrvcDao;
-    @Inject
-    StorageNetworkManager _stnwMgr;
-    @Inject
     VpcManager _vpcMgr;
     @Inject
-    PrivateIpDao _privateIpDao;
-    @Inject
-    NetworkACLManager _networkACLMgr;
-    @Inject
-    UsageEventDao _usageEventDao;
-    @Inject
     NetworkModel _networkModel;
     @Inject
-    NicSecondaryIpDao _nicSecondaryIpDao;
-    @Inject
-    UserIpv6AddressDao _ipv6Dao;
-    @Inject
     Ipv6AddressManager _ipv6Mgr;
     @Inject
     PortableIpDao _portableIpDao;
@@ -1102,7 +1054,7 @@ public PublicIp assignSourceNatIpAddressToGuestNetwork(Account owner, Network gu
         IPAddressVO sourceNatIp = getExistingSourceNatInNetwork(owner.getId(), guestNetwork.getId());
 
         PublicIp ipToReturn = null;
-        if (sourceNatIp != null) {
+        if (sourceNatIp != null || isRouted(guestNetwork)) {
             ipToReturn = PublicIp.createFromAddrAndVlan(sourceNatIp, _vlanDao.findById(sourceNatIp.getVlanId()));
         } else {
             ipToReturn = assignDedicateIpAddress(owner, guestNetwork.getId(), null, dcId, true);
@@ -1111,6 +1063,15 @@ public PublicIp assignSourceNatIpAddressToGuestNetwork(Account owner, Network gu
         return ipToReturn;
     }
 
+    private boolean isRouted(Network guestNetwork) {
+        VpcOffering vpcOffer = null;
+        NetworkOffering netOffer = _networkOfferingDao.findById(guestNetwork.getNetworkOfferingId());
+        if (netOffer.isForVpc()) {
+            vpcOffer = vpcOfferingDao.findById(guestNetwork.getVpcId());
+        }
+        return netOffer.getRoutingMode() != null || (vpcOffer != null && vpcOffer.getRoutingMode() != null);
+    }
+
     @DB
     @Override
     public PublicIp assignDedicateIpAddress(Account owner, final Long guestNtwkId, final Long vpcId, final long dcId, final boolean isSourceNat)
@@ -1633,7 +1594,7 @@ private static void validateNetworkAndIpOwnership(Account owner, IPAddressVO ipT
      */
     protected boolean isSourceNatAvailableForNetwork(Account owner, IPAddressVO ipToAssoc, Network network) {
         NetworkOffering offering = _networkOfferingDao.findById(network.getNetworkOfferingId());
-        boolean sharedSourceNat = offering.isSharedSourceNat();
+        boolean sharedSourceNat = offering.isSharedSourceNat() || offering.getRoutingMode() != null;
         boolean isSourceNat = false;
         if (!sharedSourceNat) {
             if (getExistingSourceNatInNetwork(owner.getId(), network.getId()) == null) {