[VOL-4688] openonuAdapterGo: OMCI extended message set - derive the capability from the OMCC version
Do not merge before https://gerrit.opencord.org/c/bbsim/+/32128
Change-Id: I800f1bae3b696f320c63c80336a22f187b9c947c
diff --git a/internal/pkg/core/device_handler.go b/internal/pkg/core/device_handler.go
index 5b67345..b05cd10 100755
--- a/internal/pkg/core/device_handler.go
+++ b/internal/pkg/core/device_handler.go
@@ -2004,7 +2004,7 @@
/* this might be a good time for Omci Verify message? */
verifyExec := make(chan bool)
omciVerify := otst.NewOmciTestRequest(log.WithSpanFromContext(context.TODO(), ctx),
- dh.device.Id, pDevEntry.PDevOmciCC,
+ dh.device.Id, pDevEntry.PDevOmciCC, false,
true, true) //exclusive and allowFailure (anyway not yet checked)
omciVerify.PerformOmciTest(log.WithSpanFromContext(context.TODO(), ctx), verifyExec)
@@ -2012,7 +2012,7 @@
after Timeout start and try MibUpload FSM anyway
(to prevent stopping on just not supported OMCI verification from ONU) */
select {
- case <-time.After(pDevEntry.PDevOmciCC.GetMaxOmciTimeoutWithRetries() * time.Second):
+ case <-time.After(((cmn.CDefaultRetries+1)*otst.CTestRequestOmciTimeout + 1) * time.Second):
logger.Warnw(ctx, "omci start-verification timed out (continue normal)", log.Fields{"device-id": dh.DeviceID})
case testresult := <-verifyExec:
logger.Infow(ctx, "Omci start verification done", log.Fields{"device-id": dh.DeviceID, "result": testresult})