[rhmessaging-commits] rhmessaging commits: r3773 - in mgmt/trunk/cumin/python/cumin: grid and 1 other directories.

rhmessaging-commits at lists.jboss.org rhmessaging-commits at lists.jboss.org
Fri Jan 8 13:54:29 EST 2010


Author: justi9
Date: 2010-01-08 13:54:29 -0500 (Fri, 08 Jan 2010)
New Revision: 3773

Modified:
   mgmt/trunk/cumin/python/cumin/grid/model.py
   mgmt/trunk/cumin/python/cumin/messaging/model.py
   mgmt/trunk/cumin/python/cumin/model.py
Log:
Adapt cumin method calls to the new pattern

Modified: mgmt/trunk/cumin/python/cumin/grid/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/grid/model.py	2010-01-08 18:53:58 UTC (rev 3772)
+++ mgmt/trunk/cumin/python/cumin/grid/model.py	2010-01-08 18:54:29 UTC (rev 3773)
@@ -77,7 +77,7 @@
 #            "User":         {"TYPE": self.STRING_TYPE,
 #                             "VALUE": condor_string("example at example.com")}
 
-        scheduler.Submit(self.app.model.mint.model, completion, ad, None)
+        scheduler.Submit(completion, ad, None)
 
 def condor_string(string):
     return "\"%s\"" % string
@@ -105,7 +105,7 @@
             master = Master.select("System = '%s'" % system_name)[0]
         except IndexError:
             raise Exception("Master daemon not running")
-        master.Start(self.app.model.mint.model, completion, "NEGOTIATOR")
+        master.Start(completion, "NEGOTIATOR")
 
 class NegotiatorSetStartTask(SetTask):
     def __init__(self, app, cls):
@@ -140,7 +140,7 @@
             master = Master.select("System = '%s'" % system_name)[0]
         except IndexError:
             raise Exception("Master daemon not running")
-        master.Stop(self.app.model.mint.model, completion, "NEGOTIATOR")
+        master.Stop(completion, "NEGOTIATOR")
 
 class NegotiatorSetStopTask(SetTask):
     def __init__(self, app, cls):
@@ -168,12 +168,12 @@
     def do_invoke(self, completion, session, negotiator, name, max):
         assert isinstance(negotiator, Negotiator)
 
-        negotiator.SetLimit(self.app.model.mint.model, completion, name, max)
+        negotiator.SetLimit(completion, name, max)
 
         def completion():
             pass
 
-        negotiator.Reconfig(self.app.model.mint.model, completion)
+        negotiator.Reconfig(completion)
         
 class CollectorStartTask(QmfTask):
     def __init__(self, app, cls):
@@ -198,7 +198,7 @@
             master = Master.select("System = '%s'" % system_name)[0]
         except IndexError:
             raise Exception("Master daemon not running")
-        master.Start(self.app.model.mint.model, completion, "COLLECTOR")
+        master.Start(completion, "COLLECTOR")
 
 class CollectorSetStartTask(SetTask):
     def __init__(self, app, cls):
@@ -233,7 +233,7 @@
             master = Master.select("System = '%s'" % system_name)[0]
         except IndexError:
             raise Exception("Master daemon not running")
-        master.Stop(self.app.model.mint.model, completion, "COLLECTOR")
+        master.Stop(completion, "COLLECTOR")
 
 class CollectorSetStopTask(SetTask):
     def __init__(self, app, cls):
@@ -268,7 +268,7 @@
             master = Master.select("System = '%s'" % system_name)[0]
         except IndexError:
             raise Exception("Master daemon not running")
-        master.Start(self.app.model.mint.model, completion, "SCHEDD")
+        master.Start(completion, "SCHEDD")
 
 class SchedulerSetStartTask(SetTask):
     def __init__(self, app, cls):
@@ -303,7 +303,7 @@
             master = Master.select("System = '%s'" % system_name)[0]
         except IndexError:
             raise Exception("Master daemon not running")
-        master.Stop(self.app.model.mint.model, completion, "SCHEDD")
+        master.Stop(completion, "SCHEDD")
 
 class SchedulerSetStopTask(SetTask):
     def __init__(self, app, cls):
@@ -355,7 +355,7 @@
 
     def do_invoke(self, completion, session, job, reason, scheduler):
         assert isinstance(scheduler, Scheduler)
-        scheduler.Hold(self.app.model.mint.model, completion, job, reason)
+        scheduler.Hold(completion, job, reason)
 
 class JobSetHoldTask(JobSetBaseTask):
     def __init__(self, app, cls):
@@ -371,7 +371,7 @@
 
     def do_invoke(self, completion, session, job, reason, scheduler):
         assert isinstance(scheduler, Scheduler)
-        scheduler.Release(self.app.model.mint.model, completion, job, reason)
+        scheduler.Release(completion, job, reason)
 
 class JobSetReleaseTask(JobSetBaseTask):
     def __init__(self, app, cls):
@@ -387,7 +387,7 @@
 
     def do_invoke(self, completion, session, job, reason, scheduler):
         assert isinstance(scheduler, Scheduler)
-        scheduler.Remove(self.app.model.mint.model, completion, job, reason)
+        scheduler.Remove(completion, job, reason)
 
 class JobSetRemoveTask(JobSetBaseTask):
     def __init__(self, app, cls):
@@ -403,7 +403,7 @@
 
     def do_invoke(self, completion, session, job, name, value, scheduler):
         assert isinstance(scheduler, Scheduler)
-        scheduler.SetAttribute(self.app.model.mint.model, completion, job, name, str(value))
+        scheduler.SetAttribute(completion, job, name, str(value))
 
     def get_title(self, session):
         return "Set Job Attribute"
@@ -424,9 +424,9 @@
         assert isinstance(negotiator, Negotiator)
 
         if group == "Reconfig":
-            negotiator.Reconfig(self.app.model.mint.model, completion)
+            negotiator.Reconfig(completion)
         else:
-            negotiator.SetRawConfig(self.app.model.mint.model, completion, group, value)
+            negotiator.SetRawConfig(completion, group, value)
 
 class NegotiatorAddGroupTask(NegotiatorGroupTask):
     def __init__(self, app, cls):

Modified: mgmt/trunk/cumin/python/cumin/messaging/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/messaging/model.py	2010-01-08 18:53:58 UTC (rev 3772)
+++ mgmt/trunk/cumin/python/cumin/messaging/model.py	2010-01-08 18:54:29 UTC (rev 3773)
@@ -34,7 +34,7 @@
                 raise Exception \
                     ("Cannot close management connection %s" % conn.address)
 
-        conn.close(self.app.model.mint.model, completion)
+        conn.close(completion)
 
 class ConnectionSetCloseTask(SetTask):
     def __init__(self, app, cls):
@@ -54,7 +54,7 @@
         return "Detach"
 
     def do_invoke(self, completion, session, sess):
-        sess.detach(self.app.model.mint.model, completion)
+        sess.detach(completion)
 
 class SessionSetDetachTask(SetTask):
     def __init__(self, app, cls):
@@ -71,7 +71,7 @@
         return "Close"
 
     def do_invoke(self, completion, session, sess):
-        sess.close(self.app.model.mint.model, completion)
+        sess.close(completion)
 
 class SessionSetCloseTask(SetTask):
     def __init__(self, app, cls):
@@ -149,7 +149,7 @@
 
         assert isinstance(queue, Queue)
 
-        queue.purge(self.app.model.mint.model, completion, count)
+        queue.purge(completion, count)
 
 class QueueSetPurgeTask(SetTask):
     def __init__(self, app, cls):
@@ -226,10 +226,9 @@
         self.form.queue.set(session, queue)
 
     def do_invoke(self, completion, session, queue, dest_queue, count):
-        model = self.app.model.mint.model
         broker = queue.vhost.broker
         broker.queueMoveMessages \
-            (model, completion, queue.name, dest_queue.name, count)
+            (completion, queue.name, dest_queue.name, count)
 
 class ExchangeAddTask(Task):
     MSG_SEQUENCE = "qpid.msg_sequence"
@@ -322,9 +321,8 @@
         else:
             mech = "PLAIN"
 
-        broker.connect(self.app.model.mint.model, completion,
-                       host, port, durable, mech, username, password,
-                       transport)
+        broker.connect(completion, host, port, durable, mech,
+                       username, password, transport)
 
 class LinkRemoveTask(QmfTask):
     def __init__(self, app, cls):
@@ -339,7 +337,7 @@
         self.form.object.set(session, link)
 
     def do_invoke(self, completion, session, link):
-        link.close(self.app.model.mint.model, completion)
+        link.close(completion)
 
 class LinkSetRemoveTask(SetTask):
     def __init__(self, app, cls):
@@ -368,8 +366,7 @@
 
     def do_invoke(self, completion, session, link, exchange, key, tag,
                   dynamic, sync, excludes):
-        link.bridge(self.app.model.mint.model, completion,
-                    link.durable, exchange.name, exchange.name,
+        link.bridge(completion, link.durable, exchange.name, exchange.name,
                     key, tag, excludes, False, False, dynamic, sync)
 
 class RouteRemoveTask(QmfTask):
@@ -377,7 +374,7 @@
         return "Remove"
 
     def do_invoke(self, completion, session, route):
-        route.close(self.app.model.mint.model, completion)
+        route.close(completion)
 
 class RouteSetRemoveTask(SetTask):
     def __init__(self, app, cls):

Modified: mgmt/trunk/cumin/python/cumin/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/model.py	2010-01-08 18:53:58 UTC (rev 3772)
+++ mgmt/trunk/cumin/python/cumin/model.py	2010-01-08 18:54:29 UTC (rev 3773)
@@ -2075,7 +2075,6 @@
         self.got_data = False
         self.error = False
         self.status = None
-        self.model = app.model.mint.model
 
     def get_completion(self):
         def completion(status, data):
@@ -2122,7 +2121,7 @@
         self.data = {'Value': None}
 
     def execute(self, negotiator, config_name, timeout=5):
-        negotiator.GetRawConfig(self.model, self.get_completion(), config_name, None)
+        negotiator.GetRawConfig(self.get_completion(), config_name, None)
         return self.do_wait(timeout)
 
 class FetchRawConfigSet(QmfCallSet):
@@ -2130,7 +2129,7 @@
         default = {'Value': 0}
         for group in groups:
             call = self.add_call(group, default)
-            negotiator.GetRawConfig(call.model, call.get_completion(), prepend+group, None)
+            negotiator.GetRawConfig(call.get_completion(), prepend+group, None)
 
         return self.do_wait(timeout)
 
@@ -2140,7 +2139,7 @@
         self.data = {'JobAd': {"":{"VALUE":"", "TYPE":0}}}
 
     def execute(self, scheduler, jobId, timeout=10):
-        scheduler.GetAd(self.model, self.get_completion(), jobId, None)
+        scheduler.GetAd(self.get_completion(), jobId, None)
         return self.do_wait(timeout)
 
 class FetchJobOutput(QmfCall):
@@ -2149,7 +2148,7 @@
         self.data = {'Data': ""}
 
     def execute(self, scheduler, jobId, file, start, end, timeout=10):
-        scheduler.Fetch(self.model, self.get_completion(), jobId, file, start, end, None)
+        scheduler.Fetch(self.get_completion(), jobId, file, start, end, None)
         return self.do_wait(timeout)
 
 class CuminScheduler(RemoteClass):
@@ -2448,12 +2447,12 @@
         def completion(status, data):
             self.data = data["Limits"]
 
-        self.negotiator.GetLimits(self.model.mint.model, completion, None)
+        self.negotiator.GetLimits(completion, None)
 
     def delete(self):
         del self.model.limits_by_negotiator[self.negotiator]
 
-        super(SubmissionJobStore, self).delete()
+        super(NegotiatorLimitStore, self).delete()
 
 class SubmissionJobStore(ObjectStore):
     def __init__(self, model, submission):
@@ -2467,8 +2466,7 @@
 
         scheduler = self.submission.scheduler
 
-        scheduler.GetJobs \
-            (self.model.mint.model, completion, self.submission.Name, None)
+        scheduler.GetJobs(completion, self.submission.Name, None)
 
     def delete(self):
         del self.model.jobs_by_submission[self.submission]



More information about the rhmessaging-commits mailing list