X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=extension%2Fopenflowplugin-extension-nicira%2Fsrc%2Fmain%2Fyang%2Fopenflowplugin-extension-nicira-action.yang;h=4853a724d25d40780c46b06ff7223c4a0476f82c;hb=d1af0fd5a4053a10917f631bae42970c1960fd20;hp=3966262105b1194a24af6e2240440f0f68196a38;hpb=32b316e33f931b6126f3fee5169221a4665e4d2f;p=openflowplugin.git

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 3966262105..4853a724d2 100644
--- 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,7 @@ 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";}
 
     description
         "Nicira openflow action extensions.";
@@ -418,6 +419,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 {
@@ -636,6 +648,11 @@ 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;
@@ -682,6 +699,11 @@ 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;
@@ -729,6 +751,11 @@ 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;
@@ -775,6 +802,11 @@ 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;
@@ -821,6 +853,11 @@ 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;
@@ -867,6 +904,11 @@ 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;
@@ -913,6 +955,11 @@ 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;
@@ -959,6 +1006,11 @@ 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;
@@ -1005,6 +1057,11 @@ 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;
@@ -1051,6 +1108,11 @@ 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;
@@ -1097,6 +1159,11 @@ 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;
@@ -1143,6 +1210,11 @@ 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;
@@ -1189,6 +1261,11 @@ 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;
@@ -1236,6 +1313,11 @@ 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;
@@ -1282,6 +1364,11 @@ 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;
@@ -1328,6 +1415,11 @@ 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;
@@ -1375,6 +1467,11 @@ 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;
@@ -1421,6 +1518,11 @@ 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;
@@ -1467,6 +1569,11 @@ 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;
@@ -1492,4 +1599,69 @@ bits specified from the register.";
             uses nx-action-learn-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-learn-notif-direct-statistics-update-apply-actions-case" {
+            uses nx-action-learn-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-learn-notif-direct-statistics-update-write-actions-case" {
+            uses nx-action-learn-grouping;
+        }
+    }
 }