Add xxxFields for GroupIE in Release 17 #140
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,13 +31,7 @@ func (i *IE) AccessAvailabilityInformation() (uint8, error) { | |
| if err != nil { | ||
| return 0, err | ||
| } | ||
| return ies.AccessAvailabilityInformation, nil | ||
| default: | ||
| return 0, &InvalidTypeError{Type: i.Type} | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -10,10 +10,57 @@ func NewAccessAvailabilityReport(info *IE) *IE { | |||||
| } | ||||||
|
|
||||||
| // AccessAvailabilityReport returns the IEs above AccessAvailabilityReport if the type of IE matches. | ||||||
| func (i *IE) AccessAvailabilityReport() (*AccessAvailabilityReportFields, error) { | ||||||
| if i.Type != AccessAvailabilityReport { | ||||||
| return nil, &InvalidTypeError{Type: i.Type} | ||||||
| } | ||||||
| // Check if the ie.Parse have called or not | ||||||
|
Owner
There was a problem hiding this comment. In which kind of situation it is already parsed and it is not? Clarifying that in the comment would definitely help devs in the future. |
||||||
| if len(i.ChildIEs) > 0 { | ||||||
| p := &AccessAvailabilityReportFields{} | ||||||
| if err := p.ParseIEs(i.ChildIEs...); err != nil { | ||||||
| return p, err | ||||||
| } | ||||||
| return p, nil | ||||||
| } | ||||||
| // If the ChildIEs not already parsed | ||||||
| return ParseAccessAvailabilityReportFields(i.Payload) | ||||||
| } | ||||||
|
|
||||||
| // AccessAvailabilityReportFields is a set of fields in AccessAvailabilityReport IE. | ||||||
| // | ||||||
| // The contained fields are of type struct, as they are too complex to handle with | ||||||
| // existing (standard) types in Go. | ||||||
| type AccessAvailabilityReportFields struct { | ||||||
| AccessAvailabilityInformation uint8 | ||||||
| } | ||||||
|
|
||||||
| // ParseAccessAvailabilityReportFields returns the IEs above AccessAvailabilityReport | ||||||
| func ParseAccessAvailabilityReportFields(b []byte) (*AccessAvailabilityReportFields, error) { | ||||||
| ies, err := ParseMultiIEs(b) | ||||||
| if err != nil { | ||||||
| return nil, err | ||||||
| } | ||||||
| c := &AccessAvailabilityReportFields{} | ||||||
| if err := c.ParseIEs(ies...); err != nil { | ||||||
| return c, err | ||||||
| } | ||||||
|
|
||||||
| return c, nil | ||||||
| } | ||||||
|
|
||||||
| // ParseIEs will iterator over all childs IE to avoid to use Parse or ParseMultiIEs any time we iterate in IE | ||||||
|
Owner
There was a problem hiding this comment.
Suggested change
typo, but is it necessary for this function to be exported? |
||||||
| func (s *AccessAvailabilityReportFields) ParseIEs(ies ...*IE) error { | ||||||
| for _, i := range ies { | ||||||
| if i == nil { | ||||||
| continue | ||||||
| } | ||||||
| if i.Type == AccessAvailabilityInformation { | ||||||
| v, err := i.AccessAvailabilityInformation() | ||||||
| if err != nil { | ||||||
| return nil | ||||||
| } | ||||||
| s.AccessAvailabilityInformation = v | ||||||
| } | ||||||
| } | ||||||
| return nil | ||||||
| } | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,21 +19,17 @@ func (i *IE) ActivatePredefinedRules() (string, error) { | |
| if err != nil { | ||
| return "", err | ||
| } | ||
| if len(ies.ActivatePredefinedRules) > 0 { | ||
| return ies.ActivatePredefinedRules, nil | ||
|
Comment on lines
+22
to
+23
Owner
There was a problem hiding this comment. We return |
||
| } | ||
| return "", ErrIENotFound | ||
| case UpdatePDR: | ||
| ies, err := i.UpdatePDR() | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
| if len(ies.ActivatePredefinedRules) > 0 { | ||
| return ies.ActivatePredefinedRules, nil | ||
| } | ||
| return "", ErrIENotFound | ||
| default: | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,21 +24,17 @@ func (i *IE) ActivationTime() (time.Time, error) { | |
| if err != nil { | ||
| return time.Time{}, err | ||
| } | ||
| if !ies.ActivationTime.IsZero() { | ||
| return ies.ActivationTime, nil | ||
| } | ||
| return time.Time{}, ErrIENotFound | ||
| case UpdatePDR: | ||
| ies, err := i.UpdatePDR() | ||
| if err != nil { | ||
| return time.Time{}, err | ||
| } | ||
| if !ies.ActivationTime.IsZero() { | ||
| return ies.ActivationTime, nil | ||
| } | ||
| return time.Time{}, ErrIENotFound | ||
| default: | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| package ie | ||
|
|
||
| // NewAddMBSUnicastParameters creates a new AbsMBSUnicastParameters IE. | ||
| func NewAddMBSUnicastParameters(ies ...*IE) *IE { | ||
| return newGroupedIE(AddMBSUnicastParameters, 0, ies...) | ||
| } | ||
|
|
||
| // AddMBSUnicastParameters returns the IEs above AddMBSUnicastParameters if the type of IE matches. | ||
| func (i *IE) AddMBSUnicastParameters() (*AddMBSUnicastParametersFields, error) { | ||
| switch i.Type { | ||
| case AddMBSUnicastParameters: | ||
| return ParseAddMBSUnicastParametersFields(i.Payload) | ||
| case CreateFAR: | ||
| ies, err := i.CreateFAR() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| for _, i := range ies.AddMBSUnicastParameters { | ||
| if i == nil { | ||
| continue | ||
| } | ||
| return i, nil | ||
| } | ||
| return nil, ErrIENotFound | ||
| case UpdateFAR: | ||
| ies, err := i.UpdateFAR() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| for _, i := range ies.AddMBSUnicastParameters { | ||
| if i == nil { | ||
| continue | ||
| } | ||
| return i, nil | ||
| } | ||
| return nil, ErrIENotFound | ||
| default: | ||
| return nil, &InvalidTypeError{Type: i.Type} | ||
| } | ||
| } | ||
|
|
||
| // AddMBSUnicastParametersFields is a set of fields in AddMBSUnicastParameters IE. | ||
| // | ||
| // The contained fields are of type struct, as they are too complex to handle with | ||
| // existing (standard) types in Go. | ||
| type AddMBSUnicastParametersFields struct { | ||
| DestinationInterface uint8 | ||
| MBSUnicastParametersID uint16 | ||
| NetworkInstance string | ||
| OuterHeaderCreation *OuterHeaderCreationFields | ||
| TransportLevelMarking uint16 | ||
| DestinationInterfaceType uint8 | ||
| } | ||
|
|
||
| // ParseAddMBSUnicastParametersFields returns the IEs above AddMBSUnicastParameters. | ||
| func ParseAddMBSUnicastParametersFields(b []byte) (*AddMBSUnicastParametersFields, error) { | ||
| ies, err := ParseMultiIEs(b) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| f := &AddMBSUnicastParametersFields{} | ||
| if err := f.ParseIEs(ies...); err != nil { | ||
| return f, err | ||
| } | ||
| return f, nil | ||
| } | ||
|
|
||
| // ParseIEs will iterator over all childs IE to avoid to use Parse or ParseMultiIEs any time we iterate in IE | ||
| func (a *AddMBSUnicastParametersFields) ParseIEs(ies ...*IE) error { | ||
| for _, ie := range ies { | ||
| if ie == nil { | ||
| continue | ||
| } | ||
|
|
||
| switch ie.Type { | ||
| case DestinationInterface: | ||
| dest, err := ie.DestinationInterface() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| a.DestinationInterface = dest | ||
| case MBSUnicastParametersID: | ||
| v, err := ie.MBSUnicastParametersID() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| a.MBSUnicastParametersID = v | ||
| case NetworkInstance: | ||
| v, err := ie.NetworkInstance() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| a.NetworkInstance = v | ||
| case OuterHeaderCreation: | ||
| creation, err := ie.OuterHeaderCreation() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| a.OuterHeaderCreation = creation | ||
| case TransportLevelMarking: | ||
| transport, err := ie.TransportLevelMarking() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| a.TransportLevelMarking = transport | ||
| case TGPPInterfaceType: | ||
| tgppinterface, err := ie.TGPPInterfaceType() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| a.DestinationInterfaceType = tgppinterface | ||
| } | ||
| } | ||
| return nil | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
missing godoc comment