[VOL-3756] openonu-adapter-go: Allow reception of OMCI messages via inter-adapter messageType 'OmciResponse' and smaller changes for OnuSwUpgrade preparation
Change-Id: I7392360cd95f07bd6de5b6c4f3decb7a7d878fa2
diff --git a/internal/pkg/onuadaptercore/device_handler.go b/internal/pkg/onuadaptercore/device_handler.go
index 758bf9e..64e8f24 100644
--- a/internal/pkg/onuadaptercore/device_handler.go
+++ b/internal/pkg/onuadaptercore/device_handler.go
@@ -299,7 +299,7 @@
}
-func (dh *deviceHandler) processInterAdapterOMCIReqMessage(ctx context.Context, msg *ic.InterAdapterMessage) error {
+func (dh *deviceHandler) processInterAdapterOMCIReceiveMessage(ctx context.Context, msg *ic.InterAdapterMessage) error {
msgBody := msg.GetBody()
omciMsg := &ic.InterAdapterOmciMessage{}
if err := ptypes.UnmarshalAny(msgBody, omciMsg); err != nil {
@@ -546,9 +546,10 @@
switch msgType {
// case ic.InterAdapterMessageType_ONU_IND_REQUEST: was handled by OpenONUAC already - see comments there
- case ic.InterAdapterMessageType_OMCI_REQUEST:
+ //OMCI_RESPONSE also accepted acc. to VOL-3756 (OMCI_REQUEST request was legacy code)
+ case ic.InterAdapterMessageType_OMCI_RESPONSE, ic.InterAdapterMessageType_OMCI_REQUEST:
{
- return dh.processInterAdapterOMCIReqMessage(ctx, msg)
+ return dh.processInterAdapterOMCIReceiveMessage(ctx, msg)
}
case ic.InterAdapterMessageType_TECH_PROFILE_DOWNLOAD_REQUEST:
{
@@ -958,7 +959,10 @@
func (dh *deviceHandler) doOnuSwUpgrade(ctx context.Context, apImageDsc *voltha.ImageDownload) error {
logger.Warnw(ctx, "onuSwUpgrade not yet implemented in deviceHandler", log.Fields{
"device-id": dh.deviceID, "image-name": (*apImageDsc).Name})
- return fmt.Errorf("onuSwUpgrade not yet implemented in deviceHandler: %s", dh.deviceID)
+ //return success to comfort the core processing during integration
+ return nil
+ // TODO!!: also verify error response behavior
+ //return fmt.Errorf("onuSwUpgrade not yet implemented in deviceHandler: %s", dh.deviceID)
}
// deviceHandler methods that implement the adapters interface requests## end #########