Merge "Added the Buffer-Id to packet-in."

[controller.git] / opendaylight / md-sal / model / model-flow-service / src / main / yang / packet-processing.yang

diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/packet-processing.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/packet-processing.yang
index f3db3181f7935665a8731d5bb76119aac5036df4..022c623afd62d598dfd3d0897db5abf21c68e056 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/packet-processing.yang
+++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/packet-processing.yang
@@ -9,13 +9,18 @@ module packet-processing {
     import opendaylight-match-types {prefix match-type;revision-date "2013-10-26";}
     import opendaylight-table-types {prefix table-type;revision-date "2013-10-26";}
     import opendaylight-action-types {prefix action-type;revision-date "2013-11-12";}
+    import opendaylight-flow-types {prefix flow-type;revision-date "2013-10-26";}
 
     
     revision "2013-07-09" {
         description "";
     }
 
-    typedef cookie {
+    typedef buffer-id {
+        type uint32;
+    }
+
+    typedef connection-cookie {
         type uint32;
     }
 
@@ -58,8 +63,17 @@ module packet-processing {
     }
 
     notification packet-received {
-       leaf cookie {
-                type cookie;
+
+        leaf buffer-id {
+            type buffer-id;
+        }
+
+       leaf connection-cookie {
+                type connection-cookie;
+        }
+        
+        leaf flow-cookie {
+            type flow-type:flow-cookie;
         }
         
         leaf table-id {
@@ -83,15 +97,15 @@ module packet-processing {
        input {
             uses inv:node-context-ref;
 
-            leaf cookie {
-                type cookie;
+            leaf connection-cookie {
+                type connection-cookie;
             }
             
                leaf egress {
                        type inv:node-connector-ref;
                }
-               leaf buffer-id {
-                  type uint32;
+            leaf buffer-id {
+                  type buffer-id;
             }
 
                uses raw-packet;