diff options
Diffstat (limited to 'framework/src/onos/core/store/serializers/src/main/java/org')
2 files changed, 11 insertions, 8 deletions
diff --git a/framework/src/onos/core/store/serializers/src/main/java/org/onosproject/store/serializers/ExtensionInstructionSerializer.java b/framework/src/onos/core/store/serializers/src/main/java/org/onosproject/store/serializers/ExtensionInstructionSerializer.java index 6b12df96..e688a80c 100644 --- a/framework/src/onos/core/store/serializers/src/main/java/org/onosproject/store/serializers/ExtensionInstructionSerializer.java +++ b/framework/src/onos/core/store/serializers/src/main/java/org/onosproject/store/serializers/ExtensionInstructionSerializer.java @@ -22,13 +22,13 @@ import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; import org.onlab.osgi.DefaultServiceDirectory; import org.onosproject.net.DeviceId; -import org.onosproject.net.behaviour.ExtensionResolver; +import org.onosproject.net.behaviour.ExtensionTreatmentResolver; import org.onosproject.net.driver.DefaultDriverData; import org.onosproject.net.driver.DefaultDriverHandler; import org.onosproject.net.driver.DriverHandler; import org.onosproject.net.driver.DriverService; -import org.onosproject.net.flow.instructions.ExtensionInstruction; -import org.onosproject.net.flow.instructions.ExtensionType; +import org.onosproject.net.flow.instructions.ExtensionTreatment; +import org.onosproject.net.flow.instructions.ExtensionTreatmentType; import org.onosproject.net.flow.instructions.Instructions; /** @@ -53,16 +53,16 @@ public class ExtensionInstructionSerializer extends @Override public Instructions.ExtensionInstructionWrapper read(Kryo kryo, Input input, Class<Instructions.ExtensionInstructionWrapper> type) { - ExtensionType exType = (ExtensionType) kryo.readClassAndObject(input); + ExtensionTreatmentType exType = (ExtensionTreatmentType) kryo.readClassAndObject(input); DeviceId deviceId = (DeviceId) kryo.readClassAndObject(input); DriverService driverService = DefaultServiceDirectory.getService(DriverService.class); DriverHandler handler = new DefaultDriverHandler( new DefaultDriverData(driverService.getDriver(deviceId), deviceId)); - ExtensionResolver resolver = handler.behaviour(ExtensionResolver.class); + ExtensionTreatmentResolver resolver = handler.behaviour(ExtensionTreatmentResolver.class); - ExtensionInstruction instruction = resolver.getExtensionInstruction(exType); + ExtensionTreatment instruction = resolver.getExtensionInstruction(exType); byte[] bytes = (byte[]) kryo.readClassAndObject(input); diff --git a/framework/src/onos/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java b/framework/src/onos/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java index 6f96498f..1b883a30 100644 --- a/framework/src/onos/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java +++ b/framework/src/onos/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java @@ -75,6 +75,7 @@ import org.onosproject.net.OduSignalType; import org.onosproject.net.OmsPort; import org.onosproject.net.Port; import org.onosproject.net.PortNumber; +import org.onosproject.net.TributarySlot; import org.onosproject.net.device.DefaultDeviceDescription; import org.onosproject.net.device.DefaultPortDescription; import org.onosproject.net.device.DefaultPortStatistics; @@ -128,7 +129,7 @@ import org.onosproject.net.flow.criteria.TunnelIdCriterion; import org.onosproject.net.flow.criteria.UdpPortCriterion; import org.onosproject.net.flow.criteria.VlanIdCriterion; import org.onosproject.net.flow.criteria.VlanPcpCriterion; -import org.onosproject.net.flow.instructions.ExtensionType; +import org.onosproject.net.flow.instructions.ExtensionTreatmentType; import org.onosproject.net.flow.instructions.Instructions; import org.onosproject.net.flow.instructions.L0ModificationInstruction; import org.onosproject.net.flow.instructions.L1ModificationInstruction; @@ -367,6 +368,7 @@ public final class KryoNamespaces { L2ModificationInstruction.ModVlanPcpInstruction.class, L2ModificationInstruction.PopVlanInstruction.class, L2ModificationInstruction.ModMplsLabelInstruction.class, + L2ModificationInstruction.ModMplsBosInstruction.class, L2ModificationInstruction.ModMplsTtlInstruction.class, L2ModificationInstruction.ModTunnelIdInstruction.class, L3ModificationInstruction.class, @@ -454,7 +456,7 @@ public final class KryoNamespaces { .register(new DefaultOutboundPacketSerializer(), DefaultOutboundPacket.class) .register(new AnnotationsSerializer(), DefaultAnnotations.class) .register(new ExtensionInstructionSerializer(), Instructions.ExtensionInstructionWrapper.class) - .register(ExtensionType.class) + .register(ExtensionTreatmentType.class) .register(Versioned.class) .register(MapEvent.class) .register(MapEvent.Type.class) @@ -476,6 +478,7 @@ public final class KryoNamespaces { .register(OduCltPortDescription.class) .register(OchPortDescription.class) .register(OmsPortDescription.class) + .register(TributarySlot.class) .register( MplsIntent.class, MplsPathIntent.class, |