[VOL-4718] openonuAdapterGo: OMCI extended message set - support SW upgrade
This feature was implemented according to ITU-T G.988 Amendment 3 (03/2020) and tested with BBSIM ONU.
Once you have tested it with real ONU hardware supporting OMCI extended message set, please share your results with the community.
Change-Id: Ibf5d0871c48c4b9086fd19755afa7594490840dd
diff --git a/VERSION b/VERSION
index d0db356..530cdd9 100755
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.4-dev285
+2.2.4
diff --git a/internal/pkg/common/omci_cc.go b/internal/pkg/common/omci_cc.go
index 71c8116..45ee429 100755
--- a/internal/pkg/common/omci_cc.go
+++ b/internal/pkg/common/omci_cc.go
@@ -878,23 +878,22 @@
}
// SendMibUpload sends MibUploadRequest
-func (oo *OmciCC) SendMibUpload(ctx context.Context, timeout int, highPrio bool) error {
+func (oo *OmciCC) SendMibUpload(ctx context.Context, timeout int, highPrio bool, isExtOmciSupported bool) error {
logger.Debugw(ctx, "send MibUpload-msg to:", log.Fields{"device-id": oo.deviceID})
tid := oo.GetNextTid(highPrio)
- isExtended := oo.pOnuDeviceEntry.GetPersIsExtOmciSupported()
omciLayer := &omci.OMCI{
TransactionID: tid,
MessageType: omci.MibUploadRequestType,
}
- if isExtended {
+ if isExtOmciSupported {
omciLayer.DeviceIdentifier = omci.ExtendedIdent
}
request := &omci.MibUploadRequest{
MeBasePacket: omci.MeBasePacket{
EntityClass: me.OnuDataClassID,
- Extended: isExtended,
+ Extended: isExtOmciSupported,
},
}
var options gopacket.SerializeOptions
@@ -918,23 +917,22 @@
}
// SendMibUploadNext sends MibUploadNextRequest
-func (oo *OmciCC) SendMibUploadNext(ctx context.Context, timeout int, highPrio bool) error {
+func (oo *OmciCC) SendMibUploadNext(ctx context.Context, timeout int, highPrio bool, isExtOmciSupported bool) error {
logger.Debugw(ctx, "send MibUploadNext-msg to:", log.Fields{"device-id": oo.deviceID, "UploadSequNo": oo.UploadSequNo})
tid := oo.GetNextTid(highPrio)
- isExtended := oo.pOnuDeviceEntry.GetPersIsExtOmciSupported()
omciLayer := &omci.OMCI{
TransactionID: tid,
MessageType: omci.MibUploadNextRequestType,
}
- if isExtended {
+ if isExtOmciSupported {
omciLayer.DeviceIdentifier = omci.ExtendedIdent
}
request := &omci.MibUploadNextRequest{
MeBasePacket: omci.MeBasePacket{
EntityClass: me.OnuDataClassID,
- Extended: isExtended,
+ Extended: isExtOmciSupported,
},
CommandSequenceNumber: oo.UploadSequNo,
}
@@ -4214,7 +4212,7 @@
// SendStartSoftwareDownload sends StartSoftwareDownloadRequest
func (oo *OmciCC) SendStartSoftwareDownload(ctx context.Context, timeout int, highPrio bool,
- rxChan chan Message, aImageMeID uint16, aDownloadWindowSize uint8, aFileLen uint32) error {
+ rxChan chan Message, aImageMeID uint16, aDownloadWindowSize uint8, aFileLen uint32, aIsExtendedOmci bool) error {
tid := oo.GetNextTid(highPrio)
logger.Debugw(ctx, "send StartSwDlRequest:", log.Fields{"device-id": oo.deviceID,
"SequNo": strconv.FormatInt(int64(tid), 16),
@@ -4226,10 +4224,14 @@
// DeviceIdentifier: omci.BaselineIdent, // Optional, defaults to Baseline
// Length: 0x28, // Optional, defaults to 40 octets
}
+ if aIsExtendedOmci {
+ omciLayer.DeviceIdentifier = omci.ExtendedIdent
+ }
request := &omci.StartSoftwareDownloadRequest{
MeBasePacket: omci.MeBasePacket{
EntityClass: me.SoftwareImageClassID,
EntityInstance: aImageMeID, //inactive image
+ Extended: aIsExtendedOmci,
},
WindowSize: aDownloadWindowSize,
ImageSize: aFileLen,
@@ -4266,7 +4268,7 @@
//GetOnuSwSecNextTid can be invoked without further locking
func (oo *OmciCC) PrepareOnuSectionsOfWindow(ctx context.Context,
aImageMeID uint16, aAckRequest uint8, aDownloadSectionNo uint8, aSection []byte,
- omciMsgsPerWindow *ia.OmciMessages) (OmciTransferStructure, error) {
+ omciMsgsPerWindow *ia.OmciMessages, aIsExtendedOmci bool) (OmciTransferStructure, error) {
//onuswsections uses only low prioirity tids
tid := oo.GetOnuSwSecNextTid()
logger.Infow(ctx, "send DlSectionRequest:", log.Fields{"device-id": oo.deviceID,
@@ -4286,6 +4288,9 @@
// DeviceIdentifier: omci.BaselineIdent, // Optional, defaults to Baseline
// Length: 0x28, // Optional, defaults to 40 octets
}
+ if aIsExtendedOmci {
+ omciLayer.DeviceIdentifier = omci.ExtendedIdent
+ }
localSectionData := make([]byte, len(aSection))
copy(localSectionData[:], aSection) // as long as DownloadSectionRequest defines array for SectionData we need to copy into the array
@@ -4293,6 +4298,7 @@
MeBasePacket: omci.MeBasePacket{
EntityClass: me.SoftwareImageClassID,
EntityInstance: aImageMeID, //inactive image
+ Extended: aIsExtendedOmci,
},
SectionNumber: aDownloadSectionNo,
SectionData: localSectionData,
@@ -4419,7 +4425,7 @@
// SendDownloadSection sends DownloadSectionRequestWithResponse
func (oo *OmciCC) SendDownloadSection(ctx context.Context, aTimeout int, highPrio bool,
- rxChan chan Message, aImageMeID uint16, aAckRequest uint8, aDownloadSectionNo uint8, aSection []byte, aPrint bool) error {
+ rxChan chan Message, aImageMeID uint16, aAckRequest uint8, aDownloadSectionNo uint8, aSection []byte, aPrint bool, aIsExtendedOmci bool) error {
tid := oo.GetNextTid(highPrio)
logger.Debugw(ctx, "send DlSectionRequest:", log.Fields{"device-id": oo.deviceID,
"SequNo": strconv.FormatInt(int64(tid), 16),
@@ -4439,6 +4445,9 @@
// DeviceIdentifier: omci.BaselineIdent, // Optional, defaults to Baseline
// Length: 0x28, // Optional, defaults to 40 octets
}
+ if aIsExtendedOmci {
+ omciLayer.DeviceIdentifier = omci.ExtendedIdent
+ }
localSectionData := make([]byte, len(aSection))
copy(localSectionData[:], aSection) // as long as DownloadSectionRequest defines array for SectionData we need to copy into the array
@@ -4446,6 +4455,7 @@
MeBasePacket: omci.MeBasePacket{
EntityClass: me.SoftwareImageClassID,
EntityInstance: aImageMeID, //inactive image
+ Extended: aIsExtendedOmci,
},
SectionNumber: aDownloadSectionNo,
SectionData: localSectionData,
@@ -4485,7 +4495,7 @@
//SendEndSoftwareDownload sends EndSoftwareDownloadRequest
func (oo *OmciCC) SendEndSoftwareDownload(ctx context.Context, timeout int, highPrio bool,
- rxChan chan Message, aImageMeID uint16, aFileLen uint32, aImageCrc uint32) error {
+ rxChan chan Message, aImageMeID uint16, aFileLen uint32, aImageCrc uint32, aIsExtendedOmci bool) error {
tid := oo.GetNextTid(highPrio)
logger.Debugw(ctx, "send EndSwDlRequest:", log.Fields{"device-id": oo.deviceID,
"SequNo": strconv.FormatInt(int64(tid), 16),
@@ -4497,10 +4507,14 @@
// DeviceIdentifier: omci.BaselineIdent, // Optional, defaults to Baseline
// Length: 0x28, // Optional, defaults to 40 octets
}
+ if aIsExtendedOmci {
+ omciLayer.DeviceIdentifier = omci.ExtendedIdent
+ }
request := &omci.EndSoftwareDownloadRequest{
MeBasePacket: omci.MeBasePacket{
EntityClass: me.SoftwareImageClassID,
EntityInstance: aImageMeID, //inactive image
+ Extended: aIsExtendedOmci,
},
CRC32: aImageCrc,
ImageSize: aFileLen,
@@ -4534,7 +4548,7 @@
// SendActivateSoftware sends ActivateSoftwareRequest
func (oo *OmciCC) SendActivateSoftware(ctx context.Context, timeout int, highPrio bool,
- rxChan chan Message, aImageMeID uint16) error {
+ rxChan chan Message, aImageMeID uint16, aIsExtendedOmci bool) error {
tid := oo.GetNextTid(highPrio)
logger.Debugw(ctx, "send ActivateSwRequest:", log.Fields{"device-id": oo.deviceID,
"SequNo": strconv.FormatInt(int64(tid), 16),
@@ -4546,10 +4560,14 @@
// DeviceIdentifier: omci.BaselineIdent, // Optional, defaults to Baseline
// Length: 0x28, // Optional, defaults to 40 octets
}
+ if aIsExtendedOmci {
+ omciLayer.DeviceIdentifier = omci.ExtendedIdent
+ }
request := &omci.ActivateSoftwareRequest{
MeBasePacket: omci.MeBasePacket{
EntityClass: me.SoftwareImageClassID,
EntityInstance: aImageMeID, //inactive image
+ Extended: aIsExtendedOmci,
},
ActivateFlags: 0, //unconditionally reset as the only relevant option here (regardless of VOIP)
}
@@ -4580,7 +4598,7 @@
// SendCommitSoftware sends CommitSoftwareRequest
func (oo *OmciCC) SendCommitSoftware(ctx context.Context, timeout int, highPrio bool,
- rxChan chan Message, aImageMeID uint16) error {
+ rxChan chan Message, aImageMeID uint16, aIsExtendedOmci bool) error {
tid := oo.GetNextTid(highPrio)
logger.Debugw(ctx, "send CommitSwRequest:", log.Fields{"device-id": oo.deviceID,
"SequNo": strconv.FormatInt(int64(tid), 16),
@@ -4592,10 +4610,14 @@
// DeviceIdentifier: omci.BaselineIdent, // Optional, defaults to Baseline
// Length: 0x28, // Optional, defaults to 40 octets
}
+ if aIsExtendedOmci {
+ omciLayer.DeviceIdentifier = omci.ExtendedIdent
+ }
request := &omci.CommitSoftwareRequest{
MeBasePacket: omci.MeBasePacket{
EntityClass: me.SoftwareImageClassID,
EntityInstance: aImageMeID, //inactive image
+ Extended: aIsExtendedOmci,
},
}
diff --git a/internal/pkg/mib/mib_sync.go b/internal/pkg/mib/mib_sync.go
index 60eb72f..9c18f65 100755
--- a/internal/pkg/mib/mib_sync.go
+++ b/internal/pkg/mib/mib_sync.go
@@ -312,7 +312,8 @@
func (oo *OnuDeviceEntry) enterUploadingState(ctx context.Context, e *fsm.Event) {
logger.Debugw(ctx, "MibSync FSM", log.Fields{"send MibUpload in State": e.FSM.Current(), "device-id": oo.deviceID})
- _ = oo.PDevOmciCC.SendMibUpload(log.WithSpanFromContext(context.TODO(), ctx), oo.baseDeviceHandler.GetOmciTimeout(), true)
+ _ = oo.PDevOmciCC.SendMibUpload(log.WithSpanFromContext(context.TODO(), ctx),
+ oo.baseDeviceHandler.GetOmciTimeout(), true, oo.GetPersIsExtOmciSupported())
//even though lastTxParameters are currently not used for checking the ResetResponse message we have to ensure
// that the lastTxMessageType is correctly set to avoid misinterpreting other responses
oo.mutexLastTxParamStruct.Lock()
@@ -619,7 +620,8 @@
/* to be verified / reworked !!! */
oo.PDevOmciCC.UploadNoOfCmds = msgObj.NumberOfCommands
if oo.PDevOmciCC.UploadSequNo < oo.PDevOmciCC.UploadNoOfCmds {
- _ = oo.PDevOmciCC.SendMibUploadNext(log.WithSpanFromContext(context.TODO(), ctx), oo.baseDeviceHandler.GetOmciTimeout(), true)
+ _ = oo.PDevOmciCC.SendMibUploadNext(log.WithSpanFromContext(context.TODO(), ctx),
+ oo.baseDeviceHandler.GetOmciTimeout(), true, oo.GetPersIsExtOmciSupported())
//even though lastTxParameters are currently not used for checking the ResetResponse message we have to ensure
// that the lastTxMessageType is correctly set to avoid misinterpreting other responses
oo.mutexLastTxParamStruct.Lock()
@@ -723,7 +725,8 @@
}
}
if oo.PDevOmciCC.UploadSequNo < oo.PDevOmciCC.UploadNoOfCmds {
- _ = oo.PDevOmciCC.SendMibUploadNext(log.WithSpanFromContext(context.TODO(), ctx), oo.baseDeviceHandler.GetOmciTimeout(), true)
+ _ = oo.PDevOmciCC.SendMibUploadNext(log.WithSpanFromContext(context.TODO(), ctx),
+ oo.baseDeviceHandler.GetOmciTimeout(), true, oo.GetPersIsExtOmciSupported())
//even though lastTxParameters are currently not used for checking the ResetResponse message we have to ensure
// that the lastTxMessageType is correctly set to avoid misinterpreting other responses
oo.mutexLastTxParamStruct.Lock()
diff --git a/internal/pkg/swupg/omci_onu_upgrade.go b/internal/pkg/swupg/omci_onu_upgrade.go
index 481f349..196daf3 100755
--- a/internal/pkg/swupg/omci_onu_upgrade.go
+++ b/internal/pkg/swupg/omci_onu_upgrade.go
@@ -40,8 +40,10 @@
const (
// internal predefined values - some off them should later be configurable (perhaps with theses as defaults)
- cOmciDownloadSectionSize = 31 //in bytes
- cOmciDownloadWindowSizeLimit = 31 //in sections for window offset (windowSize(32)-1)
+ cOmciDownloadSectionSizeBaseLine = 31 //in bytes
+ cOmciDownloadWindowSizeLimitBaseLine = 31 //in sections for window offset (windowSize(32)-1)
+ cOmciDownloadSectionSizeExtLine = 1965 //in bytes
+ cOmciDownloadWindowSizeLimitExtLine = 7 //in sections for window offset (windowSize(8)-1)
//cOmciDownloadWindowRetryMax = 2 // max attempts for a specific window
cOmciSectionInterleaveMilliseconds = 0 //DownloadSection interleave time in milliseconds (0 for no delay)
cOmciEndSwDlDelaySeconds = 1 //End Software Download delay after last section (may be also configurable?)
@@ -188,6 +190,8 @@
volthaImageState voltha.ImageState_ImageActivationState
isEndSwDlOpen bool
chReceiveAbortEndSwDlResponse chan tEndSwDlResponseResult
+ isExtendedOmci bool
+ omciDownloadSectionSize int64
}
//NewOnuUpgradeFsm is the 'constructor' for the state machine to config the PON ANI ports
@@ -196,22 +200,21 @@
apDevEntry cmn.IonuDeviceEntry, apOnuDB *devdb.OnuDeviceDB,
aRequestEvent cmn.OnuDeviceEvent, aName string, aCommChannel chan cmn.Message) *OnuUpgradeFsm {
instFsm := &OnuUpgradeFsm{
- pDeviceHandler: apDeviceHandler,
- deviceID: apDeviceHandler.GetDeviceID(),
- pDevEntry: apDevEntry,
- pOmciCC: apDevEntry.GetDevOmciCC(),
- pOnuDB: apOnuDB,
- requestEvent: aRequestEvent,
- omciDownloadWindowSizeLimit: cOmciDownloadWindowSizeLimit,
- omciSectionInterleaveDelay: cOmciSectionInterleaveMilliseconds,
- downloadToOnuTimeout4MB: apDeviceHandler.GetDlToOnuTimeout4M(),
- waitCountEndSwDl: cWaitCountEndSwDl,
- waitDelayEndSwDl: cWaitDelayEndSwDlSeconds,
- upgradePhase: cUpgradeUndefined,
- volthaDownloadState: voltha.ImageState_DOWNLOAD_UNKNOWN,
- volthaDownloadReason: voltha.ImageState_NO_ERROR,
- volthaImageState: voltha.ImageState_IMAGE_UNKNOWN,
- abortRequested: voltha.ImageState_NO_ERROR,
+ pDeviceHandler: apDeviceHandler,
+ deviceID: apDeviceHandler.GetDeviceID(),
+ pDevEntry: apDevEntry,
+ pOmciCC: apDevEntry.GetDevOmciCC(),
+ pOnuDB: apOnuDB,
+ requestEvent: aRequestEvent,
+ omciSectionInterleaveDelay: cOmciSectionInterleaveMilliseconds,
+ downloadToOnuTimeout4MB: apDeviceHandler.GetDlToOnuTimeout4M(),
+ waitCountEndSwDl: cWaitCountEndSwDl,
+ waitDelayEndSwDl: cWaitDelayEndSwDlSeconds,
+ upgradePhase: cUpgradeUndefined,
+ volthaDownloadState: voltha.ImageState_DOWNLOAD_UNKNOWN,
+ volthaDownloadReason: voltha.ImageState_NO_ERROR,
+ volthaImageState: voltha.ImageState_IMAGE_UNKNOWN,
+ abortRequested: voltha.ImageState_NO_ERROR,
}
instFsm.chReceiveExpectedResponse = make(chan bool)
instFsm.chAdapterDlReady = make(chan bool)
@@ -219,6 +222,15 @@
instFsm.chOnuDlReady = make(chan bool)
instFsm.chReceiveAbortEndSwDlResponse = make(chan tEndSwDlResponseResult)
+ instFsm.isExtendedOmci = instFsm.pDevEntry.GetPersIsExtOmciSupported()
+ if instFsm.isExtendedOmci {
+ instFsm.omciDownloadSectionSize = cOmciDownloadSectionSizeExtLine
+ instFsm.omciDownloadWindowSizeLimit = cOmciDownloadWindowSizeLimitExtLine
+ } else {
+ instFsm.omciDownloadSectionSize = cOmciDownloadSectionSizeBaseLine
+ instFsm.omciDownloadWindowSizeLimit = cOmciDownloadWindowSizeLimitBaseLine
+ }
+
instFsm.PAdaptFsm = cmn.NewAdapterFsm(aName, instFsm.deviceID, aCommChannel)
if instFsm.PAdaptFsm == nil {
logger.Errorw(ctx, "OnuUpgradeFsm's AdapterFsm could not be instantiated!!", log.Fields{
@@ -670,16 +682,20 @@
return
}
//provide slice capacity already with the reserve of one section to avoid inflation of the slice to double size at append
- oFsm.imageBuffer = make([]byte, fileLen, fileLen+cOmciDownloadSectionSize)
+ oFsm.imageBuffer = make([]byte, fileLen, fileLen+oFsm.omciDownloadSectionSize)
//better use a copy of the read image buffer in case the buffer/file is modified from outside,
// this also limits the slice len to the expected maximum fileLen
copy(oFsm.imageBuffer, imageBuffer)
- oFsm.noOfSections = uint32(fileLen / cOmciDownloadSectionSize)
- if fileLen%cOmciDownloadSectionSize > 0 {
- bufferPadding := make([]byte, cOmciDownloadSectionSize-uint32((fileLen)%cOmciDownloadSectionSize))
- //expand the imageBuffer to exactly fit multiples of cOmciDownloadSectionSize with padding
- oFsm.imageBuffer = append(oFsm.imageBuffer, bufferPadding...)
+ oFsm.noOfSections = uint32(fileLen / oFsm.omciDownloadSectionSize)
+ if fileLen%oFsm.omciDownloadSectionSize > 0 {
+ // Because the extended message format allows for variable length,
+ // software image sections are only padded in baseline message format
+ if !oFsm.isExtendedOmci {
+ bufferPadding := make([]byte, oFsm.omciDownloadSectionSize-fileLen%oFsm.omciDownloadSectionSize)
+ //expand the imageBuffer to exactly fit multiples of cOmciDownloadSectionSize with padding
+ oFsm.imageBuffer = append(oFsm.imageBuffer, bufferPadding...)
+ }
oFsm.noOfSections++
}
oFsm.origImageLength = uint32(fileLen)
@@ -700,7 +716,7 @@
go oFsm.waitOnDownloadToOnuReady(ctx, oFsm.chOnuDlReady) // start supervision of the complete download-to-ONU procedure
err = oFsm.pOmciCC.SendStartSoftwareDownload(log.WithSpanFromContext(context.Background(), ctx), oFsm.pDeviceHandler.GetOmciTimeout(), false,
- oFsm.PAdaptFsm.CommChan, oFsm.InactiveImageMeID, oFsm.omciDownloadWindowSizeLimit, oFsm.origImageLength)
+ oFsm.PAdaptFsm.CommChan, oFsm.InactiveImageMeID, oFsm.omciDownloadWindowSizeLimit, oFsm.origImageLength, oFsm.isExtendedOmci)
if err != nil {
logger.Errorw(ctx, "StartSwDl abort: can't send section", log.Fields{
"device-id": oFsm.deviceID, "error": err})
@@ -757,8 +773,13 @@
}
oFsm.mutexAbortRequest.RUnlock()
- bufferStartOffset = oFsm.nextDownloadSectionsAbsolute * cOmciDownloadSectionSize
- bufferEndOffset = bufferStartOffset + cOmciDownloadSectionSize - 1 //for representing cOmciDownloadSectionSizeLimit values
+ bufferStartOffset = oFsm.nextDownloadSectionsAbsolute * uint32(oFsm.omciDownloadSectionSize)
+ bufferEndOffset = bufferStartOffset + uint32(oFsm.omciDownloadSectionSize) - 1
+ if oFsm.isExtendedOmci {
+ if bufferEndOffset > oFsm.origImageLength-1 {
+ bufferEndOffset = oFsm.origImageLength - 1
+ }
+ }
logger.Debugw(ctx, "DlSection values are", log.Fields{
"DlSectionNoAbsolute": oFsm.nextDownloadSectionsAbsolute,
"DlSectionWindow": oFsm.nextDownloadSectionsWindow,
@@ -793,7 +814,7 @@
}
oFsm.mutexUpgradeParams.Unlock() //unlock here to give other functions some chance to process during/after the send request
omciTxReq, err := oFsm.pOmciCC.PrepareOnuSectionsOfWindow(log.WithSpanFromContext(context.Background(), ctx),
- oFsm.InactiveImageMeID, windowAckRequest, oFsm.nextDownloadSectionsWindow, downloadSection, omciMsgsPerSection)
+ oFsm.InactiveImageMeID, windowAckRequest, oFsm.nextDownloadSectionsWindow, downloadSection, omciMsgsPerSection, oFsm.isExtendedOmci)
if err != nil {
logger.Errorw(ctx, "DlSection abort: can't send section", log.Fields{
"device-id": oFsm.deviceID, "section absolute": oFsm.nextDownloadSectionsAbsolute, "error": err})
@@ -880,7 +901,7 @@
return
}
err := oFsm.pOmciCC.SendEndSoftwareDownload(log.WithSpanFromContext(context.Background(), ctx), oFsm.pDeviceHandler.GetOmciTimeout(), false,
- oFsm.PAdaptFsm.CommChan, oFsm.InactiveImageMeID, oFsm.origImageLength, oFsm.imageCRC)
+ oFsm.PAdaptFsm.CommChan, oFsm.InactiveImageMeID, oFsm.origImageLength, oFsm.imageCRC, oFsm.isExtendedOmci)
if err != nil {
logger.Errorw(ctx, "EndSwDl abort: error sending EndSwDl", log.Fields{
@@ -994,7 +1015,7 @@
"device-id": oFsm.deviceID, "me-id": oFsm.InactiveImageMeID})
err := oFsm.pOmciCC.SendActivateSoftware(log.WithSpanFromContext(context.Background(), ctx), oFsm.pDeviceHandler.GetOmciTimeout(), false,
- oFsm.PAdaptFsm.CommChan, oFsm.InactiveImageMeID)
+ oFsm.PAdaptFsm.CommChan, oFsm.InactiveImageMeID, oFsm.isExtendedOmci)
if err != nil {
logger.Errorw(ctx, "ActivateSw abort: can't send activate frame", log.Fields{
"device-id": oFsm.deviceID, "error": err})
@@ -1023,7 +1044,7 @@
oFsm.upgradePhase = cUpgradeCommitting //start of image commitment for ONU
oFsm.mutexUpgradeParams.Unlock()
err := oFsm.pOmciCC.SendCommitSoftware(log.WithSpanFromContext(context.Background(), ctx), oFsm.pDeviceHandler.GetOmciTimeout(), false,
- oFsm.PAdaptFsm.CommChan, inactiveImageID) //more efficient activeImageID with above check
+ oFsm.PAdaptFsm.CommChan, inactiveImageID, oFsm.isExtendedOmci) //more efficient activeImageID with above check
if err != nil {
logger.Errorw(ctx, "CommitSw abort: can't send commit sw frame", log.Fields{
"device-id": oFsm.deviceID, "error": err})
@@ -1126,7 +1147,7 @@
}
// abort the download operation by sending an end software download message with invalid CRC and image size
err := oFsm.pOmciCC.SendEndSoftwareDownload(log.WithSpanFromContext(context.Background(), ctx), oFsm.pDeviceHandler.GetOmciTimeout(), false,
- oFsm.PAdaptFsm.CommChan, oFsm.InactiveImageMeID, 0, 0xFFFFFFFF)
+ oFsm.PAdaptFsm.CommChan, oFsm.InactiveImageMeID, 0, 0xFFFFFFFF, oFsm.isExtendedOmci)
if err != nil {
logger.Errorw(ctx, "OnuUpgradeFsm aborting download: can't send EndSwDl request", log.Fields{"device-id": oFsm.deviceID})