NullHostProvider - check for device ownership before host creation.
This is done by literal check of NodeId, as it is encoded in the
DeviceId.
Also includes minor fixes to config file parsing.
Reference: ONOS-873
Change-Id: Id333c109c3bb752dcb78ede3a4dfd94fec189cc0
diff --git a/providers/null/device/src/main/java/org/onosproject/provider/nil/device/impl/NullDeviceProvider.java b/providers/null/device/src/main/java/org/onosproject/provider/nil/device/impl/NullDeviceProvider.java
index 08f8260..d6be465 100644
--- a/providers/null/device/src/main/java/org/onosproject/provider/nil/device/impl/NullDeviceProvider.java
+++ b/providers/null/device/src/main/java/org/onosproject/provider/nil/device/impl/NullDeviceProvider.java
@@ -98,7 +98,7 @@
private int numDevices = DEF_NUMDEVICES;
- @Property(name = "numPorts", intValue = DEF_NUMPORTS, label = "Number of ports per devices")
+ @Property(name = "numPorts", value = "10", label = "Number of ports per devices")
private int numPorts = DEF_NUMPORTS;
private DeviceCreator creator;
@@ -159,6 +159,8 @@
newPortNum = isNullOrEmpty(s) ? DEF_NUMPORTS : Integer.valueOf(s.trim());
} catch (Exception e) {
log.warn(e.getMessage());
+ newDevNum = numDevices;
+ newPortNum = numPorts;
}
boolean chgd = false;
diff --git a/providers/null/host/src/main/java/org/onosproject/provider/nil/host/impl/NullHostProvider.java b/providers/null/host/src/main/java/org/onosproject/provider/nil/host/impl/NullHostProvider.java
index e20bfca..3cddb9a 100644
--- a/providers/null/host/src/main/java/org/onosproject/provider/nil/host/impl/NullHostProvider.java
+++ b/providers/null/host/src/main/java/org/onosproject/provider/nil/host/impl/NullHostProvider.java
@@ -22,6 +22,8 @@
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
+import org.onosproject.cluster.ClusterService;
+import org.onosproject.mastership.MastershipService;
import org.onosproject.net.Device;
import org.onosproject.net.Host;
import org.onosproject.net.HostId;
@@ -41,6 +43,7 @@
import org.slf4j.Logger;
import static org.slf4j.LoggerFactory.getLogger;
+import static org.onlab.util.Tools.toHex;
/**
* Null provider to advertise fake hosts.
@@ -54,6 +57,12 @@
protected DeviceService deviceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+ protected MastershipService roleService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+ protected ClusterService nodeService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected HostProviderRegistry providerRegistry;
private HostProviderService providerService;
@@ -90,8 +99,6 @@
log.info("Started");
}
-
-
@Deactivate
public void deactivate() {
providerRegistry.unregister(this);
@@ -104,6 +111,14 @@
public void triggerProbe(Host host) {}
private void addHosts(Device device) {
+ String nhash = toHex(nodeService.getLocalNode().hashCode());
+ String dhash = device.id().toString();
+ // make sure this instance owns the device.
+ if (!nhash.substring(nhash.length() - 3)
+ .equals(dhash.substring(14, 17))) {
+ log.warn("Device {} is not mine. Can't add hosts.", device.id());
+ return;
+ }
for (int i = 0; i < HOSTSPERDEVICE; i++) {
providerService.hostDetected(
HostId.hostId(MacAddress.valueOf(i + device.hashCode()),
@@ -130,8 +145,9 @@
private class InternalHostProvider implements DeviceListener {
@Override
public void event(DeviceEvent event) {
- if (!deviceService.getRole(event.subject().id())
- .equals(MastershipRole.MASTER)) {
+ Device dev = event.subject();
+ if (!deviceService.getRole(event.subject().id()).equals(
+ MastershipRole.MASTER)) {
log.info("Local node is not master for device {}", event
.subject().id());
return;
@@ -139,12 +155,12 @@
switch (event.type()) {
case DEVICE_ADDED:
- addHosts(event.subject());
+ addHosts(dev);
break;
case DEVICE_UPDATED:
break;
case DEVICE_REMOVED:
- removeHosts(event.subject());
+ removeHosts(dev);
break;
case DEVICE_SUSPENDED:
break;
@@ -161,6 +177,6 @@
}
}
-
}
+
}
diff --git a/providers/null/link/src/main/java/org/onosproject/provider/nil/link/impl/NullLinkProvider.java b/providers/null/link/src/main/java/org/onosproject/provider/nil/link/impl/NullLinkProvider.java
index a90e61c..99e46dc 100644
--- a/providers/null/link/src/main/java/org/onosproject/provider/nil/link/impl/NullLinkProvider.java
+++ b/providers/null/link/src/main/java/org/onosproject/provider/nil/link/impl/NullLinkProvider.java
@@ -103,12 +103,12 @@
namedThreads("onos-null-link-driver"));
// If true, 'flickers' links by alternating link up/down events at eventRate
- @Property(name = "flicker", boolValue = FLICKER,
+ @Property(name = "flicker", value = "false",
label = "Setting to flap links")
private boolean flicker = FLICKER;
// For flicker = true, duration between events in msec.
- @Property(name = "eventRate", intValue = DEFAULT_RATE,
+ @Property(name = "eventRate", value = "3000",
label = "Duration between Link Event")
private int eventRate = DEFAULT_RATE;