removing l2switch dependency

[unimgr.git] / ovs-driver / src / main / java / org / opendaylight / unimgr / mef / nrp / ovs / util / OpenFlowUtils.java

diff --git a/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/util/OpenFlowUtils.java b/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/util/OpenFlowUtils.java
index 582640df914d6c16dbde0596d8da42a7146c05f2..d6399ca6a065ce2590702f7ab0c626a6c585cda0 100644 (file)
--- a/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/util/OpenFlowUtils.java
+++ b/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/util/OpenFlowUtils.java
@@ -12,7 +12,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import org.opendaylight.controller.liblldp.EtherTypes;
 import org.opendaylight.unimgr.mef.nrp.common.ResourceNotAvailableException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
@@ -40,6 +39,7 @@ public class OpenFlowUtils {
     private static final int VLAN_FLOW_PRIORITY = 20;
     private static final int INTERSWITCH_FLOW_PRIORITY = 10;
     private static final int DROP_FLOW_PRIORITY = 0;
+    private static final long ETH_TYPE_LLDP = 35020;
 
     private static final String FLOW_TABLE_NOT_PRESENT_ERROR_MESSAGE = "Flow table is not present in node '%s'.";
     private static final String NODE_NOT_AUGMENTED_ERROR_MESSAGE = "Node '%s' does not have '%s' augmentation.";
@@ -154,7 +154,7 @@ public class OpenFlowUtils {
                 .filter(flow -> {
                     try {
                         return ! (flow.getMatch().getEthernetMatch().getEthernetType().getType().getValue()
-                                .equals((long) EtherTypes.LLDP.intValue()));
+                                .equals(ETH_TYPE_LLDP));
                     } catch (NullPointerException npe) {
                         return true;
                     }