summaryrefslogtreecommitdiffstats
path: root/infra/bgp-distribution/src/main/java
diff options
context:
space:
mode:
authorJan Srnicek <jsrnicek@cisco.com>2017-06-27 09:25:04 +0200
committerMarek Gradzki <mgradzki@cisco.com>2017-06-30 11:16:29 +0000
commitef852789b2c156196a847b211066ae456c2683f5 (patch)
tree0ad11f02581de272fc7fc8a76b4f8e23c1b01354 /infra/bgp-distribution/src/main/java
parent74f4963ae3b0ccf3fdf67e9797000853cc9a068b (diff)
HONEYCOMB-358 - Activation module
Provides module that provides set of distribution started modules Change-Id: I54287cc17f3af7d51a47a7342e5b8496e5ade00e Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
Diffstat (limited to 'infra/bgp-distribution/src/main/java')
-rw-r--r--infra/bgp-distribution/src/main/java/io/fd/honeycomb/infra/bgp/distro/Main.java13
1 files changed, 3 insertions, 10 deletions
diff --git a/infra/bgp-distribution/src/main/java/io/fd/honeycomb/infra/bgp/distro/Main.java b/infra/bgp-distribution/src/main/java/io/fd/honeycomb/infra/bgp/distro/Main.java
index bf6725a09..8994f0415 100644
--- a/infra/bgp-distribution/src/main/java/io/fd/honeycomb/infra/bgp/distro/Main.java
+++ b/infra/bgp-distribution/src/main/java/io/fd/honeycomb/infra/bgp/distro/Main.java
@@ -16,18 +16,12 @@
package io.fd.honeycomb.infra.bgp.distro;
-import static io.fd.honeycomb.infra.distro.ActiveModuleProvider.STANDARD_MODULES_RELATIVE_PATH;
-import static io.fd.honeycomb.infra.distro.ActiveModuleProvider.aggregateResources;
-import static io.fd.honeycomb.infra.distro.ActiveModuleProvider.loadActiveModules;
-
import com.google.inject.ConfigurationException;
import com.google.inject.CreationException;
import com.google.inject.Injector;
-import com.google.inject.Module;
import com.google.inject.ProvisionException;
import io.fd.honeycomb.infra.bgp.BgpConfiguration;
import io.fd.honeycomb.infra.bgp.BgpServerProvider;
-import java.util.Set;
import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.BgpNeighbors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,16 +34,15 @@ public final class Main {
}
public static void main(String[] args) {
- final ClassLoader classLoader = Main.class.getClassLoader();
- init(loadActiveModules(aggregateResources(STANDARD_MODULES_RELATIVE_PATH, classLoader)));
+ init();
}
/**
* Initialize the Honeycomb with provided modules
*/
- public static Injector init(final Set<? extends Module> modules) {
+ public static Injector init() {
try {
- Injector injector = io.fd.honeycomb.infra.distro.Main.init(modules);
+ Injector injector = io.fd.honeycomb.infra.distro.Main.init();
final BgpConfiguration bgpAttributes = injector.getInstance(BgpConfiguration.class);
if (bgpAttributes.isBgpEnabled()) {