Fix import statement for Hardware in fact.py and update test_fact.py

Author: azamrii

ci/prodbin/Dockerfile.in

@@ -104,10 +104,10 @@ RUN <<EOT
 set -eux
 
 # Install python 2 with latest security fixes from Ubuntu 22.04
-BASE_URL="launchpad.net/ubuntu/+archive/primary/+files/"
+BASE_URL="https://launchpad.net/ubuntu/+archive/primary/+files"
 
 # Manually download libssl1.1 from Jammy as it is required for Python 2.7's _ssl module
-wget -c "https://${BASE_URL}/libssl1.1_1.1.1f-1ubuntu2.24_amd64.deb"
+wget -c "${BASE_URL}/libssl1.1_1.1.1f-1ubuntu2.24_amd64.deb"
 dpkg -i libssl1.1_1.1.1f-1ubuntu2.24_amd64.deb
 rm libssl1.1_1.1.1f-1ubuntu2.24_amd64.deb
 

src/Products/Zing/fact.py

@@ -23,7 +23,6 @@
 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
@@ -224,6 +223,7 @@ def device_info_fact(device):
     hwTag = None
     hwSN = None
 
+    from Products.ZenModel.Hardware import Hardware
     if isinstance(device, Hardware):
         hwProductKey = device.getProductKey()
         hwTag = getattr(device, "tag", None)

src/Products/Zing/tests/test_fact.py

@@ -10,55 +10,12 @@
 from __future__ import absolute_import
 
 from unittest import TestCase
+from mock import Mock
 
+from Products.ZenModel.Device import Device
 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):
 
@@ -67,7 +24,24 @@ 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()
+        # Create a mock Device. Using spec=Device ensures isinstance(device, Device) works.
+        # It automatically provides dummy callable methods for titleOrId, getProductionState, etc.
+        device = Mock(spec=Device)
+        device.id = "test_device"
+        device.title = "Test Device"
+        device.meta_type = "Device"
+        
+        # Stub the specific methods called during fact generation
+        device.titleOrId.return_value = "Test Device"
+        device._propertyMap.return_value = []
+        device.device.return_value = None
+        device.getOSProductKey.return_value = ("os_model", "os_manufacturer")
+        
+        # Mock the hardware fallback methods for a non-Hardware object
+        device.getHWProductKey.return_value = ("device_hw_model", "device_hw_manufacturer")
+        device.getHWTag.return_value = "device_hw_tag"
+        device.getHWSerialNumber.return_value = "device_hw_sn"
+
         fact = device_info_fact(device)
 
         self.assertEqual(fact.data.get(MetadataKeys.HW_MODEL), "device_hw_model")
@@ -81,7 +55,23 @@ def test_hardware_component_extraction(self):
         a component that inherits from Hardware, rather than falling back to the 
         parent device methods.
         """
-        hw_comp = DummyHardwareComponent()
+        # Create a mock Hardware component. spec=Hardware makes isinstance(device, Hardware) True
+        hw_comp = Mock(spec=Hardware)
+        hw_comp.id = "test_hw_comp"
+        hw_comp.title = "Test HW Comp"
+        hw_comp.meta_type = "HWComponent"
+        
+        # Stub the specific methods called during fact generation
+        hw_comp.titleOrId.return_value = "Test HW Comp"
+        hw_comp._propertyMap.return_value = []
+        hw_comp.device.return_value = None
+        hw_comp.getOSProductKey.return_value = ("os_model", "os_manufacturer")
+        
+        # Its own hardware properties (which should be used because it's a Hardware instance)
+        hw_comp.getProductKey.return_value = ("comp_hw_model", "comp_hw_manufacturer")
+        hw_comp.tag = "comp_hw_tag"
+        hw_comp.serialNumber = "comp_hw_sn"
+
         fact = device_info_fact(hw_comp)
 
         self.assertEqual(fact.data.get(MetadataKeys.HW_MODEL), "comp_hw_model")