Fixing emulated ofdpa in cpqd switches. Due to cpqd bugs in dealing with Vlans and MPLS labels simultaneously,
we cannot emulate correct behavior in the same driver. This checkin separates the emulation, with one
driver meant for MPLS with untagged packets, and the other meant for untagged/tagged VLAN packets without MPLS.
Change-Id: Ia6112f4d26c7b32c93e1db2e9b1ae4673c553d87
diff --git a/drivers/default/src/main/resources/onos-drivers.xml b/drivers/default/src/main/resources/onos-drivers.xml
index 1817f07..f0f2e4c 100644
--- a/drivers/default/src/main/resources/onos-drivers.xml
+++ b/drivers/default/src/main/resources/onos-drivers.xml
@@ -141,6 +141,7 @@
manufacturer="NoviFlow Inc" hwVersion="NS.*" swVersion="NW.*">
</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"
@@ -149,6 +150,16 @@
<behaviour api="org.onosproject.net.behaviour.Pipeliner"
impl="org.onosproject.driver.pipeline.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.CpqdOFDPA2VlanPipeline"/>
+ </driver>
<driver name="calient" extends="default"
manufacturer="calient inc" hwVersion="calient hardware"
swVersion="ocs switch">