Use multiple threads during flow programming

Change-Id: I86448f92c831bbf1ad142138c007d3e009361e02
Signed-off-by: Shashidhar Raja <shashidharr@altencalsoftlabs.com>

diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AbstractAclServiceImpl.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AbstractAclServiceImpl.java
index 93edcbfe847692d2a0cac4ec269e9100a67b2352..f98b2d0b547a2a1af6a233f20712fc061d5fd0cb 100644 (file)
--- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AbstractAclServiceImpl.java
+++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AbstractAclServiceImpl.java
@@ -265,8 +265,8 @@ public abstract class AbstractAclServiceImpl implements AclServiceListener {
             List<InstructionInfo> instructions =
                     AclServiceOFFlowBuilder.getGotoInstructionInfo(getAclRuleBasedFilterTable());
             instructions.add(AclServiceUtils.getWriteMetadataForRemoteAclTag(remoteAclTag));
-            syncFlow(port.getDpId(), getAclFilterCumDispatcherTable(), flowId,
-                    AclConstants.ACE_GOTO_NEXT_REMOTE_ACL_PRIORITY, "ACL", 0, 0, AclConstants.COOKIE_ACL_BASE, matches,
+            syncFlow(port.getDpId(), port.getInterfaceId(), getAclFilterCumDispatcherTable(), flowId,
+                    AclConstants.ACE_GOTO_NEXT_REMOTE_ACL_PRIORITY, 0, 0, AclConstants.COOKIE_ACL_BASE, matches,
                     instructions, addOrRemove);
 
             previousRemoteAclTag = remoteAclTag;
@@ -283,8 +283,9 @@ public abstract class AbstractAclServiceImpl implements AclServiceListener {
         List<InstructionInfo> instructions =
                 AclServiceOFFlowBuilder.getGotoInstructionInfo(getAclRuleBasedFilterTable());
         instructions.add(AclServiceUtils.getWriteMetadataForRemoteAclTag(firstRemoteAclTag));
-        syncFlow(port.getDpId(), getAclFilterCumDispatcherTable(), flowId, AclConstants.ACE_FIRST_REMOTE_ACL_PRIORITY,
-                "ACL", 0, 0, AclConstants.COOKIE_ACL_BASE, matches, instructions, addOrRemove);
+        syncFlow(port.getDpId(), port.getInterfaceId(), getAclFilterCumDispatcherTable(), flowId,
+                AclConstants.ACE_FIRST_REMOTE_ACL_PRIORITY, 0, 0, AclConstants.COOKIE_ACL_BASE, matches, instructions,
+                addOrRemove);
     }
 
     protected void programLastRemoteAclEntryInDispatcherTable(AclInterface port, Integer lastRemoteAclTag,
@@ -296,8 +297,9 @@ public abstract class AbstractAclServiceImpl implements AclServiceListener {
                 + lastRemoteAclTag;
 
         List<InstructionInfo> instructions = AclServiceOFFlowBuilder.getDropInstructionInfo();
-        syncFlow(port.getDpId(), getAclFilterCumDispatcherTable(), flowId, AclConstants.ACE_LAST_REMOTE_ACL_PRIORITY,
-                "ACL", 0, 0, AclServiceUtils.getDropFlowCookie(port.getLPortTag()), matches, instructions, addOrRemove);
+        syncFlow(port.getDpId(), port.getInterfaceId(), getAclFilterCumDispatcherTable(), flowId,
+                AclConstants.ACE_LAST_REMOTE_ACL_PRIORITY, 0, 0, AclServiceUtils.getDropFlowCookie(port.getLPortTag()),
+                matches, instructions, addOrRemove);
     }
 
     private void programAcl(AclInterface port, Action action, int addOrRemove) {
@@ -400,8 +402,8 @@ public abstract class AbstractAclServiceImpl implements AclServiceListener {
                     + ace.key().getRuleName();
 
             int operation = addOrRemove == NwConstants.MOD_FLOW ? NwConstants.DEL_FLOW : addOrRemove;
-            syncFlow(port.getDpId(), getAclFilterCumDispatcherTable(), flowId, flowPriority, "ACL", 0, 0,
-                    AclConstants.COOKIE_ACL_BASE, matches, instructions, operation);
+            syncFlow(port.getDpId(), port.getInterfaceId(), getAclFilterCumDispatcherTable(), flowId, flowPriority,
+                    0, 0, AclConstants.COOKIE_ACL_BASE, matches, instructions, operation);
 
             if (addOrRemove != NwConstants.DEL_FLOW) {
                 programAclForExistingTrafficTable(port, ace, addOrRemove, flowName, matches, flowPriority);
@@ -432,8 +434,8 @@ public abstract class AbstractAclServiceImpl implements AclServiceListener {
                     + ace.key().getRuleName();
 
             int operation = addOrRemove == NwConstants.MOD_FLOW ? NwConstants.DEL_FLOW : addOrRemove;
-            syncFlow(port.getDpId(), getAclRuleBasedFilterTable(), flowId, flowPriority, "ACL", 0, 0,
-                    AclConstants.COOKIE_ACL_BASE, matches, instructions, operation);
+            syncFlow(port.getDpId(), port.getInterfaceId(), getAclRuleBasedFilterTable(), flowId, flowPriority,
+                    0, 0, AclConstants.COOKIE_ACL_BASE, matches, instructions, operation);
 
             if (addOrRemove != NwConstants.DEL_FLOW) {
                 programAclForExistingTrafficTable(port, ace, addOrRemove, flowName, matches,
@@ -458,7 +460,7 @@ public abstract class AbstractAclServiceImpl implements AclServiceListener {
                 AclServiceUtils.createCtMarkInstructionForNewState(getAclFilterCumDispatcherTable(), port.getElanId());
         // Reversing the flow add/delete operation for this table.
         int operation = (addOrRemove == NwConstants.ADD_FLOW) ? NwConstants.DEL_FLOW : NwConstants.ADD_FLOW;
-        syncFlow(port.getDpId(), getAclForExistingTrafficTable(), newFlowName, priority, "ACL", 0,
+        syncFlow(port.getDpId(), port.getInterfaceId(), getAclForExistingTrafficTable(), newFlowName, priority, 0,
                 AclServiceUtils.getHardTimoutForApplyStatefulChangeOnExistingTraffic(ace, aclServiceUtils),
                 AclConstants.COOKIE_ACL_BASE, newMatches, instructions, operation);
     }
@@ -537,14 +539,14 @@ public abstract class AbstractAclServiceImpl implements AclServiceListener {
      *
      * @param dpId
      *            the dpId
+     * @param interfaceId
+     *            the interfaceId
      * @param tableId
      *            the tableId
      * @param flowId
      *            the flowId
      * @param priority
      *            the priority
-     * @param flowName
-     *            the flow name
      * @param idleTimeOut
      *            the idle timeout
      * @param hardTimeOut
@@ -558,17 +560,17 @@ public abstract class AbstractAclServiceImpl implements AclServiceListener {
      * @param addOrRemove
      *            add or remove the entries.
      */
-    protected void syncFlow(BigInteger dpId, short tableId, String flowId, int priority, String flowName,
+    protected void syncFlow(BigInteger dpId, String interfaceId, short tableId, String flowId, int priority,
             int idleTimeOut, int hardTimeOut, BigInteger cookie, List<? extends MatchInfoBase> matches,
             List<InstructionInfo> instructions, int addOrRemove) {
-        jobCoordinator.enqueueJob(flowName, () -> {
+        jobCoordinator.enqueueJob((AclConstants.ACL_JOB_KEY_PREFIX + interfaceId), () -> {
             if (addOrRemove == NwConstants.DEL_FLOW) {
                 LOG.trace("Removing Acl Flow DpnId {}, flowId {}", dpId, flowId);
                 return Collections.singletonList(txRunner.callWithNewReadWriteTransactionAndSubmit(
                     Datastore.CONFIGURATION, tx -> mdsalManager.removeFlow(tx, dpId, flowId, tableId)));
             } else {
-                FlowEntity flowEntity = MDSALUtil.buildFlowEntity(dpId, tableId, flowId, priority, flowName,
-                        idleTimeOut, hardTimeOut, cookie, matches, instructions);
+                FlowEntity flowEntity = MDSALUtil.buildFlowEntity(dpId, tableId, flowId, priority,
+                        flowId, idleTimeOut, hardTimeOut, cookie, matches, instructions);
                 LOG.trace("Installing DpnId {}, flowId {}", dpId, flowId);
                 return Collections.singletonList(
                     txRunner.callWithNewWriteOnlyTransactionAndSubmit(Datastore.CONFIGURATION,
@@ -796,10 +798,10 @@ public abstract class AbstractAclServiceImpl implements AclServiceListener {
      */
     protected void programAclPortSpecificFixedRules(BigInteger dpId, List<AllowedAddressPairs> allowedAddresses,
             int lportTag, String portId, Action action, int write) {
-        programGotoClassifierTableRules(dpId, allowedAddresses, lportTag, write);
+        programGotoClassifierTableRules(dpId, allowedAddresses, lportTag, portId, write);
         if (action == Action.ADD || action == Action.REMOVE) {
             programConntrackRecircRules(dpId, allowedAddresses, lportTag, portId, write);
-            programPortSpecificDropRules(dpId, lportTag, write);
+            programPortSpecificDropRules(dpId, lportTag, portId, write);
             programAclCommitRules(dpId, lportTag, portId, write);
         }
         LOG.info("programAclPortSpecificFixedRules: flows for dpId={}, lportId={}, action={}, write={}", dpId, lportTag,
@@ -807,7 +809,7 @@ public abstract class AbstractAclServiceImpl implements AclServiceListener {
     }
 
     protected abstract void programGotoClassifierTableRules(BigInteger dpId, List<AllowedAddressPairs> aaps,
-            int lportTag, int addOrRemove);
+            int lportTag, String portId, int addOrRemove);
 
     /**
      * Adds the rule to send the packet to the netfilter to check whether it is a known packet.
@@ -849,7 +851,7 @@ public abstract class AbstractAclServiceImpl implements AclServiceListener {
 
         String flowName =
                 this.directionString + "_Fixed_Conntrk_" + dpId + "_" + lportTag + "_" + matchEtherType + "_Recirc";
-        syncFlow(dpId, getAclConntrackSenderTable(), flowName, AclConstants.ACL_DEFAULT_PRIORITY, "ACL", 0, 0,
+        syncFlow(dpId, portId, getAclConntrackSenderTable(), flowName, AclConstants.ACL_DEFAULT_PRIORITY, 0, 0,
                 AclConstants.COOKIE_ACL_BASE, matches, instructions, addOrRemove);
     }
 
@@ -860,10 +862,10 @@ public abstract class AbstractAclServiceImpl implements AclServiceListener {
      * @param lportTag the lport tag
      * @param addOrRemove whether to add or remove the flow
      */
-    protected void programPortSpecificDropRules(BigInteger dpId, int lportTag, int addOrRemove) {
+    protected void programPortSpecificDropRules(BigInteger dpId, int lportTag, String portId, int addOrRemove) {
         LOG.debug("Programming Drop Rules: DpId={}, lportTag={}, addOrRemove={}", dpId, lportTag, addOrRemove);
-        programConntrackInvalidDropRule(dpId, lportTag, addOrRemove);
-        programAclRuleMissDropRule(dpId, lportTag, addOrRemove);
+        programConntrackInvalidDropRule(dpId, lportTag, portId, addOrRemove);
+        programAclRuleMissDropRule(dpId, lportTag, portId, addOrRemove);
     }
 
     /**
@@ -873,14 +875,15 @@ public abstract class AbstractAclServiceImpl implements AclServiceListener {
      * @param lportTag the lport tag
      * @param addOrRemove whether to add or remove the flow
      */
-    protected void programConntrackInvalidDropRule(BigInteger dpId, int lportTag, int addOrRemove) {
+    protected void programConntrackInvalidDropRule(BigInteger dpId, int lportTag, String portId, int addOrRemove) {
         List<MatchInfoBase> matches = AclServiceOFFlowBuilder.addLPortTagMatches(lportTag,
                 AclConstants.TRACKED_INV_CT_STATE, AclConstants.TRACKED_INV_CT_STATE_MASK, serviceMode);
         List<InstructionInfo> instructions = AclServiceOFFlowBuilder.getDropInstructionInfo();
 
         String flowId = this.directionString + "_Fixed_Conntrk_Drop" + dpId + "_" + lportTag + "_Tracked_Invalid";
-        syncFlow(dpId, getAclFilterCumDispatcherTable(), flowId, AclConstants.CT_STATE_TRACKED_INVALID_PRIORITY, "ACL",
-                0, 0, AclServiceUtils.getDropFlowCookie(lportTag), matches, instructions, addOrRemove);
+        syncFlow(dpId, portId, getAclFilterCumDispatcherTable(), flowId,
+                AclConstants.CT_STATE_TRACKED_INVALID_PRIORITY, 0, 0, AclServiceUtils.getDropFlowCookie(lportTag),
+                matches, instructions, addOrRemove);
     }
 
     /**
@@ -890,14 +893,14 @@ public abstract class AbstractAclServiceImpl implements AclServiceListener {
      * @param lportTag the lport tag
      * @param addOrRemove the add or remove
      */
-    protected void programAclRuleMissDropRule(BigInteger dpId, int lportTag, int addOrRemove) {
+    protected void programAclRuleMissDropRule(BigInteger dpId, int lportTag, String portId, int addOrRemove) {
         List<MatchInfoBase> matches = new ArrayList<>();
         matches.add(AclServiceUtils.buildLPortTagMatch(lportTag, serviceMode));
         List<InstructionInfo> instructions = AclServiceOFFlowBuilder.getDropInstructionInfo();
 
         String flowId = this.directionString + "_Fixed_Acl_Rule_Miss_Drop_" + dpId + "_" + lportTag;
-        syncFlow(dpId, getAclFilterCumDispatcherTable(), flowId, AclConstants.ACL_PORT_SPECIFIC_DROP_PRIORITY, "ACL", 0,
-                0, AclServiceUtils.getDropFlowCookie(lportTag), matches, instructions, addOrRemove);
+        syncFlow(dpId, portId, getAclFilterCumDispatcherTable(), flowId, AclConstants.ACL_PORT_SPECIFIC_DROP_PRIORITY,
+                0, 0, AclServiceUtils.getDropFlowCookie(lportTag), matches, instructions, addOrRemove);
     }
 
     /**
@@ -911,7 +914,7 @@ public abstract class AbstractAclServiceImpl implements AclServiceListener {
     protected void programAclCommitRules(BigInteger dpId, int lportTag, String portId, int addOrRemove) {
         programAclCommitRuleForConntrack(dpId, lportTag, portId, MatchEthernetType.IPV4, addOrRemove);
         programAclCommitRuleForConntrack(dpId, lportTag, portId, MatchEthernetType.IPV6, addOrRemove);
-        programAclCommitRuleForNonConntrack(dpId, lportTag, addOrRemove);
+        programAclCommitRuleForNonConntrack(dpId, lportTag, portId, addOrRemove);
     }
 
     /**
@@ -947,7 +950,7 @@ public abstract class AbstractAclServiceImpl implements AclServiceListener {
 
         String flowName = directionString + "_Acl_Commit_Conntrack_" + dpId + "_" + lportTag + "_" + matchEtherType;
         // Flow for conntrack traffic to commit and resubmit to dispatcher
-        syncFlow(dpId, getAclCommitterTable(), flowName, AclConstants.ACL_DEFAULT_PRIORITY, "ACL", 0, 0,
+        syncFlow(dpId, portId, getAclCommitterTable(), flowName, AclConstants.ACL_DEFAULT_PRIORITY, 0, 0,
                 AclConstants.COOKIE_ACL_BASE, matches, instructions, addOrRemove);
     }
 
@@ -958,7 +961,7 @@ public abstract class AbstractAclServiceImpl implements AclServiceListener {
      * @param lportTag the lport tag
      * @param addOrRemove the add or remove
      */
-    protected void programAclCommitRuleForNonConntrack(BigInteger dpId, int lportTag, int addOrRemove) {
+    protected void programAclCommitRuleForNonConntrack(BigInteger dpId, int lportTag, String portId, int addOrRemove) {
         List<MatchInfoBase> matches = new ArrayList<>();
         matches.addAll(AclServiceUtils.buildMatchesForLPortTagAndConntrackClassifierType(lportTag,
                 AclConntrackClassifierType.NON_CONNTRACK_SUPPORTED, serviceMode));
@@ -966,7 +969,7 @@ public abstract class AbstractAclServiceImpl implements AclServiceListener {
         List<InstructionInfo> instructions = getDispatcherTableResubmitInstructions();
         String flowName = this.directionString + "_Acl_Commit_Non_Conntrack_" + dpId + "_" + lportTag;
         // Flow for non-conntrack traffic to resubmit to dispatcher
-        syncFlow(dpId, getAclCommitterTable(), flowName, AclConstants.ACL_DEFAULT_PRIORITY, "ACL", 0, 0,
+        syncFlow(dpId, portId, getAclCommitterTable(), flowName, AclConstants.ACL_DEFAULT_PRIORITY, 0, 0,
                 AclConstants.COOKIE_ACL_BASE, matches, instructions, addOrRemove);
     }
 

diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/EgressAclServiceImpl.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/EgressAclServiceImpl.java
index 5db508b0c317fb9b0f93790ecfffc76b239cc11b..2d8ad39af76f3401b5f547ca1186986c0a24a7c7 100644 (file)
--- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/EgressAclServiceImpl.java
+++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/EgressAclServiceImpl.java
@@ -123,19 +123,20 @@ public class EgressAclServiceImpl extends AbstractAclServiceImpl {
 
         BigInteger dpid = port.getDpId();
         int lportTag = port.getLPortTag();
+        String portId = port.getInterfaceId();
         if (action != Action.UPDATE) {
-            programCommitterDropFlow(dpid, lportTag, addOrRemove);
-            egressAclIcmpv6AllowedList(dpid, lportTag, addOrRemove);
+            programCommitterDropFlow(dpid, lportTag, portId, addOrRemove);
+            egressAclIcmpv6AllowedList(dpid, lportTag, portId, addOrRemove);
         }
         List<AllowedAddressPairs> filteredAAPs = AclServiceUtils.excludeMulticastAAPs(allowedAddresses);
         programL2BroadcastAllowRule(port, filteredAAPs, addOrRemove);
 
         egressAclDhcpAllowClientTraffic(port, filteredAAPs, lportTag, addOrRemove);
         egressAclDhcpv6AllowClientTraffic(port, filteredAAPs, lportTag, addOrRemove);
-        programArpRule(dpid, filteredAAPs, lportTag, addOrRemove);
+        programArpRule(dpid, filteredAAPs, lportTag, portId, addOrRemove);
     }
 
-    private void programCommitterDropFlow(BigInteger dpId, int lportTag, int addOrRemove) {
+    private void programCommitterDropFlow(BigInteger dpId, int lportTag, String portId, int addOrRemove) {
         List<MatchInfoBase> matches = new ArrayList<>();
         List<InstructionInfo> instructions = AclServiceOFFlowBuilder.getDropInstructionInfo();
 
@@ -146,8 +147,8 @@ public class EgressAclServiceImpl extends AbstractAclServiceImpl {
         matches.add(new MatchMetadata(metaData, metaDataMask));
 
         String flowName = "Egress_" + dpId + "_" + lportTag + "_Drop";
-        syncFlow(dpId, getAclCommitterTable(), flowName, AclConstants.CT_STATE_TRACKED_INVALID_PRIORITY,
-                "ACL", 0, 0, AclServiceUtils.getDropFlowCookie(lportTag), matches, instructions, addOrRemove);
+        syncFlow(dpId, portId, getAclCommitterTable(), flowName, AclConstants.CT_STATE_TRACKED_INVALID_PRIORITY,
+                0, 0, AclServiceUtils.getDropFlowCookie(lportTag), matches, instructions, addOrRemove);
     }
 
     @Override
@@ -159,13 +160,13 @@ public class EgressAclServiceImpl extends AbstractAclServiceImpl {
         List<InstructionInfo> instructions = AclServiceOFFlowBuilder.getGotoInstructionInfo(getAclCommitterTable());
         String flowNameAdded = "Acl_Filter_Egress_" + aap.getIpAddress().stringValue() + "_" + aclTag;
 
-        syncFlow(dpId, getAclRemoteAclTable(), flowNameAdded, AclConstants.ACL_DEFAULT_PRIORITY, "ACL", 0, 0,
-                AclConstants.COOKIE_ACL_BASE, flowMatches, instructions, addOrRemove);
+        syncFlow(dpId, dpId.toString(), getAclRemoteAclTable(), flowNameAdded, AclConstants.ACL_DEFAULT_PRIORITY,
+                0, 0, AclConstants.COOKIE_ACL_BASE, flowMatches, instructions, addOrRemove);
     }
 
     @Override
     protected void programGotoClassifierTableRules(BigInteger dpId, List<AllowedAddressPairs> aaps, int lportTag,
-            int addOrRemove) {
+            String portId, int addOrRemove) {
         List<AllowedAddressPairs> filteredAAPs = AclServiceUtils.excludeMulticastAAPs(aaps);
         for (AllowedAddressPairs aap : filteredAAPs) {
             IpPrefixOrAddress attachIp = aap.getIpAddress();
@@ -181,7 +182,7 @@ public class EgressAclServiceImpl extends AbstractAclServiceImpl {
 
             String flowName = "Egress_Fixed_Goto_Classifier_" + dpId + "_" + lportTag + "_" + mac.getValue() + "_"
                     + attachIp.stringValue();
-            syncFlow(dpId, getAclAntiSpoofingTable(), flowName, AclConstants.PROTO_MATCH_PRIORITY, "ACL", 0, 0,
+            syncFlow(dpId, portId, getAclAntiSpoofingTable(), flowName, AclConstants.PROTO_MATCH_PRIORITY, 0, 0,
                     AclConstants.COOKIE_ACL_BASE, matches, gotoInstructions, addOrRemove);
         }
     }
@@ -193,14 +194,14 @@ public class EgressAclServiceImpl extends AbstractAclServiceImpl {
      * @param lportTag the lport tag
      * @param addOrRemove add/remove the flow.
      */
-    private void egressAclIcmpv6AllowedList(BigInteger dpId, int lportTag, int addOrRemove) {
+    private void egressAclIcmpv6AllowedList(BigInteger dpId, int lportTag, String portId, int addOrRemove) {
         List<InstructionInfo> instructions = getDispatcherTableResubmitInstructions();
 
         for (Integer icmpv6Type: AclConstants.allowedIcmpv6NdList()) {
             List<MatchInfoBase> matches = AclServiceUtils.buildIcmpV6Matches(icmpv6Type, 0, lportTag, serviceMode);
             String flowName = "Egress_ICMPv6" + "_" + dpId + "_" + lportTag + "_" + icmpv6Type + "_Permit_";
-            syncFlow(dpId, getAclAntiSpoofingTable(), flowName, AclConstants.PROTO_IPV6_ALLOWED_PRIORITY, "ACL", 0, 0,
-                    AclConstants.COOKIE_ACL_BASE, matches, instructions, addOrRemove);
+            syncFlow(dpId, portId, getAclAntiSpoofingTable(), flowName, AclConstants.PROTO_IPV6_ALLOWED_PRIORITY,
+                    0, 0, AclConstants.COOKIE_ACL_BASE, matches, instructions, addOrRemove);
         }
     }
 
@@ -230,8 +231,9 @@ public class EgressAclServiceImpl extends AbstractAclServiceImpl {
 
             String flowName =
                     "Egress_DHCP_Client_v4" + dpId + "_" + lportTag + "_" + aap.getMacAddress().getValue() + "_Permit_";
-            syncFlow(dpId, getAclAntiSpoofingTable(), flowName, AclConstants.PROTO_DHCP_CLIENT_TRAFFIC_MATCH_PRIORITY,
-                    "ACL", 0, 0, AclConstants.COOKIE_ACL_BASE, matches, instructions, addOrRemove);
+            syncFlow(dpId, port.getInterfaceId(), getAclAntiSpoofingTable(), flowName,
+                    AclConstants.PROTO_DHCP_CLIENT_TRAFFIC_MATCH_PRIORITY, 0, 0, AclConstants.COOKIE_ACL_BASE,
+                    matches, instructions, addOrRemove);
         }
     }
 
@@ -262,8 +264,9 @@ public class EgressAclServiceImpl extends AbstractAclServiceImpl {
 
             String flowName = "Egress_DHCP_Client_v6" + "_" + dpId + "_" + lportTag + "_"
                     + aap.getMacAddress().getValue() + "_Permit_";
-            syncFlow(dpId, getAclAntiSpoofingTable(), flowName, AclConstants.PROTO_DHCP_CLIENT_TRAFFIC_MATCH_PRIORITY,
-                    "ACL", 0, 0, AclConstants.COOKIE_ACL_BASE, matches, instructions, addOrRemove);
+            syncFlow(dpId, port.getInterfaceId(), getAclAntiSpoofingTable(), flowName,
+                    AclConstants.PROTO_DHCP_CLIENT_TRAFFIC_MATCH_PRIORITY, 0, 0, AclConstants.COOKIE_ACL_BASE,
+                    matches, instructions, addOrRemove);
         }
     }
 
@@ -276,7 +279,7 @@ public class EgressAclServiceImpl extends AbstractAclServiceImpl {
      * @param addOrRemove whether to add or remove the flow
      */
     protected void programArpRule(BigInteger dpId, List<AllowedAddressPairs> allowedAddresses, int lportTag,
-            int addOrRemove) {
+            String portId, int addOrRemove) {
         for (AllowedAddressPairs allowedAddress : allowedAddresses) {
             if (!AclServiceUtils.isIPv4Address(allowedAddress)) {
                 continue; // For IPv6 allowed addresses
@@ -297,8 +300,8 @@ public class EgressAclServiceImpl extends AbstractAclServiceImpl {
                     addOrRemove == NwConstants.DEL_FLOW ? "Deleting" : "Adding", dpId, lportTag);
             String flowName = "Egress_ARP_" + dpId + "_" + lportTag + "_" + allowedAddress.getMacAddress().getValue()
                     + allowedAddressIp.stringValue();
-            syncFlow(dpId, getAclAntiSpoofingTable(), flowName, AclConstants.PROTO_ARP_TRAFFIC_MATCH_PRIORITY, "ACL", 0,
-                    0, AclConstants.COOKIE_ACL_BASE, matches, instructions, addOrRemove);
+            syncFlow(dpId, portId, getAclAntiSpoofingTable(), flowName, AclConstants.PROTO_ARP_TRAFFIC_MATCH_PRIORITY,
+                    0, 0, AclConstants.COOKIE_ACL_BASE, matches, instructions, addOrRemove);
         }
     }
 
@@ -343,8 +346,9 @@ public class EgressAclServiceImpl extends AbstractAclServiceImpl {
             List<InstructionInfo> instructions = getDispatcherTableResubmitInstructions();
 
             String flowName = "Egress_L2Broadcast_" + dpId + "_" + lportTag + "_" + mac.getValue();
-            syncFlow(dpId, getAclAntiSpoofingTable(), flowName, AclConstants.PROTO_L2BROADCAST_TRAFFIC_MATCH_PRIORITY,
-                    "ACL", 0, 0, AclConstants.COOKIE_ACL_BASE, matches, instructions, addOrRemove);
+            syncFlow(dpId, port.getInterfaceId(), getAclAntiSpoofingTable(), flowName,
+                    AclConstants.PROTO_L2BROADCAST_TRAFFIC_MATCH_PRIORITY, 0, 0, AclConstants.COOKIE_ACL_BASE,
+                    matches, instructions, addOrRemove);
         }
     }
 

diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/IngressAclServiceImpl.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/IngressAclServiceImpl.java
index 2de00749dc26e299275699c8d975418297e347b5..5c22dbcfc1334c12d185dd85f36b3709a3696c44 100644 (file)
--- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/IngressAclServiceImpl.java
+++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/IngressAclServiceImpl.java
@@ -134,19 +134,20 @@ public class IngressAclServiceImpl extends AbstractAclServiceImpl {
 
         BigInteger dpid = port.getDpId();
         int lportTag = port.getLPortTag();
+        String portId = port.getInterfaceId();
         if (action == Action.ADD || action == Action.REMOVE) {
-            programCommitterDropFlow(dpid, lportTag, addOrRemove);
-            ingressAclDhcpAllowServerTraffic(dpid, lportTag, addOrRemove);
-            ingressAclDhcpv6AllowServerTraffic(dpid, lportTag, addOrRemove);
+            programCommitterDropFlow(dpid, lportTag, portId, addOrRemove);
+            ingressAclDhcpAllowServerTraffic(dpid, lportTag, portId, addOrRemove);
+            ingressAclDhcpv6AllowServerTraffic(dpid, lportTag, portId, addOrRemove);
             ingressAclIcmpv6AllowedTraffic(port, addOrRemove);
             programIcmpv6RARule(port, port.getSubnetInfo(), addOrRemove);
 
-            programArpRule(dpid, lportTag, addOrRemove);
+            programArpRule(dpid, lportTag, portId, addOrRemove);
             programIpv4BroadcastRule(port, addOrRemove);
         }
     }
 
-    private void programCommitterDropFlow(BigInteger dpId, int lportTag, int addOrRemove) {
+    private void programCommitterDropFlow(BigInteger dpId, int lportTag, String portId, int addOrRemove) {
         List<MatchInfoBase> matches = new ArrayList<>();
         List<InstructionInfo> instructions = AclServiceOFFlowBuilder.getDropInstructionInfo();
 
@@ -159,13 +160,13 @@ public class IngressAclServiceImpl extends AbstractAclServiceImpl {
         matches.add(new MatchMetadata(metaData, metaDataMask));
 
         String flowName = "Ingress_" + dpId + "_" + lportTag + "_Drop";
-        syncFlow(dpId, getAclCommitterTable(), flowName, AclConstants.CT_STATE_TRACKED_INVALID_PRIORITY,
-                "ACL", 0, 0, AclServiceUtils.getDropFlowCookie(lportTag), matches, instructions, addOrRemove);
+        syncFlow(dpId, portId, getAclCommitterTable(), flowName, AclConstants.CT_STATE_TRACKED_INVALID_PRIORITY,
+                0, 0, AclServiceUtils.getDropFlowCookie(lportTag), matches, instructions, addOrRemove);
     }
 
     @Override
     protected void programGotoClassifierTableRules(BigInteger dpId, List<AllowedAddressPairs> aaps, int lportTag,
-            int addOrRemove) {
+            String portId, int addOrRemove) {
         for (AllowedAddressPairs aap : aaps) {
             IpPrefixOrAddress attachIp = aap.getIpAddress();
             MacAddress mac = aap.getMacAddress();
@@ -180,7 +181,7 @@ public class IngressAclServiceImpl extends AbstractAclServiceImpl {
 
             String flowName = "Ingress_Fixed_Goto_Classifier_" + dpId + "_" + lportTag + "_" + mac.getValue() + "_"
                     + attachIp.stringValue();
-            syncFlow(dpId, getAclAntiSpoofingTable(), flowName, AclConstants.PROTO_MATCH_PRIORITY, "ACL", 0, 0,
+            syncFlow(dpId, portId, getAclAntiSpoofingTable(), flowName, AclConstants.PROTO_MATCH_PRIORITY, 0, 0,
                     AclConstants.COOKIE_ACL_BASE, matches, gotoInstructions, addOrRemove);
         }
     }
@@ -194,8 +195,8 @@ public class IngressAclServiceImpl extends AbstractAclServiceImpl {
         List<InstructionInfo> instructions = AclServiceOFFlowBuilder.getGotoInstructionInfo(getAclCommitterTable());
         String flowNameAdded = "Acl_Filter_Ingress_" + aap.getIpAddress().stringValue() + "_" + aclTag;
 
-        syncFlow(dpId, getAclRemoteAclTable(), flowNameAdded, AclConstants.ACL_DEFAULT_PRIORITY, "ACL", 0, 0,
-                AclConstants.COOKIE_ACL_BASE, flowMatches, instructions, addOrRemove);
+        syncFlow(dpId, dpId.toString(), getAclRemoteAclTable(), flowNameAdded, AclConstants.ACL_DEFAULT_PRIORITY,
+                0, 0, AclConstants.COOKIE_ACL_BASE, flowMatches, instructions, addOrRemove);
     }
 
     /**
@@ -206,14 +207,14 @@ public class IngressAclServiceImpl extends AbstractAclServiceImpl {
      * @param lportTag the lport tag
      * @param addOrRemove is write or delete
      */
-    protected void ingressAclDhcpAllowServerTraffic(BigInteger dpId, int lportTag, int addOrRemove) {
+    protected void ingressAclDhcpAllowServerTraffic(BigInteger dpId, int lportTag, String portId, int addOrRemove) {
         final List<MatchInfoBase> matches = AclServiceUtils.buildDhcpMatches(AclConstants.DHCP_SERVER_PORT_IPV4,
                 AclConstants.DHCP_CLIENT_PORT_IPV4, lportTag, serviceMode);
         List<InstructionInfo> instructions = getDispatcherTableResubmitInstructions();
 
         String flowName = "Ingress_DHCP_Server_v4" + dpId + "_" + lportTag + "_Permit_";
-        syncFlow(dpId, getAclAntiSpoofingTable(), flowName, AclConstants.PROTO_DHCP_SERVER_MATCH_PRIORITY, "ACL", 0, 0,
-                AclConstants.COOKIE_ACL_BASE, matches, instructions, addOrRemove);
+        syncFlow(dpId, portId, getAclAntiSpoofingTable(), flowName, AclConstants.PROTO_DHCP_SERVER_MATCH_PRIORITY,
+                0, 0, AclConstants.COOKIE_ACL_BASE, matches, instructions, addOrRemove);
     }
 
     /**
@@ -224,14 +225,14 @@ public class IngressAclServiceImpl extends AbstractAclServiceImpl {
      * @param lportTag the lport tag
      * @param addOrRemove is write or delete
      */
-    protected void ingressAclDhcpv6AllowServerTraffic(BigInteger dpId, int lportTag, int addOrRemove) {
+    protected void ingressAclDhcpv6AllowServerTraffic(BigInteger dpId, int lportTag, String portId, int addOrRemove) {
         final List<MatchInfoBase> matches = AclServiceUtils.buildDhcpV6Matches(AclConstants.DHCP_SERVER_PORT_IPV6,
                 AclConstants.DHCP_CLIENT_PORT_IPV6, lportTag, serviceMode);
         List<InstructionInfo> instructions = getDispatcherTableResubmitInstructions();
 
         String flowName = "Ingress_DHCP_Server_v6" + "_" + dpId + "_" + lportTag + "_Permit_";
-        syncFlow(dpId, getAclAntiSpoofingTable(), flowName, AclConstants.PROTO_DHCP_SERVER_MATCH_PRIORITY, "ACL", 0, 0,
-                AclConstants.COOKIE_ACL_BASE, matches, instructions, addOrRemove);
+        syncFlow(dpId, portId, getAclAntiSpoofingTable(), flowName, AclConstants.PROTO_DHCP_SERVER_MATCH_PRIORITY,
+                0, 0, AclConstants.COOKIE_ACL_BASE, matches, instructions, addOrRemove);
     }
 
     /**
@@ -244,6 +245,7 @@ public class IngressAclServiceImpl extends AbstractAclServiceImpl {
     private void ingressAclIcmpv6AllowedTraffic(AclInterface port, int addOrRemove) {
         BigInteger dpId = port.getDpId();
         int lportTag = port.getLPortTag();
+        String portId = port.getInterfaceId();
         List<InstructionInfo> instructions = getDispatcherTableResubmitInstructions();
 
         // Allow ICMPv6 Multicast Listener Query packets.
@@ -253,21 +255,21 @@ public class IngressAclServiceImpl extends AbstractAclServiceImpl {
         final short tableId = getAclAntiSpoofingTable();
         String flowName =
                 "Ingress_ICMPv6" + "_" + dpId + "_" + lportTag + "_" + AclConstants.ICMPV6_TYPE_MLD_QUERY + "_Permit_";
-        syncFlow(dpId, tableId, flowName, AclConstants.PROTO_IPV6_ALLOWED_PRIORITY, "ACL", 0, 0,
+        syncFlow(dpId, portId, tableId, flowName, AclConstants.PROTO_IPV6_ALLOWED_PRIORITY, 0, 0,
                 AclConstants.COOKIE_ACL_BASE, matches, instructions, addOrRemove);
 
         // Allow ICMPv6 Neighbor Solicitation packets.
         matches = AclServiceUtils.buildIcmpV6Matches(AclConstants.ICMPV6_TYPE_NS, 0, lportTag, serviceMode);
 
         flowName = "Ingress_ICMPv6" + "_" + dpId + "_" + lportTag + "_" + AclConstants.ICMPV6_TYPE_NS + "_Permit_";
-        syncFlow(dpId, tableId, flowName, AclConstants.PROTO_IPV6_ALLOWED_PRIORITY, "ACL", 0, 0,
+        syncFlow(dpId, portId, tableId, flowName, AclConstants.PROTO_IPV6_ALLOWED_PRIORITY, 0, 0,
                 AclConstants.COOKIE_ACL_BASE, matches, instructions, addOrRemove);
 
         // Allow ICMPv6 Neighbor Advertisement packets.
         matches = AclServiceUtils.buildIcmpV6Matches(AclConstants.ICMPV6_TYPE_NA, 0, lportTag, serviceMode);
 
         flowName = "Ingress_ICMPv6" + "_" + dpId + "_" + lportTag + "_" + AclConstants.ICMPV6_TYPE_NA + "_Permit_";
-        syncFlow(dpId, tableId, flowName, AclConstants.PROTO_IPV6_ALLOWED_PRIORITY, "ACL", 0, 0,
+        syncFlow(dpId, portId, tableId, flowName, AclConstants.PROTO_IPV6_ALLOWED_PRIORITY, 0, 0,
                 AclConstants.COOKIE_ACL_BASE, matches, instructions, addOrRemove);
     }
 
@@ -287,9 +289,9 @@ public class IngressAclServiceImpl extends AbstractAclServiceImpl {
                     AclServiceManager.MatchCriteria.MATCH_SOURCE));
             String flowName = "Ingress_ICMPv6" + "_" + port.getDpId() + "_" + port.getLPortTag() + "_"
                     + AclConstants.ICMPV6_TYPE_RA + "_LinkLocal_Permit_";
-            syncFlow(port.getDpId(), getAclAntiSpoofingTable(), flowName,
-                    AclConstants.PROTO_IPV6_ALLOWED_PRIORITY, "ACL", 0,
-                    0, AclConstants.COOKIE_ACL_BASE, matches, instructions, addOrRemove);
+            syncFlow(port.getDpId(), port.getInterfaceId(), getAclAntiSpoofingTable(), flowName,
+                    AclConstants.PROTO_IPV6_ALLOWED_PRIORITY, 0, 0, AclConstants.COOKIE_ACL_BASE, matches,
+                    instructions, addOrRemove);
         }
     }
 
@@ -300,7 +302,7 @@ public class IngressAclServiceImpl extends AbstractAclServiceImpl {
      * @param lportTag the lport tag
      * @param addOrRemove whether to add or remove the flow
      */
-    protected void programArpRule(BigInteger dpId, int lportTag, int addOrRemove) {
+    protected void programArpRule(BigInteger dpId, int lportTag, String portId, int addOrRemove) {
         List<MatchInfoBase> matches = new ArrayList<>();
         matches.add(MatchEthernetType.ARP);
         matches.add(AclServiceUtils.buildLPortTagMatch(lportTag, serviceMode));
@@ -308,8 +310,8 @@ public class IngressAclServiceImpl extends AbstractAclServiceImpl {
         LOG.debug("{} ARP Rule on DPID {}, lportTag {}", addOrRemove == NwConstants.DEL_FLOW ? "Deleting" : "Adding",
                 dpId, lportTag);
         String flowName = "Ingress_ARP_" + dpId + "_" + lportTag;
-        syncFlow(dpId, getAclAntiSpoofingTable(), flowName, AclConstants.PROTO_ARP_TRAFFIC_MATCH_PRIORITY, "ACL", 0, 0,
-                AclConstants.COOKIE_ACL_BASE, matches, instructions, addOrRemove);
+        syncFlow(dpId, portId, getAclAntiSpoofingTable(), flowName, AclConstants.PROTO_ARP_TRAFFIC_MATCH_PRIORITY,
+                0, 0, AclConstants.COOKIE_ACL_BASE, matches, instructions, addOrRemove);
     }
 
 
@@ -344,8 +346,9 @@ public class IngressAclServiceImpl extends AbstractAclServiceImpl {
                 List<InstructionInfo> instructions = new ArrayList<>();
                 instructions.add(new InstructionGotoTable(getAclConntrackClassifierTable()));
                 String flowName = "Ingress_v4_Broadcast_" + dpId + "_" + lportTag + "_" + broadcastAddress + "_Permit";
-                syncFlow(dpId, getAclAntiSpoofingTable(), flowName, AclConstants.PROTO_MATCH_PRIORITY, "ACL", 0, 0,
-                        AclConstants.COOKIE_ACL_BASE, matches, instructions, addOrRemove);
+                syncFlow(dpId, port.getInterfaceId(), getAclAntiSpoofingTable(), flowName,
+                        AclConstants.PROTO_MATCH_PRIORITY, 0, 0, AclConstants.COOKIE_ACL_BASE, matches, instructions,
+                        addOrRemove);
             }
         } else {
             LOG.warn("IP Broadcast CIDRs are missing for port {}", port.getInterfaceId());

diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclConstants.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclConstants.java
index 06a51eec6109ddf613f3043ad7f3a41f43a6d930..7d30f8bf8c3cedc0ca401ff5083c43c9bbe4f610 100644 (file)
--- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclConstants.java
+++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclConstants.java
@@ -123,6 +123,8 @@ public interface AclConstants {
     String ACL_SYNC_KEY_EXT = "-acl";
     int JOB_MAX_RETRIES = 3;
 
+    String ACL_JOB_KEY_PREFIX = "ACL-";
+
     List<IPProtocols> PROTOCOLS_SUPPORTED_BY_CONNTRACK =
             ImmutableList.of(IPProtocols.TCP, IPProtocols.UDP, IPProtocols.ICMP, IPProtocols.IPV6ICMP);
 

diff --git a/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsBase.xtend b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsBase.xtend
index acb78408597abcd371970c380149ee3c1205f2d3..f02cff53d7eaa0ce33f71c483ff831b9564bdce4 100644 (file)
--- a/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsBase.xtend
+++ b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsBase.xtend
@@ -44,7 +44,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_DHCP_Server_v4123_987_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_DHCP_Server_v4123_987_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -64,10 +64,10 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_DHCP_Server_v6_123_987_Permit_"
-            flowName = "ACL"
-            instructionInfoList = #[
-                new InstructionApplyActions(#[
-                    new ActionNxResubmit(220 as short)
+                flowName = "Ingress_DHCP_Server_v6_123_987_Permit_"
+                instructionInfoList = #[
+                    new InstructionApplyActions(#[
+                        new ActionNxResubmit(220 as short)
                     ])
                 ]
                 matchInfoList = #[
@@ -84,10 +84,10 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_ICMPv6_123_987_130_Permit_"
-            flowName = "ACL"
-            instructionInfoList = #[
-                new InstructionApplyActions(#[
-                    new ActionNxResubmit(220 as short)
+                flowName = "Ingress_ICMPv6_123_987_130_Permit_"
+                instructionInfoList = #[
+                    new InstructionApplyActions(#[
+                        new ActionNxResubmit(220 as short)
                     ])
                 ]
                 matchInfoList = #[
@@ -103,10 +103,10 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_ICMPv6_123_987_135_Permit_"
-            flowName = "ACL"
-            instructionInfoList = #[
-                new InstructionApplyActions(#[
-                    new ActionNxResubmit(220 as short)
+                flowName = "Ingress_ICMPv6_123_987_135_Permit_"
+                instructionInfoList = #[
+                    new InstructionApplyActions(#[
+                        new ActionNxResubmit(220 as short)
                     ])
                 ]
                 matchInfoList = #[
@@ -122,10 +122,10 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_ICMPv6_123_987_136_Permit_"
-            flowName = "ACL"
-            instructionInfoList = #[
-                new InstructionApplyActions(#[
-                    new ActionNxResubmit(220 as short)
+                flowName = "Ingress_ICMPv6_123_987_136_Permit_"
+                instructionInfoList = #[
+                    new InstructionApplyActions(#[
+                        new ActionNxResubmit(220 as short)
                     ])
                 ]
                 matchInfoList = #[
@@ -141,10 +141,10 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_ARP_123_987"
-            flowName = "ACL"
-            instructionInfoList = #[
-                new InstructionApplyActions(#[
-                    new ActionNxResubmit(220 as short)
+                flowName = "Ingress_ARP_123_987"
+                instructionInfoList = #[
+                    new InstructionApplyActions(#[
+                        new ActionNxResubmit(220 as short)
                     ])
                 ]
                 matchInfoList = #[
@@ -164,7 +164,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_L2Broadcast_123_987_0D:AA:D8:42:30:F3"
-                flowName = "ACL"
+                flowName = "Egress_L2Broadcast_123_987_0D:AA:D8:42:30:F3"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -186,7 +186,7 @@ class FlowEntryObjectsBase {
                 cookie = 110100480bi
                 dpnId = 123bi
                 flowId = "Ingress_v4_Broadcast_123_987_10.0.0.255_Permit"
-                flowName = "ACL"
+                flowName = "Ingress_v4_Broadcast_123_987_10.0.0.255_Permit"
                 hardTimeOut = 0
                 idleTimeOut = 0
                 instructionInfoList = #[
@@ -213,7 +213,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_DHCP_Client_v4123_987_0D:AA:D8:42:30:F3_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_DHCP_Client_v4123_987_0D:AA:D8:42:30:F3_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -234,7 +234,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ICMPv6_123_987_133_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_ICMPv6_123_987_133_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -253,7 +253,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ICMPv6_123_987_135_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_ICMPv6_123_987_135_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -272,7 +272,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ICMPv6_123_987_136_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_ICMPv6_123_987_136_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -297,7 +297,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ARP_123_987_0D:AA:D8:42:30:F310.0.0.1/32"
-                flowName = "ACL"
+                flowName = "Egress_ARP_123_987_0D:AA:D8:42:30:F310.0.0.1/32"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -322,7 +322,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_DHCP_Server_v4123_987_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_DHCP_Server_v4123_987_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -342,7 +342,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_DHCP_Server_v6_123_987_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_DHCP_Server_v6_123_987_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -362,7 +362,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_ICMPv6_123_987_130_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_ICMPv6_123_987_130_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -381,7 +381,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_ICMPv6_123_987_135_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_ICMPv6_123_987_135_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -400,7 +400,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_ICMPv6_123_987_136_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_ICMPv6_123_987_136_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -419,7 +419,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_ARP_123_987"
-                flowName = "ACL"
+                flowName = "Ingress_ARP_123_987"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -441,7 +441,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_L2Broadcast_123_987_0D:AA:D8:42:30:F4"
-                flowName = "ACL"
+                flowName = "Egress_L2Broadcast_123_987_0D:AA:D8:42:30:F4"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -463,7 +463,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_DHCP_Client_v4123_987_0D:AA:D8:42:30:F4_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_DHCP_Client_v4123_987_0D:AA:D8:42:30:F4_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -484,7 +484,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ICMPv6_123_987_133_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_ICMPv6_123_987_133_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -503,7 +503,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ICMPv6_123_987_135_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_ICMPv6_123_987_135_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -522,7 +522,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ICMPv6_123_987_136_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_ICMPv6_123_987_136_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -546,7 +546,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ARP_123_987_0D:AA:D8:42:30:F410.0.0.2/32"
-                flowName = "ACL"
+                flowName = "Egress_ARP_123_987_0D:AA:D8:42:30:F410.0.0.2/32"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -571,7 +571,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_DHCP_Server_v4123_987_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_DHCP_Server_v4123_987_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -591,7 +591,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_DHCP_Server_v6_123_987_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_DHCP_Server_v6_123_987_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -611,7 +611,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_ICMPv6_123_987_130_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_ICMPv6_123_987_130_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -630,7 +630,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_ICMPv6_123_987_135_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_ICMPv6_123_987_135_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -649,7 +649,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_ICMPv6_123_987_136_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_ICMPv6_123_987_136_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -668,7 +668,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_ARP_123_987"
-                flowName = "ACL"
+                flowName = "Ingress_ARP_123_987"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -690,7 +690,7 @@ class FlowEntryObjectsBase {
                dpnId = 123bi
                cookie = 110100480bi
                flowId = "Egress_L2Broadcast_123_987_0D:AA:D8:42:30:F5"
-               flowName = "ACL"
+               flowName = "Egress_L2Broadcast_123_987_0D:AA:D8:42:30:F5"
                instructionInfoList = #[
                    new InstructionApplyActions(#[
                        new ActionNxResubmit(17 as short)
@@ -712,7 +712,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_DHCP_Client_v4123_987_0D:AA:D8:42:30:F5_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_DHCP_Client_v4123_987_0D:AA:D8:42:30:F5_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -733,7 +733,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ICMPv6_123_987_133_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_ICMPv6_123_987_133_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -752,7 +752,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ICMPv6_123_987_135_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_ICMPv6_123_987_135_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -771,7 +771,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ICMPv6_123_987_136_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_ICMPv6_123_987_136_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -790,7 +790,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ARP_123_987_0D:AA:D8:42:30:F510.0.0.3/32"
-                flowName = "ACL"
+                flowName = "Egress_ARP_123_987_0D:AA:D8:42:30:F510.0.0.3/32"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -815,7 +815,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_DHCP_Server_v4123_987_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_DHCP_Server_v4123_987_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -835,7 +835,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_DHCP_Server_v6_123_987_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_DHCP_Server_v6_123_987_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -855,7 +855,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_ICMPv6_123_987_130_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_ICMPv6_123_987_130_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -874,7 +874,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_ICMPv6_123_987_135_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_ICMPv6_123_987_135_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -893,7 +893,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_ICMPv6_123_987_136_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_ICMPv6_123_987_136_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -912,7 +912,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_ARP_123_987"
-                flowName = "ACL"
+                flowName = "Ingress_ARP_123_987"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -934,7 +934,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_DHCP_Client_v4123_987__Permit_"
-                flowName = "ACL"
+                flowName = "Egress_DHCP_Client_v4123_987__Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -954,7 +954,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_DHCP_Client_v6_123_987__Permit_"
-                flowName = "ACL"
+                flowName = "Egress_DHCP_Client_v6_123_987__Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -974,7 +974,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ICMPv6_123_987_133_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_ICMPv6_123_987_133_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -993,7 +993,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ICMPv6_123_987_135_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_ICMPv6_123_987_135_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -1012,7 +1012,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ICMPv6_123_987_136_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_ICMPv6_123_987_136_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -1031,7 +1031,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ARP_123_987_0D:AA:D8:42:30:F6"
-                flowName = "ACL"
+                flowName = "Egress_ARP_123_987_0D:AA:D8:42:30:F6"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -1050,7 +1050,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ARP_123_987_0D:AA:D8:42:30:F6"
-                flowName = "ACL"
+                flowName = "Egress_ARP_123_987_0D:AA:D8:42:30:F6"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -1105,7 +1105,7 @@ class FlowEntryObjectsBase {
             dpnId = 123bi
             cookie = 110100480bi
             flowId = "Acl_Filter_Egress_" + ip + "/32_2"
-            flowName = "ACL"
+            flowName = "Acl_Filter_Egress_" + ip + "/32_2"
             instructionInfoList = #[
                new InstructionGotoTable(NwConstants.INGRESS_ACL_COMMITTER_TABLE)
             ]
@@ -1124,7 +1124,7 @@ class FlowEntryObjectsBase {
             dpnId = 123bi
             cookie = 110100480bi
             flowId = "Acl_Filter_Ingress_" + ip + "/32_2"
-            flowName = "ACL"
+            flowName = "Acl_Filter_Ingress_" + ip + "/32_2"
             instructionInfoList = #[
                 new InstructionGotoTable(NwConstants.EGRESS_ACL_COMMITTER_TABLE)
             ]
@@ -1144,7 +1144,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Acl_Filter_Ingress_10.0.0.2/32_4"
-                flowName = "ACL"
+                flowName = "Acl_Filter_Ingress_10.0.0.2/32_4"
                 instructionInfoList = #[
                     new InstructionGotoTable(247 as short)
                 ]
@@ -1165,7 +1165,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Acl_Filter_Egress_10.0.0.2/32_4"
-                flowName = "ACL"
+                flowName = "Acl_Filter_Egress_10.0.0.2/32_4"
                 instructionInfoList = #[
                     new InstructionGotoTable(217 as short)
                 ]
@@ -1187,7 +1187,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_DHCP_Server_v4123_987_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_DHCP_Server_v4123_987_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -1207,7 +1207,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_DHCP_Server_v6_123_987_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_DHCP_Server_v6_123_987_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -1227,7 +1227,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_ICMPv6_123_987_130_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_ICMPv6_123_987_130_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -1246,7 +1246,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_ICMPv6_123_987_135_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_ICMPv6_123_987_135_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -1265,7 +1265,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_ICMPv6_123_987_136_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_ICMPv6_123_987_136_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -1284,7 +1284,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_ARP_123_987"
-                flowName = "ACL"
+                flowName = "Ingress_ARP_123_987"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -1301,7 +1301,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_DHCP_Client_v4123_987_" + mac + "_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_DHCP_Client_v4123_987_" + mac + "_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -1322,7 +1322,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_DHCP_Client_v6_123_987_" + mac + "_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_DHCP_Client_v6_123_987_" + mac + "_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -1343,7 +1343,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ICMPv6_123_987_133_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_ICMPv6_123_987_133_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -1362,7 +1362,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ICMPv6_123_987_135_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_ICMPv6_123_987_135_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -1381,7 +1381,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ICMPv6_123_987_136_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_ICMPv6_123_987_136_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -1400,7 +1400,7 @@ class FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ARP_123_987_" + mac
-                flowName = "ACL"
+                flowName = "Egress_ARP_123_987_" + mac
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit

diff --git a/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsStateful.xtend b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsStateful.xtend
index 478a5d0661c228224a717329d173a4a55d168cbb..f3866fb639a5cb445d43c9e839aee19ee12c441b 100644 (file)
--- a/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsStateful.xtend
+++ b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsStateful.xtend
@@ -256,7 +256,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId1
-                flowName = "ACL"
+                flowName = theFlowId1
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.INGRESS_REMOTE_ACL_TABLE)
                 ]
@@ -280,7 +280,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.EGRESS_ACL_COMMITTER_TABLE)
                 ]
@@ -303,7 +303,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F4_0.0.0.0/0"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F4_0.0.0.0/0"
                 instructionInfoList = #[
                     new InstructionGotoTable(211 as short)
                 ]
@@ -319,7 +319,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F4_0.0.0.0/0"
-                flowName = "ACL"
+                flowName = "Ingress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F4_0.0.0.0/0"
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.EGRESS_ACL_CONNTRACK_CLASSIFIER_TABLE)
                 ]
@@ -335,7 +335,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ARP_123_987_0D:AA:D8:42:30:F40.0.0.0/0"
-                flowName = "ACL"
+                flowName = "Egress_ARP_123_987_0D:AA:D8:42:30:F40.0.0.0/0"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -354,7 +354,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_DHCP_Client_v4123_987_0D:AA:D8:42:30:F4_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_DHCP_Client_v4123_987_0D:AA:D8:42:30:F4_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                     new ActionNxResubmit(17 as short)
@@ -387,7 +387,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F4_10.0.0.100/32"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F4_10.0.0.100/32"
                 instructionInfoList = #[
                    new InstructionGotoTable(211 as short)
                 ]
@@ -404,7 +404,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F4_10.0.0.100/32"
-                flowName = "ACL"
+                flowName = "Ingress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F4_10.0.0.100/32"
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.EGRESS_ACL_CONNTRACK_CLASSIFIER_TABLE)
                 ]
@@ -421,7 +421,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:A4_10.0.0.101/32"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:A4_10.0.0.101/32"
                 instructionInfoList = #[
                     new InstructionGotoTable(211 as short)
                 ]
@@ -438,7 +438,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:A4_10.0.0.101/32"
-                flowName = "ACL"
+                flowName = "Ingress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:A4_10.0.0.101/32"
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.EGRESS_ACL_CONNTRACK_CLASSIFIER_TABLE)
                 ]
@@ -455,7 +455,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ARP_123_987_0D:AA:D8:42:30:F410.0.0.100/32"
-                flowName = "ACL"
+                flowName = "Egress_ARP_123_987_0D:AA:D8:42:30:F410.0.0.100/32"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -475,7 +475,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ARP_123_987_0D:AA:D8:42:30:A410.0.0.101/32"
-                flowName = "ACL"
+                flowName = "Egress_ARP_123_987_0D:AA:D8:42:30:A410.0.0.101/32"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -495,7 +495,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_DHCP_Client_v4123_987_0D:AA:D8:42:30:A4_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_DHCP_Client_v4123_987_0D:AA:D8:42:30:A4_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -516,7 +516,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_DHCP_Client_v4123_987_0D:AA:D8:42:30:F4_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_DHCP_Client_v4123_987_0D:AA:D8:42:30:F4_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -537,7 +537,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_L2Broadcast_123_987_0D:AA:D8:42:30:A4"
-                flowName = "ACL"
+                flowName = "Egress_L2Broadcast_123_987_0D:AA:D8:42:30:A4"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -559,15 +559,15 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F3_10.0.0.1/32"
-            flowName = "ACL"
-            instructionInfoList = #[
-                new InstructionGotoTable(NwConstants.EGRESS_ACL_CONNTRACK_CLASSIFIER_TABLE)
-            ]
-            matchInfoList = #[
-                new NxMatchRegister(NxmNxReg6, 252672L, 268435200L),
-                new MatchEthernetDestination(new MacAddress("0D:AA:D8:42:30:F3")),
-                new MatchEthernetType(2048L),
-                new MatchIpv4Destination("10.0.0.1", "32")
+                flowName = "Ingress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F3_10.0.0.1/32"
+                instructionInfoList = #[
+                    new InstructionGotoTable(NwConstants.EGRESS_ACL_CONNTRACK_CLASSIFIER_TABLE)
+                ]
+                matchInfoList = #[
+                    new NxMatchRegister(NxmNxReg6, 252672L, 268435200L),
+                    new MatchEthernetDestination(new MacAddress("0D:AA:D8:42:30:F3")),
+                    new MatchEthernetType(2048L),
+                    new MatchIpv4Destination("10.0.0.1", "32")
                 ]
                 priority = 61010
                 tableId = NwConstants.EGRESS_ACL_ANTI_SPOOFING_TABLE
@@ -576,7 +576,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
-                flowName = "ACL"
+                flowName = "Ingress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxConntrack(2, 0, 0, 5000, 243 as short)
@@ -593,7 +593,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = "Ingress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
-                flowName = "ACL"
+                flowName = "Ingress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -616,7 +616,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                      new InstructionGotoTable(NwConstants.EGRESS_REMOTE_ACL_TABLE)
                 ]
@@ -638,7 +638,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F3_10.0.0.1/32"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F3_10.0.0.1/32"
                 instructionInfoList = #[
                     new InstructionGotoTable(211 as short)
                 ]
@@ -655,7 +655,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                        new ActionNxConntrack(2, 0, 0, 5000, NwConstants.INGRESS_ACL_FOR_EXISTING_TRAFFIC_TABLE)
@@ -672,7 +672,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = "Egress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -694,7 +694,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F4_10.0.0.2/32"
-                flowName = "ACL"
+                flowName = "Ingress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F4_10.0.0.2/32"
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.EGRESS_ACL_CONNTRACK_CLASSIFIER_TABLE)
                 ]
@@ -711,7 +711,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
-                flowName = "ACL"
+                flowName = "Ingress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxConntrack(2, 0, 0, 5000, NwConstants.EGRESS_ACL_FOR_EXISTING_TRAFFIC_TABLE)
@@ -728,7 +728,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = "Ingress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
-                flowName = "ACL"
+                flowName = "Ingress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -750,7 +750,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F4_10.0.0.2/32"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F4_10.0.0.2/32"
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.INGRESS_ACL_CONNTRACK_CLASSIFIER_TABLE)
                 ]
@@ -767,7 +767,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxConntrack(2, 0, 0, 5000, 213 as short)
@@ -784,7 +784,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = "Egress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -806,7 +806,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F5_10.0.0.3/32"
-                flowName = "ACL"
+                flowName = "Ingress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F5_10.0.0.3/32"
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.EGRESS_ACL_CONNTRACK_CLASSIFIER_TABLE)
                 ]
@@ -823,7 +823,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
-                flowName = "ACL"
+                flowName = "Ingress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxConntrack(2, 0, 0, 5000, NwConstants.EGRESS_ACL_FOR_EXISTING_TRAFFIC_TABLE)
@@ -840,7 +840,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = "Ingress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
-                flowName = "ACL"
+                flowName = "Ingress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -862,7 +862,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F5_10.0.0.3/32"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F5_10.0.0.3/32"
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.INGRESS_ACL_CONNTRACK_CLASSIFIER_TABLE)
                 ]
@@ -879,7 +879,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxConntrack(2, 0, 0, 5000, NwConstants.INGRESS_ACL_FOR_EXISTING_TRAFFIC_TABLE)
@@ -896,7 +896,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = "Egress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -918,7 +918,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_Fixed_Conntrk_123_0D:AA:D8:42:30:F6_10.0.0.4/32_Recirc"
-                flowName = "ACL"
+                flowName = "Ingress_Fixed_Conntrk_123_0D:AA:D8:42:30:F6_10.0.0.4/32_Recirc"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxConntrack(2, 0, 0, 5000, NwConstants.EGRESS_ACL_CONNTRACK_CLASSIFIER_TABLE)
@@ -937,7 +937,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_Fixed_Conntrk_123_0D:AA:D8:42:30:F6_0.0.0.0/0_Recirc"
-                flowName = "ACL"
+                flowName = "Ingress_Fixed_Conntrk_123_0D:AA:D8:42:30:F6_0.0.0.0/0_Recirc"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxConntrack(2, 0, 0, 5000, NwConstants.EGRESS_ACL_CONNTRACK_CLASSIFIER_TABLE)
@@ -955,7 +955,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = "Ingress_Fixed_Conntrk_Drop123_987_Tracked_New"
-                flowName = "ACL"
+                flowName = "Ingress_Fixed_Conntrk_Drop123_987_Tracked_New"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -972,7 +972,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = "Ingress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
-                flowName = "ACL"
+                flowName = "Ingress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -994,7 +994,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_Fixed_Conntrk_123_0D:AA:D8:42:30:F6_10.0.0.4/32_Recirc"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Conntrk_123_0D:AA:D8:42:30:F6_10.0.0.4/32_Recirc"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxConntrack(2, 0, 0, 5000, NwConstants.INGRESS_ACL_CONNTRACK_CLASSIFIER_TABLE)
@@ -1012,7 +1012,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_Fixed_Conntrk_123_0D:AA:D8:42:30:F6_0.0.0.0/0_Recirc"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Conntrk_123_0D:AA:D8:42:30:F6_0.0.0.0/0_Recirc"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxConntrack(2, 0, 0, 5000, NwConstants.INGRESS_ACL_CONNTRACK_CLASSIFIER_TABLE)
@@ -1029,7 +1029,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = "Egress_Fixed_Conntrk_Drop123_987_Tracked_New"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Conntrk_Drop123_987_Tracked_New"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -1046,7 +1046,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = "Egress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -1069,7 +1069,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.INGRESS_ACL_COMMITTER_TABLE)
                 ]
@@ -1091,7 +1091,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.INGRESS_ACL_COMMITTER_TABLE)
                 ]
@@ -1113,7 +1113,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                    new InstructionGotoTable(NwConstants.EGRESS_ACL_COMMITTER_TABLE)
                 ]
@@ -1137,7 +1137,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.EGRESS_ACL_COMMITTER_TABLE)
                 ]
@@ -1161,7 +1161,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.INGRESS_REMOTE_ACL_TABLE)
                 ]
@@ -1185,7 +1185,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                      new InstructionGotoTable(NwConstants.INGRESS_ACL_COMMITTER_TABLE)
                 ]
@@ -1209,7 +1209,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.EGRESS_REMOTE_ACL_TABLE)
                 ]
@@ -1234,7 +1234,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.INGRESS_ACL_COMMITTER_TABLE)
                 ]
@@ -1258,7 +1258,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.EGRESS_ACL_COMMITTER_TABLE)
                 ]
@@ -1282,7 +1282,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.EGRESS_ACL_COMMITTER_TABLE)
                 ]
@@ -1306,7 +1306,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.INGRESS_REMOTE_ACL_TABLE)
                 ]
@@ -1330,7 +1330,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.EGRESS_ACL_COMMITTER_TABLE)
                 ]
@@ -1361,7 +1361,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId1
-                flowName = "ACL"
+                flowName = flowId1
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.INGRESS_ACL_COMMITTER_TABLE)
                 ]
@@ -1379,7 +1379,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId2
-                flowName = "ACL"
+                flowName = flowId2
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.INGRESS_ACL_COMMITTER_TABLE)
                 ]
@@ -1397,7 +1397,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId3
-                flowName = "ACL"
+                flowName = flowId3
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.INGRESS_ACL_COMMITTER_TABLE)
                 ]
@@ -1415,7 +1415,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId4
-                flowName = "ACL"
+                flowName = flowId4
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.INGRESS_ACL_COMMITTER_TABLE)
                 ]
@@ -1433,7 +1433,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId5
-                flowName = "ACL"
+                flowName = flowId5
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.INGRESS_ACL_COMMITTER_TABLE)
                 ]
@@ -1451,7 +1451,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId6
-                flowName = "ACL"
+                flowName = flowId6
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.INGRESS_ACL_COMMITTER_TABLE)
                 ]
@@ -1469,7 +1469,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId7
-                flowName = "ACL"
+                flowName = flowId7
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.INGRESS_ACL_COMMITTER_TABLE)
                 ]
@@ -1487,7 +1487,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId8
-                flowName = "ACL"
+                flowName = flowId8
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.INGRESS_ACL_COMMITTER_TABLE)
                 ]
@@ -1511,7 +1511,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.EGRESS_ACL_COMMITTER_TABLE)
                 ]
@@ -1534,7 +1534,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.INGRESS_ACL_COMMITTER_TABLE)
                 ]
@@ -1559,7 +1559,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId1
-                flowName = "ACL"
+                flowName = flowId1
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.EGRESS_ACL_COMMITTER_TABLE)
                 ]
@@ -1577,7 +1577,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId2
-                flowName = "ACL"
+                flowName = flowId2
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.EGRESS_ACL_COMMITTER_TABLE)
                 ]
@@ -1602,7 +1602,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId1
-                flowName = "ACL"
+                flowName = flowId1
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.INGRESS_ACL_COMMITTER_TABLE)
                 ]
@@ -1620,7 +1620,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId2
-                flowName = "ACL"
+                flowName = flowId2
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.INGRESS_ACL_COMMITTER_TABLE)
                 ]
@@ -1644,7 +1644,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_DHCP_Server_v4123_987_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_DHCP_Server_v4123_987_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -1664,7 +1664,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_DHCP_Server_v6_123_987_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_DHCP_Server_v6_123_987_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -1684,7 +1684,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_ICMPv6_123_987_130_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_ICMPv6_123_987_130_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -1703,7 +1703,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_ICMPv6_123_987_135_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_ICMPv6_123_987_135_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -1722,7 +1722,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_ICMPv6_123_987_136_Permit_"
-                flowName = "ACL"
+                flowName = "Ingress_ICMPv6_123_987_136_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -1741,7 +1741,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_ARP_123_987"
-                flowName = "ACL"
+                flowName = "Ingress_ARP_123_987"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -1758,7 +1758,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F3_10.0.0.1/32"
-                flowName = "ACL"
+                flowName = "Ingress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F3_10.0.0.1/32"
                 instructionInfoList = #[
                     new InstructionGotoTable(NwConstants.EGRESS_ACL_CONNTRACK_CLASSIFIER_TABLE)
                 ]
@@ -1775,7 +1775,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = "Ingress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
-                flowName = "ACL"
+                flowName = "Ingress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -1792,7 +1792,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_DHCP_Client_v4123_987_" + mac + "_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_DHCP_Client_v4123_987_" + mac + "_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -1813,7 +1813,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ICMPv6_123_987_133_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_ICMPv6_123_987_133_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -1832,7 +1832,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ICMPv6_123_987_135_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_ICMPv6_123_987_135_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -1851,7 +1851,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ICMPv6_123_987_136_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_ICMPv6_123_987_136_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -1870,7 +1870,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F3_10.0.0.1/32"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F3_10.0.0.1/32"
                 instructionInfoList = #[
                     new InstructionGotoTable(211 as short)
                 ]
@@ -1887,7 +1887,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = "Egress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -1904,15 +1904,15 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
-            flowName = "ACL"
-            instructionInfoList = #[
-                new InstructionApplyActions(#[
-                    new ActionNxConntrack(2, 0, 0, 5000, NwConstants.EGRESS_ACL_FOR_EXISTING_TRAFFIC_TABLE)
-                ])
-            ]
-            matchInfoList = #[
-                new MatchEthernetType(2048L),
-                new NxMatchRegister(NxmNxReg6, 252672L, 268435200L)
+                flowName = "Ingress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
+                instructionInfoList = #[
+                    new InstructionApplyActions(#[
+                        new ActionNxConntrack(2, 0, 0, 5000, NwConstants.EGRESS_ACL_FOR_EXISTING_TRAFFIC_TABLE)
+                    ])
+                ]
+                matchInfoList = #[
+                    new MatchEthernetType(2048L),
+                    new NxMatchRegister(NxmNxReg6, 252672L, 268435200L)
                 ]
                 priority = 100
                 tableId = NwConstants.EGRESS_ACL_CONNTRACK_SENDER_TABLE
@@ -1921,7 +1921,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxConntrack(2, 0, 0, 5000, NwConstants.INGRESS_ACL_FOR_EXISTING_TRAFFIC_TABLE)
@@ -1938,7 +1938,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ARP_123_987_" + mac + "10.0.0.1/32"
-                flowName = "ACL"
+                flowName = "Egress_ARP_123_987_" + mac + "10.0.0.1/32"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -1958,7 +1958,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_L2Broadcast_123_987_" + mac
-                flowName = "ACL"
+                flowName = "Egress_L2Broadcast_123_987_" + mac
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -1975,7 +1975,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 cookie = 110100480bi
                 dpnId = 123bi
                 flowId = "Ingress_v4_Broadcast_123_987_10.0.0.255_Permit"
-                flowName = "ACL"
+                flowName = "Ingress_v4_Broadcast_123_987_10.0.0.255_Permit"
                 hardTimeOut = 0
                 idleTimeOut = 0
                 instructionInfoList = #[
@@ -1996,7 +1996,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_Acl_Commit_Conntrack_123_987_MatchEthernetType[2048]"
-                flowName = "ACL"
+                flowName = "Ingress_Acl_Commit_Conntrack_123_987_MatchEthernetType[2048]"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxConntrack(2, 1, 0, 5000, 255 as short,
@@ -2018,7 +2018,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_Acl_Commit_Conntrack_123_987_MatchEthernetType[34525]"
-                flowName = "ACL"
+                flowName = "Ingress_Acl_Commit_Conntrack_123_987_MatchEthernetType[34525]"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxConntrack(2, 1, 0, 5000, 255 as short,
@@ -2040,7 +2040,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_Acl_Commit_Conntrack_123_987_MatchEthernetType[2048]"
-                flowName = "ACL"
+                flowName = "Egress_Acl_Commit_Conntrack_123_987_MatchEthernetType[2048]"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                     new ActionNxConntrack(2, 1, 0, 5000, 255 as short,
@@ -2061,7 +2061,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_Acl_Commit_Conntrack_123_987_MatchEthernetType[34525]"
-                flowName = "ACL"
+                flowName = "Egress_Acl_Commit_Conntrack_123_987_MatchEthernetType[34525]"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxConntrack(2, 1, 0, 5000, 255 as short,
@@ -2082,7 +2082,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_Acl_Commit_Non_Conntrack_123_987"
-                flowName = "ACL"
+                flowName = "Egress_Acl_Commit_Non_Conntrack_123_987"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -2098,7 +2098,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = "Egress_123_987_Drop"
-                flowName = "ACL"
+                flowName = "Egress_123_987_Drop"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -2114,7 +2114,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_Acl_Commit_Non_Conntrack_123_987"
-                flowName = "ACL"
+                flowName = "Ingress_Acl_Commit_Non_Conntrack_123_987"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                     new ActionNxResubmit(220 as short)
@@ -2131,7 +2131,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = "Ingress_123_987_Drop"
-                flowName = "ACL"
+                flowName = "Ingress_123_987_Drop"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -2148,7 +2148,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = "Ingress_Fixed_Acl_Rule_Miss_Drop_123_987"
-                flowName = "ACL"
+                flowName = "Ingress_Fixed_Acl_Rule_Miss_Drop_123_987"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -2164,7 +2164,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = "Egress_Fixed_Acl_Rule_Miss_Drop_123_987"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Acl_Rule_Miss_Drop_123_987"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -2187,7 +2187,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                     dpnId = 123bi
                     cookie = 110100480bi
                     flowId = flowId1
-                    flowName = "ACL"
+                    flowName = flowId1
                     instructionInfoList = #[
                         new InstructionApplyActions(#[
                             new ActionNxConntrack(2, 1, 0, 5000, 255 as short,
@@ -2210,7 +2210,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId2
-                flowName = "ACL"
+                flowName = flowId2
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxConntrack(2, 1, 0, 5000, 255 as short,
@@ -2239,7 +2239,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId1
-                flowName = "ACL"
+                flowName = flowId1
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxConntrack(2, 1, 0, 5000, 255 as short,
@@ -2260,7 +2260,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId2
-                flowName = "ACL"
+                flowName = flowId2
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxConntrack(2, 1, 0, 5000, 255 as short,
@@ -2287,7 +2287,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId1
-                flowName = "ACL"
+                flowName = flowId1
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                     new ActionNxResubmit(17 as short)
@@ -2303,7 +2303,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = "Egress_123_987_Drop"
-                flowName = "ACL"
+                flowName = "Egress_123_987_Drop"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -2325,7 +2325,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId1
-                flowName = "ACL"
+                flowName = flowId1
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(220 as short)
@@ -2342,7 +2342,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = "Ingress_123_987_Drop"
-                flowName = "ACL"
+                flowName = "Ingress_123_987_Drop"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -2365,7 +2365,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = flowId1
-                flowName = "ACL"
+                flowName = flowId1
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -2387,7 +2387,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = flowId1
-                flowName = "ACL"
+                flowName = flowId1
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -2409,7 +2409,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId1
-                flowName = "ACL"
+                flowName = flowId1
                 instructionInfoList = #[
                     new InstructionGotoTable(245 as short),
                     new InstructionWriteMetadata(32bi, 16777200bi)
@@ -2430,7 +2430,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = flowId1
-                flowName = "ACL"
+                flowName = flowId1
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -2453,7 +2453,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId1
-                flowName = "ACL"
+                flowName = flowId1
                 instructionInfoList = #[
                     new InstructionGotoTable(215 as short),
                     new InstructionWriteMetadata(32bi, 16777200bi)
@@ -2474,7 +2474,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = flowId1
-                flowName = "ACL"
+                flowName = flowId1
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -2496,7 +2496,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                     dpnId = 123bi
                     cookie = 110100480bi
                     flowId = flowId1
-                    flowName = "ACL"
+                    flowName = flowId1
                     instructionInfoList = #[
                         new InstructionGotoTable(215 as short),
                         new InstructionWriteMetadata(64bi, 16777200bi)
@@ -2517,7 +2517,7 @@ class FlowEntryObjectsStateful extends FlowEntryObjectsBase {
                     dpnId = 123bi
                     cookie = 1085218086715393bi
                     flowId = flowId1
-                    flowName = "ACL"
+                    flowName = flowId1
                     instructionInfoList = #[
                         new InstructionApplyActions(#[
                             new ActionDrop()

diff --git a/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsStatefulIPv6.xtend b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsStatefulIPv6.xtend
index fb62cb3b8136b77d213a1aa804ca5b6faaa5e926..5c84c8f22365efedec4ccf2525ac2c68f09f6f5b 100644 (file)
--- a/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsStatefulIPv6.xtend
+++ b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsStatefulIPv6.xtend
@@ -63,7 +63,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F3_10.0.0.1/32"
-                flowName = "ACL"
+                flowName = "Ingress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F3_10.0.0.1/32"
                 instructionInfoList = #[
                     new InstructionGotoTable(241 as short)
                 ]
@@ -80,7 +80,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                cookie = 110100480bi
                flowId = "Ingress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
-               flowName = "ACL"
+               flowName = "Ingress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
                instructionInfoList = #[
                    new InstructionApplyActions(#[
                        new ActionNxConntrack(2, 0, 0, 5000, 243 as short)
@@ -97,7 +97,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                cookie = 1085218086715393bi
                flowId = "Ingress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
-               flowName = "ACL"
+               flowName = "Ingress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
                instructionInfoList = #[
                    new InstructionApplyActions(#[
                        new ActionDrop()
@@ -120,7 +120,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId1
-                flowName = "ACL"
+                flowName = flowId1
                 instructionInfoList = #[
                     new InstructionGotoTable(246 as short)
                 ]
@@ -142,7 +142,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F3_10.0.0.1/32"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F3_10.0.0.1/32"
                 instructionInfoList = #[
                     new InstructionGotoTable(211 as short)
                 ]
@@ -159,7 +159,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = "Egress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -176,7 +176,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxConntrack(2, 0, 0, 5000, 213 as short)
@@ -199,7 +199,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F4_10.0.0.2/32"
-                flowName = "ACL"
+                flowName = "Ingress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F4_10.0.0.2/32"
                 instructionInfoList = #[
                     new InstructionGotoTable(241 as short)
                 ]
@@ -216,7 +216,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                  cookie = 110100480bi
                  flowId = "Ingress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
-                 flowName = "ACL"
+                 flowName = "Ingress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
                  instructionInfoList = #[
                      new InstructionApplyActions(#[
                          new ActionNxConntrack(2, 0, 0, 5000, 243 as short)
@@ -233,7 +233,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                  cookie = 1085218086715393bi
                  flowId = "Ingress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
-                 flowName = "ACL"
+                 flowName = "Ingress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
                  instructionInfoList = #[
                      new InstructionApplyActions(#[
                          new ActionDrop()
@@ -256,7 +256,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F4_10.0.0.2/32"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F4_10.0.0.2/32"
                 instructionInfoList = #[
                     new InstructionGotoTable(211 as short)
                 ]
@@ -273,7 +273,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = "Egress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -290,7 +290,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxConntrack(2, 0, 0, 5000, 213 as short)
@@ -312,7 +312,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F5_10.0.0.3/32"
-                flowName = "ACL"
+                flowName = "Ingress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F5_10.0.0.3/32"
                 instructionInfoList = #[
                     new InstructionGotoTable(241 as short)
                 ]
@@ -329,7 +329,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Ingress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
-                flowName = "ACL"
+                flowName = "Ingress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxConntrack(2, 0, 0, 5000, 243 as short)
@@ -346,7 +346,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = "Ingress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
-                flowName = "ACL"
+                flowName = "Ingress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -368,7 +368,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F5_10.0.0.3/32"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F5_10.0.0.3/32"
                 instructionInfoList = #[
                     new InstructionGotoTable(211 as short)
                 ]
@@ -385,7 +385,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = "Egress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -402,7 +402,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 1085218086715393bi
                 flowId = "Egress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
-                flowName = "ACL"
+                flowName = "Egress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionDrop()
@@ -426,7 +426,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                     new InstructionGotoTable(217 as short)
                 ]
@@ -448,7 +448,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                     new InstructionGotoTable(217 as short)
                 ]
@@ -470,7 +470,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                     new InstructionGotoTable(247 as short)
                 ]
@@ -494,7 +494,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                     new InstructionGotoTable(247 as short)
                 ]
@@ -518,7 +518,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId1
-                flowName = "ACL"
+                flowName = flowId1
                 instructionInfoList = #[
                     new InstructionGotoTable(216 as short)
                 ]
@@ -542,7 +542,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                     new InstructionGotoTable(217 as short)
                 ]
@@ -566,7 +566,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId1
-                flowName = "ACL"
+                flowName = flowId1
                 instructionInfoList = #[
                     new InstructionGotoTable(246 as short)
                 ]
@@ -591,7 +591,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                     new InstructionGotoTable(217 as short)
 
@@ -616,7 +616,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                     new InstructionGotoTable(247 as short)
                 ]
@@ -640,7 +640,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                     new InstructionGotoTable(247 as short)
                 ]
@@ -664,7 +664,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId1
-                flowName = "ACL"
+                flowName = flowId1
                 instructionInfoList = #[
                     new InstructionGotoTable(216 as short)
                 ]
@@ -688,7 +688,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                     new InstructionGotoTable(247 as short)
                 ]
@@ -719,7 +719,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId1
-                flowName = "ACL"
+                flowName = flowId1
                 instructionInfoList = #[
                     new InstructionGotoTable(217 as short)
                 ]
@@ -737,7 +737,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId2
-                flowName = "ACL"
+                flowName = flowId2
                 instructionInfoList = #[
                     new InstructionGotoTable(217 as short)
                 ]
@@ -755,7 +755,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId3
-                flowName = "ACL"
+                flowName = flowId3
                 instructionInfoList = #[
                     new InstructionGotoTable(217 as short)
                 ]
@@ -773,7 +773,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId4
-                flowName = "ACL"
+                flowName = flowId4
                 instructionInfoList = #[
                     new InstructionGotoTable(217 as short)
                 ]
@@ -791,7 +791,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId5
-                flowName = "ACL"
+                flowName = flowId5
                 instructionInfoList = #[
                     new InstructionGotoTable(217 as short)
                 ]
@@ -809,7 +809,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId6
-                flowName = "ACL"
+                flowName = flowId6
                 instructionInfoList = #[
                     new InstructionGotoTable(217 as short)
                 ]
@@ -827,7 +827,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId7
-                flowName = "ACL"
+                flowName = flowId7
                 instructionInfoList = #[
                     new InstructionGotoTable(217 as short)
                 ]
@@ -845,7 +845,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId8
-                flowName = "ACL"
+                flowName = flowId8
                 instructionInfoList = #[
                     new InstructionGotoTable(217 as short)
                 ]
@@ -869,7 +869,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                     new InstructionGotoTable(247 as short)
                 ]
@@ -892,7 +892,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = theFlowId
-                flowName = "ACL"
+                flowName = theFlowId
                 instructionInfoList = #[
                     new InstructionGotoTable(217 as short)
                 ]
@@ -917,7 +917,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId1
-                flowName = "ACL"
+                flowName = flowId1
                 instructionInfoList = #[
                     new InstructionGotoTable(247 as short)
                 ]
@@ -935,7 +935,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId2
-                flowName = "ACL"
+                flowName = flowId2
                 instructionInfoList = #[
                     new InstructionGotoTable(247 as short)
                 ]
@@ -960,7 +960,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId1
-                flowName = "ACL"
+                flowName = flowId1
                 instructionInfoList = #[
                     new InstructionGotoTable(247 as short)
                 ]
@@ -978,7 +978,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId2
-                flowName = "ACL"
+                flowName = flowId2
                 instructionInfoList = #[
                     new InstructionGotoTable(247 as short)
                 ]
@@ -1003,7 +1003,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId1
-                flowName = "ACL"
+                flowName = flowId1
                 instructionInfoList = #[
                     new InstructionGotoTable(217 as short)
                 ]
@@ -1021,7 +1021,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId2
-                flowName = "ACL"
+                flowName = flowId2
                 instructionInfoList = #[
                     new InstructionGotoTable(217 as short)
                 ]
@@ -1046,7 +1046,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId1
-                flowName = "ACL"
+                flowName = flowId1
                 instructionInfoList = #[
                     new InstructionGotoTable(217 as short)
                 ]
@@ -1064,7 +1064,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = flowId2
-                flowName = "ACL"
+                flowName = flowId2
                 instructionInfoList = #[
                     new InstructionGotoTable(217 as short)
                 ]
@@ -1087,7 +1087,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_DHCP_Client_v4123_987_0D:AA:D8:42:30:F5_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_DHCP_Client_v4123_987_0D:AA:D8:42:30:F5_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -1108,7 +1108,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ICMPv6_123_987_133_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_ICMPv6_123_987_133_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -1127,7 +1127,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ICMPv6_123_987_135_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_ICMPv6_123_987_135_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -1146,7 +1146,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ICMPv6_123_987_136_Permit_"
-                flowName = "ACL"
+                flowName = "Egress_ICMPv6_123_987_136_Permit_"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -1165,7 +1165,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                 dpnId = 123bi
                 cookie = 110100480bi
                 flowId = "Egress_ARP_123_987_0D:AA:D8:42:30:F510.0.0.3/32"
-                flowName = "ACL"
+                flowName = "Egress_ARP_123_987_0D:AA:D8:42:30:F510.0.0.3/32"
                 instructionInfoList = #[
                     new InstructionApplyActions(#[
                         new ActionNxResubmit(17 as short)
@@ -1190,7 +1190,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                     dpnId = 123bi
                     cookie = 110100480bi
                     flowId = "Egress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F5_10.0.0.3/32"
-                    flowName = "ACL"
+                    flowName = "Egress_Fixed_Goto_Classifier_123_987_0D:AA:D8:42:30:F5_10.0.0.3/32"
                     instructionInfoList = #[
                         new InstructionGotoTable(211 as short)
                     ]
@@ -1207,7 +1207,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                     dpnId = 123bi
                     cookie = 1085218086715393bi
                     flowId = "Egress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
-                    flowName = "ACL"
+                    flowName = "Egress_Fixed_Conntrk_Drop123_987_Tracked_Invalid"
                     instructionInfoList = #[
                         new InstructionApplyActions(#[
                             new ActionDrop()
@@ -1224,7 +1224,7 @@ class FlowEntryObjectsStatefulIPv6 extends FlowEntryObjectsStateful {
                     dpnId = 123bi
                     cookie = 110100480bi
                     flowId = "Egress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
-                    flowName = "ACL"
+                    flowName = "Egress_Fixed_Conntrk_123_987_MatchEthernetType[2048]_Recirc"
                     instructionInfoList = #[
                         new InstructionApplyActions(#[
                             new ActionNxConntrack(2, 0, 0, 5000, 213 as short)