commit 5e2233aa3fe10d197bd57d852da7eb4aa3f0c281
author BitOhenry <jiangrui1@huawei.com> Tue Dec 08 09:26:38 2015 +0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Dec 09 17:33:18 2015 +0000
tree e28903a0265af7a04679a3aaaf0b38adc0bd988d
parent b73ce6c177648bff24ac259c39f480e47d56c2c7

[ONOS-3551] Add implementation  of resubmit and resubmit-table to
drivers

Change-Id: Ib96f7f3197968f7e6642cf2368040f340763cef2

drivers/src/main/java/org/onosproject/driver/extensions/NiciraResubmit.java

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();
     }
 }