홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
tom
43526fcc 1 parent 8539ee28

Moved host provider test to be under src/test

Inline Side-by-side
Showing 1 changed file with 9 additions and 9 deletions
...@@ -51,7 +51,7 @@ public class OpenFlowHostProviderTest { ...@@ -51,7 +51,7 @@ public class OpenFlowHostProviderTest {
51 private static final VLANID VLAN = VLANID.vlanId(); 51 private static final VLANID VLAN = VLANID.vlanId();
52 private static final MACAddress MAC = MACAddress.valueOf("00:00:11:00:00:01"); 52 private static final MACAddress MAC = MACAddress.valueOf("00:00:11:00:00:01");
53 private static final MACAddress BCMAC = MACAddress.valueOf("ff:ff:ff:ff:ff:ff"); 53 private static final MACAddress BCMAC = MACAddress.valueOf("ff:ff:ff:ff:ff:ff");
54 - private static byte [] IP = new byte [] { 10,0,0,1 }; 54 + private static final byte[] IP = new byte[]{10, 0, 0, 1};
55 55
56 private OpenFlowHostProvider provider = new OpenFlowHostProvider(); 56 private OpenFlowHostProvider provider = new OpenFlowHostProvider();
57 private TestHostRegistry hostService = new TestHostRegistry(); 57 private TestHostRegistry hostService = new TestHostRegistry();
...@@ -242,13 +242,13 @@ public class OpenFlowHostProviderTest { ...@@ -242,13 +242,13 @@ public class OpenFlowHostProviderTest {
242 242
243 @Override 243 @Override
244 public Set<DeviceId> getClusterDevices(Topology topology, 244 public Set<DeviceId> getClusterDevices(Topology topology,
245 - TopologyCluster cluster) { 245 + TopologyCluster cluster) {
246 return null; 246 return null;
247 } 247 }
248 248
249 @Override 249 @Override
250 public Set<Link> getClusterLinks(Topology topology, 250 public Set<Link> getClusterLinks(Topology topology,
251 - TopologyCluster cluster) { 251 + TopologyCluster cluster) {
252 return null; 252 return null;
253 } 253 }
254 254
...@@ -259,13 +259,13 @@ public class OpenFlowHostProviderTest { ...@@ -259,13 +259,13 @@ public class OpenFlowHostProviderTest {
259 259
260 @Override 260 @Override
261 public Set<Path> getPaths(Topology topology, DeviceId src, 261 public Set<Path> getPaths(Topology topology, DeviceId src,
262 - DeviceId dst, LinkWeight weight) { 262 + DeviceId dst, LinkWeight weight) {
263 return null; 263 return null;
264 } 264 }
265 265
266 @Override 266 @Override
267 public boolean isInfrastructure(Topology topology, 267 public boolean isInfrastructure(Topology topology,
268 - ConnectPoint connectPoint) { 268 + ConnectPoint connectPoint) {
269 //simulate DPID3 as an infrastructure switch 269 //simulate DPID3 as an infrastructure switch
270 if (Dpid.dpid(connectPoint.deviceId().uri()).equals(DPID3)) { 270 if (Dpid.dpid(connectPoint.deviceId().uri()).equals(DPID3)) {
271 return true; 271 return true;
...@@ -275,7 +275,7 @@ public class OpenFlowHostProviderTest { ...@@ -275,7 +275,7 @@ public class OpenFlowHostProviderTest {
275 275
276 @Override 276 @Override
277 public boolean isBroadcastPoint(Topology topology, 277 public boolean isBroadcastPoint(Topology topology,
278 - ConnectPoint connectPoint) { 278 + ConnectPoint connectPoint) {
279 return false; 279 return false;
280 } 280 }
281 281
...@@ -319,9 +319,9 @@ public class OpenFlowHostProviderTest { ...@@ -319,9 +319,9 @@ public class OpenFlowHostProviderTest {
319 // just things we (and serializers) need 319 // just things we (and serializers) need
320 ARP arp = new ARP(); 320 ARP arp = new ARP();
321 arp.setSenderProtocolAddress(IP) 321 arp.setSenderProtocolAddress(IP)
322 - .setSenderHardwareAddress(MAC.toBytes()) 322 + .setSenderHardwareAddress(MAC.toBytes())
323 - .setTargetHardwareAddress(BCMAC.toBytes()) 323 + .setTargetHardwareAddress(BCMAC.toBytes())
324 - .setTargetProtocolAddress(IP); 324 + .setTargetProtocolAddress(IP);
325 325
326 Ethernet eth = new Ethernet(); 326 Ethernet eth = new Ethernet();
327 eth.setEtherType(Ethernet.TYPE_ARP) 327 eth.setEtherType(Ethernet.TYPE_ARP)
......