import static org.opendaylight.genius.infra.Datastore.CONFIGURATION;
-import com.google.common.base.Optional;
-
-import java.math.BigInteger;
import java.util.Collections;
import java.util.List;
-import javax.annotation.Nonnull;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
import javax.inject.Inject;
import javax.inject.Singleton;
-
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
+import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
import org.opendaylight.genius.infra.Datastore.Configuration;
import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
import org.opendaylight.genius.infra.TypedReadWriteTransaction;
import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager;
import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.common.api.ReadFailedException;
import org.opendaylight.netvirt.natservice.api.CentralizedSwitchScheduler;
-import org.opendaylight.serviceutils.tools.mdsal.listener.AbstractClusteredSyncDataTreeChangeListener;
+import org.opendaylight.serviceutils.tools.listener.AbstractClusteredSyncDataTreeChangeListener;
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.rev160111.ext.routers.Routers;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.ext.routers.routers.ExternalIps;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.napt.switches.RouterToNaptSwitch;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsalutil.rev170830.Config;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.upgrade.rev180702.UpgradeConfig;
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 UpgradeStateListener extends AbstractClusteredSyncDataTreeChangeListener<Config> {
+public class UpgradeStateListener extends AbstractClusteredSyncDataTreeChangeListener<UpgradeConfig> {
private static final Logger LOG = LoggerFactory.getLogger(UpgradeStateListener.class);
private final DataBroker dataBroker;
private final CentralizedSwitchScheduler centralizedSwitchScheduler;
private final NatserviceConfig.NatMode natMode;
- private SNATDefaultRouteProgrammer defaultRouteProgrammer;
+ private final SNATDefaultRouteProgrammer defaultRouteProgrammer;
private IMdsalApiManager mdsalManager;
private IdManagerService idManager;
- private NaptSwitchHA naptSwitchHA;
+ private final NaptSwitchHA naptSwitchHA;
private final JobCoordinator coordinator;
private final ManagedNewTransactionRunner txRunner;
final IdManagerService idManager,
final NaptSwitchHA naptSwitchHA,
final NatserviceConfig config, final JobCoordinator coordinator) {
- super(dataBroker, new DataTreeIdentifier<>(
- LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(Config.class)));
+ super(dataBroker, DataTreeIdentifier.create(
+ LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(UpgradeConfig.class)));
this.dataBroker = dataBroker;
this.txRunner = new ManagedNewTransactionRunnerImpl(dataBroker);
this.centralizedSwitchScheduler = centralizedSwitchScheduler;
this.defaultRouteProgrammer = defaultRouteProgrammer;
+ this.mdsalManager = mdsalManager;
+ this.idManager = idManager;
this.coordinator = coordinator;
this.naptSwitchHA = naptSwitchHA;
if (config != null) {
}
@Override
- public void add(@Nonnull Config newDataObject) {
+ public void add(@NonNull UpgradeConfig newDataObject) {
}
@Override
- public void remove(@Nonnull Config removedDataObject) {
+ public void remove(@NonNull UpgradeConfig removedDataObject) {
if (natMode == NatserviceConfig.NatMode.Conntrack) {
return;
}
}
@Override
- public void update(@Nonnull Config original, Config updated) {
+ public void update(@NonNull UpgradeConfig original, UpgradeConfig updated) {
if (natMode == NatserviceConfig.NatMode.Controller) {
if (original.isUpgradeInProgress() && !updated.isUpgradeInProgress()) {
Optional<NaptSwitches> npatSwitches = NatUtil.getAllPrimaryNaptSwitches(dataBroker);
if (npatSwitches.isPresent()) {
- for (RouterToNaptSwitch routerToNaptSwitch : npatSwitches.get().getRouterToNaptSwitch()) {
- BigInteger primaryNaptDpnId = routerToNaptSwitch.getPrimarySwitchId();
+ for (RouterToNaptSwitch routerToNaptSwitch : npatSwitches.get().nonnullRouterToNaptSwitch()) {
+ Uint64 primaryNaptDpnId = routerToNaptSwitch.getPrimarySwitchId();
if (!NatUtil.getSwitchStatus(dataBroker, routerToNaptSwitch.getPrimarySwitchId())) {
String routerUuid = routerToNaptSwitch.getRouterName();
- coordinator.enqueueJob((NatConstants.NAT_DJC_PREFIX + routerUuid),
+ coordinator.enqueueJob(NatConstants.NAT_DJC_PREFIX + routerUuid,
() -> Collections.singletonList(
- txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, confTx -> {
- reElectNewNaptSwitch(routerUuid, primaryNaptDpnId, confTx);
- }
+ txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION,
+ confTx -> reElectNewNaptSwitch(routerUuid, primaryNaptDpnId, confTx)
)), NatConstants.NAT_DJC_MAX_RETRIES);
}
}
return;
}
- for (Routers router : routers.getRouters()) {
+ for (Routers router : routers.nonnullRouters()) {
List<ExternalIps> externalIps = router.getExternalIps();
if (router.isEnableSnat() && externalIps != null && !externalIps.isEmpty()) {
centralizedSwitchScheduler.scheduleCentralizedSwitch(router);
}
}
- private void reElectNewNaptSwitch(String routerName, BigInteger primaryNaptDpnId,
- TypedReadWriteTransaction<Configuration> confTx) {
+ private void reElectNewNaptSwitch(String routerName, Uint64 primaryNaptDpnId,
+ TypedReadWriteTransaction<Configuration> confTx) throws ExecutionException, InterruptedException {
// Check if this is externalRouter else ignore
InstanceIdentifier<Routers> extRoutersId = NatUtil.buildRouterIdentifier(routerName);
Optional<Routers> routerData =
routerName);
return;
}
- Uuid networkId = routerData.get().getNetworkId();
+ Routers extRouters = routerData.get();
+ Uuid networkId = extRouters.getNetworkId();
if (networkId == null) {
LOG.error("hndlTepDelForSnatInEachRtr : SNAT -> Ignoring Re-election with Napt {} for router {}"
+ "as external network configuraton is missing", primaryNaptDpnId, routerName);
return;
}
- long routerId = NatUtil.getVpnId(dataBroker, routerName);
+ Uint32 routerId = NatUtil.getVpnId(dataBroker, routerName);
LOG.debug("hndlTepDelForSnatInEachRtr : SNAT->Router {} is associated with ext nw {}", routerId, networkId);
Uuid bgpVpnUuid = NatUtil.getVpnForRouter(dataBroker, routerName);
- Long bgpVpnId;
+ Uint32 bgpVpnId;
if (bgpVpnUuid == null) {
LOG.debug("hndlTepDelForSnatInEachRtr : SNAT->Internal VPN-ID {} associated to router {}",
routerId, routerName);
if (routerData.get().isEnableSnat()) {
LOG.info("hndlTepDelForSnatInEachRtr : SNAT enabled for router {}", routerId);
- long routerVpnId = routerId;
+ Uint32 routerVpnId = routerId;
if (bgpVpnId != NatConstants.INVALID_ID) {
LOG.debug("hndlTepDelForSnatInEachRtr : SNAT -> Private BGP VPN ID (Internal BGP VPN ID) {} "
+ "associated to the router {}", bgpVpnId, routerName);
//Re-elect the other available switch as the NAPT switch and program the NAT flows.
ProviderTypes extNwProvType = NatEvpnUtil.getExtNwProvTypeFromRouterName(dataBroker,
routerName, networkId);
+ String externalVpnName = NatUtil.getAssociatedVPN(dataBroker,extRouters.getNetworkId());
if (extNwProvType == null) {
return;
}
- NatUtil.removeSNATFromDPN(dataBroker, mdsalManager, idManager, naptSwitchHA, primaryNaptDpnId, routerName,
- routerId, routerVpnId, extNwProvType, confTx);
+ NatUtil.removeSNATFromDPN(dataBroker, mdsalManager, idManager, naptSwitchHA, primaryNaptDpnId, extRouters,
+ routerId, routerVpnId, externalVpnName, extNwProvType, confTx);
} else {
LOG.info("hndlTepDelForSnatInEachRtr : SNAT is not enabled for router {} to handle addDPN event {}",
Code Review / netvirt.git / blobdiff