Merge branch 'master' into merge
Change-Id: I163ecf699b554e33f4db938c66b73c9911e51135
diff --git a/providers/null/src/main/java/org/onosproject/provider/nil/cli/CreateNullDevice.java b/providers/null/src/main/java/org/onosproject/provider/nil/cli/CreateNullDevice.java
index bbe1e131..752ef51 100644
--- a/providers/null/src/main/java/org/onosproject/provider/nil/cli/CreateNullDevice.java
+++ b/providers/null/src/main/java/org/onosproject/provider/nil/cli/CreateNullDevice.java
@@ -17,7 +17,9 @@
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
+import org.apache.karaf.shell.api.action.Option;
import org.apache.karaf.shell.api.action.lifecycle.Service;
+
import org.onlab.util.Tools;
import org.onosproject.net.Device;
import org.onosproject.net.DeviceId;
@@ -61,6 +63,15 @@
required = false)
String locType = GEO;
+ @Option(name = "-I", aliases = "--id", description = "Device identifier")
+ String id = null;
+
+ @Option(name = "-H", aliases = "--hw", description = "Hardware version")
+ String hw = "0.1";
+
+ @Option(name = "-S", aliases = "--sw", description = "Software version")
+ String sw = "0.1.2";
+
@Override
protected void doExecute() {
NullProviders service = get(NullProviders.class);
@@ -72,13 +83,14 @@
}
CustomTopologySimulator sim = (CustomTopologySimulator) simulator;
- DeviceId deviceId = sim.nextDeviceId();
+ DeviceId deviceId = id == null ? sim.nextDeviceId() : DeviceId.deviceId(id);
BasicDeviceConfig cfg = cfgService.addConfig(deviceId, BasicDeviceConfig.class);
cfg.name(name);
setUiCoordinates(cfg, locType, latOrY, longOrX);
Tools.delay(10);
- sim.createDevice(deviceId, name, Device.Type.valueOf(type.toUpperCase()), portCount);
+ sim.createDevice(deviceId, name, Device.Type.valueOf(type.toUpperCase()),
+ hw, sw, portCount);
}
}