@@ -442,7 +442,6 @@ public void testGetFirewallServiceCapabilitiesForVpcNetworkUsesVpcProvider() {
442442 Map <Service , Map <Capability , String >> providerCapabilities = new HashMap <>();
443443 providerCapabilities .put (Service .Firewall , firewallCaps );
444444
445- when (network .getId ()).thenReturn (1L );
446445 when (network .getVpcId ()).thenReturn (10L );
447446 when (fwProvider .getProvider ()).thenReturn (Network .Provider .VPCVirtualRouter );
448447 when (fwProvider .getCapabilities ()).thenReturn (providerCapabilities );
@@ -591,24 +590,6 @@ public void testValidateFirewallRuleForVpcSucceedsWithSupportedProtocolAndTraffi
591590 verify (_accountMgr , times (1 )).checkAccess (caller , null , true , ipAddress );
592591 }
593592
594- @ Test
595- public void testCreateIngressFirewallRuleRoutesToVpcMethodWhenIpHasVpcId () throws NetworkRuleConflictException {
596- FirewallRule rule = Mockito .mock (FirewallRule .class );
597- IPAddressVO ipAddress = Mockito .mock (IPAddressVO .class );
598-
599- when (rule .getSourceIpAddressId ()).thenReturn (1L );
600- when (ipAddress .getVpcId ()).thenReturn (10L );
601-
602- doReturn (ipAddress ).when (_firewallMgr ).getSourceIpForIngressRule (1L );
603- doReturn (rule ).when (_firewallMgr ).createIngressFirewallRuleForVpcIp (rule , null , ipAddress );
604-
605- doReturn (rule ).when (_firewallMgr ).createIngressFirewallRuleForVpcIp (
606- Mockito .eq (rule ), Mockito .any (), Mockito .eq (ipAddress ));
607-
608- verify (_firewallMgr , never ()).createIngressFirewallRuleForIsolatedIp (
609- Mockito .any (), Mockito .any (), Mockito .any ());
610- }
611-
612593 @ Test
613594 public void testCreateFirewallRuleRoutesToVpcWhenVpcIdProvided () throws NetworkRuleConflictException {
614595 Account caller = Mockito .mock (Account .class );
0 commit comments