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

Fixing possibile NPE in gNMI ports discovery

Browse Source 
Change-Id: Ie942fecf07adeb1fe6cb698b73cb90b1ce3c141f
This commit is contained in:
Andrea Campanella 2018-01-31 19:06:49 +01:00
parent 693c38cf83
commit de76c2c01e
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/gnmi/src/main/java/org/onosproject/drivers/gnmi/GnmiDeviceDescriptionDiscovery.java
View File

@ -83,8 +83,17 @@ public class GnmiDeviceDescriptionDiscovery
public List<PortDescription> discoverPortDetails() {
log.info("Discovering port details on device {}", handler().data().deviceId());
String serverAddr = this.data().value(GNMI_SERVER_ADDR_KEY);
String serverPortString = this.data().value(GNMI_SERVER_PORT_KEY);
if (serverAddr == null || serverPortString == null ||
serverAddr.isEmpty() || serverPortString.isEmpty()) {
log.warn("gNMI server information not provided, can't discover ports");
return ImmutableList.of();
}
// Get the channel
ManagedChannel channel = getChannel();
ManagedChannel channel = getChannel(serverAddr, serverPortString);
if (channel == null) {
return ImmutableList.of();
@ -112,7 +121,7 @@ public class GnmiDeviceDescriptionDiscovery
} catch (InterruptedException | ExecutionException | TimeoutException
| StatusRuntimeException e) {
log.warn("Unable to discover ports from {}: {}",
data().deviceId(), e.getMessage());
data().deviceId(), e.getMessage());
log.debug("{}", e);
return ImmutableList.of();
} finally {
@ -127,11 +136,9 @@ public class GnmiDeviceDescriptionDiscovery
*
* @return the managed channel
*/
private ManagedChannel getChannel() {
private ManagedChannel getChannel(String serverAddr, String serverPortString) {
DeviceId deviceId = handler().data().deviceId();
String serverAddr = this.data().value(GNMI_SERVER_ADDR_KEY);
String serverPortString = this.data().value(GNMI_SERVER_PORT_KEY);
GrpcController controller = handler().get(GrpcController.class);
ManagedChannel channel = null;
@ -162,7 +169,7 @@ public class GnmiDeviceDescriptionDiscovery
channel = controller.connectChannel(newChannelId, channelBuilder);
} catch (IOException e) {
log.warn("Unable to connect to gRPC server of {}: {}",
deviceId, e.getMessage());
deviceId, e.getMessage());
}
}
return channel;
@ -221,7 +228,7 @@ public class GnmiDeviceDescriptionDiscovery
@Override
public void onError(Throwable throwable) {
log.warn("Error on stream channel for {}: {}",
data().deviceId(), Status.fromThrowable(throwable));
data().deviceId(), Status.fromThrowable(throwable));
log.debug("{}", throwable);
}