commit d9fa2a8a0ab4920c0814d4eb52c64053f8c52acd
author Toshio Koide <t-koide@onlab.us> Wed Feb 19 17:35:18 2014 -0800
committer Toshio Koide <t-koide@onlab.us> Wed Feb 19 17:36:53 2014 -0800
tree 8bb2c4c6bbd0665ecd498c2be6a478799e26d675
parent 50cd1485dd4043e8a5d81f4811231f80fe825877

Use LinkEvent class instead of Link class for elements of Path

Change-Id: Iaf40f6e21d7cc411476909d3a3f32746787e16a6

src/test/java/net/onrc/onos/intent/PathIntentTest.java

diff --git a/src/test/java/net/onrc/onos/intent/PathIntentTest.java b/src/test/java/net/onrc/onos/intent/PathIntentTest.java
index 3161cca..dd87041 100644
--- a/src/test/java/net/onrc/onos/intent/PathIntentTest.java
+++ b/src/test/java/net/onrc/onos/intent/PathIntentTest.java
@@ -1,6 +1,7 @@
 package net.onrc.onos.intent;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import net.onrc.onos.ofcontroller.networkgraph.LinkEvent;
 import net.onrc.onos.ofcontroller.networkgraph.NetworkGraph;
 import net.onrc.onos.ofcontroller.networkgraph.Path;
 
@@ -35,9 +36,9 @@
 				new ConstrainedShortestPathIntent("1", 2L, 3L, 4L, 5L, 6L, 7L, 1000.0);
 
 		Path path = new Path();
-		path.add(g.getSwitch(1L).getPort(1L).getOutgoingLink());
-		path.add(g.getSwitch(2L).getPort(1L).getOutgoingLink());
-		path.add(g.getSwitch(3L).getPort(1L).getOutgoingLink());
+		path.add(new LinkEvent(g.getSwitch(1L).getPort(1L).getOutgoingLink()));
+		path.add(new LinkEvent(g.getSwitch(2L).getPort(1L).getOutgoingLink()));
+		path.add(new LinkEvent(g.getSwitch(3L).getPort(1L).getOutgoingLink()));
 
 		PathIntent pathIntent1 = new PathIntent("11", path, 123.45, cspIntent1);
 
@@ -53,30 +54,30 @@
 		input.close();
 
 		// check
-		
+
 		assertEquals("11", pathIntent2.getId());
-		Path path2 = pathIntent2.getPath(g);
+		Path path2 = pathIntent2.getPath();
 
-		assertEquals(Long.valueOf(1L), path2.get(0).getSourceSwitch().getDpid());
-		assertEquals(Long.valueOf(1L), path2.get(0).getSourcePort().getNumber());
-		assertEquals(Long.valueOf(2L), path2.get(0).getDestinationSwitch().getDpid());
-		assertEquals(Long.valueOf(2L), path2.get(0).getDestinationPort().getNumber());
+		assertEquals(Long.valueOf(1L), path2.get(0).getSrc().getDpid());
+		assertEquals(Long.valueOf(1L), path2.get(0).getSrc().getNumber());
+		assertEquals(Long.valueOf(2L), path2.get(0).getDst().getDpid());
+		assertEquals(Long.valueOf(2L), path2.get(0).getDst().getNumber());
 
-		assertEquals(Long.valueOf(2L), path2.get(1).getSourceSwitch().getDpid());
-		assertEquals(Long.valueOf(1L), path2.get(1).getSourcePort().getNumber());
-		assertEquals(Long.valueOf(3L), path2.get(1).getDestinationSwitch().getDpid());
-		assertEquals(Long.valueOf(2L), path2.get(1).getDestinationPort().getNumber());
+		assertEquals(Long.valueOf(2L), path2.get(1).getSrc().getDpid());
+		assertEquals(Long.valueOf(1L), path2.get(1).getSrc().getNumber());
+		assertEquals(Long.valueOf(3L), path2.get(1).getDst().getDpid());
+		assertEquals(Long.valueOf(2L), path2.get(1).getDst().getNumber());
 
-		assertEquals(Long.valueOf(3L), path2.get(2).getSourceSwitch().getDpid());
-		assertEquals(Long.valueOf(1L), path2.get(2).getSourcePort().getNumber());
-		assertEquals(Long.valueOf(4L), path2.get(2).getDestinationSwitch().getDpid());
-		assertEquals(Long.valueOf(2L), path2.get(2).getDestinationPort().getNumber());
+		assertEquals(Long.valueOf(3L), path2.get(2).getSrc().getDpid());
+		assertEquals(Long.valueOf(1L), path2.get(2).getSrc().getNumber());
+		assertEquals(Long.valueOf(4L), path2.get(2).getDst().getDpid());
+		assertEquals(Long.valueOf(2L), path2.get(2).getDst().getNumber());
 
 		assertEquals(123.45, pathIntent2.getBandwidth(), 0.0);
 
-		ConstrainedShortestPathIntent cspIntent2 = 
+		ConstrainedShortestPathIntent cspIntent2 =
 				(ConstrainedShortestPathIntent) pathIntent2.getParentIntent();
-		
+
 		assertEquals("1", cspIntent2.getId());
 		assertEquals(2L, cspIntent2.getSrcSwitchDpid());
 		assertEquals(3L, cspIntent2.getSrcPortNumber());