Convert openflowplugin-it to use DTCL instead of DCL

Change-Id: I8a3f3b690bef5d29dcd9b51e243bd83ad5c501c6
Signed-off-by: Andrej Leitner <andrej.leitner@pantheon.tech>

diff --git a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPaxOptionsAssistant.java b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPaxOptionsAssistant.java
index 75c7f7ad8bd2521c62254ce562435de3249e7aa3..ba82ec0e661b407e028beacb65216f8a44db4165 100644 (file)
--- a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPaxOptionsAssistant.java
+++ b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPaxOptionsAssistant.java
@@ -54,7 +54,7 @@ public abstract class OFPaxOptionsAssistant {
         if (System.getProperty(INSPECT_OSGI) != null) {
             option
             .add(CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address="+DEBUG_PORT))
-            .add(CoreOptions.mavenBundle("equinoxSDK381", "org.eclipse.equinox.console").versionAsInProject()));
+            .add(CoreOptions.mavenBundle("equinoxSDK381", "org.eclipse.equinox.console").versionAsInProject());
         }
 
         return option;

diff --git a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPluginFlowTest.java b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPluginFlowTest.java
index a9ea510e3a84555952320dcafc52b8a362452b80..866080481dd275fbc4c2f57c83b37738e88f88d0 100644 (file)
--- a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPluginFlowTest.java
+++ b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPluginFlowTest.java
@@ -16,12 +16,13 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import java.math.BigInteger;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Deque;
 import java.util.List;
-import java.util.Set;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import org.junit.After;
 import org.junit.Assert;
@@ -29,11 +30,12 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
+import org.opendaylight.controller.md.sal.binding.api.DataObjectModification.ModificationType;
+import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;
+import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
+import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
 import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
@@ -76,7 +78,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.EthernetMatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv4Match;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv4MatchBuilder;
-import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.Option;
@@ -155,23 +156,21 @@ public class OFPluginFlowTest {
         }
     }
 
-    final class TriggerTestListener implements DataChangeListener {
+    final class TriggerTestListener implements DataTreeChangeListener<FlowCapableNode> {
 
         public TriggerTestListener() {
             // NOOP
         }
 
         @Override
-        public void onDataChanged(
-                AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> arg0) {
-            Set<InstanceIdentifier<?>> keySet = arg0.getCreatedData().keySet();
-            if (keySet.size() == 1) {
-                for (InstanceIdentifier<?> key : keySet) {
-                    InstanceIdentifier<FlowCapableNode> neededKey =
-                            key.firstIdentifierOf(FlowCapableNode.class);
-                    if (neededKey != null) {
-                        LOG.info("Node was added (brm) {}", neededKey);
-                        writeFlow(createTestFlow(), neededKey);
+        public void onDataTreeChanged(@Nonnull Collection<DataTreeModification<FlowCapableNode>> modifications) {
+
+            for (DataTreeModification modification : modifications) {
+                if (modification.getRootNode().getModificationType() == ModificationType.WRITE) {
+                    InstanceIdentifier<FlowCapableNode> ii = modification.getRootPath().getRootIdentifier();
+                    if (ii != null) {
+                        LOG.info("Node was added (brm) {}", ii);
+                        writeFlow(createTestFlow(), ii);
                         break;
                     }
                 }
@@ -188,8 +187,8 @@ public class OFPluginFlowTest {
         LOG.debug("testFlowMod integration test");
         TriggerTestListener brmListener = new TriggerTestListener();
 
-        dataBroker.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL,
-                getWildcardPath(), brmListener, DataChangeScope.BASE);
+        final DataTreeIdentifier<FlowCapableNode> dataTreeIdentifier = new DataTreeIdentifier(LogicalDatastoreType.OPERATIONAL, getWildcardPath());
+        dataBroker.registerDataTreeChangeListener(dataTreeIdentifier, brmListener);
 
         switchSim = createSimpleClient();
         switchSim.setSecuredClient(false);

diff --git a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/SalIntegrationTest.java b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/SalIntegrationTest.java
index 2eb0a4d16bb23d1603075cf80c25083b43fb13ac..a11fd400c9643fa5b17d55ce9db3ca929fe6d984 100644 (file)
--- a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/SalIntegrationTest.java
+++ b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/SalIntegrationTest.java
@@ -21,7 +21,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerContext;
 import org.opendaylight.controller.sal.binding.api.BindingAwareConsumer;

diff --git a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/ScenarioFactory.java b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/ScenarioFactory.java
index 4f071cf7fd84cb7ec2295d40b1283526e2b5e8d5..40b6417b17701f9029d1fa9a3ed972c3cde27228 100644 (file)
--- a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/ScenarioFactory.java
+++ b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/ScenarioFactory.java
@@ -9,7 +9,6 @@ package org.opendaylight.openflowplugin.openflow.md.it;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
-
 import org.opendaylight.openflowjava.protocol.impl.clients.ClientEvent;
 import org.opendaylight.openflowjava.protocol.impl.clients.SendEvent;
 import org.opendaylight.openflowjava.protocol.impl.clients.SleepEvent;
@@ -122,8 +121,6 @@ public abstract class ScenarioFactory {
     /**
      * Attempt to simulate the MLX running 1.0 talking to ODL
      *
-     * @param auxId
-     * @param pluginVersionBitmap
      * @return handshake scenario without switch version bitmap
      */
     public static Deque<ClientEvent> createHandshakeScenarioNoVBM_OF10_TwoHello() {
@@ -240,8 +237,6 @@ public abstract class ScenarioFactory {
     /**
      * Attempt to simulate the MLX running 1.0 talking to ODL
      *
-     * @param auxId
-     * @param pluginVersionBitmap
      * @return handshake scenario without switch version bitmap
      */
     public static Deque<ClientEvent> createHandshakeScenarioNOVBM_OF10_OneHello() {

diff --git a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/SimulatorAssistant.java b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/SimulatorAssistant.java
index 110c4094601410e9cd0208dbefc285acc33b1418..9160491a27923523493c489173ae39b8d454074c 100644 (file)
--- a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/SimulatorAssistant.java
+++ b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/SimulatorAssistant.java
@@ -11,22 +11,17 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-
 import org.junit.Assert;
 import org.opendaylight.openflowjava.protocol.impl.clients.SimpleClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * 
- */
 public abstract class SimulatorAssistant {
-    
-    private static final Logger LOG = LoggerFactory
-            .getLogger(SimulatorAssistant.class);
+
+    private static final Logger LOG = LoggerFactory.getLogger(SimulatorAssistant.class);
 
     /**
-     * @param switchSim 
+     * @param switchSim
      * @throws InterruptedException
      */
     public static void waitForSwitchSimulatorOn(SimpleClient switchSim) {