Merge "1. Corrected Ip Protocol match field. 2. Added mask for Ipv6 Extension header...

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/match-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/match-types.yang
index f58f6a459741e569578c5133b8e6d118e953d2a6..5ba92aba9d2f242be04e05b11e18892872d53c3f 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/match-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/match-types.yang
@@ -91,11 +91,6 @@ module opendaylight-match-types {
             description "IP ECN (2 bits in ToS field).";
             type uint8; 
         }
-        
-        leaf ip-proto {
-            description "IP Proto (IPv4 or IPv6 Protocol Number).";
-            type inet:ip-version; 
-        }
     } 
     
     grouping "ipv4-match-fields" {
@@ -146,10 +141,16 @@ module opendaylight-match-types {
             description "Link layer target address for neighbour discovery message";
             type yang:mac-address;
         }
-            
-        leaf ipv6-exthdr {
-            description "IPv6 Extension Header field";
-            type uint16;
+        
+        container "ipv6-ext-header" {    
+            leaf ipv6-exthdr {
+                description "IPv6 Extension Header field";
+                type uint16;
+            }
+
+            leaf ipv6-exthdr-mask {
+                type binary;
+            }
         }
     }