commit 809b5d71fe216250c9018d3b591e9060b0f9316c
author Yi Tseng <yi@opennetworking.org> Wed Aug 16 14:00:37 2017 -0700
committer Thomas Vachuska <tom@opennetworking.org> Wed Aug 23 23:13:04 2017 +0000
tree 8678d11c687c6ec5cb4ba5cbfc309f319be9680a
parent f43b3d5bb1e5f19cc6eaba27478f64e6b5571824

[ONOS-6933] Support packet request for different device scheme

Change-Id: If9658838c35b4d425f414c6d5c275c364e15e1a6

core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java b/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
index 490e0d5..ec783f0 100644
--- a/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
+++ b/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
@@ -16,7 +16,6 @@
 package org.onosproject.net.packet.impl;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
@@ -33,6 +32,8 @@
 import org.onosproject.net.device.DeviceEvent;
 import org.onosproject.net.device.DeviceListener;
 import org.onosproject.net.device.DeviceService;
+import org.onosproject.net.driver.Driver;
+import org.onosproject.net.driver.DriverService;
 import org.onosproject.net.flow.DefaultTrafficTreatment;
 import org.onosproject.net.flow.TrafficSelector;
 import org.onosproject.net.flow.TrafficTreatment;
@@ -62,7 +63,6 @@
 
 import java.util.List;
 import java.util.Optional;
-import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -89,6 +89,7 @@
     private static final String ERROR_NULL_SELECTOR = "Selector cannot be null";
     private static final String ERROR_NULL_APP_ID = "Application ID cannot be null";
     private static final String ERROR_NULL_DEVICE_ID = "Device ID cannot be null";
+    private static final String SUPPORT_PACKET_REQUEST_PROPERTY = "supportPacketRequest";
 
     private final PacketStoreDelegate delegate = new InternalStoreDelegate();
 
@@ -102,6 +103,9 @@
     protected DeviceService deviceService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+    protected DriverService driverService;
+
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected PacketStore store;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
@@ -259,11 +263,6 @@
     }
 
     /**
-     * Set of DeviceId scheme which supports packet requests.
-     */
-    private static final Set<String> SUPPORTED = ImmutableSet.of("of");
-
-    /**
      * Pushes a packet request flow rule to all devices.
      *
      * @param request the packet request
@@ -271,8 +270,9 @@
     private void pushToAllDevices(PacketRequest request) {
         log.debug("Pushing packet request {} to all devices", request);
         for (Device device : deviceService.getDevices()) {
-            // TODO properly test capability via driver, defining behaviour
-            if (SUPPORTED.contains(device.id().uri().getScheme())) {
+            Driver driver = driverService.getDriver(device.id());
+            if (driver != null &&
+                    Boolean.parseBoolean(driver.getProperty(SUPPORT_PACKET_REQUEST_PROPERTY))) {
                 pushRule(device, request);
             }
         }
@@ -446,12 +446,20 @@
             eventHandlingExecutor.execute(() -> {
                 try {
                     Device device = event.subject();
+                    Driver driver = driverService.getDriver(device.id());
+                    if (driver == null) {
+                        return;
+                    }
+                    if (!Boolean.parseBoolean(driver.getProperty(SUPPORT_PACKET_REQUEST_PROPERTY))) {
+                        return;
+                    }
+                    if (!deviceService.isAvailable(event.subject().id())) {
+                        return;
+                    }
                     switch (event.type()) {
                         case DEVICE_ADDED:
                         case DEVICE_AVAILABILITY_CHANGED:
-                            if (deviceService.isAvailable(event.subject().id())) {
-                                pushRulesToDevice(device);
-                            }
+                            pushRulesToDevice(device);
                             break;
                         default:
                             break;