[rhmessaging-commits] rhmessaging commits: r1655 - mgmt/cumin/python/cumin.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Thu Feb 7 08:22:19 EST 2008
Author: justi9
Date: 2008-02-07 08:22:19 -0500 (Thu, 07 Feb 2008)
New Revision: 1655
Modified:
mgmt/cumin/python/cumin/broker.py
mgmt/cumin/python/cumin/model.py
mgmt/cumin/python/cumin/page.py
Log:
Makes all the existing actions show up in the jobs ui.
Modified: mgmt/cumin/python/cumin/broker.py
===================================================================
--- mgmt/cumin/python/cumin/broker.py 2008-02-07 13:06:07 UTC (rev 1654)
+++ mgmt/cumin/python/cumin/broker.py 2008-02-07 13:22:19 UTC (rev 1655)
@@ -464,7 +464,7 @@
def render_add_broker_href(self, session, model):
branch = session.branch()
- self.frame().show_broker_add(branch)
+ self.frame().show_brokers_add(branch)
return branch.marshal()
def render_clear_filters_href(self, session, model):
@@ -612,7 +612,7 @@
def render_content(self, session, model):
return "More Entries"
-class BrokerAdd(BrokerForm):
+class BrokerSetAdd(BrokerForm):
def get_title(self, session, object):
return "Register New Brokers"
@@ -622,6 +622,8 @@
self.page().set_redirect_url(session, branch.marshal())
def process_submit(self, session, model):
+ action = self.app.model.broker_registration.add
+
addrs = self.addrs.get(session)
names = self.names.get(session)
groups = self.groups.get(session)
@@ -630,24 +632,30 @@
addr = addrs[i]
if addr:
- reg = BrokerRegistration()
+ name = names[i]
elems = addr.split(":")
if len(elems) > 1:
- reg.host, reg.port = elems[0], int(elems[1])
+ host, port = elems[0], int(elems[1])
else:
- reg.host, reg.port = elems[0], 5672
+ host, port = elems[0], 5672
- reg.name = names[i]
+ group = groups[i]
- if groups[i]:
- reg.addBrokerGroup(groups[i])
+ args = {
+ "name": name,
+ "host": host,
+ "port": port
+ }
- reg.syncUpdate()
+ reg = BrokerRegistration()
- self.app.broker_connect_thread.prompt()
+ if group:
+ reg.addBrokerGroup(group)
+ action.invoke(reg, args);
+
self.process_cancel(session, model)
class BrokerRemove(CuminConfirmForm):
@@ -664,7 +672,7 @@
action.invoke(broker)
branch = session.branch()
- self.page().show_main(branch)
+ self.page().show_main(branch).show_view(branch)
self.page().set_redirect_url(session, branch.marshal())
def render_submit_content(self, session, broker):
@@ -685,12 +693,9 @@
self.page().set_redirect_url(session, branch.marshal())
def process_item(self, session, id):
- try:
- broker = BrokerRegistration.get(id)
- broker.destroySelf()
- except Exception, e:
- # In an extra ui step, note any errors that arose
- print e
+ action = self.app.model.broker_registration.remove
+ # XXX need to handle object not found case
+ action.invoke(BrokerRegistration.get(id))
def render_item_content(self, session, id):
return "Unregister Broker '%s'" % BrokerRegistration.get(id).name
Modified: mgmt/cumin/python/cumin/model.py
===================================================================
--- mgmt/cumin/python/cumin/model.py 2008-02-07 13:06:07 UTC (rev 1654)
+++ mgmt/cumin/python/cumin/model.py 2008-02-07 13:22:19 UTC (rev 1655)
@@ -92,10 +92,13 @@
invoc.args = args
#invoc.prt()
- self.do_invoke(object, args, completion)
+ try:
+ self.do_invoke(object, args, completion)
+ except Exception, e:
+ invoc.exception = e;
+ finally:
+ self.model.invocations.add(invoc)
- self.model.invocations.add(invoc)
-
return invoc
def do_invoke(self, object, args, completion):
@@ -108,6 +111,7 @@
self.when = datetime.now()
self.status = "pending"
self.args = None
+ self.exception = None
def get_description(self, session):
verb = self.action.get_title(session)
@@ -294,9 +298,14 @@
def do_invoke(self, object, args, completion):
try:
- object = self.cumin_class.mint_class()
+ if not object:
+ object = self.cumin_class.mint_class()
+
object.set(**args)
object.syncUpdate()
+
+ self.model.app.broker_connect_thread.prompt()
+
completion("OK")
except Exception, e:
completion(e.message or "failed")
@@ -640,7 +649,6 @@
self.Close(self, "close")
self.Detach(self, "detach")
- # XXX de studly these
self.ResetLifespan(self, "resetLifespan")
self.SolicitAck(self, "solicitAck")
Modified: mgmt/cumin/python/cumin/page.py
===================================================================
--- mgmt/cumin/python/cumin/page.py 2008-02-07 13:06:07 UTC (rev 1654)
+++ mgmt/cumin/python/cumin/page.py 2008-02-07 13:22:19 UTC (rev 1655)
@@ -74,9 +74,8 @@
self.__broker = BrokerFrame(app, "broker")
self.add_mode(self.__broker)
- # XXX rename to BrokerSetAdd
- self.__broker_add = BrokerAdd(app, "brokeradd")
- self.add_mode(self.__broker_add)
+ self.__brokers_add = BrokerSetAdd(app, "brokersadd")
+ self.add_mode(self.__brokers_add)
self.__brokers_remove = BrokerSetRemove(app, "brokersremove")
self.add_mode(self.__brokers_remove)
@@ -87,15 +86,9 @@
self.__profile = BrokerProfileFrame(app, "profile")
self.add_mode(self.__profile)
- self.__profile_add = BrokerProfileAdd(app, "profileadd")
- self.add_mode(self.__profile_add)
-
self.__cluster = BrokerClusterFrame(app, "cluster")
self.add_mode(self.__cluster)
- self.__cluster_add = BrokerClusterAdd(app, "clusteradd")
- self.add_mode(self.__cluster_add)
-
self.__system = SystemFrame(app, "system")
self.add_mode(self.__system)
@@ -142,8 +135,8 @@
return self.page().set_current_frame(session, frame)
- def show_broker_add(self, session):
- frame = self.show_mode(session, self.__broker_add)
+ def show_brokers_add(self, session):
+ frame = self.show_mode(session, self.__brokers_add)
return self.page().set_current_frame(session, frame)
def show_brokers_remove(self, session):
@@ -160,19 +153,11 @@
frame.set_object(session, profile)
return self.page().set_current_frame(session, frame)
- def show_broker_profile_add(self, session):
- frame = self.show_mode(session, self.__profile_add)
- return self.page().set_current_frame(session, frame)
-
def show_broker_cluster(self, session, cluster):
frame = self.show_mode(session, self.__cluster)
frame.set_object(session, cluster)
return self.page().set_current_frame(session, frame)
- def show_broker_cluster_add(self, session):
- frame = self.show_mode(session, self.__cluster_add)
- return self.page().set_current_frame(session, frame)
-
def show_system(self, session, system):
frame = self.show_mode(session, self.__system)
frame.set_object(session, system)
More information about the rhmessaging-commits
mailing list