[ONOS-3596] update VTN's bug: delete local broadcast flows
unsuccessfully.
Change-Id: I87f5744b23a444eb4eb56772111a0579e6ffdbf9
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,
diff --git a/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/L2ForwardServiceImpl.java b/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/L2ForwardServiceImpl.java
index 3581cf6..c8231b0 100644
--- a/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/L2ForwardServiceImpl.java
+++ b/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/L2ForwardServiceImpl.java
@@ -98,7 +98,7 @@
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));