From a90863760d1ae1a92520ce29841aec600d25a83a Mon Sep 17 00:00:00 2001 From: Jan Srnicek Date: Fri, 30 Jun 2017 15:10:27 +0200 Subject: HONEYCOMB-358 - Conditional module loading Change-Id: Ic9b7182cc77bf2f73cf5edd3ee19f25f53711cda Signed-off-by: Jan Srnicek --- .../src/test/resources/WEB-INF/web.xml | 74 --------------------- .../src/test/resources/activation.json | 3 - .../base-distro-test-modules/base-modules | 9 --- .../src/test/resources/honeycomb-keystore | Bin 2392 -> 0 bytes .../src/test/resources/honeycomb.json | 40 ----------- .../src/test/resources/logback.xml | 31 --------- .../test/resources/modules/module-config-one.txt | 4 -- .../test/resources/modules/module-config-two.txt | 1 - 8 files changed, 162 deletions(-) delete mode 100644 infra/minimal-distribution/src/test/resources/WEB-INF/web.xml delete mode 100644 infra/minimal-distribution/src/test/resources/activation.json delete mode 100644 infra/minimal-distribution/src/test/resources/base-distro-test-modules/base-modules delete mode 100644 infra/minimal-distribution/src/test/resources/honeycomb-keystore delete mode 100644 infra/minimal-distribution/src/test/resources/honeycomb.json delete mode 100644 infra/minimal-distribution/src/test/resources/logback.xml delete mode 100644 infra/minimal-distribution/src/test/resources/modules/module-config-one.txt delete mode 100644 infra/minimal-distribution/src/test/resources/modules/module-config-two.txt (limited to 'infra/minimal-distribution/src/test/resources') diff --git a/infra/minimal-distribution/src/test/resources/WEB-INF/web.xml b/infra/minimal-distribution/src/test/resources/WEB-INF/web.xml deleted file mode 100644 index 6cf487170..000000000 --- a/infra/minimal-distribution/src/test/resources/WEB-INF/web.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - JAXRSRestconf - com.sun.jersey.spi.container.servlet.ServletContainer - - javax.ws.rs.Application - org.opendaylight.netconf.sal.rest.impl.RestconfApplication - - 1 - - - - JAXRSRestconf - /* - - - cross-origin-restconf - org.eclipse.jetty.servlets.CrossOriginFilter - - allowedOrigins - * - - - allowedMethods - GET,POST,OPTIONS,DELETE,PUT,HEAD - - - allowedHeaders - origin, content-type, accept, authorization - - - exposedHeaders - location - - - - cross-origin-restconf - /* - - - - - NB api - /* - POST - GET - PUT - PATCH - DELETE - HEAD - - - - diff --git a/infra/minimal-distribution/src/test/resources/activation.json b/infra/minimal-distribution/src/test/resources/activation.json deleted file mode 100644 index 7e2015123..000000000 --- a/infra/minimal-distribution/src/test/resources/activation.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "modules-resource-path": "base-distro-test-modules" -} \ No newline at end of file diff --git a/infra/minimal-distribution/src/test/resources/base-distro-test-modules/base-modules b/infra/minimal-distribution/src/test/resources/base-distro-test-modules/base-modules deleted file mode 100644 index 28b28446c..000000000 --- a/infra/minimal-distribution/src/test/resources/base-distro-test-modules/base-modules +++ /dev/null @@ -1,9 +0,0 @@ -io.fd.honeycomb.infra.distro.cfgattrs.CfgAttrsModule -io.fd.honeycomb.infra.distro.data.ConfigAndOperationalPipelineModule -io.fd.honeycomb.infra.distro.data.context.ContextPipelineModule -io.fd.honeycomb.infra.distro.initializer.InitializerPipelineModule -io.fd.honeycomb.infra.distro.netconf.NetconfModule -io.fd.honeycomb.infra.distro.netconf.NetconfReadersModule -io.fd.honeycomb.infra.distro.restconf.RestconfModule -io.fd.honeycomb.infra.distro.schema.SchemaModule -io.fd.honeycomb.infra.distro.schema.YangBindingProviderModule \ No newline at end of file diff --git a/infra/minimal-distribution/src/test/resources/honeycomb-keystore b/infra/minimal-distribution/src/test/resources/honeycomb-keystore deleted file mode 100644 index 44093dc09..000000000 Binary files a/infra/minimal-distribution/src/test/resources/honeycomb-keystore and /dev/null differ diff --git a/infra/minimal-distribution/src/test/resources/honeycomb.json b/infra/minimal-distribution/src/test/resources/honeycomb.json deleted file mode 100644 index a0b2a633c..000000000 --- a/infra/minimal-distribution/src/test/resources/honeycomb.json +++ /dev/null @@ -1,40 +0,0 @@ - { - "persisted-context-path": "/tmp/honeycomb/persist/context/data.json", - "persisted-context-restoration-type": "Merge", - "persisted-config-path": "/tmp/honeycomb/persist/config/data.json", - "persisted-config-restoration-type": "Merge", - - "notification-service-queue-depth": 1, - - "restconf-http-enabled": "true", - "restconf-root-path": "/restconf", - "restconf-binding-address": "127.0.0.1", - "restconf-port": 8182, - "restconf-https-enabled": "true", - "restconf-https-binding-address": "127.0.0.1", - "restconf-https-port": 8444, - "restconf-keystore": "/honeycomb-keystore", - "restconf-keystore-password": "testing", - "restconf-keystore-manager-password": "testing", - "restconf-truststore": "/honeycomb-keystore", - "restconf-truststore-password": "testing", - "restconf-websocket-port": 7780, - "restconf-pool-max-size": 10, - "restconf-pool-min-size": 1, - "restconf-acceptors-size": 1, - "restconf-selectors-size": 1, - "restconf-https-acceptors-size": 1, - "restconf-https-selectors-size": 1, - - "netconf-netty-threads": 2, - "netconf-tcp-enabled" : "true", - "netconf-tcp-binding-address": "127.0.0.1", - "netconf-tcp-binding-port": 7778, - "netconf-ssh-enabled" : "true", - "netconf-ssh-binding-address": "127.0.0.1", - "netconf-ssh-binding-port": 2832, - "netconf-notification-stream-name": "honeycomb", - - "username": "admin", - "password": "admin" -} \ No newline at end of file diff --git a/infra/minimal-distribution/src/test/resources/logback.xml b/infra/minimal-distribution/src/test/resources/logback.xml deleted file mode 100644 index 2ee89db4e..000000000 --- a/infra/minimal-distribution/src/test/resources/logback.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - %date{"yyyy-MM-dd HH:mm:ss.SSS z"} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - - diff --git a/infra/minimal-distribution/src/test/resources/modules/module-config-one.txt b/infra/minimal-distribution/src/test/resources/modules/module-config-one.txt deleted file mode 100644 index 8d48a3c9d..000000000 --- a/infra/minimal-distribution/src/test/resources/modules/module-config-one.txt +++ /dev/null @@ -1,4 +0,0 @@ -//Commented -// Commented non-trimmed -Not commented - Non-commented non-trimmed \ No newline at end of file diff --git a/infra/minimal-distribution/src/test/resources/modules/module-config-two.txt b/infra/minimal-distribution/src/test/resources/modules/module-config-two.txt deleted file mode 100644 index ef11829e9..000000000 --- a/infra/minimal-distribution/src/test/resources/modules/module-config-two.txt +++ /dev/null @@ -1 +0,0 @@ -// Line from second file \ No newline at end of file -- cgit 1.2.3-korg