[rhmessaging-commits] rhmessaging commits: r2057 - mgmt/mint/python/mint.

[rhmessaging-commits at lists.jboss.org]

Author: nunofsantos
Date: 2008-05-15 15:49:57 -0400 (Thu, 15 May 2008)
New Revision: 2057

Modified:
   mgmt/mint/python/mint/__init__.py
Log:
add 'managedBroker' to composite key for broker lookup

Modified: mgmt/mint/python/mint/__init__.py
===================================================================
--- mgmt/mint/python/mint/__init__.py	2008-05-15 17:00:14 UTC (rev 2056)
+++ mgmt/mint/python/mint/__init__.py	2008-05-15 19:49:57 UTC (rev 2057)
@@ -126,22 +126,23 @@
   def set(self, idOriginal, obj):
     self.idMap[idOriginal] = obj
     
-  def getByOriginalId(self, objType, idOriginal, create=False, args={}):
+  def getByOriginalId(self, objType, idOriginal, managedBroker, create=False, args={}):
     obj = None
-    if (idOriginal in self.idMap):
+    key = (managedBroker, idOriginal)
+    if (key in self.idMap):
       #print "\n\n=============== %s %d found\n\n" % (objType.__name__, idOriginal)
-      obj = self.idMap[idOriginal]
+      obj = self.idMap[key]
     else:
       try:
-        obj = eval("objType.selectBy(idOriginal=idOriginal)[:1][0]")
-        self.idMap[idOriginal] = obj
+        obj = eval("objType.selectBy(idOriginal=idOriginal, managedBroker=managedBroker)[:1][0]")
+        self.idMap[key] = obj
       except:
         if (create):
           #print "\n\n=============== %s %d NOT found, creating\n\n" % (objType.__name__, idOriginal)
           obj = objType.__new__(objType)
           obj.__init__()
           obj.syncUpdate()
-          self.idMap[idOriginal] = obj
+          self.idMap[key] = obj
         else:
           #print "\n\n=============== %s %d NOT found, NOT creating\n\n" % (objType.__name__, idOriginal)
           pass
@@ -282,8 +283,8 @@
     self.mclient = None
     self.mchan = None
 
-  def getByOriginalId(self, objType, idOriginal, create=False, args={}):
-    return self.objs.getByOriginalId(objType, idOriginal, create, args)
+  def getByOriginalId(self, objType, idOriginal, managedBroker, create=False, args={}):
+    return self.objs.getByOriginalId(objType, idOriginal, managedBroker, create, args)
 
   def getByIndexAttrib(self, objType, indexAttrib, indexValue, parent,
                        create=False, args={}):
@@ -377,8 +378,8 @@
         convertedKey = self.convertRefKey(parentKey)
         cls = schema.schemaNameToClassMap.get(convertedKey)
         if cls:
-          d[convertedKey] = conn.getByOriginalId(cls, d.pop(parentKey))
-      obj = conn.getByOriginalId(schema.schemaNameToClassMap[objectName], d["idOriginal"], create=True)
+          d[convertedKey] = conn.getByOriginalId(cls, d.pop(parentKey), brokerId)
+      obj = conn.getByOriginalId(schema.schemaNameToClassMap[objectName], d["idOriginal"], brokerId, create=True)
       if (not obj):
         self.log("Couldn't find type %s id %s" % (objectName, d["idOriginal"]))
         return 
@@ -404,7 +405,7 @@
     self.log(d)
 
     try:
-      obj = conn.getByOriginalId(schema.schemaNameToClassMap[objectName], d[self.convertIdKey("id")])
+      obj = conn.getByOriginalId(schema.schemaNameToClassMap[objectName], d[self.convertIdKey("id")], brokerId)
       if (not obj):
         self.log("Couldn't find type %s id %s" % (objectName, d[self.convertIdKey("id")]))
         print "lion", classInfo, list