[VOL-3955] Sporadically an ONU does not reach pre-reconciling reason in multiple ONU-scenario
Change-Id: I7d40a894d2f0852e3036fd99bd7d8bb7309df7f0
diff --git a/internal/pkg/onuadaptercore/omci_vlan_config.go b/internal/pkg/onuadaptercore/omci_vlan_config.go
index 4660e95..5d46208 100644
--- a/internal/pkg/onuadaptercore/omci_vlan_config.go
+++ b/internal/pkg/onuadaptercore/omci_vlan_config.go
@@ -1001,13 +1001,13 @@
}(pConfigVlanStateBaseFsm)
return
}
+ if oFsm.pDeviceHandler.isSkipOnuConfigReconciling() {
+ oFsm.configuredUniFlow = oFsm.numUniFlows
+ logger.Debugw(ctx, "reconciling - skip enterVlanConfigDone processing",
+ log.Fields{"numUniFlows": oFsm.numUniFlows, "configuredUniFlow": oFsm.configuredUniFlow, "device-id": oFsm.deviceID})
+ return
+ }
if oFsm.numUniFlows > oFsm.configuredUniFlow {
- if oFsm.pDeviceHandler.isSkipOnuConfigReconciling() {
- oFsm.configuredUniFlow = oFsm.numUniFlows
- logger.Debugw(ctx, "reconciling - skip enterVlanConfigDone processing",
- log.Fields{"numUniFlows": oFsm.numUniFlows, "configuredUniFlow": oFsm.configuredUniFlow, "device-id": oFsm.deviceID})
- return
- }
if oFsm.configuredUniFlow == 0 {
// this is a restart with a complete new flow, we can re-use the initial flow config control
// including the check, if the related techProfile is (still) available (probably also removed in between)