Adopt 2023.03 Argon upstreams

[openflowplugin.git] / applications / forwardingrules-manager / src / test / java / test / mock / util / AbstractFRMTest.java

diff --git a/applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractFRMTest.java b/applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractFRMTest.java
index 4d791e815eeed1b028e4d86c6859700887e2af62..5796c24cde1adbc935391177af82092113316e00 100644 (file)
--- a/applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractFRMTest.java
+++ b/applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractFRMTest.java
@@ -7,8 +7,8 @@
  */
 package test.mock.util;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -35,7 +35,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.Sal
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.SalMeterService;
@@ -45,6 +44,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.app.forwardingrules.manager.config.rev160511.ForwardingRulesManagerConfigBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.service.rev131026.SalTableService;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.opendaylight.yangtools.yang.common.Uint16;
 
 public abstract class AbstractFRMTest extends AbstractDataBrokerTest {
@@ -101,19 +101,19 @@ public abstract class AbstractFRMTest extends AbstractDataBrokerTest {
     }
 
     protected void addFlowCapableNode(final NodeKey nodeKey) {
-        Nodes nodes = new NodesBuilder().build();
-
-        NodeBuilder nodeBuilder = new NodeBuilder();
-        nodeBuilder.withKey(nodeKey);
-        nodeBuilder.addAugmentation(new FlowCapableNodeBuilder().build());
+        Nodes nodes = new NodesBuilder()
+            .setNode(BindingMap.of(new NodeBuilder()
+                .withKey(nodeKey)
+                .addAugmentation(new FlowCapableNodeBuilder().build())
+                .build()))
+            .build();
 
         WriteTransaction writeTx = getDataBroker().newWriteOnlyTransaction();
         writeTx.put(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(Nodes.class), nodes);
+        assertCommit(writeTx.commit());
 
-        InstanceIdentifier<Node> flowNodeIdentifier = InstanceIdentifier.create(Nodes.class).child(Node.class, nodeKey);
-        writeTx.put(LogicalDatastoreType.OPERATIONAL, flowNodeIdentifier, nodeBuilder.build());
+        writeTx = getDataBroker().newWriteOnlyTransaction();
         writeTx.put(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(Nodes.class), nodes);
-        writeTx.put(LogicalDatastoreType.CONFIGURATION, flowNodeIdentifier, nodeBuilder.build());
         assertCommit(writeTx.commit());
     }