Code Review / netvirt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
8121: Exception in SG Acl while SFC acl is created/modified
[netvirt.git] / vpnservice / aclservice / impl / src / test / java / org / opendaylight / netvirt / aclservice / listeners / AclEventListenerTest.java
diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/listeners/AclEventListenerTest.java b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/listeners/AclEventListenerTest.java
index b20336d4f6dc38421f7341077d8f13f90048b67b..8162ef5bcb246dc645f74c3183d956ca116814f7 100644 (file)
--- a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/listeners/AclEventListenerTest.java
+++ b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/listeners/AclEventListenerTest.java
@@ -9,15 +9,16 @@
 package org.opendaylight.netvirt.aclservice.listeners;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.opendaylight.netvirt.aclservice.utils.AclServiceTestUtils.clearStaticData;
 import static org.opendaylight.netvirt.aclservice.utils.AclServiceTestUtils.prepareAcl;
 import static org.opendaylight.netvirt.aclservice.utils.AclServiceTestUtils.prepareAclClusterUtil;
 import static org.opendaylight.netvirt.aclservice.utils.AclServiceTestUtils.prepareAclDataUtil;
 
-import org.junit.After;
+import com.google.common.util.concurrent.Futures;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
@@ -26,22 +27,32 @@ import org.opendaylight.netvirt.aclservice.api.AclServiceManager;
 import org.opendaylight.netvirt.aclservice.api.AclServiceManager.Action;
 import org.opendaylight.netvirt.aclservice.api.utils.AclInterface;
 import org.opendaylight.netvirt.aclservice.utils.AclClusterUtil;
+import org.opendaylight.netvirt.aclservice.utils.AclDataUtil;
+import org.opendaylight.netvirt.aclservice.utils.AclServiceUtils;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.Acl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.acl.access.list.entries.Ace;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.ReleaseIdInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.aclservice.config.rev160806.AclserviceConfig;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
+
 public class AclEventListenerTest {
 
     private AclEventListener aclEventListener;
     private AclServiceManager aclServiceManager;
+    private AclDataUtil aclDataUtil = new AclDataUtil();
 
     private InstanceIdentifier<Acl> mockInstanceId;
     private AclInterface aclInterfaceMock;
+    private AclServiceUtils aclSeviceUtils;
 
     private ArgumentCaptor<AclInterface> aclInterfaceValueSaver;
     private ArgumentCaptor<Action> actionValueSaver;
     private ArgumentCaptor<Ace> aceValueSaver;
+    private ArgumentCaptor<String> aclNameSaver;
     private String aclName;
+    private IdManagerService idManagerMock;
 
     @SuppressWarnings("unchecked")
     @Before
@@ -49,33 +60,33 @@ public class AclEventListenerTest {
         mockInstanceId = mock(InstanceIdentifier.class);
         aclInterfaceMock = mock(AclInterface.class);
         aclServiceManager = mock(AclServiceManager.class);
+        idManagerMock = mock(IdManagerService.class);
+        aclSeviceUtils = new AclServiceUtils(aclDataUtil, mock(AclserviceConfig.class), idManagerMock);
+        doReturn(Futures.immediateFuture(null)).when(idManagerMock).releaseId(any(ReleaseIdInput.class));
         AclClusterUtil aclClusterUtil = () -> true;
-        aclEventListener = new AclEventListener(aclServiceManager, aclClusterUtil, mock(DataBroker.class));
+        aclEventListener = new AclEventListener(aclServiceManager, aclClusterUtil, mock(DataBroker.class), aclDataUtil,
+                aclSeviceUtils);
 
         aclInterfaceValueSaver = ArgumentCaptor.forClass(AclInterface.class);
         actionValueSaver = ArgumentCaptor.forClass(AclServiceManager.Action.class);
         aceValueSaver = ArgumentCaptor.forClass(Ace.class);
+        aclNameSaver = ArgumentCaptor.forClass(String.class);
         prepareAclClusterUtil("netvirt-acl");
 
         aclName = "00000000-0000-0000-0000-000000000001";
     }
 
-    @After
-    public void tearDown() {
-        clearStaticData(aclInterfaceMock, aclName);
-    }
-
     @Test
     public void testUpdate_singleInterface_addNewAce() {
-        prepareAclDataUtil(aclInterfaceMock, aclName);
+        prepareAclDataUtil(aclDataUtil, aclInterfaceMock, aclName);
 
-        Acl previousAcl = prepareAcl(aclName, "AllowUDP");
-        Acl updatedAcl = prepareAcl(aclName, "AllowICMP", "AllowUDP");
+        Acl previousAcl = prepareAcl(aclName, true, "AllowUDP");
+        Acl updatedAcl = prepareAcl(aclName, true, "AllowICMP", "AllowUDP");
 
         aclEventListener.update(mockInstanceId, previousAcl, updatedAcl);
 
         verify(aclServiceManager).notifyAce(aclInterfaceValueSaver.capture(), actionValueSaver.capture(),
-                aceValueSaver.capture());
+                aclNameSaver.capture(), aceValueSaver.capture());
 
         assertEquals(Action.ADD, actionValueSaver.getValue());
         assertEquals("AllowICMP", aceValueSaver.getValue().getRuleName());
@@ -83,15 +94,15 @@ public class AclEventListenerTest {
 
     @Test
     public void testUpdate_singleInterface_removeOldAce() {
-        prepareAclDataUtil(aclInterfaceMock, aclName);
+        prepareAclDataUtil(aclDataUtil, aclInterfaceMock, aclName);
 
-        Acl previousAcl = prepareAcl(aclName, "AllowICMP", "AllowUDP");
-        Acl updatedAcl = prepareAcl(aclName, "AllowUDP");
+        Acl previousAcl = prepareAcl(aclName, true, "AllowICMP", "AllowUDP");
+        Acl updatedAcl = prepareAcl(aclName, true, "AllowUDP");
 
         aclEventListener.update(mockInstanceId, previousAcl, updatedAcl);
 
         verify(aclServiceManager).notifyAce(aclInterfaceValueSaver.capture(), actionValueSaver.capture(),
-                aceValueSaver.capture());
+                aclNameSaver.capture(), aceValueSaver.capture());
 
         assertEquals(Action.REMOVE, actionValueSaver.getValue());
         assertEquals("AllowICMP", aceValueSaver.getValue().getRuleName());
@@ -99,15 +110,15 @@ public class AclEventListenerTest {
 
     @Test
     public void testUpdate_singleInterface_addNewAceAndRemoveOldAce() {
-        prepareAclDataUtil(aclInterfaceMock, aclName);
+        prepareAclDataUtil(aclDataUtil, aclInterfaceMock, aclName);
 
-        Acl previousAcl = prepareAcl(aclName, "AllowICMP", "AllowUDP");
-        Acl updatedAcl = prepareAcl(aclName, "AllowTCP", "AllowUDP");
+        Acl previousAcl = prepareAcl(aclName, true, "AllowICMP", "AllowUDP");
+        Acl updatedAcl = prepareAcl(aclName, true, "AllowTCP", "AllowUDP");
 
         aclEventListener.update(mockInstanceId, previousAcl, updatedAcl);
 
         verify(aclServiceManager, times(2)).notifyAce(aclInterfaceValueSaver.capture(), actionValueSaver.capture(),
-                aceValueSaver.capture());
+                aclNameSaver.capture(), aceValueSaver.capture());
 
         assertEquals(Action.ADD, actionValueSaver.getAllValues().get(0));
         assertEquals("AllowTCP", aceValueSaver.getAllValues().get(0).getRuleName());
@@ -115,4 +126,30 @@ public class AclEventListenerTest {
         assertEquals(Action.REMOVE, actionValueSaver.getAllValues().get(1));
         assertEquals("AllowICMP", aceValueSaver.getAllValues().get(1).getRuleName());
     }
+
+    @Test
+    public void testUpdate_addNewAce_withoutSecurityAttrAugmentation() {
+        prepareAclDataUtil(aclDataUtil, aclInterfaceMock, aclName);
+
+        Acl previousAcl = prepareAcl(aclName, false, "AllowUDP");
+        Acl updatedAcl = prepareAcl(aclName, false, "AllowICMP", "AllowUDP");
+
+        aclEventListener.update(mockInstanceId, previousAcl, updatedAcl);
+
+        verify(aclServiceManager, times(0)).notifyAce(aclInterfaceValueSaver.capture(), actionValueSaver.capture(),
+                aclNameSaver.capture(), aceValueSaver.capture());
+    }
+
+    @Test
+    public void testUpdate_removeOldAce_withoutSecurityAttrAugmentation() {
+        prepareAclDataUtil(aclDataUtil, aclInterfaceMock, aclName);
+
+        Acl previousAcl = prepareAcl(aclName, false, "AllowICMP", "AllowUDP");
+        Acl updatedAcl = prepareAcl(aclName, false, "AllowUDP");
+
+        aclEventListener.update(mockInstanceId, previousAcl, updatedAcl);
+
+        verify(aclServiceManager, times(0)).notifyAce(aclInterfaceValueSaver.capture(), actionValueSaver.capture(),
+                aclNameSaver.capture(), aceValueSaver.capture());
+    }
 }
NetVirt - Archived