MRI version bumpup for Aluminium

[netvirt.git] / elanmanager / impl / src / test / java / org / opendaylight / netvirt / elan / l2gw / nodehandlertest / NodeConnectedHandlerUtils.java

diff --git a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerUtils.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerUtils.java
index a1423d95482962c6a36d4add4b28b5f92ec3e721..ff1133673b88cdd419bd8053230a3faa10a0ec85 100644 (file)
--- a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerUtils.java
+++ b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerUtils.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.netvirt.elan.l2gw.nodehandlertest;
 
-import static org.opendaylight.controller.md.sal.binding.api.WriteTransaction.CREATE_MISSING_PARENTS;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -81,22 +80,22 @@ public class NodeConnectedHandlerUtils {
         nodeBuilder.setTerminationPoint(PhysicalSwitchHelper
                 .addPhysicalSwitchTerminationPoints(path, portNameList));
 
-        tx.put(path, nodeBuilder.build(), CREATE_MISSING_PARENTS);
+        tx.mergeParentStructurePut(path, nodeBuilder.build());
     }
 
-    private NodeBuilder prepareOperationalNode(InstanceIdentifier<Node> iid) {
+    private static NodeBuilder prepareOperationalNode(InstanceIdentifier<Node> iid) {
         NodeBuilder nodeBuilder = new NodeBuilder();
         nodeBuilder.setNodeId(iid.firstKeyOf(Node.class).getNodeId());
         return nodeBuilder;
     }
 
-    private HwvtepGlobalAugmentationBuilder prepareAugmentationBuilder() {
+    private static HwvtepGlobalAugmentationBuilder prepareAugmentationBuilder() {
         HwvtepGlobalAugmentationBuilder builder = new HwvtepGlobalAugmentationBuilder();
         builder.setManagers(TestBuilders.buildManagers());
         return builder;
     }
 
-    private List<String> getData(String data) {
+    private static List<String> getData(String data) {
         return Arrays.asList(data.split(","));
     }