Fix deleting VLANs on fabric

Change-Id: I980656b06c88c32551e549e8fd4b355ce9042a3e

@@ -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)
-                .forEach(cp -> removeForwarding(vlanId, cp.deviceId(), cp.port()));
+        Collection<ConnectPoint> ports = vlans.removeAll(vlanId);
+
+        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);