X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fmodel%2Fmodel-flow-base%2Fsrc%2Fmain%2Fyang%2Fflow-types.yang;h=29ea8ddf1889bc8d3cfec6e37d070896fc0bd3ae;hp=b5a70ccfe5357a3dec6b91d1ea04aac559a0ec1a;hb=cd196a492c531331f201031843d687bea3ed99c3;hpb=83591d76828e7557ca83189f516a7834b1f17c07

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/flow-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/flow-types.yang
index b5a70ccfe5..29ea8ddf18 100644
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/flow-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/flow-types.yang
@@ -4,7 +4,7 @@ module opendaylight-flow-types {
 
     import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
     import ietf-yang-types {prefix yang; revision-date "2010-09-24";}    
-    import opendaylight-match-types {prefix match; revision-date 2013-10-26";}
+    import opendaylight-match-types {prefix match; revision-date "2013-10-26";}
     import opendaylight-action-types {prefix action;}
 
     revision "2013-10-26" {
@@ -55,6 +55,10 @@ module opendaylight-flow-types {
                 leaf meter {
                     type string;
                 }
+                
+                leaf meter-id {
+                    type uint32;
+                }
             }   
         }
     }
@@ -68,6 +72,15 @@ module opendaylight-flow-types {
             bit SEND_FLOW_REM;
         }
     }
+
+    typedef removed_reason_flags {
+        type bits {
+            bit IDLE_TIMEOUT;
+            bit HARD_TIMEOUT;
+            bit DELETE;
+            bit GROUP_DELETE;
+        }
+    }
     
     grouping generic_flow_attributes {
         leaf priority {
@@ -181,6 +194,10 @@ module opendaylight-flow-types {
     grouping flow-mod-removed {
         uses generic_flow_attributes;
         
+        leaf removed_reason {
+            type removed_reason_flags;
+        }
+
         leaf duration_nsec {
             type uint32;
         }
@@ -188,22 +205,15 @@ module opendaylight-flow-types {
         leaf duration_sec {
             type uint32;
         }
-        
-        leaf idle_timeout {
-            type uint16;
-        }
-        
-        leaf hard_timeout {
-            type uint16;
-        }
-        
+
         leaf packet_count {
             type uint64;
         }
-        
+
         leaf byte_count {
             type uint64;
         }
+		
         container match {
             uses match:match;
         }