Bug 5179 : Fixing NPE in InterfaceManager

Change-Id: I43a9792a1fa5066ad8116376c9b36a2be7854d57
Signed-off-by: Faseela K <faseela.k@ericsson.com>

diff --git a/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/IfmUtil.java b/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/IfmUtil.java
index 531f25b151549b51a9f5163bce9c16b60d6c8aba..76f78b2a5954fafe79e1b647185e426838958048 100644 (file)
--- a/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/IfmUtil.java
+++ b/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/IfmUtil.java
@@ -198,7 +198,8 @@ public class IfmUtil {
         if(L2vlan.class.equals(ifType)){
             IfL2vlan vlanIface = interfaceInfo.getAugmentation(IfL2vlan.class);
             LOG.trace("L2Vlan: {}",vlanIface);
-            long vlanVid = (vlanIface == null) ? 0 : vlanIface.getVlanId().getValue();
+            long vlanVid = (vlanIface == null) ? 0 :
+                    vlanIface.getVlanId() == null ? 0 : vlanIface.getVlanId().getValue();
             if (vlanVid != 0) {
                 listActionInfo.add(new ActionInfo(ActionType.push_vlan, new String[] {}, actionKeyStart));
                 actionKeyStart++;

diff --git a/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/commons/AlivenessMonitorUtils.java b/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/commons/AlivenessMonitorUtils.java
index abc3b2c837690ff1034739c7902b3cfb7844f692..27795c2c38e57b0eb98e80c0c9d08158ecae966c 100644 (file)
--- a/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/commons/AlivenessMonitorUtils.java
+++ b/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/commons/AlivenessMonitorUtils.java
@@ -66,7 +66,7 @@ public class AlivenessMonitorUtils {
     public static void startLLDPMonitoring(AlivenessMonitorService alivenessMonitorService, DataBroker dataBroker,
                                             Interface trunkInterface) {
         //LLDP monitoring for the trunk interface
-        String trunkInterfaceName = trunkInterface.getName();
+        /*String trunkInterfaceName = trunkInterface.getName();
         IfTunnel ifTunnel = trunkInterface.getAugmentation(IfTunnel.class);
         if(ifTunnel.getTunnelInterfaceType().isAssignableFrom(TunnelTypeVxlan.class)) {
             MonitorStartInput lldpMonitorInput = new MonitorStartInputBuilder().setConfig(new ConfigBuilder()
@@ -90,12 +90,12 @@ public class AlivenessMonitorUtils {
             } catch (InterruptedException | ExecutionException e) {
                 LOG.warn("Exception when starting monitoring", e);
             }
-        }
+        }*/
     }
 
     public static void stopLLDPMonitoring(AlivenessMonitorService alivenessMonitorService, DataBroker dataBroker,
                                           Interface trunkInterface) {
-        IfTunnel ifTunnel = trunkInterface.getAugmentation(IfTunnel.class);
+        /*IfTunnel ifTunnel = trunkInterface.getAugmentation(IfTunnel.class);
         if(!ifTunnel.getTunnelInterfaceType().isAssignableFrom(TunnelTypeVxlan.class)){
             return;
         }
@@ -113,7 +113,7 @@ public class AlivenessMonitorUtils {
                 removeMonitorIdFromInterfaceMonitorIdMap(dataBroker, interfaceName, monitorId);
                 return;
             }
-        }
+        }*/
     }
 
     public static String getInterfaceFromMonitorId(DataBroker broker, Long monitorId) {