Skip to content

Commit c5bd11a

Browse files
authored
VPC: associate tier public IPs when a public IP of the tier has firewall rules (#14681)
Since #12706 the Firewall service for public IPs of a VPC is provided by the VPC offering; the network offerings of the tiers do not list it. applyIpAssociations passes the services of the public IPs of a tier to VpcVirtualRouterElement.applyIps, which associates the IPs only when it can handle every one of these services on the tier. Once any public IP of the tier has a firewall rule, Firewall is in that set, canHandle(tier, Firewall) is false, and applyIps skips the association without an error: - port forwarding and load balancing rules on a new IP are applied, but the IP never reaches the router, also not on a network restart; - an IP whose last rule is removed stays configured on the router. Check the Firewall service on the VPC in that case, as applyFWRulesInVPC does. Other services and canHandle(network, service) are unchanged. Log when the IP association is skipped.
1 parent 1191bff commit c5bd11a

2 files changed

Lines changed: 101 additions & 1 deletion

File tree

‎server/src/main/java/com/cloud/network/element/VpcVirtualRouterElement.java‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,8 @@ public boolean deletePrivateGateway(final PrivateGateway gateway) throws Concurr
539539
public boolean applyIps(final Network network, final List<? extends PublicIpAddress> ipAddress, final Set<Service> services) throws ResourceUnavailableException {
540540
boolean canHandle = true;
541541
for (final Service service : services) {
542-
if (!canHandle(network, service)) {
542+
if (!canHandleIpService(network, service)) {
543+
logger.debug("{} element can't handle service {} in the network {}; skipping IP association", getName(), service.getName(), network);
543544
canHandle = false;
544545
break;
545546
}
@@ -563,6 +564,22 @@ public boolean applyIps(final Network network, final List<? extends PublicIpAddr
563564
return result;
564565
}
565566

567+
/**
568+
* The Firewall service for public IPs is a VPC service: the VPC offering provides it, while the
569+
* tier's network offering does not list it. Once a public IP of the tier has a firewall rule,
570+
* Firewall is part of the services passed to {@link #applyIps}, so it is checked on the VPC
571+
* here. Otherwise no public IP of that tier could be associated with the VPC virtual router.
572+
*/
573+
protected boolean canHandleIpService(final Network network, final Service service) {
574+
if (canHandle(network, service)) {
575+
return true;
576+
}
577+
if (Service.Firewall.equals(service) && network.getVpcId() != null) {
578+
return canHandle(_vpcDao.findById(network.getVpcId()), service);
579+
}
580+
return false;
581+
}
582+
566583
@Override
567584
public boolean applyNetworkACLs(final Network network, final List<? extends NetworkACLItem> rules) throws ResourceUnavailableException {
568585
boolean result = true;

‎server/src/test/java/com/cloud/network/element/VpcVirtualRouterElementTest.java‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,21 @@
2121
import com.cloud.exception.ResourceUnavailableException;
2222
import com.cloud.network.Network;
2323
import com.cloud.network.NetworkModel;
24+
import com.cloud.network.PublicIpAddress;
2425
import com.cloud.network.RemoteAccessVpn;
2526
import com.cloud.network.VpnUser;
27+
import com.cloud.network.router.VirtualRouter;
2628
import com.cloud.network.router.VpcVirtualNetworkApplianceManagerImpl;
2729
import com.cloud.network.vpc.Vpc;
2830
import com.cloud.network.vpc.VpcManager;
31+
import com.cloud.network.vpc.VpcVO;
2932
import com.cloud.network.vpc.dao.VpcDao;
3033
import com.cloud.utils.db.EntityManager;
3134
import com.cloud.vm.DomainRouterVO;
3235
import com.cloud.vm.dao.DomainRouterDao;
3336
import org.apache.cloudstack.network.topology.AdvancedNetworkTopology;
3437
import org.apache.cloudstack.network.topology.BasicNetworkTopology;
38+
import org.apache.cloudstack.network.topology.NetworkTopology;
3539
import org.apache.cloudstack.network.topology.NetworkTopologyContext;
3640
import org.junit.Test;
3741
import org.junit.runner.RunWith;
@@ -41,9 +45,12 @@
4145
import org.mockito.junit.MockitoJUnitRunner;
4246

4347
import java.util.ArrayList;
48+
import java.util.LinkedHashSet;
4449
import java.util.List;
50+
import java.util.Set;
4551

4652
import static org.junit.Assert.assertEquals;
53+
import static org.junit.Assert.assertFalse;
4754
import static org.junit.Assert.assertNotNull;
4855
import static org.junit.Assert.assertNull;
4956
import static org.junit.Assert.assertTrue;
@@ -214,4 +221,80 @@ public void testCanHandleFirewallUsesVpcCapability() {
214221
verify(_networkMdl).isProviderSupportServiceInNetwork(200L, Network.Service.Firewall, Network.Provider.VPCVirtualRouter);
215222
verify(_vpcMgr, never()).isProviderSupportServiceInVpc(100L, Network.Service.Firewall, Network.Provider.VPCVirtualRouter);
216223
}
224+
225+
private Network mockVpcTier() {
226+
final Network network = Mockito.mock(Network.class);
227+
when(_networkMdl.getPhysicalNetworkId(network)).thenReturn(1L);
228+
when(network.getId()).thenReturn(200L);
229+
when(network.getVpcId()).thenReturn(100L);
230+
when(_networkMdl.isProviderEnabledInPhysicalNetwork(1L, Network.Provider.VPCVirtualRouter.getName())).thenReturn(true);
231+
return network;
232+
}
233+
234+
private VpcVO mockVpc(final boolean vpcProvidesFirewall) {
235+
final VpcVO vpc = Mockito.mock(VpcVO.class);
236+
when(vpc.getId()).thenReturn(100L);
237+
when(vpc.getZoneId()).thenReturn(1L);
238+
when(_vpcDao.findById(100L)).thenReturn(vpc);
239+
when(_networkMdl.isProviderEnabledInZone(1L, Network.Provider.VPCVirtualRouter.getName())).thenReturn(true);
240+
when(_vpcMgr.isProviderSupportServiceInVpc(100L, Network.Service.Firewall, Network.Provider.VPCVirtualRouter)).thenReturn(vpcProvidesFirewall);
241+
return vpc;
242+
}
243+
244+
private Set<Network.Service> lbAndFirewall() {
245+
final Set<Network.Service> services = new LinkedHashSet<>();
246+
services.add(Network.Service.Lb);
247+
services.add(Network.Service.Firewall);
248+
return services;
249+
}
250+
251+
@Test
252+
public void testApplyIpsAssociatesTierIpsWhenTheVpcProvidesFirewall() throws ResourceUnavailableException {
253+
final Network network = mockVpcTier();
254+
when(network.getDataCenterId()).thenReturn(1L);
255+
when(_networkMdl.isProviderSupportServiceInNetwork(200L, Network.Service.Lb, Network.Provider.VPCVirtualRouter)).thenReturn(true);
256+
when(_networkMdl.isProviderSupportServiceInNetwork(200L, Network.Service.Firewall, Network.Provider.VPCVirtualRouter)).thenReturn(false);
257+
mockVpc(true);
258+
259+
final DomainRouterVO router = Mockito.mock(DomainRouterVO.class);
260+
when(_routerDao.listByNetworkAndRole(200L, VirtualRouter.Role.VIRTUAL_ROUTER)).thenReturn(List.of(router));
261+
final DataCenterVO dc = Mockito.mock(DataCenterVO.class);
262+
when(_dcDao.findById(1L)).thenReturn(dc);
263+
final NetworkTopology topology = Mockito.mock(NetworkTopology.class);
264+
when(networkTopologyContext.retrieveNetworkTopology(dc)).thenReturn(topology);
265+
final List<PublicIpAddress> ips = List.of(Mockito.mock(PublicIpAddress.class));
266+
when(topology.associatePublicIP(network, ips, router)).thenReturn(true);
267+
268+
assertTrue(vpcVirtualRouterElement.applyIps(network, ips, lbAndFirewall()));
269+
verify(topology).associatePublicIP(network, ips, router);
270+
}
271+
272+
@Test
273+
public void testApplyIpsSkipsAssociationWhenNeitherTierNorVpcProvidesFirewall() throws ResourceUnavailableException {
274+
final Network network = mockVpcTier();
275+
when(_networkMdl.isProviderSupportServiceInNetwork(200L, Network.Service.Lb, Network.Provider.VPCVirtualRouter)).thenReturn(true);
276+
when(_networkMdl.isProviderSupportServiceInNetwork(200L, Network.Service.Firewall, Network.Provider.VPCVirtualRouter)).thenReturn(false);
277+
mockVpc(false);
278+
279+
assertTrue(vpcVirtualRouterElement.applyIps(network, List.of(Mockito.mock(PublicIpAddress.class)), lbAndFirewall()));
280+
verify(_routerDao, never()).listByNetworkAndRole(Mockito.anyLong(), Mockito.any());
281+
}
282+
283+
@Test
284+
public void testCanHandleIpServiceUsesTheVpcOnlyForFirewall() {
285+
final Network network = mockVpcTier();
286+
when(_networkMdl.isProviderSupportServiceInNetwork(200L, Network.Service.PortForwarding, Network.Provider.VPCVirtualRouter)).thenReturn(false);
287+
288+
assertFalse(vpcVirtualRouterElement.canHandleIpService(network, Network.Service.PortForwarding));
289+
verify(_vpcDao, never()).findById(Mockito.anyLong());
290+
}
291+
292+
@Test
293+
public void testCanHandleIpServiceKeepsTierFirewall() {
294+
final Network network = mockVpcTier();
295+
when(_networkMdl.isProviderSupportServiceInNetwork(200L, Network.Service.Firewall, Network.Provider.VPCVirtualRouter)).thenReturn(true);
296+
297+
assertTrue(vpcVirtualRouterElement.canHandleIpService(network, Network.Service.Firewall));
298+
verify(_vpcDao, never()).findById(Mockito.anyLong());
299+
}
217300
}

0 commit comments

Comments
 (0)