Showing
2 changed files
with
10 additions
and
7 deletions
... | @@ -2,7 +2,6 @@ package org.onlab.onos.net.device.impl; | ... | @@ -2,7 +2,6 @@ package org.onlab.onos.net.device.impl; |
2 | 2 | ||
3 | import org.junit.After; | 3 | import org.junit.After; |
4 | import org.junit.Before; | 4 | import org.junit.Before; |
5 | -import org.junit.Ignore; | ||
6 | import org.junit.Test; | 5 | import org.junit.Test; |
7 | import org.onlab.onos.event.Event; | 6 | import org.onlab.onos.event.Event; |
8 | import org.onlab.onos.net.Device; | 7 | import org.onlab.onos.net.Device; |
... | @@ -46,7 +45,6 @@ import static org.onlab.onos.net.device.DeviceEvent.Type.*; | ... | @@ -46,7 +45,6 @@ import static org.onlab.onos.net.device.DeviceEvent.Type.*; |
46 | /** | 45 | /** |
47 | * Test codifying the device service & device provider service contracts. | 46 | * Test codifying the device service & device provider service contracts. |
48 | */ | 47 | */ |
49 | -@Ignore | ||
50 | public class DistributedDeviceManagerTest { | 48 | public class DistributedDeviceManagerTest { |
51 | 49 | ||
52 | private static final ProviderId PID = new ProviderId("of", "foo"); | 50 | private static final ProviderId PID = new ProviderId("of", "foo"); |
... | @@ -84,8 +82,12 @@ public class DistributedDeviceManagerTest { | ... | @@ -84,8 +82,12 @@ public class DistributedDeviceManagerTest { |
84 | // avoid accidentally joining other cluster | 82 | // avoid accidentally joining other cluster |
85 | config.getGroupConfig().setName(UUID.randomUUID().toString()); | 83 | config.getGroupConfig().setName(UUID.randomUUID().toString()); |
86 | // quickly form single node cluster | 84 | // quickly form single node cluster |
87 | - config.getNetworkConfig().getJoin().getMulticastConfig() | 85 | + config.getNetworkConfig().getJoin() |
88 | - .setMulticastTimeoutSeconds(0); | 86 | + .getTcpIpConfig() |
87 | + .setEnabled(true).setConnectionTimeoutSeconds(0); | ||
88 | + config.getNetworkConfig().getJoin() | ||
89 | + .getMulticastConfig() | ||
90 | + .setEnabled(false); | ||
89 | dstore.theInstance = Hazelcast.newHazelcastInstance(config); | 91 | dstore.theInstance = Hazelcast.newHazelcastInstance(config); |
90 | dstore.activate(); | 92 | dstore.activate(); |
91 | mgr.store = dstore; | 93 | mgr.store = dstore; | ... | ... |
... | @@ -115,6 +115,7 @@ public class OpenFlowDeviceProviderTest { | ... | @@ -115,6 +115,7 @@ public class OpenFlowDeviceProviderTest { |
115 | .setDesc(PD3) | 115 | .setDesc(PD3) |
116 | .build(); | 116 | .build(); |
117 | controller.listener.portChanged(DPID1, stat); | 117 | controller.listener.portChanged(DPID1, stat); |
118 | + assertNotNull("never went throught the provider service", registry.descr); | ||
118 | assertEquals("port status unhandled", 3, registry.ports.get(DID1).size()); | 119 | assertEquals("port status unhandled", 3, registry.ports.get(DID1).size()); |
119 | } | 120 | } |
120 | 121 | ||
... | @@ -129,6 +130,7 @@ public class OpenFlowDeviceProviderTest { | ... | @@ -129,6 +130,7 @@ public class OpenFlowDeviceProviderTest { |
129 | DeviceProvider provider; | 130 | DeviceProvider provider; |
130 | Set<DeviceId> connected = new HashSet<DeviceId>(); | 131 | Set<DeviceId> connected = new HashSet<DeviceId>(); |
131 | Multimap<DeviceId, PortDescription> ports = HashMultimap.create(); | 132 | Multimap<DeviceId, PortDescription> ports = HashMultimap.create(); |
133 | + PortDescription descr = null; | ||
132 | 134 | ||
133 | @Override | 135 | @Override |
134 | public DeviceProviderService register(DeviceProvider provider) { | 136 | public DeviceProviderService register(DeviceProvider provider) { |
... | @@ -175,9 +177,8 @@ public class OpenFlowDeviceProviderTest { | ... | @@ -175,9 +177,8 @@ public class OpenFlowDeviceProviderTest { |
175 | @Override | 177 | @Override |
176 | public void portStatusChanged(DeviceId deviceId, | 178 | public void portStatusChanged(DeviceId deviceId, |
177 | PortDescription portDescription) { | 179 | PortDescription portDescription) { |
178 | - System.err.println(deviceId + ":" + portDescription.toString()); | 180 | + ports.put(deviceId, portDescription); |
179 | - | 181 | + descr = portDescription; |
180 | - System.err.println(ports.put(deviceId, portDescription)); | ||
181 | } | 182 | } |
182 | 183 | ||
183 | } | 184 | } | ... | ... |
-
Please register or login to post a comment