Author: justi9 Date: 2010-05-06 16:28:40 -0400 (Thu, 06 May 2010) New Revision: 3949 Modified: mgmt/newdata/mint/python/mint/newupdate.py Log: getName is removed, so don't use it Modified: mgmt/newdata/mint/python/mint/newupdate.py =================================================================== --- mgmt/newdata/mint/python/mint/newupdate.py 2010-05-05 21:31:36 UTC (rev 3948) +++ mgmt/newdata/mint/python/mint/newupdate.py 2010-05-06 20:28:40 UTC (rev 3949) @@ -101,7 +101,7 @@ def do_process(self, conn, stats): cls = self.get_class() - obj = self.get_object(cls, self.object.getName()) + obj = self.get_object(cls, self.object.getObjectId().objectName) columns = list() @@ -180,7 +180,7 @@ # XXX session_id may have changed too? else: obj._qmf_agent_id = self.agent.id - obj._qmf_object_id = self.object.getName() + obj._qmf_object_id = self.object.getObjectId().objectName obj._qmf_session_id = str(self.object.getObjectId().getSequence()) obj._qmf_class_key = str(self.object.getClassKey()) obj._qmf_update_time = update_time @@ -273,14 +273,14 @@ def __repr__(self): name = self.__class__.__name__ cls = self.object.getClassKey().getClassName() - id = self.object.getName() + id = self.object.getObjectId().objectName return "%s(%s,%s,%s)" % (name, self.agent.id, cls, id) class ObjectDelete(ObjectUpdate): def do_process(self, conn, stats): cls = self.get_class() - obj = self.get_object(cls, self.object.getName()) + obj = self.get_object(cls, self.object.getObjectId().objectName) cursor = conn.cursor() @@ -290,7 +290,7 @@ cursor.close() try: - del self.agent.objects_by_id[self.object.getName()] + del self.agent.objects_by_id[self.object.getObjectId().objectName] except KeyError: pass @@ -299,7 +299,7 @@ class ObjectAddSample(ObjectUpdate): def do_process(self, conn, stats): cls = self.get_class() - obj = self.get_object(cls, self.object.getName()) + obj = self.get_object(cls, self.object.getObjectId().objectName) if not cls._statistics: stats.samples_dropped += 1; return