[Zenoss-commit] r9366 - trunk/Products/DataCollector

[<sv...@ze...>]

Author: ecn
Date: 2008-05-30 15:43:28 -0400 (Fri, 30 May 2008)
New Revision: 9366

Modified:
   trunk/Products/DataCollector/WmiClient.py
   trunk/Products/DataCollector/zenmodeler.py
Log:
 * provide new zenwinmodeler option to define zenwinmodeler command


Modified: trunk/Products/DataCollector/WmiClient.py
===================================================================
--- trunk/Products/DataCollector/WmiClient.py	2008-05-30 17:39:44 UTC (rev 9365)
+++ trunk/Products/DataCollector/WmiClient.py	2008-05-30 19:43:28 UTC (rev 9366)
@@ -50,7 +50,9 @@
 
 
     def run(self):
-        modeler = zenPath('bin', 'zenwinmodeler')
+        modeler = self.datacollector.options.zenwinmodeler
+        if not modeler.startswith('/'):
+            modeler = zenPath('bin', modeler)
         args = ('run', '-d', self.device.id)
         if '--weblog' in sys.argv:
             args += ('--weblog',)

Modified: trunk/Products/DataCollector/zenmodeler.py
===================================================================
--- trunk/Products/DataCollector/zenmodeler.py	2008-05-30 17:39:44 UTC (rev 9365)
+++ trunk/Products/DataCollector/zenmodeler.py	2008-05-30 19:43:28 UTC (rev 9366)
@@ -459,6 +459,9 @@
         self.parser.add_option('--nowmi',
                 dest='nowmi', action="store_true", default=False,
                 help="do not run zenwinmodeler to execute WMI plugins")
+        self.parser.add_option('--zenwinmodeler',
+                dest='zenwinmodeler', default="zenwinmodeler",
+                help="zenwinmodeler command to execute WMI plugins")
         self.parser.add_option('--parallel', dest='parallel', 
                 type='int', default=defaultParallel,
                 help="number of devices to collect from in parallel")