Probe immediately when IPs are added to host monitor

rather than waiting for the next polling cycle. Change-Id: Iffaf50f7a589b52be659b82b8a289e04a5de4ca6

Probe immediately when IPs are added to host monitor
rather than waiting for the next polling cycle. Change-Id: Iffaf50f7a589b52be659b82b8a289e04a5de4ca6
Jonathan Hart · Gerrit Code Review
Commit 78613d2e16e342f93f4bc757d17058f169b87d6b 78613d2e 1 parent 5aa480be
Showing 2 changed files with 34 additions and 85 deletions
core/net/src/main/java/org/onosproject/net/host/impl/HostMonitor.java
core/net/src/test/java/org/onosproject/net/host/impl/HostMonitorTest.java
--- a/core/net/src/main/java/org/onosproject/net/host/impl/HostMonitor.java
View file @78613d2
+++ b/core/net/src/main/java/org/onosproject/net/host/impl/HostMonitor.java
View file @78613d2
@@ -107,6 +107,7 @@ public class HostMonitor implements TimerTask {
      */
     void addMonitoringFor(IpAddress ip) {
         monitoredAddresses.add(ip);
+        probe(ip);
     }
     /**
@@ -151,28 +152,30 @@ public class HostMonitor implements TimerTask {
     @Override
     public void run(Timeout timeout) throws Exception {
-        for (IpAddress ip : monitoredAddresses) {
+        monitoredAddresses.forEach(this::probe);
-            Set<Host> hosts = hostManager.getHostsByIp(ip);
-
-            if (hosts.isEmpty()) {
-                sendRequest(ip);
-            } else {
-                for (Host host : hosts) {
-                    HostProvider provider = hostProviders.get(host.providerId());
-                    if (provider == null) {
-                        hostProviders.remove(host.providerId(), null);
-                    } else {
-                        provider.triggerProbe(host);
-                    }
-                }
-            }
-        }
         synchronized (this) {
             this.timeout = Timer.getTimer().newTimeout(this, probeRate, TimeUnit.MILLISECONDS);
         }
     }
+    private void probe(IpAddress ip) {
+        Set<Host> hosts = hostManager.getHostsByIp(ip);
+
+        if (hosts.isEmpty()) {
+            sendRequest(ip);
+        } else {
+            for (Host host : hosts) {
+                HostProvider provider = hostProviders.get(host.providerId());
+                if (provider == null) {
+                    hostProviders.remove(host.providerId(), null);
+                } else {
+                    provider.triggerProbe(host);
+                }
+            }
+        }
+    }
+
     /**
      * Sends an ARP or NDP request for the given IP address.
      *
--- a/core/net/src/test/java/org/onosproject/net/host/impl/HostMonitorTest.java
View file @78613d2
+++ b/core/net/src/test/java/org/onosproject/net/host/impl/HostMonitorTest.java
View file @78613d2
@@ -35,10 +35,8 @@ import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.Device;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.Host;
-import org.onosproject.net.MastershipRole;
 import org.onosproject.net.Port;
 import org.onosproject.net.PortNumber;
-import org.onosproject.net.device.DeviceListener;
 import org.onosproject.net.device.DeviceServiceAdapter;
 import org.onosproject.net.edge.EdgePortService;
 import org.onosproject.net.flow.instructions.Instruction;
@@ -101,56 +99,37 @@ public class HostMonitorTest {
     @Test
     public void testMonitorIpv4HostExists() throws Exception {
-        ProviderId id = new ProviderId("fake://", "id");
+        testMonitorHostExists(TARGET_IPV4_ADDR);
-
-        Host host = createMock(Host.class);
-        expect(host.providerId()).andReturn(id);
-        replay(host);
-
-        HostManager hostManager = createMock(HostManager.class);
-        expect(hostManager.getHostsByIp(TARGET_IPV4_ADDR))
-                .andReturn(Collections.singleton(host));
-        replay(hostManager);
-
-        HostProvider hostProvider = createMock(HostProvider.class);
-        expect(hostProvider.id()).andReturn(id).anyTimes();
-        hostProvider.triggerProbe(host);
-        expectLastCall().once();
-        replay(hostProvider);
-
-        hostMonitor = new HostMonitor(null, hostManager, null, edgePortService);
-
-        hostMonitor.registerHostProvider(hostProvider);
-        hostMonitor.addMonitoringFor(TARGET_IPV4_ADDR);
-
-        hostMonitor.run(null);
-
-        verify(hostProvider);
     }
     @Test
     public void testMonitorIpv6HostExists() throws Exception {
+        testMonitorHostExists(TARGET_IPV6_ADDR);
+    }
+
+    private void testMonitorHostExists(IpAddress hostIp) throws Exception {
         ProviderId id = new ProviderId("fake://", "id");
         Host host = createMock(Host.class);
-        expect(host.providerId()).andReturn(id);
+        expect(host.providerId()).andReturn(id).anyTimes();
         replay(host);
         HostManager hostManager = createMock(HostManager.class);
-        expect(hostManager.getHostsByIp(TARGET_IPV6_ADDR))
+        expect(hostManager.getHostsByIp(hostIp))
-                .andReturn(Collections.singleton(host));
+                .andReturn(Collections.singleton(host))
+                .anyTimes();
         replay(hostManager);
         HostProvider hostProvider = createMock(HostProvider.class);
         expect(hostProvider.id()).andReturn(id).anyTimes();
         hostProvider.triggerProbe(host);
-        expectLastCall().once();
+        expectLastCall().times(2);
         replay(hostProvider);
         hostMonitor = new HostMonitor(null, hostManager, null, edgePortService);
         hostMonitor.registerHostProvider(hostProvider);
-        hostMonitor.addMonitoringFor(TARGET_IPV6_ADDR);
+        hostMonitor.addMonitoringFor(hostIp);
         hostMonitor.run(null);
@@ -202,7 +181,7 @@ public class HostMonitorTest {
         // Check that a packet was sent to our PacketService and that it has
         // the properties we expect
-        assertEquals(1, packetService.packets.size());
+        assertEquals(2, packetService.packets.size());
         OutboundPacket packet = packetService.packets.get(0);
         // Check the output port is correct
@@ -271,7 +250,7 @@ public class HostMonitorTest {
         // Check that a packet was sent to our PacketService and that it has
         // the properties we expect
-        assertEquals(1, packetService.packets.size());
+        assertEquals(2, packetService.packets.size());
         OutboundPacket packet = packetService.packets.get(0);
         // Check the output port is correct
@@ -342,7 +321,7 @@ public class HostMonitorTest {
         // Check that a packet was sent to our PacketService and that it has
         // the properties we expect
-        assertEquals(1, packetService.packets.size());
+        assertEquals(2, packetService.packets.size());
         OutboundPacket packet = packetService.packets.get(0);
         // Check the output port is correct
@@ -412,7 +391,7 @@ public class HostMonitorTest {
         // Check that a packet was sent to our PacketService and that it has
         // the properties we expect
-        assertEquals(1, packetService.packets.size());
+        assertEquals(2, packetService.packets.size());
         OutboundPacket packet = packetService.packets.get(0);
         // Check the output port is correct
@@ -460,26 +439,11 @@ public class HostMonitorTest {
         }
         @Override
-        public int getDeviceCount() {
-            return 0;
-        }
-
-        @Override
         public Iterable<Device> getDevices() {
             return devices;
         }
         @Override
-        public Device getDevice(DeviceId deviceId) {
-            return null;
-        }
-
-        @Override
-        public MastershipRole getRole(DeviceId deviceId) {
-            return null;
-        }
-
-        @Override
         public List<Port> getPorts(DeviceId deviceId) {
             List<Port> ports = Lists.newArrayList();
             for (Port p : devicePorts.get(deviceId)) {
@@ -487,23 +451,5 @@ public class HostMonitorTest {
             }
             return ports;
         }
-
-        @Override
-        public Port getPort(DeviceId deviceId, PortNumber portNumber) {
-            return null;
-        }
-
-        @Override
-        public boolean isAvailable(DeviceId deviceId) {
-            return false;
-        }
-
-        @Override
-        public void addListener(DeviceListener listener) {
-        }
-
-        @Override
-        public void removeListener(DeviceListener listener) {
-        }
     }
 }