Skip to content
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 5 commits into from
Jul 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 35 additions & 10 deletions internal/wrphandlers/mocktr181/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -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] == '.' {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

update wildcard case

continue

Check warning on line 197 in internal/wrphandlers/mocktr181/handler.go

View check run for this annotation

Codecov / codecov/patch

internal/wrphandlers/mocktr181/handler.go#L196-L197

Added lines #L196 - L197 were not covered by tests
}

// mockParameter is not readable.
failedNames = append(failedNames, mockParameter.Name)

Check warning on line 201 in internal/wrphandlers/mocktr181/handler.go

View check run for this annotation

Codecov / codecov/patch

internal/wrphandlers/mocktr181/handler.go#L201

Added line #L201 was not covered by tests
}

if !found {
Copy link
Contributor Author

Choose a reason for hiding this comment

The 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)
Expand Down
2 changes: 1 addition & 1 deletion internal/wrphandlers/mocktr181/handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func TestHandler_HandleWrp(t *testing.T) {
var result Tr181Payload
err := json.Unmarshal(msg.Payload, &result)
a.NoError(err)
a.Equal(0, len(result.Parameters))
a.Equal(1, len(result.Parameters))
a.True(h.Enabled())
return nil
},
Expand Down
Loading