*/
package org.opendaylight.netvirt.elan.utils;
-import com.google.common.base.Optional;
+import static org.opendaylight.mdsal.binding.util.Datastore.CONFIGURATION;
+import static org.opendaylight.mdsal.binding.util.Datastore.OPERATIONAL;
+
import com.google.common.util.concurrent.ListenableFuture;
import java.util.ArrayList;
import java.util.List;
+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.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
-import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;
import org.opendaylight.genius.interfacemanager.globals.InterfaceInfo;
-import org.opendaylight.infrautils.utils.concurrent.ListenableFutures;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.PhysAddress;
+import org.opendaylight.infrautils.utils.concurrent.LoggingFutures;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.util.Datastore.Operational;
+import org.opendaylight.mdsal.binding.util.ManagedNewTransactionRunner;
+import org.opendaylight.mdsal.binding.util.ManagedNewTransactionRunnerImpl;
+import org.opendaylight.mdsal.binding.util.TypedReadWriteTransaction;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.instances.ElanInstance;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.interfaces.elan._interface.StaticMacEntries;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.forwarding.entries.MacEntry;
private static final Logger LOG = LoggerFactory.getLogger(ElanForwardingEntriesHandler.class);
- private final DataBroker broker;
private final ManagedNewTransactionRunner txRunner;
private final ElanUtils elanUtils;
@Inject
public ElanForwardingEntriesHandler(DataBroker dataBroker, ElanUtils elanUtils) {
- this.broker = dataBroker;
this.txRunner = new ManagedNewTransactionRunnerImpl(dataBroker);
this.elanUtils = elanUtils;
}
public void updateElanInterfaceForwardingTablesList(String elanInstanceName, String interfaceName,
- String existingInterfaceName, MacEntry mac, WriteTransaction tx) {
+ String existingInterfaceName, MacEntry mac, TypedReadWriteTransaction<Operational> tx)
+ throws ExecutionException, InterruptedException {
if (existingInterfaceName.equals(interfaceName)) {
- LOG.error(String.format(
- "Static MAC address %s has already been added for the same ElanInstance "
- + "%s on the same Logical Interface Port %s."
+ LOG.error("Static MAC address {} has already been added for the same ElanInstance "
+ + "{} on the same Logical Interface Port {}."
+ " No operation will be done.",
- mac.getMacAddress().toString(), elanInstanceName, interfaceName));
+ mac.getMacAddress().toString(), elanInstanceName, interfaceName);
} else {
- LOG.warn(String.format(
- "Static MAC address %s had already been added for ElanInstance %s on Logical Interface Port %s. "
+ LOG.warn("Static MAC address {} had already been added for ElanInstance {} on Logical Interface Port {}. "
+ "This would be considered as MAC movement scenario and old static mac will be removed "
+ "and new static MAC will be added"
- + "for ElanInstance %s on Logical Interface Port %s",
- mac.getMacAddress().toString(), elanInstanceName, interfaceName, elanInstanceName, interfaceName));
+ + "for ElanInstance {} on Logical Interface Port {}",
+ mac.getMacAddress().toString(), elanInstanceName, interfaceName, elanInstanceName, interfaceName);
//Update the ElanInterface Forwarding Container & ElanForwarding Container
deleteElanInterfaceForwardingTablesList(existingInterfaceName, mac, tx);
createElanInterfaceForwardingTablesList(interfaceName, mac, tx);
}
public void addElanInterfaceForwardingTableList(String elanInstanceName, String interfaceName,
- StaticMacEntries staticMacEntries, WriteTransaction tx) {
+ StaticMacEntries staticMacEntries, TypedReadWriteTransaction<Operational> tx)
+ throws ExecutionException, InterruptedException {
MacEntry macEntry = new MacEntryBuilder().setIsStaticAddress(true)
.setMacAddress(staticMacEntries.getMacAddress())
.setIpPrefix(staticMacEntries.getIpPrefix())
- .setInterface(interfaceName).setKey(new MacEntryKey(staticMacEntries.getMacAddress())).build();
+ .setInterface(interfaceName).withKey(new MacEntryKey(staticMacEntries.getMacAddress())).build();
createElanForwardingTablesList(elanInstanceName, macEntry, tx);
createElanInterfaceForwardingTablesList(interfaceName, macEntry, tx);
}
- public void deleteElanInterfaceForwardingTablesList(String interfaceName, MacEntry mac, WriteTransaction tx) {
+ public void deleteElanInterfaceForwardingTablesList(String interfaceName, MacEntry mac,
+ TypedReadWriteTransaction<Operational> interfaceTx)
+ throws ExecutionException, InterruptedException {
InstanceIdentifier<MacEntry> existingMacEntryId = ElanUtils
.getInterfaceMacEntriesIdentifierOperationalDataPath(interfaceName, mac.getMacAddress());
MacEntry existingInterfaceMacEntry = elanUtils
- .getInterfaceMacEntriesOperationalDataPathFromId(existingMacEntryId);
+ .getInterfaceMacEntriesOperationalDataPathFromId(interfaceTx, existingMacEntryId);
if (existingInterfaceMacEntry != null) {
- tx.delete(LogicalDatastoreType.OPERATIONAL, existingMacEntryId);
+ interfaceTx.delete(existingMacEntryId);
}
}
- public void createElanInterfaceForwardingTablesList(String interfaceName, MacEntry mac, WriteTransaction tx) {
+ public void createElanInterfaceForwardingTablesList(String interfaceName, MacEntry mac,
+ TypedReadWriteTransaction<Operational> tx) throws ExecutionException, InterruptedException {
InstanceIdentifier<MacEntry> existingMacEntryId = ElanUtils
.getInterfaceMacEntriesIdentifierOperationalDataPath(interfaceName, mac.getMacAddress());
MacEntry existingInterfaceMacEntry = elanUtils
- .getInterfaceMacEntriesOperationalDataPathFromId(existingMacEntryId);
+ .getInterfaceMacEntriesOperationalDataPathFromId(tx, existingMacEntryId);
if (existingInterfaceMacEntry == null) {
MacEntry macEntry = new MacEntryBuilder().setMacAddress(mac.getMacAddress()).setIpPrefix(mac.getIpPrefix())
.setInterface(interfaceName)
- .setIsStaticAddress(true).setKey(new MacEntryKey(mac.getMacAddress())).build();
- tx.put(LogicalDatastoreType.OPERATIONAL, existingMacEntryId, macEntry,
- WriteTransaction.CREATE_MISSING_PARENTS);
+ .setIsStaticAddress(true).withKey(new MacEntryKey(mac.getMacAddress())).build();
+ tx.mergeParentStructurePut(existingMacEntryId, macEntry);
}
}
public void updateElanForwardingTablesList(String elanName, String interfaceName, MacEntry mac,
- WriteTransaction tx) {
+ TypedReadWriteTransaction<Operational> tx) throws ExecutionException, InterruptedException {
InstanceIdentifier<MacEntry> macEntryId = ElanUtils.getMacEntryOperationalDataPath(elanName,
mac.getMacAddress());
- MacEntry existingMacEntry = elanUtils.getMacEntryFromElanMacId(macEntryId);
+ MacEntry existingMacEntry = elanUtils.getMacEntryFromElanMacId(tx, macEntryId);
if (existingMacEntry != null && elanUtils.getElanMacTable(elanName) != null) {
MacEntry newMacEntry = new MacEntryBuilder().setInterface(interfaceName).setIsStaticAddress(true)
.setMacAddress(mac.getMacAddress()).setIpPrefix(mac.getIpPrefix())
- .setKey(new MacEntryKey(mac.getMacAddress())).build();
- tx.put(LogicalDatastoreType.OPERATIONAL, macEntryId, newMacEntry);
+ .withKey(new MacEntryKey(mac.getMacAddress())).build();
+ tx.put(macEntryId, newMacEntry);
}
}
- private void createElanForwardingTablesList(String elanName, MacEntry macEntry, WriteTransaction tx) {
+ private void createElanForwardingTablesList(String elanName, MacEntry macEntry,
+ TypedReadWriteTransaction<Operational> tx) throws ExecutionException, InterruptedException {
InstanceIdentifier<MacEntry> macEntryId = ElanUtils.getMacEntryOperationalDataPath(elanName,
macEntry.getMacAddress());
- Optional<MacEntry> existingMacEntry = ElanUtils.read(broker, LogicalDatastoreType.OPERATIONAL, macEntryId);
+ Optional<MacEntry> existingMacEntry = tx.read(macEntryId).get();
if (!existingMacEntry.isPresent() && elanUtils.getElanMacTable(elanName) != null) {
- tx.put(LogicalDatastoreType.OPERATIONAL, macEntryId, macEntry, WriteTransaction.CREATE_MISSING_PARENTS);
+ tx.mergeParentStructurePut(macEntryId, macEntry);
}
}
public void deleteElanInterfaceForwardingEntries(ElanInstance elanInfo, InterfaceInfo interfaceInfo,
MacEntry macEntry) {
- List<ListenableFuture<Void>> futures = new ArrayList<>();
- futures.add(txRunner.callWithNewWriteOnlyTransactionAndSubmit(interfaceTx -> {
+ List<ListenableFuture<?>> futures = new ArrayList<>();
+ futures.add(txRunner.callWithNewReadWriteTransactionAndSubmit(OPERATIONAL, interfaceTx -> {
InstanceIdentifier<MacEntry> macEntryId = ElanUtils
.getMacEntryOperationalDataPath(elanInfo.getElanInstanceName(), macEntry.getMacAddress());
- interfaceTx.delete(LogicalDatastoreType.OPERATIONAL, macEntryId);
+ interfaceTx.delete(macEntryId);
deleteElanInterfaceForwardingTablesList(interfaceInfo.getInterfaceName(), macEntry, interfaceTx);
- futures.add(txRunner.callWithNewWriteOnlyTransactionAndSubmit(flowTx -> {
- elanUtils.deleteMacFlows(elanInfo, interfaceInfo, macEntry, flowTx);
- }));
+ futures.add(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION,
+ flowTx -> elanUtils.deleteMacFlows(elanInfo, interfaceInfo, macEntry, flowTx)));
}));
- for (ListenableFuture<Void> future : futures) {
- ListenableFutures.addErrorLogging(future, LOG, "Error deleting ELAN interface forwarding entries");
+ for (ListenableFuture<?> future : futures) {
+ LoggingFutures.addErrorLogging(future, LOG, "Error deleting ELAN interface forwarding entries");
}
}
-
- public void deleteElanInterfaceMacForwardingEntries(String interfaceName, PhysAddress physAddress,
- WriteTransaction tx) {
- InstanceIdentifier<MacEntry> macEntryId = ElanUtils
- .getInterfaceMacEntriesIdentifierOperationalDataPath(interfaceName, physAddress);
- tx.delete(LogicalDatastoreType.OPERATIONAL, macEntryId);
- }
-
-
}
Code Review / netvirt.git / blobdiff