Simple software switch pipeline.

Change-Id: Iaaee946967cb339a875564d962d3467899df0d31

@@ -53,6 +53,12 @@
         </dependency>
 
          <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-core-serializers</artifactId>
+            <version>1.2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
             <scope>test</scope>
@@ -63,6 +69,8 @@
             <artifactId>org.apache.felix.scr.annotations</artifactId>
         </dependency>
 
+       
+
     </dependencies>
 
     <build>

@@ -29,12 +29,11 @@ import org.projectfloodlight.openflow.types.TableId;
 import java.util.Collections;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-//import java.util.ArrayList;
 
 /**
- * Corsa switch driver for BGP Router deployment.
+ * Corsa switch handshaker.
  */
-public class OFCorsaSwitchDriver extends AbstractOpenFlowSwitch {
+public class CorsaSwitchHandShaker extends AbstractOpenFlowSwitch {
 
     private AtomicBoolean handShakeComplete = new AtomicBoolean(false);
 

@@ -13,6 +13,10 @@ import org.onosproject.net.flow.TrafficSelector;
 import org.onosproject.net.flow.TrafficTreatment;
 import org.slf4j.Logger;
 
+/**
+ * Driver for Corsa TTP.
+ *
+ */
 public class CorsaPipeline extends OVSCorsaPipeline {
 
     private final Logger log = getLogger(getClass());
@@ -37,7 +41,6 @@ public class CorsaPipeline extends OVSCorsaPipeline {
                 .makePermanent()
                 .forTable(VLAN_MPLS_TABLE).build();
 
-
         ops = install ? ops.add(rule) : ops.remove(rule);
 
         flowRuleService.apply(ops.build(new FlowRuleOperationsContext() {

@@ -102,7 +102,6 @@ public class OFDPA1Pipeline extends AbstractHandlerBehaviour implements Pipeline
     protected static final int ACL_TABLE = 60;
     protected static final int MAC_LEARNING_TABLE = 254;
 
-    @SuppressWarnings("unused")
     private static final int HIGHEST_PRIORITY = 0xffff;
     private static final int DEFAULT_PRIORITY = 0x8000;
     private static final int LOWEST_PRIORITY = 0x0;

@@ -27,17 +27,20 @@
                    impl="org.onosproject.driver.pipeline.OVSCorsaPipeline"/>
     </driver>
     <driver name="spring-open-cpqd" extends="default"
-            manufacturer="Stanford University, Ericsson Research and CPqD Research" hwVersion="OpenFlow 1.3 Reference Userspace Switch" swVersion=".*">
+            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">
+            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 name="linc-oe" extends="default"
-            manufacturer="FlowForwarding.org" hwVersion="Unknown" swVersion="LINC-OE OpenFlow Software Switch 1.1">
+            manufacturer="FlowForwarding.org" hwVersion="Unknown" 
+            swVersion="LINC-OE OpenFlow Software Switch 1.1">
         <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
                    impl="org.onosproject.driver.handshaker.OFOpticalSwitchImplLINC13"/>
     </driver>
@@ -45,12 +48,22 @@
         <behaviour api="org.onosproject.net.behaviour.Pipeliner"
                    impl="org.onosproject.driver.pipeline.CorsaPipeline"/>
         <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
-                   impl="org.onosproject.driver.handshaker.OFCorsaSwitchDriver"/>
+                   impl="org.onosproject.driver.handshaker.CorsaSwitchHandShaker"/>
     </driver>
     <driver name="ofdpa" extends="default"
             manufacturer="Broadcom Corp." hwVersion="OF-DPA 1.0" swVersion="OF-DPA 1.0">
         <behaviour api="org.onosproject.net.behaviour.Pipeliner"
                    impl="org.onosproject.driver.pipeline.OFDPA1Pipeline"/>
     </driver>
+    <!--  The SoftRouter driver is meant to be used by any software/NPU based
+       ~  switch that wishes to implement a simple 2-table router. ONOS needs to
+       ~  be configured with the dpid of such a device to attach this driver
+       ~  to the device.
+      -->
+    <driver name="softrouter" extends="default"
+            manufacturer="Various" hwVersion="various" swVersion="0.0.0">
+        <behaviour api="org.onosproject.net.behaviour.Pipeliner"
+                   impl="org.onosproject.driver.pipeline.SoftRouterPipeline"/>
+    </driver>
 </drivers>