*/
package org.opendaylight.netvirt.natservice.internal;
-import java.util.List;
+import static org.opendaylight.genius.infra.Datastore.CONFIGURATION;
+
import java.util.Objects;
-import javax.annotation.PostConstruct;
+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.mdsalutil.UpgradeState;
+import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
+import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;
+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.CentralizedSwitchScheduler;
import org.opendaylight.netvirt.natservice.api.SnatServiceManager;
+import org.opendaylight.serviceutils.tools.listener.AbstractAsyncDataTreeChangeListener;
+import org.opendaylight.serviceutils.upgrade.UpgradeState;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService;
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.ExtRouters;
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.ext.routers.routers.ExternalIps;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint32;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Singleton
-public class SnatExternalRoutersListener extends AsyncDataTreeChangeListenerBase<Routers, SnatExternalRoutersListener> {
+public class SnatExternalRoutersListener extends AbstractAsyncDataTreeChangeListener<Routers> {
private static final Logger LOG = LoggerFactory.getLogger(SnatExternalRoutersListener.class);
private final DataBroker dataBroker;
+ private final ManagedNewTransactionRunner txRunner;
private final IdManagerService idManager;
private final CentralizedSwitchScheduler centralizedSwitchScheduler;
private final NatMode natMode;
final NatserviceConfig config,
final SnatServiceManager natServiceManager,
final UpgradeState upgradeState) {
- super(Routers.class, SnatExternalRoutersListener.class);
+ super(dataBroker, LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(ExtRouters.class)
+ .child(Routers.class),
+ Executors.newListeningSingleThreadExecutor("SnatExternalRoutersListener", LOG));
this.dataBroker = dataBroker;
+ this.txRunner = new ManagedNewTransactionRunnerImpl(dataBroker);
this.idManager = idManager;
this.centralizedSwitchScheduler = centralizedSwitchScheduler;
this.upgradeState = upgradeState;
} else {
this.natMode = NatMode.Conntrack;
}
+ init();
}
- @Override
- @PostConstruct
public void init() {
LOG.info("{} init", getClass().getSimpleName());
// This class handles ExternalRouters for Conntrack SNAT mode.
// For Controller SNAT mode, its handled in ExternalRoutersListeners.java
if (natMode == NatMode.Conntrack) {
- registerListener(LogicalDatastoreType.CONFIGURATION, dataBroker);
NatUtil.createGroupIdPool(idManager);
}
}
@Override
- protected InstanceIdentifier<Routers> getWildCardPath() {
- return InstanceIdentifier.create(ExtRouters.class).child(Routers.class);
+ @PreDestroy
+ public void close() {
+ super.close();
+ Executors.shutdownAndAwaitTermination(getExecutorService());
}
@Override
@SuppressWarnings("checkstyle:IllegalCatch")
- protected void add(InstanceIdentifier<Routers> identifier, Routers routers) {
+ public void add(InstanceIdentifier<Routers> identifier, Routers routers) {
+ if (natMode != NatMode.Conntrack) {
+ return;
+ }
String routerName = routers.getRouterName();
if (upgradeState.isUpgradeInProgress()) {
LOG.warn("add event for ext-router {}, but upgrade is in progress.", routerName);
}
LOG.info("add : external router event for {}", routerName);
- long routerId = NatUtil.getVpnId(dataBroker, routerName);
+ Uint32 routerId = NatUtil.getVpnId(dataBroker, routerName);
NatUtil.createRouterIdsConfigDS(dataBroker, routerId, routerName);
Uuid bgpVpnUuid = NatUtil.getVpnForRouter(dataBroker, routerName);
if (bgpVpnUuid != null) {
// Router associated to BGPVPN, ignoring it.
return;
}
-
- List<ExternalIps> externalIps = routers.getExternalIps();
// Allocate Primary NAPTSwitch for this router
- if (routers.isEnableSnat() && externalIps != null && !externalIps.isEmpty()) {
- centralizedSwitchScheduler.scheduleCentralizedSwitch(routers);
- }
+ centralizedSwitchScheduler.scheduleCentralizedSwitch(routers);
}
@Override
- protected void update(InstanceIdentifier<Routers> identifier, Routers original, Routers update) {
+ public void update(InstanceIdentifier<Routers> identifier, Routers original, Routers update) {
+ if (natMode != NatMode.Conntrack) {
+ return;
+ }
String routerName = original.getRouterName();
- Long routerId = NatUtil.getVpnId(dataBroker, routerName);
+ Uint32 routerId = NatUtil.getVpnId(dataBroker, routerName);
if (routerId == NatConstants.INVALID_ID) {
LOG.error("update : external router event - Invalid routerId for routerName {}", routerName);
return;
}
-
- // Check if its update on SNAT flag
- boolean originalSNATEnabled = original.isEnableSnat();
- boolean updatedSNATEnabled = update.isEnableSnat();
LOG.info("update :called for router {} with originalSNATStatus {} and updatedSNATStatus {}",
- routerName, originalSNATEnabled, updatedSNATEnabled);
+ routerName, original.isEnableSnat(), update.isEnableSnat());
if (!upgradeState.isUpgradeInProgress()) {
- if (originalSNATEnabled != updatedSNATEnabled) {
- if (originalSNATEnabled) {
- //SNAT is disabled for the router
- LOG.debug("update : SNAT disabled on router {}, release NAPT Switch", routerName);
- centralizedSwitchScheduler.releaseCentralizedSwitch(update);
- } else {
- LOG.debug("update : SNAT enabled on router {}, schedule NAPT Switch", routerName);
- centralizedSwitchScheduler.scheduleCentralizedSwitch(update);
- }
- } else if (updatedSNATEnabled) {
- centralizedSwitchScheduler.updateCentralizedSwitch(original, update);
- }
-
- List<ExternalIps> originalExternalIps = original.getExternalIps();
- List<ExternalIps> updateExternalIps = update.getExternalIps();
- if (!Objects.equals(originalExternalIps, updateExternalIps)) {
- if (originalExternalIps == null || originalExternalIps.isEmpty()) {
- centralizedSwitchScheduler.scheduleCentralizedSwitch(update);
- }
- }
+ centralizedSwitchScheduler.updateCentralizedSwitch(original, update);
+ }
+ if (!Objects.equals(original.getSubnetIds(), update.getSubnetIds())
+ || !Objects.equals(original.getExternalIps(), update.getExternalIps())) {
+ ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION,
+ confTx -> natServiceManager.notify(confTx, update, original, null, null,
+ SnatServiceManager.Action.SNAT_ROUTER_UPDATE)), LOG,
+ "error handling external router update");
}
}
@Override
- protected void remove(InstanceIdentifier<Routers> identifier, Routers router) {
+ public void remove(InstanceIdentifier<Routers> identifier, Routers router) {
+ if (natMode != NatMode.Conntrack) {
+ return;
+ }
if (identifier == null || router == null) {
LOG.error("remove : returning without processing since ext-router is null");
return;
}
LOG.info("remove : external router event for {}", router.getRouterName());
- if (router.isEnableSnat()) {
- centralizedSwitchScheduler.releaseCentralizedSwitch(router);
- }
- }
-
- @Override
- protected SnatExternalRoutersListener getDataTreeChangeListener() {
- return SnatExternalRoutersListener.this;
+ centralizedSwitchScheduler.releaseCentralizedSwitch(router);
}
}
Code Review / netvirt.git / blobdiff