mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-05 12:16:13 +02:00
Code Issues Projects Releases Wiki Activity

[SDFAB-944] Add support for id leaf in GNMI driver

Browse Source 
The id is available through /interfaces/interface[name=*]/state/id,
if the device does not support `id` leaf uses as fall back ifindex

Change-Id: I22ff5e1df11485ba277644778f4309b1bd407849
This commit is contained in:
pierventre 2022-01-31 13:14:46 +01:00 committed by Pier Luigi Ventre
parent 3a454444d0
commit da5ccab063
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/gnmi/src/main/java/org/onosproject/drivers/gnmi/OpenConfigGnmiDeviceDescriptionDiscovery.java
View File

@ -92,6 +92,7 @@ public class OpenConfigGnmiDeviceDescriptionDiscovery
final Map<String, DefaultPortDescription.Builder> ports = Maps.newHashMap();
final Map<String, DefaultAnnotations.Builder> annotations = Maps.newHashMap();
final Map<String, PortNumber> portIds = Maps.newHashMap();
// Creates port descriptions with port name and port number
response.getNotificationList()
@ -106,7 +107,7 @@ public class OpenConfigGnmiDeviceDescriptionDiscovery
}
final DefaultPortDescription.Builder builder = ports.get(ifName);
final DefaultAnnotations.Builder annotationsBuilder = annotations.get(ifName);
parseInterfaceInfo(update, ifName, builder, annotationsBuilder);
parseInterfaceInfo(update, ifName, builder, annotationsBuilder, portIds);
});
});
@ -117,9 +118,14 @@ public class OpenConfigGnmiDeviceDescriptionDiscovery
if (!annotationsBuilder.build().keys().contains(LAST_CHANGE)) {
annotationsBuilder.set(LAST_CHANGE, String.valueOf(0));
}
// Override port number if /interfaces/interface/state/id is available
if (portIds.containsKey(key)) {
value.withPortNumber(portIds.get(key));
}
DefaultAnnotations annotation = annotations.get(key).build();
portDescriptionList.add(value.annotations(annotation).build());
});
return portDescriptionList;
}
@ -144,15 +150,17 @@ public class OpenConfigGnmiDeviceDescriptionDiscovery
private void parseInterfaceInfo(Update update,
String ifName,
DefaultPortDescription.Builder builder,
DefaultAnnotations.Builder annotationsBuilder) {
DefaultAnnotations.Builder annotationsBuilder,
Map<String, PortNumber> portIds) {
final Path path = update.getPath();
final List<PathElem> elems = path.getElemList();
final Gnmi.TypedValue val = update.getVal();
if (elems.size() == 4) {
// /interfaces/interface/state/ifindex
// /interfaces/interface/state/oper-status
// /interfaces/interface/state/last-change
/* /interfaces/interface/state/ifindex
/interfaces/interface/state/oper-status
/interfaces/interface/state/last-change
/interfaces/interface/state/id */
final String pathElemName = elems.get(3).getName();
switch (pathElemName) {
case "ifindex": // port number
@ -164,6 +172,12 @@ public class OpenConfigGnmiDeviceDescriptionDiscovery
case "last-change":
annotationsBuilder.set(LAST_CHANGE, String.valueOf(val.getUintVal()));
return;
case "id":
/* Temporary stored in portIds and eventually substituted
when all updates have been processed. This is done because
there is no guarantee about the order of the updates delivery */
portIds.put(ifName, PortNumber.portNumber(val.getUintVal(), ifName));
return;
default:
break;
}