MRI version bump for Aluminium

[genius.git] / cloudscaler / impl / src / main / java / org / opendaylight / genius / cloudscaler / rpcservice / CloudscalerRpcServiceImpl.java

diff --git a/cloudscaler/impl/src/main/java/org/opendaylight/genius/cloudscaler/rpcservice/CloudscalerRpcServiceImpl.java b/cloudscaler/impl/src/main/java/org/opendaylight/genius/cloudscaler/rpcservice/CloudscalerRpcServiceImpl.java
index 2ba9a2ba35676e3f3fc2efe6aaf8d1b2484a65a5..9209942f1638d39d48fc1151b4348aae17b9013e 100644 (file)
--- a/cloudscaler/impl/src/main/java/org/opendaylight/genius/cloudscaler/rpcservice/CloudscalerRpcServiceImpl.java
+++ b/cloudscaler/impl/src/main/java/org/opendaylight/genius/cloudscaler/rpcservice/CloudscalerRpcServiceImpl.java
@@ -262,8 +262,8 @@ public class CloudscalerRpcServiceImpl implements CloudscalerRpcService {
         }
         ComputeNodeBuilder builder = new ComputeNodeBuilder(computeNode);
         builder.setTombstoned(tombstone);
-        tx.put(LogicalDatastoreType.CONFIGURATION,
-                computeNodeManager.buildComputeNodeIid(computeName), builder.build(), true);
+        tx.mergeParentStructurePut(LogicalDatastoreType.CONFIGURATION,
+                computeNodeManager.buildComputeNodeIid(computeName), builder.build());
     }
 
     @Override
@@ -306,7 +306,7 @@ public class CloudscalerRpcServiceImpl implements CloudscalerRpcService {
                         if (zone.getVteps() == null) {
                             continue;
                         }
-                        for (Vteps vteps : zone.getVteps()) {
+                        for (Vteps vteps : zone.getVteps().values()) {
                             if (vteps.getDpnId().equals(computeNode.getDpnid())) {
                                 InstanceIdentifier<Vteps> dpnVtepIid = InstanceIdentifier
                                         .create(TransportZones.class)