import java.util.List;
import java.util.Objects;
import java.util.concurrent.Callable;
+import org.opendaylight.genius.infra.Datastore;
+import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
+import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;
+import org.opendaylight.infrautils.utils.concurrent.ListenableFutures;
+import org.opendaylight.mdsal.binding.api.DataBroker;
import org.opendaylight.netvirt.vpnmanager.VpnUtil;
import org.opendaylight.netvirt.vpnmanager.iplearn.model.MacEntry;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.learnt.vpn.vip.to.port.data.LearntVpnVipToPort;
+import org.opendaylight.yangtools.yang.common.Uint32;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class IpMonitorStopTask implements Callable<List<ListenableFuture<Void>>> {
+public class IpMonitorStopTask implements Callable<List<? extends ListenableFuture<?>>> {
private static final Logger LOG = LoggerFactory.getLogger(IpMonitorStopTask.class);
private MacEntry macEntry;
+ private DataBroker dataBroker;
private final AlivenessMonitorUtils alivenessMonitorUtils;
private boolean isRemoveMipAdjAndLearntIp;
private final VpnUtil vpnUtil;
+ private final ManagedNewTransactionRunner txRunner;
- public IpMonitorStopTask(MacEntry macEntry, boolean removeMipAdjAndLearntIp, VpnUtil vpnUtil,
- AlivenessMonitorUtils alivenessMonitorUtils) {
+ public IpMonitorStopTask(MacEntry macEntry, DataBroker dataBroker, boolean removeMipAdjAndLearntIp, VpnUtil vpnUtil,
+ AlivenessMonitorUtils alivenessMonitorUtils) {
this.macEntry = macEntry;
+ this.dataBroker = dataBroker;
this.alivenessMonitorUtils = alivenessMonitorUtils;
this.isRemoveMipAdjAndLearntIp = removeMipAdjAndLearntIp;
this.vpnUtil = vpnUtil;
+ this.txRunner = new ManagedNewTransactionRunnerImpl(dataBroker);
}
@Override
public List<ListenableFuture<Void>> call() {
final List<ListenableFuture<Void>> futures = new ArrayList<>();
- java.util.Optional<Long> monitorIdOptional = alivenessMonitorUtils.getMonitorIdFromInterface(macEntry);
+ java.util.Optional<Uint32> monitorIdOptional = alivenessMonitorUtils.getMonitorIdFromInterface(macEntry);
if (monitorIdOptional.isPresent()) {
alivenessMonitorUtils.stopIpMonitoring(monitorIdOptional.get());
} else {
+ "Ignoring this remove event.", learntIp, vpnName);
return futures;
}
- vpnUtil.removeMipAdjAndLearntIp(vpnName, macEntry.getInterfaceName(), learntIp);
+ vpnUtil.removeLearntVpnVipToPort(macEntry.getVpnName(),
+ macEntry.getIpAddress().getHostAddress(), null);
+ vpnUtil.removeVpnPortFixedIpToPort(dataBroker, macEntry.getVpnName(),
+ macEntry.getIpAddress().getHostAddress(), null);
+
+ ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(
+ Datastore.CONFIGURATION, tx -> vpnUtil.removeMipAdjacency(macEntry.getVpnName(),
+ macEntry.getInterfaceName(), macEntry.getIpAddress().getHostAddress(), tx)),
+ LOG, "ArpMonitorStopTask: Error writing to datastore for Vpn {} IP {}",
+ macEntry.getVpnName(), macEntry.getIpAddress().getHostAddress());
} else {
// Delete only MIP adjacency
vpnUtil.removeMipAdjacency(macEntry.getInterfaceName(), learntIp);
}
return futures;
}
-
-
}