From 88ce933a818bb93261e2777b8499d0af630351a1 Mon Sep 17 00:00:00 2001 From: stephb9959 Date: Tue, 17 May 2022 06:51:14 -0700 Subject: [PATCH] DeviceRules validation fix. --- src/RESTAPI/RESTAPI_db_helpers.h | 6 +++--- test_scripts/curl/cli | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/RESTAPI/RESTAPI_db_helpers.h b/src/RESTAPI/RESTAPI_db_helpers.h index 30e33e9..430c989 100644 --- a/src/RESTAPI/RESTAPI_db_helpers.h +++ b/src/RESTAPI/RESTAPI_db_helpers.h @@ -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) { diff --git a/test_scripts/curl/cli b/test_scripts/curl/cli index 518203b..3f2d87e 100755 --- a/test_scripts/curl/cli +++ b/test_scripts/curl/cli @@ -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