[VOL-4553] openonuAdapterGo - reconciling with wrong MDS is not working in TT multi-UNI scenario
Change-Id: I3a49d3560c942168fbac53e0c503abfea785be23
diff --git a/internal/pkg/avcfg/omci_vlan_config.go b/internal/pkg/avcfg/omci_vlan_config.go
index 3194242..668d2c6 100755
--- a/internal/pkg/avcfg/omci_vlan_config.go
+++ b/internal/pkg/avcfg/omci_vlan_config.go
@@ -1327,15 +1327,15 @@
}(pConfigVlanStateBaseFsm)
return
}
+ if oFsm.lastFlowToReconcile {
+ //note: lastFlowToReconcile does not mean that this block may run only once within reconcilement here,
+ // due to asynchronous event processing from SetUniFlowParams() it may be executed multiple times
+ logger.Debugw(ctx, "reconciling - flow processing finished", log.Fields{
+ "device-id": oFsm.deviceID, "uni-id": oFsm.pOnuUniPort.UniID})
+ oFsm.pDeviceHandler.SendChUniVlanConfigFinished(uint16(oFsm.pOnuUniPort.UniID))
+ }
if oFsm.pDeviceHandler.IsSkipOnuConfigReconciling() {
oFsm.ConfiguredUniFlow = oFsm.NumUniFlows
- if oFsm.lastFlowToReconcile {
- //note: lastFlowToReconcile does not mean that this block may run only once within reconcilement here,
- // due to asynchronous event processing from SetUniFlowParams() it may be executed multiple times
- logger.Debugw(ctx, "reconciling - flow processing finished", log.Fields{
- "device-id": oFsm.deviceID, "uni-id": oFsm.pOnuUniPort.UniID})
- oFsm.pDeviceHandler.SendChUniVlanConfigFinished(uint16(oFsm.pOnuUniPort.UniID))
- }
logger.Debugw(ctx, "reconciling - skip enterVlanConfigDone processing",
log.Fields{"NumUniFlows": oFsm.NumUniFlows, "ConfiguredUniFlow": oFsm.ConfiguredUniFlow, "device-id": oFsm.deviceID})
oFsm.mutexFlowParams.Unlock()