Merge pull request #4750 from zenoss/fix/ZEN-35449

ZEN-35449: Add Model Phone in Cloud GUI Inventory View

Author: azamrii

src/Products/Zing/fact.py

@@ -23,6 +23,7 @@
 from Products.ZenModel.System import System
 from Products.ZenModel.Location import Location
 from Products.ZenRelations.ZenPropertyManager import iszprop, iscustprop
+from Products.ZenModel.Hardware import Hardware
 
 from .interfaces import IImpactRelationshipsFactProvider
 from .shortid import shortid
@@ -219,17 +220,31 @@ def device_info_fact(device):
     if osManufacturer != "":
         f.data[MetadataKeys.OS_MANUFACTURER] = osManufacturer
 
-    hwModel, hwManufacturer = extract_model_manufacturer(device.getHWProductKey())
+    hwProductKey = None
+    hwTag = None
+    hwSN = None
+
+    if isinstance(device, Hardware):
+        hwProductKey = device.getProductKey()
+        hwTag = getattr(device, "tag", None)
+        hwSN = getattr(device, "serialNumber", None)
+    else:
+        if hasattr(device, "getHWProductKey"):
+            hwProductKey = device.getHWProductKey()
+        if hasattr(device, "getHWTag"):
+            hwTag = device.getHWTag()
+        if hasattr(device, "getHWSerialNumber"):
+            hwSN = device.getHWSerialNumber()
+
+    hwModel, hwManufacturer = extract_model_manufacturer(hwProductKey)
     if hwModel != "":
         f.data[MetadataKeys.HW_MODEL] = hwModel
     if hwManufacturer != "":
         f.data[MetadataKeys.HW_MANUFACTURER] = hwManufacturer
 
-    hwTag = device.getHWTag()
     if hwTag is not None and hwTag != "":
         f.data[MetadataKeys.HW_TAG] = hwTag
 
-    hwSN = device.getHWSerialNumber()
     if hwSN is not None and hwSN != "":
         f.data[MetadataKeys.HW_SERIAL_NUMBER] = hwSN
 

src/Products/Zing/tests/test_fact.py

@@ -0,0 +1,90 @@
+##############################################################################
+#
+# Copyright (C) Zenoss, Inc. 2026, all rights reserved.
+#
+# This content is made available according to terms specified in
+# License.zenoss under the directory where your Zenoss product is installed.
+#
+##############################################################################
+
+from __future__ import absolute_import
+
+from unittest import TestCase
+
+from Products.ZenModel.Hardware import Hardware
+from Products.Zing.fact import device_info_fact, MetadataKeys
+
+class DummyDevice(object):
+    id = "dummy_device"
+    title = "Dummy Device"
+
+    def _propertyMap(self): return []
+    def device(self): return None
+    def getProductionState(self): return 1000
+    def getPriorityConversions(self): return {}
+    def getProdStateConversions(self): return {}
+    def convertProdState(self, state): return "Production"
+    
+    def getOSProductKey(self): return ("os_model", "os_manufacturer")
+    def getHWProductKey(self): return ("device_hw_model", "device_hw_manufacturer")
+    def getHWTag(self): return "device_hw_tag"
+    def getHWSerialNumber(self): return "device_hw_sn"
+
+
+class DummyHardwareComponent(Hardware):
+    id = "dummy_hw_comp"
+    title = "Dummy HW Component"
+    
+    tag = "comp_hw_tag"
+    serialNumber = "comp_hw_sn"
+
+    def __init__(self):
+        # Prevent calling MEProduct.__init__ which relies on ZODB infrastructure
+        pass
+
+    def _propertyMap(self): return []
+    def device(self): return None
+    def getProductionState(self): return 1000
+    def getPriorityConversions(self): return {}
+    def getProdStateConversions(self): return {}
+    def convertProdState(self, state): return "Production"
+    
+    def getOSProductKey(self): return ("os_model", "os_manufacturer")
+    
+    # Its own hardware properties
+    def getProductKey(self): return ("comp_hw_model", "comp_hw_manufacturer")
+
+    # Inherited device properties (fallback)
+    def getHWProductKey(self): return ("device_hw_model", "device_hw_manufacturer")
+    def getHWTag(self): return "device_hw_tag"
+    def getHWSerialNumber(self): return "device_hw_sn"
+
+
+class TestFactGeneration(TestCase):
+
+    def test_device_hardware_extraction(self):
+        """
+        Verify that device_info_fact correctly extracts hardware properties 
+        from a standard Device object using the fallback methods.
+        """
+        device = DummyDevice()
+        fact = device_info_fact(device)
+
+        self.assertEqual(fact.data.get(MetadataKeys.HW_MODEL), "device_hw_model")
+        self.assertEqual(fact.data.get(MetadataKeys.HW_MANUFACTURER), "device_hw_manufacturer")
+        self.assertEqual(fact.data.get(MetadataKeys.HW_TAG), "device_hw_tag")
+        self.assertEqual(fact.data.get(MetadataKeys.HW_SERIAL_NUMBER), "device_hw_sn")
+
+    def test_hardware_component_extraction(self):
+        """
+        Verify that device_info_fact extracts hardware properties directly from 
+        a component that inherits from Hardware, rather than falling back to the 
+        parent device methods.
+        """
+        hw_comp = DummyHardwareComponent()
+        fact = device_info_fact(hw_comp)
+
+        self.assertEqual(fact.data.get(MetadataKeys.HW_MODEL), "comp_hw_model")
+        self.assertEqual(fact.data.get(MetadataKeys.HW_MANUFACTURER), "comp_hw_manufacturer")
+        self.assertEqual(fact.data.get(MetadataKeys.HW_TAG), "comp_hw_tag")
+        self.assertEqual(fact.data.get(MetadataKeys.HW_SERIAL_NUMBER), "comp_hw_sn")