Fixing "inconsistency will tunnel-port creation" issue

[vpnservice.git] / interfacemgr / interfacemgr-impl / src / main / java / org / opendaylight / vpnservice / interfacemgr / servicebindings / flowbased / utilities / FlowBasedServicesUtils.java

diff --git a/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/servicebindings/flowbased/utilities/FlowBasedServicesUtils.java b/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/servicebindings/flowbased/utilities/FlowBasedServicesUtils.java
index 8df055ba405caa11c8eb01c15354ce1388095828..a48f71dbd1671e6b6924a4d435747b9a910d44a1 100644 (file)
--- a/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/servicebindings/flowbased/utilities/FlowBasedServicesUtils.java
+++ b/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/servicebindings/flowbased/utilities/FlowBasedServicesUtils.java
@@ -83,19 +83,6 @@ public class FlowBasedServicesUtils {
     public static List<MatchInfo> getMatchInfoForTunnelPortAtIngressTable(BigInteger dpId, long portNo, Interface iface) {
         List<MatchInfo> matches = new ArrayList<MatchInfo>();
         matches.add(new MatchInfo(MatchFieldType.in_port, new BigInteger[]{dpId, BigInteger.valueOf(portNo)}));
-        /*IfTunnel tunnel = iface.getAugmentation(IfTunnel.class);
-        TunnelResources tunnelResources = tunnel.getTunnelResources();
-        if (tunnelResources.getTunnelType().isAssignableFrom(TunnelTypeGre.class)) {
-            IfGre ifgre = tunnelResources.getAugmentation(IfGre.class);
-            BigInteger grekey = ifgre.getGreKey();
-            // FIXME: Add tunnel-id match information
-
-        } else if (tunnelResources.getTunnelType().isAssignableFrom(TunnelTypeVxlan.class)) {
-            IfVxlan ifVxlan = tunnelResources.getAugmentation(IfVxlan.class);
-            BigInteger vni = ifVxlan.getVni();
-            // FIXME: Add tunnel-id match information
-        }*/
-
         return matches;
     }
 
@@ -105,20 +92,6 @@ public class FlowBasedServicesUtils {
         matches.add(new MatchInfo(MatchFieldType.metadata, new BigInteger[] {
                 MetaDataUtil.getMetaDataForLPortDispatcher(interfaceTag, servicePriority),
                 MetaDataUtil.getMetaDataMaskForLPortDispatcher() }));
-        /*if (iface.getType().isAssignableFrom(Tunnel.class)) {
-            IfTunnel tunnel = iface.getAugmentation(IfTunnel.class);
-            TunnelResources tunnelResources = tunnel.getTunnelResources();
-            if (tunnelResources.getTunnelType().isAssignableFrom(TunnelTypeGre.class)) {
-                IfGre ifgre = tunnelResources.getAugmentation(IfGre.class);
-                BigInteger grekey = ifgre.getGreKey();
-                // FIXME: Add tunnel-id match information
-
-            } else if (tunnelResources.getTunnelType().isAssignableFrom(TunnelTypeVxlan.class)) {
-                IfVxlan ifVxlan = tunnelResources.getAugmentation(IfVxlan.class);
-                BigInteger vni = ifVxlan.getVni();
-                // FIXME: Add tunnel-id match information
-            }
-        }*/
         return matches;
     }