Merge "DHCP Handling for TOR VM"

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

diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/vpnservice/neutronvpn/NeutronvpnUtils.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/vpnservice/neutronvpn/NeutronvpnUtils.java
index 3acc5ce43b90c8ca480945b7110a2f34266a497d..d161f97dfdde3441ca4dd97e18128a7c795ee77c 100644 (file)
--- a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/vpnservice/neutronvpn/NeutronvpnUtils.java
+++ b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/vpnservice/neutronvpn/NeutronvpnUtils.java
@@ -188,26 +188,6 @@ public class NeutronvpnUtils {
         return null;
     }
 
-    protected static String getSegmentationIdFromNeutronNetwork(Network network) {
-        String segmentationId = null;
-        NetworkProviderExtension providerExtension = network.getAugmentation(NetworkProviderExtension.class);
-        if (providerExtension != null) {
-            segmentationId = providerExtension.getSegmentationId();
-            if (segmentationId == null) {
-                List<Segments> providerSegments = providerExtension.getSegments();
-                if (providerSegments != null && providerSegments.size() > 0) {
-                    for (Segments providerSegment: providerSegments) {
-                        if (isNetworkSegmentTypeVxlan(providerSegment)) {
-                            segmentationId = providerSegment.getSegmentationId();
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        return segmentationId;
-    }
-
     protected static List<Uuid> getNeutronRouterSubnetIds(DataBroker broker, Uuid routerId) {
         logger.info("getNeutronRouterSubnetIds for {}", routerId.getValue());
 
@@ -243,16 +223,6 @@ public class NeutronvpnUtils {
         return new StringBuilder().append("tap").append(tapId).toString();
     }
 
-    protected static boolean isPortVnicTypeNormal(Port port) {
-        PortBindingExtension portBinding = port.getAugmentation(PortBindingExtension.class);
-        if(portBinding == null || portBinding.getVnicType() == null) {
-            // By default, VNIC_TYPE is NORMAL
-            return true;
-        }
-        String vnicType = portBinding.getVnicType().trim().toLowerCase();
-        return vnicType.equals(VNIC_TYPE_NORMAL);
-    }
-
     protected static boolean lock(LockManagerService lockManager, String lockName) {
         TryLockInput input = new TryLockInputBuilder().setLockName(lockName).setTime(5L).setTimeUnit
                 (TimeUnits.Milliseconds).build();
@@ -365,9 +335,4 @@ public class NeutronvpnUtils {
 
         return result;
     }
-
-    static boolean isNetworkSegmentTypeVxlan(Segments providerSegment) {
-        Class<? extends NetworkTypeBase> networkType = providerSegment.getNetworkType();
-        return (networkType != null && networkType.isAssignableFrom(NetworkTypeVxlan.class));
-    }
 }