홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Gerrit Code Review
1cbd65e1 1 parent 7a81b539

Fixing null provider defects. 

Change-Id: I3a4df1d5821e1961e1c70270a6be3642d0c3a60e
Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
...@@ -329,10 +329,10 @@ public class NullProviders { ...@@ -329,10 +329,10 @@ public class NullProviders {
329 new DefaultServiceDirectory(), 329 new DefaultServiceDirectory(),
330 deviceProviderService, hostProviderService, 330 deviceProviderService, hostProviderService,
331 linkProviderService); 331 linkProviderService);
332 - simulator.setUpTopology();
333 flowRuleProvider.start(flowRuleProviderService); 332 flowRuleProvider.start(flowRuleProviderService);
334 packetProvider.start(packetRate, hostService, deviceService, 333 packetProvider.start(packetRate, hostService, deviceService,
335 packetProviderService); 334 packetProviderService);
335 + simulator.setUpTopology();
336 topologyMutationDriver.start(mutationRate, linkService, deviceService, 336 topologyMutationDriver.start(mutationRate, linkService, deviceService,
337 linkProviderService, deviceProviderService, 337 linkProviderService, deviceProviderService,
338 simulator); 338 simulator);
......
...@@ -230,7 +230,7 @@ public abstract class TopologySimulator { ...@@ -230,7 +230,7 @@ public abstract class TopologySimulator {
230 */ 230 */
231 protected void createHosts(DeviceId deviceId, int portOffset) { 231 protected void createHosts(DeviceId deviceId, int portOffset) {
232 String s = deviceId.toString(); 232 String s = deviceId.toString();
233 - byte dByte = Byte.parseByte(s.substring(s.length() - 1), 16); 233 + byte dByte = Byte.parseByte(s.substring(s.length() - 2), 16);
234 // TODO: this limits the simulation to 256 devices & 256 hosts/device. 234 // TODO: this limits the simulation to 256 devices & 256 hosts/device.
235 byte[] macBytes = new byte[]{0, 0, 0, 0, dByte, 0}; 235 byte[] macBytes = new byte[]{0, 0, 0, 0, dByte, 0};
236 byte[] ipBytes = new byte[]{(byte) 192, (byte) 168, dByte, 0}; 236 byte[] ipBytes = new byte[]{(byte) 192, (byte) 168, dByte, 0};
......