commit 83da9b768f98cccb0eb42ee031de118ffa0871b0
author Thomas Vachuska <tom@onlab.us> Sat Jul 02 12:52:23 2016 +0200
committer Thomas Vachuska <tom@onlab.us> Sat Jul 02 12:52:23 2016 +0200
tree 2ee094ed79bcb2efa12ef80a96173a2d14115236
parent 4407a7eaa568407e07e467ebc2ebc6ccb4c48418

Simplifying addition of simulated hosts to the null provider.

Change-Id: I83e4c348e502ad891a427b36a4a02172fa27e6c2

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

diff --git a/providers/null/src/main/java/org/onosproject/provider/nil/CustomTopologySimulator.java b/providers/null/src/main/java/org/onosproject/provider/nil/CustomTopologySimulator.java
index a075199..cd44dcf 100644
--- a/providers/null/src/main/java/org/onosproject/provider/nil/CustomTopologySimulator.java
+++ b/providers/null/src/main/java/org/onosproject/provider/nil/CustomTopologySimulator.java
@@ -56,7 +56,7 @@
      * @return the next host id
      */
     public HostId nextHostId() {
-        return HostId.hostId(MacAddress.valueOf(nextHostId), VlanId.NONE);
+        return HostId.hostId(MacAddress.valueOf(++nextHostId), VlanId.NONE);
     }
 
     /**

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

diff --git a/providers/null/src/main/java/org/onosproject/provider/nil/cli/CreateNullHost.java b/providers/null/src/main/java/org/onosproject/provider/nil/cli/CreateNullHost.java
index 245b110..32e40b8 100644
--- a/providers/null/src/main/java/org/onosproject/provider/nil/cli/CreateNullHost.java
+++ b/providers/null/src/main/java/org/onosproject/provider/nil/cli/CreateNullHost.java
@@ -45,19 +45,15 @@
             required = true, multiValued = false)
     String deviceName = null;
 
-    @Argument(index = 1, name = "hostId", description = "Host identifier",
-            required = true, multiValued = false)
-    String hostId = null;
-
-    @Argument(index = 2, name = "hostIp", description = "Host IP address",
+    @Argument(index = 1, name = "hostIp", description = "Host IP address",
             required = true, multiValued = false)
     String hostIp = null;
 
-    @Argument(index = 3, name = "latitude", description = "Geo latitude",
+    @Argument(index = 2, name = "latitude", description = "Geo latitude",
             required = true, multiValued = false)
     Double latitude = null;
 
-    @Argument(index = 4, name = "longitude", description = "Geo longitude",
+    @Argument(index = 3, name = "longitude", description = "Geo longitude",
             required = true, multiValued = false)
     Double longitude = null;
 
@@ -74,8 +70,8 @@
 
         CustomTopologySimulator sim = (CustomTopologySimulator) simulator;
         DeviceId deviceId = sim.deviceId(deviceName);
+        HostId id = sim.nextHostId();
         HostLocation location = findAvailablePort(deviceId);
-        HostId id = HostId.hostId(hostId);
         BasicHostConfig cfg = cfgService.addConfig(id, BasicHostConfig.class);
         cfg.latitude(latitude);
         cfg.longitude(longitude);