Author: nunofsantos Date: 2008-09-05 16:17:04 -0400 (Fri, 05 Sep 2008) New Revision: 2424 Modified: mgmt/trunk/mint/python/mint/schema.py mgmt/trunk/mint/python/mint/schemaparser.py Log: pass correct 2-part object ids in method calls Modified: mgmt/trunk/mint/python/mint/schema.py =================================================================== --- mgmt/trunk/mint/python/mint/schema.py 2008-09-05 19:16:33 UTC (rev 2423) +++ mgmt/trunk/mint/python/mint/schema.py 2008-09-05 20:17:04 UTC (rev 2424) @@ -1,6 +1,7 @@ import mint from sqlobject import * from datetime import datetime +from qpid.management import objectId class System(SQLObject): class sqlmeta: @@ -64,14 +65,16 @@ actualArgs["clusterName"] = clusterName conn = model.connections[self.managedBroker] classInfo = self.classInfos[self.managedBroker] - conn.callMethod(self.idOriginal, classInfo, "joinCluster", + originalId = objectId(None, self.sourceScopeId, self.sourceObjectId) + conn.callMethod(originalId, classInfo, "joinCluster", callback, args=actualArgs) def leaveCluster(self, model, callback): actualArgs = dict() conn = model.connections[self.managedBroker] classInfo = self.classInfos[self.managedBroker] - conn.callMethod(self.idOriginal, classInfo, "leaveCluster", + originalId = objectId(None, self.sourceScopeId, self.sourceObjectId) + conn.callMethod(originalId, classInfo, "leaveCluster", callback, args=actualArgs) def echo(self, model, callback, sequence, body): @@ -81,7 +84,8 @@ actualArgs["body"] = body conn = model.connections[self.managedBroker] classInfo = self.classInfos[self.managedBroker] - conn.callMethod(self.idOriginal, classInfo, "echo", + originalId = objectId(None, self.sourceScopeId, self.sourceObjectId) + conn.callMethod(originalId, classInfo, "echo", callback, args=actualArgs) def connect(self, model, callback, host, port, useSsl, durable, authMechanism, username, password): @@ -96,7 +100,8 @@ actualArgs["password"] = password conn = model.connections[self.managedBroker] classInfo = self.classInfos[self.managedBroker] - conn.callMethod(self.idOriginal, classInfo, "connect", + originalId = objectId(None, self.sourceScopeId, self.sourceObjectId) + conn.callMethod(originalId, classInfo, "connect", callback, args=actualArgs) class BrokerStats(SQLObject): @@ -196,7 +201,8 @@ actualArgs["request"] = request conn = model.connections[self.managedBroker] classInfo = self.classInfos[self.managedBroker] - conn.callMethod(self.idOriginal, classInfo, "purge", + originalId = objectId(None, self.sourceScopeId, self.sourceObjectId) + conn.callMethod(originalId, classInfo, "purge", callback, args=actualArgs) class QueueStats(SQLObject): @@ -340,7 +346,8 @@ actualArgs = dict() conn = model.connections[self.managedBroker] classInfo = self.classInfos[self.managedBroker] - conn.callMethod(self.idOriginal, classInfo, "close", + originalId = objectId(None, self.sourceScopeId, self.sourceObjectId) + conn.callMethod(originalId, classInfo, "close", callback, args=actualArgs) class ClientConnectionStats(SQLObject): @@ -384,7 +391,8 @@ actualArgs = dict() conn = model.connections[self.managedBroker] classInfo = self.classInfos[self.managedBroker] - conn.callMethod(self.idOriginal, classInfo, "close", + originalId = objectId(None, self.sourceScopeId, self.sourceObjectId) + conn.callMethod(originalId, classInfo, "close", callback, args=actualArgs) def bridge(self, model, callback, durable, src, dest, key, tag, excludes, srcIsQueue, srcIsLocal): @@ -400,7 +408,8 @@ actualArgs["srcIsLocal"] = srcIsLocal conn = model.connections[self.managedBroker] classInfo = self.classInfos[self.managedBroker] - conn.callMethod(self.idOriginal, classInfo, "bridge", + originalId = objectId(None, self.sourceScopeId, self.sourceObjectId) + conn.callMethod(originalId, classInfo, "bridge", callback, args=actualArgs) class LinkStats(SQLObject): @@ -445,7 +454,8 @@ actualArgs = dict() conn = model.connections[self.managedBroker] classInfo = self.classInfos[self.managedBroker] - conn.callMethod(self.idOriginal, classInfo, "close", + originalId = objectId(None, self.sourceScopeId, self.sourceObjectId) + conn.callMethod(originalId, classInfo, "close", callback, args=actualArgs) class BridgeStats(SQLObject): @@ -483,28 +493,32 @@ actualArgs = dict() conn = model.connections[self.managedBroker] classInfo = self.classInfos[self.managedBroker] - conn.callMethod(self.idOriginal, classInfo, "solicitAck", + originalId = objectId(None, self.sourceScopeId, self.sourceObjectId) + conn.callMethod(originalId, classInfo, "solicitAck", callback, args=actualArgs) def detach(self, model, callback): actualArgs = dict() conn = model.connections[self.managedBroker] classInfo = self.classInfos[self.managedBroker] - conn.callMethod(self.idOriginal, classInfo, "detach", + originalId = objectId(None, self.sourceScopeId, self.sourceObjectId) + conn.callMethod(originalId, classInfo, "detach", callback, args=actualArgs) def resetLifespan(self, model, callback): actualArgs = dict() conn = model.connections[self.managedBroker] classInfo = self.classInfos[self.managedBroker] - conn.callMethod(self.idOriginal, classInfo, "resetLifespan", + originalId = objectId(None, self.sourceScopeId, self.sourceObjectId) + conn.callMethod(originalId, classInfo, "resetLifespan", callback, args=actualArgs) def close(self, model, callback): actualArgs = dict() conn = model.connections[self.managedBroker] classInfo = self.classInfos[self.managedBroker] - conn.callMethod(self.idOriginal, classInfo, "close", + originalId = objectId(None, self.sourceScopeId, self.sourceObjectId) + conn.callMethod(originalId, classInfo, "close", callback, args=actualArgs) class SessionStats(SQLObject): @@ -580,7 +594,8 @@ actualArgs["by"] = by conn = model.connections[self.managedBroker] classInfo = self.classInfos[self.managedBroker] - conn.callMethod(self.idOriginal, classInfo, "expand", + originalId = objectId(None, self.sourceScopeId, self.sourceObjectId) + conn.callMethod(originalId, classInfo, "expand", callback, args=actualArgs) class JournalStats(SQLObject): @@ -778,7 +793,8 @@ actualArgs["JobAd"] = JobAd conn = model.connections[self.managedBroker] classInfo = self.classInfos[self.managedBroker] - conn.callMethod(self.idOriginal, classInfo, "GetAd", + originalId = objectId(None, self.sourceScopeId, self.sourceObjectId) + conn.callMethod(originalId, classInfo, "GetAd", callback, args=actualArgs) class JobStats(SQLObject): Modified: mgmt/trunk/mint/python/mint/schemaparser.py =================================================================== --- mgmt/trunk/mint/python/mint/schemaparser.py 2008-09-05 19:16:33 UTC (rev 2423) +++ mgmt/trunk/mint/python/mint/schemaparser.py 2008-09-05 20:17:04 UTC (rev 2424) @@ -162,7 +162,8 @@ self.pythonOutput += actualArgs self.pythonOutput += " conn = model.connections[self.managedBroker]\n" self.pythonOutput += " classInfo = self.classInfos[self.managedBroker]\n" - self.pythonOutput += " conn.callMethod(self.idOriginal, classInfo, \"%s\",\n" % elem["@name"] + self.pythonOutput += " originalId = objectId(None, self.sourceScopeId, self.sourceObjectId)\n" + self.pythonOutput += " conn.callMethod(originalId, classInfo, \"%s\",\n" % elem["@name"] self.pythonOutput += " callback, args=actualArgs)\n" def endClass(self): @@ -177,6 +178,7 @@ self.pythonOutput += "import mint\n" self.pythonOutput += "from sqlobject import *\n" self.pythonOutput += "from datetime import datetime\n" + self.pythonOutput += "from qpid.management import objectId\n" self.finalPythonOutput += "\nclassToSchemaNameMap = dict()\n" self.finalPythonOutput += "schemaNameToClassMap = dict()\n" outputFile = open(self.pythonFilePath, "w")