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

4 files changed, 25 insertions, 26 deletions

diff --git a/qpid/python/commands/qpid-config b/qpid/python/commands/qpid-config
index b93e74c4d2..20b08933a4 100755
--- a/qpid/python/commands/qpid-config
+++ b/qpid/python/commands/qpid-config
@@ -19,7 +19,7 @@
 # under the License.
 #
 
-import os
+import os, uuid
 import getopt
 import sys
 import socket
@@ -27,10 +27,11 @@ import qpid
 from threading       import Condition
 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
 from time            import sleep
 
-_defspecpath  = "/usr/share/amqp/amqp.0-10-preview.xml"
+_defspecpath  = "/usr/share/amqp/amqp.0-10.xml"
 _specpath     = _defspecpath
 _recursive    = False
 _host         = "localhost"
@@ -95,13 +96,11 @@ class BrokerManager:
 
     def ConnectToBroker (self):
         try:
-            self.spec     = qpid.spec.load (_specpath)
-            self.client   = Client (self.broker.host, self.broker.port, self.spec)
-            self.client.start (response='\x00' + "guest" + '\x00' + "guest",
-                               mechanism="PLAIN")
-            self.channel  = self.client.channel (1)
+            self.spec = qpid.spec.load (_specpath)
+            self.conn = Connection (connect (self.broker.host, self.broker.port), self.spec)
+            self.conn.start ()
             self.mclient  = managementClient (self.spec)
-            self.mchannel = self.mclient.addChannel (self.channel)
+            self.mchannel = self.mclient.addChannel (self.conn.session(str(uuid.uuid4())))
         except socket.error, e:
             print "Socket Error:", e
             sys.exit (1)
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   <dest-broker> <src-broker> <exchange> <routing-key>"
@@ -35,7 +37,7 @@ def Usage ():
     print "        qpid-route [OPTIONS] flush <dest-broker>"
     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
diff --git a/qpid/python/commands/qpid-tool b/qpid/python/commands/qpid-tool
index 0983e1b8af..02579b9d35 100755
--- a/qpid/python/commands/qpid-tool
+++ b/qpid/python/commands/qpid-tool
@@ -127,7 +127,7 @@ def Usage ():
   print "Usage:", sys.argv[0], "[OPTIONS] [<target-host[:<tcp-port>]]"
   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
   sys.exit (1)
 
@@ -143,7 +143,7 @@ except:
   Usage ()
   sys.exit (1)
 
-_specpath = "/usr/share/amqp/amqp.0-10-preview.xml"
+_specpath = "/usr/share/amqp/amqp.0-10.xml"
 _host     = "localhost"
 
 for opt in optlist:
diff --git a/qpid/python/qpid/managementdata.py b/qpid/python/qpid/managementdata.py
index 2876bf0948..327ae96a26 100644
--- a/qpid/python/qpid/managementdata.py
+++ b/qpid/python/qpid/managementdata.py
@@ -22,11 +22,13 @@
 import qpid
 import socket
 import struct
+import uuid
 from qpid.management import managementChannel, managementClient
 from threading       import Lock
 from disp            import Display
 from shlex           import split
-from qpid.client     import Client
+from qpid.connection import Connection
+from qpid.util       import connect
 
 class Broker:
   def __init__ (self, text):
@@ -159,7 +161,7 @@ class ManagementData:
       self.schema[className] = (configs, insts, methods, events)
 
   def __init__ (self, disp, host, username="guest", password="guest",
-                specfile="../../specs/amqp.0-10-preview.xml"):
+                specfile="../../specs/amqp.0-10.xml"):
     self.spec           = qpid.spec.load (specfile)
     self.lock           = Lock ()
     self.tables         = {}
@@ -171,15 +173,13 @@ class ManagementData:
     self.methodsPending = {}
 
     self.broker = Broker (host)
-    self.client = Client (self.broker.host, self.broker.port, self.spec)
-    self.client.start (response='\x00' + username + '\x00' + password,
-                       mechanism="PLAIN")
-    self.channel = self.client.channel (1)
+    self.conn   = Connection (connect (self.broker.host, self.broker.port), self.spec)
+    self.conn.start ()
 
     self.mclient = managementClient (self.spec, self.ctrlHandler, self.configHandler,
                                      self.instHandler, self.methodReply)
     self.mclient.schemaListener (self.schemaHandler)
-    self.mch = self.mclient.addChannel (self.channel)
+    self.mch = self.mclient.addChannel (self.conn.session(str(uuid.uuid4())))
 
   def close (self):
     self.mclient.removeChannel (self.mch)