commit 33f228af5a34d48e38095653546bd3371c5c7b2a
author Pavlin Radoslavov <pavlin@onlab.us> Mon Oct 27 19:33:16 2014 -0700
committer Pavlin Radoslavov <pavlin@onlab.us> Mon Oct 27 19:33:16 2014 -0700
tree f343cc977d03789b70fb0231fb0bb3dfb7b83c72
parent e1bcb0b3efc4d0fa7ca225f0c15e7daee41b58c1

Replaced IpPrefix and IpAddress in the following methods
and cleanup related code:

 - Host.ipAddresses()
 - DefaultHost.ipAddresses()
 - HostDescription.ipAddress()
 - DefaultHostDescription.ipAddress()
 - HostService.getHostsByIp()
 - HostManager.getHostsByIp()
 - HostStore.getHosts()
 - GossipHostStore.getHosts()
 - SimpleHostStore.getHosts()
 - ProxyArpService.known()
 - ProxyArpManager.known()

As a result of the above cleanup, the "hosts" CLI command outputs
the IP addresses as "1.2.3.4" instead of "1.2.3.4/32".

Also, the following REST calls might be affected as well with
the above format replacement:
  - REST POST: config/topology
  - REST GET: topology/graph

apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTest.java

diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTest.java b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTest.java
index 13547ae..7bc9473 100644
--- a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTest.java
+++ b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTest.java
@@ -197,27 +197,27 @@
         hostService.addListener(anyObject(HostListener.class));
         expectLastCall().anyTimes();
 
-        IpPrefix host1Address = IpPrefix.valueOf("192.168.10.1/32");
+        IpAddress host1Address = IpAddress.valueOf("192.168.10.1");
         Host host1 = new DefaultHost(ProviderId.NONE, HostId.NONE,
                 MacAddress.valueOf("00:00:00:00:00:01"), VlanId.NONE,
                 new HostLocation(SW1_ETH1, 1),
-                        Sets.newHashSet(host1Address));
+                Sets.newHashSet(host1Address));
 
         expect(hostService.getHostsByIp(host1Address))
                 .andReturn(Sets.newHashSet(host1)).anyTimes();
-        hostService.startMonitoringIp(host1Address.toIpAddress());
+        hostService.startMonitoringIp(host1Address);
         expectLastCall().anyTimes();
 
 
-        IpPrefix host2Address = IpPrefix.valueOf("192.168.20.1/32");
+        IpAddress host2Address = IpAddress.valueOf("192.168.20.1");
         Host host2 = new DefaultHost(ProviderId.NONE, HostId.NONE,
                 MacAddress.valueOf("00:00:00:00:00:02"), VlanId.NONE,
                 new HostLocation(SW2_ETH1, 1),
-                        Sets.newHashSet(host2Address));
+                Sets.newHashSet(host2Address));
 
         expect(hostService.getHostsByIp(host2Address))
                 .andReturn(Sets.newHashSet(host2)).anyTimes();
-        hostService.startMonitoringIp(host2Address.toIpAddress());
+        hostService.startMonitoringIp(host2Address);
         expectLastCall().anyTimes();