From 556a0f59abc9b09005d40945bc20948d69e4f98e Mon Sep 17 00:00:00 2001
From: Michal Cmarada <michal.cmarada@pantheon.tech>
Date: Tue, 25 Sep 2018 11:15:35 +0200
Subject: Bump ODL dependencies to Fluorine (HONEYCOMB-433)

Change-Id: I142ebd2899272feff00abe7d4bae708f093ee3ec
Signed-off-by: Michal Cmarada <michal.cmarada@pantheon.tech>
---
 .../src/test/resources/WEB-INF/web.xml                     | 14 --------------
 .../src/test/resources/bgp-policy.json                     |  4 ++++
 2 files changed, 4 insertions(+), 14 deletions(-)
 create mode 100644 infra/bgp-distribution-test/src/test/resources/bgp-policy.json

(limited to 'infra/bgp-distribution-test')

diff --git a/infra/bgp-distribution-test/src/test/resources/WEB-INF/web.xml b/infra/bgp-distribution-test/src/test/resources/WEB-INF/web.xml
index 6cf487170..b5d2c8ba2 100644
--- a/infra/bgp-distribution-test/src/test/resources/WEB-INF/web.xml
+++ b/infra/bgp-distribution-test/src/test/resources/WEB-INF/web.xml
@@ -19,20 +19,6 @@
     xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
     version="3.0">
 
-    <servlet>
-        <servlet-name>JAXRSRestconf</servlet-name>
-        <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
-        <init-param>
-            <param-name>javax.ws.rs.Application</param-name>
-            <param-value>org.opendaylight.netconf.sal.rest.impl.RestconfApplication</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>JAXRSRestconf</servlet-name>
-        <url-pattern>/*</url-pattern>
-    </servlet-mapping>
     <filter>
         <filter-name>cross-origin-restconf</filter-name>
         <filter-class>org.eclipse.jetty.servlets.CrossOriginFilter</filter-class>
diff --git a/infra/bgp-distribution-test/src/test/resources/bgp-policy.json b/infra/bgp-distribution-test/src/test/resources/bgp-policy.json
new file mode 100644
index 000000000..01abb6905
--- /dev/null
+++ b/infra/bgp-distribution-test/src/test/resources/bgp-policy.json
@@ -0,0 +1,4 @@
+{
+  "default-import-policy": "ACCEPT-ROUTE",
+  "default-export-policy": "ACCEPT-ROUTE"
+}
\ No newline at end of file
-- 
cgit 1.2.3-korg