*/
package org.opendaylight.genius.itm.confighelpers;
-import com.google.common.util.concurrent.FutureCallback;
+import static java.util.Collections.singletonList;
+
+import com.google.common.base.Optional;
import com.google.common.util.concurrent.ListenableFuture;
import java.math.BigInteger;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.Callable;
-
+import java.util.concurrent.ExecutionException;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.genius.datastoreutils.DataStoreJobCoordinator;
+import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
+import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
+import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;
+import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
+import org.opendaylight.genius.itm.cache.OvsBridgeRefEntryCache;
+import org.opendaylight.genius.itm.globals.ITMConstants;
import org.opendaylight.genius.itm.impl.ITMBatchingUtils;
import org.opendaylight.genius.itm.impl.ItmUtils;
+import org.opendaylight.genius.itm.impl.TunnelMonitoringConfig;
+import org.opendaylight.genius.itm.itmdirecttunnels.renderer.ovs.utilities.DirectTunnelUtils;
import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager;
+import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfTunnel;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.ParentRefs;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelMonitoringTypeBase;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelMonitoringTypeLldp;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelTypeBase;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelTypeVxlan;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.tunnel.optional.params.TunnelOptions;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.config.rev160406.ItmConfig;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.meta.rev171210.ovs.bridge.ref.info.OvsBridgeRefEntry;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.DpnEndpoints;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.DpnEndpointsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.DpnTepsState;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.DpnTepsStateBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.TunnelList;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.dpn.endpoints.DPNTEPsInfo;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.dpn.endpoints.dpn.teps.info.TunnelEndPoints;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.dpn.teps.state.DpnsTeps;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.dpn.teps.state.DpnsTepsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.dpn.teps.state.DpnsTepsKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.dpn.teps.state.dpns.teps.RemoteDpns;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.dpn.teps.state.dpns.teps.RemoteDpnsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.dpn.teps.state.dpns.teps.RemoteDpnsKey;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.tunnel.list.InternalTunnel;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.tunnel.list.InternalTunnelKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeAugmentation;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.OperationFailedException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ItmInternalTunnelAddWorker {
+public final class ItmInternalTunnelAddWorker {
private static final Logger LOG = LoggerFactory.getLogger(ItmInternalTunnelAddWorker.class) ;
- private static Boolean monitorEnabled;
- private static Integer monitorInterval;
private static ItmConfig itmCfg;
- private static Class<? extends TunnelMonitoringTypeBase> monitorProtocol;
- private static final FutureCallback<Void> DEFAULT_CALLBACK = new FutureCallback<Void>() {
- @Override
- public void onSuccess(Void result) {
- LOG.debug("Success in Datastore operation");
- }
- @Override
- public void onFailure(Throwable error) {
- LOG.error("Error in Datastore operation", error);
- }
- };
-
- public static List<ListenableFuture<Void>> build_all_tunnels(DataBroker dataBroker,
- IdManagerService idManagerService,
- IMdsalApiManager mdsalManager,
- List<DPNTEPsInfo> cfgdDpnList,
- List<DPNTEPsInfo> meshedDpnList,
- ItmConfig itmConfig) {
+ private final Integer monitorInterval;
+ private final boolean isTunnelMonitoringEnabled;
+ private final Class<? extends TunnelMonitoringTypeBase> monitorProtocol;
+
+ private final DataBroker dataBroker;
+ private final ManagedNewTransactionRunner txRunner;
+ private final JobCoordinator jobCoordinator;
+ private final DirectTunnelUtils directTunnelUtils;
+ private final IInterfaceManager interfaceManager;
+ private final OvsBridgeRefEntryCache ovsBridgeRefEntryCache;
+
+ public ItmInternalTunnelAddWorker(DataBroker dataBroker, JobCoordinator jobCoordinator,
+ TunnelMonitoringConfig tunnelMonitoringConfig, ItmConfig itmCfg,
+ DirectTunnelUtils directTunnelUtil,
+ IInterfaceManager interfaceManager,
+ OvsBridgeRefEntryCache ovsBridgeRefEntryCache) {
+ this.dataBroker = dataBroker;
+ this.txRunner = new ManagedNewTransactionRunnerImpl(dataBroker);
+ this.jobCoordinator = jobCoordinator;
+ this.itmCfg = itmCfg;
+ this.directTunnelUtils = directTunnelUtil;
+ this.interfaceManager = interfaceManager;
+ this.ovsBridgeRefEntryCache = ovsBridgeRefEntryCache;
+ isTunnelMonitoringEnabled = tunnelMonitoringConfig.isTunnelMonitoringEnabled();
+ monitorProtocol = tunnelMonitoringConfig.getMonitorProtocol();
+ monitorInterval = Integer.valueOf(tunnelMonitoringConfig.getMonitorInterval());
+ }
+
+ public List<ListenableFuture<Void>> buildAllTunnels(IMdsalApiManager mdsalManager, List<DPNTEPsInfo> cfgdDpnList,
+ Collection<DPNTEPsInfo> meshedDpnList, ItmConfig itmConfig) {
LOG.trace("Building tunnels with DPN List {} " , cfgdDpnList);
- monitorInterval = ItmUtils.determineMonitorInterval(dataBroker);
- monitorProtocol = ItmUtils.determineMonitorProtocol(dataBroker);
- monitorEnabled = ItmUtils.readMonitoringStateFromCache(dataBroker);
itmCfg = itmConfig;
- List<ListenableFuture<Void>> futures = new ArrayList<>();
- WriteTransaction transaction = dataBroker.newWriteOnlyTransaction();
if (null == cfgdDpnList || cfgdDpnList.isEmpty()) {
LOG.error(" Build Tunnels was invoked with empty list");
- return futures;
+ return Collections.emptyList();
}
- for (DPNTEPsInfo dpn : cfgdDpnList) {
- //#####if dpn is not in meshedDpnList
- build_tunnel_from(dpn, meshedDpnList, dataBroker, idManagerService, mdsalManager, transaction, futures);
- if (null == meshedDpnList) {
- meshedDpnList = new ArrayList<>();
+ return Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(transaction -> {
+ for (DPNTEPsInfo dpn : cfgdDpnList) {
+ //#####if dpn is not in meshedDpnList
+ buildTunnelFrom(dpn, meshedDpnList, mdsalManager, transaction);
+ if (meshedDpnList != null) {
+ meshedDpnList.add(dpn);
+ }
+ // Update the config datastore -- FIXME -- Error Handling
+ updateDpnTepInfoToConfig(dpn, transaction);
}
- meshedDpnList.add(dpn);
- // Update the operational datastore -- FIXME -- Error Handling
- updateOperationalDatastore(dataBroker, dpn, transaction, futures);
- }
- futures.add(transaction.submit()) ;
- return futures ;
+ }));
}
- private static void updateOperationalDatastore(DataBroker dataBroker, DPNTEPsInfo dpn,
- WriteTransaction transaction, List<ListenableFuture<Void>> futures) {
+ private static void updateDpnTepInfoToConfig(DPNTEPsInfo dpn, WriteTransaction tx) {
LOG.debug("Updating CONFIGURATION datastore with DPN {} ", dpn);
InstanceIdentifier<DpnEndpoints> dep = InstanceIdentifier.builder(DpnEndpoints.class).build() ;
List<DPNTEPsInfo> dpnList = new ArrayList<>() ;
dpnList.add(dpn) ;
DpnEndpoints tnlBuilder = new DpnEndpointsBuilder().setDPNTEPsInfo(dpnList).build() ;
- ITMBatchingUtils.update(dep, tnlBuilder, ITMBatchingUtils.EntityType.DEFAULT_CONFIG);
+ tx.merge(LogicalDatastoreType.CONFIGURATION, dep, tnlBuilder);
}
- private static void build_tunnel_from(DPNTEPsInfo srcDpn,List<DPNTEPsInfo> meshedDpnList, DataBroker dataBroker,
- IdManagerService idManagerService, IMdsalApiManager mdsalManager,
- WriteTransaction transaction, List<ListenableFuture<Void>> futures) {
+ private void buildTunnelFrom(DPNTEPsInfo srcDpn, Collection<DPNTEPsInfo> meshedDpnList,
+ IMdsalApiManager mdsalManager, WriteTransaction transaction) throws ExecutionException,
+ InterruptedException, OperationFailedException {
LOG.trace("Building tunnels from DPN {} " , srcDpn);
- if (null == meshedDpnList || 0 == meshedDpnList.size()) {
+ if (null == meshedDpnList || meshedDpnList.isEmpty()) {
LOG.debug("No DPN in the mesh ");
return ;
}
for (DPNTEPsInfo dstDpn: meshedDpnList) {
if (!srcDpn.equals(dstDpn)) {
- wireUpWithinTransportZone(srcDpn, dstDpn, dataBroker, idManagerService, mdsalManager,
- transaction, futures);
+ wireUpWithinTransportZone(srcDpn, dstDpn, mdsalManager, transaction);
}
}
}
- private static void wireUpWithinTransportZone(DPNTEPsInfo srcDpn, DPNTEPsInfo dstDpn, DataBroker dataBroker,
- IdManagerService idManagerService, IMdsalApiManager mdsalManager,
- WriteTransaction transaction, List<ListenableFuture<Void>> futures) {
+ private void wireUpWithinTransportZone(DPNTEPsInfo srcDpn, DPNTEPsInfo dstDpn,
+ IMdsalApiManager mdsalManager, WriteTransaction transaction) throws ExecutionException,
+ InterruptedException, OperationFailedException {
LOG.trace("Wiring up within Transport Zone for Dpns {}, {} " , srcDpn, dstDpn);
List<TunnelEndPoints> srcEndPts = srcDpn.getTunnelEndPoints();
List<TunnelEndPoints> dstEndPts = dstDpn.getTunnelEndPoints();
if (!srcDpn.getDPNID().equals(dstDpn.getDPNID())) {
if (!ItmUtils.getIntersection(srcte.getTzMembership(), dstte.getTzMembership()).isEmpty()) {
// wire them up
- wireUpBidirectionalTunnel(srcte, dstte, srcDpn.getDPNID(), dstDpn.getDPNID(), dataBroker,
- idManagerService, mdsalManager, transaction, futures);
+ wireUpBidirectionalTunnel(srcte, dstte, srcDpn.getDPNID(), dstDpn.getDPNID(),
+ mdsalManager, transaction);
if (!ItmTunnelAggregationHelper.isTunnelAggregationEnabled()) {
// CHECK THIS -- Assumption -- One end point per Dpn per transport zone
break;
}
}
- private static void wireUpBidirectionalTunnel(TunnelEndPoints srcte, TunnelEndPoints dstte, BigInteger srcDpnId,
- BigInteger dstDpnId, DataBroker dataBroker,
- IdManagerService idManagerService, IMdsalApiManager mdsalManager,
- WriteTransaction transaction, List<ListenableFuture<Void>> futures) {
+ private void wireUpBidirectionalTunnel(TunnelEndPoints srcte, TunnelEndPoints dstte, BigInteger srcDpnId,
+ BigInteger dstDpnId, IMdsalApiManager mdsalManager, WriteTransaction transaction)
+ throws ExecutionException, InterruptedException, OperationFailedException {
// Setup the flow for LLDP monitoring -- PUNT TO CONTROLLER
if (monitorProtocol.isAssignableFrom(TunnelMonitoringTypeLldp.class)) {
ItmUtils.setUpOrRemoveTerminatingServiceTable(dstDpnId, mdsalManager, true);
}
// Create the forward direction tunnel
- if (!wireUp(srcte, dstte, srcDpnId, dstDpnId, dataBroker, idManagerService, mdsalManager,
- transaction, futures)) {
+ if (!wireUp(srcte, dstte, srcDpnId, dstDpnId, transaction)) {
LOG.error("Could not build tunnel between end points {}, {} " , srcte, dstte);
}
// CHECK IF FORWARD IS NOT BUILT , REVERSE CAN BE BUILT
// Create the tunnel for the reverse direction
- if (!wireUp(dstte, srcte, dstDpnId, srcDpnId, dataBroker, idManagerService, mdsalManager,
- transaction, futures)) {
+ if (!wireUp(dstte, srcte, dstDpnId, srcDpnId, transaction)) {
LOG.error("Could not build tunnel between end points {}, {} " , dstte, srcte);
}
}
- private static boolean wireUp(TunnelEndPoints srcte, TunnelEndPoints dstte,
- BigInteger srcDpnId, BigInteger dstDpnId,
- DataBroker dataBroker, IdManagerService idManagerService,
- IMdsalApiManager mdsalManager, WriteTransaction transaction,
- List<ListenableFuture<Void>> futures) {
+ private boolean wireUp(TunnelEndPoints srcte, TunnelEndPoints dstte, BigInteger srcDpnId, BigInteger dstDpnId,
+ WriteTransaction transaction) throws ExecutionException, InterruptedException, OperationFailedException {
// Wire Up logic
LOG.trace("Wiring between source tunnel end points {}, destination tunnel end points {}", srcte, dstte);
String interfaceName = srcte.getInterfaceName();
String tunTypeStr = srcte.getTunnelType().getName();
// Form the trunk Interface Name
- String trunkInterfaceName = ItmUtils.getTrunkInterfaceName(idManagerService, interfaceName,
+ String trunkInterfaceName = ItmUtils.getTrunkInterfaceName(interfaceName,
new String(srcte.getIpAddress().getValue()),
new String(dstte.getIpAddress().getValue()),
tunTypeStr);
String parentInterfaceName = null;
if (tunType.isAssignableFrom(TunnelTypeVxlan.class)) {
- parentInterfaceName = createLogicalGroupTunnel(srcDpnId, dstDpnId, dataBroker);
+ parentInterfaceName = createLogicalGroupTunnel(srcDpnId, dstDpnId);
+ }
+ if (interfaceManager.isItmDirectTunnelsEnabled()) {
+ createInternalDirectTunnels(srcte, dstte, srcDpnId, dstDpnId, tunType, trunkInterfaceName,
+ parentInterfaceName);
+ } else {
+ createTunnelInterface(srcte, dstte, srcDpnId, tunType, trunkInterfaceName, parentInterfaceName);
+ // also update itm-state ds?
+ createInternalTunnel(srcDpnId, dstDpnId, tunType, trunkInterfaceName, transaction);
}
- createTunnelInterface(srcte, dstte, srcDpnId, dstDpnId, tunType, trunkInterfaceName, parentInterfaceName);
- // also update itm-state ds?
- createInternalTunnel(srcDpnId, dstDpnId, tunType, trunkInterfaceName, transaction);
return true;
}
- private static void createTunnelInterface(TunnelEndPoints srcte, TunnelEndPoints dstte,
- BigInteger srcDpnId, BigInteger dstDpnId,
- Class<? extends TunnelTypeBase> tunType,
- String trunkInterfaceName, String parentInterfaceName) {
+ private void createTunnelInterface(TunnelEndPoints srcte, TunnelEndPoints dstte, BigInteger srcDpnId,
+ Class<? extends TunnelTypeBase> tunType, String trunkInterfaceName, String parentInterfaceName) {
String gateway = srcte.getIpAddress().getIpv4Address() != null ? "0.0.0.0" : "::";
IpAddress gatewayIpObj = new IpAddress(gateway.toCharArray());
IpAddress gwyIpAddress =
+ "source IP - {}, destination IP - {} gateway IP - {}",
trunkInterfaceName, srcte.getInterfaceName(), srcte.getIpAddress(), dstte.getIpAddress(), gwyIpAddress);
boolean useOfTunnel = ItmUtils.falseIfNull(srcte.isOptionOfTunnel());
+
List<TunnelOptions> tunOptions = ItmUtils.buildTunnelOptions(srcte, itmCfg);
+ Boolean isMonitorEnabled = tunType.isAssignableFrom(TunnelTypeLogicalGroup.class) ? false
+ : isTunnelMonitoringEnabled;
Interface iface = ItmUtils.buildTunnelInterface(srcDpnId, trunkInterfaceName,
String.format("%s %s",ItmUtils.convertTunnelTypetoString(tunType), "Trunk Interface"),
true, tunType, srcte.getIpAddress(), dstte.getIpAddress(), gwyIpAddress, srcte.getVLANID(), true,
- monitorEnabled, monitorProtocol, monitorInterval, useOfTunnel, parentInterfaceName, tunOptions);
+ isMonitorEnabled, monitorProtocol, monitorInterval, useOfTunnel, parentInterfaceName, tunOptions);
LOG.debug(" Trunk Interface builder - {} ", iface);
InstanceIdentifier<Interface> trunkIdentifier = ItmUtils.buildId(trunkInterfaceName);
LOG.debug(" Trunk Interface Identifier - {} ", trunkIdentifier);
LOG.trace(" Writing Trunk Interface to Config DS {}, {} ", trunkIdentifier, iface);
ITMBatchingUtils.update(trunkIdentifier, iface, ITMBatchingUtils.EntityType.DEFAULT_CONFIG);
- ItmUtils.itmCache.addInterface(iface);
+ ItmUtils.ITM_CACHE.addInterface(iface);
}
- private static void createLogicalTunnelInterface(BigInteger srcDpnId, BigInteger dstDpnId,
+ private static void createLogicalTunnelInterface(BigInteger srcDpnId,
Class<? extends TunnelTypeBase> tunType, String interfaceName) {
Interface iface = ItmUtils.buildLogicalTunnelInterface(srcDpnId, interfaceName,
String.format("%s %s",ItmUtils.convertTunnelTypetoString(tunType), "Interface"), true);
InstanceIdentifier<Interface> trunkIdentifier = ItmUtils.buildId(interfaceName);
ITMBatchingUtils.update(trunkIdentifier, iface, ITMBatchingUtils.EntityType.DEFAULT_CONFIG);
- ItmUtils.itmCache.addInterface(iface);
+ ItmUtils.ITM_CACHE.addInterface(iface);
}
private static void createInternalTunnel(BigInteger srcDpnId, BigInteger dstDpnId,
// Will revert when ELAN can handle this.
// ITMBatchingUtils.update(path, tnl, ITMBatchingUtils.EntityType.DEFAULT_CONFIG);
transaction.merge(LogicalDatastoreType.CONFIGURATION,path, tnl, true) ;
- ItmUtils.itmCache.addInternalTunnel(tnl);
+ ItmUtils.ITM_CACHE.addInternalTunnel(tnl);
}
- private static String createLogicalGroupTunnel(BigInteger srcDpnId, BigInteger dstDpnId, DataBroker dataBroker) {
- String logicTunnelGroupName = null;
+ private String createLogicalGroupTunnel(BigInteger srcDpnId, BigInteger dstDpnId) {
boolean tunnelAggregationEnabled = ItmTunnelAggregationHelper.isTunnelAggregationEnabled();
if (!tunnelAggregationEnabled) {
- return logicTunnelGroupName;
+ return null;
}
- logicTunnelGroupName = ItmUtils.getLogicalTunnelGroupName(srcDpnId, dstDpnId);
- DataStoreJobCoordinator coordinator = DataStoreJobCoordinator.getInstance();
+ String logicTunnelGroupName = ItmUtils.getLogicalTunnelGroupName(srcDpnId, dstDpnId);
ItmTunnelAggregationWorker addWorker =
new ItmTunnelAggregationWorker(logicTunnelGroupName, srcDpnId, dstDpnId, dataBroker);
- coordinator.enqueueJob(logicTunnelGroupName, addWorker);
+ jobCoordinator.enqueueJob(logicTunnelGroupName, addWorker);
return logicTunnelGroupName;
}
private final String logicTunnelGroupName;
private final BigInteger srcDpnId;
private final BigInteger dstDpnId;
- private final DataBroker dataBroker;
+ private final ManagedNewTransactionRunner txRunner;
ItmTunnelAggregationWorker(String logicGroupName, BigInteger srcDpnId, BigInteger dstDpnId, DataBroker broker) {
this.logicTunnelGroupName = logicGroupName;
this.srcDpnId = srcDpnId;
this.dstDpnId = dstDpnId;
- this.dataBroker = broker;
+ this.txRunner = new ManagedNewTransactionRunnerImpl(broker);
}
@Override
public List<ListenableFuture<Void>> call() throws Exception {
- List<ListenableFuture<Void>> futures = new ArrayList<>();
- //The logical tunnel interface be created only when the first tunnel interface on each OVS is created
- InternalTunnel tunnel = ItmUtils.itmCache.getInternalTunnel(logicTunnelGroupName);
- if (tunnel == null) {
- WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
- LOG.info("MULTIPLE_VxLAN_TUNNELS: add the logical tunnel group {} because a first tunnel"
+ return singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(tx -> {
+ //The logical tunnel interface be created only when the first tunnel interface on each OVS is created
+ InternalTunnel tunnel = ItmUtils.ITM_CACHE.getInternalTunnel(logicTunnelGroupName);
+ if (tunnel == null) {
+ LOG.info("MULTIPLE_VxLAN_TUNNELS: add the logical tunnel group {} because a first tunnel"
+ " interface on srcDpnId {} dstDpnId {} is created", logicTunnelGroupName, srcDpnId, dstDpnId);
- createLogicalTunnelInterface(srcDpnId, dstDpnId, TunnelTypeLogicalGroup.class, logicTunnelGroupName);
- createInternalTunnel(srcDpnId, dstDpnId, TunnelTypeLogicalGroup.class, logicTunnelGroupName, tx);
- futures.add(tx.submit());
- } else {
- LOG.debug("MULTIPLE_VxLAN_TUNNELS: not first tunnel on srcDpnId {} dstDpnId {}", srcDpnId, dstDpnId);
- }
- return futures;
+ createLogicalTunnelInterface(srcDpnId, TunnelTypeLogicalGroup.class, logicTunnelGroupName);
+ createInternalTunnel(srcDpnId, dstDpnId, TunnelTypeLogicalGroup.class, logicTunnelGroupName, tx);
+ } else {
+ LOG.debug("MULTIPLE_VxLAN_TUNNELS: not first tunnel on srcDpnId {} dstDpnId {}", srcDpnId,
+ dstDpnId);
+ }
+ }));
+ }
+ }
+
+ private void createInternalDirectTunnels(TunnelEndPoints srcte, TunnelEndPoints dstte,
+ BigInteger srcDpnId, BigInteger dstDpnId, Class<? extends TunnelTypeBase> tunType,
+ String trunkInterfaceName, String parentInterfaceName) throws ExecutionException, InterruptedException,
+ OperationFailedException {
+ IpAddress gatewayIpObj = new IpAddress("0.0.0.0".toCharArray());
+ IpAddress gwyIpAddress = srcte.getSubnetMask().equals(dstte.getSubnetMask())
+ ? gatewayIpObj : srcte.getGwIpAddress() ;
+ LOG.debug("Creating Trunk Interface with parameters trunk I/f Name - {}, parent I/f name - {}, source IP - {},"
+ + " destination IP - {} gateway IP - {}", trunkInterfaceName, parentInterfaceName,
+ srcte.getIpAddress(), dstte.getIpAddress(), gwyIpAddress) ;
+
+ boolean useOfTunnel = ItmUtils.falseIfNull(srcte.isOptionOfTunnel());
+
+ List<TunnelOptions> tunOptions = ItmUtils.buildTunnelOptions(srcte, itmCfg);
+ Boolean isMonitorEnabled = tunType.isAssignableFrom(TunnelTypeLogicalGroup.class) ? false
+ : isTunnelMonitoringEnabled;
+ Interface iface = ItmUtils.buildTunnelInterface(srcDpnId, trunkInterfaceName,
+ String.format("%s %s",ItmUtils.convertTunnelTypetoString(srcte.getTunnelType()), "Trunk Interface"),
+ true, tunType, srcte.getIpAddress(), dstte.getIpAddress(), gwyIpAddress, srcte.getVLANID(),
+ true, isMonitorEnabled, monitorProtocol, monitorInterval, useOfTunnel, parentInterfaceName, tunOptions);
+ LOG.debug("Trunk Interface builder - {} ", iface);
+
+ final DpnTepsStateBuilder dpnTepsStateBuilder = new DpnTepsStateBuilder();
+ final DpnsTepsBuilder dpnsTepsBuilder = new DpnsTepsBuilder();
+ final List<DpnsTeps> dpnTeps = new ArrayList<>();
+ final List<RemoteDpns> remoteDpns = new ArrayList<>();
+ dpnsTepsBuilder.setKey(new DpnsTepsKey(srcDpnId));
+ dpnsTepsBuilder.setTunnelType(srcte.getTunnelType());
+ dpnsTepsBuilder.setSourceDpnId(srcDpnId);
+
+ //ITM TEP INTERFACE set the group Id here ..later
+ Integer groupId = directTunnelUtils.allocateId(ITMConstants.ITM_IDPOOL_NAME, srcDpnId.toString());
+ dpnsTepsBuilder.setGroupId(groupId.longValue());
+ RemoteDpnsBuilder remoteDpn = new RemoteDpnsBuilder();
+ remoteDpn.setKey(new RemoteDpnsKey(dstDpnId));
+ remoteDpn.setDestinationDpnId(dstDpnId);
+ remoteDpn.setTunnelName(trunkInterfaceName);
+ remoteDpn.setMonitoringEnabled(isTunnelMonitoringEnabled);
+ remoteDpn.setMonitoringInterval(monitorInterval);
+ remoteDpn.setInternal(true);
+ remoteDpns.add(remoteDpn.build());
+ dpnsTepsBuilder.setRemoteDpns(remoteDpns);
+ dpnTeps.add(dpnsTepsBuilder.build());
+ dpnTepsStateBuilder.setDpnsTeps(dpnTeps);
+ updateDpnTepInterfaceInfoToConfig(dpnTepsStateBuilder.build());
+ addTunnelConfiguration(iface);
+ }
+
+ private static void updateDpnTepInterfaceInfoToConfig(DpnTepsState dpnTeps) {
+ LOG.debug("Updating CONFIGURATION datastore with DPN-Teps {} ", dpnTeps);
+ InstanceIdentifier<DpnTepsState> dpnTepsII = InstanceIdentifier.builder(DpnTepsState.class).build() ;
+ ITMBatchingUtils.update(dpnTepsII, dpnTeps, ITMBatchingUtils.EntityType.DEFAULT_CONFIG);
+ }
+
+ private List<ListenableFuture<Void>> addTunnelConfiguration(Interface iface) throws ReadFailedException {
+ // ITM Direct Tunnels This transaction is not being used -- CHECK
+ final WriteTransaction transaction = dataBroker.newWriteOnlyTransaction();
+ ParentRefs parentRefs = iface.getAugmentation(ParentRefs.class);
+ if (parentRefs == null) {
+ LOG.warn("ParentRefs for interface: {} Not Found. Creation of Tunnel OF-Port not supported"
+ + " when dpid not provided.", iface.getName());
+ return Collections.emptyList();
+ }
+
+ BigInteger dpId = parentRefs.getDatapathNodeIdentifier();
+ if (dpId == null) {
+ LOG.warn("dpid for interface: {} Not Found. No DPID provided. Creation of OF-Port not supported.",
+ iface.getName());
+ return Collections.emptyList();
+ }
+
+ LOG.info("adding tunnel configuration for {}", iface.getName());
+ LOG.debug("creating bridge interfaceEntry in ConfigDS {}", dpId);
+ DirectTunnelUtils.createBridgeTunnelEntryInConfigDS(dpId, iface.getName());
+
+ // create bridge on switch, if switch is connected
+ Optional<OvsBridgeRefEntry> ovsBridgeRefEntry = ovsBridgeRefEntryCache.get(dpId);
+
+ if (ovsBridgeRefEntry.isPresent()) {
+ LOG.debug("creating bridge interface on dpn {}", dpId);
+ InstanceIdentifier<OvsdbBridgeAugmentation> bridgeIid =
+ (InstanceIdentifier<OvsdbBridgeAugmentation>) ovsBridgeRefEntry.get()
+ .getOvsBridgeReference().getValue();
+ addPortToBridge(bridgeIid, iface, iface.getName());
+ }
+ return Collections.singletonList(transaction.submit());
+ }
+
+ private void addPortToBridge(InstanceIdentifier<?> bridgeIid, Interface iface, String portName) {
+ IfTunnel ifTunnel = iface.getAugmentation(IfTunnel.class);
+ if (ifTunnel != null) {
+ directTunnelUtils.addTunnelPortToBridge(ifTunnel, bridgeIid, iface, portName);
}
}
}
Code Review / genius.git / blobdiff