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=aa205a8165e07dc7df8f0bfc65613a46f0d250da;hpb=c9e58b14754cdc059ef63f870f74de65a5e0a15d;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 aa205a8165..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 @@ -5,108 +5,116 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - 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 com.google.common.util.concurrent.Futures; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; +import java.util.Collection; +import java.util.Optional; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.dom.api.DOMDataReadOnlyTransaction; -import org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction; -import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; -import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain; +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.DOMDataTreeReadWriteTransaction; +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.references.SchemaContextRef; -import org.opendaylight.restconf.nb.rfc8040.rests.transactions.TransactionVarsWrapper; -import org.opendaylight.yangtools.util.SingletonSet; +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; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; 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.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaNode; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; 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 DOMDataReadWriteTransaction readWrite; - @Mock - private DOMDataReadOnlyTransaction read; - @Mock - private DOMDataWriteTransaction write; + private DOMDataTreeReadWriteTransaction readWrite; @Mock private UriInfo uriInfo; @Mock - private UriBuilder uriBuilder; + private DOMDataBroker mockDataBroker; + @Mock + private NetconfDataTreeService netconfService; - private SchemaContextRef refSchemaCtx; private ContainerNode buildBaseCont; - private SchemaContext schema; + private EffectiveModelContext schema; private YangInstanceIdentifier iid2; + private YangInstanceIdentifier iidList; private MapNode buildList; @Before public void setUp() throws Exception { - MockitoAnnotations.initMocks(this); - this.refSchemaCtx = new SchemaContextRef( - YangParserTestUtils.parseYangSources(TestRestconfUtils.loadFiles(PATH_FOR_NEW_SCHEMA_CONTEXT))); - this.schema = this.refSchemaCtx.get(); + 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"); final QName containerQname = QName.create(baseQName, "player"); final QName leafQname = QName.create(baseQName, "gap"); final QName listQname = QName.create(baseQName, "playlist"); final QName listKeyQname = QName.create(baseQName, "name"); - final YangInstanceIdentifier.NodeIdentifierWithPredicates nodeWithKey = - new YangInstanceIdentifier.NodeIdentifierWithPredicates(listQname, listKeyQname, "name of band"); - this.iid2 = YangInstanceIdentifier.builder() + final NodeIdentifierWithPredicates nodeWithKey = NodeIdentifierWithPredicates.of(listQname, listKeyQname, + "name of band"); + iid2 = YangInstanceIdentifier.builder() + .node(baseQName) + .build(); + iidList = YangInstanceIdentifier.builder() .node(baseQName) + .node(listQname) .build(); final LeafNode buildLeaf = Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(leafQname)) + .withNodeIdentifier(new NodeIdentifier(leafQname)) .withValue(0.2) .build(); final ContainerNode buildPlayerCont = Builders.containerBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(containerQname)) + .withNodeIdentifier(new NodeIdentifier(containerQname)) .withChild(buildLeaf) .build(); - this.buildBaseCont = Builders.containerBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(baseQName)) + buildBaseCont = Builders.containerBuilder() + .withNodeIdentifier(new NodeIdentifier(baseQName)) .withChild(buildPlayerCont) .build(); final LeafNode content = Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(baseQName, "name"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(baseQName, "name"))) .withValue("name of band") .build(); final LeafNode content2 = Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(baseQName, "description"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(baseQName, "description"))) .withValue("band description") .build(); final MapEntryNode mapEntryNode = Builders.mapEntryBuilder() @@ -114,98 +122,113 @@ public class PostDataTransactionUtilTest { .withChild(content) .withChild(content2) .build(); - this.buildList = Builders.mapBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(listQname)) + 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(this.read).when(this.transactionChain).newReadOnlyTransaction(); + doReturn(UriBuilder.fromUri("http://localhost:8181/restconf/16/")).when(uriInfo).getBaseUriBuilder(); + doReturn(readWrite).when(mockDataBroker).newReadWriteTransaction(); + + 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); - - doReturn(Futures.immediateCheckedFuture(false)) - .when(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION, this.iid2); - final YangInstanceIdentifier.NodeIdentifier identifier = - ((ContainerNode) ((SingletonSet) payload.getData().getValue()).iterator().next()).getIdentifier(); - final YangInstanceIdentifier node = - payload.getInstanceIdentifierContext().getInstanceIdentifier().node(identifier); - doReturn(Futures.immediateCheckedFuture(false)) - .when(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION, node); - doNothing().when(this.readWrite).put(LogicalDatastoreType.CONFIGURATION, node, payload.getData()); - doReturn(Futures.immediateCheckedFuture(null)).when(this.readWrite).submit(); - final TransactionVarsWrapper wrapper = - new TransactionVarsWrapper(payload.getInstanceIdentifierContext(), null, this.transactionChain); - final Response response = - PostDataTransactionUtil.postData(this.uriInfo, payload, wrapper, this.refSchemaCtx, null, null); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(iid2, null, null, schema); + final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildBaseCont); + + doReturn(immediateFalseFluentFuture()).when(readWrite).exists(LogicalDatastoreType.CONFIGURATION, iid2); + final NodeIdentifier identifier = + ((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(readWrite).exists(LogicalDatastoreType.CONFIGURATION, iid2); + verify(readWrite).put(LogicalDatastoreType.CONFIGURATION, iid2, payload.getData()); + + response = PostDataTransactionUtil.postData(uriInfo, payload, + new NetconfRestconfStrategy(netconfService), 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(netconfService).create(LogicalDatastoreType.CONFIGURATION, iid2, payload.getData(), Optional.empty()); } @Test public void testPostListData() { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(this.iid2, null, null, this.schema); - final NormalizedNodeContext payload = new NormalizedNodeContext(iidContext, this.buildList); + final InstanceIdentifierContext iidContext = new InstanceIdentifierContext(iidList, null, null, schema); + final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildList); final MapNode data = (MapNode) payload.getData(); - final YangInstanceIdentifier.NodeIdentifierWithPredicates identifier = - data.getValue().iterator().next().getIdentifier(); - final YangInstanceIdentifier node = - payload.getInstanceIdentifierContext().getInstanceIdentifier().node(identifier); - doReturn(Futures.immediateCheckedFuture(false)) - .when(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION, node); - doNothing().when(this.readWrite).put(LogicalDatastoreType.CONFIGURATION, node, payload.getData()); - doReturn(Futures.immediateCheckedFuture(null)).when(this.readWrite).submit(); - final TransactionVarsWrapper wrapper = - new TransactionVarsWrapper(payload.getInstanceIdentifierContext(), null, this.transactionChain); - final Response response = - PostDataTransactionUtil.postData(this.uriInfo, payload, wrapper, this.refSchemaCtx, null, null); + final MapEntryNode entryNode = data.body().iterator().next(); + final NodeIdentifierWithPredicates identifier = entryNode.getIdentifier(); + 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()); - verify(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION, node); - verify(this.readWrite).put(LogicalDatastoreType.CONFIGURATION, node, data.getValue().iterator().next()); + assertThat(URLDecoder.decode(response.getLocation().toString(), StandardCharsets.UTF_8), + containsString(identifier.getValue(identifier.keySet().iterator().next()).toString())); + verify(readWrite).exists(LogicalDatastoreType.CONFIGURATION, node); + verify(readWrite).put(LogicalDatastoreType.CONFIGURATION, node, entryNode); + + 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(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); - - doReturn(Futures.immediateCheckedFuture(false)) - .when(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION, this.iid2); - final YangInstanceIdentifier.NodeIdentifier identifier = - ((ContainerNode) ((SingletonSet) payload.getData().getValue()).iterator().next()).getIdentifier(); - final YangInstanceIdentifier node = - payload.getInstanceIdentifierContext().getInstanceIdentifier().node(identifier); - doReturn(Futures.immediateCheckedFuture(false)) - .when(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION, node); - doNothing().when(this.readWrite).put(LogicalDatastoreType.CONFIGURATION, node, - payload.getData()); + final InstanceIdentifierContext iidContext = new InstanceIdentifierContext(iid2, null, null, schema); + final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildBaseCont); + + doReturn(immediateFalseFluentFuture()).when(readWrite).exists(LogicalDatastoreType.CONFIGURATION, + iid2); + final NodeIdentifier identifier = + ((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(Futures.immediateFailedCheckedFuture(domException)).when(this.readWrite).submit(); - final TransactionVarsWrapper wrapper = - new TransactionVarsWrapper(payload.getInstanceIdentifierContext(), null, this.transactionChain); - - try { - PostDataTransactionUtil.postData(this.uriInfo, payload, wrapper, this.refSchemaCtx, 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()); + 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()); } - }