Cleanup model/model_id in onewire (#154509)

homeassistant/components/onewire/onewirehub.py

@@ -144,7 +144,7 @@ async def _discover_devices(
         device_info = DeviceInfo(
             identifiers={(DOMAIN, device_id)},
             manufacturer=DEVICE_MANUFACTURER.get(device_family, MANUFACTURER_MAXIM),
-            model=device_type,
+            model=None,  # cleanup from #135279
             model_id=device_type,
             name=device_id,
             serial_number=device_id[3:],

tests/components/onewire/snapshots/test_diagnostics.ambr

@@ -11,7 +11,7 @@
             ]),
           ]),
           'manufacturer': 'Hobby Boards',
-          'model': 'HB_HUB',
+          'model': None,
           'model_id': 'HB_HUB',
           'name': 'EF.111111111113',
           'serial_number': '111111111113',

tests/components/onewire/snapshots/test_init.ambr

@@ -20,7 +20,7 @@
     'labels': set({
     }),
     'manufacturer': 'Maxim Integrated',
-    'model': 'DS2401',
+    'model': None,
     'model_id': 'DS2401',
     'name': '01.111111111111',
     'name_by_user': None,
@@ -51,7 +51,7 @@
     'labels': set({
     }),
     'manufacturer': 'Maxim Integrated',
-    'model': 'DS2405',
+    'model': None,
     'model_id': 'DS2405',
     'name': '05.111111111111',
     'name_by_user': None,
@@ -82,7 +82,7 @@
     'labels': set({
     }),
     'manufacturer': 'Maxim Integrated',
-    'model': 'DS18S20',
+    'model': None,
     'model_id': 'DS18S20',
     'name': '10.111111111111',
     'name_by_user': None,
@@ -113,7 +113,7 @@
     'labels': set({
     }),
     'manufacturer': 'Maxim Integrated',
-    'model': 'DS2406',
+    'model': None,
     'model_id': 'DS2406',
     'name': '12.111111111111',
     'name_by_user': None,
@@ -144,7 +144,7 @@
     'labels': set({
     }),
     'manufacturer': 'Maxim Integrated',
-    'model': 'DS2423',
+    'model': None,
     'model_id': 'DS2423',
     'name': '1D.111111111111',
     'name_by_user': None,
@@ -175,7 +175,7 @@
     'labels': set({
     }),
     'manufacturer': 'Maxim Integrated',
-    'model': 'DS2409',
+    'model': None,
     'model_id': 'DS2409',
     'name': '1F.111111111111',
     'name_by_user': None,
@@ -206,7 +206,7 @@
     'labels': set({
     }),
     'manufacturer': 'Maxim Integrated',
-    'model': 'DS2450',
+    'model': None,
     'model_id': 'DS2450',
     'name': '20.111111111111',
     'name_by_user': None,
@@ -237,7 +237,7 @@
     'labels': set({
     }),
     'manufacturer': 'Maxim Integrated',
-    'model': 'DS1822',
+    'model': None,
     'model_id': 'DS1822',
     'name': '22.111111111111',
     'name_by_user': None,
@@ -268,7 +268,7 @@
     'labels': set({
     }),
     'manufacturer': 'Maxim Integrated',
-    'model': 'DS2438',
+    'model': None,
     'model_id': 'DS2438',
     'name': '26.111111111111',
     'name_by_user': None,
@@ -299,7 +299,7 @@
     'labels': set({
     }),
     'manufacturer': 'Maxim Integrated',
-    'model': 'DS18B20',
+    'model': None,
     'model_id': 'DS18B20',
     'name': '28.111111111111',
     'name_by_user': None,
@@ -330,7 +330,7 @@
     'labels': set({
     }),
     'manufacturer': 'Maxim Integrated',
-    'model': 'DS18B20',
+    'model': None,
     'model_id': 'DS18B20',
     'name': '28.222222222222',
     'name_by_user': None,
@@ -361,7 +361,7 @@
     'labels': set({
     }),
     'manufacturer': 'Maxim Integrated',
-    'model': 'DS18B20',
+    'model': None,
     'model_id': 'DS18B20',
     'name': '28.222222222223',
     'name_by_user': None,
@@ -392,7 +392,7 @@
     'labels': set({
     }),
     'manufacturer': 'Maxim Integrated',
-    'model': 'DS2408',
+    'model': None,
     'model_id': 'DS2408',
     'name': '29.111111111111',
     'name_by_user': None,
@@ -423,7 +423,7 @@
     'labels': set({
     }),
     'manufacturer': 'Maxim Integrated',
-    'model': 'DS2760',
+    'model': None,
     'model_id': 'DS2760',
     'name': '30.111111111111',
     'name_by_user': None,
@@ -454,7 +454,7 @@
     'labels': set({
     }),
     'manufacturer': 'Maxim Integrated',
-    'model': 'DS2413',
+    'model': None,
     'model_id': 'DS2413',
     'name': '3A.111111111111',
     'name_by_user': None,
@@ -485,7 +485,7 @@
     'labels': set({
     }),
     'manufacturer': 'Maxim Integrated',
-    'model': 'DS1825',
+    'model': None,
     'model_id': 'DS1825',
     'name': '3B.111111111111',
     'name_by_user': None,
@@ -516,7 +516,7 @@
     'labels': set({
     }),
     'manufacturer': 'Maxim Integrated',
-    'model': 'DS28EA00',
+    'model': None,
     'model_id': 'DS28EA00',
     'name': '42.111111111111',
     'name_by_user': None,
@@ -547,7 +547,7 @@
     'labels': set({
     }),
     'manufacturer': 'Embedded Data Systems',
-    'model': 'EDS0068',
+    'model': None,
     'model_id': 'EDS0068',
     'name': '7E.111111111111',
     'name_by_user': None,
@@ -578,7 +578,7 @@
     'labels': set({
     }),
     'manufacturer': 'Embedded Data Systems',
-    'model': 'EDS0066',
+    'model': None,
     'model_id': 'EDS0066',
     'name': '7E.222222222222',
     'name_by_user': None,
@@ -609,7 +609,7 @@
     'labels': set({
     }),
     'manufacturer': 'Maxim Integrated',
-    'model': 'DS2438',
+    'model': None,
     'model_id': 'DS2438',
     'name': 'A6.111111111111',
     'name_by_user': None,
@@ -640,7 +640,7 @@
     'labels': set({
     }),
     'manufacturer': 'Hobby Boards',
-    'model': 'HobbyBoards_EF',
+    'model': None,
     'model_id': 'HobbyBoards_EF',
     'name': 'EF.111111111111',
     'name_by_user': None,
@@ -671,7 +671,7 @@
     'labels': set({
     }),
     'manufacturer': 'Hobby Boards',
-    'model': 'HB_MOISTURE_METER',
+    'model': None,
     'model_id': 'HB_MOISTURE_METER',
     'name': 'EF.111111111112',
     'name_by_user': None,
@@ -702,7 +702,7 @@
     'labels': set({
     }),
     'manufacturer': 'Hobby Boards',
-    'model': 'HB_HUB',
+    'model': None,
     'model_id': 'HB_HUB',
     'name': 'EF.111111111113',
     'name_by_user': None,