summaryrefslogtreecommitdiffstats
path: root/infra
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2017-11-30 12:39:19 +0100
committerMarek Gradzki <mgradzki@cisco.com>2017-11-30 13:32:18 +0100
commit1eb74ba49748b7416fa5a76797e424b9859b6cc6 (patch)
tree3f90c3918b4996e9c4f920d5e70623c897d2c7ce /infra
parent22250d38fb0050e356c800ff0efe6f87cd9438ee (diff)
HONEYCOMB-417: bump ODL dependencies to Nitrogen SR1
Change-Id: I6fe0d310a36dd8b0262c7db53f520616e65022e4 Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'infra')
-rw-r--r--infra/bgp-distribution-test/src/test/resources/restconf.json1
-rw-r--r--infra/minimal-distribution-test/src/test/resources/restconf.json1
-rw-r--r--infra/northbound/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfiguration.java3
-rw-r--r--infra/northbound/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfProvider.java5
-rw-r--r--infra/northbound/restconf/src/main/resources/honeycomb-minimal-resources/config/restconf.json1
5 files changed, 10 insertions, 1 deletions
diff --git a/infra/bgp-distribution-test/src/test/resources/restconf.json b/infra/bgp-distribution-test/src/test/resources/restconf.json
index 525a39f..1b5b54f 100644
--- a/infra/bgp-distribution-test/src/test/resources/restconf.json
+++ b/infra/bgp-distribution-test/src/test/resources/restconf.json
@@ -11,6 +11,7 @@
"restconf-keystore-manager-password": "testing",
"restconf-truststore": "/honeycomb-keystore",
"restconf-truststore-password": "testing",
+ "restconf-websocket-address": "0.0.0.0",
"restconf-websocket-port": 7780,
"restconf-pool-max-size": 10,
"restconf-pool-min-size": 1,
diff --git a/infra/minimal-distribution-test/src/test/resources/restconf.json b/infra/minimal-distribution-test/src/test/resources/restconf.json
index 525a39f..1b5b54f 100644
--- a/infra/minimal-distribution-test/src/test/resources/restconf.json
+++ b/infra/minimal-distribution-test/src/test/resources/restconf.json
@@ -11,6 +11,7 @@
"restconf-keystore-manager-password": "testing",
"restconf-truststore": "/honeycomb-keystore",
"restconf-truststore-password": "testing",
+ "restconf-websocket-address": "0.0.0.0",
"restconf-websocket-port": 7780,
"restconf-pool-max-size": 10,
"restconf-pool-min-size": 1,
diff --git a/infra/northbound/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfiguration.java b/infra/northbound/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfiguration.java
index 78bc39d..21307a3 100644
--- a/infra/northbound/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfiguration.java
+++ b/infra/northbound/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfiguration.java
@@ -55,6 +55,8 @@ public class RestconfConfiguration {
public Optional<String> restconfTruststore;
@InjectConfig("restconf-truststore-password")
public Optional<String> truststorePassword;
+ @InjectConfig("restconf-websocket-address")
+ public Optional<String> restconfWebsocketAddress = Optional.of("0.0.0.0");
@InjectConfig("restconf-websocket-port")
public Optional<Integer> restconfWebsocketPort = Optional.of(7779);
@InjectConfig("restconf-root-path")
@@ -98,6 +100,7 @@ public class RestconfConfiguration {
", keystoreManagerPassword=" + keystoreManagerPassword +
", restconfTruststore=" + restconfTruststore +
", truststorePassword=" + truststorePassword +
+ ", restconfWebsocketAddress=" + restconfWebsocketAddress +
", restconfWebsocketPort=" + restconfWebsocketPort +
", restconfRootPath=" + restconfRootPath +
", restPoolMaxSize=" + restPoolMaxSize +
diff --git a/infra/northbound/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfProvider.java b/infra/northbound/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfProvider.java
index ff338f1..e924dd7 100644
--- a/infra/northbound/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfProvider.java
+++ b/infra/northbound/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfProvider.java
@@ -28,6 +28,7 @@ import org.opendaylight.controller.md.sal.dom.broker.impl.DOMNotificationRouter;
import org.opendaylight.controller.sal.core.api.model.SchemaService;
import org.opendaylight.netconf.sal.rest.api.RestConnector;
import org.opendaylight.netconf.sal.restconf.impl.RestconfProviderImpl;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
final class RestconfProvider extends ProviderTrait<RestConnector> {
@@ -51,7 +52,9 @@ final class RestconfProvider extends ProviderTrait<RestConnector> {
@Override
protected RestconfProviderImpl create() {
final RestconfProviderImpl instance = new RestconfProviderImpl(domDataBroker, schemaService, rpcService,
- notificationService, mountPointService, new PortNumber(cfg.restconfWebsocketPort.get()));
+ notificationService, mountPointService,
+ IpAddressBuilder.getDefaultInstance(cfg.restconfWebsocketAddress.get()),
+ new PortNumber(cfg.restconfWebsocketPort.get()));
// Required to properly initialize restconf (broker, schema ctx, etc.).
// Without that restconf would fail with 503 (service not available).
diff --git a/infra/northbound/restconf/src/main/resources/honeycomb-minimal-resources/config/restconf.json b/infra/northbound/restconf/src/main/resources/honeycomb-minimal-resources/config/restconf.json
index d04e4ed..ec4061c 100644
--- a/infra/northbound/restconf/src/main/resources/honeycomb-minimal-resources/config/restconf.json
+++ b/infra/northbound/restconf/src/main/resources/honeycomb-minimal-resources/config/restconf.json
@@ -11,6 +11,7 @@
"restconf-keystore-manager-password": "OBF:1v9s1unr1unn1vv51zlk1t331vg91x1b1vgl1t331zly1vu51uob1uo71v8u",
"restconf-truststore": "/honeycomb-keystore",
"restconf-truststore-password": "OBF:1v9s1unr1unn1vv51zlk1t331vg91x1b1vgl1t331zly1vu51uob1uo71v8u",
+ "restconf-websocket-address": "0.0.0.0",
"restconf-websocket-port": 7779,
"restconf-pool-max-size": 10,
"restconf-pool-min-size": 1,