Merge "Fix SwitchIdleEvent echo request-reply xid"

[openflowplugin.git] / extension / openflowjava-extension-nicira / src / main / yang / nicira-match.yang

diff --git a/extension/openflowjava-extension-nicira/src/main/yang/nicira-match.yang b/extension/openflowjava-extension-nicira/src/main/yang/nicira-match.yang
index 4ea7dd700709ec7a44cda15b0a0706d5f6d244ef..e7faa80678c03ec2323a1778bc6f658e00e4dc46 100644 (file)
--- a/extension/openflowjava-extension-nicira/src/main/yang/nicira-match.yang
+++ b/extension/openflowjava-extension-nicira/src/main/yang/nicira-match.yang
@@ -144,15 +144,29 @@ module nicira-match {
     identity nxm-nx-tun-gpe-np {
         base ofoxm:match-field;
     }
-
+    identity nxm-of-mpls-label {
+        base ofoxm:match-field;
+    }
 
     grouping ofj-nxm-nx-match-reg-grouping {
         container reg-values {
             leaf value {
                 type uint32;
             }
+            leaf mask {
+                type uint32;
+            }
         }
     }
+
+    grouping ofj-oxm-of-mpls-label-grouping {
+        container mpls-label-values {
+             leaf mpls-label {
+                 type uint32;
+             }
+        }
+    }
+
     grouping ofj-nxm-nx-match-tun-id-grouping {
         container tun-id-values {
             leaf value {
@@ -160,6 +174,7 @@ module nicira-match {
             }
         }
     }
+
     grouping ofj-nxm-nx-match-arp-sha-grouping {
         container arp-sha-values {
             leaf mac-address {
@@ -167,6 +182,7 @@ module nicira-match {
             }
         }
     }
+
     grouping ofj-nxm-nx-match-arp-tha-grouping {
         container arp-tha-values {
             leaf mac-address {
@@ -174,6 +190,7 @@ module nicira-match {
             }
         }
     }
+
     grouping ofj-nxm-of-match-arp-op-grouping {
         container arp-op-values {
             leaf value {
@@ -181,6 +198,7 @@ module nicira-match {
             }
         }
     }
+
     grouping ofj-nxm-of-match-arp-spa-grouping {
         container arp-spa-values {
             leaf value {
@@ -188,6 +206,7 @@ module nicira-match {
             }
         }
     }
+
     grouping ofj-nxm-of-match-arp-tpa-grouping {
         container arp-tpa-values {
             leaf value {
@@ -195,6 +214,7 @@ module nicira-match {
             }
         }
     }
+
     grouping ofj-nxm-of-in-port-type-grouping {
         container nxm-of-in-port-values {
             leaf value {
@@ -202,6 +222,7 @@ module nicira-match {
             }
         }
     }
+
     grouping ofj-nxm-nx-match-tun-ipv4-dst-grouping {
         container tun-ipv4-dst-values {
             leaf value {
@@ -209,6 +230,7 @@ module nicira-match {
             }
         }
     }
+
     grouping ofj-nxm-nx-match-tun-ipv4-src-grouping {
         container tun-ipv4-src-values {
             leaf value {
@@ -216,6 +238,7 @@ module nicira-match {
             }
         }
     }
+
     grouping ofj-nxm-of-match-eth-src-grouping {
         container eth-src-values {
             leaf mac-address {
@@ -223,6 +246,7 @@ module nicira-match {
             }
         }
     }
+
     grouping ofj-nxm-of-match-eth-dst-grouping {
         container eth-dst-values {
             leaf mac-address {
@@ -230,6 +254,7 @@ module nicira-match {
             }
         }
     }
+
     grouping ofj-nxm-of-match-eth-type-grouping {
         container eth-type-values {
             leaf value {
@@ -265,21 +290,25 @@ module nicira-match {
             uses ofj-nxm-nx-match-nshc-grouping;
         }
     }
+
     grouping ofj-nxm-nx-match-nshc-2-grouping {
         container nshc-2-values {
             uses ofj-nxm-nx-match-nshc-grouping;
         }
     }
+
     grouping ofj-nxm-nx-match-nshc-3-grouping {
         container nshc-3-values {
             uses ofj-nxm-nx-match-nshc-grouping;
         }
     }
+
     grouping ofj-nxm-nx-match-nshc-4-grouping {
         container nshc-4-values {
             uses ofj-nxm-nx-match-nshc-grouping;
         }
     }
+
     grouping ofj-nxm-of-match-tcp-src-grouping {
         container tcp-src-values {
             leaf port {
@@ -290,6 +319,7 @@ module nicira-match {
             }
         }
     }
+
     grouping ofj-nxm-of-match-tcp-dst-grouping {
         container tcp-dst-values {
             leaf port {
@@ -300,7 +330,8 @@ module nicira-match {
             }
         }
     }
-     grouping ofj-nxm-of-match-udp-src-grouping {
+
+    grouping ofj-nxm-of-match-udp-src-grouping {
         container udp-src-values {
             leaf port {
                type inet:port-number;
@@ -310,6 +341,7 @@ module nicira-match {
             }
         }
     }
+
     grouping ofj-nxm-of-match-udp-dst-grouping {
         container udp-dst-values {
             leaf port {
@@ -320,6 +352,7 @@ module nicira-match {
             }
         }
     }
+
     grouping ofj-nxm-nx-match-ct-state-grouping{
          container ct-state-values {
             leaf ct-state {
@@ -330,6 +363,7 @@ module nicira-match {
             }
         }
     }
+
     grouping ofj-nxm-nx-match-ct-zone-grouping{
          container ct-zone-values {
             leaf ct-zone {
@@ -337,6 +371,7 @@ module nicira-match {
             }
         }
     }
+
     grouping ofj-nxm-of-match-ip-dst-grouping {
         container ip-dst-values {
             leaf value {
@@ -344,6 +379,7 @@ module nicira-match {
             }
         }
     }
+
     grouping ofj-nxm-of-match-ip-src-grouping {
         container ip-src-values {
             leaf value {
@@ -351,6 +387,7 @@ module nicira-match {
             }
         }
     }
+
     grouping ofj-nxm-of-match-icmp-type-grouping {
         container icmp-type-values {
             leaf value {
@@ -358,6 +395,7 @@ module nicira-match {
             }
         }
     }
+
     grouping ofj-nxm-nx-match-encap-eth-type-grouping {
         container encap-eth-type-values {
             leaf encap-eth-type {
@@ -365,6 +403,7 @@ module nicira-match {
             }
         }
     }
+
     grouping ofj-nxm-nx-match-encap-eth-src-grouping {
         container encap-eth-src-values {
             leaf mac-address {
@@ -372,6 +411,7 @@ module nicira-match {
             }
         }
     }
+
     grouping ofj-nxm-nx-match-encap-eth-dst-grouping {
         container encap-eth-dst-values {
             leaf mac-address {
@@ -379,6 +419,7 @@ module nicira-match {
             }
         }
     }
+
     grouping ofj-nxm-nx-match-nsh-mdtype-grouping {
         container nsh-mdtype-values {
             leaf value {
@@ -386,6 +427,7 @@ module nicira-match {
             }
         }
     }
+
     grouping ofj-nxm-nx-match-nsh-np-grouping {
         container nsh-np-values {
             leaf value {
@@ -393,6 +435,7 @@ module nicira-match {
             }
         }
     }
+
     grouping ofj-nxm-nx-match-tun-gpe-np-grouping {
         container tun-gpe-np-values {
             leaf value {
@@ -436,6 +479,9 @@ module nicira-match {
         case eth-src-case-value {
             uses ofj-nxm-of-match-eth-src-grouping;
         }
+        case of-mpls-label-case-value {
+            uses ofj-oxm-of-mpls-label-grouping;
+        }
         case eth-dst-case-value {
             uses ofj-nxm-of-match-eth-dst-grouping;
         }
@@ -457,7 +503,6 @@ module nicira-match {
         case tun-gpe-np-case-value {
             uses ofj-nxm-nx-match-tun-gpe-np-grouping;
         }
-
         case eth-type-case-value {
             uses ofj-nxm-of-match-eth-type-grouping;
         }
@@ -506,7 +551,6 @@ module nicira-match {
         case icmp-type-case-value {
             uses ofj-nxm-of-match-icmp-type-grouping;
         }
-
     }
 
 }