Revert "Fix for ONOS-5032 and ONOS-5034"
This reverts commit 50ad080683317df192a0f7159d9902dc1c403ed2.
Change-Id: Id2f9924a28c18686b4be30200244dbd0c975e90a
diff --git a/core/net/BUCK b/core/net/BUCK
index 773b20a..73bbe7d 100644
--- a/core/net/BUCK
+++ b/core/net/BUCK
@@ -12,7 +12,6 @@
'//core/common:onos-core-common',
'//core/store/dist:onos-core-dist',
'//core/store/dist:onos-core-dist-tests',
- '//utils/osgi:onlab-osgi-tests',
]
osgi_jar_with_tests (
diff --git a/core/net/pom.xml b/core/net/pom.xml
index 57a39e8..d30f7a6 100644
--- a/core/net/pom.xml
+++ b/core/net/pom.xml
@@ -125,13 +125,6 @@
<groupId>org.onosproject</groupId>
<artifactId>onos-incubator-net</artifactId>
</dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onlab-osgi</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/core/net/src/main/java/org/onosproject/net/host/impl/HostManager.java b/core/net/src/main/java/org/onosproject/net/host/impl/HostManager.java
index 27b9b7a..bdb5e43 100644
--- a/core/net/src/main/java/org/onosproject/net/host/impl/HostManager.java
+++ b/core/net/src/main/java/org/onosproject/net/host/impl/HostManager.java
@@ -106,15 +106,6 @@
label = "Enable removal of duplicate ip address")
private boolean allowDuplicateIps = true;
-
- @Property(name = "monitorHosts", boolValue = false,
- label = "Enable/Disable monitoring of hosts")
- private boolean monitorHosts = false;
-
- @Property(name = "probeRate", longValue = 30000,
- label = "Set the probe Rate in milli seconds")
- private long probeRate = 30000;
-
private HostMonitor monitor;
@@ -123,71 +114,17 @@
store.setDelegate(delegate);
eventDispatcher.addSink(HostEvent.class, listenerRegistry);
cfgService.registerProperties(getClass());
+ modified(context);
networkConfigService.addListener(networkConfigListener);
monitor = new HostMonitor(packetService, this, interfaceService, edgePortService);
- monitor.setProbeRate(probeRate);
monitor.start();
- modified(context);
- cfgService.registerProperties(getClass());
log.info("Started");
}
- @Deactivate
- public void deactivate() {
- store.unsetDelegate(delegate);
- eventDispatcher.removeSink(HostEvent.class);
- networkConfigService.removeListener(networkConfigListener);
- cfgService.unregisterProperties(getClass(), false);
- monitor.shutdown();
- log.info("Stopped");
- }
-
@Modified
public void modified(ComponentContext context) {
- boolean oldValue = monitorHosts;
- readComponentConfiguration(context);
- if (probeRate > 0) {
- monitor.setProbeRate(probeRate);
- } else {
- log.warn("probeRate cannot be lessthan 0");
- }
-
- if (oldValue != monitorHosts) {
- if (monitorHosts) {
- startMonitoring();
- } else {
- stopMonitoring();
- }
- }
- }
-
- /**
- * Extracts properties from the component configuration context.
- *
- * @param context the component context
- */
- private void readComponentConfiguration(ComponentContext context) {
Dictionary<?, ?> properties = context.getProperties();
Boolean flag;
-
- flag = Tools.isPropertyEnabled(properties, "monitorHosts");
- if (flag == null) {
- log.info("monitorHosts is not enabled " +
- "using current value of {}", monitorHosts);
- } else {
- monitorHosts = flag;
- log.info("Configured. monitorHosts {}",
- monitorHosts ? "enabled" : "disabled");
- }
-
- Long longValue = Tools.getLongProperty(properties, "probeRate");
- if (longValue == null || longValue == 0) {
- log.info("probeRate is not set sing default value of {}", probeRate);
- } else {
- probeRate = longValue;
- log.info("Configured. probeRate {}", probeRate);
- }
-
flag = Tools.isPropertyEnabled(properties, "allowDuplicateIps");
if (flag == null) {
log.info("Removal of duplicate ip address is not configured");
@@ -196,32 +133,14 @@
log.info("Removal of duplicate ip address is {}",
allowDuplicateIps ? "disabled" : "enabled");
}
-
-
}
- /**
- * Starts monitoring the hosts by IP Address.
- *
- */
- private void startMonitoring() {
- store.getHosts().forEach(host -> {
- host.ipAddresses().forEach(ip -> {
- monitor.addMonitoringFor(ip);
- });
- });
- }
-
- /**
- * Stops monitoring the hosts by IP Address.
- *
- */
- private void stopMonitoring() {
- store.getHosts().forEach(host -> {
- host.ipAddresses().forEach(ip -> {
- monitor.stopMonitoring(ip);
- });
- });
+ @Deactivate
+ public void deactivate() {
+ store.unsetDelegate(delegate);
+ eventDispatcher.removeSink(HostEvent.class);
+ networkConfigService.removeListener(networkConfigListener);
+ log.info("Stopped");
}
@Override
@@ -325,15 +244,8 @@
}
store.createOrUpdateHost(provider().id(), hostId,
hostDescription, replaceIps);
-
- if (monitorHosts) {
- hostDescription.ipAddress().forEach(ip -> {
- monitor.addMonitoringFor(ip);
- });
- }
}
-
// When a new IP is detected, remove that IP on other hosts if it exists
public void removeDuplicates(HostId hostId, HostDescription desc) {
desc.ipAddress().forEach(ip -> {
@@ -346,7 +258,9 @@
}
});
});
- }
+ }
+
+
// returns a HostDescription made from the union of the BasicHostConfig
@@ -362,12 +276,6 @@
public void hostVanished(HostId hostId) {
checkNotNull(hostId, HOST_ID_NULL);
checkValidity();
- Host host = store.getHost(hostId);
- if (monitorHosts) {
- host.ipAddresses().forEach(ip -> {
- monitor.stopMonitoring(ip);
- });
- }
store.removeHost(hostId);
}
@@ -415,4 +323,3 @@
}
}
}
-
diff --git a/core/net/src/main/java/org/onosproject/net/host/impl/HostMonitor.java b/core/net/src/main/java/org/onosproject/net/host/impl/HostMonitor.java
index 747c8eb..c2bac09 100644
--- a/core/net/src/main/java/org/onosproject/net/host/impl/HostMonitor.java
+++ b/core/net/src/main/java/org/onosproject/net/host/impl/HostMonitor.java
@@ -150,13 +150,6 @@
hostProviders.put(provider.id(), provider);
}
- /*
- * Sets the probe rate.
- */
- void setProbeRate(long probeRate) {
- this.probeRate = probeRate;
- }
-
@Override
public void run(Timeout timeout) throws Exception {
monitoredAddresses.forEach(this::probe);
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 {
}
}
-