[rhmessaging-commits] rhmessaging commits: r1336 - in mgmt: mint/python/mint and 1 other directory.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Mon Nov 19 11:29:19 EST 2007
Author: justi9
Date: 2007-11-19 11:29:18 -0500 (Mon, 19 Nov 2007)
New Revision: 1336
Modified:
mgmt/cumin/python/cumin/broker.py
mgmt/cumin/python/cumin/broker.strings
mgmt/cumin/python/cumin/brokercluster.py
mgmt/cumin/python/cumin/brokergroup.py
mgmt/cumin/python/cumin/brokerprofile.py
mgmt/cumin/python/cumin/page.py
mgmt/cumin/python/cumin/queue.py
mgmt/cumin/python/cumin/widgets.py
mgmt/cumin/python/cumin/widgets.strings
mgmt/mint/python/mint/schema.py
Log:
Generally makes the UI work with the real data model. Before lots of places
would blow up because they were expecting dummy data. They are now fixed.
Updates the schema to the newest with association methods fixed up.
Modified: mgmt/cumin/python/cumin/broker.py
===================================================================
--- mgmt/cumin/python/cumin/broker.py 2007-11-19 16:06:28 UTC (rev 1335)
+++ mgmt/cumin/python/cumin/broker.py 2007-11-19 16:29:18 UTC (rev 1336)
@@ -78,6 +78,9 @@
self.submit = self.Submit(app, "submit", self)
self.add_child(self.submit)
+ self.paginator = self.BrokerPaginator(app, "page")
+ self.add_child(self.paginator)
+
def do_process(self, session, model):
if self.submit.get(session):
self.submit.set(session, False)
@@ -100,6 +103,10 @@
def render_content(self, session, model):
return "Submit"
+ class BrokerPaginator(Paginator):
+ def get_object(self, session, model):
+ return self.parent().get_items(session, model)
+
class BrokerFrame(CuminFrame):
def __init__(self, app, name):
super(BrokerFrame, self).__init__(app, name)
Modified: mgmt/cumin/python/cumin/broker.strings
===================================================================
--- mgmt/cumin/python/cumin/broker.strings 2007-11-19 16:06:28 UTC (rev 1335)
+++ mgmt/cumin/python/cumin/broker.strings 2007-11-19 16:29:18 UTC (rev 1336)
@@ -19,6 +19,7 @@
</tr>
[BrokerSetForm.html]
+{page}
<form id="{id}" method="post" action="?">
<!-- <select onchange="document.getElementById('{id}.submit').submit()"> -->
Modified: mgmt/cumin/python/cumin/brokercluster.py
===================================================================
--- mgmt/cumin/python/cumin/brokercluster.py 2007-11-19 16:06:28 UTC (rev 1335)
+++ mgmt/cumin/python/cumin/brokercluster.py 2007-11-19 16:29:18 UTC (rev 1336)
@@ -91,10 +91,11 @@
class ClusterBrokerTab(BrokerSetForm):
def get_title(self, session, cluster):
- return "Brokers %s" % fmt_count(len(cluster.broker_items()))
+ return "Brokers" #XXX %s" % fmt_count(len(cluster.broker_items()))
def get_items(self, session, cluster):
- return sorted_by(cluster.broker_items())
+ return sorted_by(self.app.model.sys.brokers, "id")
+ #XXX return sorted_by(cluster.broker_items())
class ClusterStatsTab(Widget):
def get_title(self, session, cluster):
Modified: mgmt/cumin/python/cumin/brokergroup.py
===================================================================
--- mgmt/cumin/python/cumin/brokergroup.py 2007-11-19 16:06:28 UTC (rev 1335)
+++ mgmt/cumin/python/cumin/brokergroup.py 2007-11-19 16:29:18 UTC (rev 1336)
@@ -95,7 +95,8 @@
return "Brokers %s" % fmt_count(len(group.broker_items()))
def get_items(self, session, group):
- return sorted_by(group.broker_items())
+ return sorted_by(self.app.model.sys.brokers, "port")
+ #XXX return sorted_by(group.broker_items())
class BrokerGroupForm(CuminForm):
def __init__(self, app, name):
Modified: mgmt/cumin/python/cumin/brokerprofile.py
===================================================================
--- mgmt/cumin/python/cumin/brokerprofile.py 2007-11-19 16:06:28 UTC (rev 1335)
+++ mgmt/cumin/python/cumin/brokerprofile.py 2007-11-19 16:29:18 UTC (rev 1336)
@@ -77,7 +77,8 @@
return "Brokers %s" % fmt_count(len(profile.broker_items()))
def get_items(self, session, profile):
- return sorted_by(profile.broker_items())
+ return sorted_by(self.app.model.sys.brokers, "id")
+ #XXX return sorted_by(profile.broker_items())
def render_item_config_href(self, session, broker):
branch = session.branch()
@@ -86,6 +87,8 @@
return branch.marshal()
def render_item_config_status(self, session, broker):
+ return "0 differences" #XXX
+
diffs = 0
for prop in broker.get_broker_profile().config_property_items():
Modified: mgmt/cumin/python/cumin/page.py
===================================================================
--- mgmt/cumin/python/cumin/page.py 2007-11-19 16:06:28 UTC (rev 1335)
+++ mgmt/cumin/python/cumin/page.py 2007-11-19 16:29:18 UTC (rev 1336)
@@ -118,20 +118,17 @@
return self.set_current_frame(session, frame)
def show_queue(self, session, queue):
- broker = queue.mintVhost.mintBroker
- frame = self.show_broker(session, broker)
+ frame = self.show_broker(session, queue.vhost.broker)
frame = frame.show_queue(session, queue)
return self.set_current_frame(session, frame)
def show_exchange(self, session, exchange):
- broker = exchange.get_virtual_host().get_broker()
- frame = self.show_broker(session, broker)
+ frame = self.show_broker(session, exchange.vhost.broker)
frame = frame.show_exchange(session, exchange)
return self.set_current_frame(session, frame)
def show_client(self, session, client):
- broker = client.get_virtual_host().get_broker()
- frame = self.show_broker(session, broker)
+ frame = self.show_broker(session, client.vhost.broker)
frame = frame.show_client(session, client)
return self.set_current_frame(session, frame)
@@ -183,7 +180,6 @@
class BrokerTab(BrokerBrowser):
def get_title(self, session, model):
- print dir(model.sys)
return "Brokers %s" % fmt_count(len(model.brokers()))
class BrokerProfileTab(BrokerProfileSet):
Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py 2007-11-19 16:06:28 UTC (rev 1335)
+++ mgmt/cumin/python/cumin/queue.py 2007-11-19 16:29:18 UTC (rev 1336)
@@ -57,23 +57,23 @@
def render_item_enqueued(self, session, queue):
unit = self.unit.get(session)
key = unit == "b" and "byteTotalEnqueues" or "msgTotalEnqueues"
- value = getattr(queue.mintQueueStats, key)
+ value = getattr(queue.stats, key)
return fmt_rate(value, unit == "b" and "byte" or "msg", "sec")
def render_item_dequeued(self, session, queue):
unit = self.unit.get(session)
key = unit == "b" and "byteTotalDequeues" or "msgTotalDequeues"
- value = getattr(queue.mintQueueStats, key)
+ value = getattr(queue.stats, key)
return fmt_rate(value, unit == "b" and "byte" or "msg", "sec")
def render_item_depth(self, session, queue):
key = self.unit.get(session) == "b" and "byteDepth" or "msgDepth"
- return getattr(queue.mintQueueStats, key)
+ return getattr(queue.stats, key)
def render_item_depth_accel(self, session, queue):
unit = self.unit.get(session)
key = unit == "b" and "byteDepth" or "msgDepth"
- value = getattr(queue.mintQueueStats, key)
+ value = getattr(queue.stats, key)
return fmt_rate(value, unit == "b" and "byte" or "msg", "sec")
def render_item_status(self, session, queue):
@@ -117,36 +117,36 @@
class QueueStatus(CuminStatus):
def render_consumers(self, session, queue):
- return queue.mintQueueStats.consumers
+ return queue.stats.consumers
def render_messages_enqueued(self, session, queue):
- value = queue.mintQueueStats.msgTotalEnqueues
+ value = queue.stats.msgTotalEnqueues
return fmt_rate(value, "msg", "sec")
def render_messages_dequeued(self, session, queue):
- value = queue.mintQueueStats.msgTotalDequeues
+ value = queue.stats.msgTotalDequeues
return fmt_rate(value, "msg", "sec")
def render_message_depth(self, session, queue):
- return queue.mintQueueStats.msgDepth
+ return queue.stats.msgDepth
def render_message_depth_accel(self, session, queue):
- value = queue.mintQueueStats.msgDepth
+ value = queue.stats.msgDepth
return fmt_rate(value, "msg", "sec")
def render_bytes_enqueued(self, session, queue):
- value = queue.mintQueueStats.byteTotalEnqueues
+ value = queue.stats.byteTotalEnqueues
return fmt_rate(value, "byte", "sec")
def render_bytes_dequeued(self, session, queue):
- value = queue.mintQueueStats.byteTotalDequeues
+ value = queue.stats.byteTotalDequeues
return fmt_rate(value, "byte", "sec")
def render_byte_depth(self, session, queue):
- return queue.mintQueueStats.byteDepth
+ return queue.stats.byteDepth
def render_byte_depth_accel(self, session, queue):
- value = queue.mintQueueStats.byteDepth
+ value = queue.stats.byteDepth
return fmt_rate(value, "byte", "sec")
class QueueView(Widget):
Modified: mgmt/cumin/python/cumin/widgets.py
===================================================================
--- mgmt/cumin/python/cumin/widgets.py 2007-11-19 16:06:28 UTC (rev 1335)
+++ mgmt/cumin/python/cumin/widgets.py 2007-11-19 16:29:18 UTC (rev 1336)
@@ -1,3 +1,4 @@
+from math import ceil
from wooly import *
from wooly.widgets import *
from wooly.forms import *
@@ -252,3 +253,28 @@
class_ = self.get(session) == "b" and "selected"
return fmt_link(branch.marshal(), "Bytes", class_)
+
+class Paginator(ItemSet):
+ def __init__(self, app, name):
+ super(Paginator, self).__init__(app, name)
+
+ self.param = IntegerParameter(app, "param")
+ self.param.set_default(0)
+ self.add_parameter(self.param)
+
+ def get(self, session):
+ return self.param.get(session)
+
+ def set(self, session, value):
+ return self.param.set(session, value)
+
+ def get_items(self, session, object):
+ return range(0, ceil(len(object) / 20) - 1)
+
+ def render_item_href(self, session, page):
+ branch = session.branch()
+ self.set(branch, page)
+ return branch.marshal()
+
+ def render_item_content(self, session, page):
+ return page + 1
Modified: mgmt/cumin/python/cumin/widgets.strings
===================================================================
--- mgmt/cumin/python/cumin/widgets.strings 2007-11-19 16:06:28 UTC (rev 1335)
+++ mgmt/cumin/python/cumin/widgets.strings 2007-11-19 16:29:18 UTC (rev 1336)
@@ -25,3 +25,11 @@
<li>{messages_link}</li>
<li>{bytes_link}</li>
</ul>
+
+[Paginator.html]
+<ul class="comma">
+ {items}
+</ul>
+
+[Paginator.item_html]
+<li><a href="{item_href}">{item_content}</a></li>
Modified: mgmt/mint/python/mint/schema.py
===================================================================
--- mgmt/mint/python/mint/schema.py 2007-11-19 16:06:28 UTC (rev 1335)
+++ mgmt/mint/python/mint/schema.py 2007-11-19 16:29:18 UTC (rev 1336)
@@ -1,9 +1,6 @@
from sqlobject import *
from datetime import datetime
-#conn = connectionForURI("postgresql://localhost/")
-#sqlhub.processConnection = conn
-
class System(SQLObject):
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
@@ -69,6 +66,9 @@
model.getConnectedBroker(managedBrokerLabel).method(methodId, self.idOriginal, \
classToSchemaNameMap[self.__class__.__name__], "crash", args=actualArgs, packageName="qpid")
+System.sqlmeta.addJoin(MultipleJoin('Broker', joinMethodName='brokers'))
+
+
class BrokerStats(SQLObject):
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
@@ -85,6 +85,9 @@
broker = ForeignKey('Broker', cascade='null', default=None)
name = StringCol(length=1000, default=None)
+Broker.sqlmeta.addJoin(MultipleJoin('Vhost', joinMethodName='vhosts'))
+
+
class VhostStats(SQLObject):
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
@@ -120,6 +123,9 @@
model.getConnectedBroker(managedBrokerLabel).method(methodId, self.idOriginal, \
classToSchemaNameMap[self.__class__.__name__], "increaseDiskSize", args=actualArgs, packageName="qpid")
+Vhost.sqlmeta.addJoin(MultipleJoin('Queue', joinMethodName='queues'))
+
+
class QueueStats(SQLObject):
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
@@ -179,6 +185,9 @@
name = StringCol(length=1000, default=None)
type = StringCol(length=1000, default=None)
+Vhost.sqlmeta.addJoin(MultipleJoin('Exchange', joinMethodName='exchanges'))
+
+
class ExchangeStats(SQLObject):
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
@@ -208,6 +217,11 @@
exchange = ForeignKey('Exchange', cascade='null', default=None)
bindingKey = StringCol(length=1000, default=None)
+Queue.sqlmeta.addJoin(MultipleJoin('Binding', joinMethodName='bindings'))
+
+Exchange.sqlmeta.addJoin(MultipleJoin('Binding', joinMethodName='bindings'))
+
+
class BindingStats(SQLObject):
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
@@ -238,6 +252,9 @@
model.getConnectedBroker(managedBrokerLabel).method(methodId, self.idOriginal, \
classToSchemaNameMap[self.__class__.__name__], "detach", args=actualArgs, packageName="qpid")
+Vhost.sqlmeta.addJoin(MultipleJoin('Client', joinMethodName='clients'))
+
+
class ClientStats(SQLObject):
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
@@ -285,6 +302,11 @@
model.getConnectedBroker(managedBrokerLabel).method(methodId, self.idOriginal, \
classToSchemaNameMap[self.__class__.__name__], "close", args=actualArgs, packageName="qpid")
+Vhost.sqlmeta.addJoin(MultipleJoin('Session', joinMethodName='sessions'))
+
+Client.sqlmeta.addJoin(MultipleJoin('Session', joinMethodName='sessions'))
+
+
class SessionStats(SQLObject):
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
@@ -324,6 +346,9 @@
model.getConnectedBroker(managedBrokerLabel).method(methodId, self.idOriginal, \
classToSchemaNameMap[self.__class__.__name__], "start", args=actualArgs, packageName="qpid")
+Session.sqlmeta.addJoin(MultipleJoin('Destination', joinMethodName='destinations'))
+
+
class DestinationStats(SQLObject):
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
@@ -345,6 +370,11 @@
destination = ForeignKey('Destination', cascade='null', default=None)
exchange = ForeignKey('Exchange', cascade='null', default=None)
+Destination.sqlmeta.addJoin(MultipleJoin('Producer', joinMethodName='producers'))
+
+Exchange.sqlmeta.addJoin(MultipleJoin('Producer', joinMethodName='producers'))
+
+
class ProducerStats(SQLObject):
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
@@ -369,6 +399,11 @@
model.getConnectedBroker(managedBrokerLabel).method(methodId, self.idOriginal, \
classToSchemaNameMap[self.__class__.__name__], "close", args=actualArgs, packageName="qpid")
+Destination.sqlmeta.addJoin(MultipleJoin('Consumer', joinMethodName='consumers'))
+
+Queue.sqlmeta.addJoin(MultipleJoin('Consumer', joinMethodName='consumers'))
+
+
class ConsumerStats(SQLObject):
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
More information about the rhmessaging-commits
mailing list