X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=restconf%2Frestconf-nb-rfc8040%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Frestconf%2Fnb%2Frfc8040%2Frests%2Futils%2FPostDataTransactionUtilTest.java;h=836316e311fc956289b44726b22df374e1f34e7e;hb=9cc114dc8e4109893e2346477b5ae14391afe01c;hp=ee4d92a4756eae26063b0a189f12fdee5e147c35;hpb=a8a56843c3dc31f61a01d6eff31cb79a5381398a;p=netconf.git diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtilTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtilTest.java index ee4d92a475..836316e311 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtilTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtilTest.java @@ -10,15 +10,15 @@ package org.opendaylight.restconf.nb.rfc8040.rests.utils; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.Assert.assertThrows; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.opendaylight.yangtools.util.concurrent.FluentFutures.immediateFailedFluentFuture; import static org.opendaylight.yangtools.util.concurrent.FluentFutures.immediateFalseFluentFuture; -import java.io.UnsupportedEncodingException; +import com.google.common.util.concurrent.Futures; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; import java.util.Collection; @@ -30,20 +30,18 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.mdsal.common.api.CommitInfo; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMDataBroker; -import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction; import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction; -import org.opendaylight.mdsal.dom.api.DOMTransactionChain; +import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult; import org.opendaylight.netconf.dom.api.NetconfDataTreeService; import org.opendaylight.restconf.common.context.InstanceIdentifierContext; -import org.opendaylight.restconf.common.context.NormalizedNodeContext; import org.opendaylight.restconf.common.errors.RestconfDocumentedException; import org.opendaylight.restconf.nb.rfc8040.TestRestconfUtils; -import org.opendaylight.restconf.nb.rfc8040.handlers.TransactionChainHandler; +import org.opendaylight.restconf.nb.rfc8040.WriteDataParams; +import org.opendaylight.restconf.nb.rfc8040.legacy.NormalizedNodePayload; import org.opendaylight.restconf.nb.rfc8040.rests.transactions.MdsalRestconfStrategy; import org.opendaylight.restconf.nb.rfc8040.rests.transactions.NetconfRestconfStrategy; import org.opendaylight.yangtools.yang.common.QName; @@ -56,29 +54,22 @@ import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; -import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; import org.w3c.dom.DOMException; @RunWith(MockitoJUnitRunner.StrictStubs.class) public class PostDataTransactionUtilTest { - private static final String PATH_FOR_NEW_SCHEMA_CONTEXT = "/jukebox"; - @Mock - private DOMTransactionChain transactionChain; @Mock private DOMDataTreeReadWriteTransaction readWrite; @Mock - private DOMDataTreeReadTransaction read; - @Mock private UriInfo uriInfo; @Mock private DOMDataBroker mockDataBroker; @Mock private NetconfDataTreeService netconfService; - private TransactionChainHandler transactionChainHandler; private ContainerNode buildBaseCont; private EffectiveModelContext schema; private YangInstanceIdentifier iid2; @@ -87,7 +78,7 @@ public class PostDataTransactionUtilTest { @Before public void setUp() throws Exception { - this.schema = + schema = YangParserTestUtils.parseYangFiles(TestRestconfUtils.loadFiles(PATH_FOR_NEW_SCHEMA_CONTEXT)); final QName baseQName = QName.create("http://example.com/ns/example-jukebox", "2015-04-04", "jukebox"); @@ -97,10 +88,10 @@ public class PostDataTransactionUtilTest { final QName listKeyQname = QName.create(baseQName, "name"); final NodeIdentifierWithPredicates nodeWithKey = NodeIdentifierWithPredicates.of(listQname, listKeyQname, "name of band"); - this.iid2 = YangInstanceIdentifier.builder() + iid2 = YangInstanceIdentifier.builder() .node(baseQName) .build(); - this.iidList = YangInstanceIdentifier.builder() + iidList = YangInstanceIdentifier.builder() .node(baseQName) .node(listQname) .build(); @@ -113,7 +104,7 @@ public class PostDataTransactionUtilTest { .withNodeIdentifier(new NodeIdentifier(containerQname)) .withChild(buildLeaf) .build(); - this.buildBaseCont = Builders.containerBuilder() + buildBaseCont = Builders.containerBuilder() .withNodeIdentifier(new NodeIdentifier(baseQName)) .withChild(buildPlayerCont) .build(); @@ -131,121 +122,113 @@ public class PostDataTransactionUtilTest { .withChild(content) .withChild(content2) .build(); - this.buildList = Builders.mapBuilder() + buildList = Builders.mapBuilder() .withNodeIdentifier(new NodeIdentifier(listQname)) .withChild(mapEntryNode) .build(); - doReturn(UriBuilder.fromUri("http://localhost:8181/restconf/16/")).when(this.uriInfo).getBaseUriBuilder(); - doReturn(this.readWrite).when(this.transactionChain).newReadWriteTransaction(); + doReturn(UriBuilder.fromUri("http://localhost:8181/restconf/16/")).when(uriInfo).getBaseUriBuilder(); + doReturn(readWrite).when(mockDataBroker).newReadWriteTransaction(); - Mockito.doReturn(transactionChain).when(mockDataBroker).createTransactionChain(Mockito.any()); - transactionChainHandler = new TransactionChainHandler(mockDataBroker); + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService).lock(); + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService).unlock(); } @Test public void testPostContainerData() { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(this.iid2, null, null, this.schema); - final NormalizedNodeContext payload = new NormalizedNodeContext(iidContext, this.buildBaseCont); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(iid2, null, null, schema); + final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildBaseCont); - doReturn(immediateFalseFluentFuture()).when(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION, - this.iid2); + doReturn(immediateFalseFluentFuture()).when(readWrite).exists(LogicalDatastoreType.CONFIGURATION, iid2); final NodeIdentifier identifier = - ((ContainerNode) ((Collection) payload.getData().getValue()).iterator().next()).getIdentifier(); - final YangInstanceIdentifier node = - payload.getInstanceIdentifierContext().getInstanceIdentifier().node(identifier); - doNothing().when(this.readWrite).put(LogicalDatastoreType.CONFIGURATION, node.getParent(), payload.getData()); - doReturn(CommitInfo.emptyFluentFuture()).when(this.readWrite).commit(); - doReturn(CommitInfo.emptyFluentFuture()).when(this.netconfService).commit(Mockito.any()); - - Response response = PostDataTransactionUtil.postData(this.uriInfo, payload, - new MdsalRestconfStrategy(transactionChainHandler), this.schema, null, null); + ((ContainerNode) ((Collection) payload.getData().body()).iterator().next()).getIdentifier(); + final YangInstanceIdentifier node = iid2.node(identifier); + doNothing().when(readWrite).put(LogicalDatastoreType.CONFIGURATION, node.getParent(), payload.getData()); + doReturn(CommitInfo.emptyFluentFuture()).when(readWrite).commit(); + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService).commit(); + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService) + .create(LogicalDatastoreType.CONFIGURATION, iid2, payload.getData(), Optional.empty()); + + Response response = PostDataTransactionUtil.postData(uriInfo, payload, + new MdsalRestconfStrategy(mockDataBroker), schema, WriteDataParams.empty()); assertEquals(201, response.getStatus()); - verify(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION, this.iid2); - verify(this.readWrite).put(LogicalDatastoreType.CONFIGURATION, - payload.getInstanceIdentifierContext().getInstanceIdentifier(), payload.getData()); + verify(readWrite).exists(LogicalDatastoreType.CONFIGURATION, iid2); + verify(readWrite).put(LogicalDatastoreType.CONFIGURATION, iid2, payload.getData()); - response = PostDataTransactionUtil.postData(this.uriInfo, payload, - new NetconfRestconfStrategy(netconfService), this.schema, null, null); + response = PostDataTransactionUtil.postData(uriInfo, payload, + new NetconfRestconfStrategy(netconfService), schema, WriteDataParams.empty()); assertEquals(201, response.getStatus()); - verify(this.netconfService).create(LogicalDatastoreType.CONFIGURATION, - payload.getInstanceIdentifierContext().getInstanceIdentifier(), payload.getData(), Optional.empty()); + verify(netconfService).create(LogicalDatastoreType.CONFIGURATION, iid2, payload.getData(), Optional.empty()); } @Test - public void testPostListData() throws UnsupportedEncodingException { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(this.iidList, null, null, this.schema); - final NormalizedNodeContext payload = new NormalizedNodeContext(iidContext, this.buildList); + public void testPostListData() { + final InstanceIdentifierContext iidContext = new InstanceIdentifierContext(iidList, null, null, schema); + final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildList); final MapNode data = (MapNode) payload.getData(); - final MapEntryNode entryNode = data.getValue().iterator().next(); + final MapEntryNode entryNode = data.body().iterator().next(); final NodeIdentifierWithPredicates identifier = entryNode.getIdentifier(); - final YangInstanceIdentifier node = - payload.getInstanceIdentifierContext().getInstanceIdentifier().node(identifier); - doReturn(immediateFalseFluentFuture()).when(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION, node); - doNothing().when(this.readWrite).put(LogicalDatastoreType.CONFIGURATION, node, entryNode); - doReturn(CommitInfo.emptyFluentFuture()).when(this.readWrite).commit(); - doReturn(CommitInfo.emptyFluentFuture()).when(this.netconfService).commit(Mockito.any()); - - Response response = PostDataTransactionUtil.postData(this.uriInfo, payload, - new MdsalRestconfStrategy(transactionChainHandler), this.schema, null, null); + final YangInstanceIdentifier node = iidList.node(identifier); + doReturn(immediateFalseFluentFuture()).when(readWrite).exists(LogicalDatastoreType.CONFIGURATION, node); + doNothing().when(readWrite).put(LogicalDatastoreType.CONFIGURATION, node, entryNode); + doReturn(CommitInfo.emptyFluentFuture()).when(readWrite).commit(); + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService) + .merge(any(), any(), any(), any()); + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService).commit(); + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService).create( + LogicalDatastoreType.CONFIGURATION, node, entryNode, Optional.empty()); + + Response response = PostDataTransactionUtil.postData(uriInfo, payload, + new MdsalRestconfStrategy(mockDataBroker), schema, WriteDataParams.empty()); assertEquals(201, response.getStatus()); assertThat(URLDecoder.decode(response.getLocation().toString(), StandardCharsets.UTF_8), containsString(identifier.getValue(identifier.keySet().iterator().next()).toString())); - verify(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION, node); - verify(this.readWrite).put(LogicalDatastoreType.CONFIGURATION, node, entryNode); + verify(readWrite).exists(LogicalDatastoreType.CONFIGURATION, node); + verify(readWrite).put(LogicalDatastoreType.CONFIGURATION, node, entryNode); - response = PostDataTransactionUtil.postData(this.uriInfo, payload, - new NetconfRestconfStrategy(netconfService), this.schema, null, null); + response = PostDataTransactionUtil.postData(uriInfo, payload, + new NetconfRestconfStrategy(netconfService), schema, WriteDataParams.empty()); assertEquals(201, response.getStatus()); assertThat(URLDecoder.decode(response.getLocation().toString(), StandardCharsets.UTF_8), containsString(identifier.getValue(identifier.keySet().iterator().next()).toString())); - verify(this.netconfService).create(LogicalDatastoreType.CONFIGURATION, node, entryNode, + verify(netconfService).create(LogicalDatastoreType.CONFIGURATION, node, entryNode, Optional.empty()); } @Test public void testPostDataFail() { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(this.iid2, null, null, this.schema); - final NormalizedNodeContext payload = new NormalizedNodeContext(iidContext, this.buildBaseCont); + final InstanceIdentifierContext iidContext = new InstanceIdentifierContext(iid2, null, null, schema); + final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildBaseCont); - doReturn(immediateFalseFluentFuture()).when(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION, - this.iid2); + doReturn(immediateFalseFluentFuture()).when(readWrite).exists(LogicalDatastoreType.CONFIGURATION, + iid2); final NodeIdentifier identifier = - ((ContainerNode) ((Collection) payload.getData().getValue()).iterator().next()).getIdentifier(); - final YangInstanceIdentifier node = - payload.getInstanceIdentifierContext().getInstanceIdentifier().node(identifier); - doNothing().when(this.readWrite).put(LogicalDatastoreType.CONFIGURATION, node.getParent(), payload.getData()); + ((ContainerNode) ((Collection) payload.getData().body()).iterator().next()).getIdentifier(); + final YangInstanceIdentifier node = iid2.node(identifier); + doNothing().when(readWrite).put(LogicalDatastoreType.CONFIGURATION, node.getParent(), payload.getData()); final DOMException domException = new DOMException((short) 414, "Post request failed"); - doReturn(immediateFailedFluentFuture(domException)).when(this.readWrite).commit(); - doReturn(immediateFailedFluentFuture(domException)).when(this.netconfService).commit(Mockito.any()); - - try { - PostDataTransactionUtil.postData(this.uriInfo, payload, - new MdsalRestconfStrategy(transactionChainHandler), this.schema, null, null); - fail("Expected RestconfDocumentedException"); - } catch (final RestconfDocumentedException e) { - assertEquals(1, e.getErrors().size()); - assertTrue(e.getErrors().get(0).getErrorInfo().contains(domException.getMessage())); - } - - verify(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION, this.iid2); - verify(this.readWrite).put(LogicalDatastoreType.CONFIGURATION, - payload.getInstanceIdentifierContext().getInstanceIdentifier(), payload.getData()); - - try { - PostDataTransactionUtil.postData(this.uriInfo, payload, - new NetconfRestconfStrategy(netconfService), this.schema, null, null); - fail("Expected RestconfDocumentedException"); - } catch (final RestconfDocumentedException e) { - assertEquals(1, e.getErrors().size()); - assertTrue(e.getErrors().get(0).getErrorInfo().contains(domException.getMessage())); - } - - verify(this.netconfService).create(LogicalDatastoreType.CONFIGURATION, - payload.getInstanceIdentifierContext().getInstanceIdentifier(), payload.getData(), Optional.empty()); + doReturn(immediateFailedFluentFuture(domException)).when(readWrite).commit(); + doReturn(immediateFailedFluentFuture(domException)).when(netconfService) + .create(any(), any(), any(), any()); + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService).discardChanges(); + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService).unlock(); + + RestconfDocumentedException ex = assertThrows(RestconfDocumentedException.class, + () -> PostDataTransactionUtil.postData(uriInfo, payload, new MdsalRestconfStrategy(mockDataBroker), schema, + WriteDataParams.empty())); + assertEquals(1, ex.getErrors().size()); + assertThat(ex.getErrors().get(0).getErrorInfo(), containsString(domException.getMessage())); + + verify(readWrite).exists(LogicalDatastoreType.CONFIGURATION, iid2); + verify(readWrite).put(LogicalDatastoreType.CONFIGURATION, iid2, payload.getData()); + + ex = assertThrows(RestconfDocumentedException.class, () -> PostDataTransactionUtil.postData(uriInfo, payload, + new NetconfRestconfStrategy(netconfService), schema, WriteDataParams.empty())); + assertEquals(1, ex.getErrors().size()); + assertThat(ex.getErrors().get(0).getErrorInfo(), containsString(domException.getMessage())); + + verify(netconfService).create(LogicalDatastoreType.CONFIGURATION, iid2, payload.getData(), Optional.empty()); } }