summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xqpid/cpp/src/tests/acl.py4
-rwxr-xr-xqpid/python/commands/qpid-config4
-rwxr-xr-xqpid/python/commands/qpid-printevents2
-rwxr-xr-xqpid/python/commands/qpid-queue-stats2
-rwxr-xr-xqpid/python/commands/qpid-route16
-rw-r--r--qpid/python/qmf/__init__.py18
-rw-r--r--qpid/python/qmf/console.py (renamed from qpid/python/qpid/qmfconsole.py)0
-rw-r--r--qpid/python/qpid/management.py2
-rw-r--r--qpid/python/qpid/managementdata.py2
-rw-r--r--qpid/python/qpid/testlib.py4
10 files changed, 36 insertions, 18 deletions
diff --git a/qpid/cpp/src/tests/acl.py b/qpid/cpp/src/tests/acl.py
index eec64b625b..671b2fe247 100755
--- a/qpid/cpp/src/tests/acl.py
+++ b/qpid/cpp/src/tests/acl.py
@@ -24,7 +24,7 @@ from qpid.util import connect
from qpid.connection import Connection
from qpid.datatypes import uuid4
from qpid.testlib import TestBase010, testrunner
-from qpid.qmfconsole import Session
+from qmf.console import Session
from qpid.datatypes import Message
def scan_args(name, default=None, args=sys.argv[1:]):
@@ -456,4 +456,4 @@ if __name__ == '__main__':
extract_args("--port", args)
args.append("acl")
- if not testrunner.run(args): sys.exit(1) \ No newline at end of file
+ if not testrunner.run(args): sys.exit(1)
diff --git a/qpid/python/commands/qpid-config b/qpid/python/commands/qpid-config
index bd4aa613bc..6bfa6939f1 100755
--- a/qpid/python/commands/qpid-config
+++ b/qpid/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/qpid/python/commands/qpid-printevents b/qpid/python/commands/qpid-printevents
index 6efd472221..f27eec04f1 100755
--- a/qpid/python/commands/qpid-printevents
+++ b/qpid/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/qpid/python/commands/qpid-queue-stats b/qpid/python/commands/qpid-queue-stats
index c29cab3568..5aa32f9b38 100755
--- a/qpid/python/commands/qpid-queue-stats
+++ b/qpid/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/qpid/python/commands/qpid-route b/qpid/python/commands/qpid-route
index 6fbd11b684..5733c62a27 100755
--- a/qpid/python/commands/qpid-route
+++ b/qpid/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:
diff --git a/qpid/python/qmf/__init__.py b/qpid/python/qmf/__init__.py
new file mode 100644
index 0000000000..31d5a2ef58
--- /dev/null
+++ b/qpid/python/qmf/__init__.py
@@ -0,0 +1,18 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
diff --git a/qpid/python/qpid/qmfconsole.py b/qpid/python/qmf/console.py
index bdd93e6f94..bdd93e6f94 100644
--- a/qpid/python/qpid/qmfconsole.py
+++ b/qpid/python/qmf/console.py
diff --git a/qpid/python/qpid/management.py b/qpid/python/qpid/management.py
index e91eb48517..4a87d2d533 100644
--- a/qpid/python/qpid/management.py
+++ b/qpid/python/qpid/management.py
@@ -18,7 +18,7 @@
#
###############################################################################
-## This file is being obsoleted by qpid/qmfconsole.py
+## This file is being obsoleted by qmf/console.py
###############################################################################
"""
diff --git a/qpid/python/qpid/managementdata.py b/qpid/python/qpid/managementdata.py
index c3e66c29a1..46c746c0f9 100644
--- a/qpid/python/qpid/managementdata.py
+++ b/qpid/python/qpid/managementdata.py
@@ -21,7 +21,7 @@
###############################################################################
-## This file is being obsoleted by qpid/qmfconsole.py
+## This file is being obsoleted by qmf/console.py
###############################################################################
import qpid
diff --git a/qpid/python/qpid/testlib.py b/qpid/python/qpid/testlib.py
index 53723148b7..18ef030ec0 100644
--- a/qpid/python/qpid/testlib.py
+++ b/qpid/python/qpid/testlib.py
@@ -22,7 +22,7 @@
#
import sys, re, unittest, os, random, logging, traceback
-import qpid.client, qpid.spec, qpid.qmfconsole
+import qpid.client, qpid.spec, qmf.console
import Queue
from fnmatch import fnmatch
from getopt import getopt, GetoptError
@@ -364,7 +364,7 @@ class TestBase010(unittest.TestCase):
self.qmf = None
def startQmf(self):
- self.qmf = qpid.qmfconsole.Session()
+ self.qmf = qmf.console.Session()
self.qmf_broker = self.qmf.addBroker(str(testrunner.url))
def connect(self, host=None, port=None):
View Lorry Controller Status