commit e458f004537c1a541d5dd2d7df7b09f1123b8f38
author Jordan Halterman <jordan@opennetworking.org> Tue Sep 18 17:42:05 2018 -0700
committer Ray Milkey <ray@opennetworking.org> Tue Sep 25 16:04:28 2018 +0000
tree 8789fb145475c810942c01dc9918fc482d33b0b5
parent e7013e96ff67d367d11be1f4c0fb03cbc9baf67a

Support hostname resolution for cluster configuration

Change-Id: I9afb97bfba05366fa63dc7b9022b914bd2d1cce0
(cherry picked from commit 97cd95d5a2a7a1bf1f3bfd3091f2d66f747eee33)

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 ba66372..8df1a40 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
@@ -78,13 +78,13 @@
             return Atomix.builder(getClass().getClassLoader())
                 .withClusterId(metadata.getName())
                 .withMemberId(metadataService.getLocalNode().id().id())
-                .withAddress(metadataService.getLocalNode().ip().toString(), metadataService.getLocalNode().tcpPort())
+                .withAddress(metadataService.getLocalNode().host(), metadataService.getLocalNode().tcpPort())
                 .withProperty("type", "onos")
                 .withMembershipProvider(BootstrapDiscoveryProvider.builder()
                     .withNodes(metadata.getStorageNodes().stream()
                         .map(node -> io.atomix.cluster.Node.builder()
                             .withId(node.id().id())
-                            .withAddress(node.ip().toString(), node.tcpPort())
+                            .withAddress(node.host(), node.tcpPort())
                             .build())
                         .collect(Collectors.toList()))
                     .build())
@@ -103,13 +103,13 @@
             return Atomix.builder(getClass().getClassLoader())
                 .withClusterId(metadata.getName())
                 .withMemberId(metadataService.getLocalNode().id().id())
-                .withAddress(metadataService.getLocalNode().ip().toString(), metadataService.getLocalNode().tcpPort())
+                .withAddress(metadataService.getLocalNode().host(), metadataService.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.ip().toString(), node.tcpPort())
+                            .withAddress(node.host(), node.tcpPort())
                             .build())
                         .collect(Collectors.toList()))
                     .build())