홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
lishuai
Committed by Gerrit Code Review
590d93ae 1 parent d61f2b1a

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

unsuccessfully.

Change-Id: I87f5744b23a444eb4eb56772111a0579e6ffdbf9
Inline Side-by-side
Showing 2 changed files with 3 additions and 2 deletions
...@@ -378,6 +378,8 @@ public class VTNManager implements VTNService { ...@@ -378,6 +378,8 @@ public class VTNManager implements VTNService {
378 applyHostMonitoredL2Rules(host, Objective.Operation.REMOVE); 378 applyHostMonitoredL2Rules(host, Objective.Operation.REMOVE);
379 // apply L3 openflow rules 379 // apply L3 openflow rules
380 applyHostMonitoredL3Rules(host, Objective.Operation.REMOVE); 380 applyHostMonitoredL3Rules(host, Objective.Operation.REMOVE);
381 + VirtualPortId virtualPortId = VirtualPortId.portId(ifaceId);
382 + vPortStore.remove(virtualPortId);
381 } 383 }
382 384
383 private void programTunnelConfig(DeviceId localDeviceId, IpAddress localIp, 385 private void programTunnelConfig(DeviceId localDeviceId, IpAddress localIp,
...@@ -535,7 +537,6 @@ public class VTNManager implements VTNService { ...@@ -535,7 +537,6 @@ public class VTNManager implements VTNService {
535 localTunnelPorts, 537 localTunnelPorts,
536 type); 538 type);
537 } else if (type == Objective.Operation.REMOVE) { 539 } else if (type == Objective.Operation.REMOVE) {
538 - vPortStore.remove(virtualPortId);
539 if (networkOflocalHostPorts != null) { 540 if (networkOflocalHostPorts != null) {
540 l2ForwardService.programLocalBcastRules(deviceId, segmentationId, 541 l2ForwardService.programLocalBcastRules(deviceId, segmentationId,
541 inPort, networkOflocalHostPorts, 542 inPort, networkOflocalHostPorts,
......
...@@ -98,7 +98,7 @@ public final class L2ForwardServiceImpl implements L2ForwardService { ...@@ -98,7 +98,7 @@ public final class L2ForwardServiceImpl implements L2ForwardService {
98 treatment.setOutput(outPort); 98 treatment.setOutput(outPort);
99 } 99 }
100 } 100 }
101 - if (type.equals(Objective.Operation.REMOVE) && inPort == lp) { 101 + if (type == Objective.Operation.REMOVE && inPort.equals(lp)) {
102 flag = false; 102 flag = false;
103 } 103 }
104 treatment.group(new DefaultGroupId(GROUP_ID)); 104 treatment.group(new DefaultGroupId(GROUP_ID));
......