BUG-4132 add ip src,dst and icmp type match attrs

[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 79c98f4eabb0b42e4343faccf5376b9ed4bf624a..043c84dfa3f4f7f4d0d52870eab2d6bcb22f497f 100644 (file)
--- a/extension/openflowjava-extension-nicira/src/main/yang/nicira-match.yang
+++ b/extension/openflowjava-extension-nicira/src/main/yang/nicira-match.yang
@@ -108,6 +108,21 @@ module nicira-match {
     identity nxm-of-udp-dst {
         base ofoxm:match-field;
     }
+    identity nxm-nx-ct-state {
+        base ofoxm:match-field;
+    }
+    identity nxm-nx-ct-zone {
+        base ofoxm:match-field;
+    }
+    identity nxm-of-ip-dst {
+        base ofoxm:match-field;
+    }
+    identity nxm-of-ip-src {
+        base ofoxm:match-field;
+    }
+    identity nxm-of-icmp-type {
+        base ofoxm:match-field;
+    }
 
     grouping ofj-nxm-nx-match-reg-grouping {
         container reg-values {
@@ -209,13 +224,13 @@ module nicira-match {
             }
         }
     }
-    
+
     grouping ofj-nxm-nx-match-nshc-grouping {
         leaf nshc {
             type uint32;
         }
     }
-    
+
     grouping ofj-nxm-nx-match-nshc-1-grouping {
         container nshc-1-values {
             uses ofj-nxm-nx-match-nshc-grouping;
@@ -276,6 +291,44 @@ module nicira-match {
             }
         }
     }
+    grouping ofj-nxm-nx-match-ct-state-grouping{
+         container ct-state-values {
+            leaf ct-state {
+               type uint32;
+            }
+             leaf mask {
+               type uint32;
+            }
+        }
+    }
+    grouping ofj-nxm-nx-match-ct-zone-grouping{
+         container ct-zone-values {
+            leaf ct-zone {
+               type uint16;
+            }
+        }
+    }
+    grouping ofj-nxm-of-match-ip-dst-grouping {
+        container ip-dst-values {
+            leaf value {
+                type uint32;
+            }
+        }
+    }
+    grouping ofj-nxm-of-match-ip-src-grouping {
+        container ip-src-values {
+            leaf value {
+                type uint32;
+            }
+        }
+    }
+    grouping ofj-nxm-of-match-icmp-type-grouping {
+        container icmp-type-values {
+            leaf value {
+                type uint8;
+            }
+        }
+    }
 
     augment "/ofoxm:oxm-container/ofoxm:match-entry-value" {
         ext:augment-identifier "ofj-aug-nx-match";
@@ -346,6 +399,21 @@ module nicira-match {
         case udp-dst-case-value {
             uses ofj-nxm-of-match-udp-dst-grouping;
         }
+        case ct-state-case-value {
+            uses ofj-nxm-nx-match-ct-state-grouping;
+        }
+        case ct-zone-case-value {
+            uses ofj-nxm-nx-match-ct-zone-grouping;
+        }
+        case ip-dst-case-value {
+            uses ofj-nxm-of-match-ip-dst-grouping;
+        }
+        case ip-src-case-value {
+            uses ofj-nxm-of-match-ip-src-grouping;
+        }
+        case icmp-type-case-value {
+            uses ofj-nxm-of-match-icmp-type-grouping;
+        }
 
     }