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

Avoid throwing NPE when SID or Loopback is not configured

Browse Source 
Change-Id: I577f21c53d42b27c7cf0bcd8d80817558b00ebf6
This commit is contained in:
Charles Chan 2018-10-02 12:52:29 -07:00 committed by Charles Chan
parent 5f5ceb66a4
commit 6fa516ec0e
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
View File

@ -67,8 +67,8 @@ public class DeviceConfiguration implements DeviceProperties {
private SegmentRoutingManager srManager;
private class SegmentRouterInfo {
int ipv4NodeSid;
int ipv6NodeSid;
int ipv4NodeSid = -1;
int ipv6NodeSid = -1;
DeviceId deviceId;
Ip4Address ipv4Loopback;
Ip6Address ipv6Loopback;
@ -271,9 +271,15 @@ public class DeviceConfiguration implements DeviceProperties {
* @return node segment id, or -1 if not found in config
*/
public int getIPv4SegmentId(Ip4Address routerAddress) {
for (Map.Entry<DeviceId, SegmentRouterInfo> entry:
deviceConfigMap.entrySet()) {
for (Map.Entry<DeviceId, SegmentRouterInfo> entry: deviceConfigMap.entrySet()) {
Ip4Address ipv4Loopback = entry.getValue().ipv4Loopback;
if (ipv4Loopback == null) {
continue;
}
if (entry.getValue().ipv4Loopback.equals(routerAddress)) {
if (entry.getValue().ipv4NodeSid == -1) {
continue;
}
return entry.getValue().ipv4NodeSid;
}
}
@ -288,9 +294,15 @@ public class DeviceConfiguration implements DeviceProperties {
* @return node segment id, or -1 if not found in config
*/
public int getIPv6SegmentId(Ip6Address routerAddress) {
for (Map.Entry<DeviceId, SegmentRouterInfo> entry:
deviceConfigMap.entrySet()) {
for (Map.Entry<DeviceId, SegmentRouterInfo> entry: deviceConfigMap.entrySet()) {
Ip6Address ipv6Loopback = entry.getValue().ipv6Loopback;
if (ipv6Loopback == null) {
continue;
}
if (entry.getValue().ipv6Loopback.equals(routerAddress)) {
if (entry.getValue().ipv6NodeSid == -1) {
continue;
}
return entry.getValue().ipv6NodeSid;
}
}