VOL-1163 Remove all subscriber flows on ONU delete
Change-Id: I2a62980ee6dacdd9fb3721e651f0a0637ba538ed
diff --git a/app/src/main/java/org/opencord/olt/impl/Olt.java b/app/src/main/java/org/opencord/olt/impl/Olt.java
index 19a4822..87a9b96 100644
--- a/app/src/main/java/org/opencord/olt/impl/Olt.java
+++ b/app/src/main/java/org/opencord/olt/impl/Olt.java
@@ -691,27 +691,10 @@
}
break;
case PORT_REMOVED:
- String portName = event.port().annotations().value(AnnotationKeys.PORT_NAME);
- SubscriberAndDeviceInformation subscriber = subsService.get(portName);
- if (subscriber == null) {
- log.warn("Subscriber {} not found", portName);
- break;
- }
-
- Port uplinkPort = getUplinkPort(dev);
- if (uplinkPort == null) {
- log.warn("No uplink port found for device {}", dev);
- break;
- }
-
- Optional<VlanId> defaultVlan = Optional.empty();
- unprovisionSubscriber(devId, uplinkPort.number(),
- event.port().number(),
- subscriber.cTag(), subscriber.sTag(), defaultVlan);
-
if (isUniPort(dev, event.port())) {
if (event.port().isEnabled()) {
processFilteringObjectives(devId, event.port().number(), false);
+ removeSubscriber(new ConnectPoint(devId, event.port().number()));
}
post(new AccessDeviceEvent(AccessDeviceEvent.Type.UNI_REMOVED, devId, event.port()));