CLOUDSTACK-1828 Source Nat on private gateway feature

JayapalUradi · Murali Reddy · commit 1f1467974f77 · 2013-05-02T15:40:15.000+05:30
diff --git a/api/src/com/cloud/network/NetworkService.java b/api/src/com/cloud/network/NetworkService.java
@@ -138,6 +138,7 @@ IpAddress associateIPToNetwork(long ipId, long networkId) throws InsufficientAdd
         ResourceAllocationException, ResourceUnavailableException, ConcurrentOperationException;
 
     /**
+     *
      * @param networkName
      * @param displayText
      * @param physicalNetworkId
@@ -148,13 +149,14 @@ IpAddress associateIPToNetwork(long ipId, long networkId) throws InsufficientAdd
      * @param netmask
      * @param networkOwnerId
      * @param vpcId TODO
+     * @param sourceNat
      * @return
      * @throws InsufficientCapacityException
      * @throws ConcurrentOperationException
      * @throws ResourceAllocationException
      */
     Network createPrivateNetwork(String networkName, String displayText, long physicalNetworkId, String vlan,
-            String startIp, String endIP, String gateway, String netmask, long networkOwnerId, Long vpcId)
+                                 String startIp, String endIP, String gateway, String netmask, long networkOwnerId, Long vpcId, Boolean sourceNat)
                     throws ResourceAllocationException, ConcurrentOperationException, InsufficientCapacityException;
 
     /* Requests an IP address for the guest nic */
diff --git a/api/src/com/cloud/network/vpc/PrivateIp.java b/api/src/com/cloud/network/vpc/PrivateIp.java
@@ -44,5 +44,6 @@ public interface PrivateIp {
     String getMacAddress();
 
     long getNetworkId();
+    boolean getSourceNat();
 
 }
diff --git a/api/src/com/cloud/network/vpc/VpcGateway.java b/api/src/com/cloud/network/vpc/VpcGateway.java
@@ -77,4 +77,8 @@ public enum State {
      * @return
      */
     State getState();
+    /**
+     * @return
+     */
+    boolean getSourceNat();
 }
diff --git a/api/src/com/cloud/network/vpc/VpcService.java b/api/src/com/cloud/network/vpc/VpcService.java
@@ -163,20 +163,22 @@ boolean startVpc(long vpcId, boolean destroyOnFailure) throws ConcurrentOperatio
     /**
      * Persists VPC private gateway in the Database.
      * 
+     *
      * @param vpcId TODO
      * @param physicalNetworkId
      * @param vlan
      * @param ipAddress
      * @param gateway
      * @param netmask
      * @param gatewayOwnerId
+     * @param isSourceNat
      * @return
      * @throws InsufficientCapacityException
      * @throws ConcurrentOperationException
      * @throws ResourceAllocationException
      */
     public PrivateGateway createVpcPrivateGateway(long vpcId, Long physicalNetworkId, String vlan, String ipAddress,
-            String gateway, String netmask, long gatewayOwnerId) throws ResourceAllocationException,
+                                                  String gateway, String netmask, long gatewayOwnerId, Boolean isSourceNat) throws ResourceAllocationException,
             ConcurrentOperationException, InsufficientCapacityException;
 
     /**
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java
@@ -69,6 +69,11 @@ public class CreatePrivateGatewayCmd extends BaseAsyncCreateCmd {
             required=true, description="the VPC network belongs to")
     private Long vpcId;
 
+    @Parameter(name=ApiConstants.SOURCE_NAT_SUPPORTED, type=CommandType.BOOLEAN, required=false,
+            description="source NAT supported value. Default value false. If 'true' source NAT is enabled on the private gateway" +
+                    " 'false': sourcenat is not supported")
+    private Boolean isSourceNat;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -97,6 +102,13 @@ public Long getVpcId() {
         return vpcId;
     }
 
+    public Boolean getIsSourceNat () {
+        if (isSourceNat == null) {
+            return false;
+        }
+        return true;
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
@@ -111,7 +123,7 @@ public void create() throws ResourceAllocationException {
         PrivateGateway result = null;
         try {
             result = _vpcService.createVpcPrivateGateway(getVpcId(), getPhysicalNetworkId(),
-                    getVlan(), getStartIp(), getGateway(), getNetmask(), getEntityOwnerId());
+                    getVlan(), getStartIp(), getGateway(), getNetmask(), getEntityOwnerId(), getIsSourceNat());
         } catch (InsufficientCapacityException ex){
             s_logger.info(ex);
             s_logger.trace(ex);
diff --git a/api/src/org/apache/cloudstack/api/response/PrivateGatewayResponse.java b/api/src/org/apache/cloudstack/api/response/PrivateGatewayResponse.java
@@ -76,6 +76,10 @@ public class PrivateGatewayResponse extends BaseResponse implements ControlledEn
     private String state;
 
 
+    @SerializedName(ApiConstants.SOURCE_NAT_SUPPORTED) @Param(description = "Souce Nat enable status")
+    private Boolean sourceNat;
+
+
     @Override
     public String getObjectId() {
         return this.id;
@@ -145,5 +149,11 @@ public void setProjectName(String projectName) {
     public void setState(String state) {
         this.state = state;
     }
+
+    public void setSourceNat(Boolean sourceNat) {
+        this.sourceNat = sourceNat;
+    }
+
+
 }
 
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -863,13 +863,16 @@ private SetPortForwardingRulesAnswer execute(SetPortForwardingRulesVpcCommand cm
     }
 
     public void assignVpcIpToRouter(final String routerIP, final boolean add, final String pubIP,
-            final String nicname, final String gateway, final String netmask, final String subnet) throws InternalErrorException {
+                                    final String nicname, final String gateway, final String netmask, final String subnet, boolean sourceNat) throws InternalErrorException {
         String args = "";
+        String snatArgs = "";
 
         if (add) {
             args += " -A ";
+            snatArgs += " -A ";
         } else {
             args += " -D ";
+            snatArgs += " -D ";
         }
 
         args += " -l ";
@@ -887,6 +890,16 @@ public void assignVpcIpToRouter(final String routerIP, final boolean add, final
         if (result != null) {
             throw new InternalErrorException("KVM plugin \"vpc_ipassoc\" failed:"+result);
         }
+        if (sourceNat) {
+            snatArgs += " -l " + pubIP;
+            snatArgs += " -c " + nicname;
+
+            result = routerProxy("vpc_privateGateway.sh", routerIP, snatArgs);
+            if (result != null) {
+                throw new InternalErrorException("KVM plugin \"vpc_privateGateway\" failed:"+result);
+            }
+
+        }
     }
 
     private SetStaticRouteAnswer execute(SetStaticRouteCommand cmd) {
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_privateGateway.sh b/patches/systemvm/debian/config/opt/cloud/bin/vpc_privateGateway.sh
@@ -91,7 +91,7 @@ fi
 
 if [ "$Dflag" == "1" ]
 then
-  remove_sat  $publicIp
+  remove_snat  $publicIp
   unlock_exit $? $lock $locked
 fi
 
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -1756,7 +1756,7 @@ protected IpAssocAnswer execute(IpAssocVpcCommand cmd) {
                 String netmask = Long.toString(NetUtils.getCidrSize(ip.getVlanNetmask()));
                 String subnet = NetUtils.getSubNet(ip.getPublicIp(), ip.getVlanNetmask());
                 _virtRouterResource.assignVpcIpToRouter(routerIP, ip.isAdd(), ip.getPublicIp(),
-                        nicName, ip.getVlanGateway(), netmask, subnet);
+                        nicName, ip.getVlanGateway(), netmask, subnet, ip.isSourceNat());
                 results[i++] = ip.getPublicIp() + " - success";
             }
 
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -1441,10 +1441,14 @@ protected void assignVPCPublicIpAddress(String domrName, String routerIp, IpAddr
         }
 
         String args = "";
+        String snatArgs = "";
+
         if (ip.isAdd()) {
             args += " -A ";
+            snatArgs += " -A ";
         } else {
             args += " -D ";
+            snatArgs += " -D ";
         }
 
         args += " -l ";
@@ -1468,6 +1472,21 @@ protected void assignVPCPublicIpAddress(String domrName, String routerIp, IpAddr
         if (!result.first()) {
             throw new InternalErrorException("Unable to assign public IP address");
         }
+
+        if (ip.isSourceNat()) {
+            snatArgs += " -l ";
+            snatArgs += ip.getPublicIp();
+            snatArgs += " -c ";
+            snatArgs += "eth" + ethDeviceNum;
+
+            Pair<Boolean, String> result = SshHelper.sshExecute(routerIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null,
+                    "/opt/cloud/bin/vpc_privateGateway.sh " + args);
+
+            if (!result.first()) {
+                throw new InternalErrorException("Unable to assign public IP address");
+            }
+
+        }
     }
 
     protected void assignPublicIpAddress(VirtualMachineMO vmMo, final String vmName, final String privateIpAddress, final String publicIpAddress, final boolean add, final boolean firstIP,
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -2217,11 +2217,14 @@ protected void assignVPCPublicIpAddress(Connection conn, String vmName, String r
             }           
 
             String args = "vpc_ipassoc.sh " + routerIp;
+            String snatArgs = "vpc_privateGateway.sh " + routerIp;
 
             if (ip.isAdd()) {
                 args += " -A ";
+                snatArgs += " -A ";
             } else {
                 args += " -D ";
+                snatArgs+= " -D ";
             }
 
             args += " -l ";
@@ -2244,6 +2247,17 @@ protected void assignVPCPublicIpAddress(Connection conn, String vmName, String r
             if (result == null || result.isEmpty()) {
                 throw new InternalErrorException("Xen plugin \"vpc_ipassoc\" failed.");
             }
+
+            if (ip.isSourceNat()) {
+                snatArgs += " -l " + ip.getPublicIp();
+                snatArgs += " -c " + "eth" + correctVif.getDevice(conn);
+
+                result = callHostPlugin(conn, "vmops", "routerProxy", "args", snatArgs);
+                if (result == null || result.isEmpty()) {
+                    throw new InternalErrorException("Xen plugin \"vcp_privateGateway\" failed.");
+                }
+            }
+
         } catch (Exception e) {
             String msg = "Unable to assign public IP address due to " + e.toString();
             s_logger.warn(msg, e);
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -3120,6 +3120,7 @@ public PrivateGatewayResponse createPrivateGatewayResponse(PrivateGateway result
         populateAccount(response, result.getAccountId());
         populateDomain(response, result.getDomainId());
         response.setState(result.getState().toString());
+        response.setSourceNat(result.getSourceNat());
 
         response.setObjectName("privategateway");
 
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -3308,8 +3308,8 @@ public IpAddress associateIPToNetwork(long ipId, long networkId) throws Insuffic
     
 
     @Override @DB
-    public Network createPrivateNetwork(String networkName, String displayText, long physicalNetworkId, 
-            String vlan, String startIp, String endIp, String gateway, String netmask, long networkOwnerId, Long vpcId) 
+    public Network createPrivateNetwork(String networkName, String displayText, long physicalNetworkId,
+                                        String vlan, String startIp, String endIp, String gateway, String netmask, long networkOwnerId, Long vpcId, Boolean sourceNat)
                     throws ResourceAllocationException, ConcurrentOperationException, InsufficientCapacityException {
         
         Account owner = _accountMgr.getAccount(networkOwnerId);
@@ -3377,7 +3377,7 @@ public Network createPrivateNetwork(String networkName, String displayText, long
         Long nextMac = mac + 1;
         dc.setMacAddress(nextMac);
 
-        privateIp = new PrivateIpVO(startIp, privateNetwork.getId(), nextMac, vpcId);
+        privateIp = new PrivateIpVO(startIp, privateNetwork.getId(), nextMac, vpcId, sourceNat);
         _privateIpDao.persist(privateIp);
         
         _dcDao.update(dc.getId(), dc);
diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -1178,8 +1178,8 @@ private void createVpcAssociatePrivateIPCommands(final VirtualRouter router, fin
 
             for (final PrivateIpAddress ipAddr : ipAddrList) {
                 Network network = _networkModel.getNetwork(ipAddr.getNetworkId());
-                IpAddressTO ip = new IpAddressTO(Account.ACCOUNT_ID_SYSTEM, ipAddr.getIpAddress(), add, false, 
-                        false, ipAddr.getVlanTag(), ipAddr.getGateway(), ipAddr.getNetmask(), ipAddr.getMacAddress(),
+                IpAddressTO ip = new IpAddressTO(Account.ACCOUNT_ID_SYSTEM, ipAddr.getIpAddress(), add, false,
+                        ipAddr.getSourceNat(), ipAddr.getVlanTag(), ipAddr.getGateway(), ipAddr.getNetmask(), ipAddr.getMacAddress(),
                         null, false);
 
                 ip.setTrafficType(network.getTrafficType());
diff --git a/server/src/com/cloud/network/vpc/PrivateGatewayProfile.java b/server/src/com/cloud/network/vpc/PrivateGatewayProfile.java
@@ -100,4 +100,9 @@ public long getDomainId() {
     public State getState() {
         return vpcGateway.getState();
     }
+
+    @Override
+    public boolean getSourceNat() {
+        return vpcGateway.getSourceNat();
+    }
 }
diff --git a/server/src/com/cloud/network/vpc/PrivateIpAddress.java b/server/src/com/cloud/network/vpc/PrivateIpAddress.java
@@ -25,6 +25,7 @@ public class PrivateIpAddress implements PrivateIp{
     String ipAddress;
     String macAddress;
     long networkId;
+    boolean sourceNat;
     
     /**
      * @param privateIp
@@ -42,6 +43,7 @@ public PrivateIpAddress(PrivateIpVO privateIp, String vlanTag, String gateway, S
         this.netmask = netmask;
         this.macAddress = macAddress;
         this.networkId = privateIp.getNetworkId();
+        this.sourceNat = privateIp.getSourceNat();
     }
 
     @Override
@@ -73,4 +75,9 @@ public String getMacAddress() {
     public long getNetworkId() {
         return networkId;
     }
+
+    @Override
+    public boolean getSourceNat() {
+        return sourceNat;
+    }
 }
diff --git a/server/src/com/cloud/network/vpc/PrivateIpVO.java b/server/src/com/cloud/network/vpc/PrivateIpVO.java
@@ -54,15 +54,19 @@ public class PrivateIpVO implements InternalIdentity {
     
     @Column(name="vpc_id")
     private Long vpcId;
+
+    @Column(name="source_nat")
+    private boolean sourceNat;
     
     public PrivateIpVO() {
-    } 
+    }
 
-    public PrivateIpVO(String ipAddress, long networkId, long macAddress, long vpcId) {
+    public PrivateIpVO(String ipAddress, long networkId, long macAddress, long vpcId, boolean sourceNat) {
         this.ipAddress = ipAddress;
         this.networkId = networkId;
         this.macAddress = macAddress;
         this.vpcId = vpcId;
+        this.sourceNat = sourceNat;
     }
     
     public void setTakenAt(Date takenDate) {
@@ -92,4 +96,8 @@ public long getMacAddress() {
     public Long getVpcId() {
         return vpcId;
     }
+    public boolean getSourceNat() {
+        return sourceNat;
+    }
+
 }
diff --git a/server/src/com/cloud/network/vpc/VpcGatewayVO.java b/server/src/com/cloud/network/vpc/VpcGatewayVO.java
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
diff --git a/server/test/com/cloud/network/MockNetworkManagerImpl.java b/server/test/com/cloud/network/MockNetworkManagerImpl.java
diff --git a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java
diff --git a/server/test/com/cloud/vpc/MockVpcManagerImpl.java b/server/test/com/cloud/vpc/MockVpcManagerImpl.java
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql

Original file line number	Diff line number	Diff line change
`@@ -44,5 +44,6 @@ public interface PrivateIp {`
`44`	`44`	`String getMacAddress();`
`45`	`45`
`46`	`46`	`long getNetworkId();`
	`47`	`+ boolean getSourceNat();`
`47`	`48`
`48`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,4 +77,8 @@ public enum State {`
`77`	`77`	`* @return`
`78`	`78`	`*/`
`79`	`79`	`State getState();`
	`80`	`+ /**`
	`81`	`+ * @return`
	`82`	`+ */`
	`83`	`+ boolean getSourceNat();`
`80`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1756,7 +1756,7 @@ protected IpAssocAnswer execute(IpAssocVpcCommand cmd) {`
`1756`	`1756`	`String netmask = Long.toString(NetUtils.getCidrSize(ip.getVlanNetmask()));`
`1757`	`1757`	`String subnet = NetUtils.getSubNet(ip.getPublicIp(), ip.getVlanNetmask());`
`1758`	`1758`	`_virtRouterResource.assignVpcIpToRouter(routerIP, ip.isAdd(), ip.getPublicIp(),`
`1759`		`- nicName, ip.getVlanGateway(), netmask, subnet);`
	`1759`	`+ nicName, ip.getVlanGateway(), netmask, subnet, ip.isSourceNat());`
`1760`	`1760`	`results[i++] = ip.getPublicIp() + " - success";`
`1761`	`1761`	`}`
`1762`	`1762`