Add support for encap/decap nicira actions

[openflowplugin.git] / extension / openflowplugin-extension-nicira / src / main / yang / openflowplugin-extension-nicira-action.yang

diff --git a/extension/openflowplugin-extension-nicira/src/main/yang/openflowplugin-extension-nicira-action.yang b/extension/openflowplugin-extension-nicira/src/main/yang/openflowplugin-extension-nicira-action.yang
index 21e7d444d41824c6dd6e5fbb7877ae0ccce8a1f9..8df9300df40f945f5f01ad5788090f7dd72de59c 100644 (file)
--- a/extension/openflowplugin-extension-nicira/src/main/yang/openflowplugin-extension-nicira-action.yang
+++ b/extension/openflowplugin-extension-nicira/src/main/yang/openflowplugin-extension-nicira-action.yang
@@ -16,6 +16,9 @@ module openflowplugin-extension-nicira-action {
     import openflowplugin-extension-general {prefix ext-gen;revision-date "2014-07-14";}
     import openflow-action {prefix ofaction;revision-date "2015-02-03";}
     import nicira-action {prefix nicira-action;revision-date "2014-04-21";}
+    import opendaylight-direct-statistics {prefix directstat;revision-date "2016-05-11";}
+    import ietf-inet-types { prefix "inet"; revision-date "2013-07-15"; }
+    import opendaylight-match-types {prefix match; revision-date "2013-10-26";}
 
     description
         "Nicira openflow action extensions.";
@@ -53,6 +56,16 @@ module openflowplugin-extension-nicira-action {
             type empty;
         }
     }
+    grouping oxm-of-mpls-label-grouping {
+        leaf of-mpls-label {
+            type empty;
+        }
+    }
+    grouping oxm-of-metadata-grouping {
+        leaf of-metadata {
+            type empty;
+        }
+    }
     grouping nxm-of-arp-op-grouping {
         leaf of-arp-op {
             type empty;
@@ -68,6 +81,11 @@ module openflowplugin-extension-nicira-action {
             type empty;
         }
     }
+    grouping nxm-of-in-port-grouping {
+        leaf of-in-port {
+            type empty;
+        }
+    }
     grouping nxm-nx-tun-ipv4-dst-grouping {
         leaf nx-tun-ipv4-dst {
             type empty;
@@ -123,6 +141,56 @@ module openflowplugin-extension-nicira-action {
             type empty;
         }
     }
+    grouping nxm-of-ip-src-grouping {
+        leaf of-ip-src {
+            type empty;
+        }
+    }
+    grouping nxm-of-ip-dst-grouping {
+        leaf of-ip-dst {
+            type empty;
+        }
+    }
+    grouping nxm-nx-ipv6-src-grouping {
+        leaf nx-ipv6-src {
+            type empty;
+        }
+    }
+    grouping nxm-nx-ipv6-dst-grouping {
+        leaf nx-ipv6-dst {
+            type empty;
+        }
+    }
+    grouping nxm-of-icmp-type-grouping {
+        leaf of-icmp-type {
+            type empty;
+        }
+    }
+    grouping nxm-nx-encap-eth-src-grouping {
+        leaf nx-encap-eth-src {
+            type empty;
+        }
+    }
+    grouping nxm-nx-encap-eth-dst-grouping {
+        leaf nx-encap-eth-dst {
+            type empty;
+        }
+    }
+    grouping nxm-nx-nsh-mdtype-grouping {
+        leaf nx-nsh-mdtype {
+            type empty;
+        }
+    }
+    grouping nxm-nx-nsh-np-grouping {
+        leaf nx-nsh-np {
+            type empty;
+        }
+    }
+    grouping nxm-nx-tun-gpe-np-grouping {
+        leaf nx-tun-gpe-np {
+            type empty;
+        }
+    }
 
     grouping dst-choice-grouping {
         choice dst-choice {
@@ -132,6 +200,12 @@ module openflowplugin-extension-nicira-action {
             case dst-nx-tun-id-case {
                 uses nxm-nx-tun-id-grouping;
             }
+            case dst-of-mpls-label-case {
+                 uses oxm-of-mpls-label-grouping;
+            }
+            case dst-of-metadata-case {
+                uses oxm-of-metadata-grouping;
+            }
             case dst-nx-arp-sha-case {
                 uses nxm-nx-arp-sha-grouping;
             }
@@ -147,6 +221,9 @@ module openflowplugin-extension-nicira-action {
             case dst-of-arp-tpa-case {
                 uses nxm-of-arp-tpa-grouping;
             }
+            case dst-nx-of-in-port-case {
+                uses nxm-of-in-port-grouping;
+            }
             case dst-nx-tun-ipv4-dst-case {
                 uses nxm-nx-tun-ipv4-dst-grouping;
             }
@@ -177,6 +254,36 @@ module openflowplugin-extension-nicira-action {
             case dst-nx-nshc-4-case {
                 uses nxm-nx-nshc-4-grouping;
             }
+            case dst-of-ip-src-case {
+                uses nxm-of-ip-src-grouping;
+            }
+            case dst-of-ip-dst-case {
+                uses nxm-of-ip-dst-grouping;
+            }
+            case dst-nx-ipv6-src-case {
+                uses nxm-nx-ipv6-src-grouping;
+            }
+            case dst-nx-ipv6-dst-case {
+                uses nxm-nx-ipv6-dst-grouping;
+            }
+            case dst-of-icmp-type-case {
+                uses nxm-of-icmp-type-grouping;
+            }
+            case dst-nx-encap-eth-src-case {
+                uses nxm-nx-encap-eth-src-grouping;
+            }
+            case dst-nx-encap-eth-dst-case {
+                uses nxm-nx-encap-eth-dst-grouping;
+            }
+            case dst-nx-nsh-mdtype-case {
+                uses nxm-nx-nsh-mdtype-grouping;
+            }
+            case dst-nx-nsh-np-case {
+                uses nxm-nx-nsh-np-grouping;
+            }
+            case dst-nx-tun-gpe-np-case {
+                uses nxm-nx-tun-gpe-np-grouping;
+            }
         }
     }
 
@@ -188,6 +295,12 @@ module openflowplugin-extension-nicira-action {
             case src-nx-tun-id-case {
                 uses nxm-nx-tun-id-grouping;
             }
+            case src-nx-of-mpls-label-case {
+                uses oxm-of-mpls-label-grouping;
+            }
+            case src-nx-of-metadata-case {
+                uses oxm-of-metadata-grouping;
+            }
             case src-nx-arp-sha-case {
                 uses nxm-nx-arp-sha-grouping;
             }
@@ -203,6 +316,9 @@ module openflowplugin-extension-nicira-action {
             case src-of-arp-tpa-case {
                 uses nxm-of-arp-tpa-grouping;
             }
+            case src-nx-of-in-port-case {
+                uses nxm-of-in-port-grouping;
+            }
             case src-nx-tun-ipv4-dst-case {
                 uses nxm-nx-tun-ipv4-dst-grouping;
             }
@@ -236,6 +352,33 @@ module openflowplugin-extension-nicira-action {
             case src-nx-nshc-4-case {
                 uses nxm-nx-nshc-4-grouping;
             }
+            case src-of-ip-src-case {
+                uses nxm-of-ip-src-grouping;
+            }
+            case src-of-ip-dst-case {
+                uses nxm-of-ip-dst-grouping;
+            }
+            case src-nx-ipv6-src-case {
+                uses nxm-nx-ipv6-src-grouping;
+            }
+            case src-nx-ipv6-dst-case {
+                uses nxm-nx-ipv6-dst-grouping;
+            }
+            case src-nx-encap-eth-src-case {
+                uses nxm-nx-encap-eth-src-grouping;
+            }
+            case src-nx-encap-eth-dst-case {
+                uses nxm-nx-encap-eth-dst-grouping;
+            }
+            case src-nx-nsh-mdtype-case {
+                uses nxm-nx-nsh-mdtype-grouping;
+            }
+            case src-nx-nsh-np-case {
+                uses nxm-nx-nsh-np-grouping;
+            }
+            case src-nx-tun-gpe-np-case {
+                uses nxm-nx-tun-gpe-np-grouping;
+            }
         }
     }
 
@@ -311,6 +454,17 @@ bits specified from the register.";
         }
     }
 
+    grouping nx-action-fin-timeout-grouping {
+        container nx-action-fin-timeout {
+            leaf fin-idle-timeout {
+                type uint16;
+            }
+            leaf fin-hard-timeout  {
+                type uint16;
+            }
+        }
+    }
+
     grouping nx-action-multipath-grouping {
         container nx-multipath {
             leaf fields {
@@ -337,75 +491,243 @@ bits specified from the register.";
         }
     }
 
-    grouping nx-action-set-nsp-grouping {
-        container nx-set-nsp {
-            description "Sets NSP header"
-            + " Sets NSH Service Path ID (NSP) header";
-            leaf nsp {
-                type uint32;
-            }
+    grouping nx-action-push-nsh-grouping {
+        container nx-push-nsh {
+            presence "no content action";
+            description "Push NSH header";
+        }
+    }
+    grouping nx-action-pop-nsh-grouping {
+        container nx-pop-nsh {
+            presence "no content action";
+            description "Pop NSH header";
         }
     }
 
-    grouping nx-action-set-nsi-grouping {
-        container nx-set-nsi {
-            description "Sets NSH Service Index (NSI) header";
-            leaf nsi {
+    grouping nx-action-conntrack-grouping {
+        container nx-conntrack {
+            leaf flags {
+                type uint16;
+            }
+            leaf zone-src {
+                type uint32;
+            }
+            leaf conntrack-zone {
+                type uint16;
+            }
+            leaf recirc-table {
                 type uint8;
             }
+            list ct-actions{
+                uses ofpact-actions;
+            }
         }
     }
 
-    grouping nx-action-set-nshc-grouping {
-        leaf nshc {
-            type uint32;
+    grouping nx-action-ct-clear-grouping {
+        container nx-ct-clear {
+            presence "no content action";
+            description "Clear Ct states from the flow";
         }
     }
 
-    grouping nx-action-set-nshc-1-grouping {
-        container nx-set-nshc-1 {
-            description "Sets NSC1 header";
-            uses nx-action-set-nshc-grouping;
+    grouping ofpact-actions {
+        description
+           "Actions to be performed with conntrack.";
+        choice ofpact-actions {
+            case nx-action-nat-case {
+                container nx-action-nat {
+                    leaf flags {
+                        type uint16;
+                    }
+                    leaf range_present {
+                        type uint16;
+                    }
+                    leaf ip-address-min {
+                        type inet:ip-address;
+                    }
+                    leaf ip-address-max {
+                        type inet:ip-address;
+                    }
+                    leaf port-min {
+                        type uint16;
+                    }
+                    leaf port-max {
+                        type uint16;
+                    }
+                }
+            }
+            case nx-action-ct-mark-case {
+                container nx-action-ct-mark {
+                    leaf ct-mark {
+                        type uint32;
+                    }
+                    // TODO: ct_mark mask is not supported yet
+                }
+            }
         }
     }
 
-    grouping nx-action-set-nshc-2-grouping {
-        container nx-set-nshc-2 {
-            description "Sets NSC2 header";
-            uses nx-action-set-nshc-grouping;
-        }
-    }
+    grouping flow-mod-spec {
+        description
+           "flow mod spec indicates the actions that should be performed to create a new flow which was learned from learn action.";
+        choice flow-mod-spec{
+            case flow-mod-add-match-from-field-case{
+                container flow-mod-add-match-from-field{
+                        leaf flow-mod-num-bits{
+                        type uint16;
+                    }
 
-    grouping nx-action-set-nshc-3-grouping {
-        container nx-set-nshc-3 {
-            description "Sets NSC3 header";
-            uses nx-action-set-nshc-grouping;
-        }
-    }
+                    leaf src-field{
+                        type uint32;
+                    }
+
+                    leaf src-ofs{
+                        type uint16;
+                    }
+
+                    leaf dst-field{
+                        type uint32;
+                    }
+
+                    leaf dst-ofs{
+                        type uint16;
+                    }
+                }
+            }
+            case flow-mod-add-match-from-value-case{
+                container flow-mod-add-match-from-value{
+                        leaf flow-mod-num-bits{
+                        type uint16;
+                    }
+
+                    leaf value{
+                        type uint16;
+                    }
+
+                    leaf src-field{
+                        type uint32;
+                    }
+
+                    leaf src-ofs{
+                        type uint16;
+                    }
+                }
+            }
+            case flow-mod-copy-field-into-field-case{
+                container flow-mod-copy-field-into-field{
+                        leaf flow-mod-num-bits{
+                        type uint16;
+                    }
+
+                    leaf src-field{
+                        type uint32;
+                    }
 
-    grouping nx-action-set-nshc-4-grouping {
-        container nx-set-nshc-4 {
-            description "Sets NSC4 header";
-            uses nx-action-set-nshc-grouping;
+                    leaf src-ofs{
+                        type uint16;
+                    }
+
+                    leaf dst-field{
+                        type uint32;
+                    }
+
+                    leaf dst-ofs{
+                        type uint16;
+                    }
+                }
+            }
+            case flow-mod-copy-value-into-field-case{
+                container flow-mod-copy-value-into-field{
+                        leaf flow-mod-num-bits{
+                        type uint16;
+                    }
+
+                    leaf value{
+                        type uint16;
+                    }
+
+                    leaf dst-field{
+                        type uint32;
+                    }
+
+                    leaf dst-ofs{
+                        type uint16;
+                    }
+                }
+            }
+            case flow-mod-output-to-port-case{
+                container flow-mod-output-to-port{
+                        leaf flow-mod-num-bits{
+                        type uint16;
+                    }
+
+                    leaf src-field{
+                        type uint32;
+                    }
+
+                    leaf src-ofs{
+                        type uint16;
+                    }
+                }
+            }
         }
     }
 
-    grouping nx-action-conntrack-grouping {
-        container nx-conntrack {
-            leaf flags {
+    grouping nx-action-learn-grouping {
+        container nx-learn {
+            leaf idle-timeout {
                 type uint16;
             }
-            leaf zone-src {
-                type uint32;
+            leaf hard-timeout {
+                type uint16;
             }
-            leaf conntrack-zone {
+            leaf priority {
                 type uint16;
             }
-            leaf recirc-table {
+            leaf cookie {
+                type uint64;
+            }
+            leaf flags {
+                type uint16;
+            }
+            leaf table-id {
                 type uint8;
             }
+            leaf fin-idle-timeout {
+                type uint16;
+            }
+            leaf fin-hard-timeout {
+                type uint16;
+            }
+
+            list flow-mods{
+                uses flow-mod-spec;
+            }
+        }
+    }
+
+    grouping nx-action-encap-grouping {
+        container nx-encap {
+            uses match:packet-type-fields {
+                refine packet-type {
+                    mandatory true;
+                }
+            }
         }
     }
+
+    grouping nx-action-decap-grouping {
+        container nx-decap {
+            uses match:packet-type-fields {
+                refine packet-type {
+                    default "0xFFFE"; // USE NEXT PROTO
+                }
+            }
+        }
+    }
+
+
     // ACTION augmentations
     // RPCS
     augment "/sal-flow:add-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
@@ -428,47 +750,54 @@ bits specified from the register.";
             uses nx-action-resubmit-grouping;
         }
     }
+    augment "/sal-flow:add-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
+        case nx-action-fin-timeout-rpc-add-flow-write-actions-case {
+            uses nx-action-fin-timeout-grouping;
+        }
+    }
     augment "/sal-flow:add-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
         case nx-action-multipath-rpc-add-flow-write-actions-case {
             uses nx-action-multipath-grouping;
         }
     }
     augment "/sal-flow:add-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-set-nsp-rpc-add-flow-write-actions-case {
-            uses nx-action-set-nsp-grouping;
+        case nx-action-push-nsh-rpc-add-flow-write-actions-case {
+            uses nx-action-push-nsh-grouping;
         }
     }
     augment "/sal-flow:add-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-set-nshc-1-rpc-add-flow-write-actions-case {
-            uses nx-action-set-nshc-1-grouping;
+        case nx-action-pop-nsh-rpc-add-flow-write-actions-case {
+            uses nx-action-pop-nsh-grouping;
         }
     }
     augment "/sal-flow:add-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-set-nshc-2-rpc-add-flow-write-actions-case {
-            uses nx-action-set-nshc-2-grouping;
+        case nx-action-conntrack-rpc-add-flow-write-actions-case {
+            uses nx-action-conntrack-grouping;
         }
     }
     augment "/sal-flow:add-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-set-nshc-3-rpc-add-flow-write-actions-case {
-            uses nx-action-set-nshc-3-grouping;
+        case nx-action-ct-clear-rpc-add-flow-write-actions-case {
+            uses nx-action-ct-clear-grouping;
         }
     }
     augment "/sal-flow:add-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-set-nshc-4-rpc-add-flow-write-actions-case {
-            uses nx-action-set-nshc-4-grouping;
+        case nx-action-learn-rpc-add-flow-write-actions-case {
+            uses nx-action-learn-grouping;
         }
     }
     augment "/sal-flow:add-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-set-nsi-rpc-add-flow-write-actions-case {
-            uses nx-action-set-nsi-grouping;
+        case nx-action-encap-rpc-add-flow-write-actions-case {
+            uses nx-action-encap-grouping;
         }
     }
-     augment "/sal-flow:add-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-conntrack-rpc-add-flow-write-actions-case {
-            uses nx-action-conntrack-grouping;
+    augment "/sal-flow:add-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
+        case nx-action-decap-rpc-add-flow-write-actions-case {
+            uses nx-action-decap-grouping;
         }
     }
 
+
+
     augment "/sal-flow:add-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
         case nx-action-reg-load-rpc-add-flow-apply-actions-case {
             uses nx-action-reg-load-grouping;
@@ -489,46 +818,50 @@ bits specified from the register.";
             uses nx-action-resubmit-grouping;
         }
     }
+    augment "/sal-flow:add-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
+        case nx-action-fin-timeout-rpc-add-flow-apply-actions-case {
+            uses nx-action-fin-timeout-grouping;
+        }
+    }
     augment "/sal-flow:add-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
         case nx-action-multipath-rpc-add-flow-apply-actions-case {
             uses nx-action-multipath-grouping;
         }
     }
     augment "/sal-flow:add-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-set-nsp-rpc-add-flow-apply-actions-case {
-            uses nx-action-set-nsp-grouping;
+        case nx-action-push-nsh-rpc-add-flow-apply-actions-case {
+            uses nx-action-push-nsh-grouping;
         }
     }
     augment "/sal-flow:add-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-set-nshc-1-rpc-add-flow-apply-actions-case {
-            uses nx-action-set-nshc-1-grouping;
+        case nx-action-pop-nsh-rpc-add-flow-apply-actions-case {
+            uses nx-action-pop-nsh-grouping;
         }
     }
+
     augment "/sal-flow:add-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-set-nshc-2-rpc-add-flow-apply-actions-case {
-            uses nx-action-set-nshc-2-grouping;
+        case nx-action-conntrack-rpc-add-flow-apply-actions-case {
+            uses nx-action-conntrack-grouping;
         }
     }
     augment "/sal-flow:add-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-set-nshc-3-rpc-add-flow-apply-actions-case {
-            uses nx-action-set-nshc-3-grouping;
+        case nx-action-ct-clear-rpc-add-flow-apply-actions-case {
+            uses nx-action-ct-clear-grouping;
         }
     }
-
     augment "/sal-flow:add-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-set-nshc-4-rpc-add-flow-apply-actions-case {
-            uses nx-action-set-nshc-4-grouping;
+        case nx-action-learn-rpc-add-flow-apply-actions-case {
+            uses nx-action-learn-grouping;
         }
     }
     augment "/sal-flow:add-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-conntrack-rpc-add-flow-apply-actions-case {
-            uses nx-action-conntrack-grouping;
+        case nx-action-encap-rpc-add-flow-apply-actions-case {
+            uses nx-action-encap-grouping;
         }
     }
-
     augment "/sal-flow:add-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-set-nsi-rpc-add-flow-apply-actions-case {
-            uses nx-action-set-nsi-grouping;
+        case nx-action-decap-rpc-add-flow-apply-actions-case {
+          uses nx-action-decap-grouping;
         }
     }
 
@@ -552,44 +885,49 @@ bits specified from the register.";
             uses nx-action-resubmit-grouping;
         }
     }
+    augment "/sal-flow:remove-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
+        case nx-action-fin-timeout-rpc-remove-flow-write-actions-case {
+            uses nx-action-fin-timeout-grouping;
+        }
+    }
     augment "/sal-flow:remove-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
         case nx-action-multipath-rpc-remove-flow-write-actions-case {
             uses nx-action-multipath-grouping;
         }
     }
     augment "/sal-flow:remove-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-set-nsp-rpc-remove-flow-write-actions-case {
-            uses nx-action-set-nsp-grouping;
+        case nx-action-push-nsh-rpc-remove-flow-write-actions-case {
+            uses nx-action-push-nsh-grouping;
         }
     }
     augment "/sal-flow:remove-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-set-nshc-1-rpc-remove-flow-write-actions-case {
-            uses nx-action-set-nshc-1-grouping;
+        case nx-action-pop-nsh-rpc-remove-flow-write-actions-case {
+            uses nx-action-pop-nsh-grouping;
         }
     }
     augment "/sal-flow:remove-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-set-nshc-2-rpc-remove-flow-write-actions-case {
-            uses nx-action-set-nshc-2-grouping;
+        case nx-action-conntrack-rpc-remove-flow-write-actions-case {
+            uses nx-action-conntrack-grouping;
         }
     }
     augment "/sal-flow:remove-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-set-nshc-3-rpc-remove-flow-write-actions-case {
-            uses nx-action-set-nshc-3-grouping;
+        case nx-action-ct-clear-rpc-remove-flow-write-actions-case {
+            uses nx-action-ct-clear-grouping;
         }
     }
     augment "/sal-flow:remove-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-set-nshc-4-rpc-remove-flow-write-actions-case {
-            uses nx-action-set-nshc-4-grouping;
+        case nx-action-learn-rpc-remove-flow-write-actions-case {
+            uses nx-action-learn-grouping;
         }
     }
     augment "/sal-flow:remove-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-set-nsi-rpc-remove-flow-write-actions-case {
-            uses nx-action-set-nsi-grouping;
+        case nx-action-encap-rpc-remove-flow-write-actions-case {
+            uses nx-action-encap-grouping;
         }
     }
     augment "/sal-flow:remove-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-conntrack-rpc-remove-flow-write-actions-case {
-            uses nx-action-conntrack-grouping;
+        case nx-action-decap-rpc-remove-flow-write-actions-case {
+            uses nx-action-decap-grouping;
         }
     }
 
@@ -613,44 +951,49 @@ bits specified from the register.";
             uses nx-action-resubmit-grouping;
         }
     }
+    augment "/sal-flow:remove-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
+        case nx-action-fin-timeout-rpc-remove-flow-apply-actions-case {
+            uses nx-action-fin-timeout-grouping;
+        }
+    }
     augment "/sal-flow:remove-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
         case nx-action-multipath-rpc-remove-flow-apply-actions-case {
             uses nx-action-multipath-grouping;
         }
     }
     augment "/sal-flow:remove-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-set-nsp-rpc-remove-flow-apply-actions-case {
-            uses nx-action-set-nsp-grouping;
+        case nx-action-push-nsh-rpc-remove-flow-apply-actions-case {
+            uses nx-action-push-nsh-grouping;
         }
     }
     augment "/sal-flow:remove-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-set-nshc-1-rpc-remove-flow-apply-actions-case {
-            uses nx-action-set-nshc-1-grouping;
+        case nx-action-pop-nsh-rpc-remove-flow-apply-actions-case {
+            uses nx-action-pop-nsh-grouping;
         }
     }
     augment "/sal-flow:remove-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-set-nshc-2-rpc-remove-flow-apply-actions-case {
-            uses nx-action-set-nshc-2-grouping;
+        case nx-action-conntrack-rpc-remove-flow-apply-actions-case {
+            uses nx-action-conntrack-grouping;
         }
     }
     augment "/sal-flow:remove-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-set-nshc-3-rpc-remove-flow-apply-actions-case {
-            uses nx-action-set-nshc-3-grouping;
+        case nx-action-ct-clear-rpc-remove-flow-apply-actions-case {
+            uses nx-action-ct-clear-grouping;
         }
     }
     augment "/sal-flow:remove-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-set-nshc-4-rpc-remove-flow-apply-actions-case {
-            uses nx-action-set-nshc-4-grouping;
+        case nx-action-learn-rpc-remove-flow-apply-actions-case {
+            uses nx-action-learn-grouping;
         }
     }
     augment "/sal-flow:remove-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-set-nsi-rpc-remove-flow-apply-actions-case {
-            uses nx-action-set-nsi-grouping;
+        case nx-action-encap-rpc-remove-flow-apply-actions-case {
+            uses nx-action-encap-grouping;
         }
     }
     augment "/sal-flow:remove-flow/sal-flow:input/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case nx-action-conntrack-rpc-remove-flow-apply-actions-case {
-            uses nx-action-conntrack-grouping;
+        case nx-action-decap-rpc-remove-flow-apply-actions-case {
+            uses nx-action-decap-grouping;
         }
     }
 
@@ -674,44 +1017,49 @@ bits specified from the register.";
             uses nx-action-resubmit-grouping;
         }
     }
+    augment "/sal-flow:update-flow/sal-flow:input/sal-flow:original-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
+        case "nx-action-fin-timeout-rpc-update-flow-original-write-actions-case" {
+            uses nx-action-fin-timeout-grouping;
+        }
+    }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:original-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
         case "nx-action-multipath-rpc-update-flow-original-write-actions-case" {
             uses nx-action-multipath-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:original-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-set-nsp-rpc-update-flow-original-write-actions-case" {
-            uses nx-action-set-nsp-grouping;
+        case "nx-action-push-nsh-rpc-update-flow-original-write-actions-case" {
+            uses nx-action-push-nsh-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:original-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-set-nshc-1-rpc-update-flow-original-write-actions-case" {
-            uses nx-action-set-nshc-1-grouping;
+        case "nx-action-pop-nsh-rpc-update-flow-original-write-actions-case" {
+            uses nx-action-pop-nsh-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:original-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-set-nshc-2-rpc-update-flow-original-write-actions-case" {
-            uses nx-action-set-nshc-2-grouping;
+        case "nx-action-conntrack-rpc-update-flow-original-write-actions-case" {
+            uses nx-action-conntrack-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:original-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-set-nshc-3-rpc-update-flow-original-write-actions-case" {
-            uses nx-action-set-nshc-3-grouping;
+        case "nx-action-ct-clear-rpc-update-flow-original-write-actions-case" {
+            uses nx-action-ct-clear-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:original-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-set-nshc-4-rpc-update-flow-original-write-actions-case" {
-            uses nx-action-set-nshc-4-grouping;
+        case "nx-action-learn-rpc-update-flow-original-write-actions-case" {
+            uses nx-action-learn-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:original-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-set-nsi-rpc-update-flow-original-write-actions-case" {
-            uses nx-action-set-nsi-grouping;
+        case "nx-action-encap-rpc-update-flow-original-write-actions-case" {
+            uses nx-action-encap-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:original-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-conntrack-rpc-update-flow-original-write-actions-case" {
-            uses nx-action-conntrack-grouping;
+        case "nx-action-decap-rpc-update-flow-original-write-actions-case" {
+            uses nx-action-decap-grouping;
         }
     }
 
@@ -735,44 +1083,49 @@ bits specified from the register.";
             uses nx-action-resubmit-grouping;
         }
     }
+    augment "/sal-flow:update-flow/sal-flow:input/sal-flow:original-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
+        case "nx-action-fin-timeout-rpc-update-flow-original-apply-actions-case" {
+            uses nx-action-fin-timeout-grouping;
+        }
+    }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:original-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
         case "nx-action-multipath-rpc-update-flow-original-apply-actions-case" {
             uses nx-action-multipath-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:original-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-set-nsp-rpc-update-flow-original-apply-actions-case" {
-            uses nx-action-set-nsp-grouping;
+        case "nx-action-push-nsh-rpc-update-flow-original-apply-actions-case" {
+            uses nx-action-push-nsh-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:original-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-set-nshc-1-rpc-update-flow-original-apply-actions-case" {
-            uses nx-action-set-nshc-1-grouping;
+        case "nx-action-pop-nsh-rpc-update-flow-original-apply-actions-case" {
+            uses nx-action-pop-nsh-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:original-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-set-nshc-2-rpc-update-flow-original-apply-actions-case" {
-            uses nx-action-set-nshc-2-grouping;
+        case "nx-action-conntrack-rpc-update-flow-original-apply-actions-case" {
+            uses nx-action-conntrack-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:original-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-set-nshc-3-rpc-update-flow-original-apply-actions-case" {
-            uses nx-action-set-nshc-3-grouping;
+        case "nx-action-ct-clear-rpc-update-flow-original-apply-actions-case" {
+            uses nx-action-ct-clear-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:original-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-set-nshc-4-rpc-update-flow-original-apply-actions-case" {
-            uses nx-action-set-nshc-4-grouping;
+        case "nx-action-learn-rpc-update-flow-original-apply-actions-case" {
+            uses nx-action-learn-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:original-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-set-nsi-rpc-update-flow-original-apply-actions-case" {
-            uses nx-action-set-nsi-grouping;
+        case "nx-action-encap-rpc-update-flow-original-apply-actions-case" {
+            uses nx-action-encap-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:original-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-conntrack-rpc-update-flow-original-apply-actions-case" {
-            uses nx-action-conntrack-grouping;
+        case "nx-action-decap-rpc-update-flow-original-apply-actions-case" {
+            uses nx-action-decap-grouping;
         }
     }
 
@@ -796,44 +1149,49 @@ bits specified from the register.";
             uses nx-action-resubmit-grouping;
         }
     }
+    augment "/sal-flow:update-flow/sal-flow:input/sal-flow:updated-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
+        case "nx-action-fin-timeout-rpc-update-flow-updated-write-actions-case" {
+            uses nx-action-fin-timeout-grouping;
+        }
+    }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:updated-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
         case "nx-action-multipath-rpc-update-flow-updated-write-actions-case" {
             uses nx-action-multipath-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:updated-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-set-nsp-rpc-update-flow-updated-write-actions-case" {
-            uses nx-action-set-nsp-grouping;
+        case "nx-action-push-nsh-rpc-update-flow-updated-write-actions-case" {
+            uses nx-action-push-nsh-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:updated-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-set-nshc-1-rpc-update-flow-updated-write-actions-case" {
-            uses nx-action-set-nshc-1-grouping;
+        case "nx-action-pop-nsh-rpc-update-flow-updated-write-actions-case" {
+            uses nx-action-pop-nsh-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:updated-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-set-nshc-2-rpc-update-flow-updated-write-actions-case" {
-            uses nx-action-set-nshc-2-grouping;
+        case "nx-action-conntrack-rpc-update-flow-updated-write-actions-case" {
+            uses nx-action-conntrack-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:updated-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-set-nshc-3-rpc-update-flow-updated-write-actions-case" {
-            uses nx-action-set-nshc-3-grouping;
+        case "nx-action-ct-clear-rpc-update-flow-updated-write-actions-case" {
+            uses nx-action-ct-clear-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:updated-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-set-nshc-4-rpc-update-flow-updated-write-actions-case" {
-            uses nx-action-set-nshc-4-grouping;
+        case "nx-action-learn-rpc-update-flow-updated-write-actions-case" {
+            uses nx-action-learn-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:updated-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-set-nsi-rpc-update-flow-updated-write-actions-case" {
-            uses nx-action-set-nsi-grouping;
+        case "nx-action-encap-rpc-update-flow-updated-write-actions-case" {
+            uses nx-action-encap-grouping;
         }
     }
-     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:updated-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-conntrack-rpc-update-flow-updated-write-actions-case" {
-            uses nx-action-conntrack-grouping;
+    augment "/sal-flow:update-flow/sal-flow:input/sal-flow:updated-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:write-actions-case/sal-flow:write-actions/sal-flow:action/sal-flow:action" {
+        case "nx-action-decap-rpc-update-flow-updated-write-actions-case" {
+            uses nx-action-decap-grouping;
         }
     }
 
@@ -857,44 +1215,49 @@ bits specified from the register.";
             uses nx-action-resubmit-grouping;
         }
     }
+    augment "/sal-flow:update-flow/sal-flow:input/sal-flow:updated-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
+        case "nx-action-fin-timeout-rpc-update-flow-updated-apply-actions-case" {
+            uses nx-action-fin-timeout-grouping;
+        }
+    }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:updated-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
         case "nx-action-multipath-rpc-update-flow-updated-apply-actions-case" {
             uses nx-action-multipath-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:updated-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-set-nsp-rpc-update-flow-updated-apply-actions-case" {
-            uses nx-action-set-nsp-grouping;
+        case "nx-action-push-nsh-rpc-update-flow-updated-apply-actions-case" {
+            uses nx-action-push-nsh-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:updated-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-set-nshc-1-rpc-update-flow-updated-apply-actions-case" {
-            uses nx-action-set-nshc-1-grouping;
+        case "nx-action-pop-nsh-rpc-update-flow-updated-apply-actions-case" {
+            uses nx-action-pop-nsh-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:updated-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-set-nshc-2-rpc-update-flow-updated-apply-actions-case" {
-            uses nx-action-set-nshc-2-grouping;
+        case "nx-action-conntrack-rpc-update-flow-updated-apply-actions-case" {
+            uses nx-action-conntrack-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:updated-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-set-nshc-3-rpc-update-flow-updated-apply-actions-case" {
-            uses nx-action-set-nshc-3-grouping;
+        case "nx-action-ct-clear-rpc-update-flow-updated-apply-actions-case" {
+            uses nx-action-ct-clear-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:updated-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-set-nshc-4-rpc-update-flow-updated-apply-actions-case" {
-            uses nx-action-set-nshc-4-grouping;
+        case "nx-action-learn-rpc-update-flow-updated-apply-actions-case" {
+            uses nx-action-learn-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:updated-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-set-nsi-rpc-update-flow-updated-apply-actions-case" {
-            uses nx-action-set-nsi-grouping;
+        case "nx-action-encap-rpc-update-flow-updated-apply-actions-case" {
+            uses nx-action-encap-grouping;
         }
     }
     augment "/sal-flow:update-flow/sal-flow:input/sal-flow:updated-flow/sal-flow:instructions/sal-flow:instruction/sal-flow:instruction/sal-flow:apply-actions-case/sal-flow:apply-actions/sal-flow:action/sal-flow:action" {
-        case "nx-action-conntrack-rpc-update-flow-updated-apply-actions-case" {
-            uses nx-action-conntrack-grouping;
+        case "nx-action-decap-rpc-update-flow-updated-apply-actions-case" {
+            uses nx-action-decap-grouping;
         }
     }
 
@@ -918,44 +1281,49 @@ bits specified from the register.";
             uses nx-action-resubmit-grouping;
         }
     }
+    augment "/sal-group:add-group/sal-group:input/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
+        case "nx-action-fin-timeout-rpc-add-group-case" {
+            uses nx-action-fin-timeout-grouping;
+        }
+    }
     augment "/sal-group:add-group/sal-group:input/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
         case "nx-action-multipath-rpc-add-group-case" {
             uses nx-action-multipath-grouping;
         }
     }
     augment "/sal-group:add-group/sal-group:input/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-set-nsp-rpc-add-group-case" {
-            uses nx-action-set-nsp-grouping;
+        case "nx-action-push-nsh-rpc-add-group-case" {
+            uses nx-action-push-nsh-grouping;
         }
     }
     augment "/sal-group:add-group/sal-group:input/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-set-nshc-1-rpc-add-group-case" {
-            uses nx-action-set-nshc-1-grouping;
+        case "nx-action-pop-nsh-rpc-add-group-case" {
+            uses nx-action-pop-nsh-grouping;
         }
     }
     augment "/sal-group:add-group/sal-group:input/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-set-nshc-2-rpc-add-group-case" {
-            uses nx-action-set-nshc-2-grouping;
+        case "nx-action-conntrack-rpc-add-group-case" {
+            uses nx-action-conntrack-grouping;
         }
     }
     augment "/sal-group:add-group/sal-group:input/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-set-nshc-3-rpc-add-group-case" {
-            uses nx-action-set-nshc-3-grouping;
+        case "nx-action-ct-clear-rpc-add-group-case" {
+            uses nx-action-ct-clear-grouping;
         }
     }
     augment "/sal-group:add-group/sal-group:input/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-set-nshc-4-rpc-add-group-case" {
-            uses nx-action-set-nshc-4-grouping;
+        case "nx-action-learn-rpc-add-group-case" {
+            uses nx-action-learn-grouping;
         }
     }
     augment "/sal-group:add-group/sal-group:input/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-set-nsi-rpc-add-group-case" {
-            uses nx-action-set-nsi-grouping;
+        case "nx-action-encap-rpc-add-group-case" {
+            uses nx-action-encap-grouping;
         }
     }
     augment "/sal-group:add-group/sal-group:input/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-conntrack-rpc-add-group-case" {
-            uses nx-action-conntrack-grouping;
+        case "nx-action-decap-rpc-add-group-case" {
+            uses nx-action-decap-grouping;
         }
     }
 
@@ -979,44 +1347,49 @@ bits specified from the register.";
             uses nx-action-resubmit-grouping;
         }
     }
+    augment "/sal-group:remove-group/sal-group:input/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
+        case "nx-action-fin-timeout-rpc-remove-group-case" {
+            uses nx-action-fin-timeout-grouping;
+        }
+    }
     augment "/sal-group:remove-group/sal-group:input/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
         case "nx-action-multipath-rpc-remove-group-case" {
             uses nx-action-multipath-grouping;
         }
     }
     augment "/sal-group:remove-group/sal-group:input/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-set-nsp-rpc-remove-group-case" {
-            uses nx-action-set-nsp-grouping;
+        case "nx-action-push-nsh-rpc-remove-group-case" {
+            uses nx-action-push-nsh-grouping;
         }
     }
     augment "/sal-group:remove-group/sal-group:input/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-set-nshc-1-rpc-remove-group-case" {
-            uses nx-action-set-nshc-1-grouping;
+        case "nx-action-pop-nsh-rpc-remove-group-case" {
+            uses nx-action-pop-nsh-grouping;
         }
     }
     augment "/sal-group:remove-group/sal-group:input/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-set-nshc-2-rpc-remove-group-case" {
-            uses nx-action-set-nshc-2-grouping;
+        case "nx-action-conntrack-rpc-remove-group-case" {
+            uses nx-action-conntrack-grouping;
         }
     }
     augment "/sal-group:remove-group/sal-group:input/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-set-nshc-3-rpc-remove-group-case" {
-            uses nx-action-set-nshc-3-grouping;
+        case "nx-action-ct-clear-rpc-remove-group-case" {
+            uses nx-action-ct-clear-grouping;
         }
     }
     augment "/sal-group:remove-group/sal-group:input/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-set-nshc-4-rpc-remove-group-case" {
-            uses nx-action-set-nshc-4-grouping;
+        case "nx-action-learn-rpc-remove-group-case" {
+            uses nx-action-learn-grouping;
         }
     }
     augment "/sal-group:remove-group/sal-group:input/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-set-nsi-rpc-remove-group-case" {
-            uses nx-action-set-nsi-grouping;
+        case "nx-action-encap-rpc-remove-group-case" {
+            uses nx-action-encap-grouping;
         }
     }
     augment "/sal-group:remove-group/sal-group:input/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-conntrack-rpc-remove-group-case" {
-            uses nx-action-conntrack-grouping;
+        case "nx-action-decap-rpc-remove-group-case" {
+            uses nx-action-decap-grouping;
         }
     }
 
@@ -1040,44 +1413,49 @@ bits specified from the register.";
             uses nx-action-resubmit-grouping;
         }
     }
+    augment "/sal-group:update-group/sal-group:input/sal-group:original-group/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
+        case "nx-action-fin-timeout-rpc-update-group-original-case" {
+            uses nx-action-fin-timeout-grouping;
+        }
+    }
     augment "/sal-group:update-group/sal-group:input/sal-group:original-group/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
         case "nx-action-multipath-rpc-update-group-original-case" {
             uses nx-action-multipath-grouping;
         }
     }
     augment "/sal-group:update-group/sal-group:input/sal-group:original-group/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-set-nsp-rpc-update-group-original-case" {
-            uses nx-action-set-nsp-grouping;
+        case "nx-action-push-nsh-rpc-update-group-original-case" {
+            uses nx-action-push-nsh-grouping;
         }
     }
     augment "/sal-group:update-group/sal-group:input/sal-group:original-group/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-set-nshc-1-rpc-update-group-original-case" {
-            uses nx-action-set-nshc-1-grouping;
+        case "nx-action-pop-nsh-rpc-update-group-original-case" {
+            uses nx-action-pop-nsh-grouping;
         }
     }
     augment "/sal-group:update-group/sal-group:input/sal-group:original-group/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-set-nshc-2-rpc-update-group-original-case" {
-            uses nx-action-set-nshc-2-grouping;
+        case "nx-action-conntrack-rpc-update-group-original-case" {
+            uses nx-action-conntrack-grouping;
         }
     }
     augment "/sal-group:update-group/sal-group:input/sal-group:original-group/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-set-nshc-3-rpc-update-group-original-case" {
-            uses nx-action-set-nshc-3-grouping;
+        case "nx-action-ct-clear-rpc-update-group-original-case" {
+            uses nx-action-ct-clear-grouping;
         }
     }
     augment "/sal-group:update-group/sal-group:input/sal-group:original-group/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-set-nshc-4-rpc-update-group-original-case" {
-            uses nx-action-set-nshc-4-grouping;
+        case "nx-action-learn-rpc-update-group-original-case" {
+            uses nx-action-learn-grouping;
         }
     }
     augment "/sal-group:update-group/sal-group:input/sal-group:original-group/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-set-nsi-rpc-update-group-original-case" {
-            uses nx-action-set-nsi-grouping;
+        case "nx-action-encap-rpc-update-group-original-case" {
+            uses nx-action-encap-grouping;
         }
     }
     augment "/sal-group:update-group/sal-group:input/sal-group:original-group/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-conntrack-rpc-update-group-original-case" {
-            uses nx-action-conntrack-grouping;
+        case "nx-action-decap-rpc-update-group-original-case" {
+            uses nx-action-decap-grouping;
         }
     }
 
@@ -1101,44 +1479,49 @@ bits specified from the register.";
             uses nx-action-resubmit-grouping;
         }
     }
+    augment "/sal-group:update-group/sal-group:input/sal-group:updated-group/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
+        case "nx-action-fin-timeout-rpc-update-group-updated-case" {
+            uses nx-action-fin-timeout-grouping;
+        }
+    }
     augment "/sal-group:update-group/sal-group:input/sal-group:updated-group/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
         case "nx-action-multipath-rpc-update-group-updated-case" {
             uses nx-action-multipath-grouping;
         }
     }
     augment "/sal-group:update-group/sal-group:input/sal-group:updated-group/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-set-nsp-rpc-update-group-updated-case" {
-            uses nx-action-set-nsp-grouping;
+        case "nx-action-push-nsh-rpc-update-group-updated-case" {
+            uses nx-action-push-nsh-grouping;
         }
     }
     augment "/sal-group:update-group/sal-group:input/sal-group:updated-group/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-set-nshc-1-rpc-update-group-updated-case" {
-            uses nx-action-set-nshc-1-grouping;
+        case "nx-action-pop-nsh-rpc-update-group-updated-case" {
+            uses nx-action-pop-nsh-grouping;
         }
     }
     augment "/sal-group:update-group/sal-group:input/sal-group:updated-group/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-set-nshc-2-rpc-update-group-updated-case" {
-            uses nx-action-set-nshc-2-grouping;
+        case "nx-action-conntrack-rpc-update-group-updated-case" {
+            uses nx-action-conntrack-grouping;
         }
     }
     augment "/sal-group:update-group/sal-group:input/sal-group:updated-group/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-set-nshc-3-rpc-update-group-updated-case" {
-            uses nx-action-set-nshc-3-grouping;
+        case "nx-action-ct-clear-rpc-update-group-updated-case" {
+            uses nx-action-ct-clear-grouping;
         }
     }
     augment "/sal-group:update-group/sal-group:input/sal-group:updated-group/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-set-nshc-4-rpc-update-group-updated-case" {
-            uses nx-action-set-nshc-4-grouping;
+        case "nx-action-learn-rpc-update-group-updated-case" {
+            uses nx-action-learn-grouping;
         }
     }
     augment "/sal-group:update-group/sal-group:input/sal-group:updated-group/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-set-nsi-rpc-update-group-updated-case" {
-            uses nx-action-set-nsi-grouping;
+        case "nx-action-encap-rpc-update-group-updated-case" {
+            uses nx-action-encap-grouping;
         }
     }
     augment "/sal-group:update-group/sal-group:input/sal-group:updated-group/sal-group:buckets/sal-group:bucket/sal-group:action/sal-group:action" {
-        case "nx-action-conntrack-rpc-update-group-updated-case" {
-            uses nx-action-conntrack-grouping;
+        case "nx-action-decap-rpc-update-group-updated-case" {
+            uses nx-action-decap-grouping;
         }
     }
 
@@ -1162,44 +1545,49 @@ bits specified from the register.";
             uses nx-action-resubmit-grouping;
         }
     }
+    augment "/sal-packet:transmit-packet/sal-packet:input/sal-packet:action/sal-packet:action" {
+        case "nx-action-fin-timeout-rpc-transmit-packet-case" {
+            uses nx-action-fin-timeout-grouping;
+        }
+    }
     augment "/sal-packet:transmit-packet/sal-packet:input/sal-packet:action/sal-packet:action" {
         case "nx-action-multipath-rpc-transmit-packet-case" {
             uses nx-action-multipath-grouping;
         }
     }
     augment "/sal-packet:transmit-packet/sal-packet:input/sal-packet:action/sal-packet:action" {
-        case "nx-action-set-nsp-rpc-transmit-packet-case" {
-            uses nx-action-set-nsp-grouping;
+        case "nx-action-push-nsh-rpc-transmit-packet-case" {
+            uses nx-action-push-nsh-grouping;
         }
     }
     augment "/sal-packet:transmit-packet/sal-packet:input/sal-packet:action/sal-packet:action" {
-        case "nx-action-set-nshc-1-rpc-transmit-packet-case" {
-            uses nx-action-set-nshc-1-grouping;
+        case "nx-action-pop-nsh-rpc-transmit-packet-case" {
+            uses nx-action-pop-nsh-grouping;
         }
     }
     augment "/sal-packet:transmit-packet/sal-packet:input/sal-packet:action/sal-packet:action" {
-        case "nx-action-set-nshc-2-rpc-transmit-packet-case" {
-            uses nx-action-set-nshc-2-grouping;
+        case "nx-action-conntrack-rpc-transmit-packet-case" {
+            uses nx-action-conntrack-grouping;
         }
     }
     augment "/sal-packet:transmit-packet/sal-packet:input/sal-packet:action/sal-packet:action" {
-        case "nx-action-set-nshc-3-rpc-transmit-packet-case" {
-            uses nx-action-set-nshc-3-grouping;
+        case "nx-action-ct-clear-rpc-transmit-packet-case" {
+            uses nx-action-ct-clear-grouping;
         }
     }
     augment "/sal-packet:transmit-packet/sal-packet:input/sal-packet:action/sal-packet:action" {
-        case "nx-action-set-nshc-4-rpc-transmit-packet-case" {
-            uses nx-action-set-nshc-4-grouping;
+        case "nx-action-learn-rpc-transmit-packet-case" {
+            uses nx-action-learn-grouping;
         }
     }
     augment "/sal-packet:transmit-packet/sal-packet:input/sal-packet:action/sal-packet:action" {
-        case "nx-action-set-nsi-rpc-transmit-packet-case" {
-            uses nx-action-set-nsi-grouping;
+        case "nx-action-encap-rpc-transmit-packet-case" {
+            uses nx-action-encap-grouping;
         }
     }
     augment "/sal-packet:transmit-packet/sal-packet:input/sal-packet:action/sal-packet:action" {
-        case "nx-action-conntrack-rpc-transmit-packet-case" {
-            uses nx-action-conntrack-grouping;
+        case "nx-action-decap-rpc-transmit-packet-case" {
+            uses nx-action-decap-grouping;
         }
     }
 
@@ -1224,44 +1612,49 @@ bits specified from the register.";
             uses nx-action-resubmit-grouping;
         }
     }
+    augment "/inv:nodes/inv:node/fni:table/fni:flow/fni:instructions/fni:instruction/fni:instruction/fni:write-actions-case/fni:write-actions/fni:action/fni:action" {
+        case "nx-action-fin-timeout-nodes-node-table-flow-write-actions-case" {
+            uses nx-action-fin-timeout-grouping;
+        }
+    }
     augment "/inv:nodes/inv:node/fni:table/fni:flow/fni:instructions/fni:instruction/fni:instruction/fni:write-actions-case/fni:write-actions/fni:action/fni:action" {
         case "nx-action-multipath-nodes-node-table-flow-write-actions-case" {
             uses nx-action-multipath-grouping;
         }
     }
     augment "/inv:nodes/inv:node/fni:table/fni:flow/fni:instructions/fni:instruction/fni:instruction/fni:write-actions-case/fni:write-actions/fni:action/fni:action" {
-        case "nx-action-set-nsp-nodes-node-table-flow-write-actions-case" {
-            uses nx-action-set-nsp-grouping;
+        case "nx-action-push-nsh-nodes-node-table-flow-write-actions-case" {
+            uses nx-action-push-nsh-grouping;
         }
     }
     augment "/inv:nodes/inv:node/fni:table/fni:flow/fni:instructions/fni:instruction/fni:instruction/fni:write-actions-case/fni:write-actions/fni:action/fni:action" {
-        case "nx-action-set-nshc-1-nodes-node-table-flow-write-actions-case" {
-            uses nx-action-set-nshc-1-grouping;
+        case "nx-action-pop-nsh-nodes-node-table-flow-write-actions-case" {
+            uses nx-action-pop-nsh-grouping;
         }
     }
     augment "/inv:nodes/inv:node/fni:table/fni:flow/fni:instructions/fni:instruction/fni:instruction/fni:write-actions-case/fni:write-actions/fni:action/fni:action" {
-        case "nx-action-set-nshc-2-nodes-node-table-flow-write-actions-case" {
-            uses nx-action-set-nshc-2-grouping;
+        case "nx-action-conntrack-nodes-node-table-flow-write-actions-case" {
+            uses nx-action-conntrack-grouping;
         }
     }
     augment "/inv:nodes/inv:node/fni:table/fni:flow/fni:instructions/fni:instruction/fni:instruction/fni:write-actions-case/fni:write-actions/fni:action/fni:action" {
-        case "nx-action-set-nshc-3-nodes-node-table-flow-write-actions-case" {
-            uses nx-action-set-nshc-3-grouping;
+        case "nx-action-ct-clear-nodes-node-table-flow-write-actions-case" {
+            uses nx-action-ct-clear-grouping;
         }
     }
     augment "/inv:nodes/inv:node/fni:table/fni:flow/fni:instructions/fni:instruction/fni:instruction/fni:write-actions-case/fni:write-actions/fni:action/fni:action" {
-        case "nx-action-set-nshc-4-nodes-node-table-flow-write-actions-case" {
-            uses nx-action-set-nshc-4-grouping;
+        case "nx-action-learn-nodes-node-table-flow-write-actions-case" {
+            uses nx-action-learn-grouping;
         }
     }
     augment "/inv:nodes/inv:node/fni:table/fni:flow/fni:instructions/fni:instruction/fni:instruction/fni:write-actions-case/fni:write-actions/fni:action/fni:action" {
-        case "nx-action-set-nsi-nodes-node-table-flow-write-actions-case" {
-            uses nx-action-set-nsi-grouping;
+        case "nx-action-encap-nodes-node-table-flow-write-actions-case" {
+            uses nx-action-encap-grouping;
         }
     }
     augment "/inv:nodes/inv:node/fni:table/fni:flow/fni:instructions/fni:instruction/fni:instruction/fni:write-actions-case/fni:write-actions/fni:action/fni:action" {
-        case "nx-action-conntrack-nodes-node-table-flow-write-actions-case" {
-            uses nx-action-conntrack-grouping;
+        case "nx-action-decap-nodes-node-table-flow-write-actions-case" {
+            uses nx-action-decap-grouping;
         }
     }
 
@@ -1285,44 +1678,49 @@ bits specified from the register.";
             uses nx-action-resubmit-grouping;
         }
     }
+    augment "/inv:nodes/inv:node/fni:table/fni:flow/fni:instructions/fni:instruction/fni:instruction/fni:apply-actions-case/fni:apply-actions/fni:action/fni:action" {
+        case "nx-action-fin-timeout-nodes-node-table-flow-apply-actions-case" {
+            uses nx-action-fin-timeout-grouping;
+        }
+    }
     augment "/inv:nodes/inv:node/fni:table/fni:flow/fni:instructions/fni:instruction/fni:instruction/fni:apply-actions-case/fni:apply-actions/fni:action/fni:action" {
         case "nx-action-multipath-nodes-node-table-flow-apply-actions-case" {
             uses nx-action-multipath-grouping;
         }
     }
     augment "/inv:nodes/inv:node/fni:table/fni:flow/fni:instructions/fni:instruction/fni:instruction/fni:apply-actions-case/fni:apply-actions/fni:action/fni:action" {
-        case "nx-action-set-nsp-nodes-node-table-flow-apply-actions-case" {
-            uses nx-action-set-nsp-grouping;
+        case "nx-action-push-nsh-nodes-node-table-flow-apply-actions-case" {
+            uses nx-action-push-nsh-grouping;
         }
     }
     augment "/inv:nodes/inv:node/fni:table/fni:flow/fni:instructions/fni:instruction/fni:instruction/fni:apply-actions-case/fni:apply-actions/fni:action/fni:action" {
-        case "nx-action-set-nshc-1-nodes-node-table-flow-apply-actions-case" {
-            uses nx-action-set-nshc-1-grouping;
+        case "nx-action-pop-nsh-nodes-node-table-flow-apply-actions-case" {
+            uses nx-action-pop-nsh-grouping;
         }
     }
     augment "/inv:nodes/inv:node/fni:table/fni:flow/fni:instructions/fni:instruction/fni:instruction/fni:apply-actions-case/fni:apply-actions/fni:action/fni:action" {
-        case "nx-action-set-nshc-2-nodes-node-table-flow-apply-actions-case" {
-            uses nx-action-set-nshc-2-grouping;
+        case "nx-action-conntrack-nodes-node-table-flow-apply-actions-case" {
+            uses nx-action-conntrack-grouping;
         }
     }
     augment "/inv:nodes/inv:node/fni:table/fni:flow/fni:instructions/fni:instruction/fni:instruction/fni:apply-actions-case/fni:apply-actions/fni:action/fni:action" {
-        case "nx-action-set-nshc-3-nodes-node-table-flow-apply-actions-case" {
-            uses nx-action-set-nshc-3-grouping;
+        case "nx-action-ct-clear-nodes-node-table-flow-apply-actions-case" {
+            uses nx-action-ct-clear-grouping;
         }
     }
     augment "/inv:nodes/inv:node/fni:table/fni:flow/fni:instructions/fni:instruction/fni:instruction/fni:apply-actions-case/fni:apply-actions/fni:action/fni:action" {
-        case "nx-action-set-nshc-4-nodes-node-table-flow-apply-actions-case" {
-            uses nx-action-set-nshc-4-grouping;
+        case "nx-action-learn-nodes-node-table-flow-apply-actions-case" {
+            uses nx-action-learn-grouping;
         }
     }
     augment "/inv:nodes/inv:node/fni:table/fni:flow/fni:instructions/fni:instruction/fni:instruction/fni:apply-actions-case/fni:apply-actions/fni:action/fni:action" {
-        case "nx-action-set-nsi-nodes-node-table-flow-apply-actions-case" {
-            uses nx-action-set-nsi-grouping;
+        case "nx-action-encap-nodes-node-table-flow-apply-actions-case" {
+            uses nx-action-encap-grouping;
         }
     }
     augment "/inv:nodes/inv:node/fni:table/fni:flow/fni:instructions/fni:instruction/fni:instruction/fni:apply-actions-case/fni:apply-actions/fni:action/fni:action" {
-        case "nx-action-conntrack-nodes-node-table-flow-apply-actions-case" {
-            uses nx-action-conntrack-grouping;
+        case "nx-action-decap-nodes-node-table-flow-apply-actions-case" {
+            uses nx-action-decap-grouping;
         }
     }
 
@@ -1346,44 +1744,49 @@ bits specified from the register.";
             uses nx-action-resubmit-grouping;
         }
     }
+    augment "/inv:nodes/inv:node/fni:group/fni:buckets/fni:bucket/fni:action/fni:action" {
+        case "nx-action-fin-timeout-nodes-node-group-buckets-bucket-actions-case" {
+            uses nx-action-fin-timeout-grouping;
+        }
+    }
     augment "/inv:nodes/inv:node/fni:group/fni:buckets/fni:bucket/fni:action/fni:action" {
         case "nx-action-multipath-nodes-node-group-buckets-bucket-actions-case" {
             uses nx-action-multipath-grouping;
         }
     }
     augment "/inv:nodes/inv:node/fni:group/fni:buckets/fni:bucket/fni:action/fni:action" {
-        case "nx-action-set-nsp-nodes-node-group-buckets-bucket-actions-case" {
-            uses nx-action-set-nsp-grouping;
+        case "nx-action-push-nsh-nodes-node-group-buckets-bucket-actions-case" {
+            uses nx-action-push-nsh-grouping;
         }
     }
     augment "/inv:nodes/inv:node/fni:group/fni:buckets/fni:bucket/fni:action/fni:action" {
-        case "nx-action-set-nshc-1-nodes-node-group-buckets-bucket-actions-case" {
-            uses nx-action-set-nshc-1-grouping;
+        case "nx-action-pop-nsh-nodes-node-group-buckets-bucket-actions-case" {
+            uses nx-action-pop-nsh-grouping;
         }
     }
     augment "/inv:nodes/inv:node/fni:group/fni:buckets/fni:bucket/fni:action/fni:action" {
-        case "nx-action-set-nshc-2-nodes-node-group-buckets-bucket-actions-case" {
-            uses nx-action-set-nshc-2-grouping;
+        case "nx-action-conntrack-nodes-node-group-buckets-bucket-actions-case" {
+            uses nx-action-conntrack-grouping;
         }
     }
     augment "/inv:nodes/inv:node/fni:group/fni:buckets/fni:bucket/fni:action/fni:action" {
-        case "nx-action-set-nshc-3-nodes-node-group-buckets-bucket-actions-case" {
-            uses nx-action-set-nshc-3-grouping;
+        case "nx-action-ct-clear-nodes-node-group-buckets-bucket-actions-case" {
+            uses nx-action-ct-clear-grouping;
         }
     }
     augment "/inv:nodes/inv:node/fni:group/fni:buckets/fni:bucket/fni:action/fni:action" {
-        case "nx-action-set-nshc-4-nodes-node-group-buckets-bucket-actions-case" {
-            uses nx-action-set-nshc-4-grouping;
+        case "nx-action-learn-nodes-node-group-buckets-bucket-actions-case" {
+            uses nx-action-learn-grouping;
         }
     }
     augment "/inv:nodes/inv:node/fni:group/fni:buckets/fni:bucket/fni:action/fni:action" {
-        case "nx-action-set-nsi-nodes-node-group-buckets-bucket-actions-case" {
-            uses nx-action-set-nsi-grouping;
+        case "nx-action-encap-nodes-node-group-buckets-bucket-actions-case" {
+            uses nx-action-encap-grouping;
         }
     }
     augment "/inv:nodes/inv:node/fni:group/fni:buckets/fni:bucket/fni:action/fni:action" {
-        case "nx-action-conntrack-nodes-node-group-buckets-bucket-actions-case" {
-            uses nx-action-conntrack-grouping;
+        case "nx-action-decap-nodes-node-group-buckets-bucket-actions-case" {
+            uses nx-action-decap-grouping;
         }
     }
 
@@ -1408,44 +1811,49 @@ bits specified from the register.";
             uses nx-action-resubmit-grouping;
         }
     }
+    augment "/odl-flow-stats:flows-statistics-update/odl-flow-stats:flow-and-statistics-map-list/odl-flow-stats:instructions/odl-flow-stats:instruction/odl-flow-stats:instruction/odl-flow-stats:write-actions-case/odl-flow-stats:write-actions/odl-flow-stats:action/odl-flow-stats:action" {
+        case "nx-action-fin-timeout-notif-flows-statistics-update-write-actions-case" {
+            uses nx-action-fin-timeout-grouping;
+        }
+    }
     augment "/odl-flow-stats:flows-statistics-update/odl-flow-stats:flow-and-statistics-map-list/odl-flow-stats:instructions/odl-flow-stats:instruction/odl-flow-stats:instruction/odl-flow-stats:write-actions-case/odl-flow-stats:write-actions/odl-flow-stats:action/odl-flow-stats:action" {
         case "nx-action-multipath-notif-flows-statistics-update-write-actions-case" {
             uses nx-action-multipath-grouping;
         }
     }
     augment "/odl-flow-stats:flows-statistics-update/odl-flow-stats:flow-and-statistics-map-list/odl-flow-stats:instructions/odl-flow-stats:instruction/odl-flow-stats:instruction/odl-flow-stats:write-actions-case/odl-flow-stats:write-actions/odl-flow-stats:action/odl-flow-stats:action" {
-        case "nx-action-set-nsp-notif-flows-statistics-update-write-actions-case" {
-            uses nx-action-set-nsp-grouping;
+        case "nx-action-push-nsh-notif-flows-statistics-update-write-actions-case" {
+            uses nx-action-push-nsh-grouping;
         }
     }
     augment "/odl-flow-stats:flows-statistics-update/odl-flow-stats:flow-and-statistics-map-list/odl-flow-stats:instructions/odl-flow-stats:instruction/odl-flow-stats:instruction/odl-flow-stats:write-actions-case/odl-flow-stats:write-actions/odl-flow-stats:action/odl-flow-stats:action" {
-        case "nx-action-set-nshc-1-notif-flows-statistics-update-write-actions-case" {
-            uses nx-action-set-nshc-1-grouping;
+        case "nx-action-pop-nsh-notif-flows-statistics-update-write-actions-case" {
+            uses nx-action-pop-nsh-grouping;
         }
     }
     augment "/odl-flow-stats:flows-statistics-update/odl-flow-stats:flow-and-statistics-map-list/odl-flow-stats:instructions/odl-flow-stats:instruction/odl-flow-stats:instruction/odl-flow-stats:write-actions-case/odl-flow-stats:write-actions/odl-flow-stats:action/odl-flow-stats:action" {
-        case "nx-action-set-nshc-2-notif-flows-statistics-update-write-actions-case" {
-            uses nx-action-set-nshc-2-grouping;
+        case "nx-action-conntrack-notif-flows-statistics-update-write-actions-case" {
+            uses nx-action-conntrack-grouping;
         }
     }
     augment "/odl-flow-stats:flows-statistics-update/odl-flow-stats:flow-and-statistics-map-list/odl-flow-stats:instructions/odl-flow-stats:instruction/odl-flow-stats:instruction/odl-flow-stats:write-actions-case/odl-flow-stats:write-actions/odl-flow-stats:action/odl-flow-stats:action" {
-        case "nx-action-set-nshc-3-notif-flows-statistics-update-write-actions-case" {
-            uses nx-action-set-nshc-3-grouping;
+        case "nx-action-ct-clear-notif-flows-statistics-update-write-actions-case" {
+            uses nx-action-ct-clear-grouping;
         }
     }
     augment "/odl-flow-stats:flows-statistics-update/odl-flow-stats:flow-and-statistics-map-list/odl-flow-stats:instructions/odl-flow-stats:instruction/odl-flow-stats:instruction/odl-flow-stats:write-actions-case/odl-flow-stats:write-actions/odl-flow-stats:action/odl-flow-stats:action" {
-        case "nx-action-set-nshc-4-notif-flows-statistics-update-write-actions-case" {
-            uses nx-action-set-nshc-4-grouping;
+        case "nx-action-learn-notif-flows-statistics-update-write-actions-case" {
+            uses nx-action-learn-grouping;
         }
     }
     augment "/odl-flow-stats:flows-statistics-update/odl-flow-stats:flow-and-statistics-map-list/odl-flow-stats:instructions/odl-flow-stats:instruction/odl-flow-stats:instruction/odl-flow-stats:write-actions-case/odl-flow-stats:write-actions/odl-flow-stats:action/odl-flow-stats:action" {
-        case "nx-action-set-nsi-notif-flows-statistics-update-write-actions-case" {
-            uses nx-action-set-nsi-grouping;
+        case "nx-action-encap-notif-flows-statistics-update-write-actions-case" {
+            uses nx-action-encap-grouping;
         }
     }
     augment "/odl-flow-stats:flows-statistics-update/odl-flow-stats:flow-and-statistics-map-list/odl-flow-stats:instructions/odl-flow-stats:instruction/odl-flow-stats:instruction/odl-flow-stats:write-actions-case/odl-flow-stats:write-actions/odl-flow-stats:action/odl-flow-stats:action" {
-        case "nx-action-conntrack-notif-flows-statistics-update-write-actions-case" {
-            uses nx-action-conntrack-grouping;
+        case "nx-action-decap-notif-flows-statistics-update-write-actions-case" {
+            uses nx-action-decap-grouping;
         }
     }
 
@@ -1469,44 +1877,49 @@ bits specified from the register.";
             uses nx-action-resubmit-grouping;
         }
     }
+    augment "/odl-flow-stats:flows-statistics-update/odl-flow-stats:flow-and-statistics-map-list/odl-flow-stats:instructions/odl-flow-stats:instruction/odl-flow-stats:instruction/odl-flow-stats:apply-actions-case/odl-flow-stats:apply-actions/odl-flow-stats:action/odl-flow-stats:action" {
+        case "nx-action-fin-timeout-notif-flows-statistics-update-apply-actions-case" {
+            uses nx-action-fin-timeout-grouping;
+        }
+    }
     augment "/odl-flow-stats:flows-statistics-update/odl-flow-stats:flow-and-statistics-map-list/odl-flow-stats:instructions/odl-flow-stats:instruction/odl-flow-stats:instruction/odl-flow-stats:apply-actions-case/odl-flow-stats:apply-actions/odl-flow-stats:action/odl-flow-stats:action" {
         case "nx-action-multipath-notif-flows-statistics-update-apply-actions-case" {
             uses nx-action-multipath-grouping;
         }
     }
     augment "/odl-flow-stats:flows-statistics-update/odl-flow-stats:flow-and-statistics-map-list/odl-flow-stats:instructions/odl-flow-stats:instruction/odl-flow-stats:instruction/odl-flow-stats:apply-actions-case/odl-flow-stats:apply-actions/odl-flow-stats:action/odl-flow-stats:action" {
-        case "nx-action-set-nsp-notif-flows-statistics-update-apply-actions-case" {
-            uses nx-action-set-nsp-grouping;
+        case "nx-action-push-nsh-notif-flows-statistics-update-apply-actions-case" {
+            uses nx-action-push-nsh-grouping;
         }
     }
     augment "/odl-flow-stats:flows-statistics-update/odl-flow-stats:flow-and-statistics-map-list/odl-flow-stats:instructions/odl-flow-stats:instruction/odl-flow-stats:instruction/odl-flow-stats:apply-actions-case/odl-flow-stats:apply-actions/odl-flow-stats:action/odl-flow-stats:action" {
-        case "nx-action-set-nshc-1-notif-flows-statistics-update-apply-actions-case" {
-            uses nx-action-set-nshc-1-grouping;
+        case "nx-action-pop-nsh-notif-flows-statistics-update-apply-actions-case" {
+            uses nx-action-pop-nsh-grouping;
         }
     }
     augment "/odl-flow-stats:flows-statistics-update/odl-flow-stats:flow-and-statistics-map-list/odl-flow-stats:instructions/odl-flow-stats:instruction/odl-flow-stats:instruction/odl-flow-stats:apply-actions-case/odl-flow-stats:apply-actions/odl-flow-stats:action/odl-flow-stats:action" {
-        case "nx-action-set-nshc-2-notif-flows-statistics-update-apply-actions-case" {
-            uses nx-action-set-nshc-2-grouping;
+        case "nx-action-conntrack-notif-flows-statistics-update-apply-actions-case" {
+            uses nx-action-conntrack-grouping;
         }
     }
     augment "/odl-flow-stats:flows-statistics-update/odl-flow-stats:flow-and-statistics-map-list/odl-flow-stats:instructions/odl-flow-stats:instruction/odl-flow-stats:instruction/odl-flow-stats:apply-actions-case/odl-flow-stats:apply-actions/odl-flow-stats:action/odl-flow-stats:action" {
-        case "nx-action-set-nshc-3-notif-flows-statistics-update-apply-actions-case" {
-            uses nx-action-set-nshc-3-grouping;
+        case "nx-action-ct-clear-notif-flows-statistics-update-apply-actions-case" {
+            uses nx-action-ct-clear-grouping;
         }
     }
     augment "/odl-flow-stats:flows-statistics-update/odl-flow-stats:flow-and-statistics-map-list/odl-flow-stats:instructions/odl-flow-stats:instruction/odl-flow-stats:instruction/odl-flow-stats:apply-actions-case/odl-flow-stats:apply-actions/odl-flow-stats:action/odl-flow-stats:action" {
-        case "nx-action-set-nshc-4-notif-flows-statistics-update-apply-actions-case" {
-            uses nx-action-set-nshc-4-grouping;
+        case "nx-action-learn-notif-flows-statistics-update-apply-actions-case" {
+            uses nx-action-learn-grouping;
         }
     }
     augment "/odl-flow-stats:flows-statistics-update/odl-flow-stats:flow-and-statistics-map-list/odl-flow-stats:instructions/odl-flow-stats:instruction/odl-flow-stats:instruction/odl-flow-stats:apply-actions-case/odl-flow-stats:apply-actions/odl-flow-stats:action/odl-flow-stats:action" {
-        case "nx-action-set-nsi-notif-flows-statistics-update-apply-actions-case" {
-            uses nx-action-set-nsi-grouping;
+        case "nx-action-encap-notif-flows-statistics-update-apply-actions-case" {
+            uses nx-action-encap-grouping;
         }
     }
     augment "/odl-flow-stats:flows-statistics-update/odl-flow-stats:flow-and-statistics-map-list/odl-flow-stats:instructions/odl-flow-stats:instruction/odl-flow-stats:instruction/odl-flow-stats:apply-actions-case/odl-flow-stats:apply-actions/odl-flow-stats:action/odl-flow-stats:action" {
-        case "nx-action-conntrack-notif-flows-statistics-update-apply-actions-case" {
-            uses nx-action-conntrack-grouping;
+        case "nx-action-decap-notif-flows-statistics-update-apply-actions-case" {
+            uses nx-action-decap-grouping;
         }
     }
 
@@ -1530,44 +1943,132 @@ bits specified from the register.";
             uses nx-action-resubmit-grouping;
         }
     }
+    augment "/odl-group-stats:group-desc-stats-updated/odl-group-stats:group-desc-stats/odl-group-stats:buckets/odl-group-stats:bucket/odl-group-stats:action/odl-group-stats:action" {
+        case "nx-action-fin-timeout-notif-group-desc-stats-updated-case" {
+            uses nx-action-fin-timeout-grouping;
+        }
+    }
     augment "/odl-group-stats:group-desc-stats-updated/odl-group-stats:group-desc-stats/odl-group-stats:buckets/odl-group-stats:bucket/odl-group-stats:action/odl-group-stats:action" {
         case "nx-action-multipath-notif-group-desc-stats-updated-case" {
             uses nx-action-multipath-grouping;
         }
     }
     augment "/odl-group-stats:group-desc-stats-updated/odl-group-stats:group-desc-stats/odl-group-stats:buckets/odl-group-stats:bucket/odl-group-stats:action/odl-group-stats:action" {
-        case "nx-action-set-nsp-notif-group-desc-stats-updated-case" {
-            uses nx-action-set-nsp-grouping;
+        case "nx-action-push-nsh-notif-group-desc-stats-updated-case" {
+            uses nx-action-push-nsh-grouping;
         }
     }
     augment "/odl-group-stats:group-desc-stats-updated/odl-group-stats:group-desc-stats/odl-group-stats:buckets/odl-group-stats:bucket/odl-group-stats:action/odl-group-stats:action" {
-        case "nx-action-set-nshc-1-notif-group-desc-stats-updated-case" {
-            uses nx-action-set-nshc-1-grouping;
+        case "nx-action-pop-nsh-notif-group-desc-stats-updated-case" {
+            uses nx-action-pop-nsh-grouping;
         }
     }
     augment "/odl-group-stats:group-desc-stats-updated/odl-group-stats:group-desc-stats/odl-group-stats:buckets/odl-group-stats:bucket/odl-group-stats:action/odl-group-stats:action" {
-        case "nx-action-set-nshc-2-notif-group-desc-stats-updated-case" {
-            uses nx-action-set-nshc-2-grouping;
+        case "nx-action-conntrack-notif-group-desc-stats-updated-case" {
+            uses nx-action-conntrack-grouping;
         }
     }
     augment "/odl-group-stats:group-desc-stats-updated/odl-group-stats:group-desc-stats/odl-group-stats:buckets/odl-group-stats:bucket/odl-group-stats:action/odl-group-stats:action" {
-        case "nx-action-set-nshc-3-notif-group-desc-stats-updated-case" {
-            uses nx-action-set-nshc-3-grouping;
+        case "nx-action-ct-clear-notif-group-desc-stats-updated-case" {
+            uses nx-action-ct-clear-grouping;
         }
     }
     augment "/odl-group-stats:group-desc-stats-updated/odl-group-stats:group-desc-stats/odl-group-stats:buckets/odl-group-stats:bucket/odl-group-stats:action/odl-group-stats:action" {
-        case "nx-action-set-nshc-4-notif-group-desc-stats-updated-case" {
-            uses nx-action-set-nshc-4-grouping;
+        case "nx-action-learn-notif-group-desc-stats-updated-case" {
+            uses nx-action-learn-grouping;
         }
     }
     augment "/odl-group-stats:group-desc-stats-updated/odl-group-stats:group-desc-stats/odl-group-stats:buckets/odl-group-stats:bucket/odl-group-stats:action/odl-group-stats:action" {
-        case "nx-action-set-nsi-notif-group-desc-stats-updated-case" {
-            uses nx-action-set-nsi-grouping;
+        case "nx-action-encap-notif-group-desc-stats-updated-case" {
+            uses nx-action-encap-grouping;
         }
     }
-     augment "/odl-group-stats:group-desc-stats-updated/odl-group-stats:group-desc-stats/odl-group-stats:buckets/odl-group-stats:bucket/odl-group-stats:action/odl-group-stats:action" {
-        case "nx-action-conntrack-notif-group-desc-stats-updated-case" {
+    augment "/odl-group-stats:group-desc-stats-updated/odl-group-stats:group-desc-stats/odl-group-stats:buckets/odl-group-stats:bucket/odl-group-stats:action/odl-group-stats:action" {
+        case "nx-action-decap-notif-group-desc-stats-updated-case" {
+            uses nx-action-decap-grouping;
+        }
+    }
+    augment "/directstat:get-flow-statistics/directstat:output/directstat:flow-and-statistics-map-list/directstat:instructions/directstat:instruction/directstat:instruction/directstat:apply-actions-case/directstat:apply-actions/directstat:action/directstat:action" {
+        case "nx-action-reg-load-notif-direct-statistics-update-apply-actions-case" {
+            uses nx-action-reg-load-grouping;
+        }
+        case "nx-action-reg-move-notif-direct-statistics-update-apply-actions-case" {
+            uses nx-action-reg-move-grouping;
+        }
+        case "nx-action-output-reg-notif-direct-statistics-update-apply-actions-case" {
+            uses nx-action-output-reg-grouping;
+        }
+        case "nx-action-resubmit-notif-direct-statistics-update-apply-actions-case" {
+            uses nx-action-resubmit-grouping;
+        }
+        case "nx-action-fin-timeout-notif-direct-statistics-update-apply-actions-case" {
+            uses nx-action-fin-timeout-grouping;
+        }
+        case "nx-action-multipath-notif-direct-statistics-update-apply-actions-case" {
+            uses nx-action-multipath-grouping;
+        }
+        case "nx-action-push-nsh-notif-direct-statistics-update-apply-actions-case" {
+            uses nx-action-push-nsh-grouping;
+        }
+        case "nx-action-pop-nsh-notif-direct-statistics-update-apply-actions-case" {
+            uses nx-action-pop-nsh-grouping;
+        }
+        case "nx-action-conntrack-notif-direct-statistics-update-apply-actions-case" {
             uses nx-action-conntrack-grouping;
         }
+        case "nx-action-ct-clear-notif-direct-statistics-update-apply-actions-case" {
+            uses nx-action-ct-clear-grouping;
+        }
+        case "nx-action-learn-notif-direct-statistics-update-apply-actions-case" {
+            uses nx-action-learn-grouping;
+        }
+        case "nx-action-encap-notif-direct-statistics-update-apply-actions-case" {
+            uses nx-action-encap-grouping;
+        }
+        case "nx-action-decap-notif-direct-statistics-update-apply-actions-case" {
+            uses nx-action-decap-grouping;
+        }
+    }
+
+    augment "/directstat:get-flow-statistics/directstat:output/directstat:flow-and-statistics-map-list/directstat:instructions/directstat:instruction/directstat:instruction/directstat:write-actions-case/directstat:write-actions/directstat:action/directstat:action" {
+        case "nx-action-reg-load-notif-direct-statistics-update-write-actions-case" {
+            uses nx-action-reg-load-grouping;
+        }
+        case "nx-action-reg-move-notif-direct-statistics-update-write-actions-case" {
+            uses nx-action-reg-move-grouping;
+        }
+        case "nx-action-output-reg-notif-direct-statistics-update-write-actions-case" {
+            uses nx-action-output-reg-grouping;
+        }
+        case "nx-action-resubmit-notif-direct-statistics-update-write-actions-case" {
+            uses nx-action-resubmit-grouping;
+        }
+        case "nx-action-fin-timeout-notif-direct-statistics-update-write-actions-case" {
+            uses nx-action-fin-timeout-grouping;
+        }
+        case "nx-action-multipath-notif-direct-statistics-update-write-actions-case" {
+            uses nx-action-multipath-grouping;
+        }
+        case "nx-action-push-nsh-notif-direct-statistics-update-write-actions-case" {
+            uses nx-action-push-nsh-grouping;
+        }
+        case "nx-action-pop-nsh-notif-direct-statistics-update-write-actions-case" {
+            uses nx-action-pop-nsh-grouping;
+        }
+        case "nx-action-conntrack-notif-direct-statistics-update-write-actions-case" {
+            uses nx-action-conntrack-grouping;
+        }
+        case "nx-action-ct-clear-notif-direct-statistics-update-write-actions-case" {
+            uses nx-action-ct-clear-grouping;
+        }
+        case "nx-action-learn-notif-direct-statistics-update-write-actions-case" {
+            uses nx-action-learn-grouping;
+        }
+        case "nx-action-encap-notif-direct-statistics-update-write-actions-case" {
+            uses nx-action-encap-grouping;
+        }
+        case "nx-action-decap-notif-direct-statistics-update-write-actions-case" {
+            uses nx-action-decap-grouping;
+        }
     }
 }