commit f651cc9798e9d108fcbbd6fe42bddf1781c8fefe
author Thomas Vachuska <tom@onlab.us> Tue Apr 14 16:11:44 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Wed Apr 15 00:00:59 2015 +0000
tree 19d8d5194c36e6783eb0d5791e21e767f71825e3
parent ab582b86dbb63cee2c38c0927abe79c028b07b81

Fixing a defect in simulated topology to make sure to use unique ports.

Change-Id: I6ae266e9347470722e4df31aed18e3141e3e84a4

providers/null/src/main/java/org/onosproject/provider/nil/RerouteTopologySimulator.java

diff --git a/providers/null/src/main/java/org/onosproject/provider/nil/RerouteTopologySimulator.java b/providers/null/src/main/java/org/onosproject/provider/nil/RerouteTopologySimulator.java
index 11dc130..d17466b 100644
--- a/providers/null/src/main/java/org/onosproject/provider/nil/RerouteTopologySimulator.java
+++ b/providers/null/src/main/java/org/onosproject/provider/nil/RerouteTopologySimulator.java
@@ -25,7 +25,7 @@
     @Override
     protected void processTopoShape(String shape) {
         super.processTopoShape(shape);
-        infrastructurePorts = 3;
+        infrastructurePorts = 5;
         deviceCount = (topoShape.length == 1) ? deviceCount : Integer.parseInt(topoShape[1]);
     }
 
@@ -37,13 +37,15 @@
 
     @Override
     protected void createLinks() {
+        int portOffset = 1;
         for (int i = 0, n = deviceCount - 2; i < n; i++) {
-            createLink(i, i + 1);
+            createLink(i, i + 1, portOffset, 1);
+            portOffset = 2;
         }
         int middle = (deviceCount - 1) / 2;
         int alternate = deviceCount - 1;
-        createLink(middle - 1, alternate);
-        createLink(middle, alternate);
+        createLink(middle - 1, alternate, 3, 1);
+        createLink(middle, alternate, 3, 2);
     }
 
     @Override