[VOL-3880] Correctly reporting software image status in OMCI Get
[VOL-3900] OMCI ONU Software Image Download
Change-Id: I8d91be832f3a89404d0af0dd98e6b53359e6a738
diff --git a/vendor/github.com/opencord/omci-lib-go/messagetypes.go b/vendor/github.com/opencord/omci-lib-go/messagetypes.go
index 6776b06..42a0d42 100644
--- a/vendor/github.com/opencord/omci-lib-go/messagetypes.go
+++ b/vendor/github.com/opencord/omci-lib-go/messagetypes.go
@@ -184,7 +184,7 @@
// DecodeFromBytes decodes the given bytes of a Create Request into this layer
func (omci *CreateRequest) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4)
if err != nil {
return err
}
@@ -271,7 +271,7 @@
// DecodeFromBytes decodes the given bytes of a Create Response into this layer
func (omci *CreateResponse) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 3)
if err != nil {
return err
}
@@ -341,7 +341,7 @@
// DecodeFromBytes decodes the given bytes of a Delete Request into this layer
func (omci *DeleteRequest) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4)
if err != nil {
return err
}
@@ -397,7 +397,7 @@
// DecodeFromBytes decodes the given bytes of a Delete Response into this layer
func (omci *DeleteResponse) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 1)
if err != nil {
return err
}
@@ -460,7 +460,7 @@
// DecodeFromBytes decodes the given bytes of a Set Request into this layer
func (omci *SetRequest) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 2)
if err != nil {
return err
}
@@ -567,7 +567,7 @@
// DecodeFromBytes decodes the given bytes of a Set Response into this layer
func (omci *SetResponse) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 5)
if err != nil {
return err
}
@@ -636,7 +636,7 @@
// DecodeFromBytes decodes the given bytes of a Get Request into this layer
func (omci *GetRequest) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 2)
if err != nil {
return err
}
@@ -703,7 +703,7 @@
// DecodeFromBytes decodes the given bytes of a Get Response into this layer
func (omci *GetResponse) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 3)
if err != nil {
return err
}
@@ -870,7 +870,7 @@
// DecodeFromBytes decodes the given bytes of a Get All Alarms Request into this layer
func (omci *GetAllAlarmsRequest) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 1)
if err != nil {
return err
}
@@ -948,7 +948,7 @@
// DecodeFromBytes decodes the given bytes of a Get All Alarms Response into this layer
func (omci *GetAllAlarmsResponse) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 2)
if err != nil {
return err
}
@@ -1021,7 +1021,7 @@
// DecodeFromBytes decodes the given bytes of a Get All Alarms Next Request into this layer
func (omci *GetAllAlarmsNextRequest) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 2)
if err != nil {
return err
}
@@ -1097,7 +1097,7 @@
// DecodeFromBytes decodes the given bytes of a Get All Alarms Next Response into this layer
func (omci *GetAllAlarmsNextResponse) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 4 + 28)
if err != nil {
return err
}
@@ -1173,7 +1173,7 @@
// DecodeFromBytes decodes the given bytes of a MIB Upload Request into this layer
func (omci *MibUploadRequest) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4)
if err != nil {
return err
}
@@ -1240,7 +1240,7 @@
// DecodeFromBytes decodes the given bytes of a MIB Upload Response into this layer
func (omci *MibUploadResponse) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 2)
if err != nil {
return err
}
@@ -1313,7 +1313,7 @@
// DecodeFromBytes decodes the given bytes of a MIB Upload Next Request into this layer
func (omci *MibUploadNextRequest) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 2)
if err != nil {
return err
}
@@ -1386,7 +1386,7 @@
// DecodeFromBytes decodes the given bytes of a MIB Upload Next Response into this layer
func (omci *MibUploadNextResponse) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 6)
if err != nil {
return err
}
@@ -1457,7 +1457,7 @@
// DecodeFromBytes decodes the given bytes of a MIB Reset Request into this layer
func (omci *MibResetRequest) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4)
if err != nil {
return err
}
@@ -1511,7 +1511,7 @@
// DecodeFromBytes decodes the given bytes of a MIB Reset Response into this layer
func (omci *MibResetResponse) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 1)
if err != nil {
return err
}
@@ -1684,7 +1684,7 @@
// DecodeFromBytes decodes the given bytes of an Alarm Notification into this layer
func (omci *AlarmNotificationMsg) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 28)
if err != nil {
return err
}
@@ -1770,7 +1770,7 @@
// DecodeFromBytes decodes the given bytes of an Attribute Value Change notification into this layer
func (omci *AttributeValueChangeMsg) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 2)
if err != nil {
return err
}
@@ -1855,7 +1855,7 @@
// DecodeFromBytes decodes the given bytes of a Test Request into this layer
func (omci *TestRequest) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 5)
if err != nil {
return err
}
@@ -1891,7 +1891,7 @@
// DecodeFromBytes decodes the given bytes of a Test Response into this layer
func (omci *TestResponse) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 1)
if err != nil {
return err
}
@@ -1931,7 +1931,7 @@
// DecodeFromBytes decodes the given bytes of a Start Software Download Request into this layer
func (omci *StartSoftwareDownloadRequest) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 4)
if err != nil {
return err
}
@@ -2007,12 +2007,12 @@
/////////////////////////////////////////////////////////////////////////////
//
-type downloadResults struct {
+type DownloadResults struct {
ManagedEntityID uint16 // ME ID of software image entity instance (slot number plus instance 0..1 or 2..254 vendor-specific)
Result me.Results
}
-func (dr *downloadResults) String() string {
+func (dr *DownloadResults) String() string {
return fmt.Sprintf("ME: %v (%#x), Results: %d (%v)", dr.ManagedEntityID, dr.ManagedEntityID,
dr.Result, dr.Result)
}
@@ -2022,7 +2022,7 @@
Result me.Results
WindowSize byte // Window Size -1
NumberOfInstances byte
- MeResults []downloadResults
+ MeResults []DownloadResults
}
func (omci *StartSoftwareDownloadResponse) String() string {
@@ -2033,7 +2033,7 @@
// DecodeFromBytes decodes the given bytes of a Start Software Download Response into this layer
func (omci *StartSoftwareDownloadResponse) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 3)
if err != nil {
return err
}
@@ -2065,7 +2065,7 @@
return errors.New(msg)
}
if omci.NumberOfInstances > 0 {
- omci.MeResults = make([]downloadResults, omci.NumberOfInstances)
+ omci.MeResults = make([]DownloadResults, omci.NumberOfInstances)
for index := 0; index < int(omci.NumberOfInstances); index++ {
omci.MeResults[index].ManagedEntityID = binary.BigEndian.Uint16(data[7+(index*3):])
@@ -2155,7 +2155,7 @@
// DecodeFromBytes decodes the given bytes of a Download Section Request into this layer
func (omci *DownloadSectionRequest) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 1)
if err != nil {
return err
}
@@ -2228,7 +2228,7 @@
// DecodeFromBytes decodes the given bytes of a Download Section Response into this layer
func (omci *DownloadSectionResponse) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 2)
if err != nil {
return err
}
@@ -2313,7 +2313,7 @@
// DecodeFromBytes decodes the given bytes of an End Software Download Request into this layer
func (omci *EndSoftwareDownloadRequest) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 7)
if err != nil {
return err
}
@@ -2395,7 +2395,7 @@
MeBasePacket // Note: EntityInstance for software download is two specific values
Result me.Results
NumberOfInstances byte
- MeResults []downloadResults
+ MeResults []DownloadResults
}
func (omci *EndSoftwareDownloadResponse) String() string {
@@ -2406,7 +2406,7 @@
// DecodeFromBytes decodes the given bytes of an End Software Download Response into this layer
func (omci *EndSoftwareDownloadResponse) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 2)
if err != nil {
return err
}
@@ -2437,7 +2437,7 @@
return errors.New(msg)
}
if omci.NumberOfInstances > 0 {
- omci.MeResults = make([]downloadResults, omci.NumberOfInstances)
+ omci.MeResults = make([]DownloadResults, omci.NumberOfInstances)
for index := 0; index < int(omci.NumberOfInstances); index++ {
omci.MeResults[index].ManagedEntityID = binary.BigEndian.Uint16(data[6+(index*3):])
@@ -2525,7 +2525,7 @@
// DecodeFromBytes decodes the given bytes of an Activate Software Request into this layer
func (omci *ActivateSoftwareRequest) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 1)
if err != nil {
return err
}
@@ -2604,7 +2604,7 @@
// DecodeFromBytes decodes the given bytes of an Activate Softwre Response into this layer
func (omci *ActivateSoftwareResponse) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 1)
if err != nil {
return err
}
@@ -2682,7 +2682,7 @@
// DecodeFromBytes decodes the given bytes of a Commit Software Request into this layer
func (omci *CommitSoftwareRequest) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4)
if err != nil {
return err
}
@@ -2744,7 +2744,7 @@
// DecodeFromBytes decodes the given bytes of a Commit Softwar Response into this layer
func (omci *CommitSoftwareResponse) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 1)
if err != nil {
return err
}
@@ -2813,7 +2813,7 @@
// DecodeFromBytes decodes the given bytes of a Synchronize Time Request into this layer
func (omci *SynchronizeTimeRequest) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 7)
if err != nil {
return err
}
@@ -2893,7 +2893,7 @@
// DecodeFromBytes decodes the given bytes of a Synchronize Time Response into this layer
func (omci *SynchronizeTimeResponse) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 2)
if err != nil {
return err
}
@@ -2981,7 +2981,7 @@
// DecodeFromBytes decodes the given bytes of a Reboot Request into this layer
func (omci *RebootRequest) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 1)
if err != nil {
return err
}
@@ -3052,7 +3052,7 @@
// DecodeFromBytes decodes the given bytes of a Reboot Response into this layer
func (omci *RebootResponse) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 1)
if err != nil {
return err
}
@@ -3123,7 +3123,7 @@
// DecodeFromBytes decodes the given bytes of a Get Next Request into this layer
func (omci *GetNextRequest) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 4)
if err != nil {
return err
}
@@ -3194,7 +3194,7 @@
// DecodeFromBytes decodes the given bytes of a Get Next Response into this layer
func (omci *GetNextResponse) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 3)
if err != nil {
return err
}
@@ -3312,7 +3312,7 @@
// DecodeFromBytes decodes the given bytes of a Test Result Notification into this layer
func (omci *TestResultMsg) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4)
if err != nil {
return err
}
@@ -3350,7 +3350,7 @@
// DecodeFromBytes decodes the given bytes of a Get Current Data Request into this layer
func (omci *GetCurrentDataRequest) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 2)
if err != nil {
return err
}
@@ -3416,7 +3416,7 @@
// DecodeFromBytes decodes the given bytes of a Get Current Data Respnse into this layer
func (omci *GetCurrentDataResponse) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 4 + 3)
if err != nil {
return err
}
@@ -3503,7 +3503,7 @@
// DecodeFromBytes decodes the given bytes of a Set Table Request into this layer
func (omci *SetTableRequest) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 6 + 2)
if err != nil {
return err
}
@@ -3540,7 +3540,7 @@
// DecodeFromBytes decodes the given bytes of a Set Table Response into this layer
func (omci *SetTableResponse) DecodeFromBytes(data []byte, p gopacket.PacketBuilder) error {
// Common ClassID/EntityID decode in msgBase
- err := omci.MeBasePacket.DecodeFromBytes(data, p)
+ err := omci.MeBasePacket.DecodeFromBytes(data, p, 6 + 1)
if err != nil {
return err
}