X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-it%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Ftest%2Fsal%2Fbinding%2Fit%2FDataServiceIT.java;h=833c710e328b9dccdf09ff42f791e446ffd1bb49;hb=2611e6a728e586ea34dd891f30a473bf54d6cbd8;hp=53d88aee681162add8fe05b3de66d415d122b65a;hpb=aaea3e9a92ae9d6fac04c4a065db4b35cbca9ed0;p=controller.git diff --git a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/DataServiceIT.java b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/DataServiceIT.java index 53d88aee68..833c710e32 100644 --- a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/DataServiceIT.java +++ b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/DataServiceIT.java @@ -12,13 +12,13 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import com.google.common.base.Optional; +import java.util.Optional; import java.util.concurrent.TimeUnit; import javax.inject.Inject; import org.junit.Test; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.WriteTransaction; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.store.rev140422.Lists; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.store.rev140422.lists.UnorderedContainer; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.store.rev140422.lists.unordered.container.UnorderedList; @@ -51,7 +51,7 @@ public class DataServiceIT extends AbstractIT { UnorderedList nodeData1 = createNode("0"); transaction.put(LogicalDatastoreType.OPERATIONAL, node1, nodeData1); - transaction.submit().get(5, TimeUnit.SECONDS); + transaction.commit().get(5, TimeUnit.SECONDS); Optional readedData = dataBroker.newReadOnlyTransaction().read(LogicalDatastoreType.OPERATIONAL, node1).get(5, TimeUnit.SECONDS); @@ -63,7 +63,7 @@ public class DataServiceIT extends AbstractIT { transaction2.delete(LogicalDatastoreType.OPERATIONAL, node1); - transaction2.submit().get(5, TimeUnit.SECONDS); + transaction2.commit().get(5, TimeUnit.SECONDS); Optional readedData2 = dataBroker.newReadOnlyTransaction().read(LogicalDatastoreType.OPERATIONAL, node1).get(5, TimeUnit.SECONDS);