clean isExternal NPE and string syntax

[netvirt.git] / vpnservice / neutronvpn / neutronvpn-impl / src / main / java / org / opendaylight / netvirt / neutronvpn / NeutronNetworkChangeListener.java

diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java
index b69b33c364add2cb56595110face754ab00bb2cf..809182d931f53b9f930d48eb0e516f2dc25292b8 100644 (file)
--- a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java
+++ b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java
@@ -78,7 +78,7 @@ public class NeutronNetworkChangeListener extends AbstractDataChangeListener<Net
         ElanInstance elanInstance = createElanInstance(input);
         // Create ELAN interface and IETF interfaces for the physical network
         elanService.createExternalElanNetwork(elanInstance);
-        if (input.getAugmentation(NetworkL3Extension.class).isExternal()) {
+        if (NeutronvpnUtils.getIsExternal(input)) {
             nvpnNatManager.addExternalNetwork(input);
             NeutronvpnUtils.addToNetworkCache(input);
         }
@@ -101,7 +101,7 @@ public class NeutronNetworkChangeListener extends AbstractDataChangeListener<Net
             elanService.deleteExternalElanNetwork(elanInstance);
             deleteElanInstance(elanInstanceName);
         }
-        if (input.getAugmentation(NetworkL3Extension.class).isExternal()) {
+        if (NeutronvpnUtils.getIsExternal(input)) {
             nvpnNatManager.removeExternalNetwork(input);
             NeutronvpnUtils.removeFromNetworkCache(input);
         }
@@ -114,7 +114,7 @@ public class NeutronNetworkChangeListener extends AbstractDataChangeListener<Net
                     update);
         }
 
-        if (update.getAugmentation(NetworkL3Extension.class).isExternal()) {
+        if (NeutronvpnUtils.getIsExternal(update)) {
             NeutronvpnUtils.addToNetworkCache(update);
         }