Release NAT IP subnet when VPC is removed or IP is released (#44)

* Release NAT IP subnet when VPC is removed or IP is released

* add license

Author: Pearl1594

api/src/main/java/com/cloud/network/element/NetworkElement.java

@@ -23,6 +23,7 @@
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.network.IpAddress;
 import com.cloud.network.Network;
 import com.cloud.network.Network.Capability;
 import com.cloud.network.Network.Provider;
@@ -87,6 +88,12 @@ boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, Deplo
     boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException,
         ResourceUnavailableException;
 
+    /**
+     * Release IP from the network provider if reserved
+     * @param ipAddress
+     */
+    boolean releaseIp(IpAddress ipAddress);
+
     /**
      * The network is being shutdown.
      * @param network

api/src/main/java/com/cloud/network/netris/NetrisService.java

@@ -46,4 +46,6 @@ public interface NetrisService {
     boolean addOrUpdateStaticRoute(long zoneId, long accountId, long domainId, String networkResourceName, Long networkResourceId, boolean isForVpc, String prefix, String nextHop, Long routeId, boolean updateRoute);
 
     boolean deleteStaticRoute(long zoneId, long accountId, long domainId, String networkResourceName, Long networkResourceId, boolean isForVpc, String prefix, String nextHop, Long routeId);
+
+    boolean releaseNatIp(long zoneId, String publicIp);
 }

engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcOfferingServiceMapDao.java

@@ -40,4 +40,6 @@ public interface VpcOfferingServiceMapDao extends GenericDao<VpcOfferingServiceM
 
     boolean isProviderForVpcOffering(Network.Provider provider, long vpcOfferingId);
 
+    List<VpcOfferingServiceMapVO> listProvidersForServiceForVpcOffering(long vpcOfferingId, Service service);
+
 }

engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java

@@ -119,4 +119,14 @@ public boolean isProviderForVpcOffering(Network.Provider provider, long vpcOffer
         sc.setParameters("provider", provider.getName());
         return findOneBy(sc) != null;
     }
+
+    @Override
+    public List<VpcOfferingServiceMapVO> listProvidersForServiceForVpcOffering(long vpcOfferingId, Service service) {
+        SearchCriteria<VpcOfferingServiceMapVO> sc = AllFieldsSearch.create();
+
+        sc.setParameters("vpcOffId", vpcOfferingId);
+        sc.setParameters("service", service.getName());
+
+        return customSearch(sc, null);
+    }
 }

plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java

@@ -34,6 +34,7 @@
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.host.Host;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.network.IpAddress;
 import com.cloud.network.Network;
 import com.cloud.network.Network.Capability;
 import com.cloud.network.Network.GuestType;
@@ -125,6 +126,11 @@ public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm
         return true;
     }
 
+    @Override
+    public boolean releaseIp(IpAddress ipAddress) {
+        return true;
+    }
+
     @Override
     public boolean shutdown(Network network, ReservationContext context, boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException {
         return true;

plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalPxeElement.java

@@ -29,6 +29,7 @@
 import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.network.IpAddress;
 import com.cloud.network.Network;
 import com.cloud.network.Network.Capability;
 import com.cloud.network.Network.GuestType;
@@ -161,6 +162,11 @@ public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm
         return true;
     }
 
+    @Override
+    public boolean releaseIp(IpAddress ipAddress) {
+        return true;
+    }
+
     private void releaseVlan(Network network, VirtualMachineProfile vm) {
         vlanMgr.releaseVlan(network, vm);
     }

plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java

@@ -30,6 +30,7 @@
 import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.network.IpAddress;
 import com.cloud.network.Network;
 import com.cloud.network.Network.Capability;
 import com.cloud.network.Network.Provider;
@@ -124,6 +125,11 @@ public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm
         return false;
     }
 
+    @Override
+    public boolean releaseIp(IpAddress ipAddress) {
+        return true;
+    }
+
     @Override
     public boolean shutdown(Network network, ReservationContext context, boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException {
         // TODO Auto-generated method stub

plugins/hypervisors/vmware/src/main/java/com/cloud/network/element/CiscoNexusVSMElement.java

@@ -24,7 +24,7 @@
 
 import javax.inject.Inject;
 
-
+import com.cloud.network.IpAddress;
 import com.cloud.api.commands.DeleteCiscoNexusVSMCmd;
 import com.cloud.api.commands.DisableCiscoNexusVSMCmd;
 import com.cloud.api.commands.EnableCiscoNexusVSMCmd;
@@ -106,6 +106,11 @@ public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm
         return true;
     }
 
+    @Override
+    public boolean releaseIp(IpAddress ipAddress) {
+        return true;
+    }
+
     @Override
     public boolean shutdown(Network network, ReservationContext context, boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException {
         return true;

plugins/network-elements/bigswitch/src/main/java/com/cloud/network/element/BigSwitchBcfElement.java

@@ -29,6 +29,7 @@
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.network.IpAddress;
 import org.springframework.stereotype.Component;
 import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice;
 import org.apache.commons.net.util.SubnetUtils;
@@ -318,6 +319,11 @@ public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm
         return true;
     }
 
+    @Override
+    public boolean releaseIp(IpAddress ipAddress) {
+        return true;
+    }
+
     @Override
     public boolean shutdown(Network network, ReservationContext context, boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException {
         if (!canHandle(network, Service.Connectivity)) {

plugins/network-elements/brocade-vcs/src/main/java/com/cloud/network/element/BrocadeVcsElement.java

@@ -27,6 +27,7 @@
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.network.IpAddress;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
 import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice;
 import org.springframework.stereotype.Component;
@@ -194,6 +195,11 @@ public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm
         return true;
     }
 
+    @Override
+    public boolean releaseIp(IpAddress ipAddress) {
+        return true;
+    }
+
     @Override
     public boolean shutdown(Network network, ReservationContext context, boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException {
         if (!canHandle(network, Service.Connectivity)) {