BUG-1416 clean up flow statistic models

[controller.git] / opendaylight / md-sal / model / model-flow-statistics / src / main / yang / opendaylight-flow-statistics.yang

diff --git a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-flow-statistics.yang b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-flow-statistics.yang
index 94e2c0a42831f98b4dc14887e0bd356d2db15221..f7a0652e45f042bf891c58a1a7fcdb017e811a2c 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-flow-statistics.yang
+++ b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-flow-statistics.yang
@@ -10,51 +10,50 @@ module opendaylight-flow-statistics {
     import flow-node-inventory {prefix flow-node;revision-date "2013-08-19";}
     import flow-capable-transaction {prefix tr;}
     import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
-    
+
 
     revision "2013-08-19" {
         description "Initial revision of flow statistics service";
     }
-       
-       //Augment flow statistics data to the flow-capable-node->table->flow
-       augment "/inv:nodes/inv:node/flow-node:table/flow-node:flow" {
+
+    //Augment flow statistics data to the flow-capable-node->table->flow
+    augment "/inv:nodes/inv:node/flow-node:table/flow-node:flow" {
         ext:augment-identifier "flow-statistics-data";
         uses flow-statistics;
     }
-       
-       grouping flow-statistics {
+
+    grouping flow-statistics {
         container flow-statistics {
             //config "false";
-               uses flow-types:flow;
-               uses stat-types:generic-statistics;
+            uses stat-types:generic-statistics;
+        }
+    }
+
+    typedef flow-id {
+        description "flow id";
+        type inet:uri;
+    }
+
+    grouping flow-and-statistics-map-list {
+        description "List of flow and statistics map";
+        list flow-and-statistics-map-list {
+            key "flow-id";
+            leaf flow-id {
+                type flow-id;
+            }
+            uses flow-and-statistics-map;
         }
-       }    
-       
-       typedef flow-id {
-               description "flow id";
-               type inet:uri;
-       }
-       
-       grouping flow-and-statistics-map-list {
-               description "List of flow and statistics map";
-               list flow-and-statistics-map-list {
-                       key "flow-id";
-                       leaf flow-id {
-                               type flow-id;
-                       }
-                       uses flow-and-statistics-map;
-               }
-       }
-       
-       grouping flow-and-statistics-map{
-               description "Mapping between flow and its statistics";
-               uses flow-types:flow;
-               uses stat-types:generic-statistics;
-       }
-       
+    }
+
+    grouping flow-and-statistics-map{
+        description "Mapping between flow and its statistics";
+        uses flow-types:flow;
+        uses stat-types:generic-statistics;
+    }
+
     // RPC calls to fetch flow statistics
     rpc get-all-flows-statistics-from-all-flow-tables {
-       description "Fetch statistics of all the flow present in all the flow tables of the switch"; 
+        description "Fetch statistics of all the flow present in all the flow tables of the switch";
         input {
             uses inv:node-context-ref;
         }
@@ -62,15 +61,15 @@ module opendaylight-flow-statistics {
             uses flow-and-statistics-map-list;
             uses tr:transaction-aware;
         }
-    
+
     }
 
     rpc get-all-flow-statistics-from-flow-table {
-       description "Fetch statistics of all the flow present in the specific flow table of the switch"; 
+        description "Fetch statistics of all the flow present in the specific flow table of the switch";
         input {
             uses inv:node-context-ref;
             leaf table-id {
-               type table-types:table-id;
+                type table-types:table-id;
             }
         }
         output {
@@ -80,7 +79,7 @@ module opendaylight-flow-statistics {
     }
 
     rpc get-flow-statistics-from-flow-table {
-       description "Fetch statistics of the specific flow present in the specific flow table of the switch"; 
+        description "Fetch statistics of the specific flow present in the specific flow table of the switch";
         input {
             uses inv:node-context-ref;
             uses flow-types:flow;
@@ -92,61 +91,58 @@ module opendaylight-flow-statistics {
     }
 
     notification flows-statistics-update {
-       description "Flows statistics sent by switch";
-               leaf moreReplies {
+        description "Flows statistics sent by switch";
+        leaf moreReplies {
             type boolean;
         }
         uses inv:node;
-               uses flow-and-statistics-map-list;
-               uses tr:transaction-aware;
+        uses flow-and-statistics-map-list;
+        uses tr:transaction-aware;
     }
 
-       //Models for aggregate flow statistics collection
-       augment "/inv:nodes/inv:node/flow-node:table" {
+    //Models for aggregate flow statistics collection
+    augment "/inv:nodes/inv:node/flow-node:table" {
         ext:augment-identifier "aggregate-flow-statistics-data";
         uses aggregate-flow-statistics;
     }
-       
-       grouping aggregate-flow-statistics {
+
+    grouping aggregate-flow-statistics {
         container aggregate-flow-statistics {
             //config "false";
-               uses stat-types:aggregate-flow-statistics;
+            uses stat-types:aggregate-flow-statistics;
         }
-       }    
-       
+    }
+
     // RPC calls to fetch aggregate flow statistics
     rpc get-aggregate-flow-statistics-from-flow-table-for-all-flows {
-       description "Fetch aggregate statistics for all the flows present in the specific flow table of the switch"; 
+        description "Fetch aggregate statistics for all the flows present in the specific flow table of the switch";
         input {
             uses inv:node-context-ref;
             leaf table-id {
-               type table-types:table-id;
+                type table-types:table-id;
             }
         }
         output {
-               uses stat-types:aggregate-flow-statistics;
+            uses stat-types:aggregate-flow-statistics;
             uses tr:transaction-aware;
         }
     }
     rpc get-aggregate-flow-statistics-from-flow-table-for-given-match {
-       description "Fetch aggregate statistics for all the flow matches to the given match from the given table of the switch"; 
+        description "Fetch aggregate statistics for all the flow matches to the given match from the given table of the switch";
         input {
             uses inv:node-context-ref;
             uses flow-types:flow;
         }
         output {
-               uses stat-types:aggregate-flow-statistics;
+            uses stat-types:aggregate-flow-statistics;
             uses tr:transaction-aware;
         }
     }
 
     notification aggregate-flow-statistics-update {
-       description "Aggregate flow statistics for a table, sent by switch";
-               leaf moreReplies {
-            type boolean;
-        }
+        description "Aggregate flow statistics for a table, sent by switch";
         uses inv:node;
-               uses stat-types:aggregate-flow-statistics;
-               uses tr:transaction-aware;
+        uses stat-types:aggregate-flow-statistics;
+        uses tr:multipart-transaction-aware;
     }
 }