From eb44d63e891b9e7516ead524ad56da7ae4710de6 Mon Sep 17 00:00:00 2001 From: Amin Ben Ramdhane Date: Tue, 14 Dec 2021 18:00:47 +0100 Subject: [PATCH] WiFi.DataElements: update mapping options --- dmtree/tr181/wifi.c | 12 +++---- .../tmp/wifi.dataelements.collector.dump.data | 32 +++++++++++++++++-- 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/dmtree/tr181/wifi.c b/dmtree/tr181/wifi.c index bb41d3c1..8ce6078b 100644 --- a/dmtree/tr181/wifi.c +++ b/dmtree/tr181/wifi.c @@ -4703,25 +4703,25 @@ static int get_WiFiDataElementsNetworkDeviceMultiAPDevice_EasyMeshAgentOperation static int get_WiFiDataElementsNetworkDeviceMultiAPDeviceBackhaul_LinkType(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { - *value = dmjson_get_value(((struct wifi_data_element_args *)data)->dump2_obj, 1, "Backhaul_LinkType"); + *value = dmjson_get_value(((struct wifi_data_element_args *)data)->dump2_obj, 1, "backhaul_type"); return 0; } static int get_WiFiDataElementsNetworkDeviceMultiAPDeviceBackhaul_BackhaulMACAddress(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { - *value = dmjson_get_value(((struct wifi_data_element_args *)data)->dump2_obj, 1, "Backhaul_BackhaulMACAddress"); + *value = dmjson_get_value(((struct wifi_data_element_args *)data)->dump2_obj, 1, "backhaul_macaddr"); return 0; } static int get_WiFiDataElementsNetworkDeviceMultiAPDeviceBackhaul_BackhaulDeviceID(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { - *value = dmjson_get_value(((struct wifi_data_element_args *)data)->dump2_obj, 1, "Backhaul_BackhaulDeviceID"); + *value = dmjson_get_value(((struct wifi_data_element_args *)data)->dump2_obj, 1, "backhaul_macaddr"); return 0; } static int get_WiFiDataElementsNetworkDeviceMultiAPDeviceBackhaul_MACAddress(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { - *value = dmjson_get_value(((struct wifi_data_element_args *)data)->dump2_obj, 1, "Backhaul_MACAddress"); + *value = dmjson_get_value(((struct wifi_data_element_args *)data)->dump2_obj, 1, "macaddr"); return 0; } @@ -4757,13 +4757,13 @@ static int get_WiFiDataElementsNetworkDeviceMultiAPDeviceBackhaulCurrentOperatin static int get_WiFiDataElementsNetworkDeviceMultiAPDeviceBackhaulStats_BytesSent(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { - *value = dmjson_get_value(((struct wifi_data_element_args *)data)->dump2_obj, 1, "Backhaul_BytesSent"); + *value = dmjson_get_value(((struct wifi_data_element_args *)data)->dump2_obj, 1, "backhaul_tx_bytes"); return 0; } static int get_WiFiDataElementsNetworkDeviceMultiAPDeviceBackhaulStats_BytesReceived(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { - *value = dmjson_get_value(((struct wifi_data_element_args *)data)->dump2_obj, 1, "Backhaul_BytesReceived"); + *value = dmjson_get_value(((struct wifi_data_element_args *)data)->dump2_obj, 1, "backhaul_rx_bytes"); return 0; } diff --git a/test/files/tmp/wifi.dataelements.collector.dump.data b/test/files/tmp/wifi.dataelements.collector.dump.data index 4a170fae..03ac9bc5 100644 --- a/test/files/tmp/wifi.dataelements.collector.dump.data +++ b/test/files/tmp/wifi.dataelements.collector.dump.data @@ -35,7 +35,7 @@ "TimeStamp": "2021-12-13T06:06:35+01:00", "Enabled": true, "LastChange": 0, - "NumberofSTA": 0, + "NumberofSTA": 1, "EstServiceParametersBE": "AAAA", "EstServiceParametersBK": "AAAA", "EstServiceParametersVO": "AAAA", @@ -47,7 +47,33 @@ "BroadcastBytesReceived": 0, "BroadcastBytesSent": 0, "STAList": [ - + { + "MACAddress": "44:d4:37:71:be:6f", + "TimeStamp": "2021-12-14T16:54:08+01:00", + "SignalStrength": 158, + "HTCapabilities": "/g==", + "VHTCapabilities": "qv+q/24w", + "HECapabilities": "qv+q/2wA", + "EstMACDataRateDownlink": 0, + "EstMACDataRateUplink": 0, + "LastDataDownlinkRate": 1361, + "LastDataUplinkRate": 1633, + "UtilizationTransmit": 0, + "UtilizationReceive": 0, + "LastConnectTime": 6, + "Hostname": "", + "BytesSent": 85439, + "BytesReceived": 7872, + "PacketsSent": 827, + "PacketsReceived": 44, + "ErrorsSent": 0, + "ErrorsReceived": 0, + "RetransCount": 2, + "NumberOfMeasureReports": 0, + "Measurementreport": [ + + ] + } ] }, { @@ -183,7 +209,7 @@ ], "BackhaulSta": { - "MACAddress": "00:00:00:00:00:00" + "MACAddress": "44:d4:37:71:be:6f" } }, {