learning switch shifted to new data broker API

Change-Id: Ib74861c69490a5dc259bfe94c2c03c10ec91cb57
Signed-off-by: Martin Bobak <mbobak@cisco.com>

diff --git a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/Activator.java b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/Activator.java
index 75e65f708b0a99854ce89954e17d80b686f61d06..9ee9a1e681eb5f024da41c996a81d4a99c8a84db 100644 (file)
--- a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/Activator.java
+++ b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/Activator.java
@@ -7,10 +7,10 @@
  */
 package org.opendaylight.openflowplugin.learningswitch;
 
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.sal.binding.api.AbstractBindingAwareConsumer;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerContext;
 import org.opendaylight.controller.sal.binding.api.NotificationService;
-import org.opendaylight.controller.sal.binding.api.data.DataBrokerService;
 import org.opendaylight.openflowplugin.learningswitch.multi.LearningSwitchManagerMultiImpl;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService;
 import org.osgi.framework.BundleContext;
@@ -19,26 +19,25 @@ import org.slf4j.LoggerFactory;
 
 /**
  * learning switch activator
- * 
+ * <p/>
  * Activator is derived from AbstractBindingAwareConsumer, which takes care
  * of looking up MD-SAL in Service Registry and registering consumer
  * when MD-SAL is present.
  */
 public class Activator extends AbstractBindingAwareConsumer implements AutoCloseable {
-    
+
     private static final Logger LOG = LoggerFactory.getLogger(Activator.class);
 
     private LearningSwitchManager learningSwitch;
 
-    
+
     @Override
     protected void startImpl(BundleContext context) {
         LOG.info("startImpl() passing");
     }
-    
+
     /**
      * Invoked when consumer is registered to the MD-SAL.
-     * 
      */
     @Override
     public void onSessionInitialized(ConsumerContext session) {
@@ -46,15 +45,15 @@ public class Activator extends AbstractBindingAwareConsumer implements AutoClose
         /**
          * We create instance of our LearningSwitchManager
          * and set all required dependencies,
-         * 
+         *
          * which are 
          *   Data Broker (data storage service) - for configuring flows and reading stored switch state
          *   PacketProcessingService - for sending out packets
          *   NotificationService - for receiving notifications such as packet in.
-         * 
+         *
          */
         learningSwitch = new LearningSwitchManagerMultiImpl();
-        learningSwitch.setDataBroker(session.getSALService(DataBrokerService.class));
+        learningSwitch.setDataBroker(session.getSALService(DataBroker.class));
         learningSwitch.setPacketProcessingService(session.getRpcService(PacketProcessingService.class));
         learningSwitch.setNotificationService(session.getSALService(NotificationService.class));
         learningSwitch.start();
@@ -67,7 +66,7 @@ public class Activator extends AbstractBindingAwareConsumer implements AutoClose
             learningSwitch.stop();
         }
     }
-    
+
     @Override
     protected void stopImpl(BundleContext context) {
         close();

diff --git a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/DataChangeListenerRegistrationHolder.java b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/DataChangeListenerRegistrationHolder.java
index b52951fdf605c607339f04dcd81c5d4ee558a79e..a480ec49159013af2c21f4b954c2550a67c3a56f 100644 (file)
--- a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/DataChangeListenerRegistrationHolder.java
+++ b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/DataChangeListenerRegistrationHolder.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.openflowplugin.learningswitch;
 
-import org.opendaylight.controller.sal.binding.api.data.DataChangeListener;
+import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 
 /**

diff --git a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/FlowCommitWrapper.java b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/FlowCommitWrapper.java
index 3294a1bd12eaff39dd785d3780f5e91fdb013e10..4d3de684cae35ec5b96a7a54607051c587366279 100644 (file)
--- a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/FlowCommitWrapper.java
+++ b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/FlowCommitWrapper.java
@@ -8,9 +8,11 @@
 
 package org.opendaylight.openflowplugin.learningswitch;
 
+import com.google.common.util.concurrent.CheckedFuture;
 import java.util.concurrent.Future;
 
 import org.opendaylight.controller.md.sal.common.api.TransactionStatus;
+import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.RpcResult;
@@ -29,6 +31,6 @@ public interface FlowCommitWrapper {
      * @return transaction commit 
      * 
      */
-    Future<RpcResult<TransactionStatus>> writeFlowToConfig(InstanceIdentifier<Flow> flowPath, Flow flowBody);
+    CheckedFuture<Void, TransactionCommitFailedException> writeFlowToConfig(InstanceIdentifier<Flow> flowPath, Flow flowBody);
 
 }

diff --git a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/FlowCommitWrapperImpl.java b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/FlowCommitWrapperImpl.java
index ae12b0eecf1a07af39aded103898849de802e119..b8af120fce888fbd72a9e0ba424b00e382602df0 100644 (file)
--- a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/FlowCommitWrapperImpl.java
+++ b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/FlowCommitWrapperImpl.java
@@ -8,35 +8,37 @@
 
 package org.opendaylight.openflowplugin.learningswitch;
 
+import com.google.common.util.concurrent.CheckedFuture;
 import java.util.concurrent.Future;
-
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.TransactionStatus;
-import org.opendaylight.controller.sal.binding.api.data.DataBrokerService;
-import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction;
+import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 
 /**
- * 
+ *
  */
 public class FlowCommitWrapperImpl implements FlowCommitWrapper {
-    
-    private DataBrokerService dataBrokerService;
+
+    private DataBroker dataBrokerService;
 
     /**
      * @param dataBrokerService
      */
-    public FlowCommitWrapperImpl(DataBrokerService dataBrokerService) {
+    public FlowCommitWrapperImpl(DataBroker dataBrokerService) {
         this.dataBrokerService = dataBrokerService;
     }
 
     @Override
-    public Future<RpcResult<TransactionStatus>> writeFlowToConfig(InstanceIdentifier<Flow> flowPath, 
-            Flow flowBody) {
-        DataModificationTransaction addFlowTransaction = dataBrokerService.beginTransaction();
-        addFlowTransaction.putConfigurationData(flowPath, flowBody);
-        return addFlowTransaction.commit();
+    public CheckedFuture<Void, TransactionCommitFailedException> writeFlowToConfig(InstanceIdentifier<Flow> flowPath,
+                                                                  Flow flowBody) {
+        ReadWriteTransaction addFlowTransaction = dataBrokerService.newReadWriteTransaction();
+        addFlowTransaction.put(LogicalDatastoreType.CONFIGURATION, flowPath, flowBody);
+        return addFlowTransaction.submit();
     }
 
 }

diff --git a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/LearningSwitchManager.java b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/LearningSwitchManager.java
index 9316506a7a3b2eefbba76eb79a94dde62581e855..3b992b2330303bb41e6abdd3ae2ba16c7ae24afb 100644 (file)
--- a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/LearningSwitchManager.java
+++ b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/LearningSwitchManager.java
@@ -8,12 +8,13 @@
 
 package org.opendaylight.openflowplugin.learningswitch;
 
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.sal.binding.api.NotificationService;
 import org.opendaylight.controller.sal.binding.api.data.DataBrokerService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService;
 
 /**
- * 
+ *
  */
 public interface LearningSwitchManager {
 
@@ -29,27 +30,28 @@ public interface LearningSwitchManager {
 
     /**
      * Set's Data Broker dependency.
-     * 
+     * <p/>
      * Data Broker is used to access overal operational and configuration
      * tree.
-     * 
-     *  In simple Learning Switch handler, data broker is used to listen 
-     *  for changes in Openflow tables and to configure flows which will
-     *  be provisioned down to the Openflow switch.
-     * 
-     * inject {@link DataBrokerService}
+     * <p/>
+     * In simple Learning Switch handler, data broker is used to listen
+     * for changes in Openflow tables and to configure flows which will
+     * be provisioned down to the Openflow switch.
+     * <p/>
+     * inject {@link DataBroker}
+     *
      * @param data
      */
-    void setDataBroker(DataBrokerService data);
+    void setDataBroker(DataBroker data);
 
     /**
      * Set's Packet Processing dependency.
-     * 
+     * <p/>
      * Packet Processing service is used to send packet Out on Openflow
      * switch.
-     * 
+     * <p/>
      * inject {@link PacketProcessingService}
-     * 
+     *
      * @param packetProcessingService
      */
     void setPacketProcessingService(
@@ -57,11 +59,12 @@ public interface LearningSwitchManager {
 
     /**
      * Set's Notification service dependency.
-     * 
-     * Notification service is used to register for listening 
+     * <p/>
+     * Notification service is used to register for listening
      * packet-in notifications.
-     * 
+     * <p/>
      * inject {@link NotificationService}
+     *
      * @param notificationService
      */
     void setNotificationService(NotificationService notificationService);

diff --git a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/LearningSwitchManagerSimpleImpl.java b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/LearningSwitchManagerSimpleImpl.java
index 78169fe8d03e2ff160fb81e3fdaab8e371812c10..2debfe2f4f6b6b2846b9a4aeaaafeae9e2bc2404 100644 (file)
--- a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/LearningSwitchManagerSimpleImpl.java
+++ b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/LearningSwitchManagerSimpleImpl.java
@@ -7,9 +7,10 @@
  */
 package org.opendaylight.openflowplugin.learningswitch;
 
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
+import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.sal.binding.api.NotificationService;
-import org.opendaylight.controller.sal.binding.api.data.DataBrokerService;
-import org.opendaylight.controller.sal.binding.api.data.DataChangeListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.Table;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
@@ -39,11 +40,11 @@ public class LearningSwitchManagerSimpleImpl implements DataChangeListenerRegist
 
     private NotificationService notificationService;
     private PacketProcessingService packetProcessingService;
-    private DataBrokerService data;
+    private DataBroker data;
 
     private Registration packetInRegistration;
 
-    private ListenerRegistration<DataChangeListener> dataChangeListenerRegistration; 
+    private ListenerRegistration<DataChangeListener> dataChangeListenerRegistration;
     
     /**
      * @param notificationService the notificationService to set
@@ -66,7 +67,7 @@ public class LearningSwitchManagerSimpleImpl implements DataChangeListenerRegist
      * @param data the data to set
      */
     @Override
-    public void setDataBroker(DataBrokerService data) {
+    public void setDataBroker(DataBroker data) {
         this.data = data;
     }
 
@@ -86,12 +87,13 @@ public class LearningSwitchManagerSimpleImpl implements DataChangeListenerRegist
         
         WakeupOnNode wakeupListener = new WakeupOnNode();
         wakeupListener.setLearningSwitchHandler(learningSwitchHandler);
-        dataChangeListenerRegistration = data.registerDataChangeListener(
+        dataChangeListenerRegistration = data.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL,
                 InstanceIdentifier.builder(Nodes.class)
                     .child(Node.class)
                     .augmentation(FlowCapableNode.class)
                     .child(Table.class).toInstance(),
-                wakeupListener);
+                wakeupListener,
+                DataBroker.DataChangeScope.SUBTREE);
         LOG.debug("start() <--");
     }
     

diff --git a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/WakeupOnNode.java b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/WakeupOnNode.java
index 3ce3dd0bc368332e2f72968455b2773cb10f6a89..7a860ffed779b09ed5df28bf7b4b7f6578f93690 100644 (file)
--- a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/WakeupOnNode.java
+++ b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/WakeupOnNode.java
@@ -10,9 +10,8 @@ package org.opendaylight.openflowplugin.learningswitch;
 
 import java.util.Map;
 import java.util.Map.Entry;
-
-import org.opendaylight.controller.md.sal.common.api.data.DataChangeEvent;
-import org.opendaylight.controller.sal.binding.api.data.DataChangeListener;
+import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
+import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.Table;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@ -20,27 +19,28 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * 
+ *
  */
 public class WakeupOnNode implements DataChangeListener {
-    
+
     private static final Logger LOG = LoggerFactory
             .getLogger(WakeupOnNode.class);
-    
+
     private LearningSwitchHandler learningSwitchHandler;
 
     @Override
-    public void onDataChanged(DataChangeEvent<InstanceIdentifier<?>, DataObject> change) {
+    public void onDataChanged(AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> change) {
         Short requiredTableId = 0;
-        
+
         // TODO add flow
-        Map<InstanceIdentifier<?>, DataObject> updated = change.getUpdatedOperationalData();
+
+        Map<InstanceIdentifier<?>, DataObject> updated = change.getUpdatedData();
         for (Entry<InstanceIdentifier<?>, DataObject> updateItem : updated.entrySet()) {
             DataObject table = updateItem.getValue();
             if (table instanceof Table) {
                 Table tableSure = (Table) table;
                 LOG.trace("table: {}", table);
-                
+
                 if (requiredTableId.equals(tableSure.getId())) {
                     @SuppressWarnings("unchecked")
                     InstanceIdentifier<Table> tablePath = (InstanceIdentifier<Table>) updateItem.getKey();
@@ -49,7 +49,7 @@ public class WakeupOnNode implements DataChangeListener {
             }
         }
     }
-    
+
     /**
      * @param learningSwitchHandler the learningSwitchHandler to set
      */
@@ -57,4 +57,5 @@ public class WakeupOnNode implements DataChangeListener {
             LearningSwitchHandler learningSwitchHandler) {
         this.learningSwitchHandler = learningSwitchHandler;
     }
+
 }

diff --git a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/multi/LearningSwitchManagerMultiImpl.java b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/multi/LearningSwitchManagerMultiImpl.java
index aa3d565f5ba1d4499bbdfb4f9fc9ee071945b7c5..7af21a75651d2bb8309a0e7474d794fe3d6cf303 100644 (file)
--- a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/multi/LearningSwitchManagerMultiImpl.java
+++ b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/multi/LearningSwitchManagerMultiImpl.java
@@ -7,13 +7,14 @@
  */
 package org.opendaylight.openflowplugin.learningswitch.multi;
 
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
+import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.sal.binding.api.NotificationService;
-import org.opendaylight.controller.sal.binding.api.data.DataBrokerService;
-import org.opendaylight.controller.sal.binding.api.data.DataChangeListener;
 import org.opendaylight.openflowplugin.learningswitch.DataChangeListenerRegistrationHolder;
-import org.opendaylight.openflowplugin.learningswitch.LearningSwitchManager;
 import org.opendaylight.openflowplugin.learningswitch.FlowCommitWrapper;
 import org.opendaylight.openflowplugin.learningswitch.FlowCommitWrapperImpl;
+import org.opendaylight.openflowplugin.learningswitch.LearningSwitchManager;
 import org.opendaylight.openflowplugin.learningswitch.WakeupOnNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.Table;
@@ -23,33 +24,32 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.Pa
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.NotificationListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Listens to packetIn notification and 
+ * Listens to packetIn notification and
  * <ul>
  * <li>in HUB mode simply floods all switch ports (except ingress port)</li>
- * <li>in LSWITCH mode collects source MAC address of packetIn and bind it with ingress port. 
- * If target MAC address is already bound then a flow is created (for direct communication between 
+ * <li>in LSWITCH mode collects source MAC address of packetIn and bind it with ingress port.
+ * If target MAC address is already bound then a flow is created (for direct communication between
  * corresponding MACs)</li>
  * </ul>
  */
 public class LearningSwitchManagerMultiImpl implements DataChangeListenerRegistrationHolder,
         LearningSwitchManager {
-    
+
     protected static final Logger LOG = LoggerFactory
             .getLogger(LearningSwitchManagerMultiImpl.class);
 
     private NotificationService notificationService;
     private PacketProcessingService packetProcessingService;
-    private DataBrokerService data;
+    private DataBroker data;
 
     private Registration packetInRegistration;
 
-    private ListenerRegistration<DataChangeListener> dataChangeListenerRegistration; 
-    
+    private ListenerRegistration<DataChangeListener> dataChangeListenerRegistration;
+
     /**
      * @param notificationService the notificationService to set
      */
@@ -66,12 +66,12 @@ public class LearningSwitchManagerMultiImpl implements DataChangeListenerRegistr
             PacketProcessingService packetProcessingService) {
         this.packetProcessingService = packetProcessingService;
     }
-    
+
     /**
      * @param data the data to set
      */
     @Override
-    public void setDataBroker(DataBrokerService data) {
+    public void setDataBroker(DataBroker data) {
         this.data = data;
     }
 
@@ -90,20 +90,21 @@ public class LearningSwitchManagerMultiImpl implements DataChangeListenerRegistr
         learningSwitchHandler.setPacketProcessingService(packetProcessingService);
         learningSwitchHandler.setPacketInDispatcher(packetInDispatcher);
         packetInRegistration = notificationService.registerNotificationListener(packetInDispatcher);
-        
+
         WakeupOnNode wakeupListener = new WakeupOnNode();
         wakeupListener.setLearningSwitchHandler(learningSwitchHandler);
-        dataChangeListenerRegistration = data.registerDataChangeListener(
+        dataChangeListenerRegistration = data.registerDataChangeListener(LogicalDatastoreType.CONFIGURATION,
                 InstanceIdentifier.builder(Nodes.class)
-                    .child(Node.class)
-                    .augmentation(FlowCapableNode.class)
-                    .child(Table.class).toInstance(),
-                wakeupListener);
+                        .child(Node.class)
+                        .augmentation(FlowCapableNode.class)
+                        .child(Table.class).toInstance(),
+                wakeupListener,
+                DataBroker.DataChangeScope.SUBTREE);
         LOG.debug("start() <--");
     }
-    
+
     /**
-     * stopping learning switch 
+     * stopping learning switch
      */
     @Override
     public void stop() {
@@ -121,8 +122,8 @@ public class LearningSwitchManagerMultiImpl implements DataChangeListenerRegistr
         }
         LOG.debug("stop() <--");
     }
-    
-   
+
+
     @Override
     public ListenerRegistration<DataChangeListener> getDataChangeListenerRegistration() {
         return dataChangeListenerRegistration;