* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.netvirt.elan.utils;
-
-
import com.google.common.base.Optional;
+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.interfacemanager.globals.InterfaceInfo;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.PhysAddress;
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;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.forwarding.entries.MacEntryBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.forwarding.entries.MacEntryKey;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
+@Singleton
public class ElanForwardingEntriesHandler {
private static final Logger LOG = LoggerFactory.getLogger(ElanForwardingEntriesHandler.class);
private final DataBroker broker;
private ElanUtils elanUtils;
+ @Inject
public ElanForwardingEntriesHandler(DataBroker dataBroker) {
this.broker = dataBroker;
}
}
public void addElanInterfaceForwardingTableList(ElanInstance elanInstance, String interfaceName,
- PhysAddress physAddress, WriteTransaction tx) {
- MacEntry macEntry = new MacEntryBuilder().setIsStaticAddress(true).setMacAddress(physAddress)
- .setInterface(interfaceName).setKey(new MacEntryKey(physAddress)).build();
+ StaticMacEntries staticMacEntries, WriteTransaction tx) {
+ MacEntry macEntry = new MacEntryBuilder().setIsStaticAddress(true)
+ .setMacAddress(staticMacEntries.getMacAddress())
+ .setIpPrefix(staticMacEntries.getIpPrefix())
+ .setInterface(interfaceName).setKey(new MacEntryKey(staticMacEntries.getMacAddress())).build();
+
createElanForwardingTablesList(elanInstance.getElanInstanceName(), macEntry, tx);
createElanInterfaceForwardingTablesList(interfaceName, macEntry, tx);
}
MacEntry existingInterfaceMacEntry = elanUtils
.getInterfaceMacEntriesOperationalDataPathFromId(existingMacEntryId);
if (existingInterfaceMacEntry == null) {
- MacEntry macEntry = new MacEntryBuilder().setMacAddress(mac.getMacAddress()).setInterface(interfaceName)
+ 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);
-
+ tx.put(LogicalDatastoreType.OPERATIONAL, existingMacEntryId, macEntry,
+ WriteTransaction.CREATE_MISSING_PARENTS);
}
}
MacEntry existingMacEntry = elanUtils.getMacEntryFromElanMacId(macEntryId);
if (existingMacEntry != null && elanUtils.getElanMacTable(elanName) != null) {
MacEntry newMacEntry = new MacEntryBuilder().setInterface(interfaceName).setIsStaticAddress(true)
- .setMacAddress(mac.getMacAddress()).setKey(new MacEntryKey(mac.getMacAddress())).build();
+ .setMacAddress(mac.getMacAddress()).setIpPrefix(mac.getIpPrefix())
+ .setKey(new MacEntryKey(mac.getMacAddress())).build();
tx.put(LogicalDatastoreType.OPERATIONAL, macEntryId, newMacEntry);
}
}
private void createElanForwardingTablesList(String elanName, MacEntry macEntry, WriteTransaction tx) {
InstanceIdentifier<MacEntry> macEntryId = ElanUtils.getMacEntryOperationalDataPath(elanName,
macEntry.getMacAddress());
- Optional<MacEntry> existingMacEntry = elanUtils.read(broker, LogicalDatastoreType.OPERATIONAL, macEntryId);
+ Optional<MacEntry> existingMacEntry = ElanUtils.read(broker, LogicalDatastoreType.OPERATIONAL, macEntryId);
if (!existingMacEntry.isPresent() && elanUtils.getElanMacTable(elanName) != null) {
- tx.put(LogicalDatastoreType.OPERATIONAL, macEntryId, macEntry);
+ tx.put(LogicalDatastoreType.OPERATIONAL, macEntryId, macEntry, WriteTransaction.CREATE_MISSING_PARENTS);
}
}