QPID-1327 - Event support for Management

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@702651 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 24 insertions, 27 deletions

diff --git a/python/commands/qpid-config b/python/commands/qpid-config
index 13b489abae..8b011778d6 100755
--- a/python/commands/qpid-config
+++ b/python/commands/qpid-config
@@ -84,8 +84,8 @@ class BrokerManager:
         self.qmf.delBroker(self.broker)
 
     def Overview (self):
-        exchanges = self.qmf.getObjects(cls="exchange")
-        queues    = self.qmf.getObjects(cls="queue")
+        exchanges = self.qmf.getObjects(_class="exchange")
+        queues    = self.qmf.getObjects(_class="queue")
         print "Total Exchanges: %d" % len (exchanges)
         etype = {}
         for ex in exchanges:
@@ -106,7 +106,7 @@ class BrokerManager:
         print "    non-durable: %d" % (len (queues) - _durable)
 
     def ExchangeList (self, filter):
-        exchanges = self.qmf.getObjects(cls="exchange")
+        exchanges = self.qmf.getObjects(_class="exchange")
         print "Durable   Type      Bindings  Exchange Name"
         print "======================================================="
         for ex in exchanges:
@@ -114,9 +114,9 @@ class BrokerManager:
                 print "%4c      %-10s%5d     %s" % (YN (ex.durable), ex.type, ex.bindingCount, ex.name)
 
     def ExchangeListRecurse (self, filter):
-        exchanges = self.qmf.getObjects(cls="exchange")
-        bindings  = self.qmf.getObjects(cls="binding")
-        queues    = self.qmf.getObjects(cls="queue")
+        exchanges = self.qmf.getObjects(_class="exchange")
+        bindings  = self.qmf.getObjects(_class="binding")
+        queues    = self.qmf.getObjects(_class="queue")
         for ex in exchanges:
             if self.match (ex.name, filter):
                 print "Exchange '%s' (%s)" % (ex.name, ex.type)
@@ -130,8 +130,8 @@ class BrokerManager:
             
 
     def QueueList (self, filter):
-        queues   = self.qmf.getObjects(cls="queue")
-        journals = self.qmf.getObjects(cls="journal")
+        queues   = self.qmf.getObjects(_class="queue")
+        journals = self.qmf.getObjects(_class="journal")
         print "                                      Store Size"
         print "Durable  AutoDel  Excl  Bindings  (files x file pages)  Queue Name"
         print "==========================================================================================="
@@ -151,9 +151,9 @@ class BrokerManager:
                              YN (q.exclusive), q.bindingCount, q.name)
 
     def QueueListRecurse (self, filter):
-        exchanges = self.qmf.getObjects(cls="exchange")
-        bindings  = self.qmf.getObjects(cls="binding")
-        queues    = self.qmf.getObjects(cls="queue")
+        exchanges = self.qmf.getObjects(_class="exchange")
+        bindings  = self.qmf.getObjects(_class="binding")
+        queues    = self.qmf.getObjects(_class="queue")
         for queue in queues:
             if self.match (queue.name, filter):
                 print "Queue '%s'" % queue.name
diff --git a/python/commands/qpid-printevents b/python/commands/qpid-printevents
index 970607c797..6efd472221 100755
--- a/python/commands/qpid-printevents
+++ b/python/commands/qpid-printevents
@@ -30,16 +30,13 @@ class EventConsole(Console):
   def event(self, broker, event):
     print event
 
-  def heartbeat(self, agent, timestamp):
-    print "Heartbeat"
-
 ##
 ## Main Program
 ##
 def main():
   _usage = "%prog [options] [broker-addr]..."
   _description = \
-"""Collect and print events from one of more Qpid message brokers.  If no broker-addr is
+"""Collect and print events from one or more Qpid message brokers.  If no broker-addr is
 supplied, %prog will connect to 'localhost:5672'.
 broker-addr is of the form:  [username/password@] hostname | ip-address [:<port>]
 ex: localhost, 10.1.1.7:10000, broker-host:10000, guest/guest@localhost
diff --git a/python/commands/qpid-route b/python/commands/qpid-route
index f9f938cdec..4dadcd543b 100755
--- a/python/commands/qpid-route
+++ b/python/commands/qpid-route
@@ -62,7 +62,7 @@ class RouteManager:
         self.qmf.delBroker(self.broker)
 
     def getLink (self):
-        links = self.qmf.getObjects(cls="link")
+        links = self.qmf.getObjects(_class="link")
         for link in links:
             if "%s:%d" % (link.host, link.port) == self.src.name ():
                 return link
@@ -74,7 +74,7 @@ class RouteManager:
             print "Linking broker to itself is not permitted"
             sys.exit(1)
 
-        brokers = self.qmf.getObjects(cls="broker")
+        brokers = self.qmf.getObjects(_class="broker")
         broker = brokers[0]
         link = self.getLink()
         if link != None:
@@ -92,7 +92,7 @@ class RouteManager:
 
     def DelLink (self, srcBroker):
         self.src = qmfconsole.BrokerURL(srcBroker)
-        brokers = self.qmf.getObjects(cls="broker")
+        brokers = self.qmf.getObjects(_class="broker")
         broker = brokers[0]
         link = self.getLink()
         if link == None:
@@ -103,7 +103,7 @@ class RouteManager:
             print "Close method returned:", res.status, res.text
 
     def ListLinks (self):
-        links = self.qmf.getObjects(cls="link")
+        links = self.qmf.getObjects(_class="link")
         if len(links) == 0:
             print "No Links Found"
         else:
@@ -119,7 +119,7 @@ class RouteManager:
         if self.dest.name() == self.src.name():
             raise Exception("Linking broker to itself is not permitted")
 
-        brokers = self.qmf.getObjects(cls="broker")
+        brokers = self.qmf.getObjects(_class="broker")
         broker = brokers[0]
 
         link = self.getLink()
@@ -140,7 +140,7 @@ class RouteManager:
         if link == None:
             raise Exception("Protocol Error - Missing link ID")
 
-        bridges = self.qmf.getObjects(cls="bridge")
+        bridges = self.qmf.getObjects(_class="bridge")
         for bridge in bridges:
             if bridge.linkRef == link.getObjectId() and \
                     bridge.dest == exchange and bridge.key == routingKey:
@@ -164,7 +164,7 @@ class RouteManager:
                 raise Exception("No link found from %s to %s" % (self.src.name(), self.dest.name()))
             sys.exit (0)
 
-        bridges = self.qmf.getObjects(cls="bridge")
+        bridges = self.qmf.getObjects(_class="bridge")
         for bridge in bridges:
             if bridge.linkRef == link.getObjectId() and bridge.dest == exchange and bridge.key == routingKey:
                 if _verbose:
@@ -186,8 +186,8 @@ class RouteManager:
             raise Exception("Route not found")
 
     def ListRoutes (self):
-        links   = self.qmf.getObjects(cls="link")
-        bridges = self.qmf.getObjects(cls="bridge")
+        links   = self.qmf.getObjects(_class="link")
+        bridges = self.qmf.getObjects(_class="bridge")
 
         for bridge in bridges:
             myLink = None
@@ -199,8 +199,8 @@ class RouteManager:
                 print "%s %s:%d %s %s" % (self.dest.name(), myLink.host, myLink.port, bridge.dest, bridge.key)
 
     def ClearAllRoutes (self):
-        links   = self.qmf.getObjects(cls="link")
-        bridges = self.qmf.getObjects(cls="bridge")
+        links   = self.qmf.getObjects(_class="link")
+        bridges = self.qmf.getObjects(_class="bridge")
 
         for bridge in bridges:
             if _verbose:
@@ -218,7 +218,7 @@ class RouteManager:
                 print "Ok"
 
         if _dellink:
-            links = self.qmf.getObjects(cls="link")
+            links = self.qmf.getObjects(_class="link")
             for link in links:
                 if _verbose:
                     print "Deleting Link: %s:%d... " % (link.host, link.port),