commit 2cfe8ef782a45f4b9be720c321658d29790e9764
author Andrea Campanella <andrea@onlab.us> Thu Jul 13 19:45:15 2017 +0200
committer Thomas Vachuska <tom@onlab.us> Thu Jul 13 20:23:03 2017 +0000
tree 00482517cfbc46ef754c0567597499df1f1e58b5
parent 897fd2de2234d6cdf2eb047a0297837f7d358396

Moving Extensions codecs to net/flow to avoid circular dependencies

Change-Id: I93dc5580ff46f57afe93dd4d1f0217359d5c89c2

drivers/optical/src/main/java/org/onosproject/driver/optical/extensions/OplinkExtensionTreatmentCodec.java

diff --git a/drivers/optical/src/main/java/org/onosproject/driver/optical/extensions/OplinkExtensionTreatmentCodec.java b/drivers/optical/src/main/java/org/onosproject/driver/optical/extensions/OplinkExtensionTreatmentCodec.java
index c62f857..f62e2aa 100644
--- a/drivers/optical/src/main/java/org/onosproject/driver/optical/extensions/OplinkExtensionTreatmentCodec.java
+++ b/drivers/optical/src/main/java/org/onosproject/driver/optical/extensions/OplinkExtensionTreatmentCodec.java
@@ -20,7 +20,7 @@
 import org.onlab.osgi.ServiceDirectory;
 import org.onosproject.codec.CodecContext;
 import org.onosproject.codec.CodecService;
-import org.onosproject.codec.ExtensionTreatmentCodec;
+import org.onosproject.net.flow.ExtensionTreatmentCodec;
 import org.onosproject.driver.extensions.OplinkAttenuation;
 import org.onosproject.net.driver.AbstractHandlerBehaviour;
 import org.onosproject.net.flow.instructions.ExtensionTreatment;

drivers/optical/src/main/resources/optical-drivers.xml

diff --git a/drivers/optical/src/main/resources/optical-drivers.xml b/drivers/optical/src/main/resources/optical-drivers.xml
index 1dd44ff..a7ef017 100644
--- a/drivers/optical/src/main/resources/optical-drivers.xml
+++ b/drivers/optical/src/main/resources/optical-drivers.xml
@@ -60,7 +60,7 @@
                    impl="org.onosproject.net.optical.DefaultOpticalDevice"/>
         <behaviour api="org.onosproject.net.behaviour.PowerConfig"
                    impl="org.onosproject.driver.optical.power.OplinkRoadmPowerConfig"/>
-        <behaviour api="org.onosproject.codec.ExtensionTreatmentCodec"
+        <behaviour api="org.onosproject.net.flow.ExtensionTreatmentCodec"
                    impl="org.onosproject.driver.optical.extensions.OplinkExtensionTreatmentCodec"/>
         <behaviour api="org.onosproject.openflow.controller.ExtensionTreatmentInterpreter"
                    impl="org.onosproject.driver.extensions.OplinkExtensionTreatmentInterpreter"/>