commit 1c7b38e6aa26dc8022293a843880700dd184db22
author Ayaka Koshibe <ayaka@onlab.us> Thu Sep 11 13:09:51 2014 -0700
committer Ayaka Koshibe <ayaka@onlab.us> Thu Sep 11 13:09:51 2014 -0700
tree 34653a4ee276183f390bebf195a886b601790a61
parent e5652756ecba0f5f5c82e937f8bde4bdc0df5c78

added IPAddress construct

Change-Id: Idc57a22b568b33503c78254222d52fbfc19b0b72

core/api/src/main/java/org/onlab/onos/net/host/DefaultHostDescription.java

diff --git a/core/api/src/main/java/org/onlab/onos/net/host/DefaultHostDescription.java b/core/api/src/main/java/org/onlab/onos/net/host/DefaultHostDescription.java
index c3653e6..2acdc75 100644
--- a/core/api/src/main/java/org/onlab/onos/net/host/DefaultHostDescription.java
+++ b/core/api/src/main/java/org/onlab/onos/net/host/DefaultHostDescription.java
@@ -6,7 +6,7 @@
 import java.util.Set;
 
 import org.onlab.onos.net.HostLocation;
-import org.onlab.packet.IPv4;
+import org.onlab.packet.IPAddress;
 import org.onlab.packet.MACAddress;
 
 import com.google.common.collect.ImmutableSet;
@@ -16,14 +16,14 @@
     private final MACAddress mac;
     private final short vlan;
     private final HostLocation location;
-    private final Set<IPv4> ips;
+    private final Set<IPAddress> ips;
 
     public DefaultHostDescription(MACAddress mac, short vlan,
-            HostLocation loc, Set<IPv4> ips) {
+            HostLocation loc, Set<IPAddress> ips) {
         this.mac = mac;
         this.vlan = vlan;
         this.location = loc;
-        this.ips = new HashSet<IPv4>(ips);
+        this.ips = new HashSet<IPAddress>(ips);
     }
 
     @Override
@@ -42,7 +42,7 @@
     }
 
     @Override
-    public Set<IPv4> ipAddresses() {
+    public Set<IPAddress> ipAddresses() {
         return ImmutableSet.copyOf(ips);
     }
 

core/api/src/main/java/org/onlab/onos/net/host/HostDescription.java

diff --git a/core/api/src/main/java/org/onlab/onos/net/host/HostDescription.java b/core/api/src/main/java/org/onlab/onos/net/host/HostDescription.java
index 62a4c9a..6b0831c 100644
--- a/core/api/src/main/java/org/onlab/onos/net/host/HostDescription.java
+++ b/core/api/src/main/java/org/onlab/onos/net/host/HostDescription.java
@@ -4,7 +4,7 @@
 
 import org.onlab.onos.net.Description;
 import org.onlab.onos.net.HostLocation;
-import org.onlab.packet.IPv4;
+import org.onlab.packet.IPAddress;
 import org.onlab.packet.MACAddress;
 
 /**
@@ -38,6 +38,6 @@
      *
      * @return a set of IP addresses.
      */
-    Set<IPv4> ipAddresses();
+    Set<IPAddress> ipAddresses();
 
 }

core/api/src/main/java/org/onlab/onos/net/host/HostService.java

diff --git a/core/api/src/main/java/org/onlab/onos/net/host/HostService.java b/core/api/src/main/java/org/onlab/onos/net/host/HostService.java
index 9ffa58a..b4f5b1f 100644
--- a/core/api/src/main/java/org/onlab/onos/net/host/HostService.java
+++ b/core/api/src/main/java/org/onlab/onos/net/host/HostService.java
@@ -4,7 +4,7 @@
 import org.onlab.onos.net.DeviceId;
 import org.onlab.onos.net.Host;
 import org.onlab.onos.net.HostId;
-import org.onlab.packet.IPv4;
+import org.onlab.packet.IPAddress;
 import org.onlab.packet.MACAddress;
 
 import java.util.Set;
@@ -59,7 +59,7 @@
      * @param ip ip address
      * @return set of hosts with the given IP
      */
-    Set<Host> getHostsByIp(IPv4 ip);
+    Set<Host> getHostsByIp(IPAddress ip);
 
     /**
      * Returns the set of hosts whose most recent location is the specified