-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
patch: update mock181's get, check for non-readable or non-existing parameters #194
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
943336d
patch: update mock181's get, check for non-readable parameters
denopink d479be9
Merge branch 'main' into denopink/patch/mocktr181-rework-get
denopink 9e5f3a0
chore: docs
denopink d103132
Merge branch 'main' into denopink/patch/mocktr181-rework-get
schmidtw a74afbb
Merge branch 'main' into denopink/patch/mocktr181-rework-get
denopink File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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 |
---|---|---|
|
@@ -163,35 +163,60 @@ | |
result := Tr181Payload{ | ||
Command: tr181.Command, | ||
Names: tr181.Names, | ||
StatusCode: 520, | ||
StatusCode: http.StatusOK, | ||
} | ||
|
||
var ( | ||
failedNames []string | ||
readableParams []Parameter | ||
) | ||
for _, name := range tr181.Names { | ||
var found bool | ||
for _, mockParameter := range h.parameters { | ||
if !strings.HasPrefix(mockParameter.Name, name) { | ||
continue | ||
} | ||
|
||
switch mockParameter.Access { | ||
case "r", "rw", "wr": | ||
result.Parameters = append(result.Parameters, Parameter{ | ||
// Check whether mockParameter is readable. | ||
if strings.Contains(mockParameter.Access, "r") { | ||
found = true | ||
readableParams = append(readableParams, Parameter{ | ||
Name: mockParameter.Name, | ||
Value: mockParameter.Value, | ||
DataType: mockParameter.DataType, | ||
Attributes: mockParameter.Attributes, | ||
Message: "Success", | ||
Count: 1, | ||
}) | ||
result.StatusCode = http.StatusOK | ||
default: | ||
result.Parameters = append(result.Parameters, Parameter{ | ||
Message: fmt.Sprintf("Invalid parameter name: %s", mockParameter.Name), | ||
}) | ||
result.StatusCode = 520 | ||
continue | ||
} | ||
|
||
// If the requested parameter is a wild card and is not readable, | ||
// then continue and don't count it as a failure. | ||
if name[len(name)-1] == '.' { | ||
continue | ||
} | ||
|
||
// mockParameter is not readable. | ||
failedNames = append(failedNames, mockParameter.Name) | ||
} | ||
|
||
if !found { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. added case when a requested parameter is not found |
||
// Requested parameter was not found. | ||
failedNames = append(failedNames, name) | ||
} | ||
} | ||
|
||
result.Parameters = readableParams | ||
// Check if any parameters failed. | ||
if len(failedNames) != 0 { | ||
// If any names failed, then do not return any parameters that succeeded. | ||
result.Parameters = []Parameter{{ | ||
Message: fmt.Sprintf("Invalid parameter names: %s", failedNames), | ||
}} | ||
result.StatusCode = 520 | ||
} | ||
|
||
payload, err := json.Marshal(result) | ||
if err != nil { | ||
return http.StatusInternalServerError, payload, errors.Join(ErrInvalidResponsePayload, err) | ||
|
This file contains 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
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.
update wildcard case