Skip to content

network: handle missing network when releasing public IP #14133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xujiantop-crypto wants to merge 2 commits into
base: 4.22
Choose a base branch
from
+118 −3
Open

network: handle missing network when releasing public IP #14133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0cff8f7
network: handle missing network when releasing public IP
xujiantop-crypto Sep 10, 2026
8903273
test: cover VPC public IP release paths
xujiantop-crypto Sep 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions server/src/main/java/com/cloud/network/IpAddressManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,11 +792,15 @@ public boolean disassociatePublicIpAddress(IpAddress ipAddress, long userId, Acc
logger.debug("Releasing ip {}; sourceNat = {}", ip, ip.isSourceNat());
}

Network associatedNetwork = null;
if (ip.getAssociatedWithNetworkId() != null) {
Network network = _networksDao.findById(ip.getAssociatedWithNetworkId());
associatedNetwork = _networksDao.findById(ip.getAssociatedWithNetworkId());
}

if (associatedNetwork != null) {
try {
if (!applyIpAssociations(network, rulesContinueOnErrFlag)) {
logger.warn("Unable to apply ip address associations for " + network);
if (!applyIpAssociations(associatedNetwork, rulesContinueOnErrFlag)) {
logger.warn("Unable to apply ip address associations for " + associatedNetwork);
success = false;
}
} catch (ResourceUnavailableException e) {
Expand Down
111 changes: 111 additions & 0 deletions server/src/test/java/com/cloud/network/IpAddressManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,13 @@

import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

Expand All @@ -36,6 +39,7 @@
import com.cloud.network.vo.PublicIpQuarantineVO;
import com.cloud.user.Account;
import com.cloud.user.AccountManager;
import org.apache.cloudstack.annotation.dao.AnnotationDao;
import org.apache.cloudstack.context.CallContext;
import org.junit.Assert;
import org.junit.Before;
Expand All @@ -54,10 +58,18 @@
import com.cloud.network.dao.IPAddressVO;
import com.cloud.network.dao.NetworkDao;
import com.cloud.network.dao.NetworkVO;
import com.cloud.network.element.NetworkElement;
import com.cloud.network.rules.StaticNat;
import com.cloud.network.rules.StaticNatImpl;
import com.cloud.network.vpc.VpcOfferingServiceMapVO;
import com.cloud.network.vpc.VpcOfferingVO;
import com.cloud.network.vpc.VpcVO;
import com.cloud.network.vpc.dao.VpcDao;
import com.cloud.network.vpc.dao.VpcOfferingDao;
import com.cloud.network.vpc.dao.VpcOfferingServiceMapDao;
import com.cloud.offerings.NetworkOfferingVO;
import com.cloud.offerings.dao.NetworkOfferingDao;
import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
import com.cloud.user.AccountVO;
import com.cloud.utils.net.Ip;

Expand Down Expand Up @@ -105,6 +117,21 @@ public class IpAddressManagerTest {
@Mock
AccountManager accountManagerMock;

@Mock
AnnotationDao annotationDao;

@Mock
VpcDao vpcDao;

@Mock
VpcOfferingDao vpcOfferingDao;

@Mock
VpcOfferingServiceMapDao vpcOfferingServiceMapDao;

@Mock
NetworkOfferingServiceMapDao networkOfferingServiceMapDao;

final long dummyID = 1L;

final String UUID = "uuid";
Expand All @@ -130,6 +157,90 @@ public void setup() throws ResourceUnavailableException {
Mockito.when(networkOfferingDao.findById(Mockito.anyLong())).thenReturn(networkOfferingVO);
}

@Test
public void disassociatePublicIpAddressUnassignsReleasingIpWhenAssociatedNetworkIsMissing() throws ResourceUnavailableException {
long networkId = 2L;
long vpcId = 3L;
long vpcOfferingId = 4L;
prepareIpDisassociation(networkId);
when(ipAddressVoMock.getId()).thenReturn(dummyID);
when(ipAddressVoMock.getState()).thenReturn(IpAddress.State.Releasing);
when(ipAddressVoMock.getVpcId()).thenReturn(vpcId);
when(networkDao.findById(networkId)).thenReturn(null);
doReturn(publicIpQuarantineVOMock).when(ipAddressManager).addPublicIpAddressToQuarantine(ipAddressVoMock, account.getDomainId());

VpcVO vpc = mock(VpcVO.class);
VpcOfferingVO offering = mock(VpcOfferingVO.class);
when(vpcDao.findById(vpcId)).thenReturn(vpc);
when(vpc.getVpcOfferingId()).thenReturn(vpcOfferingId);
when(vpcOfferingDao.findById(vpcOfferingId)).thenReturn(offering);
when(offering.getId()).thenReturn(vpcOfferingId);
when(vpcOfferingServiceMapDao.listProvidersForServiceForVpcOffering(vpcOfferingId, Service.NetworkACL))
.thenReturn(Collections.singletonList(new VpcOfferingServiceMapVO(vpcOfferingId, Service.NetworkACL, Network.Provider.VPCVirtualRouter)));
NetworkElement element = mock(NetworkElement.class);
ipAddressManager._networkModel = mock(NetworkModel.class);
when(ipAddressManager._networkModel.getElementImplementingProvider(Network.Provider.VPCVirtualRouter.getName())).thenReturn(element);

boolean result = ipAddressManager.disassociatePublicIpAddress(ipAddressMock, dummyID, account);

assertTrue(result);
verify(ipAddressManager, never()).applyIpAssociations(any(), anyBoolean());
verify(ipAddressManager).addPublicIpAddressToQuarantine(ipAddressVoMock, account.getDomainId());
verify(ipAddressDao).unassignIpAddress(dummyID);
verify(element).releaseIp(ipAddressVoMock);
verify(annotationDao).removeByEntityType("PUBLIC_IP_ADDRESS", UUID);
verify(ipAddressDao).releaseFromLockTable(dummyID);
}

@Test
public void disassociatePublicIpAddressAppliesAssociationsWhenNetworkExists() throws ResourceUnavailableException {
verifyDisassociationWithExistingNetwork(true);
}

@Test
public void disassociatePublicIpAddressReturnsFailureWhenAssociationsFail() throws ResourceUnavailableException {
verifyDisassociationWithExistingNetwork(false);
}

private void verifyDisassociationWithExistingNetwork(boolean associationsApplied) throws ResourceUnavailableException {
long networkId = 2L;
prepareIpDisassociation(networkId);
NetworkVO network = mock(NetworkVO.class);
when(networkDao.findById(networkId)).thenReturn(network);
doReturn(associationsApplied).when(ipAddressManager).applyIpAssociations(network, IpAddressManagerImpl.rulesContinueOnErrFlag);

boolean result = ipAddressManager.disassociatePublicIpAddress(ipAddressMock, dummyID, account);

Assert.assertEquals(associationsApplied, result);
verify(ipAddressManager).applyIpAssociations(network, IpAddressManagerImpl.rulesContinueOnErrFlag);
verify(ipAddressManager, never()).addPublicIpAddressToQuarantine(any(), anyLong());
verify(ipAddressDao, never()).unassignIpAddress(anyLong());
verify(ipAddressDao).releaseFromLockTable(dummyID);
}

@Test
public void disassociatePublicIpAddressDoesNotUnassignFreeIpWhenNetworkIsMissing() throws ResourceUnavailableException {
prepareIpDisassociation(2L);
when(ipAddressVoMock.getState()).thenReturn(IpAddress.State.Free);

boolean result = ipAddressManager.disassociatePublicIpAddress(ipAddressMock, dummyID, account);

assertTrue(result);
verify(ipAddressManager, never()).applyIpAssociations(any(), anyBoolean());
verify(ipAddressManager, never()).addPublicIpAddressToQuarantine(any(), anyLong());
verify(ipAddressDao, never()).unassignIpAddress(anyLong());
verify(ipAddressDao).releaseFromLockTable(dummyID);
}

private void prepareIpDisassociation(long networkId) {
when(ipAddressMock.getId()).thenReturn(dummyID);
when(ipAddressDao.acquireInLockTable(dummyID)).thenReturn(ipAddressVoMock);
doReturn(true).when(ipAddressManager).cleanupIpResources(ipAddressMock, dummyID, account);
doReturn(ipAddressVoMock).when(ipAddressManager).markIpAsUnavailable(dummyID);
when(ipAddressVoMock.getAssociatedWithNetworkId()).thenReturn(networkId);
when(ipAddressVoMock.getUuid()).thenReturn(UUID);
}

@Test
public void testGetStaticNatSourceIps() {
String publicIpAddress = "192.168.1.3";
Expand Down
Loading