HONEYCOMB-417: bump ODL dependencies to Nitrogen SR1

Change-Id: I6fe0d310a36dd8b0262c7db53f520616e65022e4
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

3 files changed, 8 insertions, 1 deletions

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 78bc39dd6..21307a3cc 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 ff338f1d9..e924dd751 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 d04e4ed3d..ec4061c63 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,