Add dsk option to zwave_js/add_node WS command

homeassistant/components/zwave_js/api.py

@@ -35,11 +35,11 @@
     QRProvisioningInformation,
 )
 from zwave_js_server.model.driver import Driver
-from zwave_js_server.model.firmware import FirmwareUpdateData
 from zwave_js_server.model.log_config import LogConfig
 from zwave_js_server.model.log_message import LogMessage
 from zwave_js_server.model.node import Node, NodeStatistics
 from zwave_js_server.model.node.firmware import (
+    NodeFirmwareUpdateData,
     NodeFirmwareUpdateProgress,
     NodeFirmwareUpdateResult,
 )
@@ -647,6 +647,7 @@ async def websocket_node_comments(
             QR_PROVISIONING_INFORMATION, "options"
         ): QR_PROVISIONING_INFORMATION_SCHEMA,
         vol.Exclusive(QR_CODE_STRING, "options"): QR_CODE_STRING_SCHEMA,
+        vol.Exclusive(DSK, "options"): str,
     }
 )
 @websocket_api.async_response
@@ -669,6 +670,7 @@ async def websocket_add_node(
         or msg.get(QR_PROVISIONING_INFORMATION)
         or msg.get(QR_CODE_STRING)
     )
+    dsk = msg.get(DSK)
 
     @callback
     def async_cleanup() -> None:
@@ -765,6 +767,7 @@ def device_registered(device: dr.DeviceEntry) -> None:
             INCLUSION_STRATEGY_NOT_SMART_START[inclusion_strategy.value],
             force_security=force_security,
             provisioning=provisioning,
+            dsk=dsk,
         )
     except ValueError as err:
         connection.send_error(
@@ -2072,7 +2075,7 @@ async def post(self, request: web.Request, device_id: str) -> web.Response:
                 node.client.ws_server_url,
                 node,
                 [
-                    FirmwareUpdateData(
+                    NodeFirmwareUpdateData(
                         uploaded_file.filename,
                         await hass.async_add_executor_job(uploaded_file.file.read),
                     )

homeassistant/components/zwave_js/manifest.json

@@ -8,7 +8,7 @@
   "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["zwave_js_server"],
-  "requirements": ["pyserial==3.5", "zwave-js-server-python==0.45.2"],
+  "requirements": ["pyserial==3.5", "zwave-js-server-python==0.46.0"],
   "usb": [
     {
       "vid": "0658",

requirements_all.txt

@@ -2727,7 +2727,7 @@ zigpy==0.53.0
 zm-py==0.5.2
 
 # homeassistant.components.zwave_js
-zwave-js-server-python==0.45.2
+zwave-js-server-python==0.46.0
 
 # homeassistant.components.zwave_me
 zwave_me_ws==0.3.1

requirements_test_all.txt

@@ -1931,7 +1931,7 @@ zigpy-znp==0.9.2
 zigpy==0.53.0
 
 # homeassistant.components.zwave_js
-zwave-js-server-python==0.45.2
+zwave-js-server-python==0.46.0
 
 # homeassistant.components.zwave_me
 zwave_me_ws==0.3.1

tests/components/zwave_js/test_api.py

@@ -28,8 +28,8 @@
     ProvisioningEntry,
     QRProvisioningInformation,
 )
-from zwave_js_server.model.firmware import FirmwareUpdateData
 from zwave_js_server.model.node import Node
+from zwave_js_server.model.node.firmware import NodeFirmwareUpdateData
 
 from homeassistant.components.websocket_api import ERR_INVALID_FORMAT, ERR_NOT_FOUND
 from homeassistant.components.zwave_js.api import (
@@ -779,13 +779,39 @@ async def test_add_node(
     client.async_send_command.reset_mock()
     client.async_send_command.return_value = {"success": True}
 
-    # Test Smart Start QR provisioning information with S2 inclusion strategy fails
+    # Test S2 DSK string string
     await ws_client.send_json(
         {
             ID: 6,
             TYPE: "zwave_js/add_node",
             ENTRY_ID: entry.entry_id,
             INCLUSION_STRATEGY: InclusionStrategy.SECURITY_S2.value,
+            DSK: "test_dsk",
+        }
+    )
+
+    msg = await ws_client.receive_json()
+    assert msg["success"]
+
+    assert len(client.async_send_command.call_args_list) == 1
+    assert client.async_send_command.call_args[0][0] == {
+        "command": "controller.begin_inclusion",
+        "options": {
+            "strategy": InclusionStrategy.SECURITY_S2,
+            "dsk": "test_dsk",
+        },
+    }
+
+    client.async_send_command.reset_mock()
+    client.async_send_command.return_value = {"success": True}
+
+    # Test Smart Start QR provisioning information with S2 inclusion strategy fails
+    await ws_client.send_json(
+        {
+            ID: 7,
+            TYPE: "zwave_js/add_node",
+            ENTRY_ID: entry.entry_id,
+            INCLUSION_STRATEGY: InclusionStrategy.SECURITY_S2.value,
             QR_PROVISIONING_INFORMATION: {
                 VERSION: 1,
                 SECURITY_CLASSES: [0],
@@ -812,7 +838,7 @@ async def test_add_node(
     # Test QR provisioning information with S0 inclusion strategy fails
     await ws_client.send_json(
         {
-            ID: 7,
+            ID: 8,
             TYPE: "zwave_js/add_node",
             ENTRY_ID: entry.entry_id,
             INCLUSION_STRATEGY: InclusionStrategy.SECURITY_S0,
@@ -842,7 +868,7 @@ async def test_add_node(
     # Test ValueError is caught as failure
     await ws_client.send_json(
         {
-            ID: 8,
+            ID: 9,
             TYPE: "zwave_js/add_node",
             ENTRY_ID: entry.entry_id,
             INCLUSION_STRATEGY: InclusionStrategy.DEFAULT.value,
@@ -862,7 +888,7 @@ async def test_add_node(
     ):
         await ws_client.send_json(
             {
-                ID: 9,
+                ID: 10,
                 TYPE: "zwave_js/add_node",
                 ENTRY_ID: entry.entry_id,
             }
@@ -878,7 +904,7 @@ async def test_add_node(
     await hass.async_block_till_done()
 
     await ws_client.send_json(
-        {ID: 10, TYPE: "zwave_js/add_node", ENTRY_ID: entry.entry_id}
+        {ID: 11, TYPE: "zwave_js/add_node", ENTRY_ID: entry.entry_id}
     )
     msg = await ws_client.receive_json()
 
@@ -2915,7 +2941,7 @@ async def test_firmware_upload_view(
         )
         assert mock_cmd.call_args[0][1:3] == (
             multisensor_6,
-            [FirmwareUpdateData("file", bytes(10))],
+            [NodeFirmwareUpdateData("file", bytes(10))],
         )
         assert mock_cmd.call_args[1] == {
             "additional_user_agent_components": {"HomeAssistant": "0.0.0"},