Bug 7601 - Cleanup Elan instances when a network is deleted

Fix npe for getNetworkType() being null

Change-Id: I0e7ede43cdd7553b4525f5921b487f7e17c25b52
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java
index 52c8d8e10cecaab345ca0dddade07580e725ac81..0a97528627070dee7251e5216b84de7705b75100 100644 (file)
--- a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java
+++ b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java
@@ -993,7 +993,7 @@ public class NeutronvpnUtils {
 
     static boolean isNetworkTypeSupported(Network network) {
         NetworkProviderExtension npe = network.getAugmentation(NetworkProviderExtension.class);
-        return npe != null && supportedNetworkTypes.contains(npe.getNetworkType());
+        return npe != null && npe.getNetworkType() != null && supportedNetworkTypes.contains(npe.getNetworkType());
     }
 
     static ProviderTypes getProviderNetworkType(Network network) {
@@ -1021,7 +1021,7 @@ public class NeutronvpnUtils {
 
     static boolean isNetworkOfType(Network network, Class<? extends NetworkTypeBase> type) {
         NetworkProviderExtension npe = network.getAugmentation(NetworkProviderExtension.class);
-        return npe != null && type.isAssignableFrom(npe.getNetworkType());
+        return npe != null && npe.getNetworkType() != null && type.isAssignableFrom(npe.getNetworkType());
     }
 
     static boolean isVxlanNetwork(Network network) {