neutron: unbreak of neutron northbound yang model revise

[netvirt.git] / openstack / net-virt-providers / src / test / java / org / opendaylight / netvirt / openstack / netvirt / providers / openflow13 / services / EgressAclServiceTest.java

diff --git a/openstack/net-virt-providers/src/test/java/org/opendaylight/netvirt/openstack/netvirt/providers/openflow13/services/EgressAclServiceTest.java b/openstack/net-virt-providers/src/test/java/org/opendaylight/netvirt/openstack/netvirt/providers/openflow13/services/EgressAclServiceTest.java
index 3bbd1d84e21079032020b1c0442203a5963b4c92..ec2a38e258bf6d4270041287609427ba3e53f516 100644 (file)
--- a/openstack/net-virt-providers/src/test/java/org/opendaylight/netvirt/openstack/netvirt/providers/openflow13/services/EgressAclServiceTest.java
+++ b/openstack/net-virt-providers/src/test/java/org/opendaylight/netvirt/openstack/netvirt/providers/openflow13/services/EgressAclServiceTest.java
@@ -39,6 +39,7 @@ import org.opendaylight.netvirt.openstack.netvirt.translator.Neutron_IPs;
 import org.opendaylight.netvirt.openstack.netvirt.api.SecurityGroupCacheManger;
 import org.opendaylight.netvirt.openstack.netvirt.api.SecurityServicesManager;
 import org.opendaylight.netvirt.openstack.netvirt.providers.openflow13.PipelineOrchestrator;
+import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronSecurityRuleCRUD;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.FlowBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeBuilder;
@@ -75,6 +76,7 @@ public class EgressAclServiceTest {
     @Mock private NeutronSecurityRule portSecurityRule;
     @Mock private NeutronSecurityGroup securityGroupIpv6;
     @Mock private NeutronSecurityRule portSecurityIpv6Rule;
+    @Mock private INeutronSecurityRuleCRUD neutronSecurityRuleCache;
 
     @Mock private SecurityServicesManager securityServices;
     @Mock private SecurityGroupCacheManger securityGroupCacheManger;
@@ -151,7 +153,7 @@ public class EgressAclServiceTest {
 
         List<NeutronSecurityRule> portSecurityIpv6List = new ArrayList<>();
         portSecurityIpv6List.add(portSecurityIpv6Rule);
-        when(securityGroupIpv6.getSecurityRules()).thenReturn(portSecurityIpv6List);
+        when(neutronSecurityRuleCache.getAllNeutronSecurityRules()).thenReturn(portSecurityIpv6List);
 
         neutron_ipv6_dest_1 = new Neutron_IPs();
         neutron_ipv6_dest_1.setIpAddress(IPV6_DEST_IP_1);
@@ -161,7 +163,7 @@ public class EgressAclServiceTest {
         neutron_ipv6_dest_2.setIpAddress(IPV6_DEST_IP_2);
         neutronDestIpList.add(neutron_ipv6_dest_2);
 
-        when(securityGroup.getSecurityRules()).thenReturn(portSecurityList);
+        when(neutronSecurityRuleCache.getAllNeutronSecurityRules()).thenReturn(portSecurityList);
         when(securityServices.getVmListForSecurityGroup(PORT_UUID, SECURITY_GROUP_UUID)).thenReturn(neutronDestIpList);
 
         NetvirtProvidersProvider netvirtProvider = mock(NetvirtProvidersProvider.class);
@@ -200,7 +202,7 @@ public class EgressAclServiceTest {
         portSecurityList.add(portSecurityRule4);
 
         NeutronSecurityGroup localSecurityGroup = mock(NeutronSecurityGroup.class);
-        when(localSecurityGroup.getSecurityRules()).thenReturn(portSecurityList);
+        when(neutronSecurityRuleCache.getAllNeutronSecurityRules()).thenReturn(portSecurityList);
 
         egressAclServiceSpy.programPortSecurityGroup(DP_ID_LONG, SEGMENT_ID, MAC_ADDRESS, LOCAL_PORT,
                 localSecurityGroup, PORT_UUID, true);