Fix junit dependencies in poms. Reuse existing from parent,

[bgpcep.git] / pcep / testtool / src / main / java / org / opendaylight / protocol / pcep / testtool / Main.java

diff --git a/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/Main.java b/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/Main.java
index 8790a4809bc35b1847d70057b5a5e277c7c3ab35..006d336288677fa85da92c70aaeb885456ab1daa 100644 (file)
--- a/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/Main.java
+++ b/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/Main.java
@@ -7,25 +7,16 @@
  */
 package org.opendaylight.protocol.pcep.testtool;
 
-import java.io.IOException;
+import io.netty.util.HashedWheelTimer;
+
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 
-import org.opendaylight.protocol.framework.DispatcherImpl;
-import org.opendaylight.protocol.framework.ProtocolServer;
-import org.opendaylight.protocol.pcep.PCEPConnection;
-import org.opendaylight.protocol.pcep.PCEPConnectionFactory;
-import org.opendaylight.protocol.pcep.PCEPSessionListener;
-import org.opendaylight.protocol.pcep.PCEPSessionListenerFactory;
-import org.opendaylight.protocol.pcep.PCEPSessionProposal;
-import org.opendaylight.protocol.pcep.PCEPSessionProposalChecker;
-import org.opendaylight.protocol.pcep.PCEPSessionProposalCheckerFactory;
 import org.opendaylight.protocol.pcep.PCEPSessionProposalFactory;
-import org.opendaylight.protocol.pcep.impl.PCEPConnectionImpl;
+import org.opendaylight.protocol.pcep.impl.DefaultPCEPSessionNegotiatorFactory;
 import org.opendaylight.protocol.pcep.impl.PCEPDispatcherImpl;
-import org.opendaylight.protocol.pcep.impl.PCEPMessageFactory;
-import org.opendaylight.protocol.pcep.impl.PCEPSessionProposalCheckerFactoryImpl;
 import org.opendaylight.protocol.pcep.impl.PCEPSessionProposalFactoryImpl;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.OpenObject;
 
 public class Main {
 
@@ -66,8 +57,8 @@ public class Main {
 
                        "With no parameters, this help is printed.";
 
-       public static void main(final String[] args) throws IOException {
-               if (args.length == 0 || (args.length == 1 && args[0].equalsIgnoreCase("--help"))) {
+       public static void main(final String[] args) throws Exception {
+               if (args.length == 0 || args.length == 1 && args[0].equalsIgnoreCase("--help")) {
                        System.out.println(Main.usage);
                        return;
                }
@@ -122,43 +113,12 @@ public class Main {
                        deadTimerValue = keepAliveValue * 4;
                }
 
-               final PCEPSessionListenerFactory slf = new TestingSessionListenerFactory();
                final PCEPSessionProposalFactory spf = new PCEPSessionProposalFactoryImpl(deadTimerValue, keepAliveValue, stateful, active, versioned, instant, timeout);
-               final PCEPSessionProposalCheckerFactory spcf = new PCEPSessionProposalCheckerFactoryImpl();
-
-               final PCEPSessionProposal prefs = spf.getSessionProposal(address, 0);
 
-               final DispatcherImpl d = new DispatcherImpl(new PCEPMessageFactory());
-               final PCEPDispatcherImpl dispatcher = new PCEPDispatcherImpl(d, spf);
+               final OpenObject prefs = spf.getSessionProposal(address, 0);
 
-               ProtocolServer s = null;
+               final PCEPDispatcherImpl dispatcher = new PCEPDispatcherImpl(new DefaultPCEPSessionNegotiatorFactory(new HashedWheelTimer(), prefs, 5));
 
-               try {
-                       s = dispatcher.createServer(address, new PCEPConnectionFactory() {
-                               @Override
-                               public PCEPConnection createProtocolConnection(final InetSocketAddress address) {
-                                       final PCEPSessionProposalChecker checker = spcf.getPreferencesChecker(address);
-                                       final PCEPSessionListener lsnr = slf.getSessionListener(address.getAddress());
-
-                                       return new PCEPConnectionImpl(address, lsnr, prefs.getProposal(), checker);
-                               }
-
-                               @Override
-                               public void setProposal(final PCEPSessionProposalFactory proposals, final InetSocketAddress address, final int sessionId) {
-                               }
-                       });
-
-                       // try {
-                       // Thread.sleep(10000);
-                       // } catch (final InterruptedException e) {
-                       // e.printStackTrace();
-                       // }
-                       //
-                       // s.close();
-
-               } finally {
-                       ((PCEPSessionProposalCheckerFactoryImpl) spcf).close();
-                       // d.stop();
-               }
+               dispatcher.createServer(address, new TestingSessionListenerFactory()).get();
        }
 }