commit b452fd7d71e06a977b544f1611523e7fd08e9697
author alshabib <alshabibi.ali@gmail.com> Wed Apr 22 20:46:20 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Wed May 06 01:00:17 2015 +0000
tree 5c59f66d67de5366ba56973427d2472c1db411df
parent 2eef94d9a2f9c26f710cf8fa50c3c90cf3193fed

Low level openflow drivers have been promoted to the driver subsystem.

All new device drivers should provide a handshaking behaviour as well
as well as a pipeline behaviour.

Change-Id: I883830b074e5d254a8cc6100e6c4fa0023594a36

openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/RoleManagerTest.java

diff --git a/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/RoleManagerTest.java b/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/RoleManagerTest.java
index fb0e406..06929d2 100644
--- a/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/RoleManagerTest.java
+++ b/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/RoleManagerTest.java
@@ -15,15 +15,14 @@
  */
 package org.onosproject.openflow.controller.impl;
 
-import java.io.IOException;
-import java.util.List;
-
 import org.jboss.netty.channel.Channel;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.onosproject.net.driver.DriverData;
+import org.onosproject.net.driver.DriverHandler;
+import org.onosproject.openflow.controller.Dpid;
 import org.onosproject.openflow.controller.RoleState;
-import org.onosproject.openflow.controller.OpenFlowSwitch.TableType;
 import org.onosproject.openflow.controller.driver.OpenFlowAgent;
 import org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver;
 import org.onosproject.openflow.controller.driver.RoleHandler;
@@ -39,12 +38,16 @@
 import org.projectfloodlight.openflow.protocol.OFPortDesc;
 import org.projectfloodlight.openflow.protocol.OFPortDescStatsReply;
 import org.projectfloodlight.openflow.protocol.OFVersion;
-import org.projectfloodlight.openflow.types.TableId;
 import org.projectfloodlight.openflow.types.U64;
 
+import java.io.IOException;
+import java.util.List;
+
 import static org.junit.Assert.assertEquals;
-import static org.onosproject.openflow.controller.RoleState.*;
-import static org.onosproject.openflow.controller.driver.RoleRecvStatus.*;
+import static org.onosproject.openflow.controller.RoleState.MASTER;
+import static org.onosproject.openflow.controller.RoleState.SLAVE;
+import static org.onosproject.openflow.controller.driver.RoleRecvStatus.MATCHED_CURRENT_ROLE;
+import static org.onosproject.openflow.controller.driver.RoleRecvStatus.OTHER_EXPECTATION;
 
 public class RoleManagerTest {
 
@@ -112,9 +115,6 @@
         public void sendMsg(List<OFMessage> msgs) {
         }
 
-        @Override
-        public void transformAndSendMsg(OFMessage msg, TableType tableType) {
-        }
 
         @Override
         public void handleMessage(OFMessage fromSwitch) {
@@ -224,6 +224,11 @@
         }
 
         @Override
+        public void sendRoleRequest(OFMessage message) {
+
+        }
+
+        @Override
         public boolean connectSwitch() {
             return false;
         }
@@ -293,19 +298,16 @@
         }
 
         @Override
+        public void init(Dpid dpid, OFDescStatsReply desc, OFVersion ofv) {
+
+        }
+
+        @Override
         public boolean isConnected() {
             return false;
         }
 
         @Override
-        public void write(OFMessage msg) {
-        }
-
-        @Override
-        public void write(List<OFMessage> msgs) {
-        }
-
-        @Override
         public void returnRoleReply(RoleState requested, RoleState response) {
             failed = requested;
         }
@@ -316,9 +318,23 @@
         }
 
         @Override
-        public TableType getTableType(TableId tid) {
-            return TableType.NONE;
+        public DriverHandler handler() {
+            return null;
         }
 
+        @Override
+        public void setHandler(DriverHandler handler) {
+
+        }
+
+        @Override
+        public DriverData data() {
+            return null;
+        }
+
+        @Override
+        public void setData(DriverData data) {
+
+        }
     }
 }