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/dist/src/test/java/org/onosproject/store/cluster/messaging/impl/NettyMessagingManagerTest.java

diff --git a/core/store/dist/src/test/java/org/onosproject/store/cluster/messaging/impl/NettyMessagingManagerTest.java b/core/store/dist/src/test/java/org/onosproject/store/cluster/messaging/impl/NettyMessagingManagerTest.java
index ac8a9bc..8cfa7ff 100644
--- a/core/store/dist/src/test/java/org/onosproject/store/cluster/messaging/impl/NettyMessagingManagerTest.java
+++ b/core/store/dist/src/test/java/org/onosproject/store/cluster/messaging/impl/NettyMessagingManagerTest.java
@@ -257,11 +257,21 @@
                     }
 
                     @Override
+                    public String host() {
+                        return ipAddress;
+                    }
+
+                    @Override
                     public IpAddress ip() {
                         return IpAddress.valueOf(ipAddress);
                     }
 
                     @Override
+                    public IpAddress ip(boolean resolve) {
+                        return ip();
+                    }
+
+                    @Override
                     public int tcpPort() {
                         return ep.port();
                     }

core/store/dist/src/test/java/org/onosproject/store/flow/impl/DistributedFlowRuleStoreTest.java

diff --git a/core/store/dist/src/test/java/org/onosproject/store/flow/impl/DistributedFlowRuleStoreTest.java b/core/store/dist/src/test/java/org/onosproject/store/flow/impl/DistributedFlowRuleStoreTest.java
index ceac0c2..9b9c4db 100644
--- a/core/store/dist/src/test/java/org/onosproject/store/flow/impl/DistributedFlowRuleStoreTest.java
+++ b/core/store/dist/src/test/java/org/onosproject/store/flow/impl/DistributedFlowRuleStoreTest.java
@@ -25,6 +25,7 @@
 import org.junit.Ignore;
 import org.junit.Test;
 import org.onlab.packet.Ip4Address;
+import org.onlab.packet.IpAddress;
 import org.onosproject.cluster.ClusterService;
 import org.onosproject.cluster.ControllerNode;
 import org.onosproject.cluster.NodeId;
@@ -126,11 +127,21 @@
         }
 
         @Override
+        public String host() {
+            return "127.0.0.1";
+        }
+
+        @Override
         public Ip4Address ip() {
             return Ip4Address.valueOf("127.0.0.1");
         }
 
         @Override
+        public IpAddress ip(boolean resolve) {
+            return ip();
+        }
+
+        @Override
         public int tcpPort() {
             return 0;
         }

core/store/dist/src/test/java/org/onosproject/store/flow/impl/ECFlowRuleStoreTest.java

diff --git a/core/store/dist/src/test/java/org/onosproject/store/flow/impl/ECFlowRuleStoreTest.java b/core/store/dist/src/test/java/org/onosproject/store/flow/impl/ECFlowRuleStoreTest.java
index 72562f9..0dfc2a2 100644
--- a/core/store/dist/src/test/java/org/onosproject/store/flow/impl/ECFlowRuleStoreTest.java
+++ b/core/store/dist/src/test/java/org/onosproject/store/flow/impl/ECFlowRuleStoreTest.java
@@ -22,6 +22,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import org.onlab.packet.IpAddress;
 import org.onosproject.cfg.ComponentConfigAdapter;
 import org.onosproject.cluster.NodeId;
 import org.onosproject.cluster.ClusterService;
@@ -137,11 +138,21 @@
         }
 
         @Override
+        public String host() {
+            return "127.0.0.1";
+        }
+
+        @Override
         public Ip4Address ip() {
             return Ip4Address.valueOf("127.0.0.1");
         }
 
         @Override
+        public IpAddress ip(boolean resolve) {
+            return ip();
+        }
+
+        @Override
         public int tcpPort() {
             return 0;
         }

core/store/dist/src/test/java/org/onosproject/store/statistic/impl/DistributedStatisticStoreTest.java

diff --git a/core/store/dist/src/test/java/org/onosproject/store/statistic/impl/DistributedStatisticStoreTest.java b/core/store/dist/src/test/java/org/onosproject/store/statistic/impl/DistributedStatisticStoreTest.java
index 4691df9..ad4baf7 100644
--- a/core/store/dist/src/test/java/org/onosproject/store/statistic/impl/DistributedStatisticStoreTest.java
+++ b/core/store/dist/src/test/java/org/onosproject/store/statistic/impl/DistributedStatisticStoreTest.java
@@ -135,7 +135,12 @@
         }
 
         @Override
-        public Ip4Address ip() {
+        public String host() {
+            return "127.0.0.1";
+        }
+
+        @Override
+        public Ip4Address ip(boolean resolve) {
             return Ip4Address.valueOf("127.0.0.1");
         }