ACL: Enabling ACL service in the pipeline

Change-Id: Ieca5bbefa97f38703c79f592b383fb32bc745fd9
Signed-off-by: Somashekar Byrappa <somashekar.byrappa@ericsson.com>

diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AbstractAclServiceImpl.java b/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AbstractAclServiceImpl.java
index 48bec1c66457140e175ee1cecfe74ab45239bedb..f4c6e72cd3be390172541d10a51fe01ccf6766ec 100644 (file)
--- a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AbstractAclServiceImpl.java
+++ b/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AbstractAclServiceImpl.java
@@ -73,15 +73,11 @@ public abstract class AbstractAclServiceImpl implements AclServiceListener {
             LOG.error("Unable to find DP Id from ACL interface with id {}", port.getInterfaceId());
             return false;
         }
-
         programAclWithAllowedAddress(dpId, port.getAllowedAddressPairs(), port.getLPortTag(), port.getSecurityGroups(),
                 Action.ADD, NwConstants.ADD_FLOW, port.getInterfaceId());
 
+        bindService(port.getInterfaceId());
         return true;
-
-        // TODO: uncomment bindservice() when the acl flow programming is
-        // implemented
-        // bindService(port.getName());
     }
 
     @Override
@@ -180,14 +176,11 @@ public abstract class AbstractAclServiceImpl implements AclServiceListener {
             LOG.error("Unable to find DP Id from ACL interface with id {}", port.getInterfaceId());
             return false;
         }
-
         programAclWithAllowedAddress(dpId, port.getAllowedAddressPairs(), port.getLPortTag(), port.getSecurityGroups(),
                 Action.REMOVE, NwConstants.DEL_FLOW, port.getInterfaceId());
 
+        unbindService(port.getInterfaceId());
         return true;
-        // TODO: uncomment unbindService() when the acl flow programming is
-        // implemented
-        // unbindService(port.getName());
     }
 
     @Override

diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/StatelessEgressAclServiceImplTest.java b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/StatelessEgressAclServiceImplTest.java
index ef2ab168395145018f158d5a14f385bd74e3774b..6ee84a42366df89c38396b5584a1a82d60385b75 100644 (file)
--- a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/StatelessEgressAclServiceImplTest.java
+++ b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/StatelessEgressAclServiceImplTest.java
@@ -79,6 +79,7 @@ public class StatelessEgressAclServiceImplTest {
         testedService = new StatelessEgressAclServiceImpl(dataBroker, mdsalManager);
         doReturn(Futures.immediateCheckedFuture(null)).when(mockWriteTx).submit();
         doReturn(mockReadTx).when(dataBroker).newReadOnlyTransaction();
+        doReturn(mockWriteTx).when(dataBroker).newWriteOnlyTransaction();
         installFlowValueSaver = new MethodInvocationParamSaver<Void>(null);
         doAnswer(installFlowValueSaver).when(mdsalManager).installFlow(any(FlowEntity.class));
         removeFlowValueSaver = new MethodInvocationParamSaver<Void>(null);

diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/StatelessIngressAclServiceImplTest.java b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/StatelessIngressAclServiceImplTest.java
index c61757463e0e8660f4138a29781fc9b2255c5f11..4c95386bdafa6312652e3e10af98b9a9ad47a1eb 100644 (file)
--- a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/StatelessIngressAclServiceImplTest.java
+++ b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/StatelessIngressAclServiceImplTest.java
@@ -80,6 +80,7 @@ public class StatelessIngressAclServiceImplTest {
         testedService = new StatelessIngressAclServiceImpl(dataBroker, mdsalManager);
         doReturn(Futures.immediateCheckedFuture(null)).when(mockWriteTx).submit();
         doReturn(mockReadTx).when(dataBroker).newReadOnlyTransaction();
+        doReturn(mockWriteTx).when(dataBroker).newWriteOnlyTransaction();
         installFlowValueSaver = new MethodInvocationParamSaver<Void>(null);
         doAnswer(installFlowValueSaver).when(mdsalManager).installFlow(any(FlowEntity.class));
         removeFlowValueSaver = new MethodInvocationParamSaver<Void>(null);