Bug 5184 - Datapath not working for single ELAN in single DPN when binding VLAN inter...

[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 1624b0b593caf40a1b93505cf55a401f14393d6f..a9da21e276a5d8c0f8fdfcb83083c308b51dae6e 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
@@ -76,11 +76,10 @@ public class FlowBasedServicesUtils {
         matches.add(new MatchInfo(MatchFieldType.in_port, new BigInteger[] {dpId, BigInteger.valueOf(portNo)}));
         int vlanId = 0;
         IfL2vlan l2vlan = iface.getAugmentation(IfL2vlan.class);
-        if(l2vlan != null){
+        if(l2vlan != null && l2vlan.getVlanId() != null){
             vlanId = l2vlan.getVlanId().getValue();
         }
         if (vlanId > 0) {
-            LOG.error("VlanId matching support is not fully available in Be.");
             matches.add(new MatchInfo(MatchFieldType.vlan_vid, new long[]{vlanId}));
         }
         return matches;
@@ -132,7 +131,7 @@ public class FlowBasedServicesUtils {
         List<Instruction> instructionSet = new ArrayList<Instruction>();
         int vlanId = 0;
         IfL2vlan l2vlan = iface.getAugmentation(IfL2vlan.class);
-        if(l2vlan != null){
+        if(l2vlan != null && l2vlan.getVlanId() != null){
             vlanId = l2vlan.getVlanId().getValue();
         }
         if (vlanId != 0) {