commit 590d93aeb6bc26ea5b7a58da7375cc6ad7304e25
author lishuai <lishuai12@huawei.com> Fri Dec 11 13:05:14 2015 +0800
committer Gerrit Code Review <gerrit@onlab.us> Fri Dec 11 05:48:33 2015 +0000
tree 8b12cb7f1801f79347f5e17306291702540af5c9
parent d61f2b1a545d1b2536003efcdeba1ca137fdf7d0

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

Change-Id: I87f5744b23a444eb4eb56772111a0579e6ffdbf9

apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/VTNManager.java

diff --git a/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/VTNManager.java b/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/VTNManager.java
index 95a320f..9213a84 100644
--- a/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/VTNManager.java
+++ b/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/VTNManager.java
@@ -378,6 +378,8 @@
         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 @@
                                               localTunnelPorts,
                                               type);
         } else if (type == Objective.Operation.REMOVE) {
-            vPortStore.remove(virtualPortId);
             if (networkOflocalHostPorts != null) {
                 l2ForwardService.programLocalBcastRules(deviceId, segmentationId,
                                                         inPort, networkOflocalHostPorts,