Telecominfraproject/archived-wlan-cloud-owprov
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-owprov.git synced 2026-03-20 03:40:31 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Standardization of device flags: rrm, firmwareUpgrade, rcOnly.

Browse Source
This commit is contained in:
stephb9959
2022-05-12 23:05:27 -07:00
parent 1b6e8f37de
commit 409fc756cd
25 changed files with 414 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/RESTAPI/RESTAPI_sub_devices_handler.cpp
View File

@@ -58,7 +58,7 @@ namespace OpenWifi {
!ValidDbId(NewObject.operatorId, StorageService()->OperatorDB(), true, RESTAPI::Errors::InvalidOperatorId, *this) ||
!ValidDbId(NewObject.serviceClass, StorageService()->ServiceClassDB(), true, RESTAPI::Errors::InvalidServiceClassId, *this) ||
!ValidSubscriberId(NewObject.subscriberId, true, *this) ||
!ValidRRM(NewObject.rrm,*this) ||
(RawObject->has("deviceRules") && !ValidDeviceRules(NewObject.deviceRules,*this)) ||
!ValidSerialNumber(NewObject.serialNumber,false,*this)
) {
return;
@@ -86,7 +86,7 @@ namespace OpenWifi {
!ValidDbId(UpdateObj.operatorId, StorageService()->OperatorDB(), true, RESTAPI::Errors::InvalidOperatorId, *this) ||
!ValidDbId(UpdateObj.serviceClass, StorageService()->ServiceClassDB(), true, RESTAPI::Errors::InvalidServiceClassId, *this) ||
!ValidSubscriberId(UpdateObj.subscriberId, true, *this) ||
!ValidRRM(UpdateObj.rrm,*this) ||
(RawObject->has("deviceRules") && !ValidDeviceRules(UpdateObj.deviceRules,*this)) ||
!ValidSerialNumber(UpdateObj.serialNumber,false,*this)
) {
return;
@@ -99,7 +99,8 @@ namespace OpenWifi {
AssignIfPresent(RawObject, "serviceClass", Existing.serviceClass);
AssignIfPresent(RawObject, "qrCode", Existing.qrCode);
AssignIfPresent(RawObject, "geoCode", Existing.geoCode);
AssignIfPresent(RawObject, "rrm", Existing.rrm);
if(RawObject->has("deviceRules"))
Existing.deviceRules = UpdateObj.deviceRules;
AssignIfPresent(RawObject, "state", Existing.state);
AssignIfPresent(RawObject, "locale", Existing.locale);
AssignIfPresent(RawObject, "billingCode", Existing.billingCode);