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 a1dc789..9e4cf24 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
@@ -17,6 +17,7 @@
 package org.onosproject.drivers.barefoot;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import org.apache.commons.io.IOUtils;
 import org.apache.thrift.TException;
@@ -26,15 +27,24 @@
 import org.apache.thrift.transport.TSocket;
 import org.apache.thrift.transport.TTransport;
 import org.onlab.util.SharedExecutors;
+import org.onosproject.drivers.barefoot.pal.InvalidPalOperation;
 import org.onosproject.drivers.barefoot.pal.pal;
-import org.onosproject.drivers.barefoot.pal.pal_autoneg_policy_t;
 import org.onosproject.drivers.barefoot.pal.pal_fec_type_t;
 import org.onosproject.drivers.barefoot.pal.pal_port_speed_t;
 import org.onosproject.incubator.net.config.basics.PortDescriptionsConfig;
+import org.onosproject.net.AnnotationKeys;
+import org.onosproject.net.Device;
 import org.onosproject.net.DeviceId;
+import org.onosproject.net.Port;
 import org.onosproject.net.config.NetworkConfigService;
+import org.onosproject.net.config.basics.BasicDeviceConfig;
+import org.onosproject.net.device.DeviceDescription;
+import org.onosproject.net.device.DeviceDescriptionDiscovery;
+import org.onosproject.net.device.DeviceService;
 import org.onosproject.net.device.PortDescription;
 import org.onosproject.net.driver.AbstractHandlerBehaviour;
+import org.onosproject.net.driver.Driver;
+import org.onosproject.net.driver.DriverService;
 import org.onosproject.net.pi.model.PiPipeconf;
 import org.onosproject.net.pi.model.PiPipeconf.ExtensionType;
 import org.onosproject.net.pi.model.PiPipelineProgrammable;
@@ -43,12 +53,14 @@
 import org.onosproject.provider.general.device.api.GeneralProviderDeviceConfig;
 import org.slf4j.Logger;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -176,7 +188,6 @@
             pal.Client client = new pal.Client(mProtocol);
 
             client.pal_port_add(deviceId, dp, speed, pal_fec_type_t.BF_FEC_TYP_NONE);
-            client.pal_port_an_set(deviceId, dp, pal_autoneg_policy_t.BF_AN_FORCE_DISABLE);
             client.pal_port_enable(deviceId, dp);
             transport.close();
         } catch (TException x) {
diff --git a/tools/dev/p4vm/root-bootstrap.sh b/tools/dev/p4vm/root-bootstrap.sh
deleted file mode 100755
index e69de29..0000000
--- a/tools/dev/p4vm/root-bootstrap.sh
+++ /dev/null
diff --git a/tools/test/topos/tofino-demo-dev-11.json b/tools/test/topos/tofino-demo-dev-11.json
index 72875e1..8a87af6 100644
--- a/tools/test/topos/tofino-demo-dev-11.json
+++ b/tools/test/topos/tofino-demo-dev-11.json
@@ -3,7 +3,7 @@
     "device:tofino:11": {
       "generalprovider": {
         "p4runtime": {
-          "ip": "10.6.0.34",
+          "ip": "10.254.1.38",
           "deviceKeyId": "p4runtime:device:tofino:11",
           "port": 50051,
           "deviceId": 0
@@ -29,11 +29,11 @@
           "removed": false,
           "type": "copper"
         },
-        "3/2": {
+        "3/0": {
           "name": "3/0",
-          "speed": 10000,
+          "speed": 40000,
           "enabled": true,
-          "number": 182,
+          "number": 180,
           "removed": false,
           "type": "copper"
         }
@@ -46,4 +46,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/tools/test/topos/tofino-demo-dev-12.json b/tools/test/topos/tofino-demo-dev-12.json
index 330b9d2..0b9cf4a 100644
--- a/tools/test/topos/tofino-demo-dev-12.json
+++ b/tools/test/topos/tofino-demo-dev-12.json
@@ -3,7 +3,7 @@
     "device:tofino:12": {
       "generalprovider": {
         "p4runtime": {
-          "ip": "10.6.0.37",
+          "ip": "10.254.1.37",
           "deviceKeyId": "p4runtime:device:tofino:12",
           "port": 50051,
           "deviceId": 0
@@ -29,11 +29,11 @@
           "removed": false,
           "type": "copper"
         },
-        "3/2": {
+        "3/0": {
           "name": "3/0",
-          "speed": 10000,
+          "speed": 40000,
           "enabled": true,
-          "number": 182,
+          "number": 180,
           "removed": false,
           "type": "copper"
         }
@@ -46,4 +46,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/tools/test/topos/tofino-demo-dev-21.json b/tools/test/topos/tofino-demo-dev-21.json
index 521b335..17d39f3 100644
--- a/tools/test/topos/tofino-demo-dev-21.json
+++ b/tools/test/topos/tofino-demo-dev-21.json
@@ -3,7 +3,7 @@
     "device:tofino:21": {
       "generalprovider": {
         "p4runtime": {
-          "ip": "10.6.0.33",
+          "ip": "10.254.1.40",
           "deviceKeyId": "p4runtime:device:tofino:21",
           "port": 50051,
           "deviceId": 0
@@ -38,4 +38,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/tools/test/topos/tofino-demo-dev-22.json b/tools/test/topos/tofino-demo-dev-22.json
index d3c7275..081fcc8 100644
--- a/tools/test/topos/tofino-demo-dev-22.json
+++ b/tools/test/topos/tofino-demo-dev-22.json
@@ -3,7 +3,7 @@
     "device:tofino:22": {
       "generalprovider": {
         "p4runtime": {
-          "ip": "10.6.0.35",
+          "ip": "10.254.1.39",
           "deviceKeyId": "p4runtime:device:tofino:22",
           "port": 50051,
           "deviceId": 0
@@ -38,4 +38,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file