package org.opendaylight.netvirt.natservice.ha;
-import java.math.BigInteger;
+import static org.opendaylight.genius.infra.Datastore.CONFIGURATION;
import java.time.Duration;
-import javax.annotation.PostConstruct;
+import java.util.Objects;
+import java.util.concurrent.ExecutionException;
+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.AsyncDataTreeChangeListenerBase;
import org.opendaylight.genius.datastoreutils.listeners.DataTreeEventCallbackRegistrar;
+import org.opendaylight.genius.infra.Datastore;
+import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
+import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;
+import org.opendaylight.genius.infra.TypedReadWriteTransaction;
+import org.opendaylight.infrautils.utils.concurrent.Executors;
+import org.opendaylight.infrautils.utils.concurrent.ListenableFutures;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.netvirt.natservice.api.SnatServiceManager;
import org.opendaylight.netvirt.natservice.internal.NatConstants;
import org.opendaylight.netvirt.natservice.internal.NatUtil;
+import org.opendaylight.serviceutils.tools.listener.AbstractAsyncDataTreeChangeListener;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.config.rev170206.NatserviceConfig;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.config.rev170206.NatserviceConfig.NatMode;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.NaptSwitches;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.ext.routers.Routers;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.napt.switches.RouterToNaptSwitch;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
*/
@Singleton
public class SnatCentralizedSwitchChangeListener
- extends AsyncDataTreeChangeListenerBase<RouterToNaptSwitch, SnatCentralizedSwitchChangeListener> {
+ extends AbstractAsyncDataTreeChangeListener<RouterToNaptSwitch> {
private static final Logger LOG = LoggerFactory.getLogger(SnatCentralizedSwitchChangeListener.class);
private final DataBroker dataBroker;
+ private final ManagedNewTransactionRunner txRunner;
private final SnatServiceManager snatServiceManger;
private final NatDataUtil natDataUtil;
private final DataTreeEventCallbackRegistrar eventCallbacks;
+ private final NatMode natMode;
@Inject
public SnatCentralizedSwitchChangeListener(final DataBroker dataBroker,
- final SnatServiceManager snatServiceManger, NatDataUtil natDataUtil,
+ final SnatServiceManager snatServiceManger, NatDataUtil natDataUtil, final NatserviceConfig config,
final DataTreeEventCallbackRegistrar dataTreeEventCallbackRegistrar) {
- super(RouterToNaptSwitch.class, SnatCentralizedSwitchChangeListener.class);
+ super(dataBroker, LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(NaptSwitches.class)
+ .child(RouterToNaptSwitch.class),
+ Executors.newListeningSingleThreadExecutor("SnatCentralizedSwitchChangeListener", LOG));
this.dataBroker = dataBroker;
+ this.txRunner = new ManagedNewTransactionRunnerImpl(dataBroker);
this.snatServiceManger = snatServiceManger;
this.natDataUtil = natDataUtil;
this.eventCallbacks = dataTreeEventCallbackRegistrar;
+ if (config != null) {
+ this.natMode = config.getNatMode();
+ } else {
+ LOG.info("NAT mode configured default as Controller as config is missing");
+ this.natMode = NatMode.Controller;
+ }
}
- @Override
- @PostConstruct
public void init() {
LOG.info("{} init", getClass().getSimpleName());
- registerListener(LogicalDatastoreType.CONFIGURATION, dataBroker);
}
@Override
- protected InstanceIdentifier<RouterToNaptSwitch> getWildCardPath() {
- return InstanceIdentifier.create(NaptSwitches.class).child(RouterToNaptSwitch.class);
+ @PreDestroy
+ public void close() {
+ super.close();
+ Executors.shutdownAndAwaitTermination(getExecutorService());
}
@Override
- protected void remove(InstanceIdentifier<RouterToNaptSwitch> key, RouterToNaptSwitch routerToNaptSwitch) {
+ public void remove(InstanceIdentifier<RouterToNaptSwitch> key, RouterToNaptSwitch routerToNaptSwitch) {
LOG.debug("Deleting {}", routerToNaptSwitch);
- BigInteger primarySwitchId = routerToNaptSwitch.getPrimarySwitchId();
+ if (natMode == NatMode.Controller) {
+ LOG.info("Do Not Processing this remove() event for (routerName:designatedDpn) {}:{}"
+ + "configured in Controller Mode",
+ routerToNaptSwitch.getRouterName(), routerToNaptSwitch.getPrimarySwitchId());
+ return;
+ }
+ Uint64 primarySwitchId = routerToNaptSwitch.getPrimarySwitchId();
Routers router = natDataUtil.getRouter(routerToNaptSwitch.getRouterName());
if (router != null) {
- snatServiceManger.notify(router, primarySwitchId, null, SnatServiceManager.Action.SNAT_ALL_SWITCH_DISBL);
+ ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION,
+ confTx -> snatServiceManger.notify(confTx, router, null, primarySwitchId, null,
+ SnatServiceManager.Action.SNAT_ALL_SWITCH_DISBL)), LOG,
+ "error handling SNAT centralized switch removal");
natDataUtil.removeFromRouterMap(router);
}
}
@Override
- protected void update(InstanceIdentifier<RouterToNaptSwitch> key, RouterToNaptSwitch origRouterToNaptSwitch,
+ public void update(InstanceIdentifier<RouterToNaptSwitch> key, RouterToNaptSwitch origRouterToNaptSwitch,
RouterToNaptSwitch updatedRouterToNaptSwitch) {
LOG.debug("Updating old {} new {}", origRouterToNaptSwitch, updatedRouterToNaptSwitch);
- BigInteger origPrimarySwitchId = origRouterToNaptSwitch.getPrimarySwitchId();
- Routers origRouter = NatUtil.getRoutersFromConfigDS(dataBroker, origRouterToNaptSwitch.getRouterName());
- if (origRouter != null) {
- snatServiceManger.notify(origRouter, origPrimarySwitchId, null,
- SnatServiceManager.Action.SNAT_ALL_SWITCH_DISBL);
- natDataUtil.removeFromRouterMap(origRouter);
- }
- BigInteger updatedPrimarySwitchId = updatedRouterToNaptSwitch.getPrimarySwitchId();
- Routers updatedRouter = NatUtil.getRoutersFromConfigDS(dataBroker, updatedRouterToNaptSwitch.getRouterName());
- if (updatedRouter != null) {
- natDataUtil.updateRouterMap(updatedRouter);
- snatServiceManger.notify(updatedRouter, updatedPrimarySwitchId, null,
- SnatServiceManager.Action.SNAT_ALL_SWITCH_ENBL);
+ if (natMode == NatMode.Controller) {
+ LOG.info("Do Not Processing this update() event for (routerName:designatedDpn) {}:{}"
+ + "configured in Controller Mode",
+ updatedRouterToNaptSwitch.getRouterName(), updatedRouterToNaptSwitch.getPrimarySwitchId());
+ return;
}
+ Uint64 origPrimarySwitchId = origRouterToNaptSwitch.getPrimarySwitchId();
+ Uint64 updatedPrimarySwitchId = updatedRouterToNaptSwitch.getPrimarySwitchId();
+ ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, confTx -> {
+ Routers origRouter = NatUtil.getRoutersFromConfigDS(confTx, origRouterToNaptSwitch.getRouterName());
+ Routers updatedRouter = NatUtil.getRoutersFromConfigDS(confTx, updatedRouterToNaptSwitch.getRouterName());
+ if (!Objects.equals(origPrimarySwitchId, updatedPrimarySwitchId)) {
+ if (origRouter != null) {
+ snatServiceManger.notify(confTx, origRouter, null, origPrimarySwitchId, null,
+ SnatServiceManager.Action.CNT_ROUTER_ALL_SWITCH_DISBL);
+ if (origRouterToNaptSwitch.isEnableSnat()) {
+ snatServiceManger.notify(confTx, origRouter, null, origPrimarySwitchId, null,
+ SnatServiceManager.Action.SNAT_ALL_SWITCH_DISBL);
+ }
+ natDataUtil.removeFromRouterMap(origRouter);
+ }
+ if (updatedRouter != null) {
+ natDataUtil.updateRouterMap(updatedRouter);
+ snatServiceManger.notify(confTx, updatedRouter, null, updatedPrimarySwitchId, null,
+ SnatServiceManager.Action.CNT_ROUTER_ALL_SWITCH_ENBL);
+ if (updatedRouterToNaptSwitch.isEnableSnat()) {
+ snatServiceManger.notify(confTx, updatedRouter, null, updatedPrimarySwitchId, null,
+ SnatServiceManager.Action.SNAT_ALL_SWITCH_ENBL);
+ }
+ }
+ } else {
+ boolean origIsSnatEnabled = false;
+ boolean updatedIsSnatEnabled = false;
+ if (origRouterToNaptSwitch.isEnableSnat() != null) {
+ origIsSnatEnabled = origRouterToNaptSwitch.isEnableSnat();
+ }
+ if (updatedRouterToNaptSwitch.isEnableSnat() != null) {
+ updatedIsSnatEnabled = updatedRouterToNaptSwitch.isEnableSnat();
+ }
+ if (origIsSnatEnabled != updatedIsSnatEnabled) {
+ if (updatedRouterToNaptSwitch.isEnableSnat()) {
+ snatServiceManger.notify(confTx, updatedRouter, null, updatedPrimarySwitchId, null,
+ SnatServiceManager.Action.SNAT_ALL_SWITCH_ENBL);
+ } else {
+ snatServiceManger.notify(confTx, origRouter, null, origPrimarySwitchId, null,
+ SnatServiceManager.Action.SNAT_ALL_SWITCH_DISBL);
+ }
+ }
+ }
+ }), LOG, "Error handling SNAT centralized switch update");
}
@Override
- protected void add(InstanceIdentifier<RouterToNaptSwitch> key, RouterToNaptSwitch routerToNaptSwitch) {
+ public void add(InstanceIdentifier<RouterToNaptSwitch> key, RouterToNaptSwitch routerToNaptSwitch) {
LOG.debug("Adding {}", routerToNaptSwitch);
- BigInteger primarySwitchId = routerToNaptSwitch.getPrimarySwitchId();
+ if (natMode == NatMode.Controller) {
+ LOG.info("Do Not Processing this add() event for (routerName:designatedDpn) {}:{}"
+ + "configured in Controller Mode",
+ routerToNaptSwitch.getRouterName(), routerToNaptSwitch.getPrimarySwitchId());
+ return;
+ }
+ Uint64 primarySwitchId = routerToNaptSwitch.getPrimarySwitchId();
String routerName = routerToNaptSwitch.getRouterName();
Routers router = NatUtil.getRoutersFromConfigDS(dataBroker, routerName);
- long vpnId = NatUtil.getVpnId(dataBroker, routerName);
+ final boolean isEnableSnat;
+ if (routerToNaptSwitch.isEnableSnat() != null) {
+ isEnableSnat = routerToNaptSwitch.isEnableSnat();
+ } else {
+ isEnableSnat = false;
+ }
+ Uint32 vpnId = NatUtil.getVpnId(dataBroker, routerName);
if (vpnId == NatConstants.INVALID_ID) {
LOG.warn("VpnId not unavailable for router {} yet", routerName);
eventCallbacks.onAddOrUpdate(LogicalDatastoreType.CONFIGURATION,
NatUtil.getVpnInstanceToVpnIdIdentifier(routerName), (unused, newVpnId) -> {
- handleAdd(routerName, router, primarySwitchId);
+ ListenableFutures.addErrorLogging(
+ txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION,
+ innerConfTx -> handleAdd(innerConfTx, routerName, router, primarySwitchId,
+ isEnableSnat)), LOG,
+ "Error handling router addition");
return DataTreeEventCallbackRegistrar.NextAction.UNREGISTER;
- }, Duration.ofSeconds(5), iid -> {
- LOG.error("VpnId not found for router {}", routerName);
- });
+ }, Duration.ofSeconds(5), iid -> LOG.error("VpnId not found for router {}", routerName));
return;
}
- handleAdd(routerName, router, primarySwitchId);
+ ListenableFutures.addErrorLogging(
+ txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION,
+ confTx -> handleAdd(confTx, routerName, router, primarySwitchId,
+ isEnableSnat)), LOG, "Error handling router addition");
}
- private void handleAdd(String routerName, Routers router, BigInteger primarySwitchId) {
+ private void handleAdd(TypedReadWriteTransaction<Datastore.Configuration> confTx,
+ String routerName, Routers router, Uint64 primarySwitchId, boolean isSnatEnabled)
+ throws ExecutionException, InterruptedException {
if (router != null) {
natDataUtil.addtoRouterMap(router);
- snatServiceManger.notify(router, primarySwitchId, null, SnatServiceManager.Action.SNAT_ALL_SWITCH_ENBL);
+ snatServiceManger.notify(confTx, router, null, primarySwitchId, null,
+ SnatServiceManager.Action.CNT_ROUTER_ALL_SWITCH_ENBL);
+ if (isSnatEnabled) {
+ snatServiceManger.notify(confTx, router, null, primarySwitchId, null,
+ SnatServiceManager.Action.SNAT_ALL_SWITCH_ENBL);
+ }
} else {
LOG.error("Router {} not found for primarySwitch {}", routerName, primarySwitchId);
}
}
-
- @Override
- protected SnatCentralizedSwitchChangeListener getDataTreeChangeListener() {
- return this;
- }
}
Code Review / netvirt.git / blobdiff