Use DOMAIN not MODBUS_DOMAIN (#152823)

homeassistant/components/modbus/__init__.py

@@ -148,7 +148,7 @@ from .const import (
     DEFAULT_HVAC_ON_VALUE,
     DEFAULT_SCAN_INTERVAL,
     DEFAULT_TEMP_UNIT,
-    MODBUS_DOMAIN as DOMAIN,
+    DOMAIN,
     RTUOVERTCP,
     SERIAL,
     TCP,

homeassistant/components/modbus/const.py

@@ -159,6 +159,7 @@ DEFAULT_TEMP_UNIT = "C"
 DEFAULT_HVAC_ON_VALUE = 1
 DEFAULT_HVAC_OFF_VALUE = 0
 MODBUS_DOMAIN = "modbus"
+DOMAIN = "modbus"
 
 ACTIVE_SCAN_INTERVAL = 2  # limit to force an extra update
 

homeassistant/components/modbus/modbus.py

@@ -56,7 +56,7 @@ from .const import (
     CONF_STOPBITS,
     DEFAULT_HUB,
     DEVICE_ID,
-    MODBUS_DOMAIN as DOMAIN,
+    DOMAIN,
     PLATFORMS,
     RTUOVERTCP,
     SERIAL,

homeassistant/components/modbus/validators.py

@@ -36,7 +36,7 @@ from .const import (
     CONF_VIRTUAL_COUNT,
     DEFAULT_HUB,
     DEFAULT_SCAN_INTERVAL,
-    MODBUS_DOMAIN as DOMAIN,
+    DOMAIN,
     PLATFORMS,
     SERIAL,
     DataType,

tests/components/modbus/conftest.py

@@ -11,7 +11,7 @@ from freezegun.api import FrozenDateTimeFactory
 from pymodbus.exceptions import ModbusException
 import pytest
 
-from homeassistant.components.modbus.const import MODBUS_DOMAIN as DOMAIN, TCP
+from homeassistant.components.modbus.const import DOMAIN, TCP
 from homeassistant.const import (
     CONF_ADDRESS,
     CONF_HOST,

tests/components/modbus/test_binary_sensor.py

@@ -13,7 +13,7 @@ from homeassistant.components.modbus.const import (
     CONF_INPUT_TYPE,
     CONF_SLAVE_COUNT,
     CONF_VIRTUAL_COUNT,
-    MODBUS_DOMAIN,
+    DOMAIN,
 )
 from homeassistant.const import (
     ATTR_ENTITY_ID,
@@ -439,7 +439,7 @@ async def test_no_discovery_info_binary_sensor(
     assert await async_setup_component(
         hass,
         SENSOR_DOMAIN,
-        {SENSOR_DOMAIN: {CONF_PLATFORM: MODBUS_DOMAIN}},
+        {SENSOR_DOMAIN: {CONF_PLATFORM: DOMAIN}},
     )
     await hass.async_block_till_done()
     assert SENSOR_DOMAIN in hass.config.components

tests/components/modbus/test_climate.py

@@ -84,7 +84,7 @@ from homeassistant.components.modbus.const import (
     CONF_TARGET_TEMP,
     CONF_TARGET_TEMP_WRITE_REGISTERS,
     CONF_WRITE_REGISTERS,
-    MODBUS_DOMAIN,
+    DOMAIN,
     DataType,
 )
 from homeassistant.const import (
@@ -1695,7 +1695,7 @@ async def test_no_discovery_info_climate(
     assert await async_setup_component(
         hass,
         CLIMATE_DOMAIN,
-        {CLIMATE_DOMAIN: {CONF_PLATFORM: MODBUS_DOMAIN}},
+        {CLIMATE_DOMAIN: {CONF_PLATFORM: DOMAIN}},
     )
     await hass.async_block_till_done()
     assert CLIMATE_DOMAIN in hass.config.components

tests/components/modbus/test_cover.py

@@ -16,7 +16,7 @@ from homeassistant.components.modbus.const import (
     CONF_STATE_OPENING,
     CONF_STATUS_REGISTER,
     CONF_STATUS_REGISTER_TYPE,
-    MODBUS_DOMAIN,
+    DOMAIN,
 )
 from homeassistant.const import (
     ATTR_ENTITY_ID,
@@ -305,7 +305,7 @@ async def test_no_discovery_info_cover(
     assert await async_setup_component(
         hass,
         COVER_DOMAIN,
-        {COVER_DOMAIN: {CONF_PLATFORM: MODBUS_DOMAIN}},
+        {COVER_DOMAIN: {CONF_PLATFORM: DOMAIN}},
     )
     await hass.async_block_till_done()
     assert COVER_DOMAIN in hass.config.components

tests/components/modbus/test_fan.py

@@ -17,7 +17,7 @@ from homeassistant.components.modbus.const import (
     CONF_STATE_ON,
     CONF_VERIFY,
     CONF_WRITE_TYPE,
-    MODBUS_DOMAIN,
+    DOMAIN,
 )
 from homeassistant.const import (
     ATTR_ENTITY_ID,
@@ -270,7 +270,7 @@ async def test_fan_service_turn(
 ) -> None:
     """Run test for service turn_on/turn_off."""
 
-    assert MODBUS_DOMAIN in hass.config.components
+    assert DOMAIN in hass.config.components
 
     assert hass.states.get(ENTITY_ID).state == STATE_OFF
     await hass.services.async_call(
@@ -354,7 +354,7 @@ async def test_no_discovery_info_fan(
     assert await async_setup_component(
         hass,
         FAN_DOMAIN,
-        {FAN_DOMAIN: {CONF_PLATFORM: MODBUS_DOMAIN}},
+        {FAN_DOMAIN: {CONF_PLATFORM: DOMAIN}},
     )
     await hass.async_block_till_done()
     assert FAN_DOMAIN in hass.config.components

tests/components/modbus/test_init.py

@@ -64,7 +64,7 @@ from homeassistant.components.modbus.const import (
     CONF_VIRTUAL_COUNT,
     DEFAULT_SCAN_INTERVAL,
     DEVICE_ID,
-    MODBUS_DOMAIN as DOMAIN,
+    DOMAIN,
     RTUOVERTCP,
     SERIAL,
     SERVICE_STOP,

tests/components/modbus/test_light.py

@@ -22,7 +22,7 @@ from homeassistant.components.modbus.const import (
     CONF_STATE_ON,
     CONF_VERIFY,
     CONF_WRITE_TYPE,
-    MODBUS_DOMAIN,
+    DOMAIN,
 )
 from homeassistant.const import (
     ATTR_ENTITY_ID,
@@ -311,7 +311,7 @@ async def test_light_service_turn(
 ) -> None:
     """Run test for service turn_on/turn_off."""
 
-    assert MODBUS_DOMAIN in hass.config.components
+    assert DOMAIN in hass.config.components
     assert hass.states.get(ENTITY_ID).state == STATE_OFF
     await hass.services.async_call(
         LIGHT_DOMAIN, SERVICE_TURN_ON, service_data={ATTR_ENTITY_ID: ENTITY_ID}
@@ -535,7 +535,7 @@ async def test_no_discovery_info_light(
     assert await async_setup_component(
         hass,
         LIGHT_DOMAIN,
-        {LIGHT_DOMAIN: {CONF_PLATFORM: MODBUS_DOMAIN}},
+        {LIGHT_DOMAIN: {CONF_PLATFORM: DOMAIN}},
     )
     await hass.async_block_till_done()
     assert LIGHT_DOMAIN in hass.config.components

tests/components/modbus/test_sensor.py

@@ -23,7 +23,7 @@ from homeassistant.components.modbus.const import (
     CONF_SWAP_WORD_BYTE,
     CONF_VIRTUAL_COUNT,
     CONF_ZERO_SUPPRESS,
-    MODBUS_DOMAIN,
+    DOMAIN,
     DataType,
 )
 from homeassistant.components.sensor import (
@@ -1482,7 +1482,7 @@ async def test_no_discovery_info_sensor(
     assert await async_setup_component(
         hass,
         SENSOR_DOMAIN,
-        {SENSOR_DOMAIN: {CONF_PLATFORM: MODBUS_DOMAIN}},
+        {SENSOR_DOMAIN: {CONF_PLATFORM: DOMAIN}},
     )
     await hass.async_block_till_done()
     assert SENSOR_DOMAIN in hass.config.components

tests/components/modbus/test_switch.py

@@ -19,7 +19,7 @@ from homeassistant.components.modbus.const import (
     CONF_STATE_ON,
     CONF_VERIFY,
     CONF_WRITE_TYPE,
-    MODBUS_DOMAIN,
+    DOMAIN,
 )
 from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
 from homeassistant.const import (
@@ -349,7 +349,7 @@ async def test_switch_service_turn(
     mock_modbus,
 ) -> None:
     """Run test for service turn_on/turn_off."""
-    assert MODBUS_DOMAIN in hass.config.components
+    assert DOMAIN in hass.config.components
 
     assert hass.states.get(ENTITY_ID).state == STATE_OFF
     await hass.services.async_call(
@@ -520,7 +520,7 @@ async def test_no_discovery_info_switch(
     assert await async_setup_component(
         hass,
         SWITCH_DOMAIN,
-        {SWITCH_DOMAIN: {CONF_PLATFORM: MODBUS_DOMAIN}},
+        {SWITCH_DOMAIN: {CONF_PLATFORM: DOMAIN}},
     )
     await hass.async_block_till_done()
     assert SWITCH_DOMAIN in hass.config.components