diff --git a/apps/xos-integration/src/main/java/org/onosproject/xosintegration/OnosXOSIntegrationManager.java b/apps/xos-integration/src/main/java/org/onosproject/xosintegration/OnosXOSIntegrationManager.java
index 2cd3d62..c9f7502 100644
--- a/apps/xos-integration/src/main/java/org/onosproject/xosintegration/OnosXOSIntegrationManager.java
+++ b/apps/xos-integration/src/main/java/org/onosproject/xosintegration/OnosXOSIntegrationManager.java
@@ -117,6 +117,7 @@
 
     private ApplicationId appId;
     private Map<String, ConnectPoint> nodeToPort;
+    private Map<Long, Short> portToVlan;
 
     @Activate
     public void activate(ComponentContext context) {
@@ -150,6 +151,9 @@
 
         nodeToPort.put("cordcompute02.onlab.us", new ConnectPoint(FABRIC_DEVICE_ID,
                                                                   PortNumber.portNumber(3)));
+
+        portToVlan.putIfAbsent(2L, (short) 201);
+        portToVlan.putIfAbsent(6L, (short) 401);
     }
 
     /**
@@ -412,7 +416,7 @@
         //json += "]}";
 
         JsonObject node = new JsonObject();
-        node.add("vlan", vlanId.toShort());
+        node.add("vlan", portToVlan.get(fromPoint.port().toLong()));
         JsonArray array = new JsonArray();
         JsonObject cp1 = new JsonObject();
         JsonObject cp2 = new JsonObject();
diff --git a/drivers/src/main/resources/onos-drivers.xml b/drivers/src/main/resources/onos-drivers.xml
index 44fcb8a..ee954a3 100644
--- a/drivers/src/main/resources/onos-drivers.xml
+++ b/drivers/src/main/resources/onos-drivers.xml
@@ -67,6 +67,11 @@
         <behaviour api="org.onosproject.net.behaviour.Pipeliner"
                    impl="org.onosproject.driver.pipeline.OLTPipeline"/>
     </driver>
+    <driver name="g.fast" extends="default"
+            manufacturer="TEST1" hwVersion="TEST2" swVersion="TEST3">
+        <behaviour api="org.onosproject.net.behaviour.Pipeliner"
+                   impl="org.onosproject.driver.pipeline.OLTPipeline"/>
+    </driver>
     <!--  The SoftRouter driver is meant to be used by any software/NPU based
        ~  switch that wishes to implement a simple 2-table router. To use this
        ~  driver, configure ONOS with the dpid of the device, or extend the