OpenFlow message processing for new loxi
Depends-On: Id69c8597eb4564653c56cdc90f2dcec50afbdd25
Change-Id: Ib14fbadd3debf98ce1d56343179f8e7929f8ade8
diff --git a/core/api/src/main/java/org/onosproject/net/flow/FlowRule.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRule.java
index 6d6b318..c758c48 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/FlowRule.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/FlowRule.java
@@ -34,9 +34,19 @@
* Used to check reason parameter in flows.
*/
enum FlowRemoveReason {
- NO_REASON,
IDLE_TIMEOUT,
- HARD_TIMEOUT;
+ HARD_TIMEOUT,
+ DELETE,
+ GROUP_DELETE,
+ METER_DELETE,
+ EVICTION,
+ NO_REASON;
+
+ /**
+ * Covert short to enum.
+ * @return reason in enum
+ * @param reason remove reason in integer
+ */
public static FlowRemoveReason parseShort(short reason) {
switch (reason) {
case -1 :
@@ -45,6 +55,14 @@
return IDLE_TIMEOUT;
case 1:
return HARD_TIMEOUT;
+ case 2 :
+ return DELETE;
+ case 3:
+ return GROUP_DELETE;
+ case 4:
+ return METER_DELETE;
+ case 5:
+ return EVICTION;
default :
return NO_REASON;
}
diff --git a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
index d59b859..7d1a9d1 100644
--- a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
+++ b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
@@ -249,7 +249,8 @@
.register(new ImmutableListSerializer(),
ImmutableList.class,
ImmutableList.of(1).getClass(),
- ImmutableList.of(1, 2).getClass())
+ ImmutableList.of(1, 2).getClass(),
+ ImmutableList.of(1, 2, 3).subList(1, 3).getClass())
.register(new ImmutableSetSerializer(),
ImmutableSet.class,
ImmutableSet.of().getClass(),