Merge "Refactor Subnet.isSubnetOf - reduce number of 'if' statements. Added unitests."

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

diff --git a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/statistics-types.yang b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/statistics-types.yang
index 47c4c9369e2ded77a471de29928e58e1fbef82df..7bde486e91da8c4228086a9a6e1e08f8637b8707 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/statistics-types.yang
+++ b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/statistics-types.yang
@@ -2,14 +2,23 @@ module opendaylight-statistics-types {
     namespace "urn:opendaylight:model:statistics:types";
     prefix stat-types;
 
-    import opendaylight-inventory {prefix inv;}
-
+    import ietf-yang-types {prefix yang;}
+    import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
     
-    revision "2013-08-19" {
+    revision "2013-09-25" {
         description "Initial revision of flow service";
     }
-
     
+    grouping duration {
+        container duration {
+            leaf second {
+                type yang:counter32;
+            }
+            leaf nanosecond {
+                type yang:counter32;
+            }
+        }
+    }
 
     grouping node-connector-statistics {
        container packets {
@@ -52,5 +61,62 @@ module opendaylight-statistics-types {
         leaf collision-count {
             type uint64;
         }
+        uses duration;
     }
+    
+    grouping generic-statistics {
+       description "Generic grouping for statistics";
+        leaf packet-count {
+            type yang:counter64;
+        }
+
+        leaf byte-count {
+            type yang:counter64;
+        }
+       uses duration;
+       }
+    
+    grouping generic-table-statistics {
+       description "Generic grouping holding generic statistics related to switch table";
+       leaf active-flows {
+            type yang:counter32;
+       }
+       leaf packets-looked-up {
+               type yang:counter64;
+       }
+       leaf packets-matched {
+               type yang:counter64;
+       }
+    }
+    
+    grouping aggregate-flow-statistics {
+       description "Aggregate flow statistics";
+        leaf packet-count {
+            type yang:counter64;
+        }
+
+        leaf byte-count {
+            type yang:counter64;
+        }
+        leaf flow-count {
+            type yang:counter32;
+        }
+    }
+    
+    grouping generic-queue-statistics {
+       description "Generic statistics of switch port attached queues.";
+       leaf transmitted-bytes {
+                       type yang:counter64;
+       }
+       
+       leaf transmitted-packets {
+                       type yang:counter64;
+       }
+       
+       leaf transmission-errors {
+                       type yang:counter64;
+       }
+               uses duration;          
+    }
+    
 }
\ No newline at end of file