commit 00e92da4557967c37c7dc8cc29a4778ecb362964
author Jordan Halterman <jordan@opennetworking.org> Tue May 22 23:05:52 2018 -0700
committer Thomas Vachuska <tom@opennetworking.org> Fri Jul 27 15:40:26 2018 +0000
tree d31fcb3643e95fb740ca7e21d91d23cbbf63c311
parent dd5a7bfc64d930767bb29485939f5ee5ea9f0d0c

Upgrade to Atomix 3.0-rc5
* Upgrade Raft primitives to Atomix 3.0
* Replace cluster store and messaging implementations with Atomix cluster management/messaging
* Add test scripts for installing/starting Atomix cluster
* Replace core primitives with Atomix primitives.

Change-Id: I7623653c81292a34f21b01f5f38ca11b5ef15cad

core/common/src/test/java/org/onosproject/store/trivial/SimpleClusterStore.java

diff --git a/core/common/src/test/java/org/onosproject/store/trivial/SimpleClusterStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleClusterStore.java
index 4a4fdaf..251e413 100644
--- a/core/common/src/test/java/org/onosproject/store/trivial/SimpleClusterStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleClusterStore.java
@@ -29,6 +29,7 @@
 import org.onosproject.cluster.ClusterStoreDelegate;
 import org.onosproject.cluster.ControllerNode;
 import org.onosproject.cluster.DefaultControllerNode;
+import org.onosproject.cluster.Node;
 import org.onosproject.cluster.NodeId;
 import org.onosproject.core.Version;
 import org.onosproject.core.VersionService;
@@ -103,6 +104,11 @@
     }
 
     @Override
+    public Set<Node> getStorageNodes() {
+        return ImmutableSet.of();
+    }
+
+    @Override
     public ControllerNode getNode(NodeId nodeId) {
         return instance.id().equals(nodeId) ? instance : null;
     }

core/common/src/test/java/org/onosproject/store/trivial/SimpleMastershipStore.java

diff --git a/core/common/src/test/java/org/onosproject/store/trivial/SimpleMastershipStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleMastershipStore.java
index d4df583..d52db14 100644
--- a/core/common/src/test/java/org/onosproject/store/trivial/SimpleMastershipStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleMastershipStore.java
@@ -45,6 +45,7 @@
 import org.onosproject.cluster.ControllerNode;
 import org.onosproject.cluster.ControllerNode.State;
 import org.onosproject.cluster.DefaultControllerNode;
+import org.onosproject.cluster.Node;
 import org.onosproject.cluster.NodeId;
 import org.onosproject.cluster.RoleInfo;
 import org.onosproject.core.Version;
@@ -113,6 +114,11 @@
                 }
 
                 @Override
+                public Set<Node> getConsensusNodes() {
+                    return ImmutableSet.of();
+                }
+
+                @Override
                 public ControllerNode getNode(NodeId nodeId) {
                     if (instance.id().equals(nodeId)) {
                         return instance;