From b65cd89989ead7082089bf6f333e56b03f619606 Mon Sep 17 00:00:00 2001 From: Jan Srnicek Date: Thu, 13 Jul 2017 20:21:01 +0200 Subject: HONEYCOMB-360 - Restconf Northbound Intefaces provider separation - Restconf configuration included under restconf.json Change-Id: I45f503d3ef383bd6e3d356308d3212c7314b7a28 Signed-off-by: Jan Srnicek --- .../infra/bgp/distro/BgpDistributionTest.java | 3 ++- .../resources/base-distro-test-modules/base-modules | 2 +- .../src/test/resources/honeycomb.json | 20 -------------------- .../src/test/resources/restconf.json | 21 +++++++++++++++++++++ 4 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 infra/bgp-distribution-test/src/test/resources/restconf.json (limited to 'infra/bgp-distribution-test/src') diff --git a/infra/bgp-distribution-test/src/test/java/io/fd/honeycomb/infra/bgp/distro/BgpDistributionTest.java b/infra/bgp-distribution-test/src/test/java/io/fd/honeycomb/infra/bgp/distro/BgpDistributionTest.java index d6f03f9a8..a105b6532 100644 --- a/infra/bgp-distribution-test/src/test/java/io/fd/honeycomb/infra/bgp/distro/BgpDistributionTest.java +++ b/infra/bgp-distribution-test/src/test/java/io/fd/honeycomb/infra/bgp/distro/BgpDistributionTest.java @@ -19,6 +19,7 @@ package io.fd.honeycomb.infra.bgp.distro; import com.google.common.io.ByteStreams; import com.mashape.unirest.http.Unirest; import io.fd.honeycomb.infra.distro.Main; +import io.fd.honeycomb.infra.distro.activation.ActivationModule; import java.io.IOException; import java.io.InputStream; import java.net.InetAddress; @@ -61,7 +62,7 @@ public class BgpDistributionTest { @Test(timeout = 120000) public void test() throws Exception { - Main.init(); + Main.init(new ActivationModule()); LOG.info("Testing Honeycomb BGP distribution"); assertBgp(); } diff --git a/infra/bgp-distribution-test/src/test/resources/base-distro-test-modules/base-modules b/infra/bgp-distribution-test/src/test/resources/base-distro-test-modules/base-modules index b69e94581..e647413ab 100644 --- a/infra/bgp-distribution-test/src/test/resources/base-distro-test-modules/base-modules +++ b/infra/bgp-distribution-test/src/test/resources/base-distro-test-modules/base-modules @@ -8,6 +8,6 @@ io.fd.honeycomb.infra.distro.initializer.InitializerPipelineModule io.fd.honeycomb.northbound.CredentialsModule io.fd.honeycomb.infra.distro.netconf.NetconfModule io.fd.honeycomb.infra.distro.netconf.NetconfReadersModule -io.fd.honeycomb.infra.distro.restconf.RestconfModule +io.fd.honeycomb.northbound.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/bgp-distribution-test/src/test/resources/honeycomb.json b/infra/bgp-distribution-test/src/test/resources/honeycomb.json index 8ff269a1c..65286c480 100644 --- a/infra/bgp-distribution-test/src/test/resources/honeycomb.json +++ b/infra/bgp-distribution-test/src/test/resources/honeycomb.json @@ -6,26 +6,6 @@ "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", diff --git a/infra/bgp-distribution-test/src/test/resources/restconf.json b/infra/bgp-distribution-test/src/test/resources/restconf.json new file mode 100644 index 000000000..525a39ff5 --- /dev/null +++ b/infra/bgp-distribution-test/src/test/resources/restconf.json @@ -0,0 +1,21 @@ +{ + "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 +} -- cgit 1.2.3-korg