[ONOS-3596] update VTN's bug: delete local broadcast flows

unsuccessfully.

Change-Id: I87f5744b23a444eb4eb56772111a0579e6ffdbf9

@@ -378,6 +378,8 @@ public class VTNManager implements VTNService {
         applyHostMonitoredL2Rules(host, Objective.Operation.REMOVE);
         // apply L3 openflow rules
         applyHostMonitoredL3Rules(host, Objective.Operation.REMOVE);
+        VirtualPortId virtualPortId = VirtualPortId.portId(ifaceId);
+        vPortStore.remove(virtualPortId);
     }
 
     private void programTunnelConfig(DeviceId localDeviceId, IpAddress localIp,
@@ -535,7 +537,6 @@ public class VTNManager implements VTNService {
                                               localTunnelPorts,
                                               type);
         } else if (type == Objective.Operation.REMOVE) {
-            vPortStore.remove(virtualPortId);
             if (networkOflocalHostPorts != null) {
                 l2ForwardService.programLocalBcastRules(deviceId, segmentationId,
                                                         inPort, networkOflocalHostPorts,

@@ -98,7 +98,7 @@ public final class L2ForwardServiceImpl implements L2ForwardService {
                     treatment.setOutput(outPort);
                 }
             }
-            if (type.equals(Objective.Operation.REMOVE) && inPort == lp) {
+            if (type == Objective.Operation.REMOVE && inPort.equals(lp)) {
                 flag = false;
             }
             treatment.group(new DefaultGroupId(GROUP_ID));