NEUTRON-208: BGPVPN network and router association

[neutron.git] / integration / test-standalone / src / test / java / org / opendaylight / neutron / e2etest / NeutronTestWiring.java

diff --git a/integration/test-standalone/src/test/java/org/opendaylight/neutron/e2etest/NeutronTestWiring.java b/integration/test-standalone/src/test/java/org/opendaylight/neutron/e2etest/NeutronTestWiring.java
index 2b31d5594b159190e983cecb3fc11124f7398830..0eaa082b67645d5e4865ed28fc71241f12a7c4ad 100644 (file)
--- a/integration/test-standalone/src/test/java/org/opendaylight/neutron/e2etest/NeutronTestWiring.java
+++ b/integration/test-standalone/src/test/java/org/opendaylight/neutron/e2etest/NeutronTestWiring.java
@@ -11,10 +11,14 @@ import com.google.inject.AbstractModule;
 import org.opendaylight.aaa.web.WebContextSecurer;
 import org.opendaylight.aaa.web.WebServer;
 import org.opendaylight.aaa.web.jetty.JettyWebServer;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.test.DataBrokerTestModule;
+import org.opendaylight.aaa.web.servlet.ServletSupport;
+import org.opendaylight.aaa.web.servlet.jersey2.JerseyServletSupport;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractConcurrentDataBrokerTest;
 import org.opendaylight.neutron.northbound.api.WebInitializer;
 import org.opendaylight.neutron.spi.INeutronBgpvpnCRUD;
+import org.opendaylight.neutron.spi.INeutronBgpvpnNetworkAssociationCRUD;
+import org.opendaylight.neutron.spi.INeutronBgpvpnRouterAssociationCRUD;
 import org.opendaylight.neutron.spi.INeutronFirewallCRUD;
 import org.opendaylight.neutron.spi.INeutronFirewallPolicyCRUD;
 import org.opendaylight.neutron.spi.INeutronFirewallRuleCRUD;
@@ -46,6 +50,8 @@ import org.opendaylight.neutron.spi.INeutronVpnIpSecPolicyCRUD;
 import org.opendaylight.neutron.spi.INeutronVpnIpSecSiteConnectionsCRUD;
 import org.opendaylight.neutron.spi.INeutronVpnServiceCRUD;
 import org.opendaylight.neutron.transcriber.NeutronBgpvpnInterface;
+import org.opendaylight.neutron.transcriber.NeutronBgpvpnNetworkAssociationInterface;
+import org.opendaylight.neutron.transcriber.NeutronBgpvpnRouterAssociationInterface;
 import org.opendaylight.neutron.transcriber.NeutronFirewallInterface;
 import org.opendaylight.neutron.transcriber.NeutronFirewallPolicyInterface;
 import org.opendaylight.neutron.transcriber.NeutronFirewallRuleInterface;
@@ -77,21 +83,33 @@ import org.opendaylight.neutron.transcriber.NeutronVpnIpSecPolicyInterface;
 import org.opendaylight.neutron.transcriber.NeutronVpnIpSecSiteConnectionsInterface;
 import org.opendaylight.neutron.transcriber.NeutronVpnServiceInterface;
 
+
 /**
  * Dependency Injection wiring for Neutron.
  *
  * @author Michael Vorburger.ch
  */
+@SuppressWarnings("checkstyle:IllegalCatch")
 public class NeutronTestWiring extends AbstractModule {
+    private static final class BrokerSetup extends AbstractConcurrentDataBrokerTest {
+        BrokerSetup() {
+            super(true);
+            try {
+                setup();
+            } catch (Exception e) {
+                throw new IllegalStateException("Failed to initialize", e);
+            }
+        }
+    }
 
     @Override
     protected void configure() {
         bind(WebServer.class).toInstance(new JettyWebServer(9090));
-        bind(WebContextSecurer.class).toInstance((webContextBuilder, urlPatterns) -> { }); // NOOP
+        bind(WebContextSecurer.class).toInstance((webContextBuilder, asyncSupported, urlPatterns) -> { }); // NOOP
+        bind(ServletSupport.class).toInstance(new JerseyServletSupport());
         bind(WebInitializer.class);
 
-        DataBrokerTestModule dataBrokerTestModule = new DataBrokerTestModule(true);
-        DataBroker dataBroker = dataBrokerTestModule.getDataBroker();
+        DataBroker dataBroker = new BrokerSetup().getDataBroker();
         bind(DataBroker.class).toInstance(dataBroker);
 
         bind(INeutronNetworkCRUD.class).to(NeutronNetworkInterface.class);
@@ -108,6 +126,8 @@ public class NeutronTestWiring extends AbstractModule {
         bind(INeutronLoadBalancerListenerCRUD.class).to(NeutronLoadBalancerListenerInterface.class);
         bind(INeutronLoadBalancerPoolCRUD.class).to(NeutronLoadBalancerPoolInterface.class);
         bind(INeutronBgpvpnCRUD.class).to(NeutronBgpvpnInterface.class);
+        bind(INeutronBgpvpnRouterAssociationCRUD.class).to(NeutronBgpvpnRouterAssociationInterface.class);
+        bind(INeutronBgpvpnNetworkAssociationCRUD.class).to(NeutronBgpvpnNetworkAssociationInterface.class);
         bind(INeutronL2gatewayCRUD.class).to(NeutronL2gatewayInterface.class);
         bind(INeutronL2gatewayConnectionCRUD.class).to(NeutronL2gatewayConnectionInterface.class);
         bind(INeutronLoadBalancerHealthMonitorCRUD.class).to(NeutronLoadBalancerHealthMonitorInterface.class);