Support change snat ip (#46)

* Support updating VPC Source NAT IP

* Optimize code

* Update source NAT IP

Author: Pearl1594

plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisElement.java

@@ -438,7 +438,7 @@ public boolean applyACLItemsToPrivateGw(PrivateGateway gateway, List<? extends N
 
     @Override
     public boolean updateVpcSourceNatIp(Vpc vpc, IpAddress address) {
-        return true;
+        return netrisService.updateVpcSourceNatIp(vpc, address);
     }
 
     @Override

plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisServiceImpl.java

@@ -292,7 +292,8 @@ public boolean updateVpcSourceNatIp(Vpc vpc, IpAddress address) {
 
         logger.debug("Updating the source NAT IP for Netris VPC {} to IP: {}", vpc.getName(), address.getAddress().addr());
 
-        CreateOrUpdateNetrisNatCommand cmd = new CreateOrUpdateNetrisNatCommand(zoneId, accountId, domainId, vpcName, vpcId, null, null, true, address.getAddress().addr());
+        CreateOrUpdateNetrisNatCommand cmd = new CreateOrUpdateNetrisNatCommand(zoneId, accountId, domainId, vpcName, vpcId, null, null, true, vpc.getCidr());
+        cmd.setNatIp(address.getAddress().addr());
         cmd.setNatRuleType("SNAT");
         String snatRuleName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.SNAT, String.valueOf(vpcId));
         cmd.setNatRuleName(snatRuleName);

server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java

@@ -1657,13 +1657,14 @@ private boolean checkAndUpdateRouterSourceNatIp(Vpc vpc, String sourceNatIp) {
             try {
                 _ipAddrMgr.updateSourceNatIpAddress(requestedIp, userIps);
                 if (isVpcForProvider(Provider.Nsx, vpc) || isVpcForProvider(Provider.Netris, vpc)) {
-                    VpcProvider nsxElement = (VpcProvider) _ntwkModel.getElementImplementingProvider(Provider.Nsx.getName());
-                    if (nsxElement == null) {
-                        return true;
+                    boolean isForNsx = _vpcOffSvcMapDao.isProviderForVpcOffering(Provider.Nsx, vpc.getVpcOfferingId());
+                    String providerName = isForNsx ? Provider.Nsx.getName() : Provider.Netris.getName();
+                    VpcProvider providerElement = (VpcProvider) _ntwkModel.getElementImplementingProvider(providerName);
+                    if (Objects.nonNull(providerElement)) {
+                        providerElement.updateVpcSourceNatIp(vpc, requestedIp);
+                        return false;
                     }
-                    nsxElement.updateVpcSourceNatIp(vpc, requestedIp);
-                    // The NSX source NAT IP change does not require to update the VPC VR
-                    return false;
+                    return true;
                 }
             } catch (Exception e) { // pokemon exception from transaction
                 String msg = String.format("Update of source NAT ip to %s for network \"%s\"/%s failed due to %s",