jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 13:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump axis to v60 (#114544)

Browse Source 
* Improve Axis MQTT support

* Bump axis to v60
This commit is contained in:
Robert Svensson 2024-04-01 00:24:41 +02:00 committed by GitHub
parent f08af5dc6d
commit 05d40fbc4c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
homeassistant/components/axis/hub/hub.py
View File

@ -116,7 +116,7 @@ class AxisHub:
if status.status.state == ClientState.ACTIVE: if status.status.state == ClientState.ACTIVE:
self.config.entry.async_on_unload( self.config.entry.async_on_unload(
await mqtt.async_subscribe( await mqtt.async_subscribe(
hass, f"{self.api.vapix.serial_number}/#", self.mqtt_message hass, f"{status.config.device_topic_prefix}/#", self.mqtt_message
) )
) )
@ -124,7 +124,8 @@ class AxisHub:
def mqtt_message(self, message: ReceiveMessage) -> None: def mqtt_message(self, message: ReceiveMessage) -> None:
"""Receive Axis MQTT message.""" """Receive Axis MQTT message."""
self.disconnect_from_stream() self.disconnect_from_stream()
if message.topic.endswith("event/connection"):
return
event = mqtt_json_to_event(message.payload) event = mqtt_json_to_event(message.payload)
self.api.event.handler(event) self.api.event.handler(event)

2
homeassistant/components/axis/manifest.json
View File

@ -26,7 +26,7 @@
"iot_class": "local_push", "iot_class": "local_push",
"loggers": ["axis"], "loggers": ["axis"],
"quality_scale": "platinum", "quality_scale": "platinum",
"requirements": ["axis==59"], "requirements": ["axis==60"],
"ssdp": [ "ssdp": [
{ {
"manufacturer": "AXIS" "manufacturer": "AXIS"

2
requirements_all.txt
View File

@ -514,7 +514,7 @@ aurorapy==0.2.7
# avion==0.10 # avion==0.10
# homeassistant.components.axis # homeassistant.components.axis
axis==59 axis==60
# homeassistant.components.azure_event_hub # homeassistant.components.azure_event_hub
azure-eventhub==5.11.1 azure-eventhub==5.11.1

2
requirements_test_all.txt
View File

@ -454,7 +454,7 @@ auroranoaa==0.0.3
aurorapy==0.2.7 aurorapy==0.2.7
# homeassistant.components.axis # homeassistant.components.axis
axis==59 axis==60
# homeassistant.components.azure_event_hub # homeassistant.components.azure_event_hub
azure-eventhub==5.11.1 azure-eventhub==5.11.1

1
tests/components/axis/const.py
View File

@ -74,6 +74,7 @@ MQTT_CLIENT_RESPONSE = {
"status": {"state": "active", "connectionStatus": "Connected"}, "status": {"state": "active", "connectionStatus": "Connected"},
"config": { "config": {
"server": {"protocol": "tcp", "host": "192.168.0.90", "port": 1883}, "server": {"protocol": "tcp", "host": "192.168.0.90", "port": 1883},
"deviceTopicPrefix": f"axis/{MAC}",
}, },
}, },
} }

4
tests/components/axis/test_hub.py
View File

@ -91,9 +91,9 @@ async def test_device_support_mqtt(
hass: HomeAssistant, mqtt_mock: MqttMockHAClient, setup_config_entry hass: HomeAssistant, mqtt_mock: MqttMockHAClient, setup_config_entry
) -> None: ) -> None:
"""Successful setup.""" """Successful setup."""
mqtt_mock.async_subscribe.assert_called_with(f"{MAC}/#", mock.ANY, 0, "utf-8") mqtt_mock.async_subscribe.assert_called_with(f"axis/{MAC}/#", mock.ANY, 0, "utf-8")
topic = f"{MAC}/event/tns:onvif/Device/tns:axis/Sensor/PIR/$source/sensor/0" topic = f"axis/{MAC}/event/tns:onvif/Device/tns:axis/Sensor/PIR/$source/sensor/0"
message = ( message = (
b'{"timestamp": 1590258472044, "topic": "onvif:Device/axis:Sensor/PIR",' b'{"timestamp": 1590258472044, "topic": "onvif:Device/axis:Sensor/PIR",'
b' "message": {"source": {"sensor": "0"}, "key": {}, "data": {"state": "1"}}}' b' "message": {"source": {"sensor": "0"}, "key": {}, "data": {"state": "1"}}}'