*/
package org.opendaylight.netvirt.vpnmanager.iplearn;
-import com.google.common.base.Optional;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import javax.annotation.PostConstruct;
+import java.util.Optional;
import javax.annotation.PreDestroy;
import javax.inject.Inject;
import javax.inject.Singleton;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.genius.datastoreutils.AsyncClusteredDataTreeChangeListenerBase;
import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
import org.opendaylight.genius.mdsalutil.NWUtil;
import org.opendaylight.genius.utils.clustering.EntityOwnershipUtils;
import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
+import org.opendaylight.infrautils.utils.concurrent.Executors;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.mdsal.eos.binding.api.Entity;
import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipCandidateRegistration;
import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService;
import org.opendaylight.netvirt.vpnmanager.VpnConstants;
import org.opendaylight.netvirt.vpnmanager.VpnUtil;
import org.opendaylight.netvirt.vpnmanager.iplearn.model.MacEntry;
+import org.opendaylight.serviceutils.tools.listener.AbstractClusteredAsyncDataTreeChangeListener;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.AlivenessMonitorService;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.LearntVpnVipToPortData;
import org.slf4j.LoggerFactory;
@Singleton
-public class IpMonitoringHandler
- extends AsyncClusteredDataTreeChangeListenerBase<LearntVpnVipToPort, IpMonitoringHandler> {
+public class IpMonitoringHandler extends AbstractClusteredAsyncDataTreeChangeListener<LearntVpnVipToPort> {
private static final Logger LOG = LoggerFactory.getLogger(IpMonitoringHandler.class);
private final DataBroker dataBroker;
private final AlivenessMonitorService alivenessManager;
private final JobCoordinator jobCoordinator;
private final VpnUtil vpnUtil;
- private Optional<Uint32> arpMonitorProfileId = Optional.absent();
- private Optional<Uint32> ipv6NdMonitorProfileId = Optional.absent();
+ private Optional<Uint32> arpMonitorProfileId = Optional.empty();
+ private Optional<Uint32> ipv6NdMonitorProfileId = Optional.empty();
private EntityOwnershipCandidateRegistration candidateRegistration;
@Inject
INeutronVpnManager neutronVpnService, IInterfaceManager interfaceManager,
EntityOwnershipService entityOwnershipService, JobCoordinator jobCoordinator,
AlivenessMonitorUtils alivenessMonitorUtils, VpnUtil vpnUtil) {
- super(LearntVpnVipToPort.class, IpMonitoringHandler.class);
+ super(dataBroker, LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(LearntVpnVipToPortData.class)
+ .child(LearntVpnVipToPort.class),
+ Executors.newListeningSingleThreadExecutor("IpMonitoringHandler", LOG));
this.dataBroker = dataBroker;
this.alivenessManager = alivenessManager;
this.neutronVpnService = neutronVpnService;
this.jobCoordinator = jobCoordinator;
this.alivenessMonitorUtils = alivenessMonitorUtils;
this.vpnUtil = vpnUtil;
+ start();
}
- @PostConstruct
public void start() {
+ LOG.info("{} start", getClass().getSimpleName());
this.arpMonitorProfileId = alivenessMonitorUtils.allocateArpMonitorProfile();
this.ipv6NdMonitorProfileId = alivenessMonitorUtils.allocateIpv6NaMonitorProfile();
if (this.arpMonitorProfileId == null || this.ipv6NdMonitorProfileId == null) {
LOG.error("Error while allocating ARP and IPv6 ND Profile Ids: ARP={}, IPv6ND={}", arpMonitorProfileId,
ipv6NdMonitorProfileId);
}
- registerListener(LogicalDatastoreType.OPERATIONAL, dataBroker);
try {
candidateRegistration = entityOwnershipUtils.getEntityOwnershipService().registerCandidate(
if (candidateRegistration != null) {
candidateRegistration.close();
}
- }
-
- @Override
- protected InstanceIdentifier<LearntVpnVipToPort> getWildCardPath() {
- return InstanceIdentifier.create(LearntVpnVipToPortData.class).child(LearntVpnVipToPort.class);
- }
-
- @Override
- protected IpMonitoringHandler getDataTreeChangeListener() {
- return this;
+ Executors.shutdownAndAwaitTermination(getExecutorService());
}
// TODO Clean up the exception handling
@SuppressWarnings("checkstyle:IllegalCatch")
@Override
- protected void update(InstanceIdentifier<LearntVpnVipToPort> id, LearntVpnVipToPort value,
+ public void update(InstanceIdentifier<LearntVpnVipToPort> id, LearntVpnVipToPort value,
LearntVpnVipToPort dataObjectModificationAfter) {
runOnlyInOwnerNode("IpMonitoringHandler: update event", () -> {
try {
}
@Override
- protected void add(InstanceIdentifier<LearntVpnVipToPort> identifier, LearntVpnVipToPort value) {
+ public void add(InstanceIdentifier<LearntVpnVipToPort> identifier, LearntVpnVipToPort value) {
runOnlyInOwnerNode("IpMonitoringHandler: add event", () -> {
try {
InetAddress srcInetAddr = InetAddress.getByName(value.getPortFixedip());
}
@Override
- protected void remove(InstanceIdentifier<LearntVpnVipToPort> key, LearntVpnVipToPort value) {
+ public void remove(InstanceIdentifier<LearntVpnVipToPort> key, LearntVpnVipToPort value) {
runOnlyInOwnerNode("IpMonitoringHandler: remove event", () -> {
try {
InetAddress srcInetAddr = InetAddress.getByName(value.getPortFixedip());