From d519b554473ce5ecfa5e8393e8bff23bcf60f3cc Mon Sep 17 00:00:00 2001
From: Carmelo Cascone <carmelo@opennetworking.org>
Date: Wed, 31 Jan 2018 14:48:09 -0800
Subject: [PATCH] Renamed tofino driver to barefoot

For consistency with other drivers.

Also fixed ClassDefNotFoundException when loading driver.

Change-Id: If000d9b9fdae659aa32e0a5898885b52bc5ca89b
---
 .../drivers/barefoot/TofinoPipelineProgrammable.java         | 5 ++++-
 drivers/barefoot/src/main/resources/barefoot-drivers.xml     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/barefoot/src/main/java/org/onosproject/drivers/barefoot/TofinoPipelineProgrammable.java b/drivers/barefoot/src/main/java/org/onosproject/drivers/barefoot/TofinoPipelineProgrammable.java
index 197b6816d8..114b2af302 100644
--- a/drivers/barefoot/src/main/java/org/onosproject/drivers/barefoot/TofinoPipelineProgrammable.java
+++ b/drivers/barefoot/src/main/java/org/onosproject/drivers/barefoot/TofinoPipelineProgrammable.java
@@ -19,6 +19,7 @@ package org.onosproject.drivers.barefoot;
 import com.google.common.collect.Lists;
 import org.apache.commons.io.IOUtils;
 import org.onosproject.drivers.p4runtime.AbstractP4RuntimePipelineProgrammable;
+import org.onosproject.net.behaviour.PiPipelineProgrammable;
 import org.onosproject.net.pi.model.PiPipeconf;
 import org.onosproject.net.pi.model.PiPipeconf.ExtensionType;
 
@@ -36,7 +37,9 @@ import static org.onosproject.net.pi.model.PiPipeconf.ExtensionType.TOFINO_CONTE
 /**
  * Implementation of the PiPipelineProgrammable behaviour for a Tofino-based switch.
  */
-public class TofinoPipelineProgrammable extends AbstractP4RuntimePipelineProgrammable {
+public class TofinoPipelineProgrammable
+        extends AbstractP4RuntimePipelineProgrammable
+        implements PiPipelineProgrammable {
 
     @Override
     public Optional<PiPipeconf> getDefaultPipeconf() {
diff --git a/drivers/barefoot/src/main/resources/barefoot-drivers.xml b/drivers/barefoot/src/main/resources/barefoot-drivers.xml
index 4424e5bfcb..9a2ebcc891 100644
--- a/drivers/barefoot/src/main/resources/barefoot-drivers.xml
+++ b/drivers/barefoot/src/main/resources/barefoot-drivers.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <drivers>
-    <driver name="tofino" manufacturer="Barefoot Networks" hwVersion="1.0" swVersion="1.0" extends="p4runtime">
+    <driver name="barefoot" manufacturer="Barefoot Networks" hwVersion="1.0" swVersion="1.0" extends="p4runtime">
         <behaviour api="org.onosproject.net.behaviour.PiPipelineProgrammable"
                    impl="org.onosproject.drivers.barefoot.TofinoPipelineProgrammable"/>
     </driver>