commit 2b3ed3e376cac63f0e139107692823d0e8de57f0
author Jordan Halterman <jordan@opennetworking.org> Tue Nov 27 14:38:37 2018 -0800
committer Thomas Vachuska <tom@opennetworking.org> Wed Nov 28 18:49:08 2018 +0000
tree 7bbdcb5ca9084ef32daee75bf20650908c52f785
parent 239f96bd544537e3b92fd4cfa24666ce283b3b1c

Upgrade to Atomix 3.1.0-beta3

Change-Id: Ic55798690b89db8b9e866d7ecae47d746d0e89c2

core/store/primitives/BUILD

diff --git a/core/store/primitives/BUILD b/core/store/primitives/BUILD
index 0cb83ef..ea85222 100644
--- a/core/store/primitives/BUILD
+++ b/core/store/primitives/BUILD
@@ -21,6 +21,7 @@
     "iterator",
     "list",
     "lock",
+    "log",
     "map",
     "multimap",
     "multiset",
@@ -49,7 +50,7 @@
 ])
 
 # A list of all core protocol packages for dynamic class loading
-PROTOCOL_PACKAGES = ",".join(["io.atomix.primitive.partition.impl"] + ["io.atomix.protocols.{protocol},io.atomix.protocols.{protocol}.partition".format(protocol = protocol) for protocol in _protocol_package_names] + ["io.atomix.protocols.gossip"])
+PROTOCOL_PACKAGES = ",".join(["io.atomix.primitive.partition.impl"] + ["io.atomix.protocols.{protocol},io.atomix.protocols.{protocol}.partition".format(protocol = protocol) for protocol in _protocol_package_names])
 
 # A list of all additional core packages used in dynamic class loading
 CORE_PACKAGES = ",".join([

core/store/primitives/src/main/java/org/onosproject/store/atomix/impl/AtomixManager.java

diff --git a/core/store/primitives/src/main/java/org/onosproject/store/atomix/impl/AtomixManager.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/impl/AtomixManager.java
index 1135fda..c46ce87 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/atomix/impl/AtomixManager.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/impl/AtomixManager.java
@@ -15,6 +15,7 @@
  */
 package org.onosproject.store.atomix.impl;
 
+import io.atomix.cluster.Node;
 import io.atomix.cluster.discovery.BootstrapDiscoveryProvider;
 import io.atomix.core.Atomix;
 import io.atomix.protocols.raft.partition.RaftPartitionGroup;
@@ -76,13 +77,15 @@
             return Atomix.builder(getClass().getClassLoader())
                 .withClusterId(metadata.getName())
                 .withMemberId(metadataService.getLocalNode().id().id())
-                .withAddress(metadataService.getLocalNode().host(), metadataService.getLocalNode().tcpPort())
+                .withHost(metadata.getLocalNode().host())
+                .withPort(metadata.getLocalNode().tcpPort())
                 .withProperty("type", "onos")
                 .withMembershipProvider(BootstrapDiscoveryProvider.builder()
                     .withNodes(metadata.getStorageNodes().stream()
-                        .map(node -> io.atomix.cluster.Node.builder()
+                        .map(node -> Node.builder()
                             .withId(node.id().id())
-                            .withAddress(node.host(), node.tcpPort())
+                            .withHost(node.host())
+                            .withPort(node.tcpPort())
                             .build())
                         .collect(Collectors.toList()))
                     .build())
@@ -101,13 +104,15 @@
             return Atomix.builder(getClass().getClassLoader())
                 .withClusterId(metadata.getName())
                 .withMemberId(metadataService.getLocalNode().id().id())
-                .withAddress(metadataService.getLocalNode().host(), metadataService.getLocalNode().tcpPort())
+                .withHost(metadata.getLocalNode().host())
+                .withPort(metadata.getLocalNode().tcpPort())
                 .withProperty("type", "onos")
                 .withMembershipProvider(BootstrapDiscoveryProvider.builder()
                     .withNodes(metadata.getControllerNodes().stream()
                         .map(node -> io.atomix.cluster.Node.builder()
                             .withId(node.id().id())
-                            .withAddress(node.host(), node.tcpPort())
+                            .withHost(node.host())
+                            .withPort(node.tcpPort())
                             .build())
                         .collect(Collectors.toList()))
                     .build())