Minor model refactor

[openflowjava.git] / openflow-protocol-api / src / main / yang / openflow-extensible-match.yang

diff --git a/openflow-protocol-api/src/main/yang/openflow-extensible-match.yang b/openflow-protocol-api/src/main/yang/openflow-extensible-match.yang
index 7caf73f0e792c069ee314beb80b2641540dbd24a..52da67203d731500d21e703601699adbd5d0fe39 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-extensible-match.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-extensible-match.yang
@@ -216,10 +216,10 @@
         }
 
         container oxm-container {
-            uses oxm-fields;
+            uses oxm-fields-grouping;
         }
         
-        grouping oxm-fields {
+        grouping oxm-fields-grouping {
             list match-entries {
                 description "OXM TLV-structures (Type Length Value)";
                 key "oxm-class oxm-match-field has-mask";
@@ -238,7 +238,19 @@
                 } 
             }
         }
-        
+
+        grouping match-grouping {
+            container match {
+                description "Match structure (OF v1.3)";
+                leaf type {
+                    type identityref {
+                        base oft:match-type-base;
+                    }
+                }
+                uses oxm-fields-grouping;
+            }
+        }
+
         // OF1.0 structures
         grouping match-v10-grouping {
             container match-v10 {