DeviceRules validation fix.

This commit is contained in:
stephb9959
2022-05-17 06:51:14 -07:00
parent c4a9867730
commit 88ce933a81
2 changed files with 12 additions and 3 deletions

View File

@@ -526,9 +526,9 @@ namespace OpenWifi {
}
inline bool ValidDeviceRules(const ProvObjects::DeviceRules & DR) {
return (DR.rrm=="on" || DR.rrm=="off" || DR.rrm=="inherit") &&
(DR.firmwareUpgrade=="on" || DR.firmwareUpgrade=="off" || DR.firmwareUpgrade=="inherit") &&
(DR.rcOnly=="on" || DR.rcOnly=="off" || DR.rcOnly=="inherit");
return (DR.rrm=="yes" || DR.rrm=="no" || DR.rrm=="inherit") &&
(DR.firmwareUpgrade=="yes" || DR.firmwareUpgrade=="no" || DR.firmwareUpgrade=="inherit") &&
(DR.rcOnly=="yes" || DR.rcOnly=="no" || DR.rcOnly=="inherit");
}
inline bool ValidDeviceRules(const ProvObjects::DeviceRules & DR, RESTAPIHandler &H) {

View File

@@ -491,6 +491,14 @@ getsignup() {
jq < ${result_file}
}
listvenues() {
curl ${FLAGS} -X GET "https://${OWPROV}/api/v1/venue" \
-H "Content-Type: application/json" \
-H "Authorization: Bearer ${token}" \
-H "Accept: application/json" > ${result_file}
jq < ${result_file}
}
shopt -s nocasematch
case "$1" in
"login") login; echo "You are logged in..." ; logout ;;
@@ -537,6 +545,7 @@ case "$1" in
"signup") login; signup ; logout;;
"getsignup") login; getsignup $2; logout;;
"getsubdevs") login; getsubdevs $2; logout;;
"listvenues") login; listvenues $2; logout;;
*) help ;;
esac