[rhmessaging-commits] rhmessaging commits: r1152 - in mgmt: notes and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2007-10-23 17:16:07 -0400 (Tue, 23 Oct 2007)
New Revision: 1152

Modified:
   mgmt/cumin/python/cumin/model.py
   mgmt/notes/Todo
Log:
Makes all the appropriate demo model objects use MeasuredModelObject



Modified: mgmt/cumin/python/cumin/model.py
===================================================================
--- mgmt/cumin/python/cumin/model.py	2007-10-23 21:09:57 UTC (rev 1151)
+++ mgmt/cumin/python/cumin/model.py	2007-10-23 21:16:07 UTC (rev 1152)
@@ -175,6 +175,17 @@
     def get_realm(self, id):
         return self.get_index(self.realm).get(id)
 
+class MeasuredModelObject(ModelObject):
+    def __init__(self, model, mclass):
+        super(MeasuredModelObject, self).__init__(model, mclass)
+
+        self.measurements = list()
+
+    def get_measurement(self, name):
+        for measure in self.measurements:
+            if measure.name == name:
+                return measure
+
 class Cluster(ModelObject):
     def __init__(self, model):
         super(Cluster, self).__init__(model, model.cluster)
@@ -337,7 +348,7 @@
     def get_low(self):
         return self.__low 
 
-class Queue(ModelObject):
+class Queue(MeasuredModelObject):
     def __init__(self, model):
         super(Queue, self).__init__(model, model.queue)
 
@@ -352,8 +363,6 @@
         self.error_count = 0
         self.warning_count = 0
 
-        self.measurements = list()
-
         # General
 
         measure = Measurement("msgDepth", "int")
@@ -502,11 +511,6 @@
         measure.categories = ("byte", "persistent")
         self.measurements.append(measure)
 
-    def get_measurement(self, name):
-        for measure in self.measurements:
-            if measure.name == name:
-                return measure
-
     def remove(self):
         for binding in self.binding_items().copy():
             binding.remove()
@@ -533,17 +537,6 @@
             
         writer.write("</queue>")
 
-class MeasuredModelObject(ModelObject):
-    def __init__(self, model, mclass):
-        super(MeasuredModelObject, self).__init__(model, mclass)
-
-        self.measurements = list()
-
-    def get_measurement(self, name):
-        for measure in self.measurements:
-            if measure.name == name:
-                return measure
-
 class Consumer(MeasuredModelObject):
     def __init__(self, model):
         super(Consumer, self).__init__(model, model.consumer)
@@ -566,7 +559,7 @@
         measure.highlow = True
         self.measurements.append(measure)
 
-class Exchange(ModelObject):
+class Exchange(MeasuredModelObject):
     def __init__(self, model):
         super(Exchange, self).__init__(model, model.exchange)
 
@@ -577,8 +570,6 @@
         self.is_auto_delete = False
         self.is_internal = False
 
-        self.measurements = list()
-
         measure = Measurement("bindings", "int")
         measure.title = "Bindings"
         measure.categories = ("general")
@@ -615,11 +606,6 @@
         measure.categories = ("byte", "general")
         self.measurements.append(measure)
 
-    def get_measurement(self, name):
-        for measure in self.measurements:
-            if measure.name == name:
-                return measure
-
     def remove(self):
         for binding in self.binding_items().copy():
             binding.remove()
@@ -656,24 +642,17 @@
         measure.categories = ("byte", "general")
         self.measurements.append(measure)
 
-class Binding(ModelObject):
+class Binding(MeasuredModelObject):
     def __init__(self, model):
         super(Binding, self).__init__(model, model.binding)
 
         self.binding_key = None
 
-        self.measurements = list()
-
         measure = Measurement("msgMatched", "int")
         measure.title = "Messages matched"
         measure.categories = ("message", "general")
         self.measurements.append(measure)
 
-    def get_measurement(self, name):
-        for measure in self.measurements:
-            if measure.name == name:
-                return measure
-
     def write_xml(self, writer):
         writer.write("<binding id=\"binding-%i\">" % self.id)
         writer.write("<exchange ref=\"exchange-%i\"/>" % self.exchange.id)
@@ -681,14 +660,12 @@
         writer.write("<binding-key>%s</binding-key>" % self.binding_key)
         writer.write("</binding>")
 
-class Client(ModelObject):
+class Client(MeasuredModelObject):
     def __init__(self, model):
         super(Client, self).__init__(model, model.client)
 
         self.address = None
 
-        self.measurements = list()
-
         measure = Measurement("msgsProduced", "int")
         measure.title = "Messages produced"
         measure.categories = ("message", "general")
@@ -709,19 +686,12 @@
         measure.categories = ("message", "general")
         self.measurements.append(measure)
 
-    def get_measurement(self, name):
-        for measure in self.measurements:
-            if measure.name == name:
-                return measure
-
-class Session(ModelObject):
+class Session(MeasuredModelObject):
     def __init__(self, model):
         super(Session, self).__init__(model, model.session)
 
         self.name = None
 
-        self.measurements = list()
-
         measure = Measurement("attached", "bool")
         measure.title = "Attached"
         measure.categories = ("general")
@@ -736,8 +706,3 @@
         measure.title = "Frames outstanding"
         measure.categories = ("general")
         self.measurements.append(measure)
-
-    def get_measurement(self, name):
-        for measure in self.measurements:
-            if measure.name == name:
-                return measure

Modified: mgmt/notes/Todo
===================================================================
--- mgmt/notes/Todo	2007-10-23 21:09:57 UTC (rev 1151)
+++ mgmt/notes/Todo	2007-10-23 21:16:07 UTC (rev 1152)
@@ -111,12 +111,14 @@
 
  * Remove legacy show_view methods now that we have set_view_mode
 
- * Make the model objects use MeasuredModelObject
-
  * Add more bindings to the demo data
 
  * Add producers to the default exchange
 
  * queue: link consumers stat to consumers view
 
- * exch: link bindings, proucers stats to respective views
+ * exch: link bindings, producers stats to respective views
+
+ * model: get rid of the old *_count stat fields and use the new ones
+
+ * queue: distinguish trans. msg stats from trans. stats