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 ff35c595e26bd56b5fa1adde4833913436ec628f..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
@@ -7,7 +7,18 @@ module opendaylight-statistics-types {
     
     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 {
@@ -50,15 +61,7 @@ module opendaylight-statistics-types {
         leaf collision-count {
             type uint64;
         }
-        
-        container duration {
-            leaf second {
-                type yang:counter32;
-            }
-            leaf nanosecond {
-                type yang:counter32;
-            }
-        }
+        uses duration;
     }
     
     grouping generic-statistics {
@@ -70,15 +73,20 @@ module opendaylight-statistics-types {
         leaf byte-count {
             type yang:counter64;
         }
-
-        container duration {
-            leaf second {
-                type yang:counter64;
-            }
-            leaf nanosecond {
-                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 {
@@ -95,4 +103,20 @@ module opendaylight-statistics-types {
         }
     }
     
+    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