HONEYCOMB-358 - Conditional module loading

Change-Id: Ic9b7182cc77bf2f73cf5edd3ee19f25f53711cda
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>

21 files changed, 324 insertions, 567 deletions

diff --git a/infra/minimal-distribution/pom.xml b/infra/minimal-distribution/pom.xml
index 637640723..6f520eaf6 100644
--- a/infra/minimal-distribution/pom.xml
+++ b/infra/minimal-distribution/pom.xml
@@ -41,6 +41,7 @@
             io.fd.honeycomb.infra.distro.restconf.RestconfModule,
             io.fd.honeycomb.infra.distro.cfgattrs.CfgAttrsModule
         </distribution.modules>
+        <commons-io.version>2.5</commons-io.version>
     </properties>
 
     <dependencies>
@@ -164,33 +165,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.mashape.unirest</groupId>
-            <artifactId>unirest-java</artifactId>
-            <version>1.4.9</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.jcraft</groupId>
-            <artifactId>jsch</artifactId>
-            <version>0.1.54</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/Main.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/Main.java
index 265740bcc..582fcf687 100644
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/Main.java
+++ b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/Main.java
@@ -22,7 +22,6 @@ import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.ConfigurationException;
 import com.google.inject.CreationException;
-import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.Module;
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/activation/ActivationConfig.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/activation/ActivationConfig.java
index 8777c32a2..a17f5d632 100644
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/activation/ActivationConfig.java
+++ b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/activation/ActivationConfig.java
@@ -27,7 +27,15 @@ public class ActivationConfig {
     @InjectConfig("modules-resource-path")
     private String modulesResourcePath;
 
+    @InjectConfig("yang-modules-index-path")
+    private String yangModulesIndexPath;
+
     public String getModulesResourcePath() {
         return Optional.ofNullable(modulesResourcePath).orElse("../modules/");
     }
+
+    public String getYangModulesIndexPath() {
+        return Optional.ofNullable(yangModulesIndexPath).orElse("../yang-mapping/");
+    }
+
 }
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProvider.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProvider.java
index 21d108082..d31024ce9 100644
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProvider.java
+++ b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProvider.java
@@ -139,7 +139,7 @@ class ActiveModuleProvider implements Provider<ActiveModules> {
     private static Class<? extends Module> moduleNameToClass(final String name,
                                                              final ClassLoader classLoader) {
         try {
-            LOG.info("Loading module class {}", name);
+            LOG.debug("Loading module class {}", name);
             return (Class<? extends Module>) classLoader.loadClass(name);
         } catch (ClassNotFoundException e) {
             LOG.error("Unable to convert {} to class, make sure you've provided sources to classpath", name);
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/schema/ModuleInfoBackedCtxProvider.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/schema/ModuleInfoBackedCtxProvider.java
index f82cdd0b1..e2d0fbfaa 100644
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/schema/ModuleInfoBackedCtxProvider.java
+++ b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/schema/ModuleInfoBackedCtxProvider.java
@@ -16,11 +16,11 @@
 
 package io.fd.honeycomb.infra.distro.schema;
 
+import static io.fd.honeycomb.infra.distro.schema.YangModulesProvider.YangModules;
+
 import com.google.common.base.MoreObjects;
 import com.google.inject.Inject;
 import io.fd.honeycomb.infra.distro.ProviderTrait;
-import java.util.HashSet;
-import java.util.Set;
 import java.util.stream.Collectors;
 import org.opendaylight.yangtools.sal.binding.generator.impl.ModuleInfoBackedContext;
 import org.opendaylight.yangtools.yang.binding.YangModelBindingProvider;
@@ -30,13 +30,14 @@ import org.slf4j.LoggerFactory;
 public final class ModuleInfoBackedCtxProvider extends ProviderTrait<ModuleInfoBackedContext> {
     private static final Logger LOG = LoggerFactory.getLogger(ModuleInfoBackedCtxProvider.class);
 
-    @Inject(optional = true)
-    private Set<YangModelBindingProvider> moduleInfos = new HashSet<>();
+    // optional in sense that list of modules inside can be empty if none was found
+    @Inject
+    private YangModules moduleInfos;
 
     @Override
     protected ModuleInfoBackedContext create() {
         ModuleInfoBackedContext create = ModuleInfoBackedContext.create();
-        create.addModuleInfos(moduleInfos.stream()
+        create.addModuleInfos(moduleInfos.getYangBindings().stream()
                 .map(YangModelBindingProvider::getModuleInfo)
                 .collect(Collectors.toList()));
         LOG.debug("ModuleInfoBackedContext created from {}", moduleInfos);
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/schema/ResourceLoader.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/schema/ResourceLoader.java
new file mode 100644
index 000000000..c851dab1b
--- /dev/null
+++ b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/schema/ResourceLoader.java
@@ -0,0 +1,135 @@
+/*
+ * 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.schema;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.lang.String.format;
+
+import com.google.common.base.Charsets;
+import com.google.common.base.Strings;
+import com.google.common.io.Resources;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Set;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.stream.Collectors;
+import org.apache.commons.io.IOUtils;
+
+interface ResourceLoader {
+
+    default Set<String> loadResourceContentsOnPath(final String path) {
+        final URL folderUrl = getClass().getClassLoader().getResource(path);
+        checkNotNull(folderUrl, "Resources %s not found", path);
+
+        if (ResourceLoaderIml.urlToUri(folderUrl).getScheme().equals("jar")) {
+            return ResourceLoaderIml.readFromJar(path, folderUrl);
+        } else {
+            return ResourceLoaderIml.readFromFolder(folderUrl);
+        }
+
+    }
+
+    final class ResourceLoaderIml {
+
+        private static Set<String> readFromFolder(final URL folderUrl) {
+            final File folder = new File(folderUrl.getPath());
+            final File[] files = checkNotNull(folder.listFiles(), "No files present on path %s", folderUrl);
+            return Arrays.stream(files)
+                    .map(ResourceLoaderIml::fileToUrl)
+                    .map(ResourceLoaderIml::urlToContentString)
+                    .flatMap(content -> Arrays.stream(content.split(System.lineSeparator())))
+                    .filter(ResourceLoaderIml::filterNonEmpty)
+                    .collect(Collectors.toSet());
+        }
+
+        private static Set<String> readFromJar(final String path, final URL url) {
+            final String uriString = urlToUri(url).toString();
+            final String fileReference = extractJarFilePath(uriString);
+            try (JarFile jar = new JarFile(new File(fileReference))) {
+                return Collections.list(jar.entries())
+                        .stream()
+                        .filter(jarEntry -> jarEntry.getName().contains(path))
+                        .map(jarEntry -> getJarEntryStream(jar, jarEntry))
+                        .map(ResourceLoaderIml::readJarEntryStream)
+                        .flatMap(content -> Arrays.stream(content.split(System.lineSeparator())))
+                        .filter(ResourceLoaderIml::filterNonEmpty)
+                        .collect(Collectors.toSet());
+            } catch (IOException e) {
+                throw new IllegalStateException(e);
+            }
+        }
+
+        private static String extractJarFilePath(final String uriString) {
+            return uriString.substring(0, uriString.indexOf("!")).replace("jar:file:", "");
+        }
+
+        private static boolean filterNonEmpty(final String line) {
+            return !Strings.isNullOrEmpty(line.trim());
+        }
+
+        private static String readJarEntryStream(final InputStream inputStream) {
+            try {
+                final String value = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
+                IOUtils.closeQuietly(inputStream);
+                return value;
+            } catch (IOException e) {
+                throw new IllegalStateException(e);
+            }
+        }
+
+        private static InputStream getJarEntryStream(final JarFile jar, final JarEntry jarEntry) {
+            try {
+                return jar.getInputStream(jarEntry);
+            } catch (IOException e) {
+                throw new IllegalStateException(format("Unable to get stream for entry %s | jar %s", jar, jarEntry));
+            }
+        }
+
+        private static URI urlToUri(final URL url) {
+            try {
+                return url.toURI();
+            } catch (URISyntaxException e) {
+                throw new IllegalStateException(format("Unable to convert URL %s to URI", url));
+            }
+        }
+
+        private static String urlToContentString(final URL url) {
+            try {
+                return Resources.toString(url, Charsets.UTF_8);
+            } catch (IOException e) {
+                throw new IllegalArgumentException("Unable to read resource from: " + url, e);
+            }
+        }
+
+        private static URL fileToUrl(final File file) {
+            try {
+                return file.toURI().toURL();
+            } catch (MalformedURLException e) {
+                throw new IllegalStateException(e);
+            }
+        }
+    }
+}
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/schema/YangBindingProviderModule.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/schema/YangBindingProviderModule.java
index 8e402808b..d705226bf 100644
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/schema/YangBindingProviderModule.java
+++ b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/schema/YangBindingProviderModule.java
@@ -16,68 +16,15 @@
 
 package io.fd.honeycomb.infra.distro.schema;
 
-import com.google.common.base.Charsets;
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
-import com.google.common.io.Resources;
 import com.google.inject.AbstractModule;
-import com.google.inject.Singleton;
-import com.google.inject.multibindings.Multibinder;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Collections;
-import java.util.List;
-import javax.annotation.Nonnull;
-import org.opendaylight.yangtools.yang.binding.YangModelBindingProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * Load all YangModelBindingProvider classes from classpath.
- * <p/>
- * Relying on /META-INF/services/ metadata.
- */
 public class YangBindingProviderModule extends AbstractModule {
     private static final Logger LOG = LoggerFactory.getLogger(YangBindingProviderModule.class);
 
-    private static final String YANG_BA_PROVIDER_PATH = "META-INF/services/" + YangModelBindingProvider.class.getName();
-
     protected void configure() {
-        final Multibinder<YangModelBindingProvider> binder =
-                Multibinder.newSetBinder(binder(), YangModelBindingProvider.class);
-        final List<URL> resources;
-        try {
-            resources = Collections.list(getClass().getClassLoader().getResources(YANG_BA_PROVIDER_PATH));
-        } catch (IOException e) {
-            throw new IllegalStateException("Unable to load binding providers from path: " + YANG_BA_PROVIDER_PATH, e);
-        }
-        LOG.debug("ModuleProviders found at {}", resources);
-        resources.stream()
-                .map(YangBindingProviderModule::urlToString)
-                .flatMap(content -> Lists.newArrayList(content.split("\n")).stream())
-                .filter(line -> !Strings.isNullOrEmpty(line.trim()))
-                .distinct()
-                .map(YangBindingProviderModule::loadClass)
-                .forEach(providerClass -> {
-                    LOG.debug("ModuleProvider found for {}", providerClass);
-                    binder.addBinding().to((Class<? extends YangModelBindingProvider>) providerClass)
-                            .in(Singleton.class);
-                });
-    }
-
-    private static Class<?> loadClass(@Nonnull final String className) {
-        try {
-            return Class.forName(className);
-        } catch (ClassNotFoundException e) {
-            throw new IllegalArgumentException("Unable to load class: " + className, e);
-        }
-    }
-
-    private static String urlToString(@Nonnull final URL url) {
-        try {
-            return Resources.toString(url, Charsets.UTF_8);
-        } catch (IOException e) {
-            throw new IllegalArgumentException("Unable to read resource from: " + url, e);
-        }
+        LOG.info("Configuring YangBindingProviderModule");
+        bind(YangModulesProvider.YangModules.class).toProvider(YangModulesProvider.class).asEagerSingleton();
     }
 }
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModuleMappingIndex.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModuleMappingIndex.java
new file mode 100644
index 000000000..a483cfd9c
--- /dev/null
+++ b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModuleMappingIndex.java
@@ -0,0 +1,69 @@
+/*
+ * 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.schema;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.LinkedListMultimap;
+import com.google.common.collect.Multimap;
+import java.util.Arrays;
+import java.util.Set;
+import java.util.stream.Stream;
+import javax.annotation.Nonnull;
+
+/**
+ * Index from guice module to yang module providers
+ */
+class YangModuleMappingIndex implements ResourceLoader {
+
+    private static final String G_MODULE_TOKEN = "GUICE_MODULE:";
+    private static final String KEY_VALUE_SEPARATOR = "|";
+    private static final String Y_MODULE_TOKEN = "YANG_MODULES:";
+    private static final String Y_MODULE_SEPARATOR = ",";
+
+    /**
+     * key - module class name
+     * value  - yang module provider
+     */
+    private final Multimap<String, String> index;
+
+    YangModuleMappingIndex(final String indexPath) {
+        this.index = LinkedListMultimap.create();
+        loadResourceContentsOnPath(indexPath)
+                .forEach(line -> {
+                    final String moduleName = parseModuleName(line);
+                    parseYangModules(line).forEach(yModuleProvider -> index.put(moduleName, yModuleProvider));
+                });
+    }
+
+    Set<String> getByModuleName(@Nonnull final String moduleName) {
+        return ImmutableSet.copyOf(index.get(moduleName));
+    }
+
+    int applicationModulesCount() {
+        return index.keySet().size();
+    }
+
+    private static String parseModuleName(final String rawLine) {
+        return rawLine.substring(rawLine.indexOf(G_MODULE_TOKEN) + G_MODULE_TOKEN.length(),
+                rawLine.indexOf(KEY_VALUE_SEPARATOR));
+    }
+
+    private static Stream<String> parseYangModules(final String rawLine) {
+        return Arrays.stream(rawLine.substring(rawLine.indexOf(Y_MODULE_TOKEN) + Y_MODULE_TOKEN.length())
+                .split(Y_MODULE_SEPARATOR));
+    }
+}
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModulesProvider.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModulesProvider.java
new file mode 100644
index 000000000..f6d8ea0c1
--- /dev/null
+++ b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModulesProvider.java
@@ -0,0 +1,97 @@
+/*
+ * 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.schema;
+
+
+import static java.lang.String.format;
+
+import com.google.common.base.Charsets;
+import com.google.common.io.Resources;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import io.fd.honeycomb.infra.distro.activation.ActivationConfig;
+import io.fd.honeycomb.infra.distro.activation.ActiveModules;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Collection;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
+import org.opendaylight.yangtools.yang.binding.YangModelBindingProvider;
+
+/**
+ * Loads active yang modules
+ * Relying on generate yang-module-index
+ */
+public class YangModulesProvider implements Provider<YangModulesProvider.YangModules> {
+
+    @Inject
+    private ActiveModules activeModules;
+
+    @Inject
+    private ActivationConfig config;
+
+    @Override
+    public YangModules get() {
+        // no need to bind this, pretty big map and its needed just here
+        final YangModuleMappingIndex index = new YangModuleMappingIndex(config.getYangModulesIndexPath());
+
+        return new YangModules(activeModules.getActiveModulesClasses().stream()
+                .map(Class::getName)
+                .map(index::getByModuleName)
+                .flatMap(Collection::stream)
+                .map(YangModulesProvider::loadClass)
+                .map(aClass -> (Class<? extends YangModelBindingProvider>) aClass)
+                .collect(Collectors.toSet()));
+    }
+
+    static class YangModules {
+        private final Set<Class<? extends YangModelBindingProvider>> yangBindings;
+
+        YangModules(final Set<Class<? extends YangModelBindingProvider>> yangBindings) {
+            this.yangBindings = yangBindings;
+        }
+
+        Set<YangModelBindingProvider> getYangBindings() {
+            return yangBindings.stream()
+                    .map(providerClass -> {
+                        try {
+                            return providerClass.newInstance();
+                        } catch (InstantiationException | IllegalAccessException e) {
+                            throw new IllegalStateException(format("Unable to create instance of %s", providerClass),
+                                    e);
+                        }
+                    }).collect(Collectors.toSet());
+        }
+    }
+
+    private static Class<?> loadClass(@Nonnull final String className) {
+        try {
+            return Class.forName(className);
+        } catch (ClassNotFoundException e) {
+            throw new IllegalArgumentException("Unable to load class: " + className, e);
+        }
+    }
+
+    static String urlToString(@Nonnull final URL url) {
+        try {
+            return Resources.toString(url, Charsets.UTF_8);
+        } catch (IOException e) {
+            throw new IllegalArgumentException("Unable to read resource from: " + url, e);
+        }
+    }
+}
diff --git a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/activation.json b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/activation.json
index 7b6f44a20..8dd168702 100644
--- a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/activation.json
+++ b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/activation.json
@@ -1,3 +1,4 @@
 {
-  "modules-resource-path": "../modules/"
+  "modules-resource-path": "../modules/",
+  "yang-modules-index-path": "../yang-mapping/"
 }
\ No newline at end of file
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
deleted 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