Various Bmv2 protocol refactorings in preparation of the flow rule
translator (ONOS-4044)
- Added new classes for different match parameters (exact, ternary, lpm,
valid)
- Divided api package in two sub-packages, model (previously under
drivers) and runtime (old api package)
- Improved Bmv2ThriftClient caching and table entry handling
Change-Id: I23c174cf3e8f9f6ecddb99c2d09dc531e8f1c73f
diff --git a/protocols/bmv2/src/main/java/org/onosproject/bmv2/api/runtime/Bmv2TernaryMatchParam.java b/protocols/bmv2/src/main/java/org/onosproject/bmv2/api/runtime/Bmv2TernaryMatchParam.java
new file mode 100644
index 0000000..76d42c3
--- /dev/null
+++ b/protocols/bmv2/src/main/java/org/onosproject/bmv2/api/runtime/Bmv2TernaryMatchParam.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2016-present 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.bmv2.api.runtime;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
+import org.onlab.util.ImmutableByteSequence;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkState;
+
+/**
+ * Representation of a Bmv2 ternary match parameter.
+ */
+public class Bmv2TernaryMatchParam implements Bmv2MatchParam {
+
+ private final ImmutableByteSequence value;
+ private final ImmutableByteSequence mask;
+
+ /**
+ * Creates a new ternary match parameter using the given byte sequences of
+ * value and mask.
+ *
+ * @param value a byte sequence value
+ * @param mask a byte sequence value
+ */
+ public Bmv2TernaryMatchParam(ImmutableByteSequence value,
+ ImmutableByteSequence mask) {
+ this.value = checkNotNull(value, "value cannot be null");
+ this.mask = checkNotNull(mask, "value cannot be null");
+ checkState(value.size() == mask.size(),
+ "value and mask must have equal size");
+ }
+
+ @Override
+ public Type type() {
+ return Type.TERNARY;
+ }
+
+ /**
+ * Returns the byte sequence value of by this parameter.
+ *
+ * @return a byte sequence value
+ */
+ public ImmutableByteSequence value() {
+ return this.value;
+ }
+
+ /**
+ * Returns the byte sequence mask of by this parameter.
+ *
+ * @return a byte sequence value
+ */
+ public ImmutableByteSequence mask() {
+ return this.mask;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(value, mask);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null || getClass() != obj.getClass()) {
+ return false;
+ }
+ final Bmv2TernaryMatchParam other = (Bmv2TernaryMatchParam) obj;
+ return Objects.equal(this.value, other.value)
+ && Objects.equal(this.mask, other.mask);
+ }
+
+ @Override
+ public String toString() {
+ return MoreObjects.toStringHelper(this)
+ .add("value", value)
+ .add("mask", mask)
+ .toString();
+ }
+}
\ No newline at end of file