commit db8a9d21f9b5d451342fd68edf7770c9d92fb2df
author Praseed Balakrishnan <praseed.balakrishnan@us.fujitsu.com> Wed Dec 03 11:47:55 2014 -0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Dec 03 21:44:22 2014 +0000
tree 5074a404876f766bd3ebaca8e5e1dedece8e8cd4
parent e63e51e424c4a3eb2dfc89ec04edff1dfdd73a39

Fix serializer exception while using optical intent on distributed store

Change-Id: If19a0c12eb0d88d2daa57c16fb1b626b7c0f428f

core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java

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 87cd307..b36595d 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
@@ -225,6 +225,9 @@
                     Criteria.VlanIdCriterion.class,
                     Criteria.VlanPcpCriterion.class,
                     Criteria.TcpPortCriterion.class,
+                    Criteria.OpticalSignalTypeCriterion.class,
+                    Criteria.LambdaCriterion.class,
+                    Criteria.MplsCriterion.class,
                     Criterion.class,
                     Criterion.Type.class,
                     DefaultTrafficTreatment.class,

providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java

diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java
index f14043d..b67abf3 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java
@@ -177,7 +177,8 @@
                 break;
             case EXPERIMENTER:
                 OFActionExperimenter exp = (OFActionExperimenter) act;
-                if (exp.getExperimenter() == 0x80005A06) {
+                if (exp.getExperimenter() == 0x80005A06 ||
+                        exp.getExperimenter() == 0x748771) {
                     OFActionCircuit ct = (OFActionCircuit) exp;
                     builder.setLambda(((OFOxmOchSigidBasic) ct.getField()).getValue().getChannelNumber());
                 } else {