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.

Sign up for GitHub

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

Jump to bottom

Add conditional check for split #55

Merged
merged 9 commits into from
Nov 22, 2022
Merged

Add conditional check for split #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
43438e2
Add conditional check for split
zbud-msft Nov 3, 2022
da25904
Remove redundant log
zbud-msft Nov 21, 2022
f0d1a37
Merge branch 'master' into BugFixInvalidDBKey
zbud-msft Nov 21, 2022
9a2a9e9
Add happy path UT
zbud-msft Nov 22, 2022
b376976
Change to statedb
zbud-msft Nov 22, 2022
42192f2
Merge branch 'UTDraft' into BugFixInvalidDBKey
zbud-msft Nov 22, 2022
9fa5978
Add conditional check for string splice
zbud-msft Nov 22, 2022
1f82da1
Change expected status code
zbud-msft Nov 22, 2022
8645137
Revert change
zbud-msft Nov 22, 2022
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
6 changes: 6 additions & 0 deletions gnmi_server/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1099,6 +1099,12 @@ func runGnmiTestGet(t *testing.T, namespace string) {
valTest: true,
wantRetCode: codes.OK,
wantRespVal: []byte(`{"test_field": "test_value"}`),
}, {
desc: "Invalid DBKey of length 1",
pathTarget: stateDBPath,
textPbPath: ``,
valTest: true,
wantRetCode: codes.NotFound,
},

// Happy path
Expand Down
7 changes: 6 additions & 1 deletion sonic_data_client/db_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,9 @@ func populateDbtablePath(prefix, path *gnmipb.Path, pathG2S *map[*gnmipb.Path][]
}
tblPath.dbNamespace = dbNamespace
tblPath.dbName = targetDbName
tblPath.tableName = stringSlice[1]
if len(stringSlice) > 1 {
tblPath.tableName = stringSlice[1]
}
tblPath.delimitor = separator

var mappedKey string
Expand Down Expand Up @@ -717,6 +719,9 @@ func tableData2Msi(tblPath *tablePath, useKey bool, op *string, msi *map[string]
var key string
// Split dbkey string into two parts and second part is key in table
keys := strings.SplitN(dbkey, tblPath.delimitor, 2)
if len(keys) < 2 {
return fmt.Errorf("dbkey: %s, failed split from delimitor %v", dbkey, tblPath.delimitor)
}
key = keys[1]
err = makeJSON_redis(msi, &key, op, fv)
}
Expand Down