fixed missed checkstyle complaints
Change-Id: I91a2da4a7daaaa3a98115a8cd118d31d54277ab2
Showing
2 changed files
with
1 additions
and
18 deletions
| ... | @@ -22,7 +22,6 @@ import org.onlab.onos.net.packet.PacketProviderRegistry; | ... | @@ -22,7 +22,6 @@ import org.onlab.onos.net.packet.PacketProviderRegistry; |
| 22 | import org.onlab.onos.net.packet.PacketProviderService; | 22 | import org.onlab.onos.net.packet.PacketProviderService; |
| 23 | import org.onlab.onos.net.provider.AbstractProvider; | 23 | import org.onlab.onos.net.provider.AbstractProvider; |
| 24 | import org.onlab.onos.net.provider.ProviderId; | 24 | import org.onlab.onos.net.provider.ProviderId; |
| 25 | -import org.onlab.onos.openflow.controller.DefaultOpenFlowPacketContext; | ||
| 26 | import org.onlab.onos.openflow.controller.Dpid; | 25 | import org.onlab.onos.openflow.controller.Dpid; |
| 27 | import org.onlab.onos.openflow.controller.OpenFlowController; | 26 | import org.onlab.onos.openflow.controller.OpenFlowController; |
| 28 | import org.onlab.onos.openflow.controller.OpenFlowPacketContext; | 27 | import org.onlab.onos.openflow.controller.OpenFlowPacketContext; | ... | ... |
| ... | @@ -99,9 +99,8 @@ public class OpenFlowPacketProviderTest { | ... | @@ -99,9 +99,8 @@ public class OpenFlowPacketProviderTest { |
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | @Test(expected = IllegalArgumentException.class) | 101 | @Test(expected = IllegalArgumentException.class) |
| 102 | - public void scheme() { | 102 | + public void wrongScheme() { |
| 103 | sw.setRole(RoleState.MASTER); | 103 | sw.setRole(RoleState.MASTER); |
| 104 | - //device has wrong scheme | ||
| 105 | OutboundPacket schemeFailPkt = outPacket(DID_WRONG, TR, null); | 104 | OutboundPacket schemeFailPkt = outPacket(DID_WRONG, TR, null); |
| 106 | provider.emit(schemeFailPkt); | 105 | provider.emit(schemeFailPkt); |
| 107 | assertEquals("message sent incorrectly", 0, sw.sent.size()); | 106 | assertEquals("message sent incorrectly", 0, sw.sent.size()); |
| ... | @@ -235,7 +234,6 @@ public class OpenFlowPacketProviderTest { | ... | @@ -235,7 +234,6 @@ public class OpenFlowPacketProviderTest { |
| 235 | 234 | ||
| 236 | private class TestController implements OpenFlowController { | 235 | private class TestController implements OpenFlowController { |
| 237 | 236 | ||
| 238 | - int prio; | ||
| 239 | PacketListener pktListener; | 237 | PacketListener pktListener; |
| 240 | OpenFlowSwitch current; | 238 | OpenFlowSwitch current; |
| 241 | 239 | ||
| ... | @@ -284,7 +282,6 @@ public class OpenFlowPacketProviderTest { | ... | @@ -284,7 +282,6 @@ public class OpenFlowPacketProviderTest { |
| 284 | 282 | ||
| 285 | @Override | 283 | @Override |
| 286 | public void addPacketListener(int priority, PacketListener listener) { | 284 | public void addPacketListener(int priority, PacketListener listener) { |
| 287 | - prio = priority; | ||
| 288 | pktListener = listener; | 285 | pktListener = listener; |
| 289 | } | 286 | } |
| 290 | 287 | ||
| ... | @@ -318,19 +315,6 @@ public class OpenFlowPacketProviderTest { | ... | @@ -318,19 +315,6 @@ public class OpenFlowPacketProviderTest { |
| 318 | 315 | ||
| 319 | } | 316 | } |
| 320 | 317 | ||
| 321 | - private class TestPacketProviderService implements PacketProviderService { | ||
| 322 | - | ||
| 323 | - @Override | ||
| 324 | - public PacketProvider provider() { | ||
| 325 | - return null; | ||
| 326 | - } | ||
| 327 | - | ||
| 328 | - @Override | ||
| 329 | - public void processPacket(PacketContext context) { | ||
| 330 | - } | ||
| 331 | - | ||
| 332 | - } | ||
| 333 | - | ||
| 334 | private class TestOpenFlowSwitch implements OpenFlowSwitch { | 318 | private class TestOpenFlowSwitch implements OpenFlowSwitch { |
| 335 | 319 | ||
| 336 | List<OFPortDesc> ports; | 320 | List<OFPortDesc> ports; | ... | ... |
-
Please register or login to post a comment