Fixing null provider custom topo simulator
- properly deal with device mastership
- allow creation of multi-homed hosts
- made UI location parameters optional
- added a simulated fabric script
Change-Id: I8558cc06aa4c323fab898b02fba9659b202c5392
diff --git a/providers/null/src/main/java/org/onosproject/provider/nil/TopologySimulator.java b/providers/null/src/main/java/org/onosproject/provider/nil/TopologySimulator.java
index 8152da3..f531ae6 100644
--- a/providers/null/src/main/java/org/onosproject/provider/nil/TopologySimulator.java
+++ b/providers/null/src/main/java/org/onosproject/provider/nil/TopologySimulator.java
@@ -177,9 +177,7 @@
* @param i index of the device id in the list.
*/
protected void createDevice(int i) {
- DeviceId id = DeviceId.deviceId(SCHEME + ":" + toHex(i));
- deviceIds.add(id);
- createDevice(id, i);
+ createDevice(DeviceId.deviceId(SCHEME + ":" + toHex(i)), i);
}
/**
@@ -205,6 +203,7 @@
new DefaultDeviceDescription(id.uri(), type,
"ON.Lab", "0.1", "0.1", "1234",
new ChassisId(chassisId));
+ deviceIds.add(id);
deviceProviderService.deviceConnected(id, desc);
deviceProviderService.updatePorts(id, buildPorts(portCount));
}