Update to align to changes in event proto

This commit is contained in:
Mike Hansen
2020-11-20 14:06:17 -05:00
parent 08c9db0544
commit 8d6a279ecd
5 changed files with 8559 additions and 8581 deletions

1
.gitignore vendored
View File

@@ -23,3 +23,4 @@ build.log
*.tar.gz
*.pydevproject
/target/

View File

@@ -1314,8 +1314,8 @@
"key": {
"type": "integer"
},
"min":0,
"max":1
"min": 0,
"max": 1
}
},
"thermal_upgrade_temp": {
@@ -1323,17 +1323,17 @@
"key": {
"type": "integer"
},
"min":0,
"max":1
"min": 0,
"max": 1
}
},
"thermal_integration":{
"thermal_integration": {
"type": {
"key": {
"type": "integer"
},
"min":0,
"max":1
"min": 0,
"max": 1
}
},
"temperature_control": {
@@ -1381,8 +1381,8 @@
"key": {
"type": "integer"
},
"min":0,
"max":1
"min": 0,
"max": 1
}
},
"thermal_tx_chainmask": {
@@ -1390,8 +1390,8 @@
"key": {
"type": "integer"
},
"min":0,
"max":1
"min": 0,
"max": 1
}
},
"fallback_parents": {
@@ -1414,7 +1414,8 @@
"key": {
"type": "string",
"enum": [
"set", [
"set",
[
"disable",
"enable",
"precac"
@@ -1618,8 +1619,8 @@
"key": {
"type": "integer"
},
"min":0,
"max":1
"min": 0,
"max": 1
}
},
"thermal_upgrade_temp": {
@@ -1627,26 +1628,26 @@
"key": {
"type": "integer"
},
"min":0,
"max":1
"min": 0,
"max": 1
}
},
"thermal_integration":{
"thermal_integration": {
"type": {
"key": {
"type": "integer"
},
"min":0,
"max":1
"min": 0,
"max": 1
}
},
"thermal_downgraded":{
"thermal_downgraded": {
"type": {
"key": {
"type": "boolean"
},
"min":0,
"max":1
"min": 0,
"max": 1
}
},
"temperature_control": {
@@ -1694,8 +1695,8 @@
"key": {
"type": "integer"
},
"min":0,
"max":1
"min": 0,
"max": 1
}
},
"thermal_tx_chainmask": {
@@ -1703,8 +1704,8 @@
"key": {
"type": "integer"
},
"min":0,
"max":1
"min": 0,
"max": 1
}
},
"allowed_channels": {
@@ -1746,7 +1747,8 @@
"key": {
"type": "string",
"enum": [
"set", [
"set",
[
"disable",
"enable",
"precac"
@@ -2646,7 +2648,7 @@
},
"AW_LM_Config": {
"columns": {
"name" : {
"name": {
"type": {
"key": {
"type": "string",
@@ -2654,7 +2656,7 @@
}
}
},
"periodicity" : {
"periodicity": {
"type": {
"key": {
"type": "string",
@@ -2671,7 +2673,7 @@
"max": 1
}
},
"upload_location" : {
"upload_location": {
"type": {
"key": {
"type": "string",
@@ -2681,7 +2683,7 @@
"max": 1
}
},
"upload_token" : {
"upload_token": {
"type": {
"key": {
"type": "string",
@@ -2697,7 +2699,7 @@
},
"AW_LM_State": {
"columns": {
"name" : {
"name": {
"type": {
"key": {
"type": "string",
@@ -2705,8 +2707,8 @@
}
}
},
"log_trigger" : {
"type" : {
"log_trigger": {
"type": {
"key": {
"type": "integer"
}
@@ -2717,7 +2719,7 @@
},
"AW_Debug": {
"columns": {
"name" : {
"name": {
"type": {
"key": {
"type": "string",
@@ -2725,7 +2727,7 @@
}
}
},
"log_severity" : {
"log_severity": {
"type": {
"key": {
"type": "string",
@@ -2739,7 +2741,7 @@
},
"AW_Bluetooth_Config": {
"columns": {
"mode" : {
"mode": {
"type": {
"key": {
"type": "string",
@@ -2755,8 +2757,8 @@
"max": 1
}
},
"interval_millis" : {
"type" : {
"interval_millis": {
"type": {
"key": {
"type": "integer"
},
@@ -2764,8 +2766,8 @@
"max": 1
}
},
"txpower" : {
"type" : {
"txpower": {
"type": {
"key": {
"type": "integer"
},
@@ -2773,7 +2775,7 @@
"max": 1
}
},
"command" : {
"command": {
"type": {
"key": {
"type": "string",
@@ -2806,7 +2808,7 @@
},
"AW_Bluetooth_State": {
"columns": {
"mode" : {
"mode": {
"type": {
"key": {
"type": "string",
@@ -2822,8 +2824,8 @@
"max": 1
}
},
"interval_millis" : {
"type" : {
"interval_millis": {
"type": {
"key": {
"type": "integer"
},
@@ -2831,8 +2833,8 @@
"max": 1
}
},
"txpower" : {
"type" : {
"txpower": {
"type": {
"key": {
"type": "integer"
},
@@ -2840,7 +2842,7 @@
"max": 1
}
},
"command" : {
"command": {
"type": {
"key": {
"type": "string",
@@ -2857,7 +2859,7 @@
"max": 1
}
},
"payload" : {
"payload": {
"type": {
"key": {
"type": "string",
@@ -4663,14 +4665,10 @@
"maxRows": 256
},
"DHCP_reserved_IP": {
"columns":
{
"hostname":
{
"type":
{
"key":
{
"columns": {
"hostname": {
"type": {
"key": {
"type": "string",
"minLength": 1,
"maxLength": 63
@@ -4679,25 +4677,18 @@
"max": 1
}
},
"ip_addr":
{
"type":
{
"key":
{
"ip_addr": {
"type": {
"key": {
"type": "string",
"minLength": 7,
"maxLength": 15
}
}
},
"hw_addr":
{
"type":
{
"key":
{
"hw_addr": {
"type": {
"key": {
"type": "string",
"minLength": 11,
"maxLength": 17
@@ -4708,17 +4699,12 @@
"isRoot": true
},
"IP_Port_Forward": {
"columns":
{
"protocol":
{
"type":
{
"key":
{
"columns": {
"protocol": {
"type": {
"key": {
"type": "string",
"enum":
[
"enum": [
"set",
[
"tcp",
@@ -4728,36 +4714,24 @@
}
}
},
"src_ifname":
{
"type":
{
"key":
{
"src_ifname": {
"type": {
"key": {
"type": "string",
"minLength": 2,
"maxLength": 15
}
}
},
"src_port":
{
"src_port": {
"type": "integer"
},
"dst_port":
{
"dst_port": {
"type": "integer"
},
"dst_ipaddr":
{
"type":
{
"key":
{
"dst_ipaddr": {
"type": {
"key": {
"type": "string",
"minLength": 7,
"maxLength": 15
@@ -4768,48 +4742,35 @@
"isRoot": true
},
"OVS_MAC_Learning": {
"columns":
{
"brname":
{
"type":
{
"key":
{
"columns": {
"brname": {
"type": {
"key": {
"type": "string",
"minLength": 2,
"maxLength": 15
}
}
},
"ifname":
{
"type":
{
"key":
{
"ifname": {
"type": {
"key": {
"type": "string",
"minLength": 2,
"maxLength": 15
}
}
},
"hwaddr":
{
"type":
{
"key":
{
"hwaddr": {
"type": {
"key": {
"type": "string",
"minLength": 11,
"maxLength": 17
}
}
},
"vlan":
{
"vlan": {
"type": "integer"
}
},
@@ -5327,7 +5288,8 @@
"key": {
"type": "string",
"enum": [
"set", [
"set",
[
"none",
"deauth",
"disassoc",
@@ -5350,7 +5312,8 @@
"key": {
"type": "string",
"enum": [
"set", [
"set",
[
"none",
"probe_all",
"probe_null",
@@ -5525,7 +5488,8 @@
"key": {
"type": "string",
"enum": [
"set", [
"set",
[
"none",
"deauth",
"disassoc",
@@ -5556,7 +5520,8 @@
"key": {
"type": "string",
"enum": [
"set", [
"set",
[
"off",
"home",
"away"
@@ -5586,7 +5551,8 @@
"key": {
"type": "string",
"enum": [
"set", [
"set",
[
"none",
"steering",
"expired",
@@ -5606,7 +5572,8 @@
"key": {
"type": "string",
"enum": [
"set", [
"set",
[
"none",
"deauth",
"disassoc",
@@ -5671,7 +5638,8 @@
"key": {
"type": "string",
"enum": [
"set", [
"set",
[
"hwm",
"never",
"always",
@@ -5720,7 +5688,8 @@
"key": {
"type": "string",
"enum": [
"set", [
"set",
[
"none",
"speculative",
"directed",
@@ -5737,7 +5706,8 @@
"key": {
"type": "string",
"enum": [
"set", [
"set",
[
"hwm",
"never",
"always",
@@ -5955,7 +5925,8 @@
"key": {
"type": "string",
"enum": [
"set", [
"set",
[
"cloud",
"gw",
"init"
@@ -5971,7 +5942,8 @@
"key": {
"type": "string",
"enum": [
"set", [
"set",
[
"schedule",
"always"
]
@@ -8309,12 +8281,10 @@
}
}
},
"maximum_sources":
{
"maximum_sources": {
"type": "integer"
},
"maximum_members":
{
"maximum_members": {
"type": "integer"
},
"fast_leave_enable": {
@@ -8374,12 +8344,10 @@
}
}
},
"maximum_sources":
{
"maximum_sources": {
"type": "integer"
},
"maximum_members":
{
"maximum_members": {
"type": "integer"
},
"fast_leave_enable": {

View File

@@ -715,6 +715,7 @@ message EventReport {
optional bool using11k = 9;
optional bool using11r = 10;
optional bool using11v = 11;
optional uint32 timestamp_ms = 12;
}
/* Client Authentication Event */
@@ -724,6 +725,7 @@ message EventReport {
optional string ssid = 3;
optional RadioBandType band = 4;
optional uint32 auth_status = 5;
optional uint32 timestamp_ms = 6;
}
/* Client Disconnect Event */
@@ -739,6 +741,7 @@ message EventReport {
optional int32 rssi = 9;
optional string ssid = 10;
optional RadioBandType band = 11;
optional uint32 timestamp_ms = 12;
}
/* Client Connnect Event */
@@ -763,6 +766,7 @@ message EventReport {
optional bool using11v = 18;
optional int64 ev_time_bootup_in_us_ip = 19;
optional int32 assoc_rssi = 20;
optional uint32 timestamp_ms = 21;
}
/* Client Failure Event */
@@ -772,6 +776,7 @@ message EventReport {
optional string ssid = 3;
optional int32 reason_code = 4;
optional string reason_str = 5;
optional uint32 timestamp_ms = 6;
}
/* Client First Data Event */
@@ -780,6 +785,7 @@ message EventReport {
optional uint64 session_id = 2;
optional uint64 fdata_tx_up_ts_in_us = 3;
optional uint64 fdata_rx_up_ts_in_us = 4;
optional uint32 timestamp_ms = 5;
}
/* Client Id Event */
@@ -787,6 +793,7 @@ message EventReport {
optional string clt_mac = 1;
optional uint64 session_id = 2;
optional string clt_id = 3;
optional uint32 timestamp_ms = 4;
}
/* Client IP Event */
@@ -794,6 +801,7 @@ message EventReport {
optional string sta_mac = 1;
optional uint64 session_id = 2;
optional bytes ip_addr = 3;
optional uint32 timestamp_ms = 4;
}
/* Client Timeout Event */
@@ -803,6 +811,7 @@ message EventReport {
optional CTReasonType r_code = 3;
optional uint64 last_sent_up_ts_in_us = 4;
optional uint64 last_rcv_up_ts_in_us = 5;
optional uint32 timestamp_ms = 6;
}
/* Client Session */