Working on Bay-Area-Region Demo.
- added latitude / longitude parameters to regions, so the icons can be "placed" on a GEO-map
Change-Id: I5cf939f22597d4658ab603459b2b3059ba0db0c9
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 959a7c5..3b81d4d 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
@@ -67,12 +67,10 @@
CustomTopologySimulator sim = (CustomTopologySimulator) simulator;
DeviceId deviceId = sim.nextDeviceId();
BasicDeviceConfig cfg = cfgService.addConfig(deviceId, BasicDeviceConfig.class);
- cfg.name(name);
- if (latitude != 0 || longitude != 0) {
- cfg.latitude(latitude);
- cfg.longitude(longitude);
- }
- cfg.apply();
+ cfg.name(name)
+ .latitude(latitude)
+ .longitude(longitude)
+ .apply();
sim.createDevice(deviceId, name, Device.Type.valueOf(type.toUpperCase()), portCount);
}
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 93ef2a6..26bca8c 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
@@ -73,9 +73,9 @@
HostId id = sim.nextHostId();
HostLocation location = findAvailablePort(deviceId);
BasicHostConfig cfg = cfgService.addConfig(id, BasicHostConfig.class);
- cfg.latitude(latitude);
- cfg.longitude(longitude);
- cfg.apply();
+ cfg.latitude(latitude)
+ .longitude(longitude)
+ .apply();
sim.createHost(id, location, IpAddress.valueOf(hostIp));
}