mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-18 10:51:04 +02:00
Code Issues Projects Releases Wiki Activity

Minor fixes for P4Runtime devices

Browse Source 
- Push ports before device is marked online
- Do not notify role NONE on device disconnection (otherwise the
DeviceManager won't mark the device as offline if there's not a master)
- Detect changes in the pipeconf extensions when reloading a pipeconf

Change-Id: I1779987da1269ec98c71b2ccda7bb579be5bf3f0
This commit is contained in:
Carmelo Cascone 2019-04-13 01:22:25 -07:00
parent 5f7d3bc950
commit d51a555886
4 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
protocols/grpc/ctl/src/main/java/org/onosproject/grpc/ctl/AbstractGrpcClientController.java
View File

@ -101,6 +101,8 @@ public abstract class AbstractGrpcClientController
"A %s client already exists for %s", serviceName, deviceId));
}
log.info("Creating {}...", clientName(deviceId));
final C client;
try {
client = createClientInstance(deviceId, channel);
@ -133,6 +135,7 @@ public abstract class AbstractGrpcClientController
withDeviceLock(() -> {
final C client = clients.remove(deviceId);
if (client != null) {
log.info("Removing {}...", clientName(deviceId));
client.shutdown();
}
return null;

15
protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/client/StreamClientImpl.java
View File

@ -397,11 +397,16 @@ public final class StreamClientImpl implements P4RuntimeStreamClient {
void signalClosed() {
synchronized (this) {
final boolean wasOpen = open.getAndSet(false);
if (wasOpen) {
// We lost any valid mastership role.
controller.postEvent(new DeviceAgentEvent(
DeviceAgentEvent.Type.ROLE_NONE, deviceId));
}
// FIXME: in case of device disconnection, all clients will
// signal role NONE, preventing the DeviceManager to mark the
// device as offline, as only the master can do that. We should
// change the DeviceManager. For now, we disable signaling role
// NONE.
// if (wasOpen) {
// // We lost any valid mastership role.
// controller.postEvent(new DeviceAgentEvent(
// DeviceAgentEvent.Type.ROLE_NONE, deviceId));
// }
}
}

9
protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/utils/PipeconfHelper.java
View File

@ -22,7 +22,6 @@ import com.google.common.collect.Maps;
import com.google.protobuf.ExtensionRegistry;
import com.google.protobuf.TextFormat;
import org.onosproject.net.pi.model.PiPipeconf;
import org.onosproject.net.pi.model.PiPipeconfId;
import org.slf4j.Logger;
import p4.config.v1.P4InfoOuterClass.P4Info;
@ -44,10 +43,10 @@ public final class PipeconfHelper {
private static final int P4INFO_BROWSER_EXPIRE_TIME_IN_MIN = 10;
private static final Logger log = getLogger(PipeconfHelper.class);
private static final Cache<PiPipeconfId, P4InfoBrowser> BROWSERS = CacheBuilder.newBuilder()
private static final Cache<Long, P4InfoBrowser> BROWSERS = CacheBuilder.newBuilder()
.expireAfterAccess(P4INFO_BROWSER_EXPIRE_TIME_IN_MIN, TimeUnit.MINUTES)
.build();
private static final Map<PiPipeconfId, P4Info> P4INFOS = Maps.newConcurrentMap();
private static final Map<Long, P4Info> P4INFOS = Maps.newConcurrentMap();
private PipeconfHelper() {
// hide.
@ -61,7 +60,7 @@ public final class PipeconfHelper {
* @return P4Info or null
*/
public static P4Info getP4Info(PiPipeconf pipeconf) {
return P4INFOS.computeIfAbsent(pipeconf.id(), piPipeconfId -> {
return P4INFOS.computeIfAbsent(pipeconf.fingerprint(), piPipeconfId -> {
if (!pipeconf.extension(P4_INFO_TEXT).isPresent()) {
log.warn("Missing P4Info extension in pipeconf {}", pipeconf.id());
return null;
@ -90,7 +89,7 @@ public final class PipeconfHelper {
*/
public static P4InfoBrowser getP4InfoBrowser(PiPipeconf pipeconf) {
try {
return BROWSERS.get(pipeconf.id(), () -> {
return BROWSERS.get(pipeconf.fingerprint(), () -> {
P4Info p4info = PipeconfHelper.getP4Info(pipeconf);
if (p4info == null) {
return null;

7
providers/general/device/src/main/java/org/onosproject/provider/general/device/impl/GeneralDeviceProvider.java
View File

@ -670,13 +670,14 @@ public class GeneralDeviceProvider extends AbstractProvider
return;
}
assertConfig(deviceId);
providerService.deviceConnected(deviceId, getDeviceDescription(
deviceId, available));
if (available) {
// Push port descriptions.
// Push port descriptions. If marking online, make sure to update
// ports before other subsystems pick up the device event.
final List<PortDescription> ports = getPortDetails(deviceId);
providerService.updatePorts(deviceId, ports);
}
providerService.deviceConnected(deviceId, getDeviceDescription(
deviceId, available));
}
private boolean probeAvailability(DeviceHandshaker handshaker) {