diff options
author | Maros Marsalek <mmarsale@cisco.com> | 2016-08-19 12:20:33 +0200 |
---|---|---|
committer | Maros Marsalek <mmarsale@cisco.com> | 2016-08-19 12:50:00 +0200 |
commit | 31f01fcfadf8707aefe6bf3a09daf570ce248fc5 (patch) | |
tree | 6222e198d5f4ea5eb32ee0defdf7e5a29f0b45e0 /infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/Main.java | |
parent | 3341ac467cc08ac95f937945c7502ac4a019d805 (diff) |
HONEYCOMB-18 Fixing comments from reviews
Change-Id: Ic0565d601d13b5f50ec3c714a43600e32a7e456b
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Diffstat (limited to 'infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/Main.java')
-rw-r--r-- | infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/Main.java | 25 |
1 files changed, 13 insertions, 12 deletions
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 278f0b104..d74906244 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 @@ -98,10 +98,10 @@ public final class Main { final RestConnector instance = injector.getInstance(RestConnector.class); if (cfgAttributes.isRestconfHttpEnabled()) { - injector.getInstance(Key.get(ServerConnector.class, Names.named("restconf-http"))); + injector.getInstance(Key.get(ServerConnector.class, Names.named(RestconfModule.RESTCONF_HTTP))); } if (cfgAttributes.isRestconfHttpsEnabled()) { - injector.getInstance(Key.get(ServerConnector.class, Names.named("restconf-https"))); + injector.getInstance(Key.get(ServerConnector.class, Names.named(RestconfModule.RESTCONF_HTTPS))); } try { @@ -113,21 +113,21 @@ public final class Main { } if (cfgAttributes.isNetconfEnabled()) { - LOG.info("Starting NETCONF"); - injector.getInstance( - Key.get(NetconfOperationServiceFactory.class, Names.named("netconf-mapper-honeycomb"))); - injector.getInstance( - Key.get(NetconfOperationServiceFactory.class, Names.named("netconf-mapper-notification"))); - injector.getInstance( - Key.get(NetconfOperationServiceFactory.class, Names.named("netconf-mapper-monitoring"))); + LOG.info("Starting HONEYCOMB_NETCONF"); + injector.getInstance(Key.get(NetconfOperationServiceFactory.class, + Names.named(NetconfModule.HONEYCOMB_NETCONF_MAPPER_CORE))); + injector.getInstance(Key.get(NetconfOperationServiceFactory.class, + Names.named(NetconfModule.HONEYCOMB_NETCONF_MAPPER_NOTIF))); + injector.getInstance(Key.get(NetconfOperationServiceFactory.class, + Names.named(NetconfModule.HONEYCOMB_NETCONF_MAPPER_OPER))); if (cfgAttributes.isNetconfTcpEnabled()) { - LOG.info("Starting NETCONF TCP"); + LOG.info("Starting HONEYCOMB_NETCONF TCP"); injector.getInstance(NetconfTcpServerProvider.NetconfTcpServer.class); } if (cfgAttributes.isNetconfSshEnabled()) { - LOG.info("Starting NETCONF SSH"); + LOG.info("Starting HONEYCOMB_NETCONF SSH"); injector.getInstance(NetconfSshServerProvider.NetconfSshServer.class); } injector.getInstance(HoneycombNotification2NetconfProvider.HoneycombNotification2Netconf.class); @@ -137,7 +137,8 @@ public final class Main { try { LOG.info("Initializing configuration"); - injector.getInstance(Key.get(InitializerRegistry.class, Names.named("honeycomb-initializer"))).initialize(); + injector.getInstance(Key.get(InitializerRegistry.class, + Names.named(InitializerPipelineModule.HONEYCOMB_INITIALIZER))).initialize(); LOG.info("Configuration initialized successfully"); } catch (DataTreeInitializer.InitializeException e) { LOG.error("Unable to initialize configuration", e); |