ACL: Support for non-conntrack supported traffic.
[netvirt.git] / vpnservice / aclservice / impl / src / main / java / org / opendaylight / netvirt / aclservice / listeners / AclNodeListener.java
index ef312aba962a2cdb9668bed5ec35d2e71d64a435..fd8233a70ab73e1c0d5d7f4f1bc957a9614818be 100644 (file)
@@ -9,31 +9,20 @@
 package org.opendaylight.netvirt.aclservice.listeners;
 
 import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Collections;
 import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;
-import org.opendaylight.genius.mdsalutil.ActionInfo;
-import org.opendaylight.genius.mdsalutil.ActionType;
-import org.opendaylight.genius.mdsalutil.FlowEntity;
-import org.opendaylight.genius.mdsalutil.InstructionInfo;
-import org.opendaylight.genius.mdsalutil.InstructionType;
 import org.opendaylight.genius.mdsalutil.MDSALUtil;
-import org.opendaylight.genius.mdsalutil.MatchFieldType;
-import org.opendaylight.genius.mdsalutil.MatchInfo;
-import org.opendaylight.genius.mdsalutil.MatchInfoBase;
-import org.opendaylight.genius.mdsalutil.NwConstants;
-import org.opendaylight.genius.mdsalutil.NxMatchFieldType;
-import org.opendaylight.genius.mdsalutil.NxMatchInfo;
 import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager;
-import org.opendaylight.genius.mdsalutil.packet.IPProtocols;
-import org.opendaylight.netvirt.aclservice.utils.AclClusterUtil;
+import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
 import org.opendaylight.netvirt.aclservice.utils.AclConstants;
+import org.opendaylight.netvirt.aclservice.utils.AclNodeDefaultFlowsTxBuilder;
+import org.opendaylight.netvirt.aclservice.utils.AclServiceUtils;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
@@ -45,47 +34,50 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Listener to handle flow capable node updates.
+ * Listener to handle flow capable node updates. Configures default ACL flows
+ * during when node is discovered.
  */
 @Singleton
-@SuppressWarnings("deprecation")
-public class AclNodeListener extends AsyncDataTreeChangeListenerBase<FlowCapableNode, AclNodeListener>
-        implements AutoCloseable {
+public class AclNodeListener extends AsyncDataTreeChangeListenerBase<FlowCapableNode, AclNodeListener> {
 
     private static final Logger LOG = LoggerFactory.getLogger(AclNodeListener.class);
 
     private final IMdsalApiManager mdsalManager;
-    private final AclClusterUtil aclClusterUtil;
     private final AclserviceConfig config;
     private final DataBroker dataBroker;
+    private final AclServiceUtils aclServiceUtils;
+    private final JobCoordinator jobCoordinator;
 
     private SecurityGroupMode securityGroupMode = null;
 
     @Inject
     public AclNodeListener(final IMdsalApiManager mdsalManager, DataBroker dataBroker, AclserviceConfig config,
-            AclClusterUtil aclClusterUtil) {
+            AclServiceUtils aclServiceUtils, JobCoordinator jobCoordinator) {
         super(FlowCapableNode.class, AclNodeListener.class);
 
         this.mdsalManager = mdsalManager;
-        this.aclClusterUtil = aclClusterUtil;
         this.dataBroker = dataBroker;
         this.config = config;
+        this.aclServiceUtils = aclServiceUtils;
+        this.jobCoordinator = jobCoordinator;
     }
 
+    @Override
     @PostConstruct
-    public void start() {
+    public void init() {
         LOG.info("{} start", getClass().getSimpleName());
         if (config != null) {
             this.securityGroupMode = config.getSecurityGroupMode();
         }
+        this.aclServiceUtils.createRemoteAclIdPool();
         registerListener(LogicalDatastoreType.OPERATIONAL, dataBroker);
         LOG.info("AclserviceConfig: {}", this.config);
     }
 
-    @PreDestroy
     @Override
-    public void close() throws Exception {
+    public void close() {
         super.close();
+        this.aclServiceUtils.deleteRemoteAclIdPool();
     }
 
     @Override
@@ -106,504 +98,24 @@ public class AclNodeListener extends AsyncDataTreeChangeListenerBase<FlowCapable
 
     @Override
     protected void add(InstanceIdentifier<FlowCapableNode> key, FlowCapableNode dataObjectModification) {
-        LOG.trace("FlowCapableNode Added: key: {}", key);
-        if (!aclClusterUtil.isEntityOwner()) {
-            return;
-        }
         NodeKey nodeKey = key.firstKeyOf(Node.class);
-        BigInteger dpnId = MDSALUtil.getDpnIdFromNodeName(nodeKey.getId());
-        createTableDefaultEntries(dpnId);
-    }
+        BigInteger dpId = MDSALUtil.getDpnIdFromNodeName(nodeKey.getId());
+        LOG.info("Received ACL node [{}] add event", dpId);
 
-    /**
-     * Creates the table miss entries.
-     *
-     * @param dpnId the dpn id
-     */
-    private void createTableDefaultEntries(BigInteger dpnId) {
-        LOG.info("Adding default ACL entries for mode: "
-                + (securityGroupMode == null ? SecurityGroupMode.Stateful : securityGroupMode));
-        if (securityGroupMode == null || securityGroupMode == SecurityGroupMode.Stateful) {
-            addIngressAclTableMissFlow(dpnId);
-            addEgressAclTableMissFlow(dpnId);
-            addConntrackRules(dpnId, NwConstants.LPORT_DISPATCHER_TABLE, NwConstants.INGRESS_ACL_FILTER_TABLE,
-                    NwConstants.ADD_FLOW);
-            addConntrackRules(dpnId, NwConstants.EGRESS_LPORT_DISPATCHER_TABLE, NwConstants.EGRESS_ACL_FILTER_TABLE,
-                    NwConstants.ADD_FLOW);
-        } else if (securityGroupMode == SecurityGroupMode.Transparent) {
-            addTransparentIngressAclTableMissFlow(dpnId);
-            addTransparentEgressAclTableMissFlow(dpnId);
-        } else if (securityGroupMode == SecurityGroupMode.Stateless) {
-            addStatelessIngressAclTableMissFlow(dpnId);
-            addStatelessEgressAclTableMissFlow(dpnId);
-        } else if (securityGroupMode == SecurityGroupMode.Learn) {
-            addLearnIngressAclTableMissFlow(dpnId);
-            addLearnEgressAclTableMissFlow(dpnId);
+        if (securityGroupMode != null && securityGroupMode != SecurityGroupMode.Stateful) {
+            LOG.error("Invalid security group mode ({}) obtained from AclserviceConfig. dpId={}", securityGroupMode,
+                    dpId);
+            return;
         }
-    }
-
-    /**
-     * Adds the ingress acl table miss flow.
-     *
-     * @param dpId the dp id
-     */
-    private void addIngressAclTableMissFlow(BigInteger dpId) {
-        List<MatchInfo> mkMatches = new ArrayList<>();
-        List<InstructionInfo> mkInstructions = new ArrayList<>();
-        List<ActionInfo> actionsInfos = new ArrayList<>();
-        actionsInfos.add(new ActionInfo(ActionType.drop_action, new String[] {}));
-        mkInstructions.add(new InstructionInfo(InstructionType.apply_actions, actionsInfos));
-
-        FlowEntity flowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.EGRESS_ACL_TABLE,
-                getTableMissFlowId(NwConstants.EGRESS_ACL_TABLE), 0, "Ingress ACL Table Miss Flow", 0, 0,
-                AclConstants.COOKIE_ACL_BASE, mkMatches, mkInstructions);
-        mdsalManager.installFlow(flowEntity);
-
-        FlowEntity nextTblFlowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.EGRESS_ACL_FILTER_TABLE,
-                getTableMissFlowId(NwConstants.EGRESS_ACL_FILTER_TABLE), 0, "Ingress ACL Filter Table Miss Flow",
-                0, 0, AclConstants.COOKIE_ACL_BASE, mkMatches, mkInstructions);
-        mdsalManager.installFlow(nextTblFlowEntity);
-
-        LOG.debug("Added Ingress ACL Table Miss Flows for dpn {}", dpId);
-    }
-
-    private void addLearnEgressAclTableMissFlow(BigInteger dpId) {
-        List<InstructionInfo> mkInstructions = new ArrayList<>();
-        List<ActionInfo> actionsInfos = new ArrayList<>();
-        actionsInfos.add(new ActionInfo(ActionType.nx_resubmit,
-                new String[] {Short.toString(NwConstants.EGRESS_LEARN_TABLE) }));
-        actionsInfos.add(new ActionInfo(ActionType.nx_resubmit,
-                new String[] {Short.toString(NwConstants.EGRESS_LEARN2_TABLE) }));
-        mkInstructions.add(new InstructionInfo(InstructionType.apply_actions, actionsInfos));
-
-        List<MatchInfo> mkMatches = new ArrayList<>();
-        FlowEntity doubleResubmitTable = MDSALUtil.buildFlowEntity(dpId, NwConstants.EGRESS_ACL_TABLE,
-                "RESUB-" + getTableMissFlowId(NwConstants.EGRESS_ACL_TABLE),
-                AclConstants.PROTO_MATCH_PRIORITY, "Egress resubmit ACL Table Block", 0, 0,
-                AclConstants.COOKIE_ACL_BASE, mkMatches, mkInstructions);
-        mdsalManager.installFlow(doubleResubmitTable);
-
-        mkMatches = new ArrayList<>();
-        mkInstructions = new ArrayList<>();
-        actionsInfos = new ArrayList<>();
-        actionsInfos.add(new ActionInfo(ActionType.drop_action, new String[] {}));
-        mkInstructions.add(new InstructionInfo(InstructionType.apply_actions, actionsInfos));
-
-        FlowEntity flowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.EGRESS_LEARN_TABLE,
-                "LEARN-" + getTableMissFlowId(NwConstants.EGRESS_LEARN_TABLE), 0,
-                "Egress Learn ACL Table Miss Flow", 0, 0,
-                AclConstants.COOKIE_ACL_BASE, mkMatches, mkInstructions);
-        mdsalManager.installFlow(flowEntity);
-
-        flowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.EGRESS_LEARN2_TABLE,
-                "LEARN-" + getTableMissFlowId(NwConstants.EGRESS_LEARN2_TABLE), 0,
-                "Egress Learn2 ACL Table Miss Flow", 0, 0,
-                AclConstants.COOKIE_ACL_BASE, mkMatches, mkInstructions);
-        mdsalManager.installFlow(flowEntity);
-
-        List<NxMatchInfo> nxMkMatches = new ArrayList<>();
-        nxMkMatches.add(new NxMatchInfo(NxMatchFieldType.nxm_reg_6,
-                new long[] {Long.valueOf(AclConstants.LEARN_MATCH_REG_VALUE)}));
-
-        short dispatcherTableId = NwConstants.EGRESS_LPORT_DISPATCHER_TABLE;
-        List<InstructionInfo> instructions = new ArrayList<>();
-        actionsInfos.add(new ActionInfo(ActionType.nx_resubmit, new String[] {Short.toString(dispatcherTableId)}));
-        instructions.add(new InstructionInfo(InstructionType.apply_actions, actionsInfos));
-
-        flowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.EGRESS_LEARN2_TABLE,
-                "LEARN2-REG-" + getTableMissFlowId(NwConstants.EGRESS_LEARN2_TABLE),
-                AclConstants.PROTO_MATCH_PRIORITY, "Egress Learn2 ACL Table match reg Flow", 0, 0,
-                AclConstants.COOKIE_ACL_BASE, nxMkMatches, instructions);
-        mdsalManager.installFlow(flowEntity);
-        LOG.debug("Added learn ACL Table Miss Flows for dpn {}", dpId);
-    }
-
-    private void addLearnIngressAclTableMissFlow(BigInteger dpId) {
-        List<InstructionInfo> mkInstructions = new ArrayList<>();
-        List<ActionInfo> actionsInfos = new ArrayList<>();
-        actionsInfos.add(new ActionInfo(ActionType.nx_resubmit,
-                new String[] {Short.toString(NwConstants.INGRESS_LEARN_TABLE) }));
-        actionsInfos.add(new ActionInfo(ActionType.nx_resubmit,
-                new String[] {Short.toString(NwConstants.INGRESS_LEARN2_TABLE) }));
-        mkInstructions.add(new InstructionInfo(InstructionType.apply_actions, actionsInfos));
-
-        List<MatchInfo> mkMatches = new ArrayList<>();
-        FlowEntity doubleResubmitTable = MDSALUtil.buildFlowEntity(dpId, NwConstants.INGRESS_ACL_TABLE,
-                "RESUB-" + getTableMissFlowId(NwConstants.INGRESS_ACL_TABLE),
-                AclConstants.PROTO_MATCH_PRIORITY, "Ingress resubmit ACL Table Block", 0, 0,
-                AclConstants.COOKIE_ACL_BASE, mkMatches, mkInstructions);
-        mdsalManager.installFlow(doubleResubmitTable);
-
-        mkMatches = new ArrayList<>();
-        mkInstructions = new ArrayList<>();
-        actionsInfos = new ArrayList<>();
-        actionsInfos.add(new ActionInfo(ActionType.drop_action, new String[] {}));
-        mkInstructions.add(new InstructionInfo(InstructionType.apply_actions, actionsInfos));
-
-        FlowEntity flowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.INGRESS_LEARN_TABLE,
-                "LEARN-" + getTableMissFlowId(NwConstants.INGRESS_LEARN_TABLE), 0,
-                "Ingress Learn ACL Table Miss Flow", 0, 0,
-                AclConstants.COOKIE_ACL_BASE, mkMatches, mkInstructions);
-        mdsalManager.installFlow(flowEntity);
-
-        flowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.INGRESS_LEARN2_TABLE,
-                "LEARN-" + getTableMissFlowId(NwConstants.INGRESS_LEARN2_TABLE), 0,
-                "Ingress Learn2 ACL Table Miss Flow", 0, 0,
-                AclConstants.COOKIE_ACL_BASE, mkMatches, mkInstructions);
-        mdsalManager.installFlow(flowEntity);
-
-        List<NxMatchInfo> nxMkMatches = new ArrayList<>();
-        nxMkMatches.add(new NxMatchInfo(NxMatchFieldType.nxm_reg_6,
-                new long[] {Long.valueOf(AclConstants.LEARN_MATCH_REG_VALUE)}));
-
-        short dispatcherTableId = NwConstants.LPORT_DISPATCHER_TABLE;
-        List<InstructionInfo> instructions = new ArrayList<>();
-        actionsInfos.add(new ActionInfo(ActionType.nx_resubmit, new String[] {Short.toString(dispatcherTableId)}));
-        instructions.add(new InstructionInfo(InstructionType.apply_actions, actionsInfos));
-
-        flowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.INGRESS_LEARN2_TABLE,
-                "LEARN2-REG-" + getTableMissFlowId(NwConstants.INGRESS_LEARN2_TABLE),
-                AclConstants.PROTO_MATCH_PRIORITY, "Egress Learn2 ACL Table match reg Flow", 0, 0,
-                AclConstants.COOKIE_ACL_BASE, nxMkMatches, instructions);
-        mdsalManager.installFlow(flowEntity);
-        LOG.debug("Added learn ACL Table Miss Flows for dpn {}", dpId);
-
-    }
-
-    /**
-     * Adds the ingress acl table transparent flow.
-     *
-     * @param dpId the dp id
-     */
-    private void addTransparentIngressAclTableMissFlow(BigInteger dpId) {
-        List<MatchInfo> mkMatches = new ArrayList<>();
-        List<InstructionInfo> allowAllInstructions = new ArrayList<>();
-        allowAllInstructions.add(
-            new InstructionInfo(InstructionType.goto_table,
-                    new long[] { NwConstants.INGRESS_ACL_FILTER_TABLE }));
-
-        FlowEntity nextTblFlowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.INGRESS_ACL_TABLE,
-                getTableMissFlowId(NwConstants.INGRESS_ACL_TABLE), 0, "Ingress ACL Table allow all Flow",
-                0, 0, AclConstants.COOKIE_ACL_BASE, mkMatches, allowAllInstructions);
-        mdsalManager.installFlow(nextTblFlowEntity);
-
-        short dispatcherTableId = NwConstants.LPORT_DISPATCHER_TABLE;
-
-        List<ActionInfo> actionsInfos = new ArrayList<>();
-        List<InstructionInfo> dispatcherInstructions = new ArrayList<>();
-        actionsInfos.add(new ActionInfo(ActionType.nx_resubmit, new String[] {Short.toString(dispatcherTableId)}));
-        dispatcherInstructions.add(new InstructionInfo(InstructionType.apply_actions, actionsInfos));
-
-        nextTblFlowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.INGRESS_ACL_FILTER_TABLE,
-                getTableMissFlowId(NwConstants.INGRESS_ACL_FILTER_TABLE), 0, "Ingress ACL Filter Table allow all Flow",
-                0, 0, AclConstants.COOKIE_ACL_BASE, mkMatches, dispatcherInstructions);
-        mdsalManager.installFlow(nextTblFlowEntity);
-
-        LOG.debug("Added Transparent Ingress ACL Table allow all Flows for dpn {}", dpId);
-    }
-
-    /**
-     * Adds the egress acl table transparent flow.
-     *
-     * @param dpId the dp id
-     */
-    private void addTransparentEgressAclTableMissFlow(BigInteger dpId) {
-        List<MatchInfo> mkMatches = new ArrayList<>();
-        List<InstructionInfo> allowAllInstructions = new ArrayList<>();
-        allowAllInstructions.add(
-            new InstructionInfo(InstructionType.goto_table,
-                    new long[] { NwConstants.EGRESS_ACL_FILTER_TABLE }));
-
-        FlowEntity nextTblFlowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.EGRESS_ACL_TABLE,
-                getTableMissFlowId(NwConstants.EGRESS_ACL_TABLE), 0, "Egress ACL Table allow all Flow",
-                0, 0, AclConstants.COOKIE_ACL_BASE, mkMatches, allowAllInstructions);
-        mdsalManager.installFlow(nextTblFlowEntity);
-
-        short dispatcherTableId =  NwConstants.EGRESS_LPORT_DISPATCHER_TABLE;
-
-        List<ActionInfo> actionsInfos = new ArrayList<>();
-        List<InstructionInfo> instructions = new ArrayList<>();
-        actionsInfos.add(new ActionInfo(ActionType.nx_resubmit, new String[] {Short.toString(dispatcherTableId)}));
-        instructions.add(new InstructionInfo(InstructionType.apply_actions, actionsInfos));
-
-        nextTblFlowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.EGRESS_ACL_FILTER_TABLE,
-                getTableMissFlowId(NwConstants.EGRESS_ACL_FILTER_TABLE), 0, "Egress ACL Filter Table allow all Flow",
-                0, 0, AclConstants.COOKIE_ACL_BASE, mkMatches, instructions);
-        mdsalManager.installFlow(nextTblFlowEntity);
-
-        LOG.debug("Added Transparent Egress ACL Table allow all Flows for dpn {}", dpId);
-    }
-
-    /**
-     * Adds the ingress acl table miss flow.
-     *
-     * @param dpId the dp id
-     */
-    private void addStatelessIngressAclTableMissFlow(BigInteger dpId) {
-        List<MatchInfo> synMatches = new ArrayList<>();
-        synMatches.add(new MatchInfo(MatchFieldType.eth_type,
-                new long[] { NwConstants.ETHTYPE_IPV4 }));
-        synMatches.add(new MatchInfo(MatchFieldType.ip_proto,
-                new long[] { IPProtocols.TCP.intValue() }));
+        jobCoordinator.enqueueJob(String.valueOf(dpId), () -> {
+            WriteTransaction tx = this.dataBroker.newWriteOnlyTransaction();
+            new AclNodeDefaultFlowsTxBuilder(dpId, mdsalManager, config, tx).build();
 
-        synMatches.add(new MatchInfo(MatchFieldType.tcp_flags, new long[] { AclConstants.TCP_FLAG_SYN }));
-
-        List<ActionInfo> dropActionsInfos = new ArrayList<>();
-        dropActionsInfos.add(new ActionInfo(ActionType.drop_action, new String[] {}));
-        List<InstructionInfo> synInstructions = new ArrayList<>();
-        synInstructions.add(new InstructionInfo(InstructionType.apply_actions, dropActionsInfos));
-
-        FlowEntity synFlowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.EGRESS_ACL_TABLE,
-                "SYN-" + getTableMissFlowId(NwConstants.EGRESS_ACL_TABLE),
-                AclConstants.PROTO_MATCH_SYN_DROP_PRIORITY, "Ingress Syn ACL Table Block", 0, 0,
-                AclConstants.COOKIE_ACL_BASE, synMatches, synInstructions);
-        mdsalManager.installFlow(synFlowEntity);
-
-        synMatches = new ArrayList<>();
-        synMatches.add(new MatchInfo(MatchFieldType.eth_type,
-                new long[] { NwConstants.ETHTYPE_IPV4 }));
-        synMatches.add(new MatchInfo(MatchFieldType.ip_proto,
-                new long[] { IPProtocols.TCP.intValue() }));
-        synMatches.add(new MatchInfo(MatchFieldType.tcp_flags, new long[] { AclConstants.TCP_FLAG_SYN_ACK }));
-
-        List<InstructionInfo> allowAllInstructions = new ArrayList<>();
-        allowAllInstructions.add(
-            new InstructionInfo(InstructionType.goto_table,
-                    new long[] { NwConstants.EGRESS_ACL_FILTER_TABLE }));
-
-        FlowEntity synAckFlowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.EGRESS_ACL_TABLE,
-                "SYN-ACK-ALLOW-" + getTableMissFlowId(NwConstants.EGRESS_ACL_TABLE),
-                AclConstants.PROTO_MATCH_SYN_ACK_ALLOW_PRIORITY, "Ingress Syn Ack ACL Table Allow", 0, 0,
-                AclConstants.COOKIE_ACL_BASE, synMatches, allowAllInstructions);
-        mdsalManager.installFlow(synAckFlowEntity);
-
-
-        List<MatchInfo> mkMatches = new ArrayList<>();
-        FlowEntity flowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.EGRESS_ACL_TABLE,
-                getTableMissFlowId(NwConstants.EGRESS_ACL_TABLE), 0, "Ingress Stateless ACL Table Miss Flow",
-                0, 0, AclConstants.COOKIE_ACL_BASE, mkMatches, allowAllInstructions);
-        mdsalManager.installFlow(flowEntity);
-
-        short dispatcherTableId =  NwConstants.EGRESS_LPORT_DISPATCHER_TABLE;
-
-        List<ActionInfo> actionsInfos = new ArrayList<>();
-        List<InstructionInfo> instructions = new ArrayList<>();
-        actionsInfos.add(new ActionInfo(ActionType.nx_resubmit, new String[] {Short.toString(dispatcherTableId)}));
-        instructions.add(new InstructionInfo(InstructionType.apply_actions, actionsInfos));
-
-        FlowEntity nextTblFlowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.EGRESS_ACL_FILTER_TABLE,
-                getTableMissFlowId(NwConstants.EGRESS_ACL_FILTER_TABLE), 0,
-                "Ingress Stateless Next ACL Table Miss Flow", 0, 0, AclConstants.COOKIE_ACL_BASE,
-                mkMatches, instructions);
-        mdsalManager.installFlow(nextTblFlowEntity);
-
-        LOG.debug("Added Stateless Ingress ACL Table Miss Flows for dpn {}.", dpId);
-    }
-
-    /**
-     * Adds the stateless egress acl table miss flow.
-     *
-     * @param dpId the dp id
-     */
-    private void addStatelessEgressAclTableMissFlow(BigInteger dpId) {
-        List<InstructionInfo> allowAllInstructions = new ArrayList<>();
-        allowAllInstructions.add(
-                new InstructionInfo(InstructionType.goto_table, new long[] { NwConstants.INGRESS_ACL_FILTER_TABLE }));
-
-        List<MatchInfo> synMatches = new ArrayList<>();
-        synMatches.add(new MatchInfo(MatchFieldType.eth_type,
-                new long[] { NwConstants.ETHTYPE_IPV4 }));
-        synMatches.add(new MatchInfo(MatchFieldType.ip_proto,
-                new long[] { IPProtocols.TCP.intValue() }));
-        synMatches.add(new MatchInfo(MatchFieldType.tcp_flags, new long[] { AclConstants.TCP_FLAG_SYN }));
-
-        List<ActionInfo> synActionsInfos = new ArrayList<>();
-        synActionsInfos.add(new ActionInfo(ActionType.drop_action, new String[] {}));
-        List<InstructionInfo> synInstructions = new ArrayList<>();
-        synInstructions.add(new InstructionInfo(InstructionType.apply_actions, synActionsInfos));
-
-        FlowEntity synFlowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.INGRESS_ACL_TABLE,
-                "SYN-" + getTableMissFlowId(NwConstants.INGRESS_ACL_TABLE),
-                AclConstants.PROTO_MATCH_SYN_DROP_PRIORITY, "Egress Syn ACL Table Block", 0, 0,
-                AclConstants.COOKIE_ACL_BASE, synMatches, synInstructions);
-        mdsalManager.installFlow(synFlowEntity);
-
-        synMatches = new ArrayList<>();
-        synMatches.add(new MatchInfo(MatchFieldType.eth_type,
-                new long[] { NwConstants.ETHTYPE_IPV4 }));
-        synMatches.add(new MatchInfo(MatchFieldType.ip_proto,
-                new long[] { IPProtocols.TCP.intValue() }));
-        synMatches.add(new MatchInfo(MatchFieldType.tcp_flags, new long[] { AclConstants.TCP_FLAG_SYN_ACK }));
-
-        FlowEntity synAckFlowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.INGRESS_ACL_TABLE,
-                "SYN-ACK-ALLOW-" + getTableMissFlowId(NwConstants.INGRESS_ACL_TABLE),
-                AclConstants.PROTO_MATCH_SYN_ACK_ALLOW_PRIORITY, "Egress Syn Ack ACL Table Allow", 0, 0,
-                AclConstants.COOKIE_ACL_BASE, synMatches, allowAllInstructions);
-        mdsalManager.installFlow(synAckFlowEntity);
-
-        List<MatchInfo> mkMatches = new ArrayList<>();
-        FlowEntity flowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.INGRESS_ACL_TABLE,
-                getTableMissFlowId(NwConstants.INGRESS_ACL_TABLE), 0, "Egress Stateless ACL Table Miss Flow", 0, 0,
-                AclConstants.COOKIE_ACL_BASE, mkMatches, allowAllInstructions);
-        mdsalManager.installFlow(flowEntity);
-
-        short dispatcherTableId = NwConstants.LPORT_DISPATCHER_TABLE;
-
-        List<ActionInfo> actionsInfos = new ArrayList<>();
-        List<InstructionInfo> dispatcherInstructions = new ArrayList<>();
-        actionsInfos.add(new ActionInfo(ActionType.nx_resubmit, new String[] {Short.toString(dispatcherTableId)}));
-        dispatcherInstructions.add(new InstructionInfo(InstructionType.apply_actions, actionsInfos));
-
-        FlowEntity nextTblFlowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.INGRESS_ACL_FILTER_TABLE,
-                getTableMissFlowId(NwConstants.INGRESS_ACL_FILTER_TABLE), 0,
-                "Egress Stateless Next ACL Table Miss Flow", 0, 0, AclConstants.COOKIE_ACL_BASE, mkMatches,
-                dispatcherInstructions);
-        mdsalManager.installFlow(nextTblFlowEntity);
-
-        LOG.debug("Added Stateless Egress ACL Table Miss Flows for dpn {}", dpId);
-    }
-
-    /**
-     * Adds the egress acl table miss flow.
-     *
-     * @param dpId the dp id
-     */
-    private void addEgressAclTableMissFlow(BigInteger dpId) {
-        List<MatchInfo> mkMatches = new ArrayList<>();
-        List<InstructionInfo> mkInstructions = new ArrayList<>();
-        List<ActionInfo> actionsInfos = new ArrayList<>();
-        actionsInfos.add(new ActionInfo(ActionType.drop_action, new String[] {}));
-        mkInstructions.add(new InstructionInfo(InstructionType.apply_actions, actionsInfos));
-
-        FlowEntity flowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.INGRESS_ACL_TABLE,
-                getTableMissFlowId(NwConstants.INGRESS_ACL_TABLE), 0, "Egress ACL Table Miss Flow", 0, 0,
-                AclConstants.COOKIE_ACL_BASE, mkMatches, mkInstructions);
-        mdsalManager.installFlow(flowEntity);
-
-        FlowEntity nextTblFlowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.INGRESS_ACL_FILTER_TABLE,
-                getTableMissFlowId(NwConstants.INGRESS_ACL_FILTER_TABLE), 0, "Egress ACL Table Miss Flow", 0, 0,
-                AclConstants.COOKIE_ACL_BASE, mkMatches, mkInstructions);
-        mdsalManager.installFlow(nextTblFlowEntity);
-
-        LOG.debug("Added Egress ACL Table Miss Flows for dpn {}", dpId);
-    }
-
-    private void addConntrackRules(BigInteger dpnId, short dispatcherTableId,short tableId, int write) {
-        programConntrackForwardRule(dpnId, AclConstants.CT_STATE_TRACKED_EXIST_PRIORITY,
-            "Tracked_Established", AclConstants.TRACKED_EST_CT_STATE, AclConstants.TRACKED_EST_CT_STATE_MASK,
-            dispatcherTableId, tableId, write );
-        programConntrackForwardRule(dpnId, AclConstants.CT_STATE_TRACKED_EXIST_PRIORITY,"Tracked_Related", AclConstants
-            .TRACKED_REL_CT_STATE, AclConstants.TRACKED_REL_CT_STATE_MASK, dispatcherTableId, tableId, write );
-        programConntrackDropRule(dpnId, AclConstants.CT_STATE_NEW_PRIORITY_DROP,"Tracked_New",
-            AclConstants.TRACKED_NEW_CT_STATE, AclConstants.TRACKED_NEW_CT_STATE_MASK, tableId, write );
-        programConntrackDropRule(dpnId, AclConstants.CT_STATE_NEW_PRIORITY_DROP, "Tracked_Invalid",
-            AclConstants.TRACKED_INV_CT_STATE, AclConstants.TRACKED_INV_CT_STATE_MASK, tableId, write );
-
-    }
-
-    /**
-     * Adds the rule to forward the packets known packets.
-     *
-     * @param dpId the dpId
-     * @param lportTag the lport tag
-     * @param priority the priority of the flow
-     * @param flowId the flowId
-     * @param conntrackState the conntrack state of the packets thats should be
-     *        send
-     * @param conntrackMask the conntrack mask
-     * @param addOrRemove whether to add or remove the flow
-     */
-    private void programConntrackForwardRule(BigInteger dpId, Integer priority, String flowId,
-            int conntrackState, int conntrackMask, short dispatcherTableId, short tableId, int addOrRemove) {
-        List<MatchInfoBase> matches = new ArrayList<>();
-        matches.add(new NxMatchInfo(NxMatchFieldType.ct_state, new long[] {conntrackState, conntrackMask}));
-
-        List<InstructionInfo> instructions = getDispatcherTableResubmitInstructions(
-            new ArrayList<>(),dispatcherTableId);
-
-        flowId = "Fixed_Conntrk_Trk_" + dpId + "_" + flowId + dispatcherTableId;
-        syncFlow(dpId, tableId, flowId, priority, "ACL", 0, 0,
-                AclConstants.COOKIE_ACL_BASE, matches, instructions, addOrRemove);
-    }
-
-    /**
-     * Adds the rule to drop the unknown/invalid packets .
-     *
-     * @param dpId the dpId
-     * @param lportTag the lport tag
-     * @param priority the priority of the flow
-     * @param flowId the flowId
-     * @param conntrackState the conntrack state of the packets thats should be
-     *        send
-     * @param conntrackMask the conntrack mask
-     * @param addOrRemove whether to add or remove the flow
-     */
-    private void programConntrackDropRule(BigInteger dpId, Integer priority, String flowId,
-            int conntrackState, int conntrackMask, short tableId, int addOrRemove) {
-        List<MatchInfoBase> matches = new ArrayList<>();
-        matches.add(new NxMatchInfo(NxMatchFieldType.ct_state, new long[] {conntrackState, conntrackMask}));
-
-        List<InstructionInfo> instructions = new ArrayList<>();
-        List<ActionInfo> actionsInfos = new ArrayList<>();
-        actionsInfos.add(new ActionInfo(ActionType.drop_action, new String[] {}));
-        instructions.add(new InstructionInfo(InstructionType.write_actions, actionsInfos));
-        flowId = "Fixed_Conntrk_NewDrop_" + dpId + "_" + flowId + tableId;
-        syncFlow(dpId, tableId, flowId, priority, "ACL", 0, 0,
-                AclConstants.COOKIE_ACL_BASE, matches, instructions, addOrRemove);
-    }
-
-    /**
-     * Gets the dispatcher table resubmit instructions.
-     *
-     * @param actionsInfos the actions infos
-     * @return the instructions for dispatcher table resubmit
-     */
-    private List<InstructionInfo> getDispatcherTableResubmitInstructions(List<ActionInfo> actionsInfos,
-                                                                         short dispatcherTableId) {
-        List<InstructionInfo> instructions = new ArrayList<>();
-        actionsInfos.add(new ActionInfo(ActionType.nx_resubmit, new String[] {Short.toString(dispatcherTableId)}));
-        instructions.add(new InstructionInfo(InstructionType.apply_actions, actionsInfos));
-        return instructions;
-    }
-
-    /**
-     * Writes/remove the flow to/from the datastore.
-     * @param dpId the dpId
-     * @param tableId the tableId
-     * @param flowId the flowId
-     * @param priority the priority
-     * @param flowName the flow name
-     * @param idleTimeOut the idle timeout
-     * @param hardTimeOut the hard timeout
-     * @param cookie the cookie
-     * @param matches the list of matches to be written
-     * @param instructions the list of instruction to be written.
-     * @param addOrRemove add or remove the entries.
-     */
-    protected void syncFlow(BigInteger dpId, short tableId, String flowId, int priority, String flowName,
-                          int idleTimeOut, int hardTimeOut, BigInteger cookie, List<? extends MatchInfoBase>  matches,
-                          List<InstructionInfo> instructions, int addOrRemove) {
-        if (addOrRemove == NwConstants.DEL_FLOW) {
-            FlowEntity flowEntity = MDSALUtil.buildFlowEntity(dpId, tableId,flowId,
-                priority, flowName , idleTimeOut, hardTimeOut, cookie, matches, null);
-            LOG.trace("Removing Acl Flow DpnId {}, flowId {}", dpId, flowId);
-            mdsalManager.removeFlow(flowEntity);
-        } else {
-            FlowEntity flowEntity = MDSALUtil.buildFlowEntity(dpId, tableId, flowId,
-                priority, flowName, idleTimeOut, hardTimeOut, cookie, matches, instructions);
-            LOG.trace("Installing DpnId {}, flowId {}", dpId, flowId);
-            mdsalManager.installFlow(flowEntity);
-        }
-    }
+            LOG.info("Adding default ACL flows for dpId={}", dpId);
+            return Collections.singletonList(tx.submit());
+        }, AclConstants.JOB_MAX_RETRIES);
 
-    /**
-     * Gets the table miss flow id.
-     *
-     * @param tableId the table id
-     * @return the table miss flow id
-     */
-    private String getTableMissFlowId(short tableId) {
-        return String.valueOf(tableId);
+        LOG.trace("FlowCapableNode (dpid: {}) add event is processed.", dpId);
     }
 
     @Override