[rhmessaging-commits] rhmessaging commits: r2275 - mgmt/trunk/cumin/python/cumin.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Mon Aug 11 14:15:25 EDT 2008
Author: eallen
Date: 2008-08-11 14:15:24 -0400 (Mon, 11 Aug 2008)
New Revision: 2275
Modified:
mgmt/trunk/cumin/python/cumin/exchange.py
mgmt/trunk/cumin/python/cumin/model.py
mgmt/trunk/cumin/python/cumin/queue.py
Log:
Moved Queue/Exchange Add under model/Broker
Modified: mgmt/trunk/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/exchange.py 2008-08-11 14:31:40 UTC (rev 2274)
+++ mgmt/trunk/cumin/python/cumin/exchange.py 2008-08-11 18:15:24 UTC (rev 2275)
@@ -465,7 +465,7 @@
exchange.name = self.exchange_name.get(session)
exchange.type = self.type.get(session)
- action = self.app.model.exchange.add
+ action = self.app.model.broker.add_exchange
action.invoke(exchange, reg)
self.process_cancel(session)
Modified: mgmt/trunk/cumin/python/cumin/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/model.py 2008-08-11 14:31:40 UTC (rev 2274)
+++ mgmt/trunk/cumin/python/cumin/model.py 2008-08-11 18:15:24 UTC (rev 2275)
@@ -11,6 +11,8 @@
from formats import *
from parameters import *
+
+
log = getLogger("cumin.model")
class CuminModel(object):
@@ -142,6 +144,9 @@
else:
return self.name
+ def get_verb(self, session):
+ return None
+
def invoke(self, object, args={}):
invoc = CuminActionInvocation(self, object)
@@ -188,7 +193,9 @@
self.exception = None
def get_description(self, session):
- verb = self.action.get_title(session)
+ verb = self.action.get_verb(session)
+ if not verb:
+ verb = self.action.get_title(session)
if self.object:
cls = self.action.cumin_model.get_class_by_object(self.object)
object = cls.get_object_title(session, self.object)
@@ -548,6 +555,12 @@
prop = CuminProperty(self, "dataDir")
prop.title = "Data Directory"
+ action = self.AddExchange(self, "add_exchange")
+ action.summary = True
+
+ action = self.AddQueue(self, "add_queue")
+ action.summary = True
+
def get_icon_href(self, session):
return "resource?name=broker-36.png"
@@ -558,6 +571,49 @@
def get_object_name(self, broker):
return broker.id
+ class AddExchange(CuminAction):
+ def get_title(self, session):
+ return "Add Exchange"
+
+ def get_verb(self, session):
+ return "Add"
+
+ def show(self, session, exchange):
+ frame = self.cumin_class.show_object(session, exchange)
+ return frame.show_exchange_add(session)
+
+ def do_invoke(self, exchange, reg, completion):
+ session = self.getSessionFromRegistration(reg)
+ session.exchange_declare(exchange=exchange.name,
+ type=exchange.type)
+ # if the above call fails, an exception is
+ # raised and we won't get here
+ completion("OK")
+
+ class AddQueue(CuminAction):
+ def get_title(self, session):
+ return "Add Queue"
+
+ def get_verb(self, session):
+ return "Add"
+
+ def show(self, session, queue):
+ frame = self.cumin_class.show_object(session, queue)
+ return frame.show_queue_add(session)
+
+ def do_invoke(self, queue, args, completion):
+ reg = args["reg"]
+ session = self.getSessionFromRegistration(reg)
+ session.queue_declare(queue=queue.name,
+ exclusive=queue.exclusive,
+ durable=queue.durable,
+ auto_delete=queue.autoDelete)
+
+ # optionally bind to exchanges
+ binding_info = args['exchange_keys']
+ do_bind(session, queue, binding_info)
+ completion("OK")
+
def do_bind(session, queue, binding_info):
for exchange in binding_info:
if "key" in binding_info[exchange]:
@@ -741,9 +797,6 @@
action = self.Remove(self, "remove")
action.summary = True
- action = self.Add(self, "add")
- action.summary = True
-
action = self.Bind(self, "bind")
action.summary = True
@@ -802,27 +855,6 @@
completion("OK")
- class Add(CuminAction):
- def get_title(self, session):
- return "Add"
-
- def show(self, session, queue):
- frame = self.cumin_class.show_object(session, queue)
- return frame.show_queue_add(session)
-
- def do_invoke(self, queue, args, completion):
- reg = args["reg"]
- session = self.getSessionFromRegistration(reg)
- session.queue_declare(queue=queue.name,
- exclusive=queue.exclusive,
- durable=queue.durable,
- auto_delete=queue.autoDelete)
-
- # optionally bind to exchanges
- binding_info = args['exchange_keys']
- do_bind(session, queue, binding_info)
- completion("OK")
-
class CuminExchange(RemoteClass):
def __init__(self, model):
super(CuminExchange, self).__init__(model, "exchange",
@@ -875,8 +907,6 @@
stat.unit = "message"
stat.category = "io"
- self.Add(self, "add")
-
action = self.Remove(self, "remove")
action.summary = True
@@ -898,22 +928,6 @@
else:
return "Default Exchange"
- class Add(CuminAction):
- def get_title(self, session):
- return "Add"
-
- def show(self, session, exchange):
- frame = self.cumin_class.show_object(session, exchange)
- return frame.show_exchange_add(session)
-
- def do_invoke(self, exchange, reg, completion):
- session = self.getSessionFromRegistration(reg)
- session.exchange_declare(exchange=exchange.name,
- type=exchange.type)
- # if the above call fails, an exception is
- # raised and we won't get here
- completion("OK")
-
class Remove(CuminAction):
def get_title(self, session):
return "Remove"
Modified: mgmt/trunk/cumin/python/cumin/queue.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/queue.py 2008-08-11 14:31:40 UTC (rev 2274)
+++ mgmt/trunk/cumin/python/cumin/queue.py 2008-08-11 18:15:24 UTC (rev 2275)
@@ -384,7 +384,7 @@
"exchange_keys": form_binding_info,
"reg": reg}
- action = self.app.model.queue.add
+ action = self.app.model.broker.add_queue
action.invoke(queue, args)
# navigate back to main queue frame
More information about the rhmessaging-commits
mailing list