[VOL-5303]:Avoid reconciling the MEs with ONT
[VOL-5331] - Voltha DT PODTesets :: E2E pingtest fail
Change-Id: I7b105720435b970923b3ce86a7d37ed98a06c911
Signed-off-by: Praneeth Kumar Nalmas <praneeth.nalmas@radisys.com>
diff --git a/internal/pkg/core/openonu.go b/internal/pkg/core/openonu.go
index 9fa2597..f1b5581 100755
--- a/internal/pkg/core/openonu.go
+++ b/internal/pkg/core/openonu.go
@@ -21,15 +21,16 @@
"context"
"errors"
"fmt"
- grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/retry"
- "github.com/opencord/voltha-lib-go/v7/pkg/db"
- vgrpc "github.com/opencord/voltha-lib-go/v7/pkg/grpc"
- codes "google.golang.org/grpc/codes"
"hash/fnv"
"strings"
"sync"
"time"
+ grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/retry"
+ "github.com/opencord/voltha-lib-go/v7/pkg/db"
+ vgrpc "github.com/opencord/voltha-lib-go/v7/pkg/grpc"
+ codes "google.golang.org/grpc/codes"
+
conf "github.com/opencord/voltha-lib-go/v7/pkg/config"
"github.com/opencord/voltha-protos/v5/go/adapter_service"
"github.com/opencord/voltha-protos/v5/go/common"
@@ -97,6 +98,7 @@
dlToOnuTimeout4M time.Duration
rpcTimeout time.Duration
maxConcurrentFlowsPerUni int
+ skipOnuConfig bool
}
// NewOpenONUAC returns a new instance of OpenONU_AC
@@ -156,6 +158,7 @@
openOnuAc.pDownloadManager = swupg.NewAdapterDownloadManager(ctx)
openOnuAc.pFileManager = swupg.NewFileDownloadManager(ctx)
openOnuAc.pFileManager.SetDownloadTimeout(ctx, cfg.DownloadToAdapterTimeout)
+ openOnuAc.skipOnuConfig = cfg.SkipOnuConfig
return &openOnuAc
}
@@ -265,6 +268,7 @@
var handler *deviceHandler
if handler = oo.getDeviceHandler(ctx, device.Id, false); handler == nil {
handler := newDeviceHandler(ctx, oo.coreClient, oo.eventProxy, device, oo)
+ logger.Infow(ctx, "reconciling-device skip-onu-config value ", log.Fields{"device-id": device.Id, "parent-id": device.ParentId, "skip-onu-config": oo.skipOnuConfig})
oo.addDeviceHandlerToMap(ctx, handler)
handler.device = device
if err := handler.updateDeviceStateInCore(log.WithSpanFromContext(context.Background(), ctx), &ca.DeviceStateFilter{