commit 5b240530a0fbd79aa2e5376739542cf97afa63b8
author Andrea Campanella <andrea@onlab.us> Fri Feb 05 09:44:41 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Fri Feb 05 19:46:47 2016 +0000
tree 0aa3c573ff205b1b341baf667e3cac981b9e7a9d
parent 0bfc2a1c8f082008c04efb9278c8058ed2b0b8d2

ONOS-3759 Packet fallback driver provider

Change-Id: I8d526f66200b68d21aad3bd88575f6021d10c9a1

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 c0a2286..ba16d13 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
@@ -89,19 +89,19 @@
     private final PacketStoreDelegate delegate = new InternalStoreDelegate();
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    private CoreService coreService;
+    protected CoreService coreService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    private ClusterService clusterService;
+    protected ClusterService clusterService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    private DeviceService deviceService;
+    protected DeviceService deviceService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    private FlowRuleService flowService;
+    protected FlowRuleService flowService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    private PacketStore store;
+    protected PacketStore store;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     private FlowObjectiveService objectiveService;
@@ -112,6 +112,8 @@
 
     private final List<ProcessorEntry> processors = Lists.newCopyOnWriteArrayList();
 
+    private final  PacketDriverProvider defaultProvider = new PacketDriverProvider();
+
     private ApplicationId appId;
     private NodeId localNodeId;
 
@@ -124,6 +126,7 @@
         store.setDelegate(delegate);
         deviceService.addListener(deviceListener);
         store.existingRequests().forEach(this::pushToAllDevices);
+        defaultProvider.init(deviceService);
         log.info("Started");
     }
 
@@ -136,6 +139,11 @@
     }
 
     @Override
+    protected PacketProvider defaultProvider() {
+        return defaultProvider;
+    }
+
+    @Override
     public void addProcessor(PacketProcessor processor, int priority) {
         checkPermission(PACKET_EVENT);
         checkNotNull(processor, "Processor cannot be null");
@@ -374,7 +382,7 @@
     /**
      * Internal callback from the packet store.
      */
-    private class InternalStoreDelegate implements PacketStoreDelegate {
+    protected class InternalStoreDelegate implements PacketStoreDelegate {
         @Override
         public void notify(PacketEvent event) {
             localEmit(event.subject());