[rhmessaging-commits] rhmessaging commits: r3785 - in mgmt/trunk: mint/python/mint and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2010-01-11 16:04:28 -0500 (Mon, 11 Jan 2010)
New Revision: 3785

Modified:
   mgmt/trunk/cumin/python/cumin/messaging/broker.py
   mgmt/trunk/mint/python/mint/model.py
   mgmt/trunk/mint/python/mint/update.py
Log:
More pythonic naming

Modified: mgmt/trunk/cumin/python/cumin/messaging/broker.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/messaging/broker.py	2010-01-11 20:39:58 UTC (rev 3784)
+++ mgmt/trunk/cumin/python/cumin/messaging/broker.py	2010-01-11 21:04:28 UTC (rev 3785)
@@ -87,10 +87,10 @@
             agent = self.app.model.mint.model.agents.get(data["qmf_agent_id"])
 
             if agent:
-                if agent.lastHeartbeat is None:
+                if agent.last_heartbeat is None:
                     return fmt_none()
                 else:
-                    return fmt_datetime(agent.lastHeartbeat)
+                    return fmt_datetime(agent.last_heartbeat)
 
     class ClusterColumn(SqlTableColumn):
         def render_title(self, session, data):

Modified: mgmt/trunk/mint/python/mint/model.py
===================================================================
--- mgmt/trunk/mint/python/mint/model.py	2010-01-11 20:39:58 UTC (rev 3784)
+++ mgmt/trunk/mint/python/mint/model.py	2010-01-11 21:04:28 UTC (rev 3785)
@@ -23,15 +23,15 @@
 
     self.app = app
 
+    self.qmf_session = None
+    self.qmf_brokers = list()
+
     # qmfAgentId => MintAgent
     self.agents = dict()
 
     # int seq => callable
     self.outstanding_method_calls = dict()
 
-    self.qmf_session = None
-    self.qmf_brokers = list()
-
     self.lock = RLock()
 
   def check(self):
@@ -71,10 +71,6 @@
     finally:
       self.lock.release()
 
-  def getMintAgent(self, qagent):
-    id = str(QmfAgentId.fromAgent(qagent))
-    return self.agents[id]
-
 class MintAgent(object):
   def __init__(self, model, agent):
     self.model = model
@@ -82,13 +78,13 @@
 
     self.id = str(QmfAgentId.fromAgent(agent))
 
-    self.lastHeartbeat = None
+    self.last_heartbeat = None
 
     # qmfObjectId => int database id
-    self.databaseIds = MintCache()
+    self.database_ids = MintCache()
 
     # qmfObjectId => list of ModelUpdate objects
-    self.deferredUpdates = defaultdict(list)
+    self.deferred_updates = defaultdict(list)
 
     self.model.lock.acquire()
     try:
@@ -173,7 +169,9 @@
   def delAgent(self, qagent):
     log.info("Deleting %s", qagent)
 
-    agent = self.model.getMintAgent(qagent)
+    id = str(QmfAgent.fromAgent(qagent))
+
+    agent = self.model.agents[id]
     agent.delete()
  
     up = AgentDisconnectUpdate(agent)
@@ -182,9 +180,11 @@
   def heartbeat(self, qagent, timestamp):
     timestamp = timestamp / 1000000000
 
-    agent = self.model.getMintAgent(qagent)
-    agent.lastHeartbeat = datetime.fromtimestamp(timestamp)
+    id = str(QmfAgentId.fromAgent(qagent))
 
+    agent = self.model.agents[id]
+    agent.last_heartbeat = datetime.fromtimestamp(timestamp)
+
   def newPackage(self, name):
     log.info("New package %s", name)
 

Modified: mgmt/trunk/mint/python/mint/update.py
===================================================================
--- mgmt/trunk/mint/python/mint/update.py	2010-01-11 20:39:58 UTC (rev 3784)
+++ mgmt/trunk/mint/python/mint/update.py	2010-01-11 21:04:28 UTC (rev 3785)
@@ -166,7 +166,7 @@
         foreignKey = name + "_id"
 
         object_id = str(QmfObjectId(oid.first, oid.second))
-        id = self.agent.databaseIds.get(object_id)
+        id = self.agent.database_ids.get(object_id)
 
         if id is None:
             # XXX don't want oid around much
@@ -204,7 +204,7 @@
         except ReferenceException, e:
             log.info("Referenced object %r not found", e.sought)
 
-            self.agent.deferredUpdates[self.object_id].append(self)
+            self.agent.deferred_updates[self.object_id].append(self)
 
             stats.deferred += 1
 
@@ -234,7 +234,7 @@
         # 2. Object is in mint's db, but id is not yet cached
         # 3. Object is in mint's db, and id is cached
 
-        id = self.agent.databaseIds.get(self.object_id)
+        id = self.agent.database_ids.get(self.object_id)
 
         if id is None:
             # Case 1 or 2
@@ -266,7 +266,7 @@
 
                 assert cursor.rowcount == 1
 
-            self.agent.databaseIds.set(self.object_id, id)
+            self.agent.database_ids.set(self.object_id, id)
         else:
             # Case 3
 
@@ -278,7 +278,7 @@
             #assert cursor.rowcount == 1
 
         try:
-            updates = self.agent.deferredUpdates.pop(self.object_id)
+            updates = self.agent.deferred_updates.pop(self.object_id)
 
             if updates:
                 log.info("Reenqueueing %i deferred updates", len(updates))
@@ -288,7 +288,7 @@
         except KeyError:
             pass
 
-        self.agent.databaseIds.commit()
+        self.agent.database_ids.commit()
 
         stats.prop_updated += 1
 
@@ -302,7 +302,7 @@
 
         statsCls = getattr(mint, "%sStats" % cls.__name__)
 
-        id = self.agent.databaseIds.get(self.object_id)
+        id = self.agent.database_ids.get(self.object_id)
 
         if id is None:
             stats.dropped += 1