From 7d22608d89d8ff8c32e72d15039f1f27b7d659a8 Mon Sep 17 00:00:00 2001
From: Jan Srnicek <jsrnicek@cisco.com>
Date: Tue, 11 Jul 2017 17:56:04 +0200
Subject: HONEYCOMB-360 - Netconf Northbound Intefaces provider separation

- Netconf configuration included under netconf.json

Change-Id: If2a51d689e9bfc950da73f15a438277839140f8a
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
---
 .../distro/cfgattrs/HoneycombConfiguration.java    | 37 ----------------------
 1 file changed, 37 deletions(-)

(limited to 'infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs')

diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/HoneycombConfiguration.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/HoneycombConfiguration.java
index 392248771..cccbe8e06 100644
--- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/HoneycombConfiguration.java
+++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/HoneycombConfiguration.java
@@ -31,18 +31,6 @@ import net.jmob.guice.conf.core.Syntax;
 @BindConfig(value = "honeycomb", syntax = Syntax.JSON)
 public class HoneycombConfiguration {
 
-    public boolean isNetconfTcpEnabled() {
-        return Boolean.valueOf(netconfTcp);
-    }
-
-    public boolean isNetconfSshEnabled() {
-        return Boolean.valueOf(netconfSsh);
-    }
-
-    public boolean isNetconfEnabled() {
-        return isNetconfTcpEnabled() || isNetconfSshEnabled();
-    }
-
     public boolean isConfigPersistenceEnabled() {
         return persistConfig.isPresent() && Boolean.valueOf(persistConfig.get());
     }
@@ -65,23 +53,6 @@ public class HoneycombConfiguration {
     @InjectConfig("notification-service-queue-depth")
     public int notificationServiceQueueDepth;
 
-    @InjectConfig("netconf-netty-threads")
-    public Integer netconfNettyThreads;
-    @InjectConfig("netconf-tcp-enabled")
-    public String netconfTcp;
-    @InjectConfig("netconf-tcp-binding-address")
-    public Optional<String> netconfTcpBindingAddress;
-    @InjectConfig("netconf-tcp-binding-port")
-    public Optional<Integer> netconfTcpBindingPort;
-    @InjectConfig("netconf-ssh-enabled")
-    public String netconfSsh;
-    @InjectConfig("netconf-ssh-binding-address")
-    public Optional<String> netconfSshBindingAddress;
-    @InjectConfig("netconf-ssh-binding-port")
-    public Optional<Integer> netconfSshBindingPort;
-    @InjectConfig("netconf-notification-stream-name")
-    public Optional<String> netconfNotificationStreamName = Optional.of("honeycomb");
-
     @Override
     public String toString() {
         return MoreObjects.toStringHelper(this)
@@ -90,14 +61,6 @@ public class HoneycombConfiguration {
                 .add("peristConfigPath", peristConfigPath)
                 .add("persistedConfigRestorationType", persistedConfigRestorationType)
                 .add("notificationServiceQueueDepth", notificationServiceQueueDepth)
-                .add("netconfNettyThreads", netconfNettyThreads)
-                .add("netconfTcp", netconfTcp)
-                .add("netconfTcpBindingAddress", netconfTcpBindingAddress)
-                .add("netconfTcpBindingPort", netconfTcpBindingPort)
-                .add("netconfSsh", netconfSsh)
-                .add("netconfSshBindingAddress", netconfSshBindingAddress)
-                .add("netconfSshBindingPort", netconfSshBindingPort)
-                .add("netconfNotificationStreamName", netconfNotificationStreamName)
                 .toString();
     }
 }
-- 
cgit 1.2.3-korg