From 556a0f59abc9b09005d40945bc20948d69e4f98e Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Tue, 25 Sep 2018 11:15:35 +0200 Subject: Bump ODL dependencies to Fluorine (HONEYCOMB-433) Change-Id: I142ebd2899272feff00abe7d4bae708f093ee3ec Signed-off-by: Michal Cmarada --- .../src/test/java/io/fd/honeycomb/data/impl/EditConfigTest.java | 8 ++++---- .../io/fd/honeycomb/data/impl/HoneycombSubtreeReadInfraTest.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'infra/it/it-test') diff --git a/infra/it/it-test/src/test/java/io/fd/honeycomb/data/impl/EditConfigTest.java b/infra/it/it-test/src/test/java/io/fd/honeycomb/data/impl/EditConfigTest.java index cae1e4de2..75c5b4d17 100644 --- a/infra/it/it-test/src/test/java/io/fd/honeycomb/data/impl/EditConfigTest.java +++ b/infra/it/it-test/src/test/java/io/fd/honeycomb/data/impl/EditConfigTest.java @@ -38,9 +38,9 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.opendaylight.controller.config.util.xml.DocumentedException; -import org.opendaylight.controller.config.util.xml.XmlUtil; -import org.opendaylight.controller.sal.core.api.model.SchemaService; +import org.opendaylight.mdsal.dom.api.DOMSchemaService; +import org.opendaylight.netconf.api.DocumentedException; +import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.mapping.api.NetconfOperation; import org.opendaylight.netconf.mapping.api.NetconfOperationChainedExecution; import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext; @@ -68,7 +68,7 @@ public class EditConfigTest { @Mock private ReadableDataManager operationalData; @Mock - private SchemaService schemaService; + private DOMSchemaService schemaService; private CurrentSchemaContext currentSchemaContext; private DataBroker dataBroker; diff --git a/infra/it/it-test/src/test/java/io/fd/honeycomb/data/impl/HoneycombSubtreeReadInfraTest.java b/infra/it/it-test/src/test/java/io/fd/honeycomb/data/impl/HoneycombSubtreeReadInfraTest.java index cfff6e30c..b3d24e5b5 100644 --- a/infra/it/it-test/src/test/java/io/fd/honeycomb/data/impl/HoneycombSubtreeReadInfraTest.java +++ b/infra/it/it-test/src/test/java/io/fd/honeycomb/data/impl/HoneycombSubtreeReadInfraTest.java @@ -68,7 +68,7 @@ public class HoneycombSubtreeReadInfraTest extends AbstractInfraTest { final ListInContainerBuilder builder, final ReadContext context) throws ReadFailedException { super.readCurrentAttributes(id, builder, context); - builder.setKey(id.firstKeyOf(ListInContainer.class)); + builder.withKey(id.firstKeyOf(ListInContainer.class)); } }); -- cgit 1.2.3-korg