commit | f1f2ac051df66f80cb74674b571cd2558a067d1e | [log] [tgz] |
---|---|---|
author | Yuta HIGUCHI <y-higuchi@onlab.us> | Wed Nov 26 14:02:22 2014 -0800 |
committer | Gerrit Code Review <gerrit@onlab.us> | Thu Nov 27 04:08:49 2014 +0000 |
tree | 81cb6169c0e91b9ca31275153a8527d223d32570 | |
parent | b6eb9144f2503142836fec1e83407a921cf61371 [diff] |
Construct GraphDescription with online/active Device/Link only Change-Id: I9312c0c8ae190bf0200bd040823b6f7a3e7a15e1
diff --git a/core/api/src/main/java/org/onlab/onos/net/device/DeviceService.java b/core/api/src/main/java/org/onlab/onos/net/device/DeviceService.java index d35b1af..7d2a0dd 100644 --- a/core/api/src/main/java/org/onlab/onos/net/device/DeviceService.java +++ b/core/api/src/main/java/org/onlab/onos/net/device/DeviceService.java
@@ -44,6 +44,14 @@ Iterable<Device> getDevices(); /** + * Returns an iterable collection of all devices + * currently available to the system. + * + * @return device collection + */ + Iterable<Device> getAvailableDevices(); + + /** * Returns the device with the specified identifier. * * @param deviceId device identifier
diff --git a/core/api/src/main/java/org/onlab/onos/net/device/DeviceStore.java b/core/api/src/main/java/org/onlab/onos/net/device/DeviceStore.java index bc0b5c1..ed86881 100644 --- a/core/api/src/main/java/org/onlab/onos/net/device/DeviceStore.java +++ b/core/api/src/main/java/org/onlab/onos/net/device/DeviceStore.java
@@ -44,6 +44,15 @@ Iterable<Device> getDevices(); /** + * Returns an iterable collection of all devices currently available to the system. + * + * @return device collection + */ + Iterable<Device> getAvailableDevices(); + + + + /** * Returns the device with the specified identifier. * * @param deviceId device identifier
diff --git a/core/api/src/main/java/org/onlab/onos/net/link/LinkService.java b/core/api/src/main/java/org/onlab/onos/net/link/LinkService.java index 2039aa5..58b01bf 100644 --- a/core/api/src/main/java/org/onlab/onos/net/link/LinkService.java +++ b/core/api/src/main/java/org/onlab/onos/net/link/LinkService.java
@@ -41,6 +41,13 @@ Iterable<Link> getLinks(); /** + * Returns a collection of all active infrastructure links. + * + * @return all infrastructure links + */ + Iterable<Link> getActiveLinks(); + + /** * Returns set of all infrastructure links leading to and from the * specified device. *