Skip to content

Commit f59d1d5

Browse files
Merge pull request #1642 from rackerlabs/correct-manufacturer-nautobot
fix(nautobot-device-sync): PUC-1465: normalise HP manufacturer to HPE for device type lookup
2 parents b07679f + ff50b13 commit f59d1d5

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

python/understack-workflows/tests/test_nautobot_device_sync.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def test_normalise_dell_mixed_case(self):
4747
assert _normalise_manufacturer("Dell Inc.") == "Dell"
4848

4949
def test_normalise_hp(self):
50-
assert _normalise_manufacturer("HP") == "HP"
50+
assert _normalise_manufacturer("HP") == "HPE"
5151

5252
def test_unsupported_manufacturer_raises(self):
5353
with pytest.raises(ValueError, match="not supported"):
@@ -182,15 +182,15 @@ def test_manufacturer_fallback(self, device_info):
182182
inventory = {
183183
"inventory": {
184184
"system_vendor": {
185-
"manufacturer": "HP", # Different
185+
"manufacturer": "HP", # Different - normalised to HPE
186186
}
187187
}
188188
}
189189

190190
_populate_from_inventory(device_info, inventory)
191191

192-
# Inventory always sets manufacturer
193-
assert device_info.manufacturer == "HP"
192+
# Inventory always sets manufacturer (HP normalised to HPE)
193+
assert device_info.manufacturer == "HPE"
194194

195195

196196
class TestGenerateDeviceName:

python/understack-workflows/understack_workflows/oslo_event/nautobot_device_sync.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def _normalise_manufacturer(name: str) -> str:
8181
if "DELL" in name.upper():
8282
return "Dell"
8383
elif "HP" in name.upper():
84-
return "HP"
84+
return "HPE"
8585
raise ValueError(f"Server manufacturer {name} not supported")
8686

8787

0 commit comments

Comments
 (0)