summaryrefslogtreecommitdiffstats
path: root/infra/bgp-distribution-test
diff options
context:
space:
mode:
authorJan Srnicek <jsrnicek@cisco.com>2017-07-13 20:21:01 +0200
committerMarek Gradzki <mgradzki@cisco.com>2017-07-14 12:20:49 +0000
commitb65cd89989ead7082089bf6f333e56b03f619606 (patch)
treec80952fdaead46627ca861d1b3edb68dc4b87f47 /infra/bgp-distribution-test
parent32771868ab8f9d2fdad236c049ec1c3fc3c76ba0 (diff)
HONEYCOMB-360 - Restconf Northbound Intefaces provider separation
- Restconf configuration included under restconf.json Change-Id: I45f503d3ef383bd6e3d356308d3212c7314b7a28 Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
Diffstat (limited to 'infra/bgp-distribution-test')
-rw-r--r--infra/bgp-distribution-test/src/test/java/io/fd/honeycomb/infra/bgp/distro/BgpDistributionTest.java3
-rw-r--r--infra/bgp-distribution-test/src/test/resources/base-distro-test-modules/base-modules2
-rw-r--r--infra/bgp-distribution-test/src/test/resources/honeycomb.json20
-rw-r--r--infra/bgp-distribution-test/src/test/resources/restconf.json21
4 files changed, 24 insertions, 22 deletions
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 d6f03f9..a105b65 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 b69e945..e647413 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 8ff269a..65286c4 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 0000000..525a39f
--- /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
+}