mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-12-08 19:02:00 +01:00
Code Issues Projects Releases Wiki Activity

Show chassisId in CLI and fix UI string

Browse Source 
Change-Id: Iec755760d7c8a3a52502768f903d867907709543
This commit is contained in:
Andrea Campanella 2018-05-02 15:13:54 +02:00 committed by Thomas Vachuska
parent d9af042fb1
commit ab7d9abd45
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cli/src/main/java/org/onosproject/cli/net/DevicesListCommand.java
View File

@ -41,7 +41,8 @@ import static com.google.common.collect.Lists.newArrayList;
public class DevicesListCommand extends AbstractShellCommand { public class DevicesListCommand extends AbstractShellCommand {
private static final String FMT = private static final String FMT =
"id=%s, available=%s, local-status=%s, role=%s, type=%s, mfr=%s, hw=%s, sw=%s, serial=%s, driver=%s%s"; "id=%s, available=%s, local-status=%s, role=%s, type=%s, mfr=%s, hw=%s, sw=%s, " +
"serial=%s, chassis=%s, driver=%s%s";
private static final String FMT_SHORT = private static final String FMT_SHORT =
"id=%s, available=%s, role=%s, type=%s, driver=%s"; "id=%s, available=%s, role=%s, type=%s, driver=%s";
@ -106,7 +107,7 @@ public class DevicesListCommand extends AbstractShellCommand {
deviceService.localStatus(device.id()), deviceService.localStatus(device.id()),
deviceService.getRole(device.id()), device.type(), deviceService.getRole(device.id()), device.type(),
device.manufacturer(), device.hwVersion(), device.swVersion(), device.manufacturer(), device.hwVersion(), device.swVersion(),
device.serialNumber(), driver, device.serialNumber(), device.chassisId(), driver,
annotations(device.annotations(), ImmutableSet.of(AnnotationKeys.DRIVER))); annotations(device.annotations(), ImmutableSet.of(AnnotationKeys.DRIVER)));
} }
} }

2
web/gui/src/main/webapp/app/view/device/device.js
View File

@ -88,7 +88,7 @@
'URI': device.id, 'URI': device.id,
'Type': device.type, 'Type': device.type,
'Master ID': details['masterid'], 'Master ID': details['masterid'],
'Chassis ID': details['chassid'], 'Chassis ID': details['chassisid'],
'Vendor': device.mfr, 'Vendor': device.mfr,
'H/W Version': device.hw, 'H/W Version': device.hw,
'S/W Version': device.sw, 'S/W Version': device.sw,