From 0be20ec6abff8396fb18338e3fe9fa394b688758 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 14 May 2020 22:56:04 +0200 Subject: [PATCH] Rename zwave_mqtt to ozw (#35631) --- .coveragerc | 8 ++++---- CODEOWNERS | 2 +- .../components/{zwave_mqtt => ozw}/__init__.py | 12 ++++++------ .../{zwave_mqtt => ozw}/binary_sensor.py | 0 .../{zwave_mqtt => ozw}/config_flow.py | 6 +++--- .../components/{zwave_mqtt => ozw}/const.py | 4 ++-- .../components/{zwave_mqtt => ozw}/discovery.py | 0 .../components/{zwave_mqtt => ozw}/entity.py | 0 .../components/{zwave_mqtt => ozw}/light.py | 0 homeassistant/components/ozw/manifest.json | 9 +++++++++ .../components/{zwave_mqtt => ozw}/sensor.py | 0 .../components/{zwave_mqtt => ozw}/services.py | 0 .../{zwave_mqtt => ozw}/services.yaml | 0 .../components/{zwave_mqtt => ozw}/strings.json | 1 - .../components/{zwave_mqtt => ozw}/switch.py | 0 .../{zwave_mqtt => ozw}/translations/ca.json | 0 .../{zwave_mqtt => ozw}/translations/de.json | 0 .../{zwave_mqtt => ozw}/translations/en.json | 0 .../{zwave_mqtt => ozw}/translations/es.json | 0 .../{zwave_mqtt => ozw}/translations/fi.json | 0 .../{zwave_mqtt => ozw}/translations/fr.json | 0 .../{zwave_mqtt => ozw}/translations/it.json | 0 .../{zwave_mqtt => ozw}/translations/ko.json | 0 .../{zwave_mqtt => ozw}/translations/lb.json | 0 .../{zwave_mqtt => ozw}/translations/nl.json | 0 .../{zwave_mqtt => ozw}/translations/no.json | 0 .../{zwave_mqtt => ozw}/translations/pl.json | 0 .../{zwave_mqtt => ozw}/translations/ru.json | 0 .../{zwave_mqtt => ozw}/translations/sl.json | 0 .../{zwave_mqtt => ozw}/translations/sv.json | 0 .../translations/zh-Hans.json | 0 .../translations/zh-Hant.json | 0 .../components/zwave_mqtt/manifest.json | 17 ----------------- homeassistant/generated/config_flows.py | 4 ++-- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- tests/components/ozw/__init__.py | 1 + tests/components/{zwave_mqtt => ozw}/common.py | 8 ++++---- .../components/{zwave_mqtt => ozw}/conftest.py | 16 +++++++--------- .../{zwave_mqtt => ozw}/test_binary_sensor.py | 8 ++++---- .../{zwave_mqtt => ozw}/test_config_flow.py | 8 ++++---- .../components/{zwave_mqtt => ozw}/test_init.py | 12 ++++++------ .../{zwave_mqtt => ozw}/test_light.py | 6 +++--- .../{zwave_mqtt => ozw}/test_scenes.py | 6 +++--- .../{zwave_mqtt => ozw}/test_sensor.py | 8 ++++---- .../{zwave_mqtt => ozw}/test_switch.py | 4 ++-- tests/components/zwave_mqtt/__init__.py | 1 - .../{zwave_mqtt => ozw}/binary_sensor.json | 0 .../{zwave_mqtt => ozw}/binary_sensor_alt.json | 0 .../generic_network_dump.csv | 0 tests/fixtures/{zwave_mqtt => ozw}/light.json | 0 .../{zwave_mqtt => ozw}/light_network_dump.csv | 0 tests/fixtures/{zwave_mqtt => ozw}/sensor.json | 0 tests/fixtures/{zwave_mqtt => ozw}/switch.json | 0 54 files changed, 67 insertions(+), 78 deletions(-) rename homeassistant/components/{zwave_mqtt => ozw}/__init__.py (97%) rename homeassistant/components/{zwave_mqtt => ozw}/binary_sensor.py (100%) rename homeassistant/components/{zwave_mqtt => ozw}/config_flow.py (86%) rename homeassistant/components/{zwave_mqtt => ozw}/const.py (94%) rename homeassistant/components/{zwave_mqtt => ozw}/discovery.py (100%) rename homeassistant/components/{zwave_mqtt => ozw}/entity.py (100%) rename homeassistant/components/{zwave_mqtt => ozw}/light.py (100%) create mode 100644 homeassistant/components/ozw/manifest.json rename homeassistant/components/{zwave_mqtt => ozw}/sensor.py (100%) rename homeassistant/components/{zwave_mqtt => ozw}/services.py (100%) rename homeassistant/components/{zwave_mqtt => ozw}/services.yaml (100%) rename homeassistant/components/{zwave_mqtt => ozw}/strings.json (89%) rename homeassistant/components/{zwave_mqtt => ozw}/switch.py (100%) rename homeassistant/components/{zwave_mqtt => ozw}/translations/ca.json (100%) rename homeassistant/components/{zwave_mqtt => ozw}/translations/de.json (100%) rename homeassistant/components/{zwave_mqtt => ozw}/translations/en.json (100%) rename homeassistant/components/{zwave_mqtt => ozw}/translations/es.json (100%) rename homeassistant/components/{zwave_mqtt => ozw}/translations/fi.json (100%) rename homeassistant/components/{zwave_mqtt => ozw}/translations/fr.json (100%) rename homeassistant/components/{zwave_mqtt => ozw}/translations/it.json (100%) rename homeassistant/components/{zwave_mqtt => ozw}/translations/ko.json (100%) rename homeassistant/components/{zwave_mqtt => ozw}/translations/lb.json (100%) rename homeassistant/components/{zwave_mqtt => ozw}/translations/nl.json (100%) rename homeassistant/components/{zwave_mqtt => ozw}/translations/no.json (100%) rename homeassistant/components/{zwave_mqtt => ozw}/translations/pl.json (100%) rename homeassistant/components/{zwave_mqtt => ozw}/translations/ru.json (100%) rename homeassistant/components/{zwave_mqtt => ozw}/translations/sl.json (100%) rename homeassistant/components/{zwave_mqtt => ozw}/translations/sv.json (100%) rename homeassistant/components/{zwave_mqtt => ozw}/translations/zh-Hans.json (100%) rename homeassistant/components/{zwave_mqtt => ozw}/translations/zh-Hant.json (100%) delete mode 100644 homeassistant/components/zwave_mqtt/manifest.json create mode 100644 tests/components/ozw/__init__.py rename tests/components/{zwave_mqtt => ozw}/common.py (87%) rename tests/components/{zwave_mqtt => ozw}/conftest.py (80%) rename tests/components/{zwave_mqtt => ozw}/test_binary_sensor.py (89%) rename tests/components/{zwave_mqtt => ozw}/test_config_flow.py (85%) rename tests/components/{zwave_mqtt => ozw}/test_init.py (84%) rename tests/components/{zwave_mqtt => ozw}/test_light.py (96%) rename tests/components/{zwave_mqtt => ozw}/test_scenes.py (93%) rename tests/components/{zwave_mqtt => ozw}/test_sensor.py (92%) rename tests/components/{zwave_mqtt => ozw}/test_switch.py (92%) delete mode 100644 tests/components/zwave_mqtt/__init__.py rename tests/fixtures/{zwave_mqtt => ozw}/binary_sensor.json (100%) rename tests/fixtures/{zwave_mqtt => ozw}/binary_sensor_alt.json (100%) rename tests/fixtures/{zwave_mqtt => ozw}/generic_network_dump.csv (100%) rename tests/fixtures/{zwave_mqtt => ozw}/light.json (100%) rename tests/fixtures/{zwave_mqtt => ozw}/light_network_dump.csv (100%) rename tests/fixtures/{zwave_mqtt => ozw}/sensor.json (100%) rename tests/fixtures/{zwave_mqtt => ozw}/switch.json (100%) diff --git a/.coveragerc b/.coveragerc index 282db156e65..c91b7b2a1a0 100644 --- a/.coveragerc +++ b/.coveragerc @@ -919,10 +919,10 @@ omit = homeassistant/components/zoneminder/* homeassistant/components/supla/* homeassistant/components/zwave/util.py - homeassistant/components/zwave_mqtt/__init__.py - homeassistant/components/zwave_mqtt/discovery.py - homeassistant/components/zwave_mqtt/entity.py - homeassistant/components/zwave_mqtt/services.py + homeassistant/components/ozw/__init__.py + homeassistant/components/ozw/discovery.py + homeassistant/components/ozw/entity.py + homeassistant/components/ozw/services.py [report] # Regexes for lines to exclude from consideration diff --git a/CODEOWNERS b/CODEOWNERS index 5a2723a5d83..da3d035925c 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -292,6 +292,7 @@ homeassistant/components/openweathermap/* @fabaff homeassistant/components/opnsense/* @mtreinish homeassistant/components/orangepi_gpio/* @pascallj homeassistant/components/oru/* @bvlaicu +homeassistant/components/ozw/* @cgarwood @marcelveldt @MartinHjelmare homeassistant/components/panasonic_viera/* @joogps homeassistant/components/panel_custom/* @home-assistant/frontend homeassistant/components/panel_iframe/* @home-assistant/frontend @@ -474,7 +475,6 @@ homeassistant/components/zha/* @dmulcahey @adminiuga homeassistant/components/zone/* @home-assistant/core homeassistant/components/zoneminder/* @rohankapoorcom homeassistant/components/zwave/* @home-assistant/z-wave -homeassistant/components/zwave_mqtt/* @cgarwood @marcelveldt @MartinHjelmare # Individual files homeassistant/components/demo/weather @fabaff diff --git a/homeassistant/components/zwave_mqtt/__init__.py b/homeassistant/components/ozw/__init__.py similarity index 97% rename from homeassistant/components/zwave_mqtt/__init__.py rename to homeassistant/components/ozw/__init__.py index c391f79a542..3a7d35ddd1d 100644 --- a/homeassistant/components/zwave_mqtt/__init__.py +++ b/homeassistant/components/ozw/__init__.py @@ -1,4 +1,4 @@ -"""The zwave_mqtt integration.""" +"""The ozw integration.""" import asyncio import json import logging @@ -43,7 +43,7 @@ DATA_DEVICES = "zwave-mqtt-devices" async def async_setup(hass: HomeAssistant, config: dict): - """Initialize basic config of zwave_mqtt component.""" + """Initialize basic config of ozw component.""" if "mqtt" not in hass.config.components: _LOGGER.error("MQTT integration is not set up") return False @@ -52,9 +52,9 @@ async def async_setup(hass: HomeAssistant, config: dict): async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): - """Set up zwave_mqtt from a config entry.""" - zwave_mqtt_data = hass.data[DOMAIN][entry.entry_id] = {} - zwave_mqtt_data[DATA_UNSUBSCRIBE] = [] + """Set up ozw from a config entry.""" + ozw_data = hass.data[DOMAIN][entry.entry_id] = {} + ozw_data[DATA_UNSUBSCRIBE] = [] data_nodes = {} data_values = {} @@ -216,7 +216,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): for component in PLATFORMS ] ) - zwave_mqtt_data[DATA_UNSUBSCRIBE].append( + ozw_data[DATA_UNSUBSCRIBE].append( await mqtt.async_subscribe( hass, f"{TOPIC_OPENZWAVE}/#", async_receive_message ) diff --git a/homeassistant/components/zwave_mqtt/binary_sensor.py b/homeassistant/components/ozw/binary_sensor.py similarity index 100% rename from homeassistant/components/zwave_mqtt/binary_sensor.py rename to homeassistant/components/ozw/binary_sensor.py diff --git a/homeassistant/components/zwave_mqtt/config_flow.py b/homeassistant/components/ozw/config_flow.py similarity index 86% rename from homeassistant/components/zwave_mqtt/config_flow.py rename to homeassistant/components/ozw/config_flow.py index ff6ab21994f..8822490132c 100644 --- a/homeassistant/components/zwave_mqtt/config_flow.py +++ b/homeassistant/components/ozw/config_flow.py @@ -1,13 +1,13 @@ -"""Config flow for zwave_mqtt integration.""" +"""Config flow for ozw integration.""" from homeassistant import config_entries from .const import DOMAIN # pylint:disable=unused-import -TITLE = "Z-Wave MQTT" +TITLE = "OpenZWave" class DomainConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): - """Handle a config flow for zwave_mqtt.""" + """Handle a config flow for ozw.""" VERSION = 1 CONNECTION_CLASS = config_entries.CONN_CLASS_LOCAL_PUSH diff --git a/homeassistant/components/zwave_mqtt/const.py b/homeassistant/components/ozw/const.py similarity index 94% rename from homeassistant/components/zwave_mqtt/const.py rename to homeassistant/components/ozw/const.py index 5b1f6dcbac7..59f189d124d 100644 --- a/homeassistant/components/zwave_mqtt/const.py +++ b/homeassistant/components/ozw/const.py @@ -1,10 +1,10 @@ -"""Constants for the zwave_mqtt integration.""" +"""Constants for the ozw integration.""" from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN from homeassistant.components.light import DOMAIN as LIGHT_DOMAIN from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN -DOMAIN = "zwave_mqtt" +DOMAIN = "ozw" DATA_UNSUBSCRIBE = "unsubscribe" PLATFORMS = [BINARY_SENSOR_DOMAIN, LIGHT_DOMAIN, SENSOR_DOMAIN, SWITCH_DOMAIN] diff --git a/homeassistant/components/zwave_mqtt/discovery.py b/homeassistant/components/ozw/discovery.py similarity index 100% rename from homeassistant/components/zwave_mqtt/discovery.py rename to homeassistant/components/ozw/discovery.py diff --git a/homeassistant/components/zwave_mqtt/entity.py b/homeassistant/components/ozw/entity.py similarity index 100% rename from homeassistant/components/zwave_mqtt/entity.py rename to homeassistant/components/ozw/entity.py diff --git a/homeassistant/components/zwave_mqtt/light.py b/homeassistant/components/ozw/light.py similarity index 100% rename from homeassistant/components/zwave_mqtt/light.py rename to homeassistant/components/ozw/light.py diff --git a/homeassistant/components/ozw/manifest.json b/homeassistant/components/ozw/manifest.json new file mode 100644 index 00000000000..3b828845852 --- /dev/null +++ b/homeassistant/components/ozw/manifest.json @@ -0,0 +1,9 @@ +{ + "domain": "ozw", + "name": "OpenZWave (beta)", + "config_flow": true, + "documentation": "https://www.home-assistant.io/integrations/ozw", + "requirements": ["python-openzwave-mqtt==1.0.1"], + "after_dependencies": ["mqtt"], + "codeowners": ["@cgarwood", "@marcelveldt", "@MartinHjelmare"] +} diff --git a/homeassistant/components/zwave_mqtt/sensor.py b/homeassistant/components/ozw/sensor.py similarity index 100% rename from homeassistant/components/zwave_mqtt/sensor.py rename to homeassistant/components/ozw/sensor.py diff --git a/homeassistant/components/zwave_mqtt/services.py b/homeassistant/components/ozw/services.py similarity index 100% rename from homeassistant/components/zwave_mqtt/services.py rename to homeassistant/components/ozw/services.py diff --git a/homeassistant/components/zwave_mqtt/services.yaml b/homeassistant/components/ozw/services.yaml similarity index 100% rename from homeassistant/components/zwave_mqtt/services.yaml rename to homeassistant/components/ozw/services.yaml diff --git a/homeassistant/components/zwave_mqtt/strings.json b/homeassistant/components/ozw/strings.json similarity index 89% rename from homeassistant/components/zwave_mqtt/strings.json rename to homeassistant/components/ozw/strings.json index 949b545086b..dd2aad7e4ce 100644 --- a/homeassistant/components/zwave_mqtt/strings.json +++ b/homeassistant/components/ozw/strings.json @@ -1,5 +1,4 @@ { - "title": "Z-Wave over MQTT", "config": { "step": { "user": { diff --git a/homeassistant/components/zwave_mqtt/switch.py b/homeassistant/components/ozw/switch.py similarity index 100% rename from homeassistant/components/zwave_mqtt/switch.py rename to homeassistant/components/ozw/switch.py diff --git a/homeassistant/components/zwave_mqtt/translations/ca.json b/homeassistant/components/ozw/translations/ca.json similarity index 100% rename from homeassistant/components/zwave_mqtt/translations/ca.json rename to homeassistant/components/ozw/translations/ca.json diff --git a/homeassistant/components/zwave_mqtt/translations/de.json b/homeassistant/components/ozw/translations/de.json similarity index 100% rename from homeassistant/components/zwave_mqtt/translations/de.json rename to homeassistant/components/ozw/translations/de.json diff --git a/homeassistant/components/zwave_mqtt/translations/en.json b/homeassistant/components/ozw/translations/en.json similarity index 100% rename from homeassistant/components/zwave_mqtt/translations/en.json rename to homeassistant/components/ozw/translations/en.json diff --git a/homeassistant/components/zwave_mqtt/translations/es.json b/homeassistant/components/ozw/translations/es.json similarity index 100% rename from homeassistant/components/zwave_mqtt/translations/es.json rename to homeassistant/components/ozw/translations/es.json diff --git a/homeassistant/components/zwave_mqtt/translations/fi.json b/homeassistant/components/ozw/translations/fi.json similarity index 100% rename from homeassistant/components/zwave_mqtt/translations/fi.json rename to homeassistant/components/ozw/translations/fi.json diff --git a/homeassistant/components/zwave_mqtt/translations/fr.json b/homeassistant/components/ozw/translations/fr.json similarity index 100% rename from homeassistant/components/zwave_mqtt/translations/fr.json rename to homeassistant/components/ozw/translations/fr.json diff --git a/homeassistant/components/zwave_mqtt/translations/it.json b/homeassistant/components/ozw/translations/it.json similarity index 100% rename from homeassistant/components/zwave_mqtt/translations/it.json rename to homeassistant/components/ozw/translations/it.json diff --git a/homeassistant/components/zwave_mqtt/translations/ko.json b/homeassistant/components/ozw/translations/ko.json similarity index 100% rename from homeassistant/components/zwave_mqtt/translations/ko.json rename to homeassistant/components/ozw/translations/ko.json diff --git a/homeassistant/components/zwave_mqtt/translations/lb.json b/homeassistant/components/ozw/translations/lb.json similarity index 100% rename from homeassistant/components/zwave_mqtt/translations/lb.json rename to homeassistant/components/ozw/translations/lb.json diff --git a/homeassistant/components/zwave_mqtt/translations/nl.json b/homeassistant/components/ozw/translations/nl.json similarity index 100% rename from homeassistant/components/zwave_mqtt/translations/nl.json rename to homeassistant/components/ozw/translations/nl.json diff --git a/homeassistant/components/zwave_mqtt/translations/no.json b/homeassistant/components/ozw/translations/no.json similarity index 100% rename from homeassistant/components/zwave_mqtt/translations/no.json rename to homeassistant/components/ozw/translations/no.json diff --git a/homeassistant/components/zwave_mqtt/translations/pl.json b/homeassistant/components/ozw/translations/pl.json similarity index 100% rename from homeassistant/components/zwave_mqtt/translations/pl.json rename to homeassistant/components/ozw/translations/pl.json diff --git a/homeassistant/components/zwave_mqtt/translations/ru.json b/homeassistant/components/ozw/translations/ru.json similarity index 100% rename from homeassistant/components/zwave_mqtt/translations/ru.json rename to homeassistant/components/ozw/translations/ru.json diff --git a/homeassistant/components/zwave_mqtt/translations/sl.json b/homeassistant/components/ozw/translations/sl.json similarity index 100% rename from homeassistant/components/zwave_mqtt/translations/sl.json rename to homeassistant/components/ozw/translations/sl.json diff --git a/homeassistant/components/zwave_mqtt/translations/sv.json b/homeassistant/components/ozw/translations/sv.json similarity index 100% rename from homeassistant/components/zwave_mqtt/translations/sv.json rename to homeassistant/components/ozw/translations/sv.json diff --git a/homeassistant/components/zwave_mqtt/translations/zh-Hans.json b/homeassistant/components/ozw/translations/zh-Hans.json similarity index 100% rename from homeassistant/components/zwave_mqtt/translations/zh-Hans.json rename to homeassistant/components/ozw/translations/zh-Hans.json diff --git a/homeassistant/components/zwave_mqtt/translations/zh-Hant.json b/homeassistant/components/ozw/translations/zh-Hant.json similarity index 100% rename from homeassistant/components/zwave_mqtt/translations/zh-Hant.json rename to homeassistant/components/ozw/translations/zh-Hant.json diff --git a/homeassistant/components/zwave_mqtt/manifest.json b/homeassistant/components/zwave_mqtt/manifest.json deleted file mode 100644 index 8d067bf5c35..00000000000 --- a/homeassistant/components/zwave_mqtt/manifest.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "domain": "zwave_mqtt", - "name": "Z-Wave over MQTT", - "config_flow": true, - "documentation": "https://www.home-assistant.io/integrations/zwave_mqtt", - "requirements": [ - "python-openzwave-mqtt==1.0.1" - ], - "after_dependencies": [ - "mqtt" - ], - "codeowners": [ - "@cgarwood", - "@marcelveldt", - "@MartinHjelmare" - ] -} diff --git a/homeassistant/generated/config_flows.py b/homeassistant/generated/config_flows.py index 52700a17e2b..43ccb4ef6d1 100644 --- a/homeassistant/generated/config_flows.py +++ b/homeassistant/generated/config_flows.py @@ -106,6 +106,7 @@ FLOWS = [ "opentherm_gw", "openuv", "owntracks", + "ozw", "panasonic_viera", "pi_hole", "plaato", @@ -164,6 +165,5 @@ FLOWS = [ "xiaomi_miio", "zerproc", "zha", - "zwave", - "zwave_mqtt" + "zwave" ] diff --git a/requirements_all.txt b/requirements_all.txt index 577b96429ef..cc20340939f 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1707,7 +1707,7 @@ python-nest==4.1.0 # homeassistant.components.nmap_tracker python-nmap==0.6.1 -# homeassistant.components.zwave_mqtt +# homeassistant.components.ozw python-openzwave-mqtt==1.0.1 # homeassistant.components.qbittorrent diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 8d9744cf6d6..ad01d396b60 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -704,7 +704,7 @@ python-miio==0.5.0.1 # homeassistant.components.nest python-nest==4.1.0 -# homeassistant.components.zwave_mqtt +# homeassistant.components.ozw python-openzwave-mqtt==1.0.1 # homeassistant.components.songpal diff --git a/tests/components/ozw/__init__.py b/tests/components/ozw/__init__.py new file mode 100644 index 00000000000..ce419b9f55b --- /dev/null +++ b/tests/components/ozw/__init__.py @@ -0,0 +1 @@ +"""Tests for the OZW integration.""" diff --git a/tests/components/zwave_mqtt/common.py b/tests/components/ozw/common.py similarity index 87% rename from tests/components/zwave_mqtt/common.py rename to tests/components/ozw/common.py index ef85d2e5533..a71103fdf85 100644 --- a/tests/components/zwave_mqtt/common.py +++ b/tests/components/ozw/common.py @@ -2,14 +2,14 @@ import json from homeassistant import config_entries -from homeassistant.components.zwave_mqtt.const import DOMAIN +from homeassistant.components.ozw.const import DOMAIN from tests.async_mock import Mock, patch from tests.common import MockConfigEntry -async def setup_zwave(hass, entry=None, fixture=None): - """Set up Z-Wave and load a dump.""" +async def setup_ozw(hass, entry=None, fixture=None): + """Set up OZW and load a dump.""" hass.config.components.add("mqtt") if entry is None: @@ -26,7 +26,7 @@ async def setup_zwave(hass, entry=None, fixture=None): assert await hass.config_entries.async_setup(entry.entry_id) await hass.async_block_till_done() - assert "zwave_mqtt" in hass.config.components + assert "ozw" in hass.config.components assert len(mock_subscribe.mock_calls) == 1 receive_message = mock_subscribe.mock_calls[0][1][2] diff --git a/tests/components/zwave_mqtt/conftest.py b/tests/components/ozw/conftest.py similarity index 80% rename from tests/components/zwave_mqtt/conftest.py rename to tests/components/ozw/conftest.py index 67e8382d23d..b984172d355 100644 --- a/tests/components/zwave_mqtt/conftest.py +++ b/tests/components/ozw/conftest.py @@ -12,13 +12,13 @@ from tests.common import load_fixture @pytest.fixture(name="generic_data", scope="session") def generic_data_fixture(): """Load generic MQTT data and return it.""" - return load_fixture("zwave_mqtt/generic_network_dump.csv") + return load_fixture("ozw/generic_network_dump.csv") @pytest.fixture(name="light_data", scope="session") def light_data_fixture(): """Load light dimmer MQTT data and return it.""" - return load_fixture("zwave_mqtt/light_network_dump.csv") + return load_fixture("ozw/light_network_dump.csv") @pytest.fixture(name="sent_messages") @@ -39,7 +39,7 @@ def sent_messages_fixture(): async def light_msg_fixture(hass): """Return a mock MQTT msg with a light actuator message.""" light_json = json.loads( - await hass.async_add_executor_job(load_fixture, "zwave_mqtt/light.json") + await hass.async_add_executor_job(load_fixture, "ozw/light.json") ) message = MQTTMessage(topic=light_json["topic"], payload=light_json["payload"]) message.encode() @@ -50,7 +50,7 @@ async def light_msg_fixture(hass): async def switch_msg_fixture(hass): """Return a mock MQTT msg with a switch actuator message.""" switch_json = json.loads( - await hass.async_add_executor_job(load_fixture, "zwave_mqtt/switch.json") + await hass.async_add_executor_job(load_fixture, "ozw/switch.json") ) message = MQTTMessage(topic=switch_json["topic"], payload=switch_json["payload"]) message.encode() @@ -61,7 +61,7 @@ async def switch_msg_fixture(hass): async def sensor_msg_fixture(hass): """Return a mock MQTT msg with a sensor change message.""" sensor_json = json.loads( - await hass.async_add_executor_job(load_fixture, "zwave_mqtt/sensor.json") + await hass.async_add_executor_job(load_fixture, "ozw/sensor.json") ) message = MQTTMessage(topic=sensor_json["topic"], payload=sensor_json["payload"]) message.encode() @@ -72,7 +72,7 @@ async def sensor_msg_fixture(hass): async def binary_sensor_msg_fixture(hass): """Return a mock MQTT msg with a binary_sensor change message.""" sensor_json = json.loads( - await hass.async_add_executor_job(load_fixture, "zwave_mqtt/binary_sensor.json") + await hass.async_add_executor_job(load_fixture, "ozw/binary_sensor.json") ) message = MQTTMessage(topic=sensor_json["topic"], payload=sensor_json["payload"]) message.encode() @@ -83,9 +83,7 @@ async def binary_sensor_msg_fixture(hass): async def binary_sensor_alt_msg_fixture(hass): """Return a mock MQTT msg with a binary_sensor change message.""" sensor_json = json.loads( - await hass.async_add_executor_job( - load_fixture, "zwave_mqtt/binary_sensor_alt.json" - ) + await hass.async_add_executor_job(load_fixture, "ozw/binary_sensor_alt.json") ) message = MQTTMessage(topic=sensor_json["topic"], payload=sensor_json["payload"]) message.encode() diff --git a/tests/components/zwave_mqtt/test_binary_sensor.py b/tests/components/ozw/test_binary_sensor.py similarity index 89% rename from tests/components/zwave_mqtt/test_binary_sensor.py rename to tests/components/ozw/test_binary_sensor.py index 9e4fddbef75..62b23be0cca 100644 --- a/tests/components/zwave_mqtt/test_binary_sensor.py +++ b/tests/components/ozw/test_binary_sensor.py @@ -3,15 +3,15 @@ from homeassistant.components.binary_sensor import ( DEVICE_CLASS_MOTION, DOMAIN as BINARY_SENSOR_DOMAIN, ) -from homeassistant.components.zwave_mqtt.const import DOMAIN +from homeassistant.components.ozw.const import DOMAIN from homeassistant.const import ATTR_DEVICE_CLASS -from .common import setup_zwave +from .common import setup_ozw async def test_binary_sensor(hass, generic_data, binary_sensor_msg): """Test setting up config entry.""" - receive_msg = await setup_zwave(hass, fixture=generic_data) + receive_msg = await setup_ozw(hass, fixture=generic_data) # Test Legacy sensor (disabled by default) registry = await hass.helpers.entity_registry.async_get_registry() @@ -57,7 +57,7 @@ async def test_sensor_enabled(hass, generic_data, binary_sensor_alt_msg): ) assert entry.disabled is False - receive_msg = await setup_zwave(hass, fixture=generic_data) + receive_msg = await setup_ozw(hass, fixture=generic_data) receive_msg(binary_sensor_alt_msg) await hass.async_block_till_done() diff --git a/tests/components/zwave_mqtt/test_config_flow.py b/tests/components/ozw/test_config_flow.py similarity index 85% rename from tests/components/zwave_mqtt/test_config_flow.py rename to tests/components/ozw/test_config_flow.py index fbdf4012009..bfe3f922402 100644 --- a/tests/components/zwave_mqtt/test_config_flow.py +++ b/tests/components/ozw/test_config_flow.py @@ -1,7 +1,7 @@ """Test the Z-Wave over MQTT config flow.""" from homeassistant import config_entries, setup -from homeassistant.components.zwave_mqtt.config_flow import TITLE -from homeassistant.components.zwave_mqtt.const import DOMAIN +from homeassistant.components.ozw.config_flow import TITLE +from homeassistant.components.ozw.const import DOMAIN from tests.async_mock import patch from tests.common import MockConfigEntry @@ -18,9 +18,9 @@ async def test_user_create_entry(hass): assert result["errors"] is None with patch( - "homeassistant.components.zwave_mqtt.async_setup", return_value=True + "homeassistant.components.ozw.async_setup", return_value=True ) as mock_setup, patch( - "homeassistant.components.zwave_mqtt.async_setup_entry", return_value=True, + "homeassistant.components.ozw.async_setup_entry", return_value=True, ) as mock_setup_entry: result2 = await hass.config_entries.flow.async_configure(result["flow_id"], {}) diff --git a/tests/components/zwave_mqtt/test_init.py b/tests/components/ozw/test_init.py similarity index 84% rename from tests/components/zwave_mqtt/test_init.py rename to tests/components/ozw/test_init.py index 0b77905ab9b..9a76b4906fa 100644 --- a/tests/components/zwave_mqtt/test_init.py +++ b/tests/components/ozw/test_init.py @@ -1,18 +1,18 @@ """Test integration initialization.""" from homeassistant import config_entries -from homeassistant.components.zwave_mqtt import DOMAIN, PLATFORMS, const +from homeassistant.components.ozw import DOMAIN, PLATFORMS, const -from .common import setup_zwave +from .common import setup_ozw from tests.common import MockConfigEntry async def test_init_entry(hass, generic_data): """Test setting up config entry.""" - await setup_zwave(hass, fixture=generic_data) + await setup_ozw(hass, fixture=generic_data) # Verify integration + platform loaded. - assert "zwave_mqtt" in hass.config.components + assert "ozw" in hass.config.components for platform in PLATFORMS: assert platform in hass.config.components, platform assert f"{platform}.{DOMAIN}" in hass.config.components, f"{platform}.{DOMAIN}" @@ -32,7 +32,7 @@ async def test_unload_entry(hass, generic_data, switch_msg, caplog): entry.add_to_hass(hass) assert entry.state == config_entries.ENTRY_STATE_NOT_LOADED - receive_message = await setup_zwave(hass, entry=entry, fixture=generic_data) + receive_message = await setup_ozw(hass, entry=entry, fixture=generic_data) assert entry.state == config_entries.ENTRY_STATE_LOADED assert len(hass.states.async_entity_ids("switch")) == 1 @@ -53,7 +53,7 @@ async def test_unload_entry(hass, generic_data, switch_msg, caplog): # adding the entities. # This asserts that we have unsubscribed the entity addition signals # when unloading the integration previously. - await setup_zwave(hass, entry=entry, fixture=generic_data) + await setup_ozw(hass, entry=entry, fixture=generic_data) await hass.async_block_till_done() assert entry.state == config_entries.ENTRY_STATE_LOADED diff --git a/tests/components/zwave_mqtt/test_light.py b/tests/components/ozw/test_light.py similarity index 96% rename from tests/components/zwave_mqtt/test_light.py rename to tests/components/ozw/test_light.py index 33230cd36d9..d485ca768c5 100644 --- a/tests/components/zwave_mqtt/test_light.py +++ b/tests/components/ozw/test_light.py @@ -1,12 +1,12 @@ """Test Z-Wave Lights.""" -from homeassistant.components.zwave_mqtt.light import byte_to_zwave_brightness +from homeassistant.components.ozw.light import byte_to_zwave_brightness -from .common import setup_zwave +from .common import setup_ozw async def test_light(hass, light_data, light_msg, sent_messages): """Test setting up config entry.""" - receive_message = await setup_zwave(hass, fixture=light_data) + receive_message = await setup_ozw(hass, fixture=light_data) # Test loaded state = hass.states.get("light.led_bulb_6_multi_colour_level") diff --git a/tests/components/zwave_mqtt/test_scenes.py b/tests/components/ozw/test_scenes.py similarity index 93% rename from tests/components/zwave_mqtt/test_scenes.py rename to tests/components/ozw/test_scenes.py index 10e1f94b229..2d776b7faf4 100644 --- a/tests/components/zwave_mqtt/test_scenes.py +++ b/tests/components/ozw/test_scenes.py @@ -1,5 +1,5 @@ """Test Z-Wave (central) Scenes.""" -from .common import MQTTMessage, setup_zwave +from .common import MQTTMessage, setup_ozw from tests.common import async_capture_events @@ -7,8 +7,8 @@ from tests.common import async_capture_events async def test_scenes(hass, generic_data, sent_messages): """Test setting up config entry.""" - receive_message = await setup_zwave(hass, fixture=generic_data) - events = async_capture_events(hass, "zwave_mqtt.scene_activated") + receive_message = await setup_ozw(hass, fixture=generic_data) + events = async_capture_events(hass, "ozw.scene_activated") # Publish fake scene event on mqtt message = MQTTMessage( diff --git a/tests/components/zwave_mqtt/test_sensor.py b/tests/components/ozw/test_sensor.py similarity index 92% rename from tests/components/zwave_mqtt/test_sensor.py rename to tests/components/ozw/test_sensor.py index ab7fd26b0b6..4cc0077cdea 100644 --- a/tests/components/zwave_mqtt/test_sensor.py +++ b/tests/components/ozw/test_sensor.py @@ -1,19 +1,19 @@ """Test Z-Wave Sensors.""" +from homeassistant.components.ozw.const import DOMAIN from homeassistant.components.sensor import ( DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_POWER, DEVICE_CLASS_PRESSURE, DOMAIN as SENSOR_DOMAIN, ) -from homeassistant.components.zwave_mqtt.const import DOMAIN from homeassistant.const import ATTR_DEVICE_CLASS -from .common import setup_zwave +from .common import setup_ozw async def test_sensor(hass, generic_data): """Test setting up config entry.""" - await setup_zwave(hass, fixture=generic_data) + await setup_ozw(hass, fixture=generic_data) # Test standard sensor state = hass.states.get("sensor.smart_plug_electric_v") @@ -66,7 +66,7 @@ async def test_sensor_enabled(hass, generic_data, sensor_msg): ) assert entry.disabled is False - receive_msg = await setup_zwave(hass, fixture=generic_data) + receive_msg = await setup_ozw(hass, fixture=generic_data) receive_msg(sensor_msg) await hass.async_block_till_done() diff --git a/tests/components/zwave_mqtt/test_switch.py b/tests/components/ozw/test_switch.py similarity index 92% rename from tests/components/zwave_mqtt/test_switch.py rename to tests/components/ozw/test_switch.py index 84929dabe0a..7af331b3e0f 100644 --- a/tests/components/zwave_mqtt/test_switch.py +++ b/tests/components/ozw/test_switch.py @@ -1,10 +1,10 @@ """Test Z-Wave Switches.""" -from .common import setup_zwave +from .common import setup_ozw async def test_switch(hass, generic_data, sent_messages, switch_msg): """Test setting up config entry.""" - receive_message = await setup_zwave(hass, fixture=generic_data) + receive_message = await setup_ozw(hass, fixture=generic_data) # Test loaded state = hass.states.get("switch.smart_plug_switch") diff --git a/tests/components/zwave_mqtt/__init__.py b/tests/components/zwave_mqtt/__init__.py deleted file mode 100644 index 95d36355b29..00000000000 --- a/tests/components/zwave_mqtt/__init__.py +++ /dev/null @@ -1 +0,0 @@ -"""Tests for the Z-Wave MQTT integration.""" diff --git a/tests/fixtures/zwave_mqtt/binary_sensor.json b/tests/fixtures/ozw/binary_sensor.json similarity index 100% rename from tests/fixtures/zwave_mqtt/binary_sensor.json rename to tests/fixtures/ozw/binary_sensor.json diff --git a/tests/fixtures/zwave_mqtt/binary_sensor_alt.json b/tests/fixtures/ozw/binary_sensor_alt.json similarity index 100% rename from tests/fixtures/zwave_mqtt/binary_sensor_alt.json rename to tests/fixtures/ozw/binary_sensor_alt.json diff --git a/tests/fixtures/zwave_mqtt/generic_network_dump.csv b/tests/fixtures/ozw/generic_network_dump.csv similarity index 100% rename from tests/fixtures/zwave_mqtt/generic_network_dump.csv rename to tests/fixtures/ozw/generic_network_dump.csv diff --git a/tests/fixtures/zwave_mqtt/light.json b/tests/fixtures/ozw/light.json similarity index 100% rename from tests/fixtures/zwave_mqtt/light.json rename to tests/fixtures/ozw/light.json diff --git a/tests/fixtures/zwave_mqtt/light_network_dump.csv b/tests/fixtures/ozw/light_network_dump.csv similarity index 100% rename from tests/fixtures/zwave_mqtt/light_network_dump.csv rename to tests/fixtures/ozw/light_network_dump.csv diff --git a/tests/fixtures/zwave_mqtt/sensor.json b/tests/fixtures/ozw/sensor.json similarity index 100% rename from tests/fixtures/zwave_mqtt/sensor.json rename to tests/fixtures/ozw/sensor.json diff --git a/tests/fixtures/zwave_mqtt/switch.json b/tests/fixtures/ozw/switch.json similarity index 100% rename from tests/fixtures/zwave_mqtt/switch.json rename to tests/fixtures/ozw/switch.json