package org.opendaylight.netvirt.elan.internal;
import com.google.common.base.Optional;
+
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Collection;
import java.util.concurrent.Future;
import java.util.function.BiFunction;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.common.api.clustering.CandidateAlreadyRegisteredException;
import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.genius.interfacemanager.exceptions.InterfaceAlreadyExistsException;
import org.opendaylight.genius.interfacemanager.globals.IfmConstants;
import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
import org.opendaylight.genius.mdsalutil.MDSALUtil;
-import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager;
-import org.opendaylight.netvirt.elan.l2gw.utils.ElanL2GatewayMulticastUtils;
-import org.opendaylight.netvirt.elan.l2gw.utils.ElanL2GatewayUtils;
-import org.opendaylight.netvirt.elan.l2gw.utils.L2GatewayConnectionUtils;
+import org.opendaylight.genius.mdsalutil.NwConstants;
+import org.opendaylight.genius.utils.ServiceIndex;
+import org.opendaylight.genius.utils.clustering.EntityOwnerUtils;
+import org.opendaylight.genius.utils.hwvtep.HwvtepSouthboundConstants;
import org.opendaylight.netvirt.elan.statusanddiag.ElanStatusMonitor;
import org.opendaylight.netvirt.elan.utils.ElanConstants;
-import org.opendaylight.netvirt.elan.utils.ElanForwardingEntriesHandler;
import org.opendaylight.netvirt.elan.utils.ElanUtils;
import org.opendaylight.netvirt.elanmanager.api.IElanService;
import org.opendaylight.netvirt.elanmanager.exceptions.MacNotFoundException;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.CreateIdPoolInputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfL2vlan;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.OdlInterfaceRpcService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rpcs.rev160406.ItmRpcService;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.etree.rev160614.EtreeInstance;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.etree.rev160614.EtreeInstanceBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.etree.rev160614.EtreeInterface;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.ElanInstances;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.ElanInterfaces;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan._interface.forwarding.entries.ElanInterfaceMac;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.dpn.interfaces.elan.dpn.interfaces.list.DpnInterfaces;
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.instances.ElanInstanceBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.instances.ElanInstanceKey;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
public class ElanServiceProvider implements IElanService {
- private static final Logger logger = LoggerFactory.getLogger(ElanServiceProvider.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ElanServiceProvider.class);
private final IdManagerService idManager;
private final IInterfaceManager interfaceManager;
private final ElanBridgeManager bridgeMgr;
private final DataBroker broker;
private final ElanStatusMonitor elanStatusMonitor;
- private static ElanUtils elanUtils;
+ private final ElanUtils elanUtils;
private boolean generateIntBridgeMac = true;
+ private boolean isL2BeforeL3;
public ElanServiceProvider(IdManagerService idManager, IInterfaceManager interfaceManager,
ElanInstanceManager elanInstanceManager, ElanBridgeManager bridgeMgr,
DataBroker dataBroker,
ElanInterfaceManager elanInterfaceManager,
- ElanStatusMonitor elanStatusMonitor, ElanUtils elanUtils) {
+ ElanStatusMonitor elanStatusMonitor, ElanUtils elanUtils,
+ EntityOwnershipService entityOwnershipService) {
this.idManager = idManager;
this.interfaceManager = interfaceManager;
this.elanInstanceManager = elanInstanceManager;
this.broker = dataBroker;
this.elanStatusMonitor = elanStatusMonitor;
this.elanUtils = elanUtils;
- elanInstanceManager.setElanUtils(elanUtils);
elanInterfaceManager.setElanUtils(elanUtils);
+ try {
+ EntityOwnerUtils.registerEntityCandidateForOwnerShip(entityOwnershipService,
+ HwvtepSouthboundConstants.ELAN_ENTITY_TYPE, HwvtepSouthboundConstants.ELAN_ENTITY_TYPE,
+ null/*listener*/);
+ } catch (CandidateAlreadyRegisteredException e) {
+ LOG.error("failed to register the entity");
+ }
}
- public static ElanUtils getElanutils() {
- return ElanServiceProvider.elanUtils;
- }
-
- public void init() {
- logger.info("Starting ElnaServiceProvider");
+ @SuppressWarnings("checkstyle:IllegalCatch")
+ public void init() throws Exception {
+ LOG.info("Starting ElnaServiceProvider");
elanStatusMonitor.reportStatus("STARTING");
+ setIsL2BeforeL3();
try {
createIdPool();
-
elanStatusMonitor.reportStatus("OPERATIONAL");
} catch (Exception e) {
- logger.error("Error initializing services", e);
elanStatusMonitor.reportStatus("ERROR");
+ throw e;
}
}
- private void createIdPool() {
+ private void createIdPool() throws Exception {
CreateIdPoolInput createPool = new CreateIdPoolInputBuilder().setPoolName(ElanConstants.ELAN_ID_POOL_NAME)
.setLow(ElanConstants.ELAN_ID_LOW_VALUE).setHigh(ElanConstants.ELAN_ID_HIGH_VALUE).build();
- try {
- Future<RpcResult<Void>> result = idManager.createIdPool(createPool);
- if ((result != null) && (result.get().isSuccessful())) {
- logger.debug("ELAN Id Pool is created successfully");
- }
- } catch (Exception e) {
- logger.error("Failed to create ELAN Id pool {}", e);
+ Future<RpcResult<Void>> result = idManager.createIdPool(createPool);
+ if (result != null && result.get().isSuccessful()) {
+ LOG.debug("ELAN Id Pool is created successfully");
}
}
boolean isSuccess = true;
if (existingElanInstance != null) {
if (compareWithExistingElanInstance(existingElanInstance, macTimeout, description)) {
- logger.debug("Elan Instance is already present in the Operational DS {}", existingElanInstance);
+ LOG.debug("Elan Instance is already present in the Operational DS {}", existingElanInstance);
return true;
} else {
ElanInstance updateElanInstance = new ElanInstanceBuilder().setElanInstanceName(elanInstanceName)
.setKey(new ElanInstanceKey(elanInstanceName)).build();
MDSALUtil.syncWrite(broker, LogicalDatastoreType.CONFIGURATION,
ElanUtils.getElanInstanceConfigurationDataPath(elanInstanceName), updateElanInstance);
- logger.debug("Updating the Elan Instance {} with MAC TIME-OUT %l and Description %s ",
+ LOG.debug("Updating the Elan Instance {} with MAC TIME-OUT %l and Description %s ",
updateElanInstance, macTimeout, description);
}
} else {
.build();
MDSALUtil.syncWrite(broker, LogicalDatastoreType.CONFIGURATION,
ElanUtils.getElanInstanceConfigurationDataPath(elanInstanceName), elanInstance);
- logger.debug("Creating the new Elan Instance {}", elanInstance);
+ LOG.debug("Creating the new Elan Instance {}", elanInstance);
}
return isSuccess;
}
boolean isSuccess = true;
if (existingElanInstance != null) {
if (compareWithExistingElanInstance(existingElanInstance, macTimeout, description)) {
- logger.warn("Etree Instance is already present in the Operational DS {}", existingElanInstance);
+ LOG.warn("Etree Instance is already present in the Operational DS {}", existingElanInstance);
return true;
} else {
EtreeInstance etreeInstance = new EtreeInstanceBuilder().build();
.addAugmentation(EtreeInstance.class, etreeInstance).build();
MDSALUtil.syncWrite(broker, LogicalDatastoreType.CONFIGURATION,
ElanUtils.getElanInstanceConfigurationDataPath(elanInstanceName), updateElanInstance);
- logger.debug("Updating the Etree Instance {} with MAC TIME-OUT %l and Description %s ",
+ LOG.debug("Updating the Etree Instance {} with MAC TIME-OUT %l and Description %s ",
updateElanInstance, macTimeout, description);
}
} else {
.addAugmentation(EtreeInstance.class, etreeInstance).build();
MDSALUtil.syncWrite(broker, LogicalDatastoreType.CONFIGURATION,
ElanUtils.getElanInstanceConfigurationDataPath(elanInstanceName), elanInstance);
- logger.debug("Creating the new Etree Instance {}", elanInstance);
+ LOG.debug("Creating the new Etree Instance {}", elanInstance);
}
return isSuccess;
}
+ @Override
+ public EtreeInterface getEtreeInterfaceByElanInterfaceName(String elanInterface) {
+ return ElanUtils.getEtreeInterfaceByElanInterfaceName(broker, elanInterface);
+ }
+
public static boolean compareWithExistingElanInstance(ElanInstance existingElanInstance, long macTimeOut,
String description) {
boolean isEqual = false;
boolean isSuccess = false;
ElanInstance existingElanInstance = elanInstanceManager.getElanInstanceByName(elanInstanceName);
if (existingElanInstance == null) {
- logger.debug("Elan Instance is not present {}", existingElanInstance);
+ LOG.debug("Elan Instance is not present {}", existingElanInstance);
return isSuccess;
}
- logger.debug("Deletion of the existing Elan Instance {}", existingElanInstance);
+ LOG.debug("Deletion of the existing Elan Instance {}", existingElanInstance);
ElanUtils.delete(broker, LogicalDatastoreType.CONFIGURATION,
ElanUtils.getElanInstanceConfigurationDataPath(elanInstanceName));
isSuccess = true;
}
MDSALUtil.syncWrite(broker, LogicalDatastoreType.CONFIGURATION,
ElanUtils.getElanInterfaceConfigurationDataPathId(interfaceName), elanInterface);
- logger.debug("Creating the new Etree Interface {}", elanInterface);
+ LOG.debug("Creating the new Etree Interface {}", elanInterface);
}
}
}
MDSALUtil.syncWrite(broker, LogicalDatastoreType.CONFIGURATION,
ElanUtils.getElanInterfaceConfigurationDataPathId(interfaceName), elanInterface);
- logger.debug("Creating the new ELan Interface {}", elanInterface);
+ LOG.debug("Creating the new ELan Interface {}", elanInterface);
}
}
@Override
public void updateElanInterface(String elanInstanceName, String interfaceName,
List<String> updatedStaticMacAddresses, String newDescription) {
- ElanInterface existingElanInterface = elanUtils.getElanInterfaceByElanInterfaceName(interfaceName);
+ ElanInterface existingElanInterface = ElanUtils.getElanInterfaceByElanInterfaceName(broker, interfaceName);
if (existingElanInterface == null) {
return;
}
List<PhysAddress> updatedMacAddresses = getPhysAddress(updatedStaticMacAddresses);
List<PhysAddress> updatedPhysAddress = getUpdatedPhyAddress(existingMacAddress, updatedMacAddresses);
if (updatedPhysAddress.size() > 0) {
- logger.debug("updating the ElanInterface with new Mac Entries {}", updatedStaticMacAddresses);
+ LOG.debug("updating the ElanInterface with new Mac Entries {}", updatedStaticMacAddresses);
ElanInterface elanInterface = new ElanInterfaceBuilder().setElanInstanceName(elanInstanceName)
.setName(interfaceName).setDescription(newDescription).setStaticMacEntries(updatedPhysAddress)
.setKey(new ElanInterfaceKey(interfaceName)).build();
@Override
public void deleteEtreeInterface(String elanInstanceName, String interfaceName) {
deleteElanInterface(elanInstanceName, interfaceName);
- logger.debug("deleting the Etree Interface {}", interfaceName);
+ LOG.debug("deleting the Etree Interface {}", interfaceName);
}
@Override
public void deleteElanInterface(String elanInstanceName, String interfaceName) {
- ElanInterface existingElanInterface = elanUtils.getElanInterfaceByElanInterfaceName(interfaceName);
+ ElanInterface existingElanInterface = ElanUtils.getElanInterfaceByElanInterfaceName(broker, interfaceName);
if (existingElanInterface != null) {
ElanUtils.delete(broker, LogicalDatastoreType.CONFIGURATION,
ElanUtils.getElanInterfaceConfigurationDataPathId(interfaceName));
- logger.debug("deleting the Elan Interface {}", existingElanInterface);
+ LOG.debug("deleting the Elan Interface {}", existingElanInterface);
}
}
@Override
public void addStaticMacAddress(String elanInstanceName, String interfaceName, String macAddress) {
- ElanInterface existingElanInterface = elanUtils.getElanInterfaceByElanInterfaceName(interfaceName);
+ ElanInterface existingElanInterface = ElanUtils.getElanInterfaceByElanInterfaceName(broker, interfaceName);
PhysAddress updateStaticMacAddress = new PhysAddress(macAddress);
if (existingElanInterface != null) {
List<PhysAddress> existingMacAddress = existingElanInterface.getStaticMacEntries();
@Override
public void deleteStaticMacAddress(String elanInstanceName, String interfaceName, String macAddress)
throws MacNotFoundException {
- ElanInterface existingElanInterface = elanUtils.getElanInterfaceByElanInterfaceName(interfaceName);
+ ElanInterface existingElanInterface = ElanUtils.getElanInterfaceByElanInterfaceName(broker, interfaceName);
PhysAddress physAddress = new PhysAddress(macAddress);
if (existingElanInterface == null) {
return;
MDSALUtil.syncWrite(broker, LogicalDatastoreType.CONFIGURATION,
ElanUtils.getElanInterfaceConfigurationDataPathId(interfaceName), elanInterface);
} else {
- throw new MacNotFoundException("Mac Not Found Exception");
+ throw new MacNotFoundException("deleteStaticMacAddress did not find MAC: " + macAddress);
}
}
@Override
public Collection<MacEntry> getElanMacTable(String elanInstanceName) {
- Elan elanInfo = elanUtils.getElanByName(elanInstanceName);
+ Elan elanInfo = ElanUtils.getElanByName(broker, elanInstanceName);
List<MacEntry> macAddress = new ArrayList<>();
if (elanInfo == null) {
return macAddress;
@Override
public void flushMACTable(String elanInstanceName) {
- Elan elanInfo = elanUtils.getElanByName(elanInstanceName);
+ Elan elanInfo = ElanUtils.getElanByName(broker, elanInstanceName);
if (elanInfo == null) {
return;
}
try {
deleteStaticMacAddress(elanInstanceName, elanInterface, macEntry.getMacAddress().getValue());
} catch (MacNotFoundException e) {
- logger.error("Mac Not Found Exception {}", e);
- e.printStackTrace();
+ LOG.error("Mac Not Found Exception {}", e);
}
}
}
@Override
public ElanInstance getElanInstance(String elanName) {
- return elanUtils.getElanInstanceByName(elanName);
+ return ElanUtils.getElanInstanceByName(broker, elanName);
}
@Override
public List<ElanInstance> getElanInstances() {
- List<ElanInstance> elanList = new ArrayList<>();
InstanceIdentifier<ElanInstances> elanInstancesIdentifier = InstanceIdentifier.builder(ElanInstances.class)
.build();
- Optional<ElanInstances> elansOptional = elanUtils.read(broker, LogicalDatastoreType.CONFIGURATION,
- elanInstancesIdentifier);
- if (elansOptional.isPresent()) {
- elanList.addAll(elansOptional.get().getElanInstance());
- }
- return elanList;
+ return elanUtils.read(broker, LogicalDatastoreType.CONFIGURATION, elanInstancesIdentifier).transform(
+ ElanInstances::getElanInstance).or(Collections.emptyList());
}
@Override
@Override
public void createExternalElanNetworks(Node node) {
- handleExternalElanNetworks(node, new BiFunction<ElanInstance, String, Void>() {
-
- @Override
- public Void apply(ElanInstance elanInstance, String interfaceName) {
- createExternalElanNetwork(elanInstance, interfaceName);
- return null;
- }
+ handleExternalElanNetworks(node, (elanInstance, interfaceName) -> {
+ createExternalElanNetwork(elanInstance, interfaceName);
+ return null;
});
}
@Override
public void createExternalElanNetwork(ElanInstance elanInstance) {
- handleExternalElanNetwork(elanInstance, new BiFunction<ElanInstance, String, Void>() {
+ handleExternalElanNetwork(elanInstance, (elanInstance1, interfaceName) -> {
+ createExternalElanNetwork(elanInstance1, interfaceName);
+ return null;
+ });
+ }
- @Override
- public Void apply(ElanInstance elanInstance, String interfaceName) {
- createExternalElanNetwork(elanInstance, interfaceName);
- return null;
- }
+ private void createExternalElanNetwork(ElanInstance elanInstance, String interfaceName) {
+ if (interfaceName == null) {
+ LOG.trace("No physical interface is attached to {}", elanInstance.getPhysicalNetworkName());
+ return;
+ }
- });
+ String elanInterfaceName = createIetfInterfaces(elanInstance, interfaceName);
+ addElanInterface(elanInstance.getElanInstanceName(), elanInterfaceName, null, null);
}
@Override
public void deleteExternalElanNetworks(Node node) {
- handleExternalElanNetworks(node, new BiFunction<ElanInstance, String, Void>() {
-
- @Override
- public Void apply(ElanInstance elanInstance, String interfaceName) {
- deleteExternalElanNetwork(elanInstance, interfaceName);
- return null;
- }
+ handleExternalElanNetworks(node, (elanInstance, interfaceName) -> {
+ deleteExternalElanNetwork(elanInstance, interfaceName);
+ return null;
});
}
@Override
public void deleteExternalElanNetwork(ElanInstance elanInstance) {
- handleExternalElanNetwork(elanInstance, new BiFunction<ElanInstance, String, Void>() {
+ handleExternalElanNetwork(elanInstance, (elanInstance1, interfaceName) -> {
+ deleteExternalElanNetwork(elanInstance1, interfaceName);
+ return null;
+ });
+ }
- @Override
- public Void apply(ElanInstance elanInstance, String interfaceName) {
- deleteExternalElanNetwork(elanInstance, interfaceName);
- return null;
- }
+ private void deleteExternalElanNetwork(ElanInstance elanInstance, String interfaceName) {
+ if (interfaceName == null) {
+ LOG.trace("No physial interface is attached to {}", elanInstance.getPhysicalNetworkName());
+ return;
+ }
- });
+ String elanInstanceName = elanInstance.getElanInstanceName();
+ for (String elanInterface : getExternalElanInterfaces(elanInstanceName)) {
+ if (elanInterface.startsWith(interfaceName)) {
+ deleteIetfInterface(elanInterface);
+ deleteElanInterface(elanInstanceName, elanInterface);
+ }
+ }
}
@Override
List<ElanInstance> elanInstances = getElanInstances();
if (elanInstances == null || elanInstances.isEmpty()) {
- logger.trace("No ELAN instances found");
+ LOG.trace("No ELAN instances found");
return;
}
- Optional<Map<String, String>> origProviderMapOpt = bridgeMgr.getOpenvswitchOtherConfigMap(origNode,
+ LOG.debug("updateExternalElanNetworks, orig bridge {} . updated bridge {}", origNode, updatedNode);
+
+ Map<String, String> origProviderMappping = getMapFromOtherConfig(origNode,
ElanBridgeManager.PROVIDER_MAPPINGS_KEY);
- Optional<Map<String, String>> updatedProviderMapOpt = bridgeMgr.getOpenvswitchOtherConfigMap(updatedNode,
+ Map<String, String> updatedProviderMappping = getMapFromOtherConfig(updatedNode,
ElanBridgeManager.PROVIDER_MAPPINGS_KEY);
- Map<String, String> origProviderMappping = origProviderMapOpt.or(Collections.emptyMap());
- Map<String, String> updatedProviderMappping = updatedProviderMapOpt.or(Collections.emptyMap());
+
+ boolean hasDatapathIdOnOrigNode = bridgeMgr.hasDatapathID(origNode);
+ boolean hasDatapathIdOnUpdatedNode = bridgeMgr.hasDatapathID(updatedNode);
for (ElanInstance elanInstance : elanInstances) {
String physicalNetworkName = elanInstance.getPhysicalNetworkName();
if (physicalNetworkName != null) {
String origPortName = origProviderMappping.get(physicalNetworkName);
String updatedPortName = updatedProviderMappping.get(physicalNetworkName);
- if (origPortName != null && !origPortName.equals(updatedPortName)) {
- deleteExternalElanNetwork(elanInstance, getExtInterfaceName(origNode, physicalNetworkName));
+ if (hasPortNameRemoved(origPortName, updatedPortName)) {
+ deleteExternalElanNetwork(elanInstance,
+ bridgeMgr.getProviderInterfaceName(origNode, physicalNetworkName));
}
- if (updatedPortName != null && !updatedPortName.equals(origPortName)) {
- createExternalElanNetwork(elanInstance, getExtInterfaceName(updatedNode, updatedPortName));
+ if (hasPortNameUpdated(origPortName, updatedPortName)
+ || hasDatapathIdAdded(hasDatapathIdOnOrigNode, hasDatapathIdOnUpdatedNode)) {
+ createExternalElanNetwork(elanInstance,
+ bridgeMgr.getProviderInterfaceName(updatedNode, physicalNetworkName));
}
}
}
}
- private void createExternalElanNetwork(ElanInstance elanInstance, String interfaceName) {
- if (interfaceName == null) {
- logger.trace("No physial interface is attached to {}", elanInstance.getPhysicalNetworkName());
- return;
- }
-
- String elanInterfaceName = createIetfInterfaces(elanInstance, interfaceName);
- addElanInterface(elanInstance.getElanInstanceName(), elanInterfaceName, null, null);
+ private boolean hasDatapathIdAdded(boolean hasDatapathIdOnOrigNode, boolean hasDatapathIdOnUpdatedNode) {
+ return !hasDatapathIdOnOrigNode && hasDatapathIdOnUpdatedNode;
}
- private void deleteExternalElanNetwork(ElanInstance elanInstance, String interfaceName) {
- if (interfaceName == null) {
- logger.trace("No physial interface is attached to {}", elanInstance.getPhysicalNetworkName());
- return;
- }
-
- String elanInstanceName = elanInstance.getElanInstanceName();
- for (String elanInterface : getExternalElanInterfaces(elanInstanceName)) {
- if (elanInterface.startsWith(interfaceName)) {
- deleteIetfInterface(elanInterface);
- deleteElanInterface(elanInstanceName, elanInterface);
- }
- }
+ private boolean hasPortNameUpdated(String origPortName, String updatedPortName) {
+ return updatedPortName != null && !updatedPortName.equals(origPortName);
}
- @Override
- public String getExternalElanInterface(String elanInstanceName, BigInteger dpnId) {
- DpnInterfaces dpnInterfaces = elanUtils.getElanInterfaceInfoByElanDpn(elanInstanceName, dpnId);
- if (dpnInterfaces == null || dpnInterfaces.getInterfaces() == null) {
- logger.trace("Elan {} does not have interfaces in DPN {}", elanInstanceName, dpnId);
- return null;
- }
-
- for (String dpnInterface : dpnInterfaces.getInterfaces()) {
- if (elanUtils.isExternal(dpnInterface)) {
- return dpnInterface;
- }
- }
+ private boolean hasPortNameRemoved(String origPortName, String updatedPortName) {
+ return origPortName != null && !origPortName.equals(updatedPortName);
+ }
- logger.trace("Elan {} does not have any external interace attached to DPN {}", elanInstanceName, dpnId);
- return null;
+ private Map<String, String> getMapFromOtherConfig(Node node, String otherConfigColumn) {
+ return bridgeMgr.getOpenvswitchOtherConfigMap(node, otherConfigColumn);
}
@Override
public Collection<String> getExternalElanInterfaces(String elanInstanceName) {
List<String> elanInterfaces = getElanInterfaces(elanInstanceName);
if (elanInterfaces == null || elanInterfaces.isEmpty()) {
- logger.trace("No ELAN interfaces defined for {}", elanInstanceName);
+ LOG.trace("No ELAN interfaces defined for {}", elanInstanceName);
return Collections.emptySet();
}
Set<String> externalElanInterfaces = new HashSet<>();
for (String elanInterface : elanInterfaces) {
- if (elanUtils.isExternal(elanInterface)) {
+ if (interfaceManager.isExternalInterface(elanInterface)) {
externalElanInterfaces.add(elanInterface);
}
}
return externalElanInterfaces;
}
+ @Override
+ public String getExternalElanInterface(String elanInstanceName, BigInteger dpnId) {
+ return elanUtils.getExternalElanInterface(elanInstanceName, dpnId);
+ }
+
@Override
public boolean isExternalInterface(String interfaceName) {
- return elanUtils.isExternal(interfaceName);
+ return interfaceManager.isExternalInterface(interfaceName);
+ }
+
+ @Override
+ public ElanInterface getElanInterfaceByElanInterfaceName(String interfaceName) {
+ return ElanUtils.getElanInterfaceByElanInterfaceName(broker, interfaceName);
+ }
+
+ @Override
+ public void handleKnownL3DmacAddress(String macAddress, String elanInstanceName, int addOrRemove) {
+ if (!isL2BeforeL3) {
+ LOG.trace("ELAN service is after L3VPN in the Netvirt pipeline skip known L3DMAC flows installation");
+ return;
+ }
+ ElanInstance elanInstance = ElanUtils.getElanInstanceByName(broker, elanInstanceName);
+ if (elanInstance == null) {
+ LOG.warn("Null elan instance {}", elanInstanceName);
+ return;
+ }
+
+ List<BigInteger> dpnsIdsForElanInstance = elanUtils.getParticipatingDpnsInElanInstance(elanInstanceName);
+ if (dpnsIdsForElanInstance == null || dpnsIdsForElanInstance.isEmpty()) {
+ LOG.warn("No DPNs for elan instance {}", elanInstance);
+ return;
+ }
+
+ elanUtils.handleDmacRedirectToDispatcherFlows(elanInstance.getElanTag(), elanInstanceName, macAddress,
+ addOrRemove, dpnsIdsForElanInstance);
}
/**
Long segmentationId = elanInstance.getSegmentationId();
interfaceName = parentRef + IfmConstants.OF_URI_SEPARATOR + segmentationId;
String trunkName = parentRef + IfmConstants.OF_URI_SEPARATOR + "trunk";
- interfaceManager.createVLANInterface(trunkName, parentRef, null, null, null,
- IfL2vlan.L2vlanMode.Trunk, true);
-
+ // trunk interface may have been created by other vlan network
+ Interface trunkInterface = interfaceManager.getInterfaceInfoFromConfigDataStore(trunkName);
+ if (trunkInterface == null) {
+ interfaceManager.createVLANInterface(trunkName, parentRef, null, null, null,
+ IfL2vlan.L2vlanMode.Trunk, true);
+ }
interfaceManager.createVLANInterface(interfaceName, trunkName, null, segmentationId.intValue(), null,
IfL2vlan.L2vlanMode.TrunkMember, true);
}
} catch (InterfaceAlreadyExistsException e) {
- logger.trace("Interface {} was already created", interfaceName);
+ LOG.trace("Interface {} was already created", interfaceName);
}
return interfaceName;
InstanceIdentifier<Interface> interfaceInstanceIdentifier = InstanceIdentifier.builder(Interfaces.class)
.child(Interface.class, interfaceKey).build();
MDSALUtil.syncDelete(broker, LogicalDatastoreType.CONFIGURATION, interfaceInstanceIdentifier);
- logger.debug("Deleting IETF interface {}", interfaceName);
- }
-
- private String getExtInterfaceName(Node node, String physicalNetworkName) {
- if (physicalNetworkName == null) {
- return null;
- }
-
- String providerMappingValue = bridgeMgr.getProviderMappingValue(node, physicalNetworkName);
- if (providerMappingValue == null) {
- logger.trace("No provider mapping found for physicalNetworkName {} node {}", physicalNetworkName,
- node.getNodeId().getValue());
- return null;
- }
-
- return bridgeMgr.southboundUtils.getDataPathId(node) + IfmConstants.OF_URI_SEPARATOR
- + bridgeMgr.getIntBridgePortNameFor(node, providerMappingValue);
+ LOG.debug("Deleting IETF interface {}", interfaceName);
}
private void handleExternalElanNetworks(Node node, BiFunction<ElanInstance, String, Void> function) {
List<ElanInstance> elanInstances = getElanInstances();
if (elanInstances == null || elanInstances.isEmpty()) {
- logger.trace("No ELAN instances found");
+ LOG.trace("No ELAN instances found");
return;
}
for (ElanInstance elanInstance : elanInstances) {
- String interfaceName = getExtInterfaceName(node, elanInstance.getPhysicalNetworkName());
+ String interfaceName = bridgeMgr.getProviderInterfaceName(node, elanInstance.getPhysicalNetworkName());
if (interfaceName != null) {
function.apply(elanInstance, interfaceName);
}
private void handleExternalElanNetwork(ElanInstance elanInstance, BiFunction<ElanInstance, String, Void> function) {
String elanInstanceName = elanInstance.getElanInstanceName();
if (elanInstance.getPhysicalNetworkName() == null) {
- logger.trace("No physical network attached to {}", elanInstanceName);
+ LOG.trace("No physical network attached to {}", elanInstanceName);
return;
}
List<Node> nodes = bridgeMgr.southboundUtils.getOvsdbNodes();
if (nodes == null || nodes.isEmpty()) {
- logger.trace("No OVS nodes found while creating external network for ELAN {}",
+ LOG.trace("No OVS nodes found while creating external network for ELAN {}",
elanInstance.getElanInstanceName());
return;
}
for (Node node : nodes) {
if (bridgeMgr.isIntegrationBridge(node)) {
- String interfaceName = getExtInterfaceName(node, elanInstance.getPhysicalNetworkName());
+ String interfaceName = bridgeMgr.getProviderInterfaceName(node, elanInstance.getPhysicalNetworkName());
function.apply(elanInstance, interfaceName);
}
}
}
+ private void setIsL2BeforeL3() {
+ short elanServiceRealIndex = ServiceIndex.getIndex(NwConstants.ELAN_SERVICE_NAME,
+ NwConstants.ELAN_SERVICE_INDEX);
+ short l3vpnServiceRealIndex = ServiceIndex.getIndex(NwConstants.L3VPN_SERVICE_NAME,
+ NwConstants.L3VPN_SERVICE_INDEX);
+ if (elanServiceRealIndex < l3vpnServiceRealIndex) {
+ LOG.info("ELAN service is set before L3VPN service in the Netvirt pipeline");
+ isL2BeforeL3 = true;
+ } else {
+ LOG.info("ELAN service is set after L3VPN service in the Netvirt pipeline");
+ isL2BeforeL3 = false;
+ }
+ }
}
Code Review / netvirt.git / blobdiff