You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2016/05/04 11:38:56 UTC
qpid-dispatch git commit: DISPATCH-300 - Added file missing from the
previous commit.
Repository: qpid-dispatch
Updated Branches:
refs/heads/master 7e5a04330 -> 134115b73
DISPATCH-300 - Added file missing from the previous commit.
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/134115b7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/134115b7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/134115b7
Branch: refs/heads/master
Commit: 134115b732beee7d0c026ca5c7c98d68ae3c0e81
Parents: 7e5a043
Author: Ted Ross <tr...@redhat.com>
Authored: Wed May 4 07:38:28 2016 -0400
Committer: Ted Ross <tr...@redhat.com>
Committed: Wed May 4 07:38:28 2016 -0400
----------------------------------------------------------------------
tests/system_tests_deprecated.py | 134 ++++++++++++++++++++++++++++++++++
1 file changed, 134 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/134115b7/tests/system_tests_deprecated.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_deprecated.py b/tests/system_tests_deprecated.py
new file mode 100644
index 0000000..f10b1d5
--- /dev/null
+++ b/tests/system_tests_deprecated.py
@@ -0,0 +1,134 @@
+#
+# 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.
+#
+
+import unittest, os
+from system_test import TestCase, Qdrouterd, TIMEOUT
+from system_tests_sasl_plain import RouterTestPlainSaslCommon
+from qpid_dispatch.management.client import Node
+
+class RouterTestDeprecated(RouterTestPlainSaslCommon):
+
+ @classmethod
+ def setUpClass(cls):
+ """
+ Creates two routers (QDR.X and QDR.Y) and sets up PLAIN authentication on QDR.X.
+ QDR.Y connects to QDR.X by providing a sasl_username and a sasl_password.
+
+ """
+ super(RouterTestDeprecated, cls).setUpClass()
+
+ super(RouterTestDeprecated, cls).createSaslFiles()
+
+ cls.routers = []
+
+ x_listener_port = cls.tester.get_port()
+ y_listener_port = cls.tester.get_port()
+
+ super(RouterTestDeprecated, cls).router('X', [
+ ('listener', {'addr': '0.0.0.0', 'role': 'inter-router', 'port': x_listener_port,
+ 'saslMechanisms':'PLAIN', 'authenticatePeer': 'yes'}),
+ # This unauthenticated listener is for qdstat to connect to it.
+ ('listener', {'addr': '0.0.0.0', 'role': 'normal', 'port': cls.tester.get_port(),
+ 'authenticatePeer': 'no'}),
+ ('container', {'workerThreads': 1,
+ 'containerName': 'Qpid.Dispatch.Router.A',
+ 'saslConfigName': 'tests-mech-PLAIN',
+ 'saslConfigPath': os.getcwd()}),
+ ('linkRoutePattern', {'prefix': 'org.apache'}),
+ ('router', {'routerId': 'QDR.X', 'mode': 'interior'}),
+ ])
+
+ super(RouterTestDeprecated, cls).router('Y', [
+ ('connector', {'addr': '0.0.0.0', 'role': 'inter-router',
+ 'port': x_listener_port,
+ 'saslMechanisms': 'PLAIN',
+ 'saslUsername': 'test@domain.com',
+ 'saslPassword': 'password'}),
+
+ ('router', {'mode': 'interior',
+ 'routerId': 'QDR.Y'}),
+ ('linkRoutePattern', {'prefix': 'org.apache'}),
+ ('container', {'workerThreads': 1,
+ 'containerName': 'Qpid.Dispatch.Router.Y'}),
+
+ ('listener', {'addr': '0.0.0.0',
+ 'role': 'normal',
+ 'port': y_listener_port}),
+ ])
+
+ cls.routers[1].wait_router_connected('QDR.X')
+
+ def test_deprecated(self):
+ """
+ Tests deprecated attributes like linkRoutePattern, container, fixedAddress etc.
+ This test makes executes a query for type='org.apache.qpid.dispatch.connection' over
+ an unauthenticated listener to
+ QDR.X and makes sure that the output has an "inter-router" connection to
+ QDR.Y whose authentication is PLAIN. This ensures that QDR.Y did not
+ somehow use SASL ANONYMOUS to connect to QDR.X
+ Also makes sure that TLSv1/SSLv3 was used as sslProto
+
+ """
+ local_node = Node.connect(self.routers[0].addresses[1], timeout=TIMEOUT)
+
+ # saslConfigName and saslConfigPath were set in the ContainerEntity. This tests makes sure that the
+ # saslConfigName and saslConfigPath were loaded properly from the ContainerEntity.
+ # ContainerEntity has been deprecated.
+
+ # role should be inter-router
+ self.assertEqual(u'inter-router', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][9])
+
+ # sasl must be plain
+ self.assertEqual(u'PLAIN', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][12])
+
+ # user must be test@domain.com
+ self.assertEqual(u'test@domain.com', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][16])
+
+ # Make sure that the deprecated linkRoutePattern is set up correctly
+ query_response = local_node.query(type='org.apache.qpid.dispatch.router.config.linkRoute')
+
+ self.assertEqual(2, len(query_response.results))
+ self.assertEqual("in", query_response.results[0][7])
+ self.assertEqual("out", query_response.results[1][7])
+
+ results = local_node.query(type='org.apache.qpid.dispatch.router.config.address').results
+
+ multicast_found = False
+ spread_found = False
+ closest_found = False
+
+ for result in results:
+ if result[3] == 'closest':
+ closest_found = True
+ self.assertEqual(result[4], 'closest')
+ if result[3] == 'spread':
+ spread_found = True
+ self.assertEqual(result[4], 'balanced')
+ if result[3] == 'multicast':
+ multicast_found = True
+ self.assertEqual(result[4], 'multicast')
+
+ self.assertTrue(multicast_found)
+ self.assertTrue(spread_found)
+ self.assertTrue(closest_found)
+
+
+
+
+
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org