BUG:5179 InterfaceStateChange Event handling for Elan

Change-Id: Id18f14cbd5811bf6039c80524bc557092795f1d0
Signed-off-by: epgoraj <p.govinda.rajulu@ericsson.com>

diff --git a/elanmanager/elanmanager-impl/pom.xml b/elanmanager/elanmanager-impl/pom.xml
index 313c6ee5f5c7127c4e4235a51bd8f638ad8b387a..195226510442f9ff20cbf819664e7f2d8b2fa9ae 100644 (file)
--- 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
       <artifactId>org.apache.karaf.shell.console</artifactId>
       <version>3.0.3</version>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.vpnservice</groupId>
+      <artifactId>interfacemgr-impl</artifactId>
+      <version>${vpnservices.version}</version>
+    </dependency>
   </dependencies>
 
 </project>

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 4413a3bba5fd074b103e56af5efaec4fee7ba429..95460af6a37a1720e16c12cdcfbc099356c4b7e0 100644 (file)
--- 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<ElanInterfa
         removeElanInterface(elanInfo, interfaceName);
     }
 
-    public void removeElanService(ElanInterface del, int vlanId) {
+    public void removeElanService(ElanInterface del, InterfaceInfo interfaceInfo) {
         ElanInstance elanInstance = ElanUtils.getElanInstanceByName(del.getElanInstanceName());
         String interfaceName = del.getName();
-        InterfaceInfo interfaceInfo = interfaceManager.getInterfaceInfoFromOperationalDataStore(interfaceName, InterfaceType.VLAN_INTERFACE);
         removeElanInterface(elanInstance, interfaceInfo);
-        unbindService(elanInstance, interfaceName, vlanId);
+        unbindService(elanInstance, interfaceName);
     }
 
     public void removeElanInterface(ElanInstance elanInfo, String interfaceName) {
@@ -792,6 +791,7 @@ public class ElanInterfaceManager extends AbstractDataChangeListener<ElanInterfa
             removeFilterEqualsTable(elanInfo, interfaceInfo);
         } else {
             setupElanBroadcastGroups(elanInfo, interfaceInfo);
+            setupLocalBroadcastGroups(elanInfo, interfaceInfo);
             removeFilterEqualsTable(elanInfo, interfaceInfo);
         }
     }

diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/vpnservice/elan/internal/ElanInterfaceStateChangeListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/vpnservice/elan/internal/ElanInterfaceStateChangeListener.java
new file mode 100644 (file)
index 0000000..d056d1a
--- /dev/null
+++ b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/vpnservice/elan/internal/ElanInterfaceStateChangeListener.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2016 Ericsson India Global Services Pvt Ltd. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * 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.vpnservice.elan.internal;
+
+
+import com.google.common.base.Optional;
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
+import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker;
+import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.vpnservice.elan.utils.ElanUtils;
+import org.opendaylight.vpnservice.interfacemgr.IfmUtil;
+import org.opendaylight.vpnservice.interfacemgr.globals.InterfaceInfo;
+import org.opendaylight.vpnservice.interfacemgr.interfaces.IInterfaceManager;
+import org.opendaylight.vpnservice.mdsalutil.AbstractDataChangeListener;
+import org.opendaylight.vpnservice.mdsalutil.MDSALUtil;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.Tunnel;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.elan.rev150602.elan.instances.ElanInstance;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.elan.rev150602.elan.interfaces.ElanInterface;
+import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.math.BigInteger;
+
+public class ElanInterfaceStateChangeListener extends AbstractDataChangeListener<Interface> implements AutoCloseable {
+    private DataBroker broker;
+    private IInterfaceManager interfaceManager;
+    private ElanInterfaceManager elanInterfaceManager;
+    private ListenerRegistration<DataChangeListener> 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<Interface> 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<Interface> 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<Interface> 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<org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface>
+        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<Interface> 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<ElanInterface> 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 200e645d984af2172fe368c34cdf0af368367f1e..7f901756ee3c6d21b67f8818a954c2cc0331ab17 100644 (file)
--- 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);
     }