lldp discovery independent of OF
Change-Id: I720f727f6628e30e5d732e6d7bf742d1b7050812
diff --git a/core/api/src/main/java/org/onlab/onos/net/device/DefaultDeviceDescription.java b/core/api/src/main/java/org/onlab/onos/net/device/DefaultDeviceDescription.java
index ede2eb2..79710ae 100644
--- a/core/api/src/main/java/org/onlab/onos/net/device/DefaultDeviceDescription.java
+++ b/core/api/src/main/java/org/onlab/onos/net/device/DefaultDeviceDescription.java
@@ -2,6 +2,7 @@
import org.onlab.onos.net.AbstractDescription;
import org.onlab.onos.net.SparseAnnotations;
+import org.onlab.packet.ChassisId;
import java.net.URI;
@@ -20,6 +21,7 @@
private final String hwVersion;
private final String swVersion;
private final String serialNumber;
+ private final ChassisId chassisId;
/**
* Creates a device description using the supplied information.
@@ -34,7 +36,7 @@
*/
public DefaultDeviceDescription(URI uri, Type type, String manufacturer,
String hwVersion, String swVersion,
- String serialNumber,
+ String serialNumber, ChassisId chassis,
SparseAnnotations... annotations) {
super(annotations);
this.uri = checkNotNull(uri, "Device URI cannot be null");
@@ -43,6 +45,7 @@
this.hwVersion = hwVersion;
this.swVersion = swVersion;
this.serialNumber = serialNumber;
+ this.chassisId = chassis;
}
/**
@@ -54,7 +57,7 @@
SparseAnnotations... annotations) {
this(base.deviceURI(), base.type(), base.manufacturer(),
base.hwVersion(), base.swVersion(), base.serialNumber(),
- annotations);
+ base.chassisId(), annotations);
}
@Override
@@ -88,6 +91,11 @@
}
@Override
+ public ChassisId chassisId() {
+ return chassisId;
+ }
+
+ @Override
public String toString() {
return toStringHelper(this)
.add("uri", uri).add("type", type).add("mfr", manufacturer)
@@ -104,5 +112,6 @@
this.hwVersion = null;
this.swVersion = null;
this.serialNumber = null;
+ this.chassisId = null;
}
}