ONOS extensions for use of egress tables.
This patch depends on 17671 onos-loxi patch. When we make
the new loxi release we need to change the prebuild
openflowj in lib/BUCK to that of the actual release number.
It provides support for programming l2 unfiltered groups,
the egress vlan table and the egress tpid table.
Depends-On: I3cea6ed2234147c8dbe440ae1701856a60706e7c
Change-Id: I7525f5856300eac25548b5219a5dffed12b291ad
diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/codec/Ofdpa3CopyFieldCodec.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/codec/Ofdpa3CopyFieldCodec.java
new file mode 100644
index 0000000..999bb74
--- /dev/null
+++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/codec/Ofdpa3CopyFieldCodec.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2016-present Open Networking Foundation
+ *
+ * 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.driver.extensions.codec;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.onosproject.codec.CodecContext;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.driver.extensions.Ofdpa3CopyField;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.onlab.util.Tools.nullIsIllegal;
+
+/**
+ * JSON Codec for Ofdpa copy field class.
+ */
+public class Ofdpa3CopyFieldCodec extends JsonCodec<Ofdpa3CopyField> {
+
+ private static final String N_BITS = "nBits";
+ private static final String SRC = "src";
+ private static final String DST = "dst";
+ private static final String SRC_OFFSET = "srcOffset";
+ private static final String DST_OFFSET = "dstOffset";
+
+ private static final String MISSING_MEMBER_MESSAGE = " member is required in Ofdpa3CopyField";
+ private static final String MISSING_COPY_FIELD_MESSAGE = "CopyField can not be null";
+
+ @Override
+ public ObjectNode encode(Ofdpa3CopyField copyField, CodecContext context) {
+ checkNotNull(copyField, MISSING_COPY_FIELD_MESSAGE);
+ return context.mapper().createObjectNode()
+ .put(N_BITS, copyField.getnBits())
+ .put(SRC_OFFSET, copyField.getSrcOffset())
+ .put(DST_OFFSET, copyField.getDstOffset())
+ .put(SRC, copyField.getSrc())
+ .put(DST, copyField.getDst());
+ }
+
+ @Override
+ public Ofdpa3CopyField decode(ObjectNode json, CodecContext context) {
+ if (json == null || !json.isObject()) {
+ return null;
+ }
+
+ // parse members of copy field action
+ int nBits = (int) nullIsIllegal(json.get(N_BITS),
+ N_BITS + MISSING_MEMBER_MESSAGE).asInt();
+ int src = (int) nullIsIllegal(json.get(SRC),
+ SRC + MISSING_MEMBER_MESSAGE).asInt();
+ int dst = (int) nullIsIllegal(json.get(DST),
+ DST + MISSING_MEMBER_MESSAGE).asInt();
+ int srcOffset = (int) nullIsIllegal(json.get(SRC_OFFSET),
+ SRC_OFFSET + MISSING_MEMBER_MESSAGE).asInt();
+ int dstOffset = (int) nullIsIllegal(json.get(DST_OFFSET),
+ DST_OFFSET + MISSING_MEMBER_MESSAGE).asInt();
+ return new Ofdpa3CopyField(nBits, src, dst, srcOffset, dstOffset);
+ }
+}
diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/codec/OfdpaMatchActsetOutputCodec.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/codec/OfdpaMatchActsetOutputCodec.java
new file mode 100644
index 0000000..cb051e4
--- /dev/null
+++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/codec/OfdpaMatchActsetOutputCodec.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2017-present Open Networking Foundation
+ *
+ * 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.driver.extensions.codec;
+
+import org.onosproject.driver.extensions.OfdpaMatchActsetOutput;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.onosproject.codec.CodecContext;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.net.PortNumber;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.onlab.util.Tools.nullIsIllegal;
+
+/**
+ * JSON Codec for Ofdpa match actset output class.
+ */
+public class OfdpaMatchActsetOutputCodec extends JsonCodec<OfdpaMatchActsetOutput> {
+
+ private static final String ACTSET_OUTPUT = "actsetOutput";
+ private static final String MISSING_MEMBER_MESSAGE = " member is required in OfdpaMatchActsetOutput";
+ private static final String MISSING_ACTSET_OUTPUT_MESSAGE = "Actset Output cannot be null";
+
+ @Override
+ public ObjectNode encode(OfdpaMatchActsetOutput actsetOutput, CodecContext context) {
+ checkNotNull(actsetOutput, MISSING_ACTSET_OUTPUT_MESSAGE);
+ return context.mapper().createObjectNode()
+ .put(ACTSET_OUTPUT, actsetOutput.port().toLong());
+ }
+
+ @Override
+ public OfdpaMatchActsetOutput decode(ObjectNode json, CodecContext context) {
+ if (json == null || !json.isObject()) {
+ return null;
+ }
+
+ // parse ofdpa match actset output
+ long portNumber = nullIsIllegal(json.get(ACTSET_OUTPUT),
+ ACTSET_OUTPUT + MISSING_MEMBER_MESSAGE).asLong();
+ return new OfdpaMatchActsetOutput(PortNumber.portNumber(portNumber));
+ }
+}
diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/codec/OfdpaMatchAllowVlanTranslationCodec.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/codec/OfdpaMatchAllowVlanTranslationCodec.java
new file mode 100644
index 0000000..c72aa2c
--- /dev/null
+++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/codec/OfdpaMatchAllowVlanTranslationCodec.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2017-present Open Networking Foundation
+ *
+ * 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.driver.extensions.codec;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.onosproject.codec.CodecContext;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.driver.extensions.OfdpaMatchAllowVlanTranslation;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.onlab.util.Tools.nullIsIllegal;
+
+/**
+ * JSON Codec for Ofdpa match allow vlan translation class.
+ */
+public class OfdpaMatchAllowVlanTranslationCodec extends JsonCodec<OfdpaMatchAllowVlanTranslation> {
+
+ private static final String ALLOW_VLAN_TRANSLATION = "allowVlanTranslation";
+ private static final String MISSING_MEMBER_MESSAGE = " member is required in OfdpaMatchAllowVlanTranslation";
+ private static final String MISSING_ALLOW_VLAN_TRANSLATION_MESSAGE = "Allow Vlan Translation cannot be null";
+
+ @Override
+ public ObjectNode encode(OfdpaMatchAllowVlanTranslation allowVlanTranslation, CodecContext context) {
+ checkNotNull(allowVlanTranslation, MISSING_ALLOW_VLAN_TRANSLATION_MESSAGE);
+ return context.mapper().createObjectNode().put(ALLOW_VLAN_TRANSLATION,
+ allowVlanTranslation.allowVlanTranslation());
+ }
+
+ @Override
+ public OfdpaMatchAllowVlanTranslation decode(ObjectNode json, CodecContext context) {
+ if (json == null || !json.isObject()) {
+ return null;
+ }
+
+ // parse ofdpa match allow vlan translation
+ short allowVlanTranslation = (short) nullIsIllegal(json.get(ALLOW_VLAN_TRANSLATION),
+ ALLOW_VLAN_TRANSLATION + MISSING_MEMBER_MESSAGE).asLong();
+ return new OfdpaMatchAllowVlanTranslation(allowVlanTranslation);
+ }
+}