[VOL-3655] Hardening: Cope with vendor-specific error-results of ONUs due to unsupported OMCI-MEs
[VOL-3642] Optimize logging with level "info" used for scale test
plus minor refactorizations
Change-Id: Ib2127048dc11bba55632494fb8aa77355b958900
diff --git a/internal/pkg/onuadaptercore/openonu.go b/internal/pkg/onuadaptercore/openonu.go
index bbf7c2a..946cdc9 100644
--- a/internal/pkg/onuadaptercore/openonu.go
+++ b/internal/pkg/onuadaptercore/openonu.go
@@ -214,7 +214,7 @@
//Process_inter_adapter_message sends messages to a target device (between adapters)
func (oo *OpenONUAC) Process_inter_adapter_message(msg *ic.InterAdapterMessage) error {
logger.Debugw("Process_inter_adapter_message", log.Fields{"msgId": msg.Header.Id,
- "msgProxyDeviceId": msg.Header.ProxyDeviceId, "msgToDeviceId": msg.Header.ToDeviceId})
+ "msgProxyDeviceId": msg.Header.ProxyDeviceId, "msgToDeviceId": msg.Header.ToDeviceId, "Type": msg.Header.Type})
var waitForDhInstPresent bool
//ToDeviceId should address a DeviceHandler instance
@@ -268,11 +268,11 @@
//Reconcile_device is called once when the adapter needs to re-create device - usually on core restart
func (oo *OpenONUAC) Reconcile_device(device *voltha.Device) error {
if device == nil {
- logger.Warn("voltha-device-is-nil")
+ logger.Warn("reconcile-device-voltha-device-is-nil")
return errors.New("nil-device")
}
ctx := context.Background()
- logger.Infow("Reconcile_device", log.Fields{"device-id": device.Id})
+ logger.Infow("reconcile-device", log.Fields{"device-id": device.Id})
var handler *deviceHandler
if handler = oo.getDeviceHandler(device.Id, false); handler == nil {
handler := newDeviceHandler(oo.coreProxy, oo.adapterProxy, oo.eventProxy, device, oo)
@@ -294,7 +294,7 @@
//Disable_device disables the given device
func (oo *OpenONUAC) Disable_device(device *voltha.Device) error {
- logger.Debugw("Disable_device", log.Fields{"device-id": device.Id})
+ logger.Infow("disable-device", log.Fields{"device-id": device.Id})
if handler := oo.getDeviceHandler(device.Id, false); handler != nil {
go handler.disableDevice(device)
return nil
@@ -305,7 +305,7 @@
//Reenable_device enables the onu device after disable
func (oo *OpenONUAC) Reenable_device(device *voltha.Device) error {
- logger.Debugw("Reenable_device", log.Fields{"device-id": device.Id})
+ logger.Infow("reenable-device", log.Fields{"device-id": device.Id})
if handler := oo.getDeviceHandler(device.Id, false); handler != nil {
go handler.reEnableDevice(device)
return nil
@@ -316,7 +316,7 @@
//Reboot_device reboots the given device
func (oo *OpenONUAC) Reboot_device(device *voltha.Device) error {
- logger.Debugw("Reboot-device", log.Fields{"device-id": device.Id})
+ logger.Infow("reboot-device", log.Fields{"device-id": device.Id})
if handler := oo.getDeviceHandler(device.Id, false); handler != nil {
go handler.rebootDevice(device)
return nil
@@ -332,7 +332,7 @@
// Delete_device deletes the given device
func (oo *OpenONUAC) Delete_device(device *voltha.Device) error {
- logger.Debugw("Delete_device", log.Fields{"device-id": device.Id, "SerialNumber": device.SerialNumber})
+ logger.Infow("delete-device", log.Fields{"device-id": device.Id, "SerialNumber": device.SerialNumber})
if handler := oo.getDeviceHandler(device.Id, false); handler != nil {
err := handler.deleteDevicePersistencyData()
//don't leave any garbage - even in error case
@@ -357,6 +357,7 @@
func (oo *OpenONUAC) Update_flows_incrementally(device *voltha.Device,
flows *openflow_13.FlowChanges, groups *openflow_13.FlowGroupChanges, flowMetadata *voltha.FlowMetadata) error {
+ logger.Infow("update-flows-incrementally", log.Fields{"device-id": device.Id})
//flow config is relayed to handler even if the device might be in some 'inactive' state
// let the handler or related FSM's decide, what to do with the modified flow state info
// at least the flow-remove must be done in respect to internal data, while OMCI activity might not be needed here