scottk/wlan-cloud-ucentralsec
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-ucentralsec.git synced 2025-10-30 02:12:32 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Framework update.

Browse Source
This commit is contained in:
stephb9959
2022-05-12 23:08:13 -07:00
parent e17f6cfd6c
commit c9eeb12491
2 changed files with 45 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/RESTObjects/RESTAPI_ProvObjects.cpp
View File

@@ -91,7 +91,7 @@ namespace OpenWifi::ProvObjects {
field_to_json( Obj,"managementPolicy",managementPolicy); field_to_json( Obj,"managementPolicy",managementPolicy);
field_to_json( Obj,"deviceConfiguration",deviceConfiguration); field_to_json( Obj,"deviceConfiguration",deviceConfiguration);
field_to_json( Obj,"devices",devices); field_to_json( Obj,"devices",devices);
field_to_json( Obj,"rrm",rrm); field_to_json( Obj,"deviceRules",deviceRules);
field_to_json( Obj,"sourceIP",sourceIP); field_to_json( Obj,"sourceIP",sourceIP);
field_to_json( Obj,"variables", variables); field_to_json( Obj,"variables", variables);
field_to_json( Obj,"managementPolicies", managementPolicies); field_to_json( Obj,"managementPolicies", managementPolicies);
@@ -111,7 +111,7 @@ namespace OpenWifi::ProvObjects {
field_from_json( Obj,"managementPolicy",managementPolicy); field_from_json( Obj,"managementPolicy",managementPolicy);
field_from_json( Obj,"deviceConfiguration",deviceConfiguration); field_from_json( Obj,"deviceConfiguration",deviceConfiguration);
field_from_json( Obj,"devices",devices); field_from_json( Obj,"devices",devices);
field_from_json( Obj,"rrm",rrm); field_from_json( Obj,"deviceRules",deviceRules);
field_from_json( Obj,"sourceIP",sourceIP); field_from_json( Obj,"sourceIP",sourceIP);
field_from_json( Obj,"variables", variables); field_from_json( Obj,"variables", variables);
field_from_json( Obj,"managementPolicies", managementPolicies); field_from_json( Obj,"managementPolicies", managementPolicies);
@@ -154,7 +154,7 @@ namespace OpenWifi::ProvObjects {
field_to_json( Obj,"deviceConfiguration",deviceConfiguration); field_to_json( Obj,"deviceConfiguration",deviceConfiguration);
field_to_json( Obj,"contacts",contacts); field_to_json( Obj,"contacts",contacts);
field_to_json( Obj,"location",location); field_to_json( Obj,"location",location);
field_to_json( Obj,"rrm",rrm); field_to_json( Obj,"deviceRules",deviceRules);
field_to_json( Obj,"sourceIP",sourceIP); field_to_json( Obj,"sourceIP",sourceIP);
field_to_json( Obj,"variables", variables); field_to_json( Obj,"variables", variables);
field_to_json( Obj,"managementPolicies", managementPolicies); field_to_json( Obj,"managementPolicies", managementPolicies);
@@ -178,7 +178,7 @@ namespace OpenWifi::ProvObjects {
field_from_json( Obj,"deviceConfiguration",deviceConfiguration); field_from_json( Obj,"deviceConfiguration",deviceConfiguration);
field_from_json( Obj,"contacts",contacts); field_from_json( Obj,"contacts",contacts);
field_from_json( Obj,"location",location); field_from_json( Obj,"location",location);
field_from_json( Obj,"rrm",rrm); field_from_json( Obj,"deviceRules",deviceRules);
field_from_json( Obj,"sourceIP",sourceIP); field_from_json( Obj,"sourceIP",sourceIP);
field_from_json( Obj,"variables", variables); field_from_json( Obj,"variables", variables);
field_from_json( Obj,"managementPolicies", managementPolicies); field_from_json( Obj,"managementPolicies", managementPolicies);
@@ -197,9 +197,7 @@ namespace OpenWifi::ProvObjects {
info.to_json(Obj); info.to_json(Obj);
field_to_json( Obj,"managementPolicy",managementPolicy); field_to_json( Obj,"managementPolicy",managementPolicy);
field_to_json( Obj,"managementRoles",managementRoles); field_to_json( Obj,"managementRoles",managementRoles);
field_to_json( Obj,"rrm",rrm); field_to_json( Obj,"deviceRules",deviceRules);
field_to_json( Obj,"firmwareUpgrade",firmwareUpgrade);
field_to_json( Obj,"firmwareRCOnly",firmwareRCOnly);
field_to_json( Obj,"variables",variables); field_to_json( Obj,"variables",variables);
field_to_json( Obj,"defaultOperator",defaultOperator); field_to_json( Obj,"defaultOperator",defaultOperator);
field_to_json( Obj,"sourceIP",sourceIP); field_to_json( Obj,"sourceIP",sourceIP);
@@ -211,9 +209,7 @@ namespace OpenWifi::ProvObjects {
info.from_json(Obj); info.from_json(Obj);
field_from_json( Obj,"managementPolicy",managementPolicy); field_from_json( Obj,"managementPolicy",managementPolicy);
field_from_json( Obj,"managementRoles",managementRoles); field_from_json( Obj,"managementRoles",managementRoles);
field_from_json( Obj,"rrm",rrm); field_from_json( Obj,"deviceRules",deviceRules);
field_from_json( Obj,"firmwareUpgrade",firmwareUpgrade);
field_from_json( Obj,"firmwareRCOnly",firmwareRCOnly);
field_from_json( Obj,"variables",variables); field_from_json( Obj,"variables",variables);
field_from_json( Obj,"defaultOperator",defaultOperator); field_from_json( Obj,"defaultOperator",defaultOperator);
field_from_json( Obj,"sourceIP",sourceIP); field_from_json( Obj,"sourceIP",sourceIP);
@@ -598,7 +594,7 @@ namespace OpenWifi::ProvObjects {
field_to_json( Obj, "location", location); field_to_json( Obj, "location", location);
field_to_json( Obj, "contact", contact); field_to_json( Obj, "contact", contact);
field_to_json( Obj, "deviceConfiguration",deviceConfiguration); field_to_json( Obj, "deviceConfiguration",deviceConfiguration);
field_to_json( Obj, "rrm",rrm); field_to_json( Obj,"deviceRules",deviceRules);
field_to_json( Obj, "managementPolicy",managementPolicy); field_to_json( Obj, "managementPolicy",managementPolicy);
field_to_json( Obj, "state",state); field_to_json( Obj, "state",state);
field_to_json( Obj, "devClass",devClass); field_to_json( Obj, "devClass",devClass);
@@ -619,7 +615,7 @@ namespace OpenWifi::ProvObjects {
field_from_json( Obj,"location",location); field_from_json( Obj,"location",location);
field_from_json( Obj,"contact",contact); field_from_json( Obj,"contact",contact);
field_from_json( Obj,"deviceConfiguration",deviceConfiguration); field_from_json( Obj,"deviceConfiguration",deviceConfiguration);
field_from_json( Obj,"rrm",rrm); field_from_json( Obj,"deviceRules",deviceRules);
field_from_json( Obj,"managementPolicy",managementPolicy); field_from_json( Obj,"managementPolicy",managementPolicy);
field_from_json( Obj,"state",state); field_from_json( Obj,"state",state);
field_from_json( Obj,"devClass",devClass); field_from_json( Obj,"devClass",devClass);
@@ -690,8 +686,6 @@ namespace OpenWifi::ProvObjects {
info.to_json(Obj); info.to_json(Obj);
field_to_json( Obj,"managementPolicy",managementPolicy); field_to_json( Obj,"managementPolicy",managementPolicy);
field_to_json( Obj,"deviceTypes",deviceTypes); field_to_json( Obj,"deviceTypes",deviceTypes);
field_to_json( Obj,"firmwareUpgrade",firmwareUpgrade);
field_to_json( Obj,"firmwareRCOnly",firmwareRCOnly);
field_to_json( Obj,"subscriberOnly",subscriberOnly); field_to_json( Obj,"subscriberOnly",subscriberOnly);
field_to_json( Obj,"entity", entity); field_to_json( Obj,"entity", entity);
field_to_json( Obj,"venue", venue); field_to_json( Obj,"venue", venue);
@@ -699,7 +693,7 @@ namespace OpenWifi::ProvObjects {
field_to_json( Obj,"configuration",configuration); field_to_json( Obj,"configuration",configuration);
field_to_json( Obj,"inUse",inUse); field_to_json( Obj,"inUse",inUse);
field_to_json( Obj,"variables",variables); field_to_json( Obj,"variables",variables);
field_to_json( Obj,"rrm",rrm); field_to_json( Obj,"deviceRules",deviceRules);
} }
bool DeviceConfiguration::from_json(const Poco::JSON::Object::Ptr &Obj) { bool DeviceConfiguration::from_json(const Poco::JSON::Object::Ptr &Obj) {
@@ -714,9 +708,7 @@ namespace OpenWifi::ProvObjects {
field_from_json( Obj,"venue", venue); field_from_json( Obj,"venue", venue);
field_from_json( Obj,"subscriber", subscriber); field_from_json( Obj,"subscriber", subscriber);
field_from_json( Obj,"configuration",configuration); field_from_json( Obj,"configuration",configuration);
field_from_json( Obj,"rrm",rrm); field_from_json( Obj,"deviceRules",deviceRules);
field_from_json( Obj,"firmwareUpgrade",firmwareUpgrade);
field_from_json( Obj,"firmwareRCOnly",firmwareRCOnly);
return true; return true;
} catch(...) { } catch(...) {
@@ -1028,7 +1020,7 @@ namespace OpenWifi::ProvObjects {
field_to_json( Obj,"serviceClass", serviceClass); field_to_json( Obj,"serviceClass", serviceClass);
field_to_json( Obj,"qrCode", qrCode); field_to_json( Obj,"qrCode", qrCode);
field_to_json( Obj,"geoCode", geoCode); field_to_json( Obj,"geoCode", geoCode);
field_to_json( Obj,"rrm", rrm); field_to_json( Obj,"deviceRules",deviceRules);
field_to_json( Obj,"state", state); field_to_json( Obj,"state", state);
field_to_json( Obj,"locale", locale); field_to_json( Obj,"locale", locale);
field_to_json( Obj,"billingCode", billingCode); field_to_json( Obj,"billingCode", billingCode);
@@ -1052,7 +1044,7 @@ namespace OpenWifi::ProvObjects {
field_from_json( Obj,"serviceClass", serviceClass); field_from_json( Obj,"serviceClass", serviceClass);
field_from_json( Obj,"qrCode", qrCode); field_from_json( Obj,"qrCode", qrCode);
field_from_json( Obj,"geoCode", geoCode); field_from_json( Obj,"geoCode", geoCode);
field_from_json( Obj,"rrm", rrm); field_from_json( Obj,"deviceRules",deviceRules);
field_from_json( Obj,"state", state); field_from_json( Obj,"state", state);
field_from_json( Obj,"locale", locale); field_from_json( Obj,"locale", locale);
field_from_json( Obj,"billingCode", billingCode); field_from_json( Obj,"billingCode", billingCode);
@@ -1153,5 +1145,23 @@ namespace OpenWifi::ProvObjects {
return true; return true;
} }
void DeviceRules::to_json(Poco::JSON::Object &Obj) const {
field_to_json(Obj,"rcOnly",rcOnly);
field_to_json(Obj,"rrm",rrm);
field_to_json(Obj,"firmwareUpgrade",firmwareUpgrade);
}
bool DeviceRules::from_json(const Poco::JSON::Object::Ptr &Obj) {
try {
field_from_json(Obj,"rcOnly",rcOnly);
field_from_json(Obj,"rrm",rrm);
field_from_json(Obj,"firmwareUpgrade",firmwareUpgrade);
return true;
} catch(...) {
}
return false;
}
} }

25
src/RESTObjects/RESTAPI_ProvObjects.h
View File

@@ -62,6 +62,15 @@ namespace OpenWifi::ProvObjects {
}; };
typedef std::vector<ManagementPolicy> ManagementPolicyVec; typedef std::vector<ManagementPolicy> ManagementPolicyVec;
struct DeviceRules {
std::string rcOnly{"inherit"};
std::string rrm{"inherit"};
std::string firmwareUpgrade{"inherit"};
void to_json(Poco::JSON::Object &Obj) const;
bool from_json(const Poco::JSON::Object::Ptr &Obj);
};
struct Entity { struct Entity {
ObjectInfo info; ObjectInfo info;
Types::UUID_t parent; Types::UUID_t parent;
@@ -72,7 +81,7 @@ namespace OpenWifi::ProvObjects {
Types::UUID_t managementPolicy; Types::UUID_t managementPolicy;
Types::UUIDvec_t deviceConfiguration; Types::UUIDvec_t deviceConfiguration;
Types::UUIDvec_t devices; Types::UUIDvec_t devices;
std::string rrm; DeviceRules deviceRules;
Types::StringVec sourceIP; Types::StringVec sourceIP;
Types::UUIDvec_t variables; Types::UUIDvec_t variables;
Types::UUIDvec_t managementPolicies; Types::UUIDvec_t managementPolicies;
@@ -107,7 +116,7 @@ namespace OpenWifi::ProvObjects {
Types::UUIDvec_t deviceConfiguration; Types::UUIDvec_t deviceConfiguration;
Types::UUIDvec_t contacts; Types::UUIDvec_t contacts;
std::string location; std::string location;
std::string rrm; DeviceRules deviceRules;
Types::StringVec sourceIP; Types::StringVec sourceIP;
Types::UUIDvec_t variables; Types::UUIDvec_t variables;
Types::UUIDvec_t configurations; Types::UUIDvec_t configurations;
@@ -375,9 +384,7 @@ namespace OpenWifi::ProvObjects {
DeviceConfigurationElementVec configuration; DeviceConfigurationElementVec configuration;
Types::StringVec inUse; Types::StringVec inUse;
Types::UUIDvec_t variables; Types::UUIDvec_t variables;
std::string rrm; DeviceRules deviceRules;
std::string firmwareUpgrade;
bool firmwareRCOnly=false;
bool subscriberOnly=false; bool subscriberOnly=false;
std::string venue; std::string venue;
std::string entity; std::string entity;
@@ -401,7 +408,7 @@ namespace OpenWifi::ProvObjects {
std::string location; std::string location;
std::string contact; std::string contact;
std::string deviceConfiguration; std::string deviceConfiguration;
std::string rrm; DeviceRules deviceRules;
Types::UUID_t managementPolicy; Types::UUID_t managementPolicy;
std::string state; std::string state;
std::string devClass; std::string devClass;
@@ -582,9 +589,7 @@ namespace OpenWifi::ProvObjects {
ObjectInfo info; ObjectInfo info;
Types::UUID_t managementPolicy; Types::UUID_t managementPolicy;
Types::UUIDvec_t managementRoles; Types::UUIDvec_t managementRoles;
std::string rrm; DeviceRules deviceRules;
std::string firmwareUpgrade;
bool firmwareRCOnly=true;
std::vector<Variable> variables; std::vector<Variable> variables;
bool defaultOperator=false; bool defaultOperator=false;
Types::StringVec sourceIP; Types::StringVec sourceIP;
@@ -655,7 +660,7 @@ namespace OpenWifi::ProvObjects {
Types::UUID_t serviceClass; Types::UUID_t serviceClass;
std::string qrCode; std::string qrCode;
std::string geoCode; std::string geoCode;
std::string rrm{"inherit"}; DeviceRules deviceRules;
std::string state; std::string state;
std::string locale; std::string locale;
std::string billingCode; std::string billingCode;