xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-18 20:30:56 +00:00
Code Issues Releases Wiki Activity

REST API handle no key match for tables

Browse Source
This commit is contained in:
Mark Gurevich
2018-05-07 16:12:19 -04:00
parent 4c0bc17be0
commit ecc403b136
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xCAT-server/xCAT-wsapi/xcatws.cgi
View File

@ -2871,6 +2871,12 @@ sub tablerowhdl {
# Error returned, most likely invalid table, substitute a better error msg
@$responses[0]->{error} = "No such table: @tables";
}
# Check if there is any real data in response
# One key ('xcatdsource' => '<node>') is always returned.
# If no other keys in response - no matches on key or attribute were returned from xcatd
if (keys @$responses[0] <= 1) {
@$responses[0]->{error} = "No table rows matched specified keys or attributes";
}
return $responses;
}

14
xCAT-test/autotest/testcase/restapi/table/cases0
View File

@ -19,6 +19,20 @@ check:rc==200
check:output=~"mask":"255.0.0.0"
end
start:get_network_table_with_attr_selection_error_rest
description: get all attribute matching networks table entries with REST API, invalid attribute name
cmd:restapitest -m GET -r /tables/networks/rows/abc=255.0.0.0 -u $$username -p $$password
check:rc==147
check:output=~No table rows
end
start:get_network_table_with_attr_selection_error_rest2
description: get all attribute matching networks table entries with REST API, no match
cmd:restapitest -m GET -r /tables/networks/rows/mask=a.b.c.d -u $$username -p $$password
check:rc==147
check:output=~No table rows
end
start:get_network_table_with_attr_selection_rest2
description: get attribute matching networks table attributes with REST API
cmd:restapitest -m GET -r /tables/networks/rows/mask=255.0.0.0/gateway -u $$username -p $$password