Add OZW network_statistics websocket command (#39124)

* Add network_statistics websocket command

* Add tests

homeassistant/components/ozw/websocket_api.py

@@ -23,6 +23,7 @@ def async_register_api(hass):
     """Register all of our api endpoints."""
     websocket_api.async_register_command(hass, websocket_get_instances)
     websocket_api.async_register_command(hass, websocket_network_status)
+    websocket_api.async_register_command(hass, websocket_network_statistics)
     websocket_api.async_register_command(hass, websocket_node_metadata)
     websocket_api.async_register_command(hass, websocket_node_status)
     websocket_api.async_register_command(hass, websocket_node_statistics)
@@ -59,6 +60,26 @@ def websocket_network_status(hass, connection, msg):
     )
 
 
+@websocket_api.websocket_command(
+    {
+        vol.Required(TYPE): "ozw/network_statistics",
+        vol.Optional(OZW_INSTANCE, default=1): vol.Coerce(int),
+    }
+)
+def websocket_network_statistics(hass, connection, msg):
+    """Get Z-Wave network statistics."""
+
+    manager = hass.data[DOMAIN][MANAGER]
+    statistics = manager.get_instance(msg[OZW_INSTANCE]).get_statistics().data
+    node_count = len(
+        manager.get_instance(msg[OZW_INSTANCE]).collections["node"].collection
+    )
+    connection.send_result(
+        msg[ID],
+        dict(statistics, ozw_instance=msg[OZW_INSTANCE], node_count=node_count),
+    )
+
+
 @websocket_api.websocket_command(
     {
         vol.Required(TYPE): "ozw/node_status",

tests/components/ozw/test_websocket_api.py

@@ -74,6 +74,14 @@ async def test_websocket_api(hass, generic_data, hass_ws_client):
     result = msg["result"]
     assert result["metadata"]["ProductPic"] == "images/aeotec/zwa002.png"
 
+    # Test network statistics
+    await client.send_json({ID: 9, TYPE: "ozw/network_statistics"})
+    msg = await client.receive_json()
+    result = msg["result"]
+    assert result["readCnt"] == 92220
+    assert result[OZW_INSTANCE] == 1
+    assert result["node_count"] == 5
+
 
 async def test_refresh_node(hass, generic_data, sent_messages, hass_ws_client):
     """Test the ozw refresh node api."""

tests/fixtures/ozw/generic_network_dump.csv

@@ -280,4 +280,5 @@ OpenZWave/1/node/39/instance/1/commandclass/43/,{    "Instance": 1,    "CommandC
 OpenZWave/1/node/39/instance/1/commandclass/43/value/562950622511127/,{    "Label": "Scene",    "Value": 0,    "Units": "",    "Min": -2147483648,    "Max": 2147483647,    "Type": "Int",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SCENE_ACTIVATION",    "Index": 0,    "Node": 7,    "Genre": "User",    "Help": "",    "ValueIDKey": 122339347,    "ReadOnly": false,    "WriteOnly": false,    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Event": "valueChanged",    "TimeStamp": 1579630367}
 OpenZWave/1/node/39/instance/1/commandclass/91/,{    "Instance": 1,    "CommandClassId": 91,    "CommandClass": "COMMAND_CLASS_CENTRAL_SCENE",    "TimeStamp": 1579630630}
 OpenZWave/1/node/39/instance/1/commandclass/91/value/281476005806100/,{    "Label": "Scene 1",    "Value": {        "List": [            {                "Value": 0,                "Label": "Inactive"            },            {                "Value": 1,                "Label": "Pressed 1 Time"            },            {                "Value": 2,                "Label": "Key Released"            },            {                "Value": 3,                "Label": "Key Held down"            }        ],        "Selected": "Inactive",    "Selected_id": 0    },    "Units": "",    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CENTRAL_SCENE",    "Index": 1,    "Node": 61,    "Genre": "User",    "Help": "",    "ValueIDKey": 281476005806100,    "ReadOnly": false,    "WriteOnly": false,    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Event": "valueChanged",    "TimeStamp": 1579640710}
-OpenZWave/1/node/39/statistics/,{    "sendCount": 57,    "sentFailed": 0,    "retries": 1,    "receivedPackets": 3594,    "receivedDupPackets": 12,    "receivedUnsolicited": 3546,    "lastSentTimeStamp": 1595764791,    "lastReceivedTimeStamp": 1595802261,    "lastRequestRTT": 26,    "averageRequestRTT": 29,    "lastResponseRTT": 38,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
+OpenZWave/1/node/39/statistics/,{    "sendCount": 57,    "sentFailed": 0,    "retries": 1,    "receivedPackets": 3594,    "receivedDupPackets": 12,    "receivedUnsolicited": 3546,    "lastSentTimeStamp": 1595764791,    "lastReceivedTimeStamp": 1595802261,    "lastRequestRTT": 26,    "averageRequestRTT": 29,    "lastResponseRTT": 38,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
+OpenZWave/1/statistics/,{    "SOFCnt": 92220,    "ACKWaiting": 0,    "readAborts": 0,    "badChecksum": 0,    "readCnt": 92220,    "writeCnt": 2150,    "CANCnt": 0,    "NAKCnt": 0,    "ACKCnt": 2150,    "OOFCnt": 0,    "dropped": 27,    "retries": 0,    "callbacks": 1,    "badroutes": 0,    "noack": 18,    "netbusy": 0,    "notidle": 0,    "txverified": 0,    "nondelivery": 0,    "routedbusy": 0,    "broadcastReadCnt": 42190,    "broadcastWriteCnt": 25}