Refactor channel and mastership handling in P4Runtime
This (big) change aims at solving the issue observed with mastership flapping
and device connection/disconnection with P4Runtime.
Channel handling is now based on the underlying gRPC channel state. Before,
channel events (open/close/error) were generated as a consequence of P4Runtime
StreamChannel events, making device availability dependent on mastership. Now
Stream Channel events only affect mastership (MASTER/STANDBY or NONE when the
SteamChannel RPC is not active).
Mastership handling has been refactored to generate P4Runtime election IDs that
are compatible with the mastership preference decided by the MastershipService.
GeneralDeviceProvider has been re-implemented to support in-order
device event processing and to reduce implementation complexity. Stats polling
has been moved to a separate component, and netcfg handling updated to only
depend on BasicDeviceConfig, augmented with a pipeconf field, and re-using the
managementAddress field to set the gRPC server endpoints (e.g.
grpc://myswitch.local:50051). Before it was depending on 3 different config
classes, making hard to detect changes.
Finally, this change affects some core interfaces:
- Adds a method to DeviceProvider and DeviceHandshaker to check for device
availability, making the meaning of availability device-specific. This is needed
in cases where the device manager needs to change the availability state of a
device (as in change #20842)
- Support device providers not capable of reconciling mastership role responses
with requests (like P4Runtime).
- Clarify the meaning of "connection" in the DeviceConnect behavior.
- Allows driver-based providers to check devices for reachability and
availability without probing the device via the network.
Change-Id: I7ff30d29f5d02ad938e3171536e54ae2916629a2
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricIntProgrammable.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricIntProgrammable.java
index a2bf569..d593262 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricIntProgrammable.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricIntProgrammable.java
@@ -16,9 +16,6 @@
package org.onosproject.pipelines.fabric;
import com.google.common.collect.Sets;
-import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.component.annotations.ReferenceCardinality;
-
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
import org.onosproject.inbandtelemetry.api.IntConfig;
@@ -28,6 +25,7 @@
import org.onosproject.net.DeviceId;
import org.onosproject.net.PortNumber;
import org.onosproject.net.config.NetworkConfigService;
+import org.onosproject.net.device.DeviceService;
import org.onosproject.net.flow.DefaultFlowRule;
import org.onosproject.net.flow.DefaultTrafficSelector;
import org.onosproject.net.flow.DefaultTrafficTreatment;
@@ -44,7 +42,8 @@
import org.onosproject.net.pi.model.PiTableId;
import org.onosproject.net.pi.runtime.PiAction;
import org.onosproject.net.pi.runtime.PiActionParam;
-import org.onosproject.provider.general.device.api.GeneralProviderDeviceConfig;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
import java.util.Set;
import java.util.stream.Collectors;
@@ -107,30 +106,27 @@
return false;
}
- final GeneralProviderDeviceConfig cfg = cfgService.getConfig(
- deviceId, GeneralProviderDeviceConfig.class);
- if (cfg == null) {
- log.warn("Missing GeneralProviderDevice config for {}", deviceId);
- return false;
- }
- final String switchId = cfg.protocolsInfo().containsKey("int") ?
- cfg.protocolsInfo().get("int").configValues().get("switchId")
- : null;
- if (switchId == null || switchId.isEmpty()) {
- log.warn("Missing INT device config for {}", deviceId);
- return false;
- }
+ // FIXME: create config class for INT to allow specifying arbitrary
+ // switch IDs. The one for the GeneralDeviceProvider was temporary and
+ // now has been removed. For now we use the chassis ID.
+ // final GeneralProviderDeviceConfig cfg = cfgService.getConfig(
+ // deviceId, GeneralProviderDeviceConfig.class);
+ // if (cfg == null) {
+ // log.warn("Missing GeneralProviderDevice config for {}", deviceId);
+ // return false;
+ // }
+ // final String switchId = cfg.protocolsInfo().containsKey("int") ?
+ // cfg.protocolsInfo().get("int").configValues().get("switchId")
+ // : null;
+ // if (switchId == null || switchId.isEmpty()) {
+ // log.warn("Missing INT device config for {}", deviceId);
+ // return false;
+ // }
- PiActionParam transitIdParam;
- try {
- transitIdParam = new PiActionParam(
- FabricConstants.SWITCH_ID,
- // FIXME set switch ID from netcfg
- copyFrom(Integer.parseInt(switchId)));
- } catch (NumberFormatException e) {
- log.warn("Invalid INT switch ID for {}: {}", deviceId, switchId);
- return false;
- }
+ PiActionParam transitIdParam = new PiActionParam(
+ FabricConstants.SWITCH_ID,
+ copyFrom(handler().get(DeviceService.class)
+ .getDevice(deviceId).chassisId().id()));
PiAction transitAction = PiAction.builder()
.withId(FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INIT_METADATA)