From fbde040f599d6ad77a9c30086fe91f3b6720b214 Mon Sep 17 00:00:00 2001
From: Martin Hjelmare <marhje52@gmail.com>
Date: Tue, 21 Apr 2020 19:40:16 +0200
Subject: [PATCH] Complete device registry update (#34500)

* Add manufacturer and model parameters to device registry update
  method.
---
 homeassistant/helpers/device_registry.py | 4 ++++
 tests/helpers/test_device_registry.py    | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/homeassistant/helpers/device_registry.py b/homeassistant/helpers/device_registry.py
index 6d9574c3bbd..ef85ac953f6 100644
--- a/homeassistant/helpers/device_registry.py
+++ b/homeassistant/helpers/device_registry.py
@@ -152,6 +152,8 @@ class DeviceRegistry:
         device_id,
         *,
         area_id=_UNDEF,
+        manufacturer=_UNDEF,
+        model=_UNDEF,
         name=_UNDEF,
         name_by_user=_UNDEF,
         new_identifiers=_UNDEF,
@@ -163,6 +165,8 @@ class DeviceRegistry:
         return self._async_update_device(
             device_id,
             area_id=area_id,
+            manufacturer=manufacturer,
+            model=model,
             name=name,
             name_by_user=name_by_user,
             new_identifiers=new_identifiers,
diff --git a/tests/helpers/test_device_registry.py b/tests/helpers/test_device_registry.py
index 13bb61253bc..d5f762fc701 100644
--- a/tests/helpers/test_device_registry.py
+++ b/tests/helpers/test_device_registry.py
@@ -397,6 +397,8 @@ async def test_update(registry):
         updated_entry = registry.async_update_device(
             entry.id,
             area_id="12345A",
+            manufacturer="Test Producer",
+            model="Test Model",
             name_by_user="Test Friendly Name",
             new_identifiers=new_identifiers,
             via_device_id="98765B",
@@ -405,6 +407,8 @@ async def test_update(registry):
     assert mock_save.call_count == 1
     assert updated_entry != entry
     assert updated_entry.area_id == "12345A"
+    assert updated_entry.manufacturer == "Test Producer"
+    assert updated_entry.model == "Test Model"
     assert updated_entry.name_by_user == "Test Friendly Name"
     assert updated_entry.identifiers == new_identifiers
     assert updated_entry.via_device_id == "98765B"