X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fhoneynode%2F1.2.1%2Frestconf%2Fsrc%2Fmain%2Fjava%2Fio%2Ffd%2Fhoneycomb%2Fnorthbound%2Frestconf%2FRestconfProvider.java;fp=tests%2Fhoneynode%2F2.1%2Frestconf%2Fsrc%2Fmain%2Fjava%2Fio%2Ffd%2Fhoneycomb%2Fnorthbound%2Frestconf%2FRestconfProvider.java;h=85caf6621322195af15e75ee0c039b2488467114;hb=c764b14f67faf1665f8814db9e5d16ddb342553e;hp=6650e31571bd05ed91523a4a261c4070a174ef20;hpb=b90fdacec82f92e07d14ed1df31e3fe53275c676;p=transportpce.git diff --git a/tests/honeynode/2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfProvider.java b/tests/honeynode/1.2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfProvider.java similarity index 62% rename from tests/honeynode/2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfProvider.java rename to tests/honeynode/1.2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfProvider.java index 6650e3157..85caf6621 100644 --- a/tests/honeynode/2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfProvider.java +++ b/tests/honeynode/1.2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfProvider.java @@ -17,18 +17,11 @@ package io.fd.honeycomb.northbound.restconf; import com.google.inject.Inject; -import com.google.inject.name.Named; - import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.data.init.ShutdownHandler; - -import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; -import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService; -import org.opendaylight.controller.md.sal.dom.api.DOMRpcService; -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.netconf.sal.restconf.impl.StatisticsRestconfServiceWrapper; 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; @@ -37,28 +30,15 @@ final class RestconfProvider extends ProviderTrait { @Inject private RestconfConfiguration cfg; @Inject -// @Named(HONEYCOMB_CONFIG) - //Modified in order to connect TPCE to device config datastore - @Named("device-databroker") - private DOMDataBroker domDataBroker; - @Inject - private SchemaService schemaService; - @Inject - private DOMRpcService rpcService; - @Inject - private DOMNotificationRouter notificationService; - @Inject private ShutdownHandler shutdownHandler; @Inject - private DOMMountPointService mountPointService; + private StatisticsRestconfServiceWrapper statsServiceWrapper; @Override protected RestconfProviderImpl create() { - final RestconfProviderImpl instance = new RestconfProviderImpl(domDataBroker, schemaService, rpcService, - notificationService, mountPointService, - IpAddressBuilder.getDefaultInstance(cfg.restconfWebsocketAddress.get()), - new PortNumber(cfg.restconfWebsocketPort.get())); - + final RestconfProviderImpl instance = new RestconfProviderImpl(statsServiceWrapper, + 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). instance.start();