Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions homeassistant/components/wemo/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,14 +154,14 @@ async def async_add_unique_device(
self, hass: HomeAssistant, wemo: pywemo.WeMoDevice
) -> None:
"""Add a WeMo device to hass if it has not already been added."""
if wemo.serialnumber in self._added_serial_numbers:
if wemo.serial_number in self._added_serial_numbers:
return

try:
coordinator = await async_register_device(hass, self._config_entry, wemo)
except pywemo.PyWeMoException as err:
if wemo.serialnumber not in self._failed_serial_numbers:
self._failed_serial_numbers.add(wemo.serialnumber)
if wemo.serial_number not in self._failed_serial_numbers:
self._failed_serial_numbers.add(wemo.serial_number)
_LOGGER.error(
"Unable to add WeMo %s %s: %s", repr(wemo), wemo.host, err
)
Expand Down Expand Up @@ -194,8 +194,8 @@ async def async_add_unique_device(
coordinator,
)

self._added_serial_numbers.add(wemo.serialnumber)
self._failed_serial_numbers.discard(wemo.serialnumber)
self._added_serial_numbers.add(wemo.serial_number)
self._failed_serial_numbers.discard(wemo.serial_number)


class WemoDiscovery:
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/wemo/entity.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def unique_id_suffix(self) -> str | None:
@property
def unique_id(self) -> str:
"""Return the id of this WeMo device."""
serial_number: str = self.wemo.serialnumber
serial_number: str = self.wemo.serial_number
if suffix := self.unique_id_suffix:
return f"{serial_number}_{suffix}"
return serial_number
Expand Down
6 changes: 3 additions & 3 deletions homeassistant/components/wemo/wemo_device.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def subscription_callback(
CONF_NAME: self.wemo.name,
CONF_TYPE: event_type,
CONF_PARAMS: params,
CONF_UNIQUE_ID: self.wemo.serialnumber,
CONF_UNIQUE_ID: self.wemo.serial_number,
},
)
else:
Expand Down Expand Up @@ -131,14 +131,14 @@ def _create_device_info(wemo: WeMoDevice) -> DeviceInfo:
_dev_info = _device_info(wemo)
if wemo.model_name == "DLI emulated Belkin Socket":
_dev_info[ATTR_CONFIGURATION_URL] = f"http://{wemo.host}"
_dev_info[ATTR_IDENTIFIERS] = {(DOMAIN, wemo.serialnumber[:-1])}
_dev_info[ATTR_IDENTIFIERS] = {(DOMAIN, wemo.serial_number[:-1])}
return _dev_info


def _device_info(wemo: WeMoDevice) -> DeviceInfo:
return DeviceInfo(
connections={(CONNECTION_UPNP, wemo.udn)},
identifiers={(DOMAIN, wemo.serialnumber)},
identifiers={(DOMAIN, wemo.serial_number)},
manufacturer="Belkin",
model=wemo.model_name,
name=wemo.name,
Expand Down
6 changes: 3 additions & 3 deletions tests/components/wemo/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ def create_pywemo_device(pywemo_registry, pywemo_model):
device.host = MOCK_HOST
device.port = MOCK_PORT
device.name = MOCK_NAME
device.serialnumber = MOCK_SERIAL_NUMBER
device.serial_number = MOCK_SERIAL_NUMBER
device.model_name = pywemo_model.replace("LongPress", "")
device.udn = f"uuid:{device.model_name}-1_0-{device.serialnumber}"
device.udn = f"uuid:{device.model_name}-1_0-{device.serial_number}"
device.firmware_version = MOCK_FIRMWARE_VERSION
device.get_state.return_value = 0 # Default to Off
device.supports_long_press.return_value = cls.supports_long_press()
Expand Down Expand Up @@ -102,7 +102,7 @@ def pywemo_dli_device_fixture(pywemo_registry, pywemo_model):
"""Fixture for Digital Loggers emulated instances."""
with create_pywemo_device(pywemo_registry, pywemo_model) as pywemo_dli_device:
pywemo_dli_device.model_name = "DLI emulated Belkin Socket"
pywemo_dli_device.serialnumber = "1234567891"
pywemo_dli_device.serial_number = "1234567891"
yield pywemo_dli_device


Expand Down
4 changes: 2 additions & 2 deletions tests/components/wemo/test_init.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ def create_device(counter):
device.host = f"{MOCK_HOST}_{counter}"
device.port = MOCK_PORT + counter
device.name = f"{MOCK_NAME}_{counter}"
device.serialnumber = f"{MOCK_SERIAL_NUMBER}_{counter}"
device.serial_number = f"{MOCK_SERIAL_NUMBER}_{counter}"
device.model_name = "Motion"
device.udn = f"uuid:{device.model_name}-1_0-{device.serialnumber}"
device.udn = f"uuid:{device.model_name}-1_0-{device.serial_number}"
device.firmware_version = MOCK_FIRMWARE_VERSION
device.get_state.return_value = 0 # Default to Off
device.supports_long_press.return_value = False
Expand Down
4 changes: 2 additions & 2 deletions tests/components/wemo/test_light_bridge.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ def pywemo_model():
def pywemo_bridge_light_fixture(pywemo_device):
"""Fixture for Bridge.Light WeMoDevice instances."""
light = create_autospec(pywemo.ouimeaux_device.bridge.Light, instance=True)
light.uniqueID = pywemo_device.serialnumber
light.uniqueID = pywemo_device.serial_number
light.name = pywemo_device.name
light.bridge = pywemo_device
light.state = {"onoff": 0, "available": True}
light.capabilities = ["onoff", "levelcontrol", "colortemperature"]
pywemo_device.Lights = {pywemo_device.serialnumber: light}
pywemo_device.Lights = {pywemo_device.serial_number: light}
return light


Expand Down
2 changes: 1 addition & 1 deletion tests/components/wemo/test_wemo_device.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def async_event_received(event):
"name": device.wemo.name,
"params": "testing_params",
"type": EVENT_TYPE_LONG_PRESS,
"unique_id": device.wemo.serialnumber,
"unique_id": device.wemo.serial_number,
}


Expand Down