From 303807136b7ff8f8c7ed0e2884ac858fbe8dc95f Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Tue, 22 Apr 2008 18:15:48 +0000 Subject: QPID-948: patch from Ted Ross for updated management utilities to 0-10 final git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@650604 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/python/commands/qpid-route | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'qpid/python/commands/qpid-route') diff --git a/qpid/python/commands/qpid-route b/qpid/python/commands/qpid-route index c268c638c8..a0755641c9 100755 --- a/qpid/python/commands/qpid-route +++ b/qpid/python/commands/qpid-route @@ -23,9 +23,11 @@ import getopt import sys import socket import qpid +import uuid from qpid.management import managementClient from qpid.peer import Closed -from qpid.client import Client +from qpid.connection import Connection +from qpid.util import connect def Usage (): print "Usage: qpid-route [OPTIONS] add " @@ -35,7 +37,7 @@ def Usage (): print " qpid-route [OPTIONS] flush " print print "Options:" - print " -s [ --spec-file ] PATH (/usr/share/amqp/amqp.0-10-preview.xml)" + print " -s [ --spec-file ] PATH (/usr/share/amqp/amqp.0-10.xml)" print " -v [ --verbose ] Verbose output" print " -q [ --quiet ] Quiet output, don't print duplicate warnings" print @@ -49,7 +51,7 @@ def Usage (): #print sys.exit (1) -_specpath = "/usr/share/amqp/amqp.0-10-preview.xml" +_specpath = "/usr/share/amqp/amqp.0-10.xml" _verbose = False _quiet = False @@ -78,12 +80,10 @@ class RouteManager: print "Connecting to broker: %s:%d" % (broker.host, broker.port) try: self.spec = qpid.spec.load (_specpath) - self.client = Client (broker.host, broker.port, self.spec) - self.client.start (response='\x00' + "guest" + '\x00' + "guest", - mechanism="PLAIN") - self.channel = self.client.channel (1) + self.conn = Connection (connect (broker.host, broker.port), self.spec) + self.conn.start () self.mclient = managementClient (self.spec) - self.mch = self.mclient.addChannel (self.channel) + self.mch = self.mclient.addChannel (self.conn.session(str(uuid.uuid4()))) self.mclient.syncWaitForStable (self.mch) except socket.error, e: print "Connect Error:", e -- cgit v1.2.1