commit 40a544ba3e0bf05f384ec6167f595dc974831f99
author Marc De Leenheer <marc@onlab.us> Tue Apr 25 14:16:02 2017 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Thu Apr 27 21:41:51 2017 +0000
tree a6681b1702f7b3323bf1d357a6b91dd6c7a6048d
parent 688395a4b428b99bbea5184a8e755ff5cf66a22e

Refactored cross connect helpers to optical drivers package.

Change-Id: Iae23025cf0b33c51123911f3ff1249cabc812be2

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 e483945..35563e0 100644
--- a/drivers/optical/src/main/resources/optical-drivers.xml
+++ b/drivers/optical/src/main/resources/optical-drivers.xml
@@ -33,10 +33,8 @@
                    impl="org.onosproject.driver.optical.handshaker.CalientFiberSwitchHandshaker"/>
         <behaviour api="org.onosproject.net.behaviour.LambdaQuery"
                    impl="org.onosproject.driver.optical.query.CalientLambdaQuery"/>
-
         <behaviour api="org.onosproject.net.optical.OpticalDevice"
                    impl="org.onosproject.net.optical.DefaultOpticalDevice"/>
-
     </driver>
 
     <driver name="eci" extends="default"
@@ -70,12 +68,10 @@
 
     <driver name="oplk_ops" extends="default"
             manufacturer="Oplink a Molex company" hwVersion="protection-switch" swVersion="of-agent-1.0">
-
         <behaviour api="org.onosproject.net.optical.OpticalDevice"
                    impl="org.onosproject.net.optical.DefaultOpticalDevice"/>
-
         <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
-            impl="org.onosproject.driver.optical.handshaker.OplinkSwitchHandshaker"/>
+                   impl="org.onosproject.driver.optical.handshaker.OplinkSwitchHandshaker"/>
         <behaviour api="org.onosproject.net.behaviour.protection.ProtectionConfigBehaviour"
                    impl="org.onosproject.driver.optical.protection.OplinkSwitchProtection"/>
         <behaviour api="org.onosproject.net.behaviour.LambdaQuery"
@@ -86,10 +82,8 @@
 
     <driver name="oplk-edfa" extends="default"
             manufacturer="Oplink a Molex company" hwVersion="edfa" swVersion="of-agent-1.0">
-
         <behaviour api="org.onosproject.net.optical.OpticalDevice"
                    impl="org.onosproject.net.optical.DefaultOpticalDevice"/>
-
         <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
                    impl="org.onosproject.driver.optical.handshaker.OplinkEdfaHandshaker"/>
         <behaviour api="org.onosproject.net.behaviour.LambdaQuery"
@@ -102,31 +96,23 @@
     <driver name="polatis-config" manufacturer="Polatis" hwVersion="N-VST-48x48-HU1-DMHNV-805" swVersion="6.6.1.7">
         <behaviour api="org.onosproject.net.optical.OpticalDevice"
                    impl="org.onosproject.net.optical.DefaultOpticalDevice"/>
-
         <behaviour api="org.onosproject.net.device.DeviceDescriptionDiscovery"
                    impl="org.onosproject.driver.optical.config.PolatisDeviceDiscovery"/>
-
         <behaviour api="org.onosproject.net.flow.FlowRuleProgrammable"
-            impl="org.onosproject.driver.optical.config.ConfigFlowRuleProgrammable"/>
-
+                   impl="org.onosproject.driver.optical.config.ConfigFlowRuleProgrammable"/>
         <behaviour api="org.onosproject.net.behaviour.LambdaQuery"
                    impl="org.onosproject.driver.optical.query.ConfigLambdaQuery"/>
-
     </driver>
 
     <driver name="optical-config" manufacturer="config" hwVersion="config" swVersion="config">
         <behaviour api="org.onosproject.net.optical.OpticalDevice"
                    impl="org.onosproject.net.optical.DefaultOpticalDevice"/>
-
         <behaviour api="org.onosproject.net.device.DeviceDescriptionDiscovery"
                    impl="org.onosproject.driver.optical.config.ConfigOpticalDeviceDiscovery"/>
-
         <behaviour api="org.onosproject.net.flow.FlowRuleProgrammable"
-            impl="org.onosproject.driver.optical.config.ConfigFlowRuleProgrammable"/>
-
+                   impl="org.onosproject.driver.optical.config.ConfigFlowRuleProgrammable"/>
         <behaviour api="org.onosproject.net.behaviour.LambdaQuery"
                    impl="org.onosproject.driver.optical.query.ConfigLambdaQuery"/>
-
     </driver>
 
 </drivers>