Use LinkEvent class instead of Link class for elements of Path
Change-Id: Iaf40f6e21d7cc411476909d3a3f32746787e16a6
diff --git a/src/main/java/net/onrc/onos/intent/PathIntent.java b/src/main/java/net/onrc/onos/intent/PathIntent.java
index a5454fa..e000828 100644
--- a/src/main/java/net/onrc/onos/intent/PathIntent.java
+++ b/src/main/java/net/onrc/onos/intent/PathIntent.java
@@ -1,19 +1,12 @@
package net.onrc.onos.intent;
-import java.util.LinkedList;
-import java.util.List;
-
-import net.onrc.onos.ofcontroller.networkgraph.Link;
-import net.onrc.onos.ofcontroller.networkgraph.LinkEvent;
-import net.onrc.onos.ofcontroller.networkgraph.NetworkGraph;
import net.onrc.onos.ofcontroller.networkgraph.Path;
-import net.onrc.onos.ofcontroller.networkgraph.Port;
/**
* @author Toshio Koide (t-koide@onlab.us)
*/
public class PathIntent extends Intent {
- protected List<LinkEvent> path;
+ protected Path path;
protected double bandwidth;
protected Intent parentIntent;
@@ -24,7 +17,7 @@
}
/**
- *
+ *
* @param graph
* @param path
* @param bandwidth bandwidth which should be allocated for the path.
@@ -34,14 +27,7 @@
*/
public PathIntent(String id, Path path, double bandwidth, Intent parentIntent) {
super(id);
- this.path = new LinkedList<LinkEvent>();
- for (Link link: path) {
- this.path.add(new LinkEvent(
- link.getSourceSwitch().getDpid(),
- link.getSourcePort().getNumber(),
- link.getDestinationSwitch().getDpid(),
- link.getDestinationPort().getNumber()));
- }
+ this.path = path;
this.bandwidth = bandwidth;
this.parentIntent = parentIntent;
}
@@ -50,25 +36,10 @@
return bandwidth;
}
- public List<LinkEvent> getPathByLinkEvent() {
+ public Path getPath() {
return path;
}
- /**
- * Get Path object.
- * @param graph
- * @return path object. If there is no path in the specified graph, returns null.
- */
- public Path getPath(NetworkGraph graph) {
- Path pathObj = new Path();
- for (LinkEvent linkEvent: path) {
- Link link = linkEvent.getLink(graph);
- if (link == null) return null;
- pathObj.add(link);
- }
- return pathObj;
- }
-
public Intent getParentIntent() {
return parentIntent;
}