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/TreeTopologySimulator.java

diff --git a/providers/null/src/main/java/org/onosproject/provider/nil/TreeTopologySimulator.java b/providers/null/src/main/java/org/onosproject/provider/nil/TreeTopologySimulator.java
index bed1390..2c04933 100644
--- a/providers/null/src/main/java/org/onosproject/provider/nil/TreeTopologySimulator.java
+++ b/providers/null/src/main/java/org/onosproject/provider/nil/TreeTopologySimulator.java
@@ -55,14 +55,16 @@
 
     @Override
     protected void createLinks() {
+        int portOffset = 1;
         for (int t = 1; t < tierOffset.length; t++) {
             int child = tierOffset[t];
             for (int parent = tierOffset[t - 1]; parent < tierOffset[t]; parent++) {
                 for (int i = 0; i < tierMultiplier[t]; i++) {
-                    createLink(parent, child);
+                    createLink(parent, child, i + portOffset, 1);
                     child++;
                 }
             }
+            portOffset = 2; // beyond first tier, allow for up-links
         }
     }