[ONOS-3273] Add arp_sha or arp_tha Criteria to onos

	new file:   core/api/src/main/java/org/onosproject/net/flow/criteria/ArpHaCriterion.java
	modified:   core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java

Change-Id: I4a7aa2e0de720aab7f49363a1f28ca93bf36d067

+/*
+ * 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 static com.google.common.base.Preconditions.checkNotNull;
+
+import java.util.Objects;
+
+import org.onlab.packet.MacAddress;
+
+/**
+ * Implementation of arp_eth_src address or arp_eth_dst address criterion.
+ */
+public final class ArpHaCriterion implements Criterion {
+    private final MacAddress mac;
+    private final Type type;
+
+    /**
+     * Constructor.
+     *
+     * @param mac the MAC Address to match.
+     * @param type the match type. Should be one of the following:
+     * Type.ARP_SHA, Type.ARP_THA
+     */
+    ArpHaCriterion(MacAddress mac, Type type) {
+        checkNotNull(mac, "mac cannot be null");
+        checkNotNull(type, "type cannot be null");
+        this.mac = mac;
+        this.type = type;
+    }
+
+    @Override
+    public Type type() {
+        return this.type;
+    }
+
+    /**
+     * Gets the MAC Address to match.
+     *
+     * @return the MAC Address to match
+     */
+    public MacAddress mac() {
+        return this.mac;
+    }
+
+    @Override
+    public String toString() {
+        return toStringHelper(type().toString())
+                .add("mac", mac).toString();
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(type().ordinal(), mac);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj instanceof ArpHaCriterion) {
+            ArpHaCriterion that = (ArpHaCriterion) obj;
+            return Objects.equals(mac, that.mac) &&
+                    Objects.equals(type, that.type);
+        }
+        return false;
+    }
+}
\ No newline at end of file

@@ -519,6 +519,16 @@ public final class Criteria {
         return new ArpPaCriterion(ip, Type.ARP_TPA);
         return new ArpPaCriterion(ip, Type.ARP_TPA);
     }
     }
 
 
+    /**
+     * Creates a match on MAC source field using the specified value.
+     *
+     * @param mac MAC source value
+     * @return match criterion
+     */
+    public static Criterion matchArpTha(MacAddress mac) {
+        return new ArpHaCriterion(mac, Type.ARP_THA);
+    }
+
     public static Criterion dummy() {
     public static Criterion dummy() {
         return new DummyCriterion();
         return new DummyCriterion();
     }
     }