1 files changed, 31 insertions, 1 deletions

diff --git a/framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java b/framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java
index 554b8e74..a28a4ab9 100644
--- a/framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java
+++ b/framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java
@@ -230,6 +230,16 @@ public final class Criteria {
     }
 
     /**
+     * Creates a match on TCP flags using the specified value.
+     *
+     * @param flags TCP flags
+     * @return match criterion
+     */
+    public static Criterion matchTcpFlags(int flags) {
+        return new TcpFlagsCriterion(flags);
+    }
+
+    /**
      * Creates a match on UDP source port field using the specified value.
      *
      * @param udpPort UDP source port
@@ -438,11 +448,21 @@ public final class Criteria {
      * @param mplsBos boolean value indicating true (BOS=1) or false (BOS=0)
      * @return match criterion
      */
-    public static Criterion matchMplsLabel(boolean mplsBos) {
+    public static Criterion matchMplsBos(boolean mplsBos) {
         return new MplsBosCriterion(mplsBos);
     }
 
     /**
+     * Creates a match on MPLS TC.
+     *
+     * @param mplsTc MPLS TC (3 bits)
+     * @return match criterion
+     */
+    public static Criterion matchMplsTc(byte mplsTc) {
+        return new MplsTcCriterion(mplsTc);
+    }
+
+    /**
      * Creates a match on Tunnel ID.
      *
      * @param tunnelId Tunnel ID (64 bits)
@@ -549,6 +569,16 @@ public final class Criteria {
         return new ArpHaCriterion(mac, Type.ARP_SHA);
     }
 
+    /**
+     * Creates a match on arp operation type field using the specified value.
+     *
+     * @param arpOp arp operation type value
+     * @return match criterion
+     */
+    public static Criterion matchArpOp(int arpOp) {
+        return new ArpOpCriterion(arpOp, Type.ARP_OP);
+    }
+
     public static Criterion dummy() {
         return new DummyCriterion();
     }