From: Ed Warnicke <eaw@cisco.com>
Date: Tue, 19 Aug 2014 11:17:33 +0000 (+0000)
Subject: Revert "Added the Buffer-Id to packet-in."
X-Git-Tag: release/helium~269^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=refs%2Fchanges%2F60%2F10060%2F1

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

This reverts commit 41a6be9bc180cd81e24e5872ca0682e15b37a7f6.

This revert was because it *appears* this patch is breaking integration (not sure how yet).

Change-Id: I1daf9b240c8c31a17e8b4a3f7fc5d20186a6cd0e
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---

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 022c623afd..50368e46a6 100644
--- 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
@@ -16,10 +16,6 @@ module packet-processing {
         description "";
     }
 
-    typedef buffer-id {
-        type uint32;
-    }
-
     typedef connection-cookie {
         type uint32;
     }
@@ -63,11 +59,6 @@ module packet-processing {
     }
 
     notification packet-received {
-
-        leaf buffer-id {
-            type buffer-id;
-        }
-
     	leaf connection-cookie {
                 type connection-cookie;
         }
@@ -105,7 +96,7 @@ module packet-processing {
     			type inv:node-connector-ref;
     		}
             leaf buffer-id {
-                  type buffer-id;
+                  type uint32;
             }
 
     		uses raw-packet;