commit 38feb6eddc2c8a764195321b551916eb27232f79
author Jonathan Hart <jono@onlab.us> Mon Aug 29 22:54:16 2016 +0000
committer Gerrit Code Review <gerrit@onlab.us> Mon Aug 29 23:16:45 2016 +0000
tree 26c7030a8748c70263c513b99c55d2a8f865c828
parent feb95f16329e3729be7aec1a0c898670d0b3c929

Revert "Fix for ONOS-5032 and ONOS-5034"

This reverts commit 50ad080683317df192a0f7159d9902dc1c403ed2.

Change-Id: Id2f9924a28c18686b4be30200244dbd0c975e90a

core/net/src/test/java/org/onosproject/net/host/impl/HostManagerTest.java

diff --git a/core/net/src/test/java/org/onosproject/net/host/impl/HostManagerTest.java b/core/net/src/test/java/org/onosproject/net/host/impl/HostManagerTest.java
index dd97d21..1eb014f 100644
--- a/core/net/src/test/java/org/onosproject/net/host/impl/HostManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/host/impl/HostManagerTest.java
@@ -98,14 +98,12 @@
     protected TestHostProvider provider;
     protected HostProviderService providerService;
 
-    private static final ComponentContextAdapter REMOVE_DUPS_MONITOR =
+    private static final ComponentContextAdapter REMOVE_DUPS =
             new ComponentContextAdapter() {
                 @Override
                 public Dictionary getProperties() {
                     Hashtable<String, String> props = new Hashtable<>();
                     props.put("allowDuplicateIps", "true");
-                    props.put("monitorHosts", "true");
-                    props.put("probeRate", "40000");
                     return props;
                 }
             };
@@ -118,27 +116,28 @@
         registry = mgr;
         mgr.networkConfigService = new TestNetworkConfigService();
         mgr.cfgService = new ComponentConfigAdapter();
-
-        mgr.activate(REMOVE_DUPS_MONITOR);
-
+        mgr.activate(REMOVE_DUPS);
         mgr.addListener(listener);
 
         provider = new TestHostProvider();
         providerService = registry.register(provider);
-        assertTrue("provider should be registered", registry.getProviders().contains(provider.id()));
+        assertTrue("provider should be registered",
+                   registry.getProviders().contains(provider.id()));
     }
 
     @After
     public void tearDown() {
         registry.unregister(provider);
-        assertFalse("provider should not be registered", registry.getProviders().contains(provider.id()));
+        assertFalse("provider should not be registered",
+                    registry.getProviders().contains(provider.id()));
 
         mgr.removeListener(listener);
         mgr.deactivate();
         injectEventDispatcher(mgr, null);
     }
 
-    private void detect(HostId hid, MacAddress mac, VlanId vlan, HostLocation loc, IpAddress ip) {
+    private void detect(HostId hid, MacAddress mac, VlanId vlan,
+                        HostLocation loc, IpAddress ip) {
         HostDescription descr = new DefaultHostDescription(mac, vlan, loc, ip);
         providerService.hostDetected(hid, descr, false);
         assertNotNull("host should be found", mgr.getHost(hid));
@@ -218,7 +217,8 @@
         assertNull("host should have been removed", mgr.getHost(HID3));
     }
 
-    private void validateHosts(String msg, Iterable<Host> hosts, HostId... ids) {
+    private void validateHosts(
+            String msg, Iterable<Host> hosts, HostId... ids) {
         Set<HostId> hids = Sets.newHashSet(ids);
         for (Host h : hosts) {
             assertTrue(msg, hids.remove(h.id()));
@@ -252,7 +252,8 @@
         assertTrue("incorrect host location", mgr.getConnectedHosts(DID2).isEmpty());
     }
 
-    private static class TestHostProvider extends AbstractProvider implements HostProvider {
+    private static class TestHostProvider extends AbstractProvider
+            implements HostProvider {
 
         protected TestHostProvider() {
             super(PID);
@@ -283,4 +284,3 @@
     private class TestNetworkConfigService extends NetworkConfigServiceAdapter {
     }
 }
-