From 3fc4a718a28c45f10a3589adaf256f28f6a60210 Mon Sep 17 00:00:00 2001 From: epgoraj Date: Mon, 8 Feb 2016 19:22:25 +0530 Subject: [PATCH] BUG:5179 InterfaceStateChange Event handling for Elan Change-Id: Id18f14cbd5811bf6039c80524bc557092795f1d0 Signed-off-by: epgoraj --- elanmanager/elanmanager-impl/pom.xml | 5 + .../elan/internal/ElanInterfaceManager.java | 6 +- .../ElanInterfaceStateChangeListener.java | 136 ++++++++++++++++++ .../elan/internal/ElanServiceProvider.java | 5 +- 4 files changed, 148 insertions(+), 4 deletions(-) create mode 100644 elanmanager/elanmanager-impl/src/main/java/org/opendaylight/vpnservice/elan/internal/ElanInterfaceStateChangeListener.java diff --git a/elanmanager/elanmanager-impl/pom.xml b/elanmanager/elanmanager-impl/pom.xml index 313c6ee5..19522651 100644 --- a/elanmanager/elanmanager-impl/pom.xml +++ b/elanmanager/elanmanager-impl/pom.xml @@ -55,6 +55,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.apache.karaf.shell.console 3.0.3 + + org.opendaylight.vpnservice + interfacemgr-impl + ${vpnservices.version} + diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/vpnservice/elan/internal/ElanInterfaceManager.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/vpnservice/elan/internal/ElanInterfaceManager.java index 4413a3bb..95460af6 100644 --- a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/vpnservice/elan/internal/ElanInterfaceManager.java +++ b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/vpnservice/elan/internal/ElanInterfaceManager.java @@ -147,12 +147,11 @@ public class ElanInterfaceManager extends AbstractDataChangeListener implements AutoCloseable { + private DataBroker broker; + private IInterfaceManager interfaceManager; + private ElanInterfaceManager elanInterfaceManager; + private ListenerRegistration listenerRegistration; + private static final Logger logger = LoggerFactory.getLogger(ElanInterfaceStateChangeListener.class); + + public ElanInterfaceStateChangeListener(final DataBroker db, final ElanInterfaceManager ifManager) { + super(Interface.class); + broker = db; + elanInterfaceManager = ifManager; + registerListener(db); + } + + private void registerListener(final DataBroker db) { + try { + listenerRegistration = broker.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL, + getWildCardPath(), ElanInterfaceStateChangeListener.this, AsyncDataBroker.DataChangeScope.SUBTREE); + } catch (final Exception e) { + logger.error("Elan Interfaces DataChange listener registration fail!", e); + throw new IllegalStateException("ElanInterface registration Listener failed.", e); + } + } + + private InstanceIdentifier getWildCardPath() { + return InstanceIdentifier.create(InterfacesState.class).child(Interface.class); + } + + public void setInterfaceManager(IInterfaceManager interfaceManager) { + this.interfaceManager = interfaceManager; + } + + private void handleVlanInterfaceOperationalStateChange(String interfaceName, boolean isStateUp) { + //fetching the elanInstanceName from elan-interface config data-store + ElanInterface elanInterface = ElanUtils.getElanInterfaceByElanInterfaceName(interfaceName); + if (elanInterface == null) { + return; + } + ElanInstance elanInfo = ElanUtils.getElanInstanceByName(elanInterface.getElanInstanceName()); + InterfaceInfo interfaceInfo = interfaceManager.getInterfaceInfo(interfaceName); + + logger.trace("ElanService Interface Operational state has changes for Interface:{}", interfaceName); + elanInterfaceManager.handleInterfaceUpated(interfaceInfo, elanInfo , isStateUp); + } + + @Override + protected void remove(InstanceIdentifier identifier, Interface delIf) { + logger.trace("Received interface {} Down event", delIf); + String interfaceName = delIf.getName(); + ElanInterface elanInterface = ElanUtils.getElanInterfaceByElanInterfaceName(interfaceName); + if(elanInterface == null) { + logger.debug("No Elan Interface is created for the interface:{} ", interfaceName); + return; + } + NodeConnectorId nodeConnectorId = new NodeConnectorId(delIf.getLowerLayerIf().get(0)); + BigInteger dpId = MDSALUtil.getDpnIdFromNodeName(nodeConnectorId.getValue()); + InterfaceInfo interfaceInfo = new InterfaceInfo(dpId, nodeConnectorId.getValue()); + interfaceInfo.setInterfaceName(interfaceName); + interfaceInfo.setInterfaceTag(delIf.getIfIndex()); + elanInterfaceManager.removeElanService(elanInterface, interfaceInfo); + } + + @Override + protected void update(InstanceIdentifier identifier, Interface original, Interface update) { + logger.trace("Operation Interface update event - Old: {}, New: {}", original, update); + String interfaceName = update.getName(); + ElanInterface elanInterface = ElanUtils.getElanInterfaceByElanInterfaceName(interfaceName); + if(elanInterface == null) { + logger.debug("No Elan Interface is created for the interface:{} ", interfaceName); + return; + } + Optional + intf = ElanUtils.read(broker, LogicalDatastoreType.CONFIGURATION, IfmUtil.buildId(interfaceName)); + if (intf != null && intf.get().getType().equals(Tunnel.class)) { + if(update.getOperStatus().equals(Interface.OperStatus.Up) && update.getAdminStatus() == Interface.AdminStatus.Up) { + logger.trace("Operation Status for Interface:{} event state UP ", interfaceName); + handleVlanInterfaceOperationalStateChange(interfaceName, true); + } else if(update.getOperStatus().equals(Interface.OperStatus.Down)) { + logger.trace("Operation Status for Interface:{} event state DOWN ", interfaceName); + handleVlanInterfaceOperationalStateChange(interfaceName, false); + } + } + } + + @Override + protected void add(InstanceIdentifier identifier, Interface intrf) { + logger.trace("Received interface {} up event", intrf); + String interfaceName = intrf.getName(); + ElanInterface elanInterface = ElanUtils.getElanInterfaceByElanInterfaceName(interfaceName); + if(elanInterface == null) { + logger.debug("No Elan Interface is created for the interface:{} ", interfaceName); + return; + } + InstanceIdentifier elanInterfaceId = ElanUtils.getElanInterfaceConfigurationDataPathId(interfaceName); + elanInterfaceManager.add(elanInterfaceId, elanInterface); + } + + @Override + public void close() throws Exception { + + } +} diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/vpnservice/elan/internal/ElanServiceProvider.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/vpnservice/elan/internal/ElanServiceProvider.java index 200e645d..7f901756 100644 --- a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/vpnservice/elan/internal/ElanServiceProvider.java +++ b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/vpnservice/elan/internal/ElanServiceProvider.java @@ -63,6 +63,7 @@ public class ElanServiceProvider implements BindingAwareProvider, IElanService, private ElanInterfaceManager elanInterfaceManager; private ElanPacketInHandler elanPacketInHandler; private ElanSmacFlowEventListener elanSmacFlowEventListener; + private ElanInterfaceStateChangeListener elanInterfaceStateChangeListener; private ElanNodeListener elanNodeListener; private NotificationService notificationService; private RpcProviderRegistry rpcProviderRegistry; @@ -71,7 +72,7 @@ public class ElanServiceProvider implements BindingAwareProvider, IElanService, rpcProviderRegistry = rpcRegistry; } - //private ElanInterfaceEventListener elanInterfaceEventListener; + //private ElanInterfaceStateChangeListener elanInterfaceEventListener; private ElanItmEventListener elanItmEventListener; public void setItmRpcService(ItmRpcService itmRpcService) { @@ -125,6 +126,8 @@ public class ElanServiceProvider implements BindingAwareProvider, IElanService, ElanStatisticsService interfaceStatsService = new ElanStatisticsImpl(broker, interfaceManager, mdsalManager); rpcProviderRegistry.addRpcImplementation(ElanStatisticsService.class, interfaceStatsService); + elanInterfaceStateChangeListener = new ElanInterfaceStateChangeListener(broker, elanInterfaceManager); + elanInterfaceStateChangeListener.setInterfaceManager(interfaceManager); ElanUtils.setElanServiceProvider(this); } -- 2.36.6