commit 444b519327cfd4636f76b0165451ff25b28aedf5
author Pavlin Radoslavov <pavlin@onlab.us> Tue Oct 28 10:45:19 2014 -0700
committer Pavlin Radoslavov <pavlin@onlab.us> Tue Oct 28 10:45:19 2014 -0700
tree 29afd2ef9f5c87e46ec6dbbee13f13931032cf0a
parent d35961bc18a86e3003fe55e70cf9ad7c0b52b6a9

Replaced the usage of IpPrefix with IpAddress in the context of
Controller Nodes.

Change-Id: Id2b25fb071bb20541db3f77b7afefe886520538e

core/api/src/main/java/org/onlab/onos/cluster/ClusterAdminService.java

diff --git a/core/api/src/main/java/org/onlab/onos/cluster/ClusterAdminService.java b/core/api/src/main/java/org/onlab/onos/cluster/ClusterAdminService.java
index 73137e1..997de08 100644
--- a/core/api/src/main/java/org/onlab/onos/cluster/ClusterAdminService.java
+++ b/core/api/src/main/java/org/onlab/onos/cluster/ClusterAdminService.java
@@ -1,6 +1,6 @@
 package org.onlab.onos.cluster;
 
-import org.onlab.packet.IpPrefix;
+import org.onlab.packet.IpAddress;
 
 /**
  * Service for administering the cluster node membership.
@@ -15,7 +15,7 @@
      * @param tcpPort tcp listen port
      * @return newly added node
      */
-    ControllerNode addNode(NodeId nodeId, IpPrefix ip, int tcpPort);
+    ControllerNode addNode(NodeId nodeId, IpAddress ip, int tcpPort);
 
     /**
      * Removes the specified node from the cluster node list.

core/api/src/main/java/org/onlab/onos/cluster/ClusterStore.java

diff --git a/core/api/src/main/java/org/onlab/onos/cluster/ClusterStore.java b/core/api/src/main/java/org/onlab/onos/cluster/ClusterStore.java
index 3725706..debb38a 100644
--- a/core/api/src/main/java/org/onlab/onos/cluster/ClusterStore.java
+++ b/core/api/src/main/java/org/onlab/onos/cluster/ClusterStore.java
@@ -1,7 +1,7 @@
 package org.onlab.onos.cluster;
 
 import org.onlab.onos.store.Store;
-import org.onlab.packet.IpPrefix;
+import org.onlab.packet.IpAddress;
 
 import java.util.Set;
 
@@ -48,7 +48,7 @@
      * @param tcpPort tcp listen port
      * @return newly added node
      */
-    ControllerNode addNode(NodeId nodeId, IpPrefix ip, int tcpPort);
+    ControllerNode addNode(NodeId nodeId, IpAddress ip, int tcpPort);
 
     /**
      * Removes the specified node from the inventory of cluster nodes.

core/api/src/main/java/org/onlab/onos/cluster/ControllerNode.java

diff --git a/core/api/src/main/java/org/onlab/onos/cluster/ControllerNode.java b/core/api/src/main/java/org/onlab/onos/cluster/ControllerNode.java
index 33fe1c9..00e3346 100644
--- a/core/api/src/main/java/org/onlab/onos/cluster/ControllerNode.java
+++ b/core/api/src/main/java/org/onlab/onos/cluster/ControllerNode.java
@@ -1,6 +1,6 @@
 package org.onlab.onos.cluster;
 
-import org.onlab.packet.IpPrefix;
+import org.onlab.packet.IpAddress;
 
 /**
  * Represents a controller instance as a member in a cluster.
@@ -33,7 +33,7 @@
      *
      * @return IP address
      */
-    IpPrefix ip();
+    IpAddress ip();
 
 
     /**

core/api/src/main/java/org/onlab/onos/cluster/DefaultControllerNode.java

diff --git a/core/api/src/main/java/org/onlab/onos/cluster/DefaultControllerNode.java b/core/api/src/main/java/org/onlab/onos/cluster/DefaultControllerNode.java
index d23b7a3..6cb4f24 100644
--- a/core/api/src/main/java/org/onlab/onos/cluster/DefaultControllerNode.java
+++ b/core/api/src/main/java/org/onlab/onos/cluster/DefaultControllerNode.java
@@ -1,6 +1,6 @@
 package org.onlab.onos.cluster;
 
-import org.onlab.packet.IpPrefix;
+import org.onlab.packet.IpAddress;
 
 import java.util.Objects;
 
@@ -14,7 +14,7 @@
     private static final int DEFAULT_PORT = 9876;
 
     private final NodeId id;
-    private final IpPrefix ip;
+    private final IpAddress ip;
     private final int tcpPort;
 
     // For serialization
@@ -30,7 +30,7 @@
      * @param id instance identifier
      * @param ip instance IP address
      */
-    public DefaultControllerNode(NodeId id, IpPrefix ip) {
+    public DefaultControllerNode(NodeId id, IpAddress ip) {
         this(id, ip, DEFAULT_PORT);
     }
 
@@ -40,7 +40,7 @@
      * @param id instance identifier
      * @param ip instance IP address
      */
-    public DefaultControllerNode(NodeId id, IpPrefix ip, int tcpPort) {
+    public DefaultControllerNode(NodeId id, IpAddress ip, int tcpPort) {
         this.id = id;
         this.ip = ip;
         this.tcpPort = tcpPort;
@@ -52,7 +52,7 @@
     }
 
     @Override
-    public IpPrefix ip() {
+    public IpAddress ip() {
         return ip;
     }