[VOL-3668] Restrict race condition workaround Adopt_device/ONU_IND to onu-setup-procedure
Change-Id: I87eae979aa7b4fcfb36297f71525086c90f596ce
diff --git a/internal/pkg/onuadaptercore/device_handler.go b/internal/pkg/onuadaptercore/device_handler.go
index 7328abd..fbb324e 100644
--- a/internal/pkg/onuadaptercore/device_handler.go
+++ b/internal/pkg/onuadaptercore/device_handler.go
@@ -261,33 +261,6 @@
return fmt.Errorf("no valid OnuDevice: %s", dh.deviceID)
}
-func (dh *deviceHandler) processInterAdapterONUIndReqMessage(msg *ic.InterAdapterMessage) error {
- msgBody := msg.GetBody()
- onuIndication := &oop.OnuIndication{}
- if err := ptypes.UnmarshalAny(msgBody, onuIndication); err != nil {
- logger.Warnw("onu-ind-request-cannot-unmarshal-msg-body", log.Fields{
- "device-id": dh.deviceID, "error": err})
- return err
- }
-
- onuOperstate := onuIndication.GetOperState()
- logger.Infow("onu-ind-request", log.Fields{"device-id": dh.deviceID,
- "OnuId": onuIndication.GetOnuId(),
- "AdminState": onuIndication.GetAdminState(), "OperState": onuOperstate,
- "SNR": onuIndication.GetSerialNumber()})
-
- //interface related functions might be error checked ....
- if onuOperstate == "up" {
- _ = dh.createInterface(onuIndication)
- } else if (onuOperstate == "down") || (onuOperstate == "unreachable") {
- _ = dh.updateInterface(onuIndication)
- } else {
- logger.Errorw("unknown-onu-indication operState", log.Fields{"OnuId": onuIndication.GetOnuId()})
- return fmt.Errorf("invalidOperState: %s, %s", onuOperstate, dh.deviceID)
- }
- return nil
-}
-
func (dh *deviceHandler) processInterAdapterTechProfileDownloadReqMessage(
msg *ic.InterAdapterMessage) error {
@@ -506,14 +479,11 @@
"fromTopic": fromTopic, "toTopic": toTopic, "toDeviceID": toDeviceID, "proxyDeviceID": proxyDeviceID})
switch msgType {
+ // case ic.InterAdapterMessageType_ONU_IND_REQUEST: was handled by OpenONUAC already - see comments there
case ic.InterAdapterMessageType_OMCI_REQUEST:
{
return dh.processInterAdapterOMCIReqMessage(msg)
}
- case ic.InterAdapterMessageType_ONU_IND_REQUEST:
- {
- return dh.processInterAdapterONUIndReqMessage(msg)
- }
case ic.InterAdapterMessageType_TECH_PROFILE_DOWNLOAD_REQUEST:
{
return dh.processInterAdapterTechProfileDownloadReqMessage(msg)