mirror of
https://github.com/home-assistant/core.git
synced 2025-07-09 06:17:07 +00:00
Remove unused params in "zwave_js/provision_smart_start_node" API (#140982)
This commit is contained in:
parent
2674b02bfa
commit
3fb0290fba
@ -976,13 +976,7 @@ async def websocket_validate_dsk_and_enter_pin(
|
|||||||
{
|
{
|
||||||
vol.Required(TYPE): "zwave_js/provision_smart_start_node",
|
vol.Required(TYPE): "zwave_js/provision_smart_start_node",
|
||||||
vol.Required(ENTRY_ID): str,
|
vol.Required(ENTRY_ID): str,
|
||||||
vol.Exclusive(
|
vol.Required(QR_PROVISIONING_INFORMATION): QR_PROVISIONING_INFORMATION_SCHEMA,
|
||||||
PLANNED_PROVISIONING_ENTRY, "options"
|
|
||||||
): PLANNED_PROVISIONING_ENTRY_SCHEMA,
|
|
||||||
vol.Exclusive(
|
|
||||||
QR_PROVISIONING_INFORMATION, "options"
|
|
||||||
): QR_PROVISIONING_INFORMATION_SCHEMA,
|
|
||||||
vol.Exclusive(QR_CODE_STRING, "options"): QR_CODE_STRING_SCHEMA,
|
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
@websocket_api.async_response
|
@websocket_api.async_response
|
||||||
@ -997,28 +991,10 @@ async def websocket_provision_smart_start_node(
|
|||||||
driver: Driver,
|
driver: Driver,
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Pre-provision a smart start node."""
|
"""Pre-provision a smart start node."""
|
||||||
try:
|
|
||||||
cv.has_at_least_one_key(
|
|
||||||
PLANNED_PROVISIONING_ENTRY, QR_PROVISIONING_INFORMATION, QR_CODE_STRING
|
|
||||||
)(msg)
|
|
||||||
except vol.Invalid as err:
|
|
||||||
connection.send_error(
|
|
||||||
msg[ID],
|
|
||||||
ERR_INVALID_FORMAT,
|
|
||||||
err.args[0],
|
|
||||||
)
|
|
||||||
return
|
|
||||||
|
|
||||||
provisioning_info = (
|
provisioning_info = msg[QR_PROVISIONING_INFORMATION]
|
||||||
msg.get(PLANNED_PROVISIONING_ENTRY)
|
|
||||||
or msg.get(QR_PROVISIONING_INFORMATION)
|
|
||||||
or msg[QR_CODE_STRING]
|
|
||||||
)
|
|
||||||
|
|
||||||
if (
|
if provisioning_info.version == QRCodeVersion.S2:
|
||||||
QR_PROVISIONING_INFORMATION in msg
|
|
||||||
and provisioning_info.version == QRCodeVersion.S2
|
|
||||||
):
|
|
||||||
connection.send_error(
|
connection.send_error(
|
||||||
msg[ID],
|
msg[ID],
|
||||||
ERR_INVALID_FORMAT,
|
ERR_INVALID_FORMAT,
|
||||||
|
@ -1095,52 +1095,27 @@ async def test_provision_smart_start_node(
|
|||||||
|
|
||||||
client.async_send_command.return_value = {"success": True}
|
client.async_send_command.return_value = {"success": True}
|
||||||
|
|
||||||
# Test provisioning entry
|
valid_qr_info = {
|
||||||
await ws_client.send_json(
|
VERSION: 1,
|
||||||
{
|
SECURITY_CLASSES: [0],
|
||||||
ID: 2,
|
DSK: "test",
|
||||||
TYPE: "zwave_js/provision_smart_start_node",
|
GENERIC_DEVICE_CLASS: 1,
|
||||||
ENTRY_ID: entry.entry_id,
|
SPECIFIC_DEVICE_CLASS: 1,
|
||||||
PLANNED_PROVISIONING_ENTRY: {
|
INSTALLER_ICON_TYPE: 1,
|
||||||
DSK: "test",
|
MANUFACTURER_ID: 1,
|
||||||
SECURITY_CLASSES: [0],
|
PRODUCT_TYPE: 1,
|
||||||
},
|
PRODUCT_ID: 1,
|
||||||
}
|
APPLICATION_VERSION: "test",
|
||||||
)
|
"name": "test",
|
||||||
|
|
||||||
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.provision_smart_start_node",
|
|
||||||
"entry": ProvisioningEntry(
|
|
||||||
"test", [SecurityClass.S2_UNAUTHENTICATED]
|
|
||||||
).to_dict(),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
client.async_send_command.reset_mock()
|
|
||||||
client.async_send_command.return_value = {"success": True}
|
|
||||||
|
|
||||||
# Test QR provisioning information
|
# Test QR provisioning information
|
||||||
await ws_client.send_json(
|
await ws_client.send_json(
|
||||||
{
|
{
|
||||||
ID: 3,
|
ID: 3,
|
||||||
TYPE: "zwave_js/provision_smart_start_node",
|
TYPE: "zwave_js/provision_smart_start_node",
|
||||||
ENTRY_ID: entry.entry_id,
|
ENTRY_ID: entry.entry_id,
|
||||||
QR_PROVISIONING_INFORMATION: {
|
QR_PROVISIONING_INFORMATION: valid_qr_info,
|
||||||
VERSION: 1,
|
|
||||||
SECURITY_CLASSES: [0],
|
|
||||||
DSK: "test",
|
|
||||||
GENERIC_DEVICE_CLASS: 1,
|
|
||||||
SPECIFIC_DEVICE_CLASS: 1,
|
|
||||||
INSTALLER_ICON_TYPE: 1,
|
|
||||||
MANUFACTURER_ID: 1,
|
|
||||||
PRODUCT_TYPE: 1,
|
|
||||||
PRODUCT_ID: 1,
|
|
||||||
APPLICATION_VERSION: "test",
|
|
||||||
"name": "test",
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -1171,28 +1146,6 @@ async def test_provision_smart_start_node(
|
|||||||
client.async_send_command.reset_mock()
|
client.async_send_command.reset_mock()
|
||||||
client.async_send_command.return_value = {"success": True}
|
client.async_send_command.return_value = {"success": True}
|
||||||
|
|
||||||
# Test QR code string
|
|
||||||
await ws_client.send_json(
|
|
||||||
{
|
|
||||||
ID: 4,
|
|
||||||
TYPE: "zwave_js/provision_smart_start_node",
|
|
||||||
ENTRY_ID: entry.entry_id,
|
|
||||||
QR_CODE_STRING: "90testtesttesttesttesttesttesttesttesttesttesttesttest",
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
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.provision_smart_start_node",
|
|
||||||
"entry": "90testtesttesttesttesttesttesttesttesttesttesttesttest",
|
|
||||||
}
|
|
||||||
|
|
||||||
client.async_send_command.reset_mock()
|
|
||||||
client.async_send_command.return_value = {"success": True}
|
|
||||||
|
|
||||||
# Test QR provisioning information with S2 version throws error
|
# Test QR provisioning information with S2 version throws error
|
||||||
await ws_client.send_json(
|
await ws_client.send_json(
|
||||||
{
|
{
|
||||||
@ -1243,9 +1196,7 @@ async def test_provision_smart_start_node(
|
|||||||
ID: 7,
|
ID: 7,
|
||||||
TYPE: "zwave_js/provision_smart_start_node",
|
TYPE: "zwave_js/provision_smart_start_node",
|
||||||
ENTRY_ID: entry.entry_id,
|
ENTRY_ID: entry.entry_id,
|
||||||
QR_CODE_STRING: (
|
QR_PROVISIONING_INFORMATION: valid_qr_info,
|
||||||
"90testtesttesttesttesttesttesttesttesttesttesttesttest"
|
|
||||||
),
|
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
msg = await ws_client.receive_json()
|
msg = await ws_client.receive_json()
|
||||||
@ -1263,7 +1214,7 @@ async def test_provision_smart_start_node(
|
|||||||
ID: 8,
|
ID: 8,
|
||||||
TYPE: "zwave_js/provision_smart_start_node",
|
TYPE: "zwave_js/provision_smart_start_node",
|
||||||
ENTRY_ID: entry.entry_id,
|
ENTRY_ID: entry.entry_id,
|
||||||
QR_CODE_STRING: "90testtesttesttesttesttesttesttesttesttesttesttesttest",
|
QR_PROVISIONING_INFORMATION: valid_qr_info,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
msg = await ws_client.receive_json()
|
msg = await ws_client.receive_json()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user