Fixed discard-changes for mdsal netconf, mapping code cleanup.

[controller.git] / opendaylight / md-sal / model / model-flow-base / src / main / yang / opendaylight-table-types.yang

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 118db1af06fdbd809ec1f21217bbfe1a84c27cbe..91224ef93e88e5d59b2765a9aefe1328ddc0f43b 100644 (file)
--- 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,9 +188,22 @@ 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";
+    }
+    identity tunnel_ipv4_dst {
+        base match-field;
+        description "IPv4 destination tunnel endpoint address.";
+    }
+    identity tunnel_ipv4_src {
+        base match-field;
+        description "IPv4 source tunnel endpoint address.";
+    }
         
     grouping set-field-match {
         list set-field-match {
+           key "match-type";
             leaf match-type {
                 type identityref {
                     base match-field;
@@ -330,9 +343,7 @@ module opendaylight-table-types {
             container table-properties {
                 list table-feature-properties {
                      key "order";
-                     leaf order {
-                         type int32;
-                     }
+                     uses action:ordered;
                      uses table-feature-prop-type;
                 }
             }