Author: tross
Date: Fri Aug 14 20:37:18 2009
New Revision: 804363
URL: http://svn.apache.org/viewvc?rev=804363&view=rev
Log:
Fixed regression (caused by Codec change) in the old management API.
Modified:
qpid/trunk/qpid/python/qpid/management.py
qpid/trunk/qpid/python/qpid/managementdata.py
qpid/trunk/qpid/python/tests_0-10/management.py
Modified: qpid/trunk/qpid/python/qpid/management.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/management.py?rev=804363&r1=804362&r2=804363&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/management.py (original)
+++ qpid/trunk/qpid/python/qpid/management.py Fri Aug 14 20:37:18 2009
@@ -234,8 +234,7 @@
#========================================================
# User API - interacts with the class's user
#========================================================
- def __init__ (self, amqpSpec, ctrlCb=None, configCb=None, instCb=None,
methodCb=None, closeCb=None):
- self.spec = amqpSpec
+ def __init__ (self, unused=None, ctrlCb=None, configCb=None, instCb=None,
methodCb=None, closeCb=None):
self.ctrlCb = ctrlCb
self.configCb = configCb
self.instCb = instCb
@@ -268,7 +267,7 @@
self.channels.append (mch)
self.incOutstanding (mch)
- codec = Codec (self.spec)
+ codec = Codec ()
self.setHeader (codec, ord ('B'))
msg = mch.message(codec.encoded)
mch.send ("qpid.management", msg)
@@ -285,7 +284,7 @@
def getObjects (self, channel, userSequence, className, bank=0):
""" Request immediate content from broker """
- codec = Codec (self.spec)
+ codec = Codec ()
self.setHeader (codec, ord ('G'), userSequence)
ft = {}
ft["_class"] = className
@@ -353,7 +352,7 @@
#========================================================
def topicCb (self, ch, msg):
""" Receive messages via the topic queue of a particular channel. """
- codec = Codec (self.spec, msg.body)
+ codec = Codec (msg.body)
while True:
hdr = self.checkHeader (codec)
if hdr == None:
@@ -372,7 +371,7 @@
def replyCb (self, ch, msg):
""" Receive messages via the reply queue of a particular channel. """
- codec = Codec (self.spec, msg.body)
+ codec = Codec (msg.body)
hdr = self.checkHeader (codec)
if hdr == None:
return
@@ -498,7 +497,7 @@
data = codec.read_uuid ()
elif typecode == 15: # FTABLE
data = {}
- sc = Codec(codec.spec, codec.read_vbin32())
+ sc = Codec(codec.read_vbin32())
if sc.encoded:
count = sc.read_uint32()
while count > 0:
@@ -599,7 +598,7 @@
self.ctrlCb (ch.context, self.CTRL_BROKER_INFO, ch.brokerInfo)
# Send a package request
- sendCodec = Codec (self.spec)
+ sendCodec = Codec ()
seq = self.seqMgr.reserve ("outstanding")
self.setHeader (sendCodec, ord ('P'), seq)
smsg = ch.message(sendCodec.encoded)
@@ -611,7 +610,7 @@
self.packages[pname] = {}
# Send a class request
- sendCodec = Codec (self.spec)
+ sendCodec = Codec ()
seq = self.seqMgr.reserve ("outstanding")
self.setHeader (sendCodec, ord ('Q'), seq)
self.incOutstanding (ch)
@@ -631,7 +630,7 @@
if (cname, hash) not in self.packages[pname]:
# Send a schema request
- sendCodec = Codec (self.spec)
+ sendCodec = Codec ()
seq = self.seqMgr.reserve ("outstanding")
self.setHeader (sendCodec, ord ('S'), seq)
self.incOutstanding (ch)
@@ -885,7 +884,7 @@
def method (self, channel, userSequence, objId, classId, methodName, args):
""" Invoke a method on an object """
- codec = Codec (self.spec)
+ codec = Codec ()
sequence = self.seqMgr.reserve ((userSequence, classId, methodName))
self.setHeader (codec, ord ('M'), sequence)
objId.encode(codec)
Modified: qpid/trunk/qpid/python/qpid/managementdata.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/managementdata.py?rev=804363&r1=804362&r2=804363&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/managementdata.py (original)
+++ qpid/trunk/qpid/python/qpid/managementdata.py Fri Aug 14 20:37:18 2009
@@ -212,7 +212,6 @@
sock.settimeout(10)
self.conn = Connection (sock,
username=self.broker.username,
password=self.broker.password)
- self.spec = self.conn.spec
def aborted():
raise Timeout("Waiting for connection to be established with broker")
oldAborted = self.conn.aborted
@@ -223,7 +222,7 @@
sock.settimeout(oldTimeout)
self.conn.aborted = oldAborted
- self.mclient = managementClient (self.spec, self.ctrlHandler,
self.configHandler,
+ self.mclient = managementClient ("unused", self.ctrlHandler,
self.configHandler,
self.instHandler, self.methodReply,
self.closeHandler)
self.mclient.schemaListener (self.schemaHandler)
self.mch = self.mclient.addChannel (self.conn.session(self.sessionId))
Modified: qpid/trunk/qpid/python/tests_0-10/management.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/tests_0-10/management.py?rev=804363&r1=804362&r2=804363&view=diff
==============================================================================
--- qpid/trunk/qpid/python/tests_0-10/management.py (original)
+++ qpid/trunk/qpid/python/tests_0-10/management.py Fri Aug 14 20:37:18 2009
@@ -29,13 +29,13 @@
Tests for the management hooks
"""
- def disabled_test_broker_connectivity_oldAPI (self):
+ def test_broker_connectivity_oldAPI (self):
"""
Call the "echo" method on the broker to verify it is alive and talking.
"""
session = self.session
- mc = managementClient (session.spec)
+ mc = managementClient ()
mch = mc.addChannel (session)
mc.syncWaitForStable (mch)
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
