commit b3567288d69079b4eb06cc8326355c9ed290e8d7
author Simon Hunt <simon@onlab.us> Fri Apr 07 22:59:28 2017 -0700
committer Simon Hunt <simon@onlab.us> Fri Apr 07 23:27:39 2017 -0700
tree 074b7c17f6a9a4845d5f3a794568ec7eef7ac6a9
parent f2acb661e12ca08dc7e07b54fee15a6430580812

WIP:: Initial stab at regions demo for Europe
- Added UK network
- Added France network
Also:
- Augmented "null-simulation start custom" to reset ID seeds.

Change-Id: I643ed7864da76a1077ca089c1c990e9d322bb527

providers/null/src/main/java/org/onosproject/provider/nil/cli/NullControlCommand.java

diff --git a/providers/null/src/main/java/org/onosproject/provider/nil/cli/NullControlCommand.java b/providers/null/src/main/java/org/onosproject/provider/nil/cli/NullControlCommand.java
index 6edf6e5..21ed57f 100644
--- a/providers/null/src/main/java/org/onosproject/provider/nil/cli/NullControlCommand.java
+++ b/providers/null/src/main/java/org/onosproject/provider/nil/cli/NullControlCommand.java
@@ -19,7 +19,9 @@
 import org.apache.karaf.shell.commands.Command;
 import org.onosproject.cfg.ComponentConfigService;
 import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.provider.nil.CustomTopologySimulator;
 import org.onosproject.provider.nil.NullProviders;
+import org.onosproject.provider.nil.TopologySimulator;
 
 import static org.onosproject.cli.StartStopCompleter.START;
 
@@ -30,13 +32,15 @@
         description = "Starts or stops topology simulation")
 public class NullControlCommand extends AbstractShellCommand {
 
+    private static final String CUSTOM = "custom";
+
     @Argument(index = 0, name = "cmd", description = "Control command: start/stop",
             required = true, multiValued = false)
     String cmd = null;
 
     @Argument(index = 1, name = "topoShape",
-            description = "Topology shape: e.g. configured, linear, reroute, centipede, tree, spineleaf, " +
-                    ", mesh, fattree",
+            description = "Topology shape: e.g. configured, linear, reroute, " +
+                    "centipede, tree, spineleaf, mesh, fattree, custom",
             required = false, multiValued = false)
     String topoShape = null;
 
@@ -48,6 +52,18 @@
         }
         service.setProperty(NullProviders.class.getName(), "enabled",
                             cmd.equals(START) ? "true" : "false");
+
+        // If we are re-starting the "custom" topology, reset the counts
+        //  on the auto-assigned IDs for null-devices and null-hosts, so that
+        //  scripts can rely on consistent assignment of IDs to nodes.
+        if (CUSTOM.equals(topoShape) && START.equals(cmd)) {
+            NullProviders npService = get(NullProviders.class);
+            TopologySimulator simulator = npService.currentSimulator();
+            if (simulator instanceof CustomTopologySimulator) {
+                CustomTopologySimulator sim = (CustomTopologySimulator) simulator;
+                sim.resetIdSeeds();
+            }
+        }
     }
 
 }