commit 44448a52cc33139242768f88c909456b1f825229
author Carmelo Cascone <carmelo@opennetworking.org> Mon Jun 25 23:36:57 2018 +0200
committer Carmelo Cascone <carmelo@opennetworking.org> Tue Jun 26 12:23:29 2018 +0000
tree 0dabc63a2c12b35cc904a811fdef747b88b1f900
parent af1fa39a53c0016e92c1de246807879c16f507d6

Allow re-creating clients for the same P4Runtime addr-port

Change-Id: Ib3de10d047f52dd28511e71385773d4b4a9ad74f

drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/AbstractP4RuntimeHandlerBehaviour.java

diff --git a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/AbstractP4RuntimeHandlerBehaviour.java b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/AbstractP4RuntimeHandlerBehaviour.java
index 8783adc..8e2b54d 100644
--- a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/AbstractP4RuntimeHandlerBehaviour.java
+++ b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/AbstractP4RuntimeHandlerBehaviour.java
@@ -16,8 +16,6 @@
 
 package org.onosproject.drivers.p4runtime;
 
-import io.grpc.ManagedChannelBuilder;
-import io.grpc.netty.NettyChannelBuilder;
 import org.onosproject.net.Device;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.device.DeviceService;
@@ -100,9 +98,9 @@
         deviceId = handler().data().deviceId();
         controller = handler().get(P4RuntimeController.class);
 
-        String serverAddr = this.data().value(P4RUNTIME_SERVER_ADDR_KEY);
-        String serverPortString = this.data().value(P4RUNTIME_SERVER_PORT_KEY);
-        String p4DeviceIdString = this.data().value(P4RUNTIME_DEVICE_ID_KEY);
+        final String serverAddr = this.data().value(P4RUNTIME_SERVER_ADDR_KEY);
+        final String serverPortString = this.data().value(P4RUNTIME_SERVER_PORT_KEY);
+        final String p4DeviceIdString = this.data().value(P4RUNTIME_DEVICE_ID_KEY);
 
         if (serverAddr == null || serverPortString == null || p4DeviceIdString == null) {
             log.warn("Unable to create client for {}, missing driver data key (required is {}, {}, and {})",
@@ -110,11 +108,9 @@
             return false;
         }
 
-        ManagedChannelBuilder channelBuilder = NettyChannelBuilder
-                .forAddress(serverAddr, Integer.valueOf(serverPortString))
-                .usePlaintext(true);
-
-        if (!controller.createClient(deviceId, Long.parseUnsignedLong(p4DeviceIdString), channelBuilder)) {
+        if (!controller.createClient(deviceId, serverAddr,
+                                     Integer.parseUnsignedInt(serverPortString),
+                                     Long.parseUnsignedLong(p4DeviceIdString))) {
             log.warn("Unable to create client for {}, aborting operation", deviceId);
             return false;
         }