tom

Moved host core stuff to its own package.

1 -package org.onlab.onos.net.trivial.impl; 1 +package org.onlab.onos.net.trivial.host.impl;
2 2
3 import org.apache.felix.scr.annotations.Activate; 3 import org.apache.felix.scr.annotations.Activate;
4 import org.apache.felix.scr.annotations.Component; 4 import org.apache.felix.scr.annotations.Component;
......
1 -package org.onlab.onos.net.trivial.impl; 1 +package org.onlab.onos.net.trivial.host.impl;
2 2
3 import org.onlab.onos.net.ConnectPoint; 3 import org.onlab.onos.net.ConnectPoint;
4 import org.onlab.onos.net.DefaultHost; 4 import org.onlab.onos.net.DefaultHost;
......
...@@ -32,7 +32,9 @@ import static org.onlab.util.Tools.namedThreads; ...@@ -32,7 +32,9 @@ import static org.onlab.util.Tools.namedThreads;
32 import static org.slf4j.LoggerFactory.getLogger; 32 import static org.slf4j.LoggerFactory.getLogger;
33 33
34 /** 34 /**
35 - * Simple implementation of a network topology provider/computor. 35 + * Default implementation of a network topology provider that feeds off
36 + * device and link subsystem events to trigger assembly and computation of
37 + * new topology snapshots.
36 */ 38 */
37 @Component(immediate = true) 39 @Component(immediate = true)
38 public class DefaultTopologyProvider extends AbstractProvider 40 public class DefaultTopologyProvider extends AbstractProvider
...@@ -76,7 +78,7 @@ public class DefaultTopologyProvider extends AbstractProvider ...@@ -76,7 +78,7 @@ public class DefaultTopologyProvider extends AbstractProvider
76 78
77 @Activate 79 @Activate
78 public synchronized void activate() { 80 public synchronized void activate() {
79 - executor = newFixedThreadPool(MAX_THREADS, namedThreads("topo-compute-%d")); 81 + executor = newFixedThreadPool(MAX_THREADS, namedThreads("topo-build-%d"));
80 accumulator = new TopologyChangeAccumulator(); 82 accumulator = new TopologyChangeAccumulator();
81 83
82 providerService = providerRegistry.register(this); 84 providerService = providerRegistry.register(this);
......
...@@ -5,7 +5,7 @@ import org.onlab.onos.net.DeviceId; ...@@ -5,7 +5,7 @@ import org.onlab.onos.net.DeviceId;
5 import java.util.Objects; 5 import java.util.Objects;
6 6
7 /** 7 /**
8 - * Key for filing src/dst paths. 8 + * Key for filing pre-computed paths between source and destination devices.
9 */ 9 */
10 class PathKey { 10 class PathKey {
11 private final DeviceId src; 11 private final DeviceId src;
......
...@@ -320,6 +320,7 @@ ...@@ -320,6 +320,7 @@
320 <artifactId>maven-javadoc-plugin</artifactId> 320 <artifactId>maven-javadoc-plugin</artifactId>
321 <version>2.9.1</version> 321 <version>2.9.1</version>
322 <configuration> 322 <configuration>
323 + <show>package</show>
323 <docfilessubdirs>true</docfilessubdirs> 324 <docfilessubdirs>true</docfilessubdirs>
324 <doctitle>ONOS Java API</doctitle> 325 <doctitle>ONOS Java API</doctitle>
325 <groups> 326 <groups>
......
...@@ -60,7 +60,7 @@ public class OpenFlowDeviceProvider extends AbstractProvider implements DevicePr ...@@ -60,7 +60,7 @@ public class OpenFlowDeviceProvider extends AbstractProvider implements DevicePr
60 * Creates an OpenFlow device provider. 60 * Creates an OpenFlow device provider.
61 */ 61 */
62 public OpenFlowDeviceProvider() { 62 public OpenFlowDeviceProvider() {
63 - super(new ProviderId("org.onlab.onos.provider.of.device")); 63 + super(new ProviderId("org.onlab.onos.provider.openflow"));
64 } 64 }
65 65
66 @Activate 66 @Activate
......
...@@ -37,7 +37,7 @@ public class OpenFlowHostProvider extends AbstractProvider implements HostProvid ...@@ -37,7 +37,7 @@ public class OpenFlowHostProvider extends AbstractProvider implements HostProvid
37 * Creates an OpenFlow host provider. 37 * Creates an OpenFlow host provider.
38 */ 38 */
39 public OpenFlowHostProvider() { 39 public OpenFlowHostProvider() {
40 - super(new ProviderId("org.onlab.onos.provider.of.host")); 40 + super(new ProviderId("org.onlab.onos.provider.openflow"));
41 } 41 }
42 42
43 @Activate 43 @Activate
......
...@@ -55,7 +55,7 @@ public class OpenFlowLinkProvider extends AbstractProvider implements LinkProvid ...@@ -55,7 +55,7 @@ public class OpenFlowLinkProvider extends AbstractProvider implements LinkProvid
55 * Creates an OpenFlow link provider. 55 * Creates an OpenFlow link provider.
56 */ 56 */
57 public OpenFlowLinkProvider() { 57 public OpenFlowLinkProvider() {
58 - super(new ProviderId("org.onlab.onos.provider.of.link")); 58 + super(new ProviderId("org.onlab.onos.provider.openflow"));
59 } 59 }
60 60
61 @Activate 61 @Activate
......