X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=vpnmanager%2Fimpl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetvirt%2Fvpnmanager%2Fintervpnlink%2FInterVpnLinkNodeAddTask.java;h=46f96ca7620300e747e3ed2c4bc4bdc62ca28d1e;hb=cf1ea9172b94fc17e45391b62bf4ca24ac5c5fe0;hp=bd555d9346b2305c1277235436c14f0f8224249c;hpb=84a7d0a360f0d5f9b588e269840a92158d1be7d2;p=netvirt.git diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeAddTask.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeAddTask.java index bd555d9346..46f96ca762 100755 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeAddTask.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeAddTask.java @@ -8,7 +8,6 @@ package org.opendaylight.netvirt.vpnmanager.intervpnlink; import static org.opendaylight.genius.infra.Datastore.CONFIGURATION; -import static org.opendaylight.mdsal.binding.api.WriteTransaction.CREATE_MISSING_PARENTS; import com.google.common.util.concurrent.ListenableFuture; import java.math.BigInteger; @@ -116,8 +115,8 @@ public class InterVpnLinkNodeAddTask implements Callable - tx.merge(InterVpnLinkUtil.getInterVpnLinkStateIid(interVpnLinkState.getInterVpnLinkName()), - newInterVpnLinkState, CREATE_MISSING_PARENTS)); + tx.mergeParentStructureMerge(InterVpnLinkUtil + .getInterVpnLinkStateIid(interVpnLinkState.getInterVpnLinkName()), newInterVpnLinkState)); } private void installLPortDispatcherTable(InterVpnLinkState interVpnLinkState, List firstDpnList,