* 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.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
+import static org.opendaylight.yangtools.util.concurrent.FluentFutures.immediateFalseFluentFuture;
+import static org.opendaylight.yangtools.util.concurrent.FluentFutures.immediateFluentFuture;
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.Futures;
+import java.util.Optional;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
+import org.mockito.Mockito;
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.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.DOMDataTreeWriteTransaction;
+import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
+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.restconf.nb.rfc8040.handlers.TransactionChainHandler;
+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.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
import org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree;
import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
public class PutDataTransactionUtilTest {
-
private static final String PATH_FOR_NEW_SCHEMA_CONTEXT = "/jukebox";
-
@Mock
private DOMTransactionChain transactionChain;
@Mock
- private DOMDataReadWriteTransaction readWrite;
+ private DOMDataTreeReadWriteTransaction readWrite;
@Mock
- private DOMDataReadOnlyTransaction read;
+ private DOMDataTreeReadTransaction read;
@Mock
- private DOMDataWriteTransaction write;
-
+ private DOMDataTreeWriteTransaction write;
+ @Mock
+ private DOMDataBroker mockDataBroker;
+ @Mock
+ private NetconfDataTreeService netconfService;
- private SchemaContextRef refSchemaCtx;
- private LeafNode buildLeaf;
+ private TransactionChainHandler transactionChainHandler;
+ private LeafNode<?> buildLeaf;
private ContainerNode buildBaseCont;
private ContainerNode buildBaseContWithList;
private MapEntryNode buildListEntry;
- private SchemaContext schema;
+ private EffectiveModelContext schema;
private DataSchemaNode schemaNode;
private YangInstanceIdentifier iid;
private DataSchemaNode schemaNode2;
@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();
+ this.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 listQname = QName.create(baseQName, "playlist");
final QName listKeyQname = QName.create(baseQName, "name");
- final YangInstanceIdentifier.NodeIdentifierWithPredicates nodeWithKey =
- new YangInstanceIdentifier.NodeIdentifierWithPredicates(listQname, listKeyQname, "name of band");
- final YangInstanceIdentifier.NodeIdentifierWithPredicates nodeWithKey2 =
- new YangInstanceIdentifier.NodeIdentifierWithPredicates(listQname, listKeyQname, "name of band 2");
+ final NodeIdentifierWithPredicates nodeWithKey =
+ NodeIdentifierWithPredicates.of(listQname, listKeyQname, "name of band");
+ final NodeIdentifierWithPredicates nodeWithKey2 =
+ NodeIdentifierWithPredicates.of(listQname, listKeyQname, "name of band 2");
this.iid = YangInstanceIdentifier.builder()
.node(baseQName)
this.schemaNode3 = DataSchemaContextTree.from(this.schema).getChild(this.iid3).getDataSchemaNode();
this.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(this.buildLeaf)
.build();
this.buildBaseCont = Builders.containerBuilder()
- .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(baseQName))
+ .withNodeIdentifier(new NodeIdentifier(baseQName))
.withChild(buildPlayerCont)
.build();
final LeafNode<Object> 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<Object> content2 = Builders.leafBuilder()
- .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(baseQName, "description")))
+ .withNodeIdentifier(new NodeIdentifier(QName.create(baseQName, "description")))
.withValue("band description")
.build();
this.buildListEntry = Builders.mapEntryBuilder()
.withChild(content2)
.build();
final LeafNode<Object> content3 = Builders.leafBuilder()
- .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(baseQName, "name")))
+ .withNodeIdentifier(new NodeIdentifier(QName.create(baseQName, "name")))
.withValue("name of band 2")
.build();
final LeafNode<Object> content4 = Builders.leafBuilder()
- .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(baseQName, "description")))
+ .withNodeIdentifier(new NodeIdentifier(QName.create(baseQName, "description")))
.withValue("band description 2")
.build();
final MapEntryNode buildListEntry2 = Builders.mapEntryBuilder()
.withChild(content4)
.build();
final MapNode buildList = Builders.mapBuilder()
- .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(listQname))
+ .withNodeIdentifier(new NodeIdentifier(listQname))
.withChild(this.buildListEntry)
.withChild(buildListEntry2)
.build();
this.buildBaseContWithList = Builders.containerBuilder()
- .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(baseQName))
+ .withNodeIdentifier(new NodeIdentifier(baseQName))
.withChild(buildList)
.build();
+ Mockito.doReturn(transactionChain).when(mockDataBroker).createTransactionChain(Mockito.any());
+ transactionChainHandler = new TransactionChainHandler(mockDataBroker);
}
@Test
- public void testValidInputData() throws Exception {
+ public void testValidInputData() {
final InstanceIdentifierContext<DataSchemaNode> iidContext =
new InstanceIdentifierContext<>(this.iid, this.schemaNode, null, this.schema);
final NormalizedNodeContext payload = new NormalizedNodeContext(iidContext, this.buildLeaf);
}
@Test
- public void testValidTopLevelNodeName() throws Exception {
+ public void testValidTopLevelNodeName() {
InstanceIdentifierContext<DataSchemaNode> iidContext =
new InstanceIdentifierContext<>(this.iid, this.schemaNode, null, this.schema);
NormalizedNodeContext payload = new NormalizedNodeContext(iidContext, this.buildLeaf);
}
@Test(expected = RestconfDocumentedException.class)
- public void testValidTopLevelNodeNamePathEmpty() throws Exception {
+ public void testValidTopLevelNodeNamePathEmpty() {
final InstanceIdentifierContext<DataSchemaNode> iidContext =
new InstanceIdentifierContext<>(this.iid, this.schemaNode, null, this.schema);
final NormalizedNodeContext payload = new NormalizedNodeContext(iidContext, this.buildLeaf);
- PutDataTransactionUtil.validTopLevelNodeName(YangInstanceIdentifier.EMPTY, payload);
+ PutDataTransactionUtil.validTopLevelNodeName(YangInstanceIdentifier.empty(), payload);
}
@Test(expected = RestconfDocumentedException.class)
- public void testValidTopLevelNodeNameWrongTopIdentifier() throws Exception {
+ public void testValidTopLevelNodeNameWrongTopIdentifier() {
final InstanceIdentifierContext<DataSchemaNode> iidContext =
new InstanceIdentifierContext<>(this.iid, this.schemaNode, null, this.schema);
final NormalizedNodeContext payload = new NormalizedNodeContext(iidContext, this.buildLeaf);
}
@Test
- public void testValidateListKeysEqualityInPayloadAndUri() throws Exception {
+ public void testValidateListKeysEqualityInPayloadAndUri() {
final InstanceIdentifierContext<DataSchemaNode> iidContext =
new InstanceIdentifierContext<>(this.iid3, this.schemaNode3, null, this.schema);
final NormalizedNodeContext payload = new NormalizedNodeContext(iidContext, this.buildListEntry);
}
@Test
- public void testPutContainerData() throws Exception {
+ public void testPutContainerData() {
final InstanceIdentifierContext<DataSchemaNode> iidContext =
new InstanceIdentifierContext<>(this.iid2, this.schemaNode2, null, this.schema);
final NormalizedNodeContext payload = new NormalizedNodeContext(iidContext, this.buildBaseCont);
doReturn(this.readWrite).when(this.transactionChain).newReadWriteTransaction();
doReturn(this.read).when(this.transactionChain).newReadOnlyTransaction();
doReturn(this.write).when(this.transactionChain).newWriteOnlyTransaction();
- doReturn(Futures.immediateCheckedFuture(Optional.absent()))
- .when(this.read).read(LogicalDatastoreType.CONFIGURATION, this.iid2);
- doNothing().when(this.write).put(LogicalDatastoreType.CONFIGURATION,
+ doReturn(immediateFalseFluentFuture())
+ .when(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION, this.iid2);
+ doNothing().when(this.readWrite).put(LogicalDatastoreType.CONFIGURATION,
payload.getInstanceIdentifierContext().getInstanceIdentifier(), payload.getData());
- doReturn(Futures.immediateCheckedFuture(null)).when(this.readWrite).submit();
+ doReturn(CommitInfo.emptyFluentFuture()).when(this.readWrite).commit();
- PutDataTransactionUtil.putData(payload, this.refSchemaCtx,
- new TransactionVarsWrapper(payload.getInstanceIdentifierContext(), null, this.transactionChain), null,
- null);
- verify(this.read).read(LogicalDatastoreType.CONFIGURATION,
+ PutDataTransactionUtil.putData(payload, this.schema,
+ new MdsalRestconfStrategy(iidContext, transactionChainHandler), null, null);
+ verify(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION,
payload.getInstanceIdentifierContext().getInstanceIdentifier());
verify(this.readWrite).put(LogicalDatastoreType.CONFIGURATION,
payload.getInstanceIdentifierContext().getInstanceIdentifier(), payload.getData());
}
@Test
- public void testPutleafData() throws Exception {
+ public void testPutCreateContainerData() {
+ final InstanceIdentifierContext<DataSchemaNode> iidContext =
+ new InstanceIdentifierContext<>(this.iid2, this.schemaNode2, null, this.schema);
+ final NormalizedNodeContext payload = new NormalizedNodeContext(iidContext, this.buildBaseCont);
+
+ doReturn(immediateFluentFuture(Optional.empty())).when(this.netconfService).getConfig(this.iid2);
+ doReturn(CommitInfo.emptyFluentFuture()).when(this.netconfService).commit(Mockito.any());
+
+ PutDataTransactionUtil.putData(payload, this.schema,
+ new NetconfRestconfStrategy(netconfService, iidContext), null, null);
+ verify(this.netconfService).getConfig(payload.getInstanceIdentifierContext().getInstanceIdentifier());
+ verify(this.netconfService).create(LogicalDatastoreType.CONFIGURATION,
+ payload.getInstanceIdentifierContext().getInstanceIdentifier(), payload.getData(), Optional.empty());
+ }
+
+ @Test
+ public void testPutReplaceContainerData() {
+ final InstanceIdentifierContext<DataSchemaNode> iidContext =
+ new InstanceIdentifierContext<>(this.iid2, this.schemaNode2, null, this.schema);
+ final NormalizedNodeContext payload = new NormalizedNodeContext(iidContext, this.buildBaseCont);
+
+ doReturn(immediateFluentFuture(Optional.of(mock(NormalizedNode.class))))
+ .when(this.netconfService).getConfig(this.iid2);
+ doReturn(CommitInfo.emptyFluentFuture()).when(this.netconfService).commit(Mockito.any());
+
+ PutDataTransactionUtil.putData(payload, this.schema,
+ new NetconfRestconfStrategy(netconfService, iidContext), null, null);
+ verify(this.netconfService).getConfig(payload.getInstanceIdentifierContext().getInstanceIdentifier());
+ verify(this.netconfService).replace(LogicalDatastoreType.CONFIGURATION,
+ payload.getInstanceIdentifierContext().getInstanceIdentifier(), payload.getData(), Optional.empty());
+ }
+
+ @Test
+ public void testPutLeafData() {
final InstanceIdentifierContext<DataSchemaNode> iidContext =
new InstanceIdentifierContext<>(this.iid, this.schemaNode, null, this.schema);
final NormalizedNodeContext payload = new NormalizedNodeContext(iidContext, this.buildLeaf);
doReturn(this.readWrite).when(this.transactionChain).newReadWriteTransaction();
doReturn(this.read).when(this.transactionChain).newReadOnlyTransaction();
doReturn(this.write).when(this.transactionChain).newWriteOnlyTransaction();
- doReturn(Futures.immediateCheckedFuture(Optional.absent()))
- .when(this.read).read(LogicalDatastoreType.CONFIGURATION, this.iid);
- doNothing().when(this.write).put(LogicalDatastoreType.CONFIGURATION,
+ doReturn(immediateFalseFluentFuture())
+ .when(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION, this.iid);
+ doNothing().when(this.readWrite).put(LogicalDatastoreType.CONFIGURATION,
payload.getInstanceIdentifierContext().getInstanceIdentifier(), payload.getData());
- doReturn(Futures.immediateCheckedFuture(null)).when(this.readWrite).submit();
+ doReturn(CommitInfo.emptyFluentFuture()).when(this.readWrite).commit();
- PutDataTransactionUtil.putData(payload, this.refSchemaCtx,
- new TransactionVarsWrapper(payload.getInstanceIdentifierContext(), null, this.transactionChain), null,
- null);
- verify(this.read).read(LogicalDatastoreType.CONFIGURATION,
+ PutDataTransactionUtil.putData(payload, this.schema,
+ new MdsalRestconfStrategy(iidContext, transactionChainHandler), null, null);
+ verify(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION,
payload.getInstanceIdentifierContext().getInstanceIdentifier());
verify(this.readWrite).put(LogicalDatastoreType.CONFIGURATION,
payload.getInstanceIdentifierContext().getInstanceIdentifier(), payload.getData());
}
@Test
- public void testPutListData() throws Exception {
+ public void testPutCreateLeafData() {
+ final InstanceIdentifierContext<DataSchemaNode> iidContext =
+ new InstanceIdentifierContext<>(this.iid, this.schemaNode, null, this.schema);
+ final NormalizedNodeContext payload = new NormalizedNodeContext(iidContext, this.buildLeaf);
+
+ doReturn(immediateFluentFuture(Optional.empty())).when(this.netconfService).getConfig(this.iid);
+ doReturn(CommitInfo.emptyFluentFuture()).when(this.netconfService).commit(Mockito.any());
+
+ PutDataTransactionUtil.putData(payload, this.schema,
+ new NetconfRestconfStrategy(netconfService, iidContext), null, null);
+ verify(this.netconfService).getConfig(payload.getInstanceIdentifierContext().getInstanceIdentifier());
+ verify(this.netconfService).create(LogicalDatastoreType.CONFIGURATION,
+ payload.getInstanceIdentifierContext().getInstanceIdentifier(), payload.getData(), Optional.empty());
+ }
+
+ @Test
+ public void testPutReplaceLeafData() {
+ final InstanceIdentifierContext<DataSchemaNode> iidContext =
+ new InstanceIdentifierContext<>(this.iid, this.schemaNode, null, this.schema);
+ final NormalizedNodeContext payload = new NormalizedNodeContext(iidContext, this.buildLeaf);
+
+ doReturn(immediateFluentFuture(Optional.of(mock(NormalizedNode.class))))
+ .when(this.netconfService).getConfig(this.iid);
+ doReturn(CommitInfo.emptyFluentFuture()).when(this.netconfService).commit(Mockito.any());
+
+ PutDataTransactionUtil.putData(payload, this.schema,
+ new NetconfRestconfStrategy(netconfService, iidContext), null, null);
+ verify(this.netconfService).getConfig(payload.getInstanceIdentifierContext().getInstanceIdentifier());
+ verify(this.netconfService).replace(LogicalDatastoreType.CONFIGURATION,
+ payload.getInstanceIdentifierContext().getInstanceIdentifier(), payload.getData(), Optional.empty());
+ }
+
+ @Test
+ public void testPutListData() {
final InstanceIdentifierContext<DataSchemaNode> iidContext =
new InstanceIdentifierContext<>(this.iid2, this.schemaNode2, null, this.schema);
final NormalizedNodeContext payload = new NormalizedNodeContext(iidContext, this.buildBaseContWithList);
doReturn(this.readWrite).when(this.transactionChain).newReadWriteTransaction();
doReturn(this.read).when(this.transactionChain).newReadOnlyTransaction();
doReturn(this.write).when(this.transactionChain).newWriteOnlyTransaction();
- doReturn(Futures.immediateCheckedFuture(Optional.absent()))
- .when(this.read).read(LogicalDatastoreType.CONFIGURATION, this.iid2);
- doNothing().when(this.write).put(LogicalDatastoreType.CONFIGURATION,
+ doReturn(immediateFalseFluentFuture())
+ .when(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION, this.iid2);
+ doNothing().when(this.readWrite).put(LogicalDatastoreType.CONFIGURATION,
payload.getInstanceIdentifierContext().getInstanceIdentifier(), payload.getData());
- doReturn(Futures.immediateCheckedFuture(null)).when(this.readWrite).submit();
- PutDataTransactionUtil.putData(payload, this.refSchemaCtx,
- new TransactionVarsWrapper(payload.getInstanceIdentifierContext(), null, this.transactionChain), null,
- null);
- verify(this.read).read(LogicalDatastoreType.CONFIGURATION, this.iid2);
+ doReturn(CommitInfo.emptyFluentFuture()).when(this.readWrite).commit();
+ PutDataTransactionUtil.putData(payload, this.schema,
+ new MdsalRestconfStrategy(iidContext, transactionChainHandler), null, null);
+ verify(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION, this.iid2);
verify(this.readWrite).put(LogicalDatastoreType.CONFIGURATION, this.iid2, payload.getData());
}
-}
+ @Test
+ public void testPutCreateListData() {
+ final InstanceIdentifierContext<DataSchemaNode> iidContext =
+ new InstanceIdentifierContext<>(this.iid2, this.schemaNode2, null, this.schema);
+ final NormalizedNodeContext payload = new NormalizedNodeContext(iidContext, this.buildBaseContWithList);
+ doReturn(immediateFluentFuture(Optional.empty())).when(this.netconfService)
+ .getConfig(this.iid2);
+ doReturn(CommitInfo.emptyFluentFuture()).when(this.netconfService).commit(Mockito.any());
+
+ PutDataTransactionUtil.putData(payload, this.schema,
+ new NetconfRestconfStrategy(netconfService, iidContext), null, null);
+ verify(this.netconfService).getConfig(this.iid2);
+ verify(this.netconfService).create(LogicalDatastoreType.CONFIGURATION, this.iid2,
+ payload.getData(), Optional.empty());
+ }
+
+ @Test
+ public void testPutReplaceListData() {
+ final InstanceIdentifierContext<DataSchemaNode> iidContext =
+ new InstanceIdentifierContext<>(this.iid2, this.schemaNode2, null, this.schema);
+ final NormalizedNodeContext payload = new NormalizedNodeContext(iidContext, this.buildBaseContWithList);
+
+ doReturn(immediateFluentFuture(Optional.of(mock(NormalizedNode.class)))).when(this.netconfService)
+ .getConfig(this.iid2);
+ doReturn(CommitInfo.emptyFluentFuture()).when(this.netconfService).commit(Mockito.any());
+
+ PutDataTransactionUtil.putData(payload, this.schema,
+ new NetconfRestconfStrategy(netconfService, iidContext), null, null);
+ verify(this.netconfService).getConfig(this.iid2);
+ verify(this.netconfService).replace(LogicalDatastoreType.CONFIGURATION, this.iid2,
+ payload.getData(), Optional.empty());
+ }
+}
Code Review / netconf.git / blobdiff