Fixed a defect in device provider.
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/DevicesListCommand.java b/cli/src/main/java/org/onlab/onos/cli/net/DevicesListCommand.java
index b3dd18d..c7e2c8c 100644
--- a/cli/src/main/java/org/onlab/onos/cli/net/DevicesListCommand.java
+++ b/cli/src/main/java/org/onlab/onos/cli/net/DevicesListCommand.java
@@ -18,7 +18,7 @@
@Override
protected Object doExecute() throws Exception {
for (Device device : getService(DeviceService.class).getDevices()) {
- print(FMT, device.id(), device.type(), device.manufacturer(),
+ print(FMT, device.id().uri(), device.type(), device.manufacturer(),
device.hwVersion(), device.swVersion(), device.serialNumber());
}
return null;
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/LinksListCommand.java b/cli/src/main/java/org/onlab/onos/cli/net/LinksListCommand.java
index 87be1f2..d94d547 100644
--- a/cli/src/main/java/org/onlab/onos/cli/net/LinksListCommand.java
+++ b/cli/src/main/java/org/onlab/onos/cli/net/LinksListCommand.java
@@ -21,15 +21,14 @@
required = false, multiValued = false)
String deviceId = null;
-
@Override
protected Object doExecute() throws Exception {
LinkService service = getService(LinkService.class);
Iterable<Link> links = deviceId != null ?
service.getDeviceLinks(deviceId(deviceId)) : service.getLinks();
for (Link link : links) {
- print(FMT, link.src().deviceId(), link.src().port(),
- link.dst().deviceId(), link.dst().port(), link.type());
+ print(FMT, link.src().deviceId().uri(), link.src().port(),
+ link.dst().deviceId().uri(), link.dst().port(), link.type());
}
return null;
}
diff --git a/providers/of/device/src/main/java/org/onlab/onos/provider/of/device/impl/OpenFlowDeviceProvider.java b/providers/of/device/src/main/java/org/onlab/onos/provider/of/device/impl/OpenFlowDeviceProvider.java
index 2309de4..136a237 100644
--- a/providers/of/device/src/main/java/org/onlab/onos/provider/of/device/impl/OpenFlowDeviceProvider.java
+++ b/providers/of/device/src/main/java/org/onlab/onos/provider/of/device/impl/OpenFlowDeviceProvider.java
@@ -117,7 +117,7 @@
sw.manfacturerDescription(),
sw.hardwareDescription(),
sw.softwareDescription(),
- sw.softwareDescription());
+ sw.serialNumber());
providerService.deviceConnected(deviceId(uri), description);
providerService.updatePorts(deviceId(uri), buildPortDescriptions(sw.getPorts()));
}