fix for flows stuck in pending add state
Problem is due to two packet requests from different services
for the same selector resulting in the same flow rule.
Since these rules where the same, only one ended up on the data plane,
but sadly only the first request made it into the flow service meaning
that in cases where what was in the flow service does not match what is
on the dataplane resulting in a PENDING_ADD situation.
Change-Id: I4c03e753be6e198e04f0b5263a2aa8cf2edc51e1
diff --git a/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java b/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
index 94c75dd..6e97c8f 100644
--- a/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
+++ b/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
@@ -108,6 +108,33 @@
return appId;
}
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ PacketRequest that = (PacketRequest) o;
+
+ if (priority != that.priority) {
+ return false;
+ }
+ if (!selector.equals(that.selector)) {
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = selector.hashCode();
+ result = 31 * result + priority.hashCode();
+ return result;
+ }
}
@Activate