QPID-1464 - Moved qmf console API out of python/qpid and into python/qmf

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

4 files changed, 12 insertions, 12 deletions

diff --git a/python/commands/qpid-config b/python/commands/qpid-config
index bd4aa613bc..6bfa6939f1 100755
--- a/python/commands/qpid-config
+++ b/python/commands/qpid-config
@@ -23,7 +23,7 @@ import os
 import getopt
 import sys
 import locale
-from qpid import qmfconsole
+from qmf.console import Session
 
 _recursive         = False
 _host              = "localhost"
@@ -93,7 +93,7 @@ class BrokerManager:
 
     def SetBroker (self, brokerUrl):
         self.url = brokerUrl
-        self.qmf = qmfconsole.Session()
+        self.qmf = Session()
         self.broker = self.qmf.addBroker(brokerUrl)
 
     def Disconnect(self):
diff --git a/python/commands/qpid-printevents b/python/commands/qpid-printevents
index 6efd472221..f27eec04f1 100755
--- a/python/commands/qpid-printevents
+++ b/python/commands/qpid-printevents
@@ -24,7 +24,7 @@ import optparse
 import sys
 import socket
 import time
-from qpid.qmfconsole import Console, Session
+from qmf.console import Console, Session
 
 class EventConsole(Console):
   def event(self, broker, event):
diff --git a/python/commands/qpid-queue-stats b/python/commands/qpid-queue-stats
index c29cab3568..5aa32f9b38 100755
--- a/python/commands/qpid-queue-stats
+++ b/python/commands/qpid-queue-stats
@@ -26,7 +26,7 @@ import re
 import socket
 import qpid
 from threading       import Condition
-from qpid.qmfconsole import Session, Console
+from qmf.console     import Session, Console
 from qpid.peer       import Closed
 from qpid.connection import Connection, ConnectionFailed
 from qpid.util       import connect
diff --git a/python/commands/qpid-route b/python/commands/qpid-route
index 6fbd11b684..5733c62a27 100755
--- a/python/commands/qpid-route
+++ b/python/commands/qpid-route
@@ -24,7 +24,7 @@ import sys
 import socket
 import os
 import locale
-from qpid import qmfconsole
+from qmf.console import Session, BrokerURL
 
 def Usage():
     print "Usage:  qpid-route [OPTIONS] dynamic add <dest-broker> <src-broker> <exchange> [tag] [exclude-list]"
@@ -65,9 +65,9 @@ _transport = "tcp"
 
 class RouteManager:
     def __init__(self, localBroker):
-        self.local = qmfconsole.BrokerURL(localBroker)
+        self.local = BrokerURL(localBroker)
         self.remote  = None
-        self.qmf = qmfconsole.Session()
+        self.qmf = Session()
         self.broker = self.qmf.addBroker(localBroker)
 
     def disconnect(self):
@@ -81,7 +81,7 @@ class RouteManager:
         return None
 
     def addLink(self, remoteBroker):
-        self.remote = qmfconsole.BrokerURL(remoteBroker)
+        self.remote = BrokerURL(remoteBroker)
         if self.local.match(self.remote.host, self.remote.port):
             raise Exception("Linking broker to itself is not permitted")
 
@@ -100,7 +100,7 @@ class RouteManager:
                 print "Connect method returned:", res.status, res.text
 
     def delLink(self, remoteBroker):
-        self.remote = qmfconsole.BrokerURL(remoteBroker)
+        self.remote = BrokerURL(remoteBroker)
         brokers = self.qmf.getObjects(_class="broker")
         broker = brokers[0]
         link = self.getLink()
@@ -137,7 +137,7 @@ class RouteManager:
             added = False
             links = qmf.getObjects(_class="link")
             for link in links:
-                url = qmfconsole.BrokerURL("%s:%d" % (link.host, link.port))
+                url = BrokerURL("%s:%d" % (link.host, link.port))
                 if url.name() not in brokerList:
                     print "    %s..." % url.name(),
                     try:
@@ -263,7 +263,7 @@ class RouteManager:
             print "Bridge method returned:", res.status, res.text
 
     def delQueueRoute(self, remoteBroker, exchange, queue):
-        self.remote = qmfconsole.BrokerURL(remoteBroker)
+        self.remote = BrokerURL(remoteBroker)
         link = self.getLink()
         if link == None:
             if not _quiet:
@@ -293,7 +293,7 @@ class RouteManager:
             raise Exception("Route not found")
 
     def delRoute(self, remoteBroker, exchange, routingKey, dynamic=False):
-        self.remote = qmfconsole.BrokerURL(remoteBroker)
+        self.remote = BrokerURL(remoteBroker)
         link = self.getLink()
         if link == None:
             if not _quiet: