Merge "BUG-648: include yangtools.util package"

diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ComponentActivator.java b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ComponentActivator.java
index b3a89a4ff9bb3d90d99cb50278985398f466a566..ba68d523af7faf32efd1e17ee040558f7a4b1323 100644 (file)
--- a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ComponentActivator.java
+++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ComponentActivator.java
@@ -107,6 +107,7 @@ public class ComponentActivator extends ComponentActivatorAbstractBase {
                 nodeConnectorFactory,
                 topology,
                 tpProvider,
+                this // Used for setBroker callback
         };
     }
 

diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/DataPacketAdapter.java b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/DataPacketAdapter.java
index f95f97804f3d75d43f0dbb524893f51c9cdcd44d..4d26a3a09583c349211a848e286f9dac16f9a21f 100644 (file)
--- a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/DataPacketAdapter.java
+++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/DataPacketAdapter.java
@@ -17,13 +17,19 @@ import org.slf4j.LoggerFactory;
 
 class DataPacketAdapter implements PacketProcessingListener {
     private static final Logger LOG = LoggerFactory.getLogger(DataPacketAdapter.class);
+
+    // These are injected via Apache DM (see ComponentActivator)
     private IPluginOutDataPacketService dataPacketPublisher;
 
     @Override
     public void onPacketReceived(final PacketReceived packet) {
         try {
             RawPacket inPacket = toRawPacket(packet);
-            dataPacketPublisher.receiveDataPacket(inPacket);
+            if (dataPacketPublisher != null) {
+                dataPacketPublisher.receiveDataPacket(inPacket);
+            } else {
+                LOG.warn("IPluginOutDataPacketService is not available. Not forwarding packet to AD-SAL.");
+            }
         } catch (ConstructionException e) {
             LOG.warn("Failed to construct raw packet from {}, dropping it", packet, e);
         }
@@ -34,4 +40,13 @@ class DataPacketAdapter implements PacketProcessingListener {
         ret.setIncomingNodeConnector(NodeMapping.toADNodeConnector(received.getIngress()));
         return ret;
     }
+
+    public IPluginOutDataPacketService getDataPacketPublisher() {
+        return dataPacketPublisher;
+    }
+
+    // These are injected via Apache DM (see ComponentActivator)
+    public void setDataPacketPublisher(final IPluginOutDataPacketService dataPacketPublisher) {
+        this.dataPacketPublisher = dataPacketPublisher;
+    }
 }

diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/topology/TopologyAdapter.java b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/topology/TopologyAdapter.java
index b609addae48f78d948a0940a6c889fd0a44d0479..4e3cf69817a3f68eeeb5cf9f5bbaac4ef59512bc 100644 (file)
--- a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/topology/TopologyAdapter.java
+++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/topology/TopologyAdapter.java
@@ -23,8 +23,10 @@ public class TopologyAdapter implements IPluginInTopologyService {
     private final InstanceIdentifier<Topology> topology = InstanceIdentifier.builder(NetworkTopology.class)
             .child(Topology.class, new TopologyKey(new TopologyId("flow:1"))).toInstance();
 
-    // FIXME: seems to be unused
+    // Injected via Apache DM
     private IPluginOutTopologyService topologyPublisher;
+
+
     private DataProviderService dataService;
 
     public void setDataService(final DataProviderService dataService) {
@@ -37,4 +39,12 @@ public class TopologyAdapter implements IPluginInTopologyService {
         final Topology t = reader.readOperationalData(topology);
         topologyPublisher.edgeUpdate(TopologyMapping.toADEdgeUpdates(t, reader));
     }
+
+    public IPluginOutTopologyService getTopologyPublisher() {
+        return topologyPublisher;
+    }
+
+    public void setTopologyPublisher(final IPluginOutTopologyService topologyPublisher) {
+        this.topologyPublisher = topologyPublisher;
+    }
 }