zenoss-commit — svn commit list

[Zenoss-commit] r8987 - trunk/Products/ZenModel/migrate

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

Author: ecn
Date: 2008-04-12 10:39:16 -0400 (Sat, 12 Apr 2008)
New Revision: 8987

Modified:
   trunk/Products/ZenModel/migrate/zpsitecustomize.py
Log:
skip this step if it has already been done

Modified: trunk/Products/ZenModel/migrate/zpsitecustomize.py
===================================================================
--- trunk/Products/ZenModel/migrate/zpsitecustomize.py	2008-04-11 19:06:52 UTC (rev 8986)
+++ trunk/Products/ZenModel/migrate/zpsitecustomize.py	2008-04-12 14:39:16 UTC (rev 8987)
@@ -23,6 +23,8 @@
 
     def cutover(self, dmd):
         # Write extra path to sitecustomize.py
+	import site, sys
+	if zenPath('ZenPacks') in sys.path: return
         path = zenPath('lib', 'python', 'sitecustomize.py')
         f = open(path, 'r')
         t = f.read()

[Zenoss-commit] r8986 - trunk/zenpacks/MySqlMonitor

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

Author: cluther
Date: 2008-04-11 15:06:52 -0400 (Fri, 11 Apr 2008)
New Revision: 8986

Modified:
   trunk/zenpacks/MySqlMonitor/README.txt
Log:
 * Refs #2907: Fix formatting of MySqlMonitor README.txt


Modified: trunk/zenpacks/MySqlMonitor/README.txt
===================================================================
--- trunk/zenpacks/MySqlMonitor/README.txt	2008-04-11 18:29:21 UTC (rev 8985)
+++ trunk/zenpacks/MySqlMonitor/README.txt	2008-04-11 19:06:52 UTC (rev 8986)
@@ -41,4 +41,7 @@
     4. Bind the MySQL template to the same device(s).
 
 Pay particular attention to the MySQL Version 5+ setting in the datasource.  If
-you are monitoring pre-v5 installations of MySQL then be sure to set this value to False.  If you are monitoring both pre v5 and v5+ installations then create two templates, one for MySQL installations earlier than v5 and another for those after.
\ No newline at end of file
+you are monitoring pre-v5 installations of MySQL then be sure to set this value
+to False.  If you are monitoring both pre v5 and v5+ installations then create
+two templates, one for MySQL installations earlier than v5 and another for
+those after.

[Zenoss-commit] r8984 - tags

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

Author: buildslave
Date: 2008-04-11 14:29:15 -0400 (Fri, 11 Apr 2008)
New Revision: 8984

Removed:
   tags/zenoss-2.1.91/
Log:
cleanup

[Zenoss-commit] r8985 - tags

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

Author: buildslave
Date: 2008-04-11 14:29:21 -0400 (Fri, 11 Apr 2008)
New Revision: 8985

Added:
   tags/zenoss-2.1.91/
Log:
Tagging zenoss-2.1.91 from trunk

Copied: tags/zenoss-2.1.91 (from rev 8984, trunk)

[Zenoss-commit] r8983 - trunk/zenpacks/ZenJMX/daemons

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

Author: ecn
Date: 2008-04-11 13:54:17 -0400 (Fri, 11 Apr 2008)
New Revision: 8983

Modified:
   trunk/zenpacks/ZenJMX/daemons/zenjmx
Log:
 * log4j.properties moved


Modified: trunk/zenpacks/ZenJMX/daemons/zenjmx
===================================================================
--- trunk/zenpacks/ZenJMX/daemons/zenjmx	2008-04-11 14:00:11 UTC (rev 8982)
+++ trunk/zenpacks/ZenJMX/daemons/zenjmx	2008-04-11 17:54:17 UTC (rev 8983)
@@ -28,7 +28,7 @@
 
 . ${ZENJMX_HOME}/bin/java-functions.sh
 
-LOG4J_PROPS=${ZENJMX_HOME}/log4j.properties
+LOG4J_PROPS=${ZENJMX_HOME}/src/main/resources/log4j.properties
 replace "@@ZENJMX_LOGFILE@@" "${ZENHOME}/log/zenjmx.log" ${LOG4J_PROPS}
 
 cd ${LIB_DIR}

[Zenoss-commit] r8982 - tags

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

Author: buildslave
Date: 2008-04-11 10:00:11 -0400 (Fri, 11 Apr 2008)
New Revision: 8982

Added:
   tags/zenoss-2.1.91/
Log:
Tagging zenoss-2.1.91 from trunk

Copied: tags/zenoss-2.1.91 (from rev 8981, trunk)

[Zenoss-commit] r8981 - trunk/Products/ZenModel/data

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

Author: buildslave
Date: 2008-04-11 09:53:21 -0400 (Fri, 11 Apr 2008)
New Revision: 8981

Modified:
   trunk/Products/ZenModel/data/menus.xml
Log:
 * Dumped XML for 2.1.91 release

Modified: trunk/Products/ZenModel/data/menus.xml
===================================================================
--- trunk/Products/ZenModel/data/menus.xml	2008-04-11 13:28:22 UTC (rev 8980)
+++ trunk/Products/ZenModel/data/menus.xml	2008-04-11 13:53:21 UTC (rev 8981)
@@ -2864,6 +2864,9 @@
 <property type="lines" id="permissions" mode="w" >
 ('View',)
 </property>
+<property type="lines" id="banned_classes" mode="w" >
+['IpNetwork']
+</property>
 <property type="lines" id="allowed_classes" mode="w" >
 ['EventClass', 'EventClassInst', 'Device', 'DeviceOrganizer', 'Location', 'System', 'DeviceClass']
 </property>
@@ -3002,6 +3005,9 @@
 <property type="lines" id="permissions" mode="w" >
 ('View History',)
 </property>
+<property type="lines" id="banned_classes" mode="w" >
+('IpNetwork',)
+</property>
 <property type="lines" id="allowed_classes" mode="w" >
 ['Device', 'System', 'DeviceGroup', 'Location', 'DeviceClass', 'EventClass']
 </property>

[Zenoss-commit] r8980 - in trunk/Products/ZenModel: migrate tests

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

Author: jstevens
Date: 2008-04-11 09:28:22 -0400 (Fri, 11 Apr 2008)
New Revision: 8980

Added:
   trunk/Products/ZenModel/tests/testMigrate.py
Modified:
   trunk/Products/ZenModel/migrate/Migrate.py
Log:
refs #2924
 * Refactored parts of Migrate to change behavior and also to better allow unit testing
 * added some basic unittesting for a couple Migrate methods


Modified: trunk/Products/ZenModel/migrate/Migrate.py
===================================================================
--- trunk/Products/ZenModel/migrate/Migrate.py	2008-04-11 13:26:12 UTC (rev 8979)
+++ trunk/Products/ZenModel/migrate/Migrate.py	2008-04-11 13:28:22 UTC (rev 8980)
@@ -42,6 +42,7 @@
     def __init__(self, *args, **kw):
         VersionBase.__init__(self, 'Zenoss', *args, **kw)
 
+
 def cleanup():
     "recursively remove all files ending with .pyc"
     import os
@@ -111,36 +112,14 @@
     def name(self):
         return self.__class__.__name__
 
-    def isVersionAppropriate(self, version=None):
-        """
-        Return True if this step is appropriate for the given version of
-        Zenoss, False otherwise.  Appropiate in this case means that the
-        major and minor versions match.  version can be either a Version
-        instance or a string.  If version is None then the version from
-        ZVersion is used.
-        """
-        if version is None:
-            version = VersionBase.parse(' Zenoss ' + VERSION)
-        elif isinstance(version, basestring):
-            version = VersionBase.parse(version)
-        elif not isinstance(version, VersionBase):
-            raise Exception('version for Step.isVersionAppropriate() must '
-                            'be a string or an instance of VersionBase.')
-        if self.version.major ==  version.major:
-            if self.version.minor == version.minor:
-                return True
-            if version.micro >= 70 and version.minor + 1 == self.version.minor:
-                return True
-        return False
 
-
 class Migration(ZenScriptBase):
     "main driver for migration: walks the steps and performs commit/abort"
 
     useDatabaseVersion = True
 
-    def __init__(self):
-        ZenScriptBase.__init__(self, connect=False)
+    def __init__(self, noopts=0):
+        ZenScriptBase.__init__(self, noopts=noopts, connect=False)
         self.connect()
         self.allSteps = allSteps[:]
         self.allSteps.sort(lambda x,y: cmp(x.name(), y.name()))
@@ -150,6 +129,11 @@
         log.info(msg)
 
     def _currentVersion(self):
+        """
+        Return a VersionBase instance representing the version of the database.
+        This also does some cleanup of dmd.version in case in is 
+        nonexistant, empty or set to a float value.
+        """
         if not hasattr(self.dmd, 'version') or not self.dmd.version:
             self.dmd.version = 'Zenoss ' + VERSION
         if type(self.dmd.version) == type(1.0):
@@ -158,68 +142,165 @@
         v.name = 'Zenoss'
         return v
 
-    def migrate(self):
-        "walk the steps and apply them"
-        steps = self.allSteps[:]
-        
-        # check version numbers
-        while steps and steps[0].version < 0:
-            raise MigrationFailed("Migration %s does not set "
-                                  "the version number" %
-                                  steps[0].__class__.__name__)
+    def getEarliestAppropriateStepVersion(self, codeVers=None):
+        """
+        Return a Version instance that represents the earliest version
+        of migrate step appropriate to run with this code base.
+        The earliest version is basically the first sprint/alpha release
+        for the current minor version.
+        codeVers represents the current version of the code.  It exists
+        for testing purposes and should usually not be passed in.
+        """
+        if codeVers is None:
+            codeVers = VersionBase.parse('Zenoss %s' % VERSION)
+        if codeVers.micro >= 70:
+            # We are in a dev/beta release.  Anything back through the start
+            # of this dev/beta cycle is appropriate.
+            earliestAppropriate = Version(codeVers.major, codeVers.minor, 70)
+        elif codeVers.minor > 0:
+            # We are in a regular release that is not a  N.0 version.
+            # Anything back through the previous dev/beta cycle is
+            # appropriate
+            earliestAppropriate = Version(codeVers.major, codeVers.minor-1, 70)
+        else:
+            # This is a X.0.Y release.  This is tough because we don't know
+            # what the minor version was for the last release of version X-1.
+            # We take the reasonable guess that the last version of X-1 that
+            # we see migrate steps for was indeed the last minor release
+            # of X-1.
+            beforeThis = Version(codeVers.major)
+            # self.allSteps is ordered by version, so just look back through
+            # all steps for the first one that predates beforeThis.
+            for s in reversed(self.allSteps):
+                if s.version < beforeThis:
+                    lastPrevious = s.version
+                    break
+            else:
+                # We couldn't find any migrate step that predates codeVers.
+                # Something is wrong, this should never happen.
+                raise MigrationFailed('Unable to determine the appropriate '
+                    'migrate script versions.')
+            if lastPrevious.micro >= 70:
+                earliestAppropriate = Version(lastPrevious.major,
+                        lastPrevious.minor, 70)
+            else:
+                earliestAppropriate = Version(lastPrevious.major,
+                        lastPrevious.minor-1, 70)
+        return earliestAppropriate
 
-        # dump old steps        
-        current = self._currentVersion()
-        if self.useDatabaseVersion:
-            op = self.options.again and operator.ge or operator.gt
-            steps = [s for s in steps if op(s.version, current)]
 
-        # Ideally migrate scripts are always run using the version of the code
-        # that corresponds to the version in the migrate step.  Problems can
-        # arise when executing migrate steps using newer code than that for
-        # which they were intended.  See #2924
-        if not self.options.force:
-            inappropriate = [s for s in steps if not s.isVersionAppropriate()]
-            if inappropriate:
-                sys.stderr.write('The following migrate steps were not '
-                        'intended to run with the currently installed version '
-                        'of the Zenoss code.  The installed version is %s.\n ' 
-                        % VERSION +
-                        'You can override this warning with the --force '
-                        'option.\n'
-                        )
-                for step in inappropriate:
-                    sys.stderr.write('  %s (%s)\n'
-                                    % (step.name(), step.version.short()))
-                sys.exit(-1)
+    def determineSteps(self):
+        """
+        Return a list of steps from self.allSteps that meet the criteria
+        for this migrate run
+        """
+        # Ensure all steps have version numbers
+        for step in self.allSteps:
+            if step.version == -1:
+                raise MigrationFailed("Migration %s does not set "
+                                      "the version number" %
+                                      step.__class__.__name__)
 
-        for m in steps:
-            m.prepare()
+        # Level was specified
+        if self.options.level is not None:
+            levelVers = VersionBase.parse('Zenoss ' + self.options.level)
+            steps = [s for s in self.allSteps
+                        if s.version >= levelVers]
+            
+        # Step was specified
+        elif self.options.steps:
+            import re
+            def matches(name):
+                for step in self.options.steps:
+                    if re.match('.*' + step + '.*', name):
+                        return True
+                return False
+            steps = [s for s in self.allSteps if matches(s.name())]
 
-        for m in steps:
-            if m.version > current:
-                self.message("Database going to version %s" % m.version.long())
-            self.message('Installing %s' % m.name())
-            m.cutover(self.dmd)
-            if m.version > current:
-                self.dmd.version = m.version
-        if type(self.dmd.version) != type(''):
-            self.dmd.version = self.dmd.version.long()
+        else:
+            currentDbVers = self._currentVersion()
+            # The user did not specify steps to be run, so we run the default
+            # steps.
+            newDbVers = self.allSteps[-1].version
+            if currentDbVers == newDbVers:
+                # There are no steps newer than the current db version.
+                # By default we rerun the steps for the current version.
+                # If --newer was specified then we run nothing.
+                if self.options.newer:
+                    steps = []
+                else:
+                    steps = [s for s in self.allSteps 
+                                if s.version == currentDbVers]
+            else:
+                # There are steps newer than the current db version.
+                # Run the newer steps.
+                steps = [s for s in self.allSteps
+                            if s.version > currentDbVers]
+                
+                # Ideally migrate scripts are always run using the version of
+                # the code that corresponds to the version in the migrate
+                # step.  Problems can arise when executing migrate steps
+                # using newer code than that for which they were intended.
+                # See #2924
+                if not self.options.force:
+                    earliestAppropriateVers = \
+                            self.getEarliestAppropriateStepVersion()
+                    inappropriate = [s for s in steps if
+                                        s.version < earliestAppropriateVers]
+                    if inappropriate:
+                        msg = []
+                        msg.append('The following migrate steps were not '
+                            'intended to run with the currently installed '
+                            'version of the Zenoss code.  The installed '
+                            'version is %s.' % VERSION)
+                        msg.append(
+                            'You can override this warning with the --force '
+                            'option.')
+                        for step in inappropriate:
+                            msg.append('  %s (%s)'
+                                        % (step.name(), step.version.short()))
+                        self.message('\n'.join(msg))
+                        sys.exit(-1)
+        return steps
 
-        for m in steps:
-            m.cleanup()
 
+    def migrate(self):
+        """
+        Determine the correct migrate steps to run and apply them
+        """        
+        steps = self.determineSteps()
+        if steps:
+            for m in steps:
+                m.prepare()
+            currentDbVers = self._currentVersion()
+            if steps[-1].version > currentDbVers:
+                self.message('Database going to version %s'
+                                                % steps[-1].version.long())
+            for m in steps:
+                self.message('Installing %s (%s)' 
+                                % (m.name(), m.version.short()))
+                m.cutover(self.dmd)
+                if m.version > currentDbVers:
+                    self.dmd.version = m.version.long()
+            for m in steps:
+                m.cleanup()
         cleanup()
 
         if not self.options.steps:
+            self.message('Loading Reports')
             rl = ReportLoader(noopts=True, app=self.app)
             rl.options.force = True
+            rl.options.logseverity = self.options.logseverity + 10
+            rl.setupLogging()
             rl.loadDatabase()
 
 
     def cutover(self):
         '''perform the migration, applying all the new steps,
         recovering on error'''
+        if not self.allSteps:
+            self.message('There are no migrate scripts.')
+            return
         self.backup()
         try:
             self.migrate()
@@ -295,12 +376,15 @@
                                type='string',
                                default=None,
                                help="Run the steps by version number")
-        self.parser.add_option('--again',
-                                dest='again',
+        self.parser.add_option('--newer',
+                                dest='newer',
                                 action='store_true',
                                 default=False,
-                                help='Rerun steps for current database '
-                                        'version.')
+                                help='Only run steps with versions higher '
+                                        'than the current database version.'
+                                        'Usually if there are no newer '
+                                        'migrate steps the current steps '
+                                        'are rerun.')
         self.parser.add_option('--force',
                                 dest='force',
                                 action='store_true',
@@ -319,7 +403,8 @@
         for s in self.allSteps:
             doc = s.__doc__
             if not doc:
-                doc = sys.modules[s.__class__.__module__].__doc__ or 'Not Documented'
+                doc = sys.modules[s.__class__.__module__].__doc__ \
+                                                        or 'Not Documented'
                 doc.strip()
             indent = ' '*22
             doc = '\n'.join(wrap(doc, width=80,
@@ -333,23 +418,4 @@
             self.list()
             return
                 
-        if self.options.level is not None:
-            self.options.level = VersionBase.parse('Zenoss ' + self.options.level)
-            self.allSteps = [s for s in self.allSteps
-                             if s.version == self.options.level]
-            self.useDatabaseVersion = False
-        if self.options.steps:
-            import re
-            def matches(name):
-                for step in self.options.steps:
-                    if re.match('.*' + step + '.*', name):
-                        return True
-                return False
-            self.allSteps = [s for s in self.allSteps if matches(s.name())]
-            if not self.allSteps:
-                log.error('No steps matching %s found' % self.options.steps)
-                return
-            self.useDatabaseVersion = False
-        log.debug("Level %s, steps = %s",
-                  self.options.level, self.options.steps)
         self.cutover()

Added: trunk/Products/ZenModel/tests/testMigrate.py

[Zenoss-commit] r8979 - trunk/Products/ZenModel/migrate

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

Author: jstevens
Date: 2008-04-11 09:26:12 -0400 (Fri, 11 Apr 2008)
New Revision: 8979

Modified:
   trunk/Products/ZenModel/migrate/fixManufacturersLocation.py
Log:
refs #2944


Modified: trunk/Products/ZenModel/migrate/fixManufacturersLocation.py
===================================================================
--- trunk/Products/ZenModel/migrate/fixManufacturersLocation.py	2008-04-11 13:16:46 UTC (rev 8978)
+++ trunk/Products/ZenModel/migrate/fixManufacturersLocation.py	2008-04-11 13:26:12 UTC (rev 8979)
@@ -34,7 +34,7 @@
         for m in dmd.objectValues('Manufacturer'):
             dmd._delObject(m.id)
             m = aq_base(m)
-            if not dmd.Manufacturers.has_key(m.id):
+            if not dmd.Manufacturers._getOb(m.id, None):
                 dmd.Manufacturers._setObject(m.id, m)
 
 

[Zenoss-commit] r8978 - trunk/Products/ZenModel/tests

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

Author: ian
Date: 2008-04-11 09:16:46 -0400 (Fri, 11 Apr 2008)
New Revision: 8978

Modified:
   trunk/Products/ZenModel/tests/testGoogleMaps.py
Log:
 * Removing bad test for release

Modified: trunk/Products/ZenModel/tests/testGoogleMaps.py
===================================================================
--- trunk/Products/ZenModel/tests/testGoogleMaps.py	2008-04-11 13:14:44 UTC (rev 8977)
+++ trunk/Products/ZenModel/tests/testGoogleMaps.py	2008-04-11 13:16:46 UTC (rev 8978)
@@ -48,9 +48,6 @@
         self.dmd.clearGeocodeCache()
         self.assert_(not self.dmd.geocache)
 
-    def testDummyTest(self):
-        self.assert_("IAN IS JUST TESTING THE BUILDBOT"==False)
-
 def test_suite():
     from unittest import TestSuite, makeSuite
     suite = TestSuite()

[Zenoss-commit] r8977 - trunk/Products/ZenModel/tests

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

Author: ian
Date: 2008-04-11 09:14:44 -0400 (Fri, 11 Apr 2008)
New Revision: 8977

Modified:
   trunk/Products/ZenModel/tests/testGoogleMaps.py
Log:
 * Enabling bad test for buildbot

Modified: trunk/Products/ZenModel/tests/testGoogleMaps.py
===================================================================
--- trunk/Products/ZenModel/tests/testGoogleMaps.py	2008-04-11 13:13:30 UTC (rev 8976)
+++ trunk/Products/ZenModel/tests/testGoogleMaps.py	2008-04-11 13:14:44 UTC (rev 8977)
@@ -48,7 +48,7 @@
         self.dmd.clearGeocodeCache()
         self.assert_(not self.dmd.geocache)
 
-    def _testDummyTest(self):
+    def testDummyTest(self):
         self.assert_("IAN IS JUST TESTING THE BUILDBOT"==False)
 
 def test_suite():

[Zenoss-commit] r8976 - trunk/Products/ZenModel/tests

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

Author: ian
Date: 2008-04-11 09:13:30 -0400 (Fri, 11 Apr 2008)
New Revision: 8976

Modified:
   trunk/Products/ZenModel/tests/testGoogleMaps.py
Log:
 * Disabling bad test

Modified: trunk/Products/ZenModel/tests/testGoogleMaps.py
===================================================================
--- trunk/Products/ZenModel/tests/testGoogleMaps.py	2008-04-11 13:08:46 UTC (rev 8975)
+++ trunk/Products/ZenModel/tests/testGoogleMaps.py	2008-04-11 13:13:30 UTC (rev 8976)
@@ -48,7 +48,7 @@
         self.dmd.clearGeocodeCache()
         self.assert_(not self.dmd.geocache)
 
-    def testDummyTest(self):
+    def _testDummyTest(self):
         self.assert_("IAN IS JUST TESTING THE BUILDBOT"==False)
 
 def test_suite():

[Zenoss-commit] r8975 - trunk/Products/ZenModel/migrate

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

Author: ecn
Date: 2008-04-11 09:08:46 -0400 (Fri, 11 Apr 2008)
New Revision: 8975

Modified:
   trunk/Products/ZenModel/migrate/removeStatusMonitor.py
Log:
 * add in a checkRelations on performance monitors


Modified: trunk/Products/ZenModel/migrate/removeStatusMonitor.py
===================================================================
--- trunk/Products/ZenModel/migrate/removeStatusMonitor.py	2008-04-11 13:03:39 UTC (rev 8974)
+++ trunk/Products/ZenModel/migrate/removeStatusMonitor.py	2008-04-11 13:08:46 UTC (rev 8975)
@@ -41,5 +41,7 @@
             t.maxval = 'here.pingCycleInterval * 0.8'
         except AttributeError, err:
             pass
+        for perf in dmd.Monitors.Performance.objectSubValues():
+            perf.checkRelations(repair=True)
 
 RemoveStatusMonitor()

[Zenoss-commit] r8974 - trunk/Products/ZenModel/tests

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

Author: ian
Date: 2008-04-11 09:03:39 -0400 (Fri, 11 Apr 2008)
New Revision: 8974

Modified:
   trunk/Products/ZenModel/tests/testGoogleMaps.py
Log:
 * Changing bad test for buildbot

Modified: trunk/Products/ZenModel/tests/testGoogleMaps.py
===================================================================
--- trunk/Products/ZenModel/tests/testGoogleMaps.py	2008-04-11 12:59:15 UTC (rev 8973)
+++ trunk/Products/ZenModel/tests/testGoogleMaps.py	2008-04-11 13:03:39 UTC (rev 8974)
@@ -49,7 +49,6 @@
         self.assert_(not self.dmd.geocache)
 
     def testDummyTest(self):
-
         self.assert_("IAN IS JUST TESTING THE BUILDBOT"==False)
 
 def test_suite():

[Zenoss-commit] r8973 - in trunk/Products/ZenModel: . skins/zenmodel

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

Author: ian
Date: 2008-04-11 08:59:15 -0400 (Fri, 11 Apr 2008)
New Revision: 8973

Modified:
   trunk/Products/ZenModel/MonitorClass.py
   trunk/Products/ZenModel/skins/zenmodel/leftPane.pt
Log:
 * Refs #2934: Reverted changes that should not have been committed

Modified: trunk/Products/ZenModel/MonitorClass.py
===================================================================
--- trunk/Products/ZenModel/MonitorClass.py	2008-04-11 12:55:51 UTC (rev 8972)
+++ trunk/Products/ZenModel/MonitorClass.py	2008-04-11 12:59:15 UTC (rev 8973)
@@ -140,9 +140,7 @@
     def manage_addMonitor(self, id, submon=None, REQUEST=None):
         'Remove an object from this one'
         values = {}
-        child = self
-        if submon:
-            child = self._getOb(submon) or self
+        child = self._getOb(submon) or self
         exec('from Products.ZenModel.%s import %s' % (child.sub_class,
                                                       child.sub_class), values)
         ctor = values[child.sub_class]

Modified: trunk/Products/ZenModel/skins/zenmodel/leftPane.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/leftPane.pt	2008-04-11 12:55:51 UTC (rev 8972)
+++ trunk/Products/ZenModel/skins/zenmodel/leftPane.pt	2008-04-11 12:59:15 UTC (rev 8973)
@@ -38,8 +38,6 @@
         <li><a href="/zport/dmd/Monitors">Monitors</a></li>
         <li><a href="/zport/dmd/editSettings">Settings</a></li>
         <li><a href="/zport/dmd/ZenEventManager">Event Manager</a></li>
-        <li><a href="/zport/dmd/zenossDotNet">Zenoss.net</a></li>
-
     </ul>
     </tal:block>
     </div>

[Zenoss-commit] r8972 - in trunk/Products/ZenModel: . skins/zenmodel

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

Author: ian
Date: 2008-04-11 08:55:51 -0400 (Fri, 11 Apr 2008)
New Revision: 8972

Modified:
   trunk/Products/ZenModel/MonitorClass.py
   trunk/Products/ZenModel/ServiceOrganizer.py
   trunk/Products/ZenModel/skins/zenmodel/leftPane.pt
Log:
 * Fixes #2934: Unicode strings aren't valid json. Did a simplejson dump

Modified: trunk/Products/ZenModel/MonitorClass.py
===================================================================
--- trunk/Products/ZenModel/MonitorClass.py	2008-04-11 12:26:01 UTC (rev 8971)
+++ trunk/Products/ZenModel/MonitorClass.py	2008-04-11 12:55:51 UTC (rev 8972)
@@ -140,7 +140,9 @@
     def manage_addMonitor(self, id, submon=None, REQUEST=None):
         'Remove an object from this one'
         values = {}
-        child = self._getOb(submon) or self
+        child = self
+        if submon:
+            child = self._getOb(submon) or self
         exec('from Products.ZenModel.%s import %s' % (child.sub_class,
                                                       child.sub_class), values)
         ctor = values[child.sub_class]

Modified: trunk/Products/ZenModel/ServiceOrganizer.py
===================================================================
--- trunk/Products/ZenModel/ServiceOrganizer.py	2008-04-11 12:26:01 UTC (rev 8971)
+++ trunk/Products/ZenModel/ServiceOrganizer.py	2008-04-11 12:55:51 UTC (rev 8972)
@@ -12,6 +12,7 @@
 ###########################################################################
 
 import types
+import simplejson
 import logging
 log = logging.getLogger("zen.ServiceOrganizer")
 
@@ -253,7 +254,7 @@
                 liveSearchList.append('%s [%s]' % (srv.id, srv.description))
             else:
                 liveSearchList.append(srv.id)
-        return liveSearchList
+        return simplejson.dumps(liveSearchList)
     
     def parseServiceLiveSearchString(self, str):
         """ Parse a string of id and description from a live search

Modified: trunk/Products/ZenModel/skins/zenmodel/leftPane.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/leftPane.pt	2008-04-11 12:26:01 UTC (rev 8971)
+++ trunk/Products/ZenModel/skins/zenmodel/leftPane.pt	2008-04-11 12:55:51 UTC (rev 8972)
@@ -38,6 +38,8 @@
         <li><a href="/zport/dmd/Monitors">Monitors</a></li>
         <li><a href="/zport/dmd/editSettings">Settings</a></li>
         <li><a href="/zport/dmd/ZenEventManager">Event Manager</a></li>
+        <li><a href="/zport/dmd/zenossDotNet">Zenoss.net</a></li>
+
     </ul>
     </tal:block>
     </div>

[Zenoss-commit] r8971 - trunk/Products/ZenModel/tests

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

Author: ian
Date: 2008-04-11 08:26:01 -0400 (Fri, 11 Apr 2008)
New Revision: 8971

Modified:
   trunk/Products/ZenModel/tests/testGoogleMaps.py
Log:
 * Making a bad test for the buildbot

Modified: trunk/Products/ZenModel/tests/testGoogleMaps.py
===================================================================
--- trunk/Products/ZenModel/tests/testGoogleMaps.py	2008-04-11 12:21:13 UTC (rev 8970)
+++ trunk/Products/ZenModel/tests/testGoogleMaps.py	2008-04-11 12:26:01 UTC (rev 8971)
@@ -49,6 +49,7 @@
         self.assert_(not self.dmd.geocache)
 
     def testDummyTest(self):
+
         self.assert_("IAN IS JUST TESTING THE BUILDBOT"==False)
 
 def test_suite():

[Zenoss-commit] r8970 - trunk/Products/ZenModel/tests

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

Author: ian
Date: 2008-04-11 08:21:13 -0400 (Fri, 11 Apr 2008)
New Revision: 8970

Modified:
   trunk/Products/ZenModel/tests/testGoogleMaps.py
Log:
 * Making a bad test for the buildbot

Modified: trunk/Products/ZenModel/tests/testGoogleMaps.py
===================================================================
--- trunk/Products/ZenModel/tests/testGoogleMaps.py	2008-04-11 11:52:06 UTC (rev 8969)
+++ trunk/Products/ZenModel/tests/testGoogleMaps.py	2008-04-11 12:21:13 UTC (rev 8970)
@@ -48,7 +48,7 @@
         self.dmd.clearGeocodeCache()
         self.assert_(not self.dmd.geocache)
 
-    def _testDummyTest(self):
+    def testDummyTest(self):
         self.assert_("IAN IS JUST TESTING THE BUILDBOT"==False)
 
 def test_suite():

[Zenoss-commit] r8969 - trunk/Products/ZenModel/tests

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

Author: ian
Date: 2008-04-11 07:52:06 -0400 (Fri, 11 Apr 2008)
New Revision: 8969

Modified:
   trunk/Products/ZenModel/tests/testGoogleMaps.py
Log:
 * Reverting changes made to test the buildbot

Modified: trunk/Products/ZenModel/tests/testGoogleMaps.py
===================================================================
--- trunk/Products/ZenModel/tests/testGoogleMaps.py	2008-04-11 11:43:35 UTC (rev 8968)
+++ trunk/Products/ZenModel/tests/testGoogleMaps.py	2008-04-11 11:52:06 UTC (rev 8969)
@@ -48,8 +48,7 @@
         self.dmd.clearGeocodeCache()
         self.assert_(not self.dmd.geocache)
 
-    def testDummyTest(self):
-        import pdb; pdb.set_trace
+    def _testDummyTest(self):
         self.assert_("IAN IS JUST TESTING THE BUILDBOT"==False)
 
 def test_suite():

[Zenoss-commit] r8968 - trunk/Products/ZenModel/tests

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

Author: ian
Date: 2008-04-11 07:43:35 -0400 (Fri, 11 Apr 2008)
New Revision: 8968

Modified:
   trunk/Products/ZenModel/tests/testGoogleMaps.py
Log:
 * Just a commit for testing the buildbot

Modified: trunk/Products/ZenModel/tests/testGoogleMaps.py
===================================================================
--- trunk/Products/ZenModel/tests/testGoogleMaps.py	2008-04-11 11:40:19 UTC (rev 8967)
+++ trunk/Products/ZenModel/tests/testGoogleMaps.py	2008-04-11 11:43:35 UTC (rev 8968)
@@ -49,6 +49,7 @@
         self.assert_(not self.dmd.geocache)
 
     def testDummyTest(self):
+        import pdb; pdb.set_trace
         self.assert_("IAN IS JUST TESTING THE BUILDBOT"==False)
 
 def test_suite():

[Zenoss-commit] r8967 - trunk/Products/ZenModel/tests

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

Author: ian
Date: 2008-04-11 07:40:19 -0400 (Fri, 11 Apr 2008)
New Revision: 8967

Modified:
   trunk/Products/ZenModel/tests/testGoogleMaps.py
Log:
 * Just a commit for testing the buildbot

Modified: trunk/Products/ZenModel/tests/testGoogleMaps.py
===================================================================
--- trunk/Products/ZenModel/tests/testGoogleMaps.py	2008-04-11 11:34:33 UTC (rev 8966)
+++ trunk/Products/ZenModel/tests/testGoogleMaps.py	2008-04-11 11:40:19 UTC (rev 8967)
@@ -49,7 +49,6 @@
         self.assert_(not self.dmd.geocache)
 
     def testDummyTest(self):
-        import pdb; pdb.set_trace
         self.assert_("IAN IS JUST TESTING THE BUILDBOT"==False)
 
 def test_suite():

[Zenoss-commit] r8965 - trunk/Products/ZenModel/tests

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

Author: ian
Date: 2008-04-11 07:21:53 -0400 (Fri, 11 Apr 2008)
New Revision: 8965

Modified:
   trunk/Products/ZenModel/tests/testGoogleMaps.py
Log:
 * Just a commit for testing the buildbot

Modified: trunk/Products/ZenModel/tests/testGoogleMaps.py
===================================================================
--- trunk/Products/ZenModel/tests/testGoogleMaps.py	2008-04-11 01:53:49 UTC (rev 8964)
+++ trunk/Products/ZenModel/tests/testGoogleMaps.py	2008-04-11 11:21:53 UTC (rev 8965)
@@ -49,6 +49,7 @@
         self.assert_(not self.dmd.geocache)
 
     def testDummyTest(self):
+        import pdb; pdb.set_trace()
         self.assert_("IAN IS JUST TESTING THE BUILDBOT"==False)
 
 def test_suite():

[Zenoss-commit] r8966 - trunk/Products/ZenModel/tests

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

Author: ian
Date: 2008-04-11 07:34:33 -0400 (Fri, 11 Apr 2008)
New Revision: 8966

Modified:
   trunk/Products/ZenModel/tests/testGoogleMaps.py
Log:
 * Just a commit for testing the buildbot

Modified: trunk/Products/ZenModel/tests/testGoogleMaps.py
===================================================================
--- trunk/Products/ZenModel/tests/testGoogleMaps.py	2008-04-11 11:21:53 UTC (rev 8965)
+++ trunk/Products/ZenModel/tests/testGoogleMaps.py	2008-04-11 11:34:33 UTC (rev 8966)
@@ -49,7 +49,7 @@
         self.assert_(not self.dmd.geocache)
 
     def testDummyTest(self):
-        import pdb; pdb.set_trace()
+        import pdb; pdb.set_trace
         self.assert_("IAN IS JUST TESTING THE BUILDBOT"==False)
 
 def test_suite():

[Zenoss-commit] r8964 - sandboxen/rak/zenoss-core/trunk/Products/ZenModel/skins/zenmodel

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

Author: rak
Date: 2008-04-10 21:53:49 -0400 (Thu, 10 Apr 2008)
New Revision: 8964

Modified:
   sandboxen/rak/zenoss-core/trunk/Products/ZenModel/skins/zenmodel/zenoss.css
Log:
fixes #2948: event msgbox layout issue in firefox 3

Modified: sandboxen/rak/zenoss-core/trunk/Products/ZenModel/skins/zenmodel/zenoss.css
===================================================================
--- sandboxen/rak/zenoss-core/trunk/Products/ZenModel/skins/zenmodel/zenoss.css	2008-04-10 22:09:53 UTC (rev 8963)
+++ sandboxen/rak/zenoss-core/trunk/Products/ZenModel/skins/zenmodel/zenoss.css	2008-04-11 01:53:49 UTC (rev 8964)
@@ -1547,7 +1547,6 @@
     color: #a00;
     font-size: 90%;
     padding-left: 1em;
-    float: left;
 }
 a.tinylink {
     float: right;

[Zenoss-commit] r8963 - sandboxen/rak/zenoss-core/vendor

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

Author: rak
Date: 2008-04-10 18:09:53 -0400 (Thu, 10 Apr 2008)
New Revision: 8963

Removed:
   sandboxen/rak/zenoss-core/vendor/current/
Log:
merged and no longer needed