From: Brent Salisbury <brent.salisbury@gmail.com>
Date: Tue, 27 May 2014 09:00:42 +0000 (-0400)
Subject: TCP_Flag extension model additions for OFPXMC_NXM_1 class
X-Git-Tag: release/helium~721^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=75d5bde01256c8851fa9709a5cf23ace87ad6e5d

TCP_Flag extension model additions for OFPXMC_NXM_1 class

Patch2: changed model descrip to be more generic to better
represent the high level model.

Patch1: Modified the high level models
opendaylight-match-types.yang and
opendaylight-table-types.yang to support TCP_Flag reads.

Once this and the low-level openflowjava patches merge,
I will commit the openflowplugin conversion patch since
openflowplugin will fail its build until the yang bindings
are generated.

Change-Id: Ia80e9014efa02bdb52dffeb1620625103e8dd985
Signed-off-by: Brent Salisbury <brent.salisbury@gmail.com>
---

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-match-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-match-types.yang
index b02b0dc25c..efe1ce3e3a 100644
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-match-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-match-types.yang
@@ -269,6 +269,12 @@ module opendaylight-match-types {
         }
     }
 
+    grouping "tcp-flag-match-fields" {
+        leaf tcp-flag {
+            type uint16;
+        }
+    }
+
     grouping match {
         leaf in-port {
             type inv:node-connector-id;
@@ -340,5 +346,9 @@ module opendaylight-match-types {
         container "protocol-match-fields" {
             uses "protocol-match-fields";
         }
+
+        container tcp-flag-match {
+            uses "tcp-flag-match-fields";
+        }
     }
 }
\ No newline at end of file
diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-table-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-table-types.yang
index e74b548342..c271f8f4d0 100644
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-table-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-table-types.yang
@@ -188,6 +188,10 @@ module opendaylight-table-types {
         base match-field;
         description "Match for IPv6 Extension Header pseudo-field";
     }
+    identity tcp_flag {
+        base match-field;
+        description "TCP Flag Match";
+    }
         
     grouping set-field-match {
         list set-field-match {