[ONOS-3469] Add arp_op Criteria to onos

Change-Id: I4b6c84d3a4145e698f2845d492db54d0b2e2738b
diff --git a/core/api/src/main/java/org/onosproject/net/flow/criteria/ArpOpCriterion.java b/core/api/src/main/java/org/onosproject/net/flow/criteria/ArpOpCriterion.java
new file mode 100644
index 0000000..8c5398c
--- /dev/null
+++ b/core/api/src/main/java/org/onosproject/net/flow/criteria/ArpOpCriterion.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2015 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.net.flow.criteria;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+
+import java.util.Objects;
+
+/**
+ * Implementation of arp operation type criterion.
+ */
+public final class ArpOpCriterion implements Criterion {
+    private final int arpOp;
+    private final Type type;
+
+    /**
+     * Constructor.
+     *
+     * @param arpOp the arp operation type to match.
+     * @param type the match type. Should be the following:
+     * Type.ARP_OP
+     */
+    ArpOpCriterion(int arpOp, Type type) {
+        this.arpOp = arpOp;
+        this.type = type;
+    }
+
+    @Override
+    public Type type() {
+        return this.type;
+    }
+
+    /**
+     * Gets the arp operation type to match.
+     *
+     * @return the arp operation type to match
+     */
+    public int arpOp() {
+        return this.arpOp;
+    }
+
+    @Override
+    public String toString() {
+        return toStringHelper(type().toString())
+                .add("arpOp", arpOp).toString();
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(type().ordinal(), arpOp);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj instanceof ArpOpCriterion) {
+            ArpOpCriterion that = (ArpOpCriterion) obj;
+            return Objects.equals(arpOp, that.arpOp) &&
+                    Objects.equals(type, that.type);
+        }
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java b/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java
index 554b8e7..da8e426 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java
@@ -549,6 +549,16 @@
         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();
     }