commit 6f8b70232418a54750e77fb35d7b25a3f39ad41c
author Madan Jampani <madan.jampani@gmail.com> Mon Dec 07 16:59:59 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Tue Dec 08 02:53:06 2015 +0000
tree fef750f3804b721b78793875547ab165309abf2d
parent 5f326879bd4c48ba48b6dc4f806aaab15faa5bea

Including nodeId in DefaultPacketRequest so that we do not prematurely withdraw intercepts when a node is shutdown

Change-Id: If6ae0be8f53a4a158af37e6cc4938309a5e9991b

core/api/src/main/java/org/onosproject/net/packet/DefaultPacketRequest.java

diff --git a/core/api/src/main/java/org/onosproject/net/packet/DefaultPacketRequest.java b/core/api/src/main/java/org/onosproject/net/packet/DefaultPacketRequest.java
index ce2eb11..605ab4b 100644
--- a/core/api/src/main/java/org/onosproject/net/packet/DefaultPacketRequest.java
+++ b/core/api/src/main/java/org/onosproject/net/packet/DefaultPacketRequest.java
@@ -16,6 +16,8 @@
 package org.onosproject.net.packet;
 
 import com.google.common.base.MoreObjects;
+
+import org.onosproject.cluster.NodeId;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.net.flow.TrafficSelector;
 
@@ -28,6 +30,7 @@
     private final TrafficSelector selector;
     private final PacketPriority priority;
     private final ApplicationId appId;
+    private final NodeId nodeId;
 
     /**
      * Creates a new packet request.
@@ -35,29 +38,40 @@
      * @param selector  traffic selector
      * @param priority  intercept priority
      * @param appId     application id
+     * @param nodeId    identifier of node where request originated
      */
     public DefaultPacketRequest(TrafficSelector selector, PacketPriority priority,
-                                ApplicationId appId) {
+                                ApplicationId appId,
+                                NodeId nodeId) {
         this.selector = selector;
         this.priority = priority;
         this.appId = appId;
+        this.nodeId = nodeId;
     }
 
+    @Override
     public TrafficSelector selector() {
         return selector;
     }
 
+    @Override
     public PacketPriority priority() {
         return priority;
     }
 
+    @Override
     public ApplicationId appId() {
         return appId;
     }
 
     @Override
+    public NodeId nodeId() {
+        return nodeId;
+    }
+
+    @Override
     public int hashCode() {
-        return Objects.hash(selector, priority, appId);
+        return Objects.hash(selector, priority, appId, nodeId);
     }
 
     @Override
@@ -71,7 +85,8 @@
         final DefaultPacketRequest other = (DefaultPacketRequest) obj;
         return Objects.equals(this.selector, other.selector)
                 && Objects.equals(this.priority, other.priority)
-                && Objects.equals(this.appId, other.appId);
+                && Objects.equals(this.appId, other.appId)
+                && Objects.equals(this.nodeId, other.nodeId);
     }
 
     @Override
@@ -79,6 +94,7 @@
         return MoreObjects.toStringHelper(this.getClass())
                 .add("selector", selector)
                 .add("priority", priority)
-                .add("appId", appId).toString();
+                .add("appId", appId)
+                .add("nodeId", nodeId).toString();
     }
 }
\ No newline at end of file

core/api/src/main/java/org/onosproject/net/packet/PacketRequest.java

diff --git a/core/api/src/main/java/org/onosproject/net/packet/PacketRequest.java b/core/api/src/main/java/org/onosproject/net/packet/PacketRequest.java
index dc09219..32f7cd5 100644
--- a/core/api/src/main/java/org/onosproject/net/packet/PacketRequest.java
+++ b/core/api/src/main/java/org/onosproject/net/packet/PacketRequest.java
@@ -15,6 +15,7 @@
  */
 package org.onosproject.net.packet;
 
+import org.onosproject.cluster.NodeId;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.net.flow.TrafficSelector;
 
@@ -44,4 +45,10 @@
      */
     ApplicationId appId();
 
+    /**
+     * Obtain the node id.
+     *
+     * @return an node id
+     */
+    NodeId nodeId();
 }