commit 052a6c596251e3a9c2bc4173a59d5905a71ad3b5
author Jonathan Hart <jono@onlab.us> Thu Jul 16 14:10:10 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Mon Jul 20 17:20:14 2015 +0000
tree e62f5af6c816d39a26157310b9bc3d1384c10188
parent a0d1249915a52cd612e07bfc08d87f10fe4a7a95

Fix establishing local identity with wrong IP address.

ONOS-2406.

Ported from onos-1.2 branch.

Change-Id: I4eda4eeb5ed3218d1063102db4794a535cb9002f
(cherry picked from commit 3dbf89d609afc12551106f91e91eba43cc267362)

core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterDefinitionManager.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterDefinitionManager.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterDefinitionManager.java
index eb80669..4e28e3c 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterDefinitionManager.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterDefinitionManager.java
@@ -1,20 +1,7 @@
 package org.onosproject.store.cluster.impl;
 
-import static java.net.NetworkInterface.getNetworkInterfaces;
-import static java.util.Collections.list;
-import static org.onosproject.cluster.DefaultControllerNode.DEFAULT_PORT;
-import static org.onosproject.store.consistent.impl.DatabaseManager.PARTITION_DEFINITION_FILE;
-import static org.slf4j.LoggerFactory.getLogger;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.util.Enumeration;
-import java.util.Set;
-import java.util.stream.Collectors;
-
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
@@ -28,8 +15,20 @@
 import org.onosproject.store.consistent.impl.DatabaseDefinitionStore;
 import org.slf4j.Logger;
 
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
+import java.io.File;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.Enumeration;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static java.net.NetworkInterface.getNetworkInterfaces;
+import static java.util.Collections.list;
+import static org.onosproject.cluster.DefaultControllerNode.DEFAULT_PORT;
+import static org.onosproject.store.consistent.impl.DatabaseManager.PARTITION_DEFINITION_FILE;
+import static org.slf4j.LoggerFactory.getLogger;
 
 /**
  * Implementation of ClusterDefinitionService.
@@ -113,7 +112,10 @@
             Enumeration<InetAddress> inetAddresses = iface.getInetAddresses();
             while (inetAddresses.hasMoreElements()) {
                 IpAddress ip = IpAddress.valueOf(inetAddresses.nextElement());
-                if (matchInterface(ip.toString(), clusterDefinition.getIpPrefix())) {
+                if (clusterDefinition.getNodes().stream()
+                        .map(NodeInfo::getIp)
+                        .map(IpAddress::valueOf)
+                        .anyMatch(nodeIp -> ip.equals(nodeIp))) {
                     return ip;
                 }
             }