Committed by
Gerrit Code Review
Drivers for Centec and Pica8 switches
Change-Id: I390c70716560275af7ee8bd40e6d161b6ed3b58f
Showing
4 changed files
with
17 additions
and
3 deletions
This diff is collapsed. Click to expand it.
... | @@ -815,6 +815,7 @@ public class OVSCorsaPipeline extends AbstractHandlerBehaviour implements Pipeli | ... | @@ -815,6 +815,7 @@ public class OVSCorsaPipeline extends AbstractHandlerBehaviour implements Pipeli |
815 | this.key = key; | 815 | this.key = key; |
816 | } | 816 | } |
817 | 817 | ||
818 | + @SuppressWarnings("unused") | ||
818 | public GroupKey key() { | 819 | public GroupKey key() { |
819 | return key; | 820 | return key; |
820 | } | 821 | } | ... | ... |
This diff is collapsed. Click to expand it.
... | @@ -15,13 +15,15 @@ | ... | @@ -15,13 +15,15 @@ |
15 | ~ limitations under the License. | 15 | ~ limitations under the License. |
16 | --> | 16 | --> |
17 | <drivers> | 17 | <drivers> |
18 | - <driver name="default" manufacturer="ON.Lab" hwVersion="0.0.1" swVersion="0.0.1"> | 18 | + <driver name="default" |
19 | + manufacturer="ON.Lab" hwVersion="0.0.1" swVersion="0.0.1"> | ||
19 | <behaviour api="org.onosproject.net.behaviour.Pipeliner" | 20 | <behaviour api="org.onosproject.net.behaviour.Pipeliner" |
20 | impl="org.onosproject.driver.pipeline.DefaultSingleTablePipeline"/> | 21 | impl="org.onosproject.driver.pipeline.DefaultSingleTablePipeline"/> |
21 | <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver" | 22 | <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver" |
22 | impl="org.onosproject.driver.handshaker.DefaultSwitchHandShaker"/> | 23 | impl="org.onosproject.driver.handshaker.DefaultSwitchHandShaker"/> |
23 | </driver> | 24 | </driver> |
24 | - <driver name="ovs" extends="default" manufacturer="Nicira, Inc\." hwVersion="Open vSwitch" swVersion="2\..*"> | 25 | + <driver name="ovs" extends="default" |
26 | + manufacturer="Nicira, Inc\." hwVersion="Open vSwitch" swVersion="2\..*"> | ||
25 | <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver" | 27 | <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver" |
26 | impl="org.onosproject.driver.handshaker.NiciraSwitchHandShaker"/> | 28 | impl="org.onosproject.driver.handshaker.NiciraSwitchHandShaker"/> |
27 | </driver> | 29 | </driver> |
... | @@ -48,7 +50,8 @@ | ... | @@ -48,7 +50,8 @@ |
48 | <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver" | 50 | <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver" |
49 | impl="org.onosproject.driver.handshaker.OFOpticalSwitchImplLINC13"/> | 51 | impl="org.onosproject.driver.handshaker.OFOpticalSwitchImplLINC13"/> |
50 | </driver> | 52 | </driver> |
51 | - <driver name="corsa" manufacturer="Corsa" hwVersion="Corsa Element" swVersion="2.3.1"> | 53 | + <driver name="corsa" |
54 | + manufacturer="Corsa" hwVersion="Corsa Element" swVersion="2.3.1"> | ||
52 | <behaviour api="org.onosproject.net.behaviour.Pipeliner" | 55 | <behaviour api="org.onosproject.net.behaviour.Pipeliner" |
53 | impl="org.onosproject.driver.pipeline.CorsaPipeline"/> | 56 | impl="org.onosproject.driver.pipeline.CorsaPipeline"/> |
54 | <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver" | 57 | <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver" |
... | @@ -69,5 +72,15 @@ | ... | @@ -69,5 +72,15 @@ |
69 | <behaviour api="org.onosproject.net.behaviour.Pipeliner" | 72 | <behaviour api="org.onosproject.net.behaviour.Pipeliner" |
70 | impl="org.onosproject.driver.pipeline.SoftRouterPipeline"/> | 73 | impl="org.onosproject.driver.pipeline.SoftRouterPipeline"/> |
71 | </driver> | 74 | </driver> |
75 | + <driver name="centec-V350" extends="default" | ||
76 | + manufacturer=".*Centec.*" hwVersion=".*" swVersion="3.1.*"> | ||
77 | + <behaviour api="org.onosproject.net.behaviour.Pipeliner" | ||
78 | + impl="org.onosproject.driver.pipeline.CentecV350Pipeline"/> | ||
79 | + </driver> | ||
80 | + <driver name="pica" extends="default" | ||
81 | + manufacturer="Pica8, Inc." hwVersion="ly2" swVersion="PicOS 2.6"> | ||
82 | + <behaviour api="org.onosproject.net.behaviour.Pipeliner" | ||
83 | + impl="org.onosproject.driver.pipeline.PicaPipeline"/> | ||
84 | + </driver> | ||
72 | </drivers> | 85 | </drivers> |
73 | 86 | ... | ... |
-
Please register or login to post a comment