GUI - Topologies - refactoring of ServicesBundle.
Jira: ONOS-6259
- also fixed bug where edge links were being omitted.
Change-Id: I19ac83d09ce7930de7a927fb2754e0c5004705f2
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/util/TopoIntentFilter.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/util/TopoIntentFilter.java
index e43fbf2..1dbe8f3 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/util/TopoIntentFilter.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/util/TopoIntentFilter.java
@@ -21,9 +21,7 @@
import org.onosproject.net.Host;
import org.onosproject.net.HostId;
import org.onosproject.net.Link;
-import org.onosproject.net.device.DeviceService;
import org.onosproject.net.flow.FlowRule;
-import org.onosproject.net.host.HostService;
import org.onosproject.net.intent.FlowObjectiveIntent;
import org.onosproject.net.intent.FlowRuleIntent;
import org.onosproject.net.intent.HostToHostIntent;
@@ -52,8 +50,6 @@
public class TopoIntentFilter {
private final IntentService intentService;
- private final DeviceService deviceService;
- private final HostService hostService;
private final LinkService linkService;
/**
@@ -62,19 +58,17 @@
* @param services service references bundle
*/
public TopoIntentFilter(ServicesBundle services) {
- this.intentService = services.intentService();
- this.deviceService = services.deviceService();
- this.hostService = services.hostService();
- this.linkService = services.linkService();
+ this.intentService = services.intent();
+ this.linkService = services.link();
}
/**
* Finds all path (host-to-host or point-to-point) intents that pertain
* to the given hosts and devices.
*
- * @param hosts set of hosts to query by
- * @param devices set of devices to query by
- * @param links set of links to query by
+ * @param hosts set of hosts to query by
+ * @param devices set of devices to query by
+ * @param links set of links to query by
* @return set of intents that 'match' all hosts, devices and links given
*/
public List<Intent> findPathIntents(Set<Host> hosts,