CORD-1625 Mark CpqD drivers as deprecated
Change-Id: I0137c390e1a623f206d495083834bea5003bc41b
diff --git a/drivers/default/src/main/resources/onos-drivers.xml b/drivers/default/src/main/resources/onos-drivers.xml
index 84269df..fa32015 100644
--- a/drivers/default/src/main/resources/onos-drivers.xml
+++ b/drivers/default/src/main/resources/onos-drivers.xml
@@ -55,22 +55,6 @@
impl="org.onosproject.driver.query.FullMplsAvailable" />
</driver>
- <!-- Emulation of the spring-open pipeline using a CPqD OF 1.3 software switch.
- ~ This driver is the default driver assigned to the CPqD switch.
- -->
- <driver name="spring-open-cpqd" extends="default"
- manufacturer="Stanford University, Ericsson Research and CPqD Research"
- hwVersion="OpenFlow 1.3 Reference Userspace Switch" swVersion=".*">
- <behaviour api="org.onosproject.net.behaviour.Pipeliner"
- impl="org.onosproject.driver.pipeline.SpringOpenTTP"/>
- </driver>
- <driver name="spring-open" extends="default"
- manufacturer="Dell " hwVersion="OpenFlow switch HW ver. 1.0"
- swVersion="OpenFlow switch SW ver. 1.0 and 1.3">
- <behaviour api="org.onosproject.net.behaviour.Pipeliner"
- impl="org.onosproject.driver.pipeline.SpringOpenTTPDell"/>
- </driver>
-
<!-- Driver for OFDPA i12_1.7.
~ TODO: version number in i12_1.7 is 2.0. Change it back when we can distinguish 3.0.
-->
@@ -128,30 +112,7 @@
impl="org.onosproject.driver.extensions.OfdpaExtensionSelectorInterpreter" />
</driver>
- <!-- Emulation of the OFDPA pipeline using a CPqD OF 1.3 software switch.
- ~ Use this driver when MPLS functionality is required.
- ~ To use this driver, configure ONOS with the dpid of the device.
- -->
- <driver name="ofdpa-cpqd" extends="default"
- manufacturer="ONF"
- hwVersion="OF1.3 Software Switch from CPqD" swVersion="for Group Chaining">
- <behaviour api="org.onosproject.net.behaviour.Pipeliner"
- impl="org.onosproject.driver.pipeline.ofdpa.CpqdOfdpa2Pipeline"/>
- </driver>
-
- <!-- Emulation of the OFDPA pipeline using a CPqD OF 1.3 software switch.
- ~ Use this driver when VLAN functionality is required.
- ~ To use this driver, configure ONOS with the dpid of the device.
- -->
- <driver name="ofdpa-cpqd-vlan" extends="default"
- manufacturer="ONF"
- hwVersion="OF1.3 Software Switch from CPqD" swVersion="for Group Chaining">
- <behaviour api="org.onosproject.net.behaviour.Pipeliner"
- impl="org.onosproject.driver.pipeline.ofdpa.CpqdOfdpa2VlanPipeline"/>
- </driver>
-
- <!-- Emulation of the OFDPA pipeline using a OVS OF 1.3 software switch.
- ~ Use this driver when MPLS functionality is required.
+ <!-- Emulation of the OF-DPA pipeline using a OVS 2.5.0+ software switch.
~ To use this driver, configure ONOS with the dpid of the device.
-->
<driver name="ofdpa-ovs" extends="default"
@@ -240,5 +201,46 @@
<behaviour api="org.onosproject.net.behaviour.MeterQuery"
impl="org.onosproject.driver.query.FullMetersAvailable"/>
</driver>
+
+ <!-- Deprecated CpqD drivers. CORD-1625 -->
+
+ <!-- Emulation of the spring-open pipeline using a CPqD OF 1.3 software switch.
+ ~ This driver is the default driver assigned to the CPqD switch.
+ -->
+ <driver name="spring-open-cpqd" extends="default"
+ manufacturer="Stanford University, Ericsson Research and CPqD Research"
+ hwVersion="OpenFlow 1.3 Reference Userspace Switch" swVersion=".*">
+ <behaviour api="org.onosproject.net.behaviour.Pipeliner"
+ impl="org.onosproject.driver.pipeline.SpringOpenTTP"/>
+ </driver>
+ <driver name="spring-open" extends="default"
+ manufacturer="Dell " hwVersion="OpenFlow switch HW ver. 1.0"
+ swVersion="OpenFlow switch SW ver. 1.0 and 1.3">
+ <behaviour api="org.onosproject.net.behaviour.Pipeliner"
+ impl="org.onosproject.driver.pipeline.SpringOpenTTPDell"/>
+ </driver>
+
+ <!-- Emulation of the OFDPA pipeline using a CPqD OF 1.3 software switch.
+ ~ Use this driver when MPLS functionality is required.
+ ~ To use this driver, configure ONOS with the dpid of the device.
+ -->
+ <driver name="ofdpa-cpqd" extends="default"
+ manufacturer="ONF"
+ hwVersion="OF1.3 Software Switch from CPqD" swVersion="for Group Chaining">
+ <behaviour api="org.onosproject.net.behaviour.Pipeliner"
+ impl="org.onosproject.driver.pipeline.ofdpa.CpqdOfdpa2Pipeline"/>
+ </driver>
+
+ <!-- Emulation of the OFDPA pipeline using a CPqD OF 1.3 software switch.
+ ~ Use this driver when VLAN functionality is required.
+ ~ To use this driver, configure ONOS with the dpid of the device.
+ -->
+ <driver name="ofdpa-cpqd-vlan" extends="default"
+ manufacturer="ONF"
+ hwVersion="OF1.3 Software Switch from CPqD" swVersion="for Group Chaining">
+ <behaviour api="org.onosproject.net.behaviour.Pipeliner"
+ impl="org.onosproject.driver.pipeline.ofdpa.CpqdOfdpa2VlanPipeline"/>
+ </driver>
+
</drivers>