commit d84178f559849125597845430e2b29aa96fa774f
author Saurav Das <sauravdas@alumni.stanford.edu> Mon Sep 29 17:48:54 2014 -0700
committer Saurav Das <sauravdas@alumni.stanford.edu> Mon Sep 29 17:49:54 2014 -0700
tree 71e67dab5fc6eb47d6d6b297add6c08a43ec591e
parent 463bee525d325567e3bd32f0465d90ab7f3b7735

Adding barrier message support with futures to IOFSwitch driver

Change-Id: I0f2de6c60165c2b6687d647850beb7ce23def83a

src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplCPqD13.java

diff --git a/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplCPqD13.java b/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplCPqD13.java
index 7162554..0931eca 100644
--- a/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplCPqD13.java
+++ b/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplCPqD13.java
@@ -234,19 +234,19 @@
         case INIT:
             driverState = DriverState.SET_TABLE_MISS_ENTRIES;
             setTableMissEntries();
-            sendBarrier();
+            sendHandshakeBarrier();
             break;
         case SET_TABLE_MISS_ENTRIES:
             driverState = DriverState.SET_TABLE_VLAN_TMAC;
             getNetworkConfig();
             populateTableVlan();
             populateTableTMac();
-            sendBarrier();
+            sendHandshakeBarrier();
             break;
         case SET_TABLE_VLAN_TMAC:
             driverState = DriverState.SET_GROUPS;
             createGroups();
-            sendBarrier();
+            sendHandshakeBarrier();
             break;
         case SET_GROUPS:
             driverState = DriverState.VERIFY_GROUPS;
@@ -378,7 +378,7 @@
         populateTableMissEntry(TABLE_ACL, false, false, false, -1);
     }
 
-    private void sendBarrier() throws IOException {
+    private void sendHandshakeBarrier() throws IOException {
         long xid = getNextTransactionId();
         barrierXidToWaitFor = xid;
         OFBarrierRequest br = getFactory()
@@ -1145,7 +1145,7 @@
         // getTableFeatures();
         sendGroupFeaturesRequest();
         setL2Groups();
-        sendBarrier();
+        sendHandshakeBarrier();
         setL3Groups();
         setL25Groups();
         // setEcmpGroup();
@@ -1155,7 +1155,7 @@
         populateIpTable();
         populateMplsTable();
         populateTableMissEntry(TABLE_ACL, false, false, false, -1);
-        sendBarrier();
+        sendHandshakeBarrier();
     }
 
     private void setAsyncConfig() throws IOException {