[ONOS-3172] Add arp_spa or arp_tpa Criteria to onos
Change-Id: I3eef59b71ba062ecb475f16decc7a6a0cd59032f
diff --git a/core/api/src/main/java/org/onosproject/net/flow/criteria/ArpPaCriterion.java b/core/api/src/main/java/org/onosproject/net/flow/criteria/ArpPaCriterion.java
new file mode 100644
index 0000000..ba5a03d
--- /dev/null
+++ b/core/api/src/main/java/org/onosproject/net/flow/criteria/ArpPaCriterion.java
@@ -0,0 +1,80 @@
+/*
+ * 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;
+
+import org.onlab.packet.Ip4Address;
+
+/**
+ * Implementation of arp spa or tpa address criterion.
+ */
+public final class ArpPaCriterion implements Criterion {
+ private final Ip4Address ip;
+ private final Type type;
+
+ /**
+ * Constructor.
+ *
+ * @param ip the Ip4 Address to match.
+ * @param type the match type. Should be one of the following:
+ * Type.ARP_SPA, Type.ARP_TPA
+ */
+ ArpPaCriterion(Ip4Address ip, Type type) {
+ this.ip = ip;
+ this.type = type;
+ }
+
+ @Override
+ public Type type() {
+ return this.type;
+ }
+
+ /**
+ * Gets the Ip4 Address to match.
+ *
+ * @return the Ip4 Address to match
+ */
+ public Ip4Address ip() {
+ return this.ip;
+ }
+
+ @Override
+ public String toString() {
+ return toStringHelper(type().toString())
+ .add("ip", ip).toString();
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(type().ordinal(), ip);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj instanceof ArpPaCriterion) {
+ ArpPaCriterion that = (ArpPaCriterion) obj;
+ return Objects.equals(ip, that.ip) &&
+ 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 ae940bd..778d50a 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
@@ -16,6 +16,7 @@
package org.onosproject.net.flow.criteria;
import org.onlab.packet.EthType;
+import org.onlab.packet.Ip4Address;
import org.onlab.packet.Ip6Address;
import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
@@ -25,11 +26,11 @@
import org.onosproject.net.IndexedLambda;
import org.onosproject.net.Lambda;
import org.onosproject.net.OchSignal;
+import org.onosproject.net.OchSignalType;
import org.onosproject.net.OduSignalId;
import org.onosproject.net.OduSignalType;
import org.onosproject.net.PortNumber;
import org.onosproject.net.flow.criteria.Criterion.Type;
-import org.onosproject.net.OchSignalType;
/**
* Factory class to create various traffic selection criteria.
@@ -508,6 +509,16 @@
return new OduSignalTypeCriterion(signalType);
}
+ /**
+ * Creates a match on IPv4 source field using the specified value.
+ *
+ * @param ip ipv4 source value
+ * @return match criterion
+ */
+ public static Criterion matchArpTpa(Ip4Address ip) {
+ return new ArpPaCriterion(ip, Type.ARP_TPA);
+ }
+
public static Criterion dummy() {
return new DummyCriterion();
}