From: Ed Warnicke <eaw@cisco.com>
Date: Mon, 3 Feb 2014 16:34:53 +0000 (+0000)
Subject: Merge "Yang Changes to include list<actions> to PacketOut - Added list<actions> and... 
X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~538
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=9a65c3aa52f1d5b430f4c3ecd82434dcbc6300f6;hp=c61d22e4dc73fdaba09aa8c0b189ea7459679e03

Merge "Yang Changes to include list<actions> to PacketOut - Added list<actions> and buffer_id to PacketOut Message to handle group processing and Packet Modification through different actions"
---

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 00ecdbacf0..f3db3181f7 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
@@ -8,6 +8,8 @@ module packet-processing {
     import opendaylight-l2-types {prefix types;revision-date "2013-08-27";}
     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";}
+
     
     revision "2013-07-09" {
         description "";
@@ -88,7 +90,12 @@ module packet-processing {
     		leaf egress {
     			type inv:node-connector-ref;
     		}
+		leaf buffer-id {
+                  type uint32;
+            }
+
     		uses raw-packet;
+		uses action-type:action-list;
     	}
     }
 }