mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-12-06 09:51:23 +01:00
Code Issues Projects Releases Wiki Activity

Fix deleting VLANs on fabric

Browse Source 
Change-Id: I980656b06c88c32551e549e8fd4b355ce9042a3e
This commit is contained in:
Jonathan Hart 2015-06-10 14:06:51 -07:00 committed by Gerrit Code Review
parent 4deb0e8de7
commit ab8b0c075e
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/cordfabric/src/main/java/org/onosproject/cordfabric/CordFabricManager.java
View File

@ -49,6 +49,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -240,8 +241,13 @@ public class CordFabricManager implements FabricService {
@Override @Override
public void removeVlan(VlanId vlanId) { public void removeVlan(VlanId vlanId) {
vlans.removeAll(vlanId) Collection<ConnectPoint> ports = vlans.removeAll(vlanId);
.forEach(cp -> removeForwarding(vlanId, cp.deviceId(), cp.port()));
ports.forEach(cp -> removeForwarding(vlanId, cp.deviceId(), cp.port(),
ports.stream()
.filter(p -> p != cp)
.map(ConnectPoint::port)
.collect(Collectors.toList())));
} }
@Override @Override
@ -287,19 +293,24 @@ public class CordFabricManager implements FabricService {
flowObjectiveService.forward(deviceId, objective); flowObjectiveService.forward(deviceId, objective);
} }
private void removeForwarding(VlanId vlanId, DeviceId deviceId, PortNumber inPort) { private void removeForwarding(VlanId vlanId, DeviceId deviceId, PortNumber inPort,
List<PortNumber> outPorts) {
TrafficSelector selector = DefaultTrafficSelector.builder() TrafficSelector selector = DefaultTrafficSelector.builder()
.matchVlanId(vlanId) .matchVlanId(vlanId)
.matchInPort(inPort) .matchInPort(inPort)
.build(); .build();
TrafficTreatment.Builder treatmentBuilder = DefaultTrafficTreatment.builder();
outPorts.forEach(p -> treatmentBuilder.setOutput(p));
ForwardingObjective objective = DefaultForwardingObjective.builder() ForwardingObjective objective = DefaultForwardingObjective.builder()
.fromApp(appId) .fromApp(appId)
.makePermanent() .makePermanent()
.withFlag(ForwardingObjective.Flag.VERSATILE) .withFlag(ForwardingObjective.Flag.VERSATILE)
.withPriority(PRIORITY) .withPriority(PRIORITY)
.withSelector(selector) .withSelector(selector)
.withTreatment(DefaultTrafficTreatment.builder().build()) .withTreatment(treatmentBuilder.build())
.remove(new ObjectiveHandler()); .remove(new ObjectiveHandler());
flowObjectiveService.forward(deviceId, objective); flowObjectiveService.forward(deviceId, objective);