diff --git a/homeassistant/components/axis/axis_base.py b/homeassistant/components/axis/axis_base.py index 791764dc605..3d887478528 100644 --- a/homeassistant/components/axis/axis_base.py +++ b/homeassistant/components/axis/axis_base.py @@ -10,6 +10,8 @@ from .const import DOMAIN as AXIS_DOMAIN class AxisEntityBase(Entity): """Base common to all Axis entities.""" + _attr_has_entity_name = True + def __init__(self, device): """Initialize the Axis event.""" self.device = device @@ -47,7 +49,7 @@ class AxisEventBase(AxisEntityBase): super().__init__(device) self.event = event - self._attr_name = f"{device.name} {event.TYPE} {event.id}" + self._attr_name = f"{event.TYPE} {event.id}" self._attr_unique_id = f"{device.unique_id}-{event.topic}-{event.id}" self._attr_device_class = event.CLASS diff --git a/homeassistant/components/axis/binary_sensor.py b/homeassistant/components/axis/binary_sensor.py index d2b6a9f7dd7..fba7e8d6248 100644 --- a/homeassistant/components/axis/binary_sensor.py +++ b/homeassistant/components/axis/binary_sensor.py @@ -110,9 +110,7 @@ class AxisBinarySensor(AxisEventBase, BinarySensorEntity): and self.event.id in self.device.api.vapix.ports and self.device.api.vapix.ports[self.event.id].name ): - return ( - f"{self.device.name} {self.device.api.vapix.ports[self.event.id].name}" - ) + return self.device.api.vapix.ports[self.event.id].name if self.event.CLASS == CLASS_MOTION: @@ -128,6 +126,6 @@ class AxisBinarySensor(AxisEventBase, BinarySensorEntity): and event_data and self.event.id in event_data ): - return f"{self.device.name} {self.event.TYPE} {event_data[self.event.id].name}" + return f"{self.event.TYPE} {event_data[self.event.id].name}" return self._attr_name diff --git a/homeassistant/components/axis/camera.py b/homeassistant/components/axis/camera.py index bd46ae54f81..4df9a5e2141 100644 --- a/homeassistant/components/axis/camera.py +++ b/homeassistant/components/axis/camera.py @@ -40,7 +40,6 @@ class AxisCamera(AxisEntityBase, MjpegCamera): MjpegCamera.__init__( self, - name=device.name, username=device.username, password=device.password, mjpeg_url=self.mjpeg_source, diff --git a/homeassistant/components/axis/light.py b/homeassistant/components/axis/light.py index 30f1cee9340..e34c0d4a2d6 100644 --- a/homeassistant/components/axis/light.py +++ b/homeassistant/components/axis/light.py @@ -53,7 +53,7 @@ class AxisLight(AxisEventBase, LightEntity): self.max_intensity = 0 light_type = device.api.vapix.light_control[self.light_id].light_type - self._attr_name = f"{device.name} {light_type} {event.TYPE} {event.id}" + self._attr_name = f"{light_type} {event.TYPE} {event.id}" self._attr_supported_color_modes = {ColorMode.BRIGHTNESS} self._attr_color_mode = ColorMode.BRIGHTNESS diff --git a/homeassistant/components/axis/switch.py b/homeassistant/components/axis/switch.py index a778c974737..61f16cfc789 100644 --- a/homeassistant/components/axis/switch.py +++ b/homeassistant/components/axis/switch.py @@ -40,7 +40,7 @@ class AxisSwitch(AxisEventBase, SwitchEntity): super().__init__(event, device) if event.id and device.api.vapix.ports[event.id].name: - self._attr_name = f"{device.name} {device.api.vapix.ports[event.id].name}" + self._attr_name = device.api.vapix.ports[event.id].name @property def is_on(self):