diff options
| -rw-r--r-- | python/qpid/management.py | 4 | ||||
| -rw-r--r-- | python/qpid/managementdata.py | 5 | ||||
| -rw-r--r-- | python/tests_0-10/management.py | 31 |
3 files changed, 17 insertions, 23 deletions
diff --git a/python/qpid/management.py b/python/qpid/management.py index 485b64b99f..fd60ac22cf 100644 --- a/python/qpid/management.py +++ b/python/qpid/management.py @@ -17,6 +17,10 @@ # under the License. # +############################################################################### +## This file is being obsoleted by qpid/qmfconsole.py +############################################################################### + """ Management API for Qpid """ diff --git a/python/qpid/managementdata.py b/python/qpid/managementdata.py index 2bf66a5e5b..5bceb48b7d 100644 --- a/python/qpid/managementdata.py +++ b/python/qpid/managementdata.py @@ -19,6 +19,11 @@ # under the License. # + +############################################################################### +## This file is being obsoleted by qpid/qmfconsole.py +############################################################################### + import qpid import re import socket diff --git a/python/tests_0-10/management.py b/python/tests_0-10/management.py index efec2b8a92..a47982173b 100644 --- a/python/tests_0-10/management.py +++ b/python/tests_0-10/management.py @@ -72,39 +72,25 @@ class ManagementTest (TestBase010): self.assertEqual (res.body, body) def test_system_object (self): - session = self.session - - mc = managementClient (session.spec) - mch = mc.addChannel (session) - - mc.syncWaitForStable (mch) - systems = mc.syncGetObjects (mch, "system") + self.startQmf() + systems = self.qmf.getObjects(_class="system") self.assertEqual (len (systems), 1) - mc.removeChannel (mch) def test_self_session_id (self): - session = self.session - - mc = managementClient (session.spec) - mch = mc.addChannel (session) + self.startQmf() + sessionId = self.qmf_broker.getSessionId() + brokerSessions = self.qmf.getObjects(_class="session") - info = mc.syncWaitForStable (mch) - brokerSessions = mc.syncGetObjects (mch, "session") found = False for bs in brokerSessions: - if bs.name == info.sessionId: + if bs.name == sessionId: found = True self.assertEqual (found, True) - mc.removeChannel (mch) def test_standard_exchanges (self): - session = self.session - - mc = managementClient (session.spec) - mch = mc.addChannel (session) + self.startQmf() - mc.syncWaitForStable (mch) - exchanges = mc.syncGetObjects (mch, "exchange") + exchanges = self.qmf.getObjects(_class="exchange") exchange = self.findExchange (exchanges, "") self.assertEqual (exchange.type, "direct") exchange = self.findExchange (exchanges, "amq.direct") @@ -117,7 +103,6 @@ class ManagementTest (TestBase010): self.assertEqual (exchange.type, "headers") exchange = self.findExchange (exchanges, "qpid.management") self.assertEqual (exchange.type, "topic") - mc.removeChannel (mch) def findExchange (self, exchanges, name): for exchange in exchanges: |