Skip to content

server: fix public IP association/disassociation to new network #3489

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

Merged
yadvr merged 2 commits into from
Jul 14, 2019
Merged

server: fix public IP association/disassociation to new network #3489

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
615fa37
server: fix public IP association/disassociation to new network
shwstppr Jul 12, 2019
fa31b23
server: fix for source NAT allocated network test
shwstppr Jul 12, 2019
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
11 changes: 2 additions & 9 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 @@ -29,9 +29,6 @@

import javax.inject.Inject;

import com.cloud.dc.DomainVlanMapVO;
import org.apache.log4j.Logger;

import org.apache.cloudstack.acl.ControlledEntity.ACLType;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.api.response.AcquirePodIpCmdResponse;
Expand All @@ -44,6 +41,7 @@
import org.apache.cloudstack.region.PortableIpDao;
import org.apache.cloudstack.region.PortableIpVO;
import org.apache.cloudstack.region.Region;
import org.apache.log4j.Logger;

import com.cloud.agent.AgentManager;
import com.cloud.alert.AlertManager;
Expand All @@ -54,6 +52,7 @@
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenter.NetworkType;
import com.cloud.dc.DataCenterIpAddressVO;
import com.cloud.dc.DomainVlanMapVO;
import com.cloud.dc.HostPodVO;
import com.cloud.dc.Pod;
import com.cloud.dc.PodVlanMapVO;
Expand Down Expand Up @@ -1429,12 +1428,6 @@ protected boolean isSourceNatAvailableForNetwork(Account owner, IPAddressVO ipTo
if (!sharedSourceNat) {
if (getExistingSourceNatInNetwork(owner.getId(), network.getId()) == null) {
if (network.getGuestType() == GuestType.Isolated && network.getVpcId() == null && !ipToAssoc.isPortable()) {
if (network.getState() == Network.State.Allocated) {
//prevent associating an ip address to an allocated (unimplemented network).
//it will cause the ip to become source nat, and it can't be disassociated later on.
String msg = String.format("Network with UUID:%s is in allocated and needs to be implemented first before acquiring an IP address", network.getUuid());
throw new InvalidParameterValueException(msg);
}
isSourceNat = true;
}
}
Expand Down
11 changes: 7 additions & 4 deletions server/src/main/java/com/cloud/network/NetworkServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,12 @@ private boolean releaseIpAddressInternal(long ipAddressId) throws InsufficientAd
_accountMgr.checkAccess(caller, null, true, ipVO);
}

if (ipVO.isSourceNat()) {
Network guestNetwork = null;
final Long networkId = ipVO.getAssociatedWithNetworkId();
if (networkId != null) {
guestNetwork = getNetwork(networkId);
}
if (ipVO.isSourceNat() && guestNetwork != null && guestNetwork.getState() != Network.State.Allocated) {
throw new IllegalArgumentException("ip address is used for source nat purposes and can not be disassociated.");
}

Expand All @@ -941,9 +946,7 @@ private boolean releaseIpAddressInternal(long ipAddressId) throws InsufficientAd
boolean success = _ipAddrMgr.disassociatePublicIpAddress(ipAddressId, userId, caller);

if (success) {
Long networkId = ipVO.getAssociatedWithNetworkId();
if (networkId != null) {
Network guestNetwork = getNetwork(networkId);
if (guestNetwork != null) {
NetworkOffering offering = _entityMgr.findById(NetworkOffering.class, guestNetwork.getNetworkOfferingId());
Long vmId = ipVO.getAssociatedWithVmId();
if (offering.isElasticIp() && vmId != null) {
Expand Down
7 changes: 3 additions & 4 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 @@ -36,8 +36,8 @@
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.Spy;
import org.mockito.runners.MockitoJUnitRunner;

import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.Network.Service;
import com.cloud.network.dao.IPAddressDao;
Expand All @@ -50,7 +50,6 @@
import com.cloud.offerings.dao.NetworkOfferingDao;
import com.cloud.user.AccountVO;
import com.cloud.utils.net.Ip;
import org.mockito.runners.MockitoJUnitRunner;

@RunWith(MockitoJUnitRunner.class)
public class IpAddressManagerTest {
Expand Down Expand Up @@ -170,7 +169,7 @@ public void assertSourceNatImplementedNetwork() {
assertTrue("Source NAT should be true", isSourceNat);
}

@Test(expected = InvalidParameterValueException.class)
@Test
public void assertSourceNatAllocatedNetwork() {

NetworkVO networkAllocated = Mockito.mock(NetworkVO.class);
Expand All @@ -184,7 +183,7 @@ public void assertSourceNatAllocatedNetwork() {
Mockito.when(networkDao.findById(2L)).thenReturn(networkAllocated);
doReturn(null).when(ipAddressManager).getExistingSourceNatInNetwork(1L, 2L);

ipAddressManager.isSourceNatAvailableForNetwork(account, ipAddressVO, networkAllocated);
assertTrue(ipAddressManager.isSourceNatAvailableForNetwork(account, ipAddressVO, networkAllocated));
}

@Test
Expand Down