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.binding.api.NotificationService;
-import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
-import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.genius.datastoreutils.DataStoreJobCoordinator;
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.itm.api.IITMProvider;
import org.opendaylight.genius.mdsalutil.MDSALUtil;
-import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager;
-import org.opendaylight.netvirt.elan.l2gw.internal.ElanL2GatewayProvider;
-import org.opendaylight.netvirt.elan.statisitcs.ElanStatisticsImpl;
import org.opendaylight.netvirt.elan.statusanddiag.ElanStatusMonitor;
-import org.opendaylight.netvirt.elan.utils.CacheElanInstanceListener;
-import org.opendaylight.netvirt.elan.utils.CacheElanInterfaceListener;
-import org.opendaylight.netvirt.elan.utils.ElanClusterUtils;
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.elan.interfaces.ElanInterfaceKey;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.state.Elan;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.forwarding.entries.MacEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.statistics.rev150824.ElanStatisticsService;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ElanServiceProvider implements BindingAwareProvider, IElanService, AutoCloseable {
-
- private IdManagerService idManager;
- private IMdsalApiManager mdsalManager;
- private IInterfaceManager interfaceManager;
- private OdlInterfaceRpcService interfaceManagerRpcService;
- private ElanInstanceManager elanInstanceManager;
- private ElanForwardingEntriesHandler elanForwardingEntriesHandler;
- private ElanBridgeManager bridgeMgr;
-
- public IdManagerService getIdManager() {
- return idManager;
- }
-
- public ElanForwardingEntriesHandler getElanForwardingEntriesHandler() {
- return elanForwardingEntriesHandler;
- }
-
- public ElanPacketInHandler getElanPacketInHandler() {
- return elanPacketInHandler;
- }
-
- public ElanSmacFlowEventListener getElanSmacFlowEventListener() {
- return elanSmacFlowEventListener;
- }
-
- public ElanInterfaceStateChangeListener getElanInterfaceStateChangeListener() {
- return elanInterfaceStateChangeListener;
- }
-
- public ElanInterfaceStateClusteredListener getInfStateChangeClusteredListener() {
- return infStateChangeClusteredListener;
- }
-
- public ElanDpnInterfaceClusteredListener getElanDpnInterfaceClusteredListener() {
- return elanDpnInterfaceClusteredListener;
- }
-
- public ElanNodeListener getElanNodeListener() {
- return elanNodeListener;
- }
-
- public NotificationService getNotificationService() {
- return notificationService;
- }
-
- public RpcProviderRegistry getRpcProviderRegistry() {
- return rpcProviderRegistry;
- }
-
- public ElanL2GatewayProvider getElanL2GatewayProvider() {
- return elanL2GatewayProvider;
- }
-
- public static ElanStatusMonitor getElanstatusmonitor() {
- return elanStatusMonitor;
- }
-
- public ElanItmEventListener getElanItmEventListener() {
- return elanItmEventListener;
- }
+public class ElanServiceProvider implements IElanService {
- public static Logger getLogger() {
- return logger;
- }
+ private static final Logger LOG = LoggerFactory.getLogger(ElanServiceProvider.class);
- private ElanInterfaceManager elanInterfaceManager;
- private ElanPacketInHandler elanPacketInHandler;
- private ElanSmacFlowEventListener elanSmacFlowEventListener;
- private ElanInterfaceStateChangeListener elanInterfaceStateChangeListener;
- private ElanInterfaceStateClusteredListener infStateChangeClusteredListener;
- private ElanDpnInterfaceClusteredListener elanDpnInterfaceClusteredListener;
- private ElanNodeListener elanNodeListener;
- private NotificationService notificationService;
- private RpcProviderRegistry rpcProviderRegistry;
- private IITMProvider itmManager;
- private ItmRpcService itmRpcService;
- private DataBroker broker;
- private ElanL2GatewayProvider elanL2GatewayProvider;
- private ElanStatisticsService interfaceStatsService;
- private EntityOwnershipService entityOwnershipService;
- private CacheElanInstanceListener cacheElanInstanceListener;
- private CacheElanInterfaceListener cacheElanInterfaceListener;
- private static final ElanStatusMonitor elanStatusMonitor = ElanStatusMonitor.getInstance();
- static DataStoreJobCoordinator dataStoreJobCoordinator;
- private ElanOvsdbNodeListener elanOvsdbNodeListener;
+ private final IdManagerService idManager;
+ private final IInterfaceManager interfaceManager;
+ private final ElanInstanceManager elanInstanceManager;
+ private final ElanBridgeManager bridgeMgr;
+ private final DataBroker broker;
+ private final ElanStatusMonitor elanStatusMonitor;
+ private static ElanUtils elanUtils;
private boolean generateIntBridgeMac = true;
- public static void setDataStoreJobCoordinator(DataStoreJobCoordinator ds) {
- dataStoreJobCoordinator = ds;
- }
-
- public void setBroker(DataBroker broker) {
- this.broker = broker;
- }
-
- public static DataStoreJobCoordinator getDataStoreJobCoordinator() {
- if (dataStoreJobCoordinator == null) {
- dataStoreJobCoordinator = DataStoreJobCoordinator.getInstance();
- }
- return dataStoreJobCoordinator;
- }
-
- public ElanServiceProvider(RpcProviderRegistry rpcRegistry) {
- rpcProviderRegistry = rpcRegistry;
- elanStatusMonitor.registerMbean();
+ public ElanServiceProvider(IdManagerService idManager, IInterfaceManager interfaceManager,
+ ElanInstanceManager elanInstanceManager, ElanBridgeManager bridgeMgr,
+ DataBroker dataBroker,
+ ElanInterfaceManager elanInterfaceManager,
+ ElanStatusMonitor elanStatusMonitor, ElanUtils elanUtils) {
+ this.idManager = idManager;
+ this.interfaceManager = interfaceManager;
+ this.elanInstanceManager = elanInstanceManager;
+ this.bridgeMgr = bridgeMgr;
+ this.broker = dataBroker;
+ this.elanStatusMonitor = elanStatusMonitor;
+ this.elanUtils = elanUtils;
+ elanInterfaceManager.setElanUtils(elanUtils);
}
- // private ElanInterfaceStateChangeListener elanInterfaceEventListener;
- private ElanItmEventListener elanItmEventListener;
-
- private static final Logger logger = LoggerFactory.getLogger(ElanServiceProvider.class);
-
- @Override
- public void onSessionInitiated(ProviderContext session) {
+ public void init() {
+ LOG.info("Starting ElnaServiceProvider");
elanStatusMonitor.reportStatus("STARTING");
try {
createIdPool();
- getDataStoreJobCoordinator();
- broker = session.getSALService(DataBroker.class);
-
- bridgeMgr = new ElanBridgeManager(broker);
- elanOvsdbNodeListener = new ElanOvsdbNodeListener(broker, generateIntBridgeMac, bridgeMgr, this);
- ElanUtils.setElanServiceProvider(this);
- elanForwardingEntriesHandler = ElanForwardingEntriesHandler.getElanForwardingEntriesHandler(this);
- elanInterfaceManager = ElanInterfaceManager.getElanInterfaceManager(this);
- elanInstanceManager = ElanInstanceManager.getElanInstanceManager(this);
- elanNodeListener = ElanNodeListener.getElanNodeListener(this);
- elanPacketInHandler = ElanPacketInHandler.getElanPacketInHandler(this);
- elanSmacFlowEventListener = ElanSmacFlowEventListener.getElanSmacFlowEventListener(this);
- // Initialize statistics rpc provider for elan
- interfaceStatsService = ElanStatisticsImpl.getElanStatisticsService(this);
- rpcProviderRegistry.addRpcImplementation(ElanStatisticsService.class, interfaceStatsService);
- elanInterfaceStateChangeListener = ElanInterfaceStateChangeListener
- .getElanInterfaceStateChangeListener(this);
- infStateChangeClusteredListener = ElanInterfaceStateClusteredListener
- .getElanInterfaceStateClusteredListener(this);
- elanDpnInterfaceClusteredListener = ElanDpnInterfaceClusteredListener
- .getElanDpnInterfaceClusteredListener(this);
- ElanClusterUtils.setElanServiceProvider(this);
- this.elanL2GatewayProvider = new ElanL2GatewayProvider(this);
- cacheElanInstanceListener = new CacheElanInstanceListener(this);
- cacheElanInterfaceListener = new CacheElanInterfaceListener(this);
- elanInterfaceManager.registerListener(LogicalDatastoreType.CONFIGURATION, broker);
- elanInstanceManager.registerListener(LogicalDatastoreType.CONFIGURATION, broker);
- notificationService.registerNotificationListener(elanSmacFlowEventListener);
- notificationService.registerNotificationListener(elanPacketInHandler);
+
elanStatusMonitor.reportStatus("OPERATIONAL");
} catch (Exception e) {
- logger.error("Error initializing services", e);
+ LOG.error("Error initializing services", e);
elanStatusMonitor.reportStatus("ERROR");
}
}
- public void setIdManager(IdManagerService idManager) {
- this.idManager = idManager;
- }
-
- public void setMdsalManager(IMdsalApiManager mdsalManager) {
- this.mdsalManager = mdsalManager;
- }
-
- public void setInterfaceManager(IInterfaceManager interfaceManager) {
- this.interfaceManager = interfaceManager;
- }
-
- public void setEntityOwnershipService(EntityOwnershipService entityOwnershipService) {
- this.entityOwnershipService = entityOwnershipService;
- }
-
- public IInterfaceManager getInterfaceManager() {
- return this.interfaceManager;
- }
-
- public IMdsalApiManager getMdsalManager() {
- return mdsalManager;
- }
-
- public IITMProvider getItmManager() {
- return itmManager;
- }
-
- public DataBroker getBroker() {
- return broker;
- }
-
- public void setNotificationService(NotificationService notificationService) {
- this.notificationService = notificationService;
- }
-
- public void setInterfaceManagerRpcService(OdlInterfaceRpcService interfaceManager) {
- this.interfaceManagerRpcService = interfaceManager;
- }
-
- public OdlInterfaceRpcService getInterfaceManagerRpcService() {
- return interfaceManagerRpcService;
- }
-
- public void setItmManager(IITMProvider itmManager) {
- this.itmManager = itmManager;
- }
-
- public void setItmRpcService(ItmRpcService itmRpcService) {
- this.itmRpcService = itmRpcService;
- }
-
- public ItmRpcService getItmRpcService() {
- return itmRpcService;
- }
-
- public ElanInstanceManager getElanInstanceManager() {
- return elanInstanceManager;
- }
-
- public ElanInterfaceManager getElanInterfaceManager() {
- return elanInterfaceManager;
- }
-
- public EntityOwnershipService getEntityOwnershipService() {
- return entityOwnershipService;
- }
-
private void createIdPool() {
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");
+ if (result != null && result.get().isSuccessful()) {
+ LOG.debug("ELAN Id Pool is created successfully");
}
} catch (Exception e) {
- logger.error("Failed to create ELAN Id pool {}", e);
+ LOG.error("Failed to create ELAN Id pool {}", e);
}
}
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;
List<String> elanInterfaces = elanInfo.getElanInterfaces();
if (elanInterfaces != null && elanInterfaces.size() > 0) {
for (String elanInterface : elanInterfaces) {
- ElanInterfaceMac elanInterfaceMac = ElanUtils.getElanInterfaceMacByInterfaceName(elanInterface);
+ ElanInterfaceMac elanInterfaceMac = elanUtils.getElanInterfaceMacByInterfaceName(elanInterface);
if (elanInterfaceMac != null && elanInterfaceMac.getMacEntry() != null
&& elanInterfaceMac.getMacEntry().size() > 0) {
macAddress.addAll(elanInterfaceMac.getMacEntry());
@Override
public void flushMACTable(String elanInstanceName) {
- Elan elanInfo = ElanUtils.getElanByName(elanInstanceName);
+ Elan elanInfo = ElanUtils.getElanByName(broker, elanInstanceName);
if (elanInfo == null) {
return;
}
return;
}
for (String elanInterface : elanInterfaces) {
- ElanInterfaceMac elanInterfaceMac = ElanUtils.getElanInterfaceMacByInterfaceName(elanInterface);
+ ElanInterfaceMac elanInterfaceMac = elanUtils.getElanInterfaceMacByInterfaceName(elanInterface);
if (elanInterfaceMac.getMacEntry() != null && elanInterfaceMac.getMacEntry().size() > 0) {
List<MacEntry> macEntries = elanInterfaceMac.getMacEntry();
for (MacEntry macEntry : macEntries) {
try {
deleteStaticMacAddress(elanInstanceName, elanInterface, macEntry.getMacAddress().getValue());
} catch (MacNotFoundException e) {
- logger.error("Mac Not Found Exception {}", e);
+ LOG.error("Mac Not Found Exception {}", e);
e.printStackTrace();
}
}
}
- @Override
- public void close() throws Exception {
- this.elanInstanceManager.close();
- this.elanL2GatewayProvider.close();
- this.cacheElanInstanceListener.close();
- this.cacheElanInterfaceListener.close();
- }
-
public static List<PhysAddress> getPhysAddress(List<String> macAddress) {
List<PhysAddress> physAddresses = new ArrayList<>();
for (String mac : macAddress) {
@Override
public ElanInstance getElanInstance(String elanName) {
- return ElanUtils.getElanInstanceByName(elanName);
+ return ElanUtils.getElanInstanceByName(broker, elanName);
}
@Override
List<ElanInstance> elanList = new ArrayList<>();
InstanceIdentifier<ElanInstances> elanInstancesIdentifier = InstanceIdentifier.builder(ElanInstances.class)
.build();
- Optional<ElanInstances> elansOptional = ElanUtils.read(broker, LogicalDatastoreType.CONFIGURATION,
+ Optional<ElanInstances> elansOptional = elanUtils.read(broker, LogicalDatastoreType.CONFIGURATION,
elanInstancesIdentifier);
if (elansOptional.isPresent()) {
elanList.addAll(elansOptional.get().getElanInstance());
List<String> elanInterfaces = new ArrayList<>();
InstanceIdentifier<ElanInterfaces> elanInterfacesIdentifier = InstanceIdentifier.builder(ElanInterfaces.class)
.build();
- Optional<ElanInterfaces> elanInterfacesOptional = ElanUtils.read(broker, LogicalDatastoreType.CONFIGURATION,
+ Optional<ElanInterfaces> elanInterfacesOptional = elanUtils.read(broker, LogicalDatastoreType.CONFIGURATION,
elanInterfacesIdentifier);
if (!elanInterfacesOptional.isPresent()) {
return elanInterfaces;
@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>() {
-
- @Override
- public Void apply(ElanInstance elanInstance, String interfaceName) {
- createExternalElanNetwork(elanInstance, interfaceName);
- return null;
- }
-
+ handleExternalElanNetwork(elanInstance, (elanInstance1, interfaceName) -> {
+ createExternalElanNetwork(elanInstance1, interfaceName);
+ return 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>() {
-
- @Override
- public Void apply(ElanInstance elanInstance, String interfaceName) {
- deleteExternalElanNetwork(elanInstance, interfaceName);
- return null;
- }
-
+ handleExternalElanNetwork(elanInstance, (elanInstance1, interfaceName) -> {
+ deleteExternalElanNetwork(elanInstance1, interfaceName);
+ return null;
});
}
List<ElanInstance> elanInstances = getElanInstances();
if (elanInstances == null || elanInstances.isEmpty()) {
- logger.trace("No ELAN instances found");
+ LOG.trace("No ELAN instances found");
return;
}
private void createExternalElanNetwork(ElanInstance elanInstance, String interfaceName) {
if (interfaceName == null) {
- logger.trace("No physial interface is attached to {}", elanInstance.getPhysicalNetworkName());
+ LOG.trace("No physial interface is attached to {}", elanInstance.getPhysicalNetworkName());
return;
}
private void deleteExternalElanNetwork(ElanInstance elanInstance, String interfaceName) {
if (interfaceName == null) {
- logger.trace("No physial interface is attached to {}", elanInstance.getPhysicalNetworkName());
+ LOG.trace("No physial interface is attached to {}", elanInstance.getPhysicalNetworkName());
return;
}
@Override
public String getExternalElanInterface(String elanInstanceName, BigInteger dpnId) {
- DpnInterfaces dpnInterfaces = ElanUtils.getElanInterfaceInfoByElanDpn(elanInstanceName, dpnId);
+ DpnInterfaces dpnInterfaces = elanUtils.getElanInterfaceInfoByElanDpn(elanInstanceName, dpnId);
if (dpnInterfaces == null || dpnInterfaces.getInterfaces() == null) {
- logger.trace("Elan {} does not have interfaces in DPN {}", elanInstanceName, dpnId);
+ LOG.trace("Elan {} does not have interfaces in DPN {}", elanInstanceName, dpnId);
return null;
}
for (String dpnInterface : dpnInterfaces.getInterfaces()) {
- if (ElanUtils.isExternal(dpnInterface)) {
+ if (elanUtils.isExternal(dpnInterface)) {
return dpnInterface;
}
}
- logger.trace("Elan {} does not have any external interace attached to DPN {}", elanInstanceName, dpnId);
+ LOG.trace("Elan {} does not have any external interace attached to DPN {}", elanInstanceName, dpnId);
return null;
}
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 (elanUtils.isExternal(elanInterface)) {
externalElanInterfaces.add(elanInterface);
}
}
@Override
public boolean isExternalInterface(String interfaceName) {
- return ElanUtils.isExternal(interfaceName);
+ return elanUtils.isExternal(interfaceName);
+ }
+
+ @Override
+ public ElanInterface getElanInterfaceByElanInterfaceName(String interfaceName) {
+ return ElanUtils.getElanInterfaceByElanInterfaceName(broker, interfaceName);
}
/**
interfaceManager.createVLANInterface(interfaceName, parentRef, null, null, null,
IfL2vlan.L2vlanMode.Transparent, true);
} else if (ElanUtils.isVlan(elanInstance)) {
- String trunkName = parentRef + IfmConstants.OF_URI_SEPARATOR + "trunk";
- interfaceManager.createVLANInterface(interfaceName, parentRef, null, null, null,
- IfL2vlan.L2vlanMode.Trunk, true);
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);
+
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);
+ LOG.debug("Deleting IETF interface {}", interfaceName);
}
private String getExtInterfaceName(Node node, String physicalNetworkName) {
String providerMappingValue = bridgeMgr.getProviderMappingValue(node, physicalNetworkName);
if (providerMappingValue == null) {
- logger.trace("No provider mapping found for physicalNetworkName {} node {}", physicalNetworkName,
+ LOG.trace("No provider mapping found for physicalNetworkName {} node {}", physicalNetworkName,
node.getNodeId().getValue());
return null;
}
List<ElanInstance> elanInstances = getElanInstances();
if (elanInstances == null || elanInstances.isEmpty()) {
- logger.trace("No ELAN instances found");
+ LOG.trace("No ELAN instances found");
return;
}
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;
}
Code Review / netvirt.git / blobdiff