diff options
author | 2017-06-30 15:10:27 +0200 | |
---|---|---|
committer | 2017-06-30 13:15:25 +0000 | |
commit | a90863760d1ae1a92520ce29841aec600d25a83a (patch) | |
tree | 5bf9d20b61d2a14d6f44306ef021e754088d8abc /infra/minimal-distribution/src/test | |
parent | 62dd4d32fd270d3a6b7bb47c972bbcd5dc7b9f43 (diff) |
HONEYCOMB-358 - Conditional module loading
Change-Id: Ic9b7182cc77bf2f73cf5edd3ee19f25f53711cda
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
Diffstat (limited to 'infra/minimal-distribution/src/test')
11 files changed, 0 insertions, 478 deletions
diff --git a/infra/minimal-distribution/src/test/java/io/fd/honeycomb/infra/distro/BaseMinimalDistributionTest.java b/infra/minimal-distribution/src/test/java/io/fd/honeycomb/infra/distro/BaseMinimalDistributionTest.java deleted file mode 100644 index e39dba8a0..000000000 --- a/infra/minimal-distribution/src/test/java/io/fd/honeycomb/infra/distro/BaseMinimalDistributionTest.java +++ /dev/null @@ -1,181 +0,0 @@ -/* - * Copyright (c) 2016 Cisco and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.fd.honeycomb.infra.distro; - -import static org.hamcrest.CoreMatchers.containsString; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; - -import com.google.common.base.Charsets; -import com.google.common.io.ByteStreams; -import com.jcraft.jsch.Channel; -import com.jcraft.jsch.ChannelSubsystem; -import com.jcraft.jsch.JSch; -import com.jcraft.jsch.Session; -import com.mashape.unirest.http.HttpResponse; -import com.mashape.unirest.http.Unirest; -import java.io.IOException; -import java.io.InputStream; -import java.net.Socket; -import java.util.Properties; -import javax.net.ssl.SSLContext; -import org.apache.http.conn.ssl.SSLConnectionSocketFactory; -import org.apache.http.conn.ssl.TrustSelfSignedStrategy; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.ssl.SSLContexts; -import org.junit.Before; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class BaseMinimalDistributionTest { - - private static final Logger LOG = LoggerFactory.getLogger(BaseMinimalDistributionTest.class); - - private static final int HTTP_PORT = 8182; - private static final int HTTPS_PORT = 8444; - private static final String UNAME = "admin"; - private static final String PASSWORD = "admin"; - private static final String CERT_PASSWORD = "testing"; - private static final int NETCONF_TCP_PORT = 7778; - private static final int NETCONF_SSH_PORT = 2832; - private static final String NETCONF_NAMESPACE = "urn:ietf:params:xml:ns:netconf:base:1.0"; - private static final int HELLO_WAIT = 2500; - - @Before - public void setUp() throws Exception { - SSLContext sslcontext = SSLContexts.custom() - .loadTrustMaterial(getClass().getResource("/honeycomb-keystore"), - CERT_PASSWORD.toCharArray(), new TrustSelfSignedStrategy()) - .build(); - - SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslcontext); - CloseableHttpClient httpclient = HttpClients.custom() - .setSSLSocketFactory(sslsf) - .build(); - Unirest.setHttpClient(httpclient); - } - - /** - * Start base distribution and check all northbound interfaces - */ - @Test(timeout = 120000) - public void test() throws Exception { - Main.init(); - - LOG.info("Testing Honeycomb base distribution"); - LOG.info("Testing NETCONF TCP"); - assertNetconfTcp(); - LOG.info("Testing NETCONF SSH"); - assertNetconfSsh(); - LOG.info("Testing RESTCONF HTTP"); - assertRestconfHttp(); - LOG.info("Testing RESTCONF HTTPS"); - assertRestconfHttps(); - } - - private void assertNetconfTcp() throws Exception { - try (final Socket localhost = new Socket("127.0.0.1", NETCONF_TCP_PORT); - final InputStream inputStream = localhost.getInputStream()) { - // Wait until hello msg is sent from server - Thread.sleep(HELLO_WAIT); - final String helloMessage = inputStreamToString(inputStream); - - LOG.info("NETCONF TCP sent hello: {}", helloMessage); - - assertThat(helloMessage, containsString("hello")); - assertThat(helloMessage, containsString(NETCONF_NAMESPACE)); - } - } - - private byte[] readMessage(final InputStream inputStream) throws IOException { - final int available = inputStream.available(); - final byte[] msg = new byte[available]; - ByteStreams.read(inputStream, msg, 0, available); - return msg; - } - private String inputStreamToString(final InputStream inputStream) throws IOException { - return new String(readMessage(inputStream), Charsets.UTF_8); - } - - private void assertNetconfSsh() throws Exception { - JSch jsch = new JSch(); - final Session session = jsch.getSession(UNAME, "127.0.0.1", NETCONF_SSH_PORT); - session.setPassword(PASSWORD); - Properties config = new Properties(); - config.put("StrictHostKeyChecking", "no"); - session.setConfig(config); - session.connect(20000); - - Channel channel = session.openChannel("subsystem"); - - ((ChannelSubsystem) channel).setSubsystem("netconf"); - ((ChannelSubsystem) channel).setPty(true); - final InputStream inputStream = channel.getInputStream(); - channel.connect(20000); - - // Wait until hello msg is sent from server - Thread.sleep(HELLO_WAIT); - final String helloMessage = inputStreamToString(inputStream); - LOG.info("NETCONF SSH sent hello: {}", helloMessage); - - assertThat(helloMessage, containsString("hello")); - assertThat(helloMessage, containsString(NETCONF_NAMESPACE)); - - channel.disconnect(); - session.disconnect(); - } - - private void assertRestconfHttp() throws Exception { - final String url = - "http://127.0.0.1:" + HTTP_PORT + "/restconf/operational/ietf-netconf-monitoring:netconf-state"; - LOG.info("RESTCONF HTTP GET to {}", url); - final HttpResponse<String> jsonNodeHttpResponse = Unirest.get(url) - .basicAuth(UNAME, PASSWORD) - .asString(); - LOG.info("RESTCONF HTTP GET to {}, status: {}, data: {}", - url, jsonNodeHttpResponse.getStatus(), jsonNodeHttpResponse.getBody()); - - assertSuccessStatus(jsonNodeHttpResponse); - assertSuccessResponseForNetconfMonitoring(jsonNodeHttpResponse); - } - - private void assertRestconfHttps() throws Exception { - final String url = - "https://127.0.0.1:" + HTTPS_PORT + "/restconf/operational/ietf-netconf-monitoring:netconf-state"; - LOG.info("RESTCONF HTTPS GET to {}", url); - final HttpResponse<String> jsonNodeHttpResponse = Unirest.get(url) - .basicAuth(UNAME, PASSWORD) - .asString(); - LOG.info("RESTCONF HTTPS GET to {}, status: {}, data: {}", - url, jsonNodeHttpResponse.getStatus(), jsonNodeHttpResponse.getBody()); - - assertSuccessStatus(jsonNodeHttpResponse); - assertSuccessResponseForNetconfMonitoring(jsonNodeHttpResponse); - } - - private void assertSuccessResponseForNetconfMonitoring(final HttpResponse<String> jsonNodeHttpResponse) { - assertThat(jsonNodeHttpResponse.getBody(), containsString("schemas")); - assertThat(jsonNodeHttpResponse.getBody(), containsString(NETCONF_NAMESPACE)); - } - - private void assertSuccessStatus(final HttpResponse<String> jsonNodeHttpResponse) { - assertTrue(jsonNodeHttpResponse.getStatus() >= 200); - assertTrue(jsonNodeHttpResponse.getStatus() < 400); - } -}
\ No newline at end of file diff --git a/infra/minimal-distribution/src/test/java/io/fd/honeycomb/infra/distro/Modules.java b/infra/minimal-distribution/src/test/java/io/fd/honeycomb/infra/distro/Modules.java deleted file mode 100644 index e30fb87ca..000000000 --- a/infra/minimal-distribution/src/test/java/io/fd/honeycomb/infra/distro/Modules.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2016 Cisco and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.fd.honeycomb.infra.distro; - -import com.google.inject.AbstractModule; -import com.google.inject.Binder; -import com.google.inject.Module; - -public class Modules { - - public static class ChildModule1 implements Module { - @Override - public void configure(final Binder binder) { - } - } - - public static class ChildModule2 implements Module { - @Override - public void configure(final Binder binder) { - } - } - - public static class ChildModule3 extends AbstractModule { - @Override - protected void configure() { - } - } - - public static class NonModule{} -} diff --git a/infra/minimal-distribution/src/test/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProviderTest.java b/infra/minimal-distribution/src/test/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProviderTest.java deleted file mode 100644 index fd2c6c860..000000000 --- a/infra/minimal-distribution/src/test/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProviderTest.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright (c) 2017 Cisco and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.fd.honeycomb.infra.distro.activation; - - -import static com.google.common.collect.ImmutableList.of; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.hasItem; -import static org.hamcrest.Matchers.hasItems; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.isA; -import static org.hamcrest.core.Is.is; - -import com.google.common.collect.ImmutableList; -import com.google.inject.Module; -import java.util.List; -import java.util.Set; -import org.junit.Test; - -public class ActiveModuleProviderTest { - - @Test - public void testLoadActiveModulesSuccessfull() { - final ImmutableList<String> rawResources = of( - "// this should be skipped", - "// io.fd.honeycomb.infra.distro.Modules$ChildModule1", - " io.fd.honeycomb.infra.distro.Modules$ChildModule2", - "io.fd.honeycomb.infra.distro.Modules$ChildModule3 ", - "io.fd.honeycomb.infra.distro.Modules$ChildModule3", - "io.fd.honeycomb.infra.distro.Modules$NonModule" - ); - // have to be without wildcard, otherwise mockito has problem with it - final Set<Module> activeModules = (Set<Module>) new ActiveModules(ActiveModuleProvider.loadActiveModules(rawResources)).createModuleInstances(); - - // first and second line should be ignored due to comment - // second,third,and fourth are valid,but should reduce module count to 2,because of duplicity - // last one does is not ancestor of Module, so it should be ignored/skipped - assertThat(activeModules, hasSize(2)); - //hasItems or containsInAnyOrder does not have/is deprecated in variant with matcher - assertThat(activeModules, hasItem(isA(io.fd.honeycomb.infra.distro.Modules.ChildModule2.class))); - assertThat(activeModules, hasItem(isA(io.fd.honeycomb.infra.distro.Modules.ChildModule3.class))); - } - - @Test(expected = IllegalStateException.class) - public void testLoadActiveModulesFailed() { - final ImmutableList rawResources = of( - "// this should be skipped", - "// io.fd.honeycomb.infra.distro.Modules$ChildModule1", - " io.fd.honeycomb.infra.distro.Modules$ChildModule2", - "### io.fd.honeycomb.infra.distro.Modules$ChildModule3 ",// it should fail because of this - "io.fd.honeycomb.infra.distro.Modules$ChildModule3", - "io.fd.honeycomb.infra.distro.Modules$NonModule" - ); - - ActiveModuleProvider.loadActiveModules(rawResources); - } - - @Test - public void testAggregateResourcesNonEmpty() { - final List<String> aggregatedResources = - ActiveModuleProvider.aggregateResources("modules", this.getClass().getClassLoader()); - assertThat(aggregatedResources, hasSize(5)); - assertThat(aggregatedResources, hasItems(" Non-commented non-trimmed", - "//Commented", - "// Commented non-trimmed", - "Not commented", - "// Line from second file")); - } - - @Test - public void testAggregateResourcesEmpty() { - assertThat(ActiveModuleProvider.aggregateResources("/non-existing-folder", this.getClass().getClassLoader()), - is(empty())); - } - -} 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 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - ~ Copyright (c) 2016 Cisco and/or its affiliates. - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at: - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - 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> - <init-param> - <param-name>allowedOrigins</param-name> - <param-value>*</param-value> - </init-param> - <init-param> - <param-name>allowedMethods</param-name> - <param-value>GET,POST,OPTIONS,DELETE,PUT,HEAD</param-value> - </init-param> - <init-param> - <param-name>allowedHeaders</param-name> - <param-value>origin, content-type, accept, authorization</param-value> - </init-param> - <init-param> - <param-name>exposedHeaders</param-name> - <param-value>location</param-value> - </init-param> - </filter> - <filter-mapping> - <filter-name>cross-origin-restconf</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <security-constraint> - <web-resource-collection> - <web-resource-name>NB api</web-resource-name> - <url-pattern>/*</url-pattern> - <http-method>POST</http-method> - <http-method>GET</http-method> - <http-method>PUT</http-method> - <http-method>PATCH</http-method> - <http-method>DELETE</http-method> - <http-method>HEAD</http-method> - </web-resource-collection> - </security-constraint> - -</web-app> 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 Binary files differdeleted file mode 100644 index 44093dc09..000000000 --- a/infra/minimal-distribution/src/test/resources/honeycomb-keystore +++ /dev/null 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 @@ - <!-- - ~ Copyright (c) 2016 Cisco and/or its affiliates. - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at: - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<configuration scan="true"> - - <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> - <encoder> - <pattern>%date{"yyyy-MM-dd HH:mm:ss.SSS z"} [%thread] %-5level %logger{36} - %msg%n</pattern> - </encoder> - </appender> - - <root level="warn"> - <appender-ref ref="STDOUT" /> - </root> - - <logger name="org.opendaylight" level="INFO"/> - <logger name="io.fd" level="INFO"/> -</configuration> 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 |