Eliminate NeutronvpnUtils.isNetworkOfType()

This method is used from only a single caller, which is checking
the same augmentation. Inline the check into the caller, making
sure we look up the augmentation only once -- thus speeding up
the NetworkTypeFlat case.

Change-Id: Ia3e767b8582af6ee61ed84ed13d0d8627a0eaa69
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java
index 9a19f971b707561b7503838f5d5a6565bd4689af..626d0614eccdfc3eebc924d95555c2f6b3d1f607 100644 (file)
--- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java
+++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java
@@ -1103,19 +1103,20 @@ public class NeutronvpnUtils {
         return npe != null && SUPPORTED_NETWORK_TYPES.contains(npe.getNetworkType());
     }
 
-    static boolean isNetworkOfType(Network network, Class<? extends NetworkTypeBase> type) {
-        NetworkProviderExtension npe = network.augmentation(NetworkProviderExtension.class);
-        if (npe != null && npe.getNetworkType() != null) {
-            return type.isAssignableFrom(npe.getNetworkType());
+    static boolean isFlatOrVlanNetwork(Network network) {
+        if (network != null) {
+            NetworkProviderExtension npe = network.augmentation(NetworkProviderExtension.class);
+            if (npe != null) {
+                Class<? extends NetworkTypeBase> npeType = npe.getNetworkType();
+                if (npeType != null) {
+                    return NetworkTypeVlan.class.isAssignableFrom(npeType)
+                            || NetworkTypeFlat.class.isAssignableFrom(npeType);
+                }
+            }
         }
         return false;
     }
 
-    static boolean isFlatOrVlanNetwork(Network network) {
-        return network != null
-                && (isNetworkOfType(network, NetworkTypeVlan.class) || isNetworkOfType(network, NetworkTypeFlat.class));
-    }
-
     static boolean isVlanOrVxlanNetwork(Class<? extends NetworkTypeBase> type) {
         return type.isAssignableFrom(NetworkTypeVxlan.class) || type.isAssignableFrom(NetworkTypeVlan.class);
     }