Merge pull request #4751 from zenoss/feature/ZEN-35547

Add support for setting production states on components.

Author: jpeacock-zenoss

src/Products/ZenEvents/events2/processing.py

@@ -657,21 +657,16 @@ def _selectByTypeId(self, typeid, element, sub_element):
 
     def _applyDeviceToEventContext(self, device, eventContext):
         eventContext.setDeviceObject(device)
-
-        # find all organizers for this device, and add their uuids to
-        # the appropriate event tags
-        deviceOrgs = self._getOrgs(
-            device, eventContext, self.DEVICE_TAGGERS
-        )
+        deviceOrgs = self._getOrgs(device, eventContext, self.DEVICE_TAGGERS)
         self._addDeviceContext(eventContext, device)
         self._addDeviceOrganizers(eventContext, deviceOrgs)
 
     def _applyComponentToEventContext(self, component, eventContext):
         eventContext.setComponentObject(component)
-
         componentOrgs = self._getOrgs(
             component, eventContext, self.COMPONENT_TAGGERS
         )
+        self._addComponentContext(eventContext, component)
         self._addComponentOrganizers(eventContext, componentOrgs)
 
     def _getOrgs(self, entity, eventContext, taggers):
@@ -753,6 +748,21 @@ def _addDeviceOrganizers(self, eventContext, orgs):
             asDelimitedList=True,
         )
 
+    def _addComponentContext(self, eventContext, component):
+        evtProxy = eventContext.eventProxy
+
+        prodState = component.getProductionState()
+        if prodState < evtProxy.prodState:
+            log.info(
+                "setting device %s component %s event from "
+                "production state %s to %s",
+                evtProxy.device,
+                evtProxy.component,
+                evtProxy.prodState,
+                prodState,
+            )
+            evtProxy.prodState = prodState
+
     def _addComponentOrganizers(self, eventContext, orgs):
         evtproxy = eventContext.eventProxy
         self._addDeviceOrganizerNames(

src/Products/ZenModel/Device.py

@@ -1583,7 +1583,6 @@ def setProdState(self, state, maintWindowChange=False, REQUEST=None):
         ret = super(Device, self).setProdState(
             state, maintWindowChange, REQUEST
         )
-        self._p_changed = True
         if REQUEST:
             audit(
                 "UI.Device.Edit",

src/Products/ZenModel/DeviceResultInt.py

@@ -68,18 +68,6 @@ def getDeviceClassPath(self):
     security.declareProtected("View", "getDeviceClassName")
     getDeviceClassName = getDeviceClassPath
 
-    security.declareProtected("View", "getProdState")
-
-    def getProdState(self):
-        """Get the production state of the device associated with
-        this interface"""
-        d = self.device()
-        if d:
-            # since this method is used as a case-insensitive index
-            # always return a string
-            return str(self.convertProdState(d.getProductionState()))
-        return "None"
-
     security.declareProtected("View", "getDeviceStatus")
 
     def getDeviceStatus(self):

src/Products/ZenModel/ManagedEntity.py

@@ -121,6 +121,16 @@ def getProductionStateString(self):
         """
         return str(self.convertProdState(self.getProductionState()))
 
+    security.declareProtected("View", "getProdState")
+
+    def getProdState(self):
+        """
+        Return the name of the current production state of this entity.
+
+        @rtype: str
+        """
+        return str(self.convertProdState(self.getProductionState()))
+
     security.declareProtected(ZEN_CHANGE_DEVICE_PRODSTATE, "setProdState")
 
     def setProdState(self, state, maintWindowChange=False, REQUEST=None):
@@ -145,6 +155,8 @@ def setProdState(self, state, maintWindowChange=False, REQUEST=None):
             # maintenance window.
             self.setPreMWProductionState(self.getProductionState())
 
+        self._p_changed = True
+
         if REQUEST:
             IMessageSender(self).sendToBrowser(
                 "Production State Set",

src/Products/Zuul/facades/tests/test_devicefacade.py

@@ -13,6 +13,7 @@
 from zope.interface.verify import verifyClass
 
 from Products import Zuul
+from Products.ZenModel.HardDisk import manage_addHardDisk
 from Products.ZenModel.Location import manage_addLocation
 from Products.Zuul.catalog.events import IndexingEvent
 from Products.Zuul.catalog.interfaces import IModelCatalogTool
@@ -289,7 +290,7 @@ def test_deviceSearchAndSortByProdState(self):
         self.assertEquals(device.getProductionState(), 1000)
         self.assertEquals(device.getPerformanceServer().id, "localhost")
 
-    def test_setProductionState(self):
+    def test_setProductionStateOnDevices(self):
         dev = self.dmd.Devices.createInstance("dev")
         dev2 = self.dmd.Devices.createInstance("dev2")
 
@@ -303,6 +304,19 @@ def test_setProductionState(self):
         self.assertEqual(dev.getProductionState(), 500)
         self.assertEqual(dev2.getProductionState(), 500)
 
+    def test_setProductionStateOnComponents(self):
+        dev = self.dmd.Devices.createInstance("dev")
+        manage_addHardDisk(dev.hw.harddisks, "df0")
+        df0 = dev.hw.harddisks._getOb("df0")
+
+        self.assertEqual(dev.getProductionState(), 1000)
+        self.assertEqual(df0.getProductionState(), 1000)
+
+        self.facade.setProductionState((df0.getPrimaryUrlPath(),), 500)
+
+        self.assertEqual(dev.getProductionState(), 1000)
+        self.assertEqual(df0.getProductionState(), 500)
+
 
 def test_suite():
     return unittest.TestSuite((unittest.makeSuite(DeviceFacadeTest),))

src/Products/Zuul/routers/device.py

@@ -27,6 +27,7 @@
 from Products import Zuul
 from Products.ZenMessaging.audit import audit
 from Products.ZenModel.Device import Device
+from Products.ZenModel.ManagedEntity import ManagedEntity
 from Products.ZenModel.ZenossSecurity import (
     ZEN_ADMIN_DEVICE,
     ZEN_CHANGE_DEVICE_PRODSTATE,
@@ -1034,10 +1035,10 @@ def setProductionState(
             oldStates = {}
             uids = (uids,) if isinstance(uids, six.string_types) else uids
             for uid in uids:
-                device = facade._getObject(uid)
-                if isinstance(device, Device):
+                entity = facade._getObject(uid)
+                if isinstance(entity, ManagedEntity):
                     oldStates[uid] = self.context.convertProdState(
-                        device.getProductionState()
+                        entity.getProductionState()
                     )
 
             prodStateName = self.context.convertProdState(prodState)