Merge remote-tracking branch 'origin/master'

@@ -2,7 +2,6 @@ package org.onlab.onos.net.device.impl;
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.onlab.onos.event.Event;
 import org.onlab.onos.net.Device;
@@ -46,7 +45,6 @@ import static org.onlab.onos.net.device.DeviceEvent.Type.*;
 /**
  * Test codifying the device service & device provider service contracts.
  */
-@Ignore
 public class DistributedDeviceManagerTest {
 
     private static final ProviderId PID = new ProviderId("of", "foo");
@@ -84,8 +82,12 @@ public class DistributedDeviceManagerTest {
         // avoid accidentally joining other cluster
         config.getGroupConfig().setName(UUID.randomUUID().toString());
         // quickly form single node cluster
-        config.getNetworkConfig().getJoin().getMulticastConfig()
-            .setMulticastTimeoutSeconds(0);
+        config.getNetworkConfig().getJoin()
+            .getTcpIpConfig()
+            .setEnabled(true).setConnectionTimeoutSeconds(0);
+        config.getNetworkConfig().getJoin()
+            .getMulticastConfig()
+            .setEnabled(false);
         dstore.theInstance = Hazelcast.newHazelcastInstance(config);
         dstore.activate();
         mgr.store = dstore;

@@ -115,6 +115,7 @@ public class OpenFlowDeviceProviderTest {
                 .setDesc(PD3)
                 .build();
         controller.listener.portChanged(DPID1, stat);
+        assertNotNull("never went throught the provider service", registry.descr);
         assertEquals("port status unhandled", 3, registry.ports.get(DID1).size());
     }
 
@@ -129,6 +130,7 @@ public class OpenFlowDeviceProviderTest {
         DeviceProvider provider;
         Set<DeviceId> connected = new HashSet<DeviceId>();
         Multimap<DeviceId, PortDescription> ports = HashMultimap.create();
+        PortDescription descr = null;
 
         @Override
         public DeviceProviderService register(DeviceProvider provider) {
@@ -175,9 +177,8 @@ public class OpenFlowDeviceProviderTest {
             @Override
             public void portStatusChanged(DeviceId deviceId,
                     PortDescription portDescription) {
-                System.err.println(deviceId + ":" + portDescription.toString());
-
-                System.err.println(ports.put(deviceId, portDescription));
+                ports.put(deviceId, portDescription);
+                descr = portDescription;
             }
 
         }