*/
package org.opendaylight.restconf.nb.rfc8040.rests.utils;
+import static org.junit.Assert.assertThrows;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.opendaylight.yangtools.util.concurrent.FluentFutures.immediateFalseFluentFuture;
import static org.opendaylight.yangtools.util.concurrent.FluentFutures.immediateFluentFuture;
+import com.google.common.util.concurrent.Futures;
import java.util.Optional;
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.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.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.services.impl.RestconfDataServiceImpl;
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;
@RunWith(MockitoJUnitRunner.StrictStubs.class)
public class PutDataTransactionUtilTest {
private static final String PATH_FOR_NEW_SCHEMA_CONTEXT = "/jukebox";
- @Mock
- private DOMTransactionChain transactionChain;
+
@Mock
private DOMDataTreeReadWriteTransaction readWrite;
@Mock
@Mock
private NetconfDataTreeService netconfService;
- private TransactionChainHandler transactionChainHandler;
private LeafNode<?> buildLeaf;
private ContainerNode buildBaseCont;
private ContainerNode buildBaseContWithList;
@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");
final NodeIdentifierWithPredicates nodeWithKey2 =
NodeIdentifierWithPredicates.of(listQname, listKeyQname, "name of band 2");
- final DataSchemaContextTree tree = DataSchemaContextTree.from(this.schema);
- this.iid = YangInstanceIdentifier.builder()
+ final DataSchemaContextTree tree = DataSchemaContextTree.from(schema);
+ iid = YangInstanceIdentifier.builder()
.node(baseQName)
.node(containerQname)
.node(leafQname)
.build();
- this.schemaNode = tree.findChild(this.iid).orElseThrow().getDataSchemaNode();
+ schemaNode = tree.findChild(iid).orElseThrow().getDataSchemaNode();
- this.iid2 = YangInstanceIdentifier.builder()
+ iid2 = YangInstanceIdentifier.builder()
.node(baseQName)
.build();
- this.schemaNode2 = tree.findChild(this.iid2).orElseThrow().getDataSchemaNode();
+ schemaNode2 = tree.findChild(iid2).orElseThrow().getDataSchemaNode();
- this.iid3 = YangInstanceIdentifier.builder()
+ iid3 = YangInstanceIdentifier.builder()
.node(baseQName)
.node(listQname)
.node(nodeWithKey)
.build();
- this.schemaNode3 = tree.findChild(this.iid3).orElseThrow().getDataSchemaNode();
+ schemaNode3 = tree.findChild(iid3).orElseThrow().getDataSchemaNode();
- this.buildLeaf = Builders.leafBuilder()
+ buildLeaf = Builders.leafBuilder()
.withNodeIdentifier(new NodeIdentifier(leafQname))
.withValue(0.2)
.build();
final ContainerNode buildPlayerCont = Builders.containerBuilder()
.withNodeIdentifier(new NodeIdentifier(containerQname))
- .withChild(this.buildLeaf)
+ .withChild(buildLeaf)
.build();
- this.buildBaseCont = Builders.containerBuilder()
+ buildBaseCont = Builders.containerBuilder()
.withNodeIdentifier(new NodeIdentifier(baseQName))
.withChild(buildPlayerCont)
.build();
.withNodeIdentifier(new NodeIdentifier(QName.create(baseQName, "description")))
.withValue("band description")
.build();
- this.buildListEntry = Builders.mapEntryBuilder()
+ buildListEntry = Builders.mapEntryBuilder()
.withNodeIdentifier(nodeWithKey)
.withChild(content)
.withChild(content2)
.build();
final MapNode buildList = Builders.mapBuilder()
.withNodeIdentifier(new NodeIdentifier(listQname))
- .withChild(this.buildListEntry)
+ .withChild(buildListEntry)
.withChild(buildListEntry2)
.build();
- this.buildBaseContWithList = Builders.containerBuilder()
+ buildBaseContWithList = Builders.containerBuilder()
.withNodeIdentifier(new NodeIdentifier(baseQName))
.withChild(buildList)
.build();
- 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 testValidInputData() {
- final InstanceIdentifierContext<DataSchemaNode> iidContext =
- new InstanceIdentifierContext<>(this.iid, this.schemaNode, null, this.schema);
- final NormalizedNodeContext payload = new NormalizedNodeContext(iidContext, this.buildLeaf);
- PutDataTransactionUtil.validInputData(iidContext.getSchemaNode(), payload);
+ RestconfDataServiceImpl.validInputData(schemaNode, NormalizedNodePayload.of(
+ new InstanceIdentifierContext(iid, schemaNode, null, schema), buildLeaf));
}
@Test
public void testValidTopLevelNodeName() {
- InstanceIdentifierContext<DataSchemaNode> iidContext =
- new InstanceIdentifierContext<>(this.iid, this.schemaNode, null, this.schema);
- NormalizedNodeContext payload = new NormalizedNodeContext(iidContext, this.buildLeaf);
- PutDataTransactionUtil.validTopLevelNodeName(iidContext.getInstanceIdentifier(), payload);
-
- iidContext = new InstanceIdentifierContext<>(this.iid2, this.schemaNode2, null, this.schema);
- payload = new NormalizedNodeContext(iidContext, this.buildBaseCont);
- PutDataTransactionUtil.validTopLevelNodeName(iidContext.getInstanceIdentifier(), payload);
+ RestconfDataServiceImpl.validTopLevelNodeName(iid, NormalizedNodePayload.of(
+ new InstanceIdentifierContext(iid, schemaNode, null, schema), buildLeaf));
+ RestconfDataServiceImpl.validTopLevelNodeName(iid2, NormalizedNodePayload.of(
+ new InstanceIdentifierContext(iid2, schemaNode2, null, schema), buildBaseCont));
}
- @Test(expected = RestconfDocumentedException.class)
+ @Test
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);
+ final InstanceIdentifierContext iidContext =
+ new InstanceIdentifierContext(iid, schemaNode, null, schema);
+ final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildLeaf);
+
+ // FIXME: more asserts
+ assertThrows(RestconfDocumentedException.class,
+ () -> RestconfDataServiceImpl.validTopLevelNodeName(YangInstanceIdentifier.empty(), payload));
}
- @Test(expected = RestconfDocumentedException.class)
+ @Test
public void testValidTopLevelNodeNameWrongTopIdentifier() {
- final InstanceIdentifierContext<DataSchemaNode> iidContext =
- new InstanceIdentifierContext<>(this.iid, this.schemaNode, null, this.schema);
- final NormalizedNodeContext payload = new NormalizedNodeContext(iidContext, this.buildLeaf);
- PutDataTransactionUtil.validTopLevelNodeName(this.iid.getAncestor(1), payload);
+ final InstanceIdentifierContext iidContext =
+ new InstanceIdentifierContext(iid, schemaNode, null, schema);
+ final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildLeaf);
+
+ // FIXME: more asserts
+ assertThrows(RestconfDocumentedException.class,
+ () -> RestconfDataServiceImpl.validTopLevelNodeName(iid.getAncestor(1), payload));
}
@Test
public void testValidateListKeysEqualityInPayloadAndUri() {
- final InstanceIdentifierContext<DataSchemaNode> iidContext =
- new InstanceIdentifierContext<>(this.iid3, this.schemaNode3, null, this.schema);
- final NormalizedNodeContext payload = new NormalizedNodeContext(iidContext, this.buildListEntry);
- PutDataTransactionUtil.validateListKeysEqualityInPayloadAndUri(payload);
+ final InstanceIdentifierContext iidContext =
+ new InstanceIdentifierContext(iid3, schemaNode3, null, schema);
+ final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildListEntry);
+ RestconfDataServiceImpl.validateListKeysEqualityInPayloadAndUri(payload);
}
@Test
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(immediateFalseFluentFuture())
- .when(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION, this.iid2);
- doNothing().when(this.readWrite).put(LogicalDatastoreType.CONFIGURATION,
- payload.getInstanceIdentifierContext().getInstanceIdentifier(), payload.getData());
- doReturn(CommitInfo.emptyFluentFuture()).when(this.readWrite).commit();
-
- PutDataTransactionUtil.putData(payload, this.schema, new MdsalRestconfStrategy(transactionChainHandler),
- null, null);
- verify(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION,
- payload.getInstanceIdentifierContext().getInstanceIdentifier());
- verify(this.readWrite).put(LogicalDatastoreType.CONFIGURATION,
- payload.getInstanceIdentifierContext().getInstanceIdentifier(), payload.getData());
+ final InstanceIdentifierContext iidContext =
+ new InstanceIdentifierContext(iid2, schemaNode2, null, schema);
+ final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildBaseCont);
+
+ doReturn(readWrite).when(mockDataBroker).newReadWriteTransaction();
+ doReturn(read).when(mockDataBroker).newReadOnlyTransaction();
+ doReturn(immediateFalseFluentFuture()).when(read).exists(LogicalDatastoreType.CONFIGURATION, iid2);
+ doNothing().when(readWrite).put(LogicalDatastoreType.CONFIGURATION, iid2, payload.getData());
+ doReturn(CommitInfo.emptyFluentFuture()).when(readWrite).commit();
+
+ PutDataTransactionUtil.putData(payload, schema, new MdsalRestconfStrategy(mockDataBroker),
+ WriteDataParams.empty());
+ verify(read).exists(LogicalDatastoreType.CONFIGURATION, iid2);
+ verify(readWrite).put(LogicalDatastoreType.CONFIGURATION, iid2, payload.getData());
}
@Test
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),
- null, null);
- verify(this.netconfService).getConfig(payload.getInstanceIdentifierContext().getInstanceIdentifier());
- verify(this.netconfService).replace(LogicalDatastoreType.CONFIGURATION,
- payload.getInstanceIdentifierContext().getInstanceIdentifier(), payload.getData(), Optional.empty());
+ final InstanceIdentifierContext iidContext =
+ new InstanceIdentifierContext(iid2, schemaNode2, null, schema);
+ final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildBaseCont);
+
+ doReturn(immediateFluentFuture(Optional.empty())).when(netconfService).getConfig(iid2);
+ doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService).commit();
+ doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService)
+ .replace(LogicalDatastoreType.CONFIGURATION, iid2, payload.getData(), Optional.empty());
+
+ PutDataTransactionUtil.putData(payload, schema, new NetconfRestconfStrategy(netconfService),
+ WriteDataParams.empty());
+ verify(netconfService).lock();
+ verify(netconfService).getConfig(iid2);
+ verify(netconfService).replace(LogicalDatastoreType.CONFIGURATION, iid2, 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),
- null, null);
- verify(this.netconfService).getConfig(payload.getInstanceIdentifierContext().getInstanceIdentifier());
- verify(this.netconfService).replace(LogicalDatastoreType.CONFIGURATION,
- payload.getInstanceIdentifierContext().getInstanceIdentifier(), payload.getData(), Optional.empty());
+ final InstanceIdentifierContext iidContext =
+ new InstanceIdentifierContext(iid2, schemaNode2, null, schema);
+ final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildBaseCont);
+
+ doReturn(immediateFluentFuture(Optional.of(mock(NormalizedNode.class)))).when(netconfService).getConfig(iid2);
+ doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService).commit();
+ doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService)
+ .replace(LogicalDatastoreType.CONFIGURATION, iid2, payload.getData(), Optional.empty());
+
+ PutDataTransactionUtil.putData(payload, schema, new NetconfRestconfStrategy(netconfService),
+ WriteDataParams.empty());
+ verify(netconfService).getConfig(iid2);
+ verify(netconfService).replace(LogicalDatastoreType.CONFIGURATION, iid2, 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(immediateFalseFluentFuture())
- .when(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION, this.iid);
- doNothing().when(this.readWrite).put(LogicalDatastoreType.CONFIGURATION,
- payload.getInstanceIdentifierContext().getInstanceIdentifier(), payload.getData());
- doReturn(CommitInfo.emptyFluentFuture()).when(this.readWrite).commit();
-
- PutDataTransactionUtil.putData(payload, this.schema, new MdsalRestconfStrategy(transactionChainHandler),
- null, null);
- verify(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION,
- payload.getInstanceIdentifierContext().getInstanceIdentifier());
- verify(this.readWrite).put(LogicalDatastoreType.CONFIGURATION,
- payload.getInstanceIdentifierContext().getInstanceIdentifier(), payload.getData());
+ final InstanceIdentifierContext iidContext =
+ new InstanceIdentifierContext(iid, schemaNode, null, schema);
+ final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildLeaf);
+
+ doReturn(readWrite).when(mockDataBroker).newReadWriteTransaction();
+ doReturn(read).when(mockDataBroker).newReadOnlyTransaction();
+ doReturn(immediateFalseFluentFuture()).when(read).exists(LogicalDatastoreType.CONFIGURATION, iid);
+ doNothing().when(readWrite).put(LogicalDatastoreType.CONFIGURATION, iid, payload.getData());
+ doReturn(CommitInfo.emptyFluentFuture()).when(readWrite).commit();
+
+ PutDataTransactionUtil.putData(payload, schema, new MdsalRestconfStrategy(mockDataBroker),
+ WriteDataParams.empty());
+ verify(read).exists(LogicalDatastoreType.CONFIGURATION, iid);
+ verify(readWrite).put(LogicalDatastoreType.CONFIGURATION, iid, payload.getData());
}
@Test
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),
- null, null);
- verify(this.netconfService).getConfig(payload.getInstanceIdentifierContext().getInstanceIdentifier());
- verify(this.netconfService).replace(LogicalDatastoreType.CONFIGURATION,
- payload.getInstanceIdentifierContext().getInstanceIdentifier(), payload.getData(), Optional.empty());
+ final InstanceIdentifierContext iidContext =
+ new InstanceIdentifierContext(iid, schemaNode, null, schema);
+ final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildLeaf);
+
+ doReturn(immediateFluentFuture(Optional.empty())).when(netconfService).getConfig(iid);
+ doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService).commit();
+ doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService)
+ .replace(LogicalDatastoreType.CONFIGURATION, iid, payload.getData(), Optional.empty());
+
+ PutDataTransactionUtil.putData(payload, schema, new NetconfRestconfStrategy(netconfService),
+ WriteDataParams.empty());
+ verify(netconfService).getConfig(iid);
+ verify(netconfService).replace(LogicalDatastoreType.CONFIGURATION, iid, 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), null, null);
- verify(this.netconfService).getConfig(payload.getInstanceIdentifierContext().getInstanceIdentifier());
- verify(this.netconfService).replace(LogicalDatastoreType.CONFIGURATION,
- payload.getInstanceIdentifierContext().getInstanceIdentifier(), payload.getData(), Optional.empty());
+ final InstanceIdentifierContext iidContext =
+ new InstanceIdentifierContext(iid, schemaNode, null, schema);
+ final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildLeaf);
+
+ doReturn(immediateFluentFuture(Optional.of(mock(NormalizedNode.class)))).when(netconfService).getConfig(iid);
+ doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService).commit();
+ doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService)
+ .replace(LogicalDatastoreType.CONFIGURATION, iid, payload.getData(), Optional.empty());
+
+ PutDataTransactionUtil.putData(payload, schema, new NetconfRestconfStrategy(netconfService),
+ WriteDataParams.empty());
+ verify(netconfService).getConfig(iid);
+ verify(netconfService).replace(LogicalDatastoreType.CONFIGURATION, iid, 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);
+ final InstanceIdentifierContext iidContext =
+ new InstanceIdentifierContext(iid2, schemaNode2, null, schema);
+ final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildBaseContWithList);
- doReturn(this.readWrite).when(this.transactionChain).newReadWriteTransaction();
+ doReturn(readWrite).when(mockDataBroker).newReadWriteTransaction();
+ doReturn(read).when(mockDataBroker).newReadOnlyTransaction();
doReturn(immediateFalseFluentFuture())
- .when(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION, this.iid2);
- doNothing().when(this.readWrite).put(LogicalDatastoreType.CONFIGURATION,
- payload.getInstanceIdentifierContext().getInstanceIdentifier(), payload.getData());
- doReturn(CommitInfo.emptyFluentFuture()).when(this.readWrite).commit();
- PutDataTransactionUtil.putData(payload, this.schema, new MdsalRestconfStrategy(transactionChainHandler),
- null, null);
- verify(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION, this.iid2);
- verify(this.readWrite).put(LogicalDatastoreType.CONFIGURATION, this.iid2, payload.getData());
+ .when(read).exists(LogicalDatastoreType.CONFIGURATION, iid2);
+ doNothing().when(readWrite).put(LogicalDatastoreType.CONFIGURATION, iid2, payload.getData());
+ doReturn(CommitInfo.emptyFluentFuture()).when(readWrite).commit();
+ PutDataTransactionUtil.putData(payload, schema, new MdsalRestconfStrategy(mockDataBroker),
+ WriteDataParams.empty());
+ verify(read).exists(LogicalDatastoreType.CONFIGURATION, iid2);
+ verify(readWrite).put(LogicalDatastoreType.CONFIGURATION, 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),
- null, null);
- verify(this.netconfService).getConfig(this.iid2);
- verify(this.netconfService).replace(LogicalDatastoreType.CONFIGURATION, this.iid2,
+ final InstanceIdentifierContext iidContext =
+ new InstanceIdentifierContext(iid2, schemaNode2, null, schema);
+ final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildBaseContWithList);
+
+ doReturn(immediateFluentFuture(Optional.empty())).when(netconfService)
+ .getConfig(iid2);
+ doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService).commit();
+ doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService)
+ .replace(LogicalDatastoreType.CONFIGURATION, iid2, payload.getData(), Optional.empty());
+
+ PutDataTransactionUtil.putData(payload, schema, new NetconfRestconfStrategy(netconfService),
+ WriteDataParams.empty());
+ verify(netconfService).getConfig(iid2);
+ verify(netconfService).replace(LogicalDatastoreType.CONFIGURATION, 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), null, null);
- verify(this.netconfService).getConfig(this.iid2);
- verify(this.netconfService).replace(LogicalDatastoreType.CONFIGURATION, this.iid2,
- payload.getData(), Optional.empty());
+ final InstanceIdentifierContext iidContext =
+ new InstanceIdentifierContext(iid2, schemaNode2, null, schema);
+ final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildBaseContWithList);
+
+ doReturn(immediateFluentFuture(Optional.of(mock(NormalizedNode.class)))).when(netconfService)
+ .getConfig(iid2);
+ doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService).commit();
+ doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService)
+ .replace(LogicalDatastoreType.CONFIGURATION,
+ iid2, payload.getData(), Optional.empty());
+
+ PutDataTransactionUtil.putData(payload, schema, new NetconfRestconfStrategy(netconfService),
+ WriteDataParams.empty());
+ verify(netconfService).getConfig(iid2);
+ verify(netconfService).replace(LogicalDatastoreType.CONFIGURATION, iid2, payload.getData(), Optional.empty());
}
}
Code Review / netconf.git / blobdiff