[ONOS-3551] Add implementation of resubmit and resubmit-table to
drivers
Change-Id: Ib96f7f3197968f7e6642cf2368040f340763cef2
diff --git a/drivers/src/main/java/org/onosproject/driver/extensions/NiciraExtensionTreatmentInterpreter.java b/drivers/src/main/java/org/onosproject/driver/extensions/NiciraExtensionTreatmentInterpreter.java
index 5e374d9..b364237 100644
--- a/drivers/src/main/java/org/onosproject/driver/extensions/NiciraExtensionTreatmentInterpreter.java
+++ b/drivers/src/main/java/org/onosproject/driver/extensions/NiciraExtensionTreatmentInterpreter.java
@@ -96,13 +96,17 @@
IPv4Address.of(tunnelDst.tunnelDst().toInt())));
}
if (type.equals(ExtensionTreatmentType.ExtensionTreatmentTypes.NICIRA_RESUBMIT.type())) {
- // TODO this will be implemented later
+ NiciraResubmit resubmit = (NiciraResubmit) extensionTreatment;
+ return factory.actions().niciraResubmit((int) resubmit.inPort().toLong(),
+ resubmit.table());
}
if (type.equals(ExtensionTreatmentType.ExtensionTreatmentTypes.NICIRA_SET_NSH_SPI.type())) {
// TODO this will be implemented later
}
if (type.equals(ExtensionTreatmentType.ExtensionTreatmentTypes.NICIRA_RESUBMIT_TABLE.type())) {
- // TODO this will be implemented later
+ NiciraResubmitTable resubmitTable = (NiciraResubmitTable) extensionTreatment;
+ return factory.actions().niciraResubmitTable((int) resubmitTable.inPort().toLong(),
+ resubmitTable.table());
}
if (type.equals(ExtensionTreatmentType.ExtensionTreatmentTypes.NICIRA_SET_NSH_SI.type())) {
// TODO this will be implemented later
diff --git a/drivers/src/main/java/org/onosproject/driver/extensions/NiciraResubmit.java b/drivers/src/main/java/org/onosproject/driver/extensions/NiciraResubmit.java
index b85af4f..ea0d1b8 100644
--- a/drivers/src/main/java/org/onosproject/driver/extensions/NiciraResubmit.java
+++ b/drivers/src/main/java/org/onosproject/driver/extensions/NiciraResubmit.java
@@ -17,6 +17,8 @@
package org.onosproject.driver.extensions;
import com.google.common.base.MoreObjects;
+import com.google.common.collect.Maps;
+
import org.onlab.util.KryoNamespace;
import org.onosproject.net.PortNumber;
import org.onosproject.net.flow.AbstractExtension;
@@ -24,6 +26,8 @@
import org.onosproject.net.flow.instructions.ExtensionTreatmentType;
import org.onosproject.store.serializers.PortNumberSerializer;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Objects;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -33,10 +37,14 @@
*/
public class NiciraResubmit extends AbstractExtension implements ExtensionTreatment {
+ private static final short DEFAULT_TABLE_ID = 0;
+
private PortNumber inPort;
+ private short table;
private final KryoNamespace appKryo = new KryoNamespace.Builder()
.register(new PortNumberSerializer(), PortNumber.class)
+ .register(Map.class).register(HashMap.class)
.register(byte[].class)
.build();
@@ -45,6 +53,7 @@
*/
NiciraResubmit() {
inPort = null;
+ table = DEFAULT_TABLE_ID;
}
/**
@@ -55,6 +64,7 @@
public NiciraResubmit(PortNumber inPort) {
checkNotNull(inPort);
this.inPort = inPort;
+ this.table = DEFAULT_TABLE_ID;
}
/**
@@ -66,6 +76,15 @@
return inPort;
}
+ /**
+ * Gets the table.
+ *
+ * @return table
+ */
+ public short table() {
+ return table;
+ }
+
@Override
public ExtensionTreatmentType type() {
return ExtensionTreatmentType.ExtensionTreatmentTypes.NICIRA_RESUBMIT.type();
@@ -73,17 +92,22 @@
@Override
public void deserialize(byte[] data) {
- inPort = appKryo.deserialize(data);
+ Map<String, Object> values = appKryo.deserialize(data);
+ inPort = (PortNumber) values.get("inPort");
+ table = (short) values.get("table");
}
@Override
public byte[] serialize() {
- return appKryo.serialize(inPort);
+ Map<String, Object> values = Maps.newHashMap();
+ values.put("inPort", inPort);
+ values.put("table", table);
+ return appKryo.serialize(values);
}
@Override
public int hashCode() {
- return Objects.hash(inPort);
+ return Objects.hash(inPort, table);
}
@Override
@@ -93,8 +117,8 @@
}
if (obj instanceof NiciraResubmit) {
NiciraResubmit that = (NiciraResubmit) obj;
- return Objects.equals(inPort, that.inPort);
-
+ return Objects.equals(inPort, that.inPort)
+ && (table == that.table());
}
return false;
}
@@ -103,6 +127,7 @@
public String toString() {
return MoreObjects.toStringHelper(getClass())
.add("inPort", inPort)
+ .add("table", table)
.toString();
}
}
diff --git a/drivers/src/main/java/org/onosproject/driver/extensions/NiciraResubmitTable.java b/drivers/src/main/java/org/onosproject/driver/extensions/NiciraResubmitTable.java
index 4743d21..b7792ed 100644
--- a/drivers/src/main/java/org/onosproject/driver/extensions/NiciraResubmitTable.java
+++ b/drivers/src/main/java/org/onosproject/driver/extensions/NiciraResubmitTable.java
@@ -17,6 +17,7 @@
package org.onosproject.driver.extensions;
import com.google.common.base.MoreObjects;
+import com.google.common.collect.Maps;
import org.onlab.util.KryoNamespace;
import org.onosproject.net.PortNumber;
@@ -25,8 +26,8 @@
import org.onosproject.net.flow.instructions.ExtensionTreatmentType;
import org.onosproject.store.serializers.PortNumberSerializer;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Objects;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -37,13 +38,14 @@
public class NiciraResubmitTable extends AbstractExtension implements
ExtensionTreatment {
- //the list of the in port number(PortNumber) and the table(short)
- private List<Object> inPortAndTable = new ArrayList<Object>();
+ private static final PortNumber DEFAULT_IN_PORT = PortNumber.portNumber(65528);
+
+ private PortNumber inPort;
+ private short table;
private final KryoNamespace appKryo = new KryoNamespace.Builder()
- .register(ArrayList.class)
.register(new PortNumberSerializer(), PortNumber.class)
- .register(short.class)
+ .register(Map.class).register(HashMap.class)
.register(byte[].class)
.build();
@@ -51,26 +53,50 @@
* Creates a new resubmit-table instruction.
*/
NiciraResubmitTable() {
- inPortAndTable = null;
+ inPort = DEFAULT_IN_PORT;
+ table = -1;
}
/**
* Creates a new resubmit-table instruction with a particular inPort and table.
*
- * @param inPortAndTable the list of in port number and table
+ * @param inPort the in port number
+ * @param table table
*/
- public NiciraResubmitTable(List<Object> inPortAndTable) {
- checkNotNull(inPortAndTable);
- this.inPortAndTable = inPortAndTable;
+ public NiciraResubmitTable(PortNumber inPort, short table) {
+ checkNotNull(inPort);
+ checkNotNull(table);
+ this.inPort = inPort;
+ this.table = table;
}
/**
- * Gets the inPortAndTable.
+ * Creates a new resubmit-table instruction with a particular table.
*
- * @return inPortAndTable
+ * @param table table
*/
- public List<Object> inPortAndTable() {
- return inPortAndTable;
+ public NiciraResubmitTable(short table) {
+ checkNotNull(table);
+ this.inPort = DEFAULT_IN_PORT;
+ this.table = table;
+ }
+
+ /**
+ * Gets the inPort.
+ *
+ * @return inPort
+ */
+ public PortNumber inPort() {
+ return inPort;
+ }
+
+ /**
+ * Gets the table.
+ *
+ * @return table
+ */
+ public short table() {
+ return table;
}
@Override
@@ -80,17 +106,22 @@
@Override
public void deserialize(byte[] data) {
- inPortAndTable = appKryo.deserialize(data);
+ Map<String, Object> values = appKryo.deserialize(data);
+ inPort = (PortNumber) values.get("inPort");
+ table = (short) values.get("table");
}
@Override
public byte[] serialize() {
- return appKryo.serialize(inPortAndTable);
+ Map<String, Object> values = Maps.newHashMap();
+ values.put("inPort", inPort);
+ values.put("table", table);
+ return appKryo.serialize(values);
}
@Override
public int hashCode() {
- return Objects.hash(inPortAndTable);
+ return Objects.hash(inPort, table);
}
@Override
@@ -100,8 +131,8 @@
}
if (obj instanceof NiciraResubmitTable) {
NiciraResubmitTable that = (NiciraResubmitTable) obj;
- return Objects.equals(inPortAndTable, that.inPortAndTable);
-
+ return Objects.equals(inPort, that.inPort)
+ && (table == that.table);
}
return false;
}
@@ -109,6 +140,8 @@
@Override
public String toString() {
return MoreObjects.toStringHelper(getClass())
- .add("inPortAndTable", inPortAndTable).toString();
+ .add("inPort", inPort)
+ .add("table", table)
+ .toString();
}
-}
+}
\ No newline at end of file