QPID-2261: resync with updated Connection api.

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

9 files changed, 107 insertions, 265 deletions

diff --git a/qpid/extras/qmf/src/py/qmf2/tests/agent_discovery.py b/qpid/extras/qmf/src/py/qmf2/tests/agent_discovery.py
index 0e5e595695..2c20794aaa 100644
--- a/qpid/extras/qmf/src/py/qmf2/tests/agent_discovery.py
+++ b/qpid/extras/qmf/src/py/qmf2/tests/agent_discovery.py
@@ -76,11 +76,9 @@ class _agentApp(Thread):
     def run(self):
         # Connect the agent to the broker,
         # broker_url = "user/passwd@hostname:port"
-        conn = qpid.messaging.Connection(self.broker_url.host,
-                                         self.broker_url.port,
-                                         self.broker_url.user,
-                                         self.broker_url.password)
-        conn.connect()
+        
+        conn = qpid.messaging.Connection(self.broker_url)
+        conn.open()
         self.agent.set_connection(conn)
         self.ready.set()
 
@@ -129,11 +127,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
         self.console.enable_agent_discovery()
 
@@ -172,11 +167,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         query = qmf2.common.QmfQuery.create_predicate(
@@ -218,11 +210,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=2)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
         self.console.enable_agent_discovery()
 
@@ -311,11 +300,8 @@ class BaseTest(unittest.TestCase):
         """
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         agent1 = self.console.find_agent("agent1", timeout=3)
@@ -344,11 +330,8 @@ class BaseTest(unittest.TestCase):
             console = qmf2.console.Console("test-console-" + str(i),
                                            notifier=_testNotifier(),
                                            agent_timeout=2)
-            conn = qpid.messaging.Connection(self.broker.host,
-                                             self.broker.port,
-                                             self.broker.user,
-                                             self.broker.password)
-            conn.connect()
+            conn = qpid.messaging.Connection(self.broker)
+            conn.open()
             console.add_connection(conn)
             console.enable_agent_discovery()
             self.consoles.append(console)
@@ -448,11 +431,8 @@ class BaseTest(unittest.TestCase):
             console = qmf2.console.Console("test-console-" + str(i),
                                            notifier=_testNotifier(),
                                            agent_timeout=2)
-            conn = qpid.messaging.Connection(self.broker.host,
-                                             self.broker.port,
-                                             self.broker.user,
-                                             self.broker.password)
-            conn.connect()
+            conn = qpid.messaging.Connection(self.broker)
+            conn.open()
             console.add_connection(conn)
             self.consoles.append(console)
 
diff --git a/qpid/extras/qmf/src/py/qmf2/tests/async_method.py b/qpid/extras/qmf/src/py/qmf2/tests/async_method.py
index 965a254f26..2339fc71a9 100644
--- a/qpid/extras/qmf/src/py/qmf2/tests/async_method.py
+++ b/qpid/extras/qmf/src/py/qmf2/tests/async_method.py
@@ -131,11 +131,8 @@ class _agentApp(Thread):
 
     def run(self):
         # broker_url = "user/passwd@hostname:port"
-        self.conn = qpid.messaging.Connection(self.broker_url.host,
-                                              self.broker_url.port,
-                                              self.broker_url.user,
-                                              self.broker_url.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker_url)
+        self.conn.open()
         self.agent.set_connection(self.conn)
         self.ready.set()
 
@@ -251,11 +248,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                             agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         i_count = 0
@@ -312,11 +306,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         i_count = 0
diff --git a/qpid/extras/qmf/src/py/qmf2/tests/async_query.py b/qpid/extras/qmf/src/py/qmf2/tests/async_query.py
index 7c7b22fdaf..b1c01611f7 100644
--- a/qpid/extras/qmf/src/py/qmf2/tests/async_query.py
+++ b/qpid/extras/qmf/src/py/qmf2/tests/async_query.py
@@ -162,11 +162,8 @@ class _agentApp(Thread):
 
     def run(self):
         # broker_url = "user/passwd@hostname:port"
-        self.conn = qpid.messaging.Connection(self.broker_url.host,
-                                              self.broker_url.port,
-                                              self.broker_url.user,
-                                              self.broker_url.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker_url)
+        self.conn.open()
         self.agent.set_connection(self.conn)
         self.ready.set()
 
@@ -214,11 +211,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         for aname in ["agent1", "agent2"]:
@@ -261,11 +255,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         for aname in ["agent1", "agent2"]:
@@ -306,11 +297,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         for aname in ["agent1", "agent2"]:
@@ -354,11 +342,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         # test internal state using non-api calls:
@@ -413,11 +398,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=30)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         # find the agents
diff --git a/qpid/extras/qmf/src/py/qmf2/tests/basic_method.py b/qpid/extras/qmf/src/py/qmf2/tests/basic_method.py
index 22accb7cfc..8d038bc4c8 100644
--- a/qpid/extras/qmf/src/py/qmf2/tests/basic_method.py
+++ b/qpid/extras/qmf/src/py/qmf2/tests/basic_method.py
@@ -128,11 +128,8 @@ class _agentApp(Thread):
 
     def run(self):
         # broker_url = "user/passwd@hostname:port"
-        self.conn = qpid.messaging.Connection(self.broker_url.host,
-                                              self.broker_url.port,
-                                              self.broker_url.user,
-                                              self.broker_url.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker_url)
+        self.conn.open()
         self.agent.set_connection(self.conn)
         self.ready.set()
 
@@ -242,11 +239,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                             agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         for aname in ["agent1", "agent2"]:
@@ -293,11 +287,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         for aname in ["agent1", "agent2"]:
@@ -341,11 +332,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         for aname in ["agent1", "agent2"]:
@@ -375,11 +363,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         for aname in ["agent1", "agent2"]:
diff --git a/qpid/extras/qmf/src/py/qmf2/tests/basic_query.py b/qpid/extras/qmf/src/py/qmf2/tests/basic_query.py
index be67c36d87..9f5dda6d54 100644
--- a/qpid/extras/qmf/src/py/qmf2/tests/basic_query.py
+++ b/qpid/extras/qmf/src/py/qmf2/tests/basic_query.py
@@ -162,11 +162,8 @@ class _agentApp(Thread):
 
     def run(self):
         # broker_url = "user/passwd@hostname:port"
-        self.conn = qpid.messaging.Connection(self.broker_url.host,
-                                              self.broker_url.port,
-                                              self.broker_url.user,
-                                              self.broker_url.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker_url)
+        self.conn.open()
         self.agent.set_connection(self.conn)
         self.ready.set()
 
@@ -216,11 +213,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         for aname in ["agent1", "agent2"]:
@@ -272,11 +266,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         for aname in ["agent1", "agent2"]:
@@ -327,11 +318,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         for aname in ["agent1", "agent2"]:
@@ -355,11 +343,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         for aname in ["agent1", "agent2"]:
@@ -389,11 +374,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         for aname in ["agent1", "agent2"]:
@@ -419,11 +401,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         for aname in ["agent1", "agent2"]:
@@ -463,11 +442,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         for aname in ["agent1", "agent2"]:
diff --git a/qpid/extras/qmf/src/py/qmf2/tests/events.py b/qpid/extras/qmf/src/py/qmf2/tests/events.py
index bc6465f25b..624c9b3823 100644
--- a/qpid/extras/qmf/src/py/qmf2/tests/events.py
+++ b/qpid/extras/qmf/src/py/qmf2/tests/events.py
@@ -95,12 +95,9 @@ class _agentApp(Thread):
 
     def run(self):
         # broker_url = "user/passwd@hostname:port"
-        conn = qpid.messaging.Connection(self.broker_url.host,
-                                         self.broker_url.port,
-                                         self.broker_url.user,
-                                         self.broker_url.password)
+        conn = qpid.messaging.Connection(self.broker_url)
         try:
-            conn.connect()
+            conn.open()
         except qpid.messaging.ConnectError, e:
             raise Skipped(e)
 
@@ -157,12 +154,9 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                             agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
+        self.conn = qpid.messaging.Connection(self.broker)
         try:
-            self.conn.connect()
+            self.conn.open()
         except qpid.messaging.ConnectError, e:
             raise Skipped(e)
 
diff --git a/qpid/extras/qmf/src/py/qmf2/tests/multi_response.py b/qpid/extras/qmf/src/py/qmf2/tests/multi_response.py
index 7c24435e79..991fa0114e 100644
--- a/qpid/extras/qmf/src/py/qmf2/tests/multi_response.py
+++ b/qpid/extras/qmf/src/py/qmf2/tests/multi_response.py
@@ -123,11 +123,8 @@ class _agentApp(Thread):
 
     def run(self):
         # broker_url = "user/passwd@hostname:port"
-        self.conn = qpid.messaging.Connection(self.broker_url.host,
-                                              self.broker_url.port,
-                                              self.broker_url.user,
-                                              self.broker_url.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker_url)
+        self.conn.open()
         self.agent.set_connection(self.conn)
         self.ready.set()
 
@@ -176,11 +173,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         for agent_app in self.agents:
@@ -206,11 +200,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         for agent_app in self.agents:
@@ -235,11 +226,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         for agent_app in self.agents:
@@ -268,11 +256,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         for agent_app in self.agents:
diff --git a/qpid/extras/qmf/src/py/qmf2/tests/obj_gets.py b/qpid/extras/qmf/src/py/qmf2/tests/obj_gets.py
index 466457d670..695b096973 100644
--- a/qpid/extras/qmf/src/py/qmf2/tests/obj_gets.py
+++ b/qpid/extras/qmf/src/py/qmf2/tests/obj_gets.py
@@ -164,11 +164,8 @@ class _agentApp(Thread):
 
     def run(self):
         # broker_url = "user/passwd@hostname:port"
-        self.conn = qpid.messaging.Connection(self.broker_url.host,
-                                              self.broker_url.port,
-                                              self.broker_url.user,
-                                              self.broker_url.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker_url)
+        self.conn.open()
         self.agent.set_connection(self.conn)
         self.ready.set()
 
@@ -216,11 +213,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         for agent_app in self.agents:
@@ -285,11 +279,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         agent_list = []
@@ -357,11 +348,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         agent_list = []
@@ -432,11 +420,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         for agent_app in self.agents:
@@ -531,11 +516,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         for agent_app in self.agents:
diff --git a/qpid/extras/qmf/src/py/qmf2/tests/subscriptions.py b/qpid/extras/qmf/src/py/qmf2/tests/subscriptions.py
index 1f8a31dc22..5c39af4b32 100644
--- a/qpid/extras/qmf/src/py/qmf2/tests/subscriptions.py
+++ b/qpid/extras/qmf/src/py/qmf2/tests/subscriptions.py
@@ -182,11 +182,8 @@ class _agentApp(Thread):
 
     def run(self):
         # broker_url = "user/passwd@hostname:port"
-        self.conn = qpid.messaging.Connection(self.broker_url.host,
-                                              self.broker_url.port,
-                                              self.broker_url.user,
-                                              self.broker_url.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker_url)
+        self.conn.open()
         self.agent.set_connection(self.conn)
         self.ready.set()
 
@@ -234,11 +231,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         subscriptions = []
@@ -310,11 +304,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         subscriptions = []
@@ -378,11 +369,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         subscriptions = []
@@ -451,11 +439,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         # query to match object "p1c1_key2" in schema package1/class1
@@ -526,11 +511,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         # query to match object "p1c1_key2" in schema package1/class1
@@ -597,11 +579,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         # query to match object "p2c1_key2" in schema package2/class1
@@ -666,11 +645,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         # query to match object "p1c1_key2" in schema package1/class1
@@ -752,11 +728,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         # query to match object "p1c1_key2" in schema package1/class1
@@ -836,11 +809,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         subscriptions = []
@@ -931,11 +901,8 @@ class BaseTest(unittest.TestCase):
         self.notifier = _testNotifier()
         self.console = qmf2.console.Console(notifier=self.notifier,
                                               agent_timeout=3)
-        self.conn = qpid.messaging.Connection(self.broker.host,
-                                              self.broker.port,
-                                              self.broker.user,
-                                              self.broker.password)
-        self.conn.connect()
+        self.conn = qpid.messaging.Connection(self.broker)
+        self.conn.open()
         self.console.add_connection(self.conn)
 
         subscriptions = []