Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next

pankaj
Commit eab2988c06beeb69e0dac3f469c3a24a235f9d74 eab2988c 2 parents ea0acefa e279be89
Showing 5 changed files with 23 additions and 5 deletions
apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyServer.java
core/net/src/test/java/org/onlab/onos/net/host/impl/HostMonitorTest.java
core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/DistributedClusterStore.java
core/store/dist/src/main/java/org/onlab/onos/store/cluster/messaging/impl/ClusterCommunicationManager.java
features/features.xml
--- a/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyServer.java
View file @eab2988
+++ b/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyServer.java
View file @eab2988
@@ -8,7 +8,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Test to measure Messaging performance.
  */
-    public class SimpleNettyServer {
+    public final class SimpleNettyServer {
         private static Logger log = LoggerFactory.getLogger(IOLoopTestServer.class);
             private SimpleNettyServer() {}
--- a/core/net/src/test/java/org/onlab/onos/net/host/impl/HostMonitorTest.java
View file @eab2988
+++ b/core/net/src/test/java/org/onlab/onos/net/host/impl/HostMonitorTest.java
View file @eab2988
@@ -13,6 +13,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.onlab.onos.net.ConnectPoint;
 import org.onlab.onos.net.Device;
@@ -52,6 +53,7 @@ public class HostMonitorTest {
     private HostMonitor hostMonitor;
     @Test
+    @Ignore
     public void testMonitorHostExists() throws Exception {
         ProviderId id = new ProviderId("fake://", "id");
@@ -81,6 +83,7 @@ public class HostMonitorTest {
     }
     @Test
+    @Ignore
     public void testMonitorHostDoesNotExist() throws Exception {
         HostManager hostManager = createMock(HostManager.class);
--- a/core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/DistributedClusterStore.java
View file @eab2988
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/DistributedClusterStore.java
View file @eab2988
@@ -7,11 +7,9 @@ import com.google.common.cache.RemovalNotification;
 import com.google.common.collect.ImmutableSet;
 import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.apache.felix.scr.annotations.Service;
 import org.onlab.onos.cluster.ClusterEvent;
 import org.onlab.onos.cluster.ClusterStore;
 import org.onlab.onos.cluster.ClusterStoreDelegate;
@@ -37,8 +35,8 @@ import static org.onlab.packet.IpPrefix.valueOf;
 /**
  * Distributed implementation of the cluster nodes store.
  */
-@Component(immediate = true)
+//@Component(immediate = true)
-@Service
+//@Service
 public class DistributedClusterStore
         extends AbstractStore<ClusterEvent, ClusterStoreDelegate>
         implements ClusterStore {
--- a/core/store/dist/src/main/java/org/onlab/onos/store/cluster/messaging/impl/ClusterCommunicationManager.java
View file @eab2988
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/cluster/messaging/impl/ClusterCommunicationManager.java
View file @eab2988
@@ -12,7 +12,10 @@ import java.util.TimerTask;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.Service;
+import org.onlab.onos.cluster.ClusterService;
 import org.onlab.onos.cluster.ControllerNode;
 import org.onlab.onos.cluster.NodeId;
 import org.onlab.onos.store.cluster.impl.ClusterMembershipEvent;
@@ -42,6 +45,10 @@ public class ClusterCommunicationManager
     private final Logger log = LoggerFactory.getLogger(getClass());
     private ControllerNode localNode;
+
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+    private ClusterService clusterService;
+
     private ClusterNodesDelegate nodesDelegate;
     // FIXME: `members` should go away and should be using ClusterService
     private Map<NodeId, ControllerNode> members = new HashMap<>();
@@ -65,6 +72,7 @@ public class ClusterCommunicationManager
     @Activate
     public void activate() {
+        localNode = clusterService.getLocalNode();
         messagingService = new NettyMessagingService(localNode.tcpPort());
         log.info("Started");
     }
--- a/features/features.xml
View file @eab2988
+++ b/features/features.xml
View file @eab2988
@@ -9,6 +9,12 @@
         <bundle>mvn:org.apache.commons/commons-lang3/3.3.2</bundle>
         <bundle>mvn:com.google.guava/guava/18.0</bundle>
         <bundle>mvn:io.netty/netty/3.9.2.Final</bundle>
+        <bundle>mvn:io.netty/netty-common/4.0.23.Final</bundle>
+        <bundle>mvn:io.netty/netty-buffer/4.0.23.Final</bundle>
+        <bundle>mvn:io.netty/netty-transport/4.0.23.Final</bundle>
+        <bundle>mvn:io.netty/netty-handler/4.0.23.Final</bundle>
+        <bundle>mvn:io.netty/netty-codec/4.0.23.Final</bundle>
+        <bundle>mvn:commons-pool/commons-pool/1.6</bundle>
         <bundle>mvn:com.hazelcast/hazelcast/3.3</bundle>
         <bundle>mvn:io.dropwizard.metrics/metrics-core/3.1.0</bundle>
@@ -55,6 +61,9 @@
         <bundle>mvn:org.onlab.onos/onos-core-dist/1.0.0-SNAPSHOT</bundle>
         <bundle>mvn:org.onlab.onos/onos-core-serializers/1.0.0-SNAPSHOT</bundle>
         <bundle>mvn:org.onlab.onos/onlab-netty/1.0.0-SNAPSHOT</bundle>
+
+        <bundle>mvn:org.onlab.onos/onos-core-hz-common/1.0.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.onlab.onos/onos-core-hz-cluster/1.0.0-SNAPSHOT</bundle>
     </feature>
     <feature name="onos-core-hazelcast" version="1.0.0"