Fix drop-test-karaf service injection

[openflowplugin.git] / test-common / src / main / java / org / opendaylight / openflowplugin / testcommon / AbstractDropTest.java

diff --git a/test-common/src/main/java/org/opendaylight/openflowplugin/testcommon/AbstractDropTest.java b/test-common/src/main/java/org/opendaylight/openflowplugin/testcommon/AbstractDropTest.java
index f0c47fb9510da3a2923f4a902df9efca8f4b6ab3..0b00f2e782300b68e2773636abadcecbdf7fc343 100644 (file)
--- a/test-common/src/main/java/org/opendaylight/openflowplugin/testcommon/AbstractDropTest.java
+++ b/test-common/src/main/java/org/opendaylight/openflowplugin/testcommon/AbstractDropTest.java
@@ -44,7 +44,7 @@ import org.opendaylight.yangtools.yang.common.Uint8;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-abstract class AbstractDropTest implements Listener<PacketReceived>, AutoCloseable {
+abstract class AbstractDropTest implements Listener<PacketReceived>, AutoCloseable, DropTest {
     private static final Logger LOG = LoggerFactory.getLogger(AbstractDropTest.class);
 
     protected static final Uint16 PRIORITY = Uint16.valueOf(4);
@@ -53,14 +53,11 @@ abstract class AbstractDropTest implements Listener<PacketReceived>, AutoCloseab
     protected static final Uint16 IDLE_TIMEOUT = Uint16.valueOf(240);
     protected static final Uint8 TABLE_ID = Uint8.ZERO;
 
-    static final long STARTUP_LOOP_TICK = 500L;
-    static final int STARTUP_LOOP_MAX_RETRIES = 8;
     private static final int PROCESSING_POOL_SIZE = 10000;
 
     private static final int POOL_THREAD_AMOUNT = 8;
     private final ExecutorService executorService;
 
-
     private static final AtomicIntegerFieldUpdater<AbstractDropTest> SENT_UPDATER = AtomicIntegerFieldUpdater
             .newUpdater(AbstractDropTest.class, "sent");
     private volatile int sent;
@@ -89,6 +86,7 @@ abstract class AbstractDropTest implements Listener<PacketReceived>, AutoCloseab
             .newUpdater(AbstractDropTest.class, "runablesRejected");
     protected volatile int runablesRejected;
 
+    @Override
     public final DropTestStats getStats() {
         return new DropTestStats(sent, rcvd, excs, ftrFailed, ftrSuccess, runablesExecuted, runablesRejected);
     }
@@ -110,6 +108,7 @@ abstract class AbstractDropTest implements Listener<PacketReceived>, AutoCloseab
         executorService = threadPool;
     }
 
+    @Override
     public final void clearStats() {
         sent = 0;
         rcvd = 0;
@@ -175,7 +174,7 @@ abstract class AbstractDropTest implements Listener<PacketReceived>, AutoCloseab
             //TODO: use HEX, use binary form
             //Hex.decodeHex("000000000001".toCharArray());
 
-            ethSourceBuilder.setAddress(IetfYangUtil.INSTANCE.macAddressFor(srcMac));
+            ethSourceBuilder.setAddress(IetfYangUtil.macAddressFor(srcMac));
             ethernetMatch.setEthernetSource(ethSourceBuilder.build());
             match.setEthernetMatch(ethernetMatch.build());