|
21 | 21 | import com.cloud.exception.ResourceUnavailableException; |
22 | 22 | import com.cloud.network.Network; |
23 | 23 | import com.cloud.network.NetworkModel; |
| 24 | +import com.cloud.network.PublicIpAddress; |
24 | 25 | import com.cloud.network.RemoteAccessVpn; |
25 | 26 | import com.cloud.network.VpnUser; |
| 27 | +import com.cloud.network.router.VirtualRouter; |
26 | 28 | import com.cloud.network.router.VpcVirtualNetworkApplianceManagerImpl; |
27 | 29 | import com.cloud.network.vpc.Vpc; |
28 | 30 | import com.cloud.network.vpc.VpcManager; |
| 31 | +import com.cloud.network.vpc.VpcVO; |
29 | 32 | import com.cloud.network.vpc.dao.VpcDao; |
30 | 33 | import com.cloud.utils.db.EntityManager; |
31 | 34 | import com.cloud.vm.DomainRouterVO; |
32 | 35 | import com.cloud.vm.dao.DomainRouterDao; |
33 | 36 | import org.apache.cloudstack.network.topology.AdvancedNetworkTopology; |
34 | 37 | import org.apache.cloudstack.network.topology.BasicNetworkTopology; |
| 38 | +import org.apache.cloudstack.network.topology.NetworkTopology; |
35 | 39 | import org.apache.cloudstack.network.topology.NetworkTopologyContext; |
36 | 40 | import org.junit.Test; |
37 | 41 | import org.junit.runner.RunWith; |
|
41 | 45 | import org.mockito.junit.MockitoJUnitRunner; |
42 | 46 |
|
43 | 47 | import java.util.ArrayList; |
| 48 | +import java.util.LinkedHashSet; |
44 | 49 | import java.util.List; |
| 50 | +import java.util.Set; |
45 | 51 |
|
46 | 52 | import static org.junit.Assert.assertEquals; |
| 53 | +import static org.junit.Assert.assertFalse; |
47 | 54 | import static org.junit.Assert.assertNotNull; |
48 | 55 | import static org.junit.Assert.assertNull; |
49 | 56 | import static org.junit.Assert.assertTrue; |
@@ -214,4 +221,80 @@ public void testCanHandleFirewallUsesVpcCapability() { |
214 | 221 | verify(_networkMdl).isProviderSupportServiceInNetwork(200L, Network.Service.Firewall, Network.Provider.VPCVirtualRouter); |
215 | 222 | verify(_vpcMgr, never()).isProviderSupportServiceInVpc(100L, Network.Service.Firewall, Network.Provider.VPCVirtualRouter); |
216 | 223 | } |
| 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 | + } |
217 | 300 | } |
0 commit comments