commit a9acf7a2ceed0f941d6f6759cdf18432457f14b2
author jaegonkim <jaegon77.kim@samsung.com> Fri Mar 16 00:12:59 2018 +0900
committer Thomas Vachuska <tom@opennetworking.org> Tue Jul 10 23:08:02 2018 +0000
tree a8adf08f0c04b061f0ca249c31f61dacdd51afb5
parent 3305efe879a4926de1297f511db4caa72f460286

[ONOS-7533] Extension instruction deserialization failure due to un-available device

Change-Id: I44b179bdb4ef78f6103453a9eec8df661586bed1

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

diff --git a/core/store/serializers/src/main/java/org/onosproject/store/serializers/ExtensionInstructionSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/ExtensionInstructionSerializer.java
index 3df346e..c6d2907 100644
--- a/core/store/serializers/src/main/java/org/onosproject/store/serializers/ExtensionInstructionSerializer.java
+++ b/core/store/serializers/src/main/java/org/onosproject/store/serializers/ExtensionInstructionSerializer.java
@@ -26,6 +26,7 @@
 import org.onosproject.net.behaviour.ExtensionTreatmentResolver;
 import org.onosproject.net.driver.DefaultDriverData;
 import org.onosproject.net.driver.DefaultDriverHandler;
+import org.onosproject.net.driver.Driver;
 import org.onosproject.net.driver.DriverHandler;
 import org.onosproject.net.driver.DriverService;
 import org.onosproject.net.flow.instructions.ExtensionTreatment;
@@ -50,6 +51,10 @@
     public void write(Kryo kryo, Output output, Instructions.ExtensionInstructionWrapper object) {
         kryo.writeClassAndObject(output, object.extensionInstruction().type());
         kryo.writeClassAndObject(output, object.deviceId());
+        DriverService driverService = DefaultServiceDirectory.getService(DriverService.class);
+        // It raises ItemNotFoundException if it failed to find driver
+        Driver driver = driverService.getDriver(object.deviceId());
+        kryo.writeClassAndObject(output, driver.name());
         kryo.writeClassAndObject(output, object.extensionInstruction().serialize());
     }
 
@@ -58,13 +63,14 @@
                                                          Class<Instructions.ExtensionInstructionWrapper> type) {
         ExtensionTreatmentType exType = (ExtensionTreatmentType) kryo.readClassAndObject(input);
         DeviceId deviceId = (DeviceId) kryo.readClassAndObject(input);
+        String driverName = (String) kryo.readClassAndObject(input);
         DriverService driverService = DefaultServiceDirectory.getService(DriverService.class);
         byte[] bytes = (byte[]) kryo.readClassAndObject(input);
         ExtensionTreatment instruction;
 
         try {
             DriverHandler handler = new DefaultDriverHandler(
-                    new DefaultDriverData(driverService.getDriver(deviceId), deviceId));
+                    new DefaultDriverData(driverService.getDriver(driverName), deviceId));
             ExtensionTreatmentResolver resolver = handler.behaviour(ExtensionTreatmentResolver.class);
             instruction = resolver.getExtensionInstruction(exType);
             instruction.deserialize(bytes);