diff options
7 files changed, 19 insertions, 10 deletions
diff --git a/common/honeycomb-parent/pom.xml b/common/honeycomb-parent/pom.xml index 7a84e7579..661a2a9ba 100644 --- a/common/honeycomb-parent/pom.xml +++ b/common/honeycomb-parent/pom.xml @@ -46,14 +46,14 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <!-- ODL dependencies --> - <odl.yangtools.version>1.2.0</odl.yangtools.version> - <odl.mdsal.version>2.3.0</odl.mdsal.version> - <odl.mdsal.controller.version>1.6.0</odl.mdsal.controller.version> - <odl.mdsalmodel.version>0.11.0</odl.mdsalmodel.version> - <odl.netconf.version>1.3.0</odl.netconf.version> - <odl.restconf.version>1.6.0</odl.restconf.version> - <odl.salGenerator.version>0.11.0</odl.salGenerator.version> - <odl.bgpcep.version>0.8.0</odl.bgpcep.version> + <odl.yangtools.version>1.2.1</odl.yangtools.version> + <odl.mdsal.version>2.3.1</odl.mdsal.version> + <odl.mdsal.controller.version>1.6.1</odl.mdsal.controller.version> + <odl.mdsalmodel.version>0.11.1</odl.mdsalmodel.version> + <odl.netconf.version>1.3.1</odl.netconf.version> + <odl.restconf.version>1.6.1</odl.restconf.version> + <odl.salGenerator.version>0.11.1</odl.salGenerator.version> + <odl.bgpcep.version>0.8.1</odl.bgpcep.version> <salGeneratorPath>target/generated-sources/mdsal-binding</salGeneratorPath> <!-- common dependencies --> diff --git a/common/scripts-parent/pom.xml b/common/scripts-parent/pom.xml index 9e730e84e..c9508abc7 100644 --- a/common/scripts-parent/pom.xml +++ b/common/scripts-parent/pom.xml @@ -32,7 +32,7 @@ <groovy.version>2.4.7</groovy.version> <groovy.eclipse.compiler.version>2.9.2-01</groovy.eclipse.compiler.version> <groovy.eclipse.batch.version>2.4.3-01</groovy.eclipse.batch.version> - <odl.yang-binding.version>0.11.0</odl.yang-binding.version> + <odl.yang-binding.version>0.11.1</odl.yang-binding.version> </properties> <dependencyManagement> diff --git a/infra/bgp-distribution-test/src/test/resources/restconf.json b/infra/bgp-distribution-test/src/test/resources/restconf.json index 525a39ff5..1b5b54f64 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 525a39ff5..1b5b54f64 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 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, |