You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2016/06/22 15:51:52 UTC
qpid-dispatch git commit: DISPATCH-402: Remove deprecated
hyphen-separated config/entity names
Repository: qpid-dispatch
Updated Branches:
refs/heads/master 5276cac13 -> b5ca35fc7
DISPATCH-402: Remove deprecated hyphen-separated config/entity names
Removed from documentation, tests and schema/config files.
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/b5ca35fc
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/b5ca35fc
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/b5ca35fc
Branch: refs/heads/master
Commit: b5ca35fc770262850cec2b7bd134a667fd713fff
Parents: 5276cac
Author: Alan Conway <ac...@redhat.com>
Authored: Wed Jun 22 11:37:43 2016 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Wed Jun 22 11:45:13 2016 -0400
----------------------------------------------------------------------
console/hawtio/README.md | 2 +-
doc/book/auto_links.rst | 6 +-
doc/book/link_routing.rst | 2 +-
doc/man/qdrouterd_conf_man.py | 4 +-
.../qpid_dispatch_internal/management/config.py | 2 +-
.../qpid_dispatch_internal/management/schema.py | 4 +-
tests/config-2/A-ssl.conf.in | 26 ++--
tests/config-2/B-ssl.conf.in | 16 +--
tests/management/entity.py | 4 +-
tests/management/qdrouter.py | 8 +-
tests/system_tests_broker.py | 6 +-
tests/system_tests_one_router.py | 140 +++++++++----------
tests/system_tests_qdmanage.py | 10 +-
tests/system_tests_qdstat.py | 28 ++--
tests/system_tests_sasl_plain.py | 42 +++---
tests/system_tests_two_routers.py | 12 +-
tests/system_tests_user_id.py | 72 +++++-----
17 files changed, 192 insertions(+), 192 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b5ca35fc/console/hawtio/README.md
----------------------------------------------------------------------
diff --git a/console/hawtio/README.md b/console/hawtio/README.md
index e5d427b..f501ecb 100644
--- a/console/hawtio/README.md
+++ b/console/hawtio/README.md
@@ -51,7 +51,7 @@ In the above, websockify is listening for ws traffic on port 5673 and will proxy
role: normal
host: 0.0.0.0
port: 20009
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
#### Automatically running a proxy with a router
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b5ca35fc/doc/book/auto_links.rst
----------------------------------------------------------------------
diff --git a/doc/book/auto_links.rst b/doc/book/auto_links.rst
index 822cbdd..5cbb416 100644
--- a/doc/book/auto_links.rst
+++ b/doc/book/auto_links.rst
@@ -50,7 +50,7 @@ through a pair of queues on a broker:
role: route-container
host: <hostname>
port: <port>
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
address {
@@ -190,7 +190,7 @@ multiple brokers share the message-queueing load.
role: route-container
host: <hostname>
port: <port>
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
connector {
@@ -198,7 +198,7 @@ multiple brokers share the message-queueing load.
role: route-container
host: <hostname>
port: <port>
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
address {
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b5ca35fc/doc/book/link_routing.rst
----------------------------------------------------------------------
diff --git a/doc/book/link_routing.rst b/doc/book/link_routing.rst
index f9a023e..d6fe8b0 100644
--- a/doc/book/link_routing.rst
+++ b/doc/book/link_routing.rst
@@ -99,7 +99,7 @@ broker B2:
role: route-container
host: <B2-url>
port: <B2-port>
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
This *route-container* connector tells the router how to connect to an
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b5ca35fc/doc/man/qdrouterd_conf_man.py
----------------------------------------------------------------------
diff --git a/doc/man/qdrouterd_conf_man.py b/doc/man/qdrouterd_conf_man.py
index 25302ae..0bbd7f4 100644
--- a/doc/man/qdrouterd_conf_man.py
+++ b/doc/man/qdrouterd_conf_man.py
@@ -142,14 +142,14 @@ attribute of 'sslProfile' sections.
::
sslProfile {
- name: ssl-profile-one
+ name: my-ssl
certDb: ca-certificate-1.pem
certFile: server-certificate-1.pem
keyFile: server-private-key.pem
}
listener {
- sslProfile: ssl-profile-one
+ sslProfile: my-ssl
host: 0.0.0.0
port: 20102
saslMechanisms: ANONYMOUS
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b5ca35fc/python/qpid_dispatch_internal/management/config.py
----------------------------------------------------------------------
diff --git a/python/qpid_dispatch_internal/management/config.py b/python/qpid_dispatch_internal/management/config.py
index c95d1f3..881def8 100644
--- a/python/qpid_dispatch_internal/management/config.py
+++ b/python/qpid_dispatch_internal/management/config.py
@@ -88,7 +88,7 @@ class Config(object):
"""
Find annotation sections (defined by schema) in the content,
expand references and remove the annotation sections.
- @param content: ((section-name:{name:value...}))
+ @param content: ((sectionName:{name:value...}))
"""
def _expand_section(section, annotations):
"""Expand one section"""
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b5ca35fc/python/qpid_dispatch_internal/management/schema.py
----------------------------------------------------------------------
diff --git a/python/qpid_dispatch_internal/management/schema.py b/python/qpid_dispatch_internal/management/schema.py
index 82bbdf2..d133cfb 100644
--- a/python/qpid_dispatch_internal/management/schema.py
+++ b/python/qpid_dispatch_internal/management/schema.py
@@ -501,8 +501,8 @@ class Schema(object):
def __init__(self, prefix="", annotations=None, entityTypes=None, description=""):
"""
@param prefix: Prefix for entity names.
- @param annotations: Map of { annotation-name: {attribute-name:value, ... }}
- @param entity_types: Map of { entity-type-name: { singleton:, annotation:[...], attributes:{...}}}
+ @param annotations: Map of { annotationName: {attributeName: value, ... }}
+ @param entity_types: Map of { entityTypeName: { singleton:, annotation:[...], attributes:{...}}}
@param description: Human readable description.
"""
if prefix:
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b5ca35fc/tests/config-2/A-ssl.conf.in
----------------------------------------------------------------------
diff --git a/tests/config-2/A-ssl.conf.in b/tests/config-2/A-ssl.conf.in
index 97a04ea..495da40 100644
--- a/tests/config-2/A-ssl.conf.in
+++ b/tests/config-2/A-ssl.conf.in
@@ -25,14 +25,14 @@
router {
mode: interior
- router-id: QDR.A
+ routerId: QDR.A
}
-ssl-profile {
- name: ssl-profile-name
- cert-db: ${QPID_DISPATCH_HOME_INSTALLED}/tests/config-2/ca-certificate.pem
- cert-file: ${QPID_DISPATCH_HOME_INSTALLED}/tests/config-2/server-certificate.pem
- key-file: ${QPID_DISPATCH_HOME_INSTALLED}/tests/config-2/server-private-key.pem
+sslProfile {
+ name: test-ssl
+ certDb: ${QPID_DISPATCH_HOME_INSTALLED}/tests/config-2/ca-certificate.pem
+ certFile: ${QPID_DISPATCH_HOME_INSTALLED}/tests/config-2/server-certificate.pem
+ keyFile: ${QPID_DISPATCH_HOME_INSTALLED}/tests/config-2/server-private-key.pem
password: server-password
}
@@ -42,36 +42,36 @@ ssl-profile {
listener {
host: 0.0.0.0
port: 20100
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
listener {
role: inter-router
host: 0.0.0.0
port: 20102
- sasl-mechanisms: EXTERNAL
- ssl-profile: ssl-profile-name
+ saslMechanisms: EXTERNAL
+ sslProfile: test-ssl
requirePeerAuth: yes
}
-fixed-address {
+fixedAddress {
prefix: /closest/
fanout: single
bias: closest
}
-fixed-address {
+fixedAddress {
prefix: /spread/
fanout: single
bias: spread
}
-fixed-address {
+fixedAddress {
prefix: /multicast/
fanout: multiple
}
-fixed-address {
+fixedAddress {
prefix: /
fanout: multiple
}
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b5ca35fc/tests/config-2/B-ssl.conf.in
----------------------------------------------------------------------
diff --git a/tests/config-2/B-ssl.conf.in b/tests/config-2/B-ssl.conf.in
index f372359..6abd0a4 100644
--- a/tests/config-2/B-ssl.conf.in
+++ b/tests/config-2/B-ssl.conf.in
@@ -19,15 +19,15 @@
router {
mode: interior
- router-id: QDR.B
+ routerId: QDR.B
}
ssl-profile {
- name: ssl-profile-name
- cert-db: ${QPID_DISPATCH_HOME_INSTALLED}/tests/config-2/ca-certificate.pem
- cert-file: ${QPID_DISPATCH_HOME_INSTALLED}/tests/config-2/client-certificate.pem
- key-file: ${QPID_DISPATCH_HOME_INSTALLED}/tests/config-2/client-private-key.pem
+ name: test-ssl
+ certDb: ${QPID_DISPATCH_HOME_INSTALLED}/tests/config-2/ca-certificate.pem
+ certFile: ${QPID_DISPATCH_HOME_INSTALLED}/tests/config-2/client-certificate.pem
+ keyFile: ${QPID_DISPATCH_HOME_INSTALLED}/tests/config-2/client-private-key.pem
password: client-password
}
@@ -37,15 +37,15 @@ ssl-profile {
listener {
host: 0.0.0.0
port: 20101
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
connector {
role: inter-router
host: 0.0.0.0
port: 20102
- sasl-mechanisms: EXTERNAL
- ssl-profile: ssl-profile-name
+ saslMechanisms: EXTERNAL
+ sslProfile: test-ssl
}
fixed-address {
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b5ca35fc/tests/management/entity.py
----------------------------------------------------------------------
diff --git a/tests/management/entity.py b/tests/management/entity.py
index 91837a3..b5939b0 100644
--- a/tests/management/entity.py
+++ b/tests/management/entity.py
@@ -36,8 +36,8 @@ class EntityTest(unittest.TestCase):
self.assertEqual('FooBar', camelcase('fooBar', capital=True))
def test_entity(self):
- e = EntityBase({'foo-bar': 'baz'}, type='container', name='x')
- self.assertEqual(e.attributes, {'type': 'container', 'name':'x', 'foo-bar': 'baz'})
+ e = EntityBase({'fooBar': 'baz'}, type='container', name='x')
+ self.assertEqual(e.attributes, {'type': 'container', 'name':'x', 'fooBar': 'baz'})
self.assertEqual(e.name, 'x')
self.assertEqual(e['name'], 'x')
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b5ca35fc/tests/management/qdrouter.py
----------------------------------------------------------------------
diff --git a/tests/management/qdrouter.py b/tests/management/qdrouter.py
index 6ae3ba7..b6285b4 100644
--- a/tests/management/qdrouter.py
+++ b/tests/management/qdrouter.py
@@ -35,16 +35,16 @@ ssl-profile {
}
listener {
name: l0
- sasl-mechanisms: ANONYMOUS
- ssl-profile: test-profile
+ saslMechanisms: ANONYMOUS
+ sslProfile: test-profile
}
listener {
identity: l1
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
port: 1234
}
listener {
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
port: 4567
}
"""
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b5ca35fc/tests/system_tests_broker.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_broker.py b/tests/system_tests_broker.py
index a620bd9..c42c465 100644
--- a/tests/system_tests_broker.py
+++ b/tests/system_tests_broker.py
@@ -91,12 +91,12 @@ class DistributedQueueTest(system_test.TestCase): # pylint: disable=too-many-pub
rconf = self.common_router_conf(name, mode='interior')
rconf += [
('listener', {'port':self.get_port(), 'role':'normal'}),
- ('fixed-address', {'prefix':self.testq, 'phase':0, 'fanout':'single', 'bias':'spread'}),
- ('fixed-address', {'prefix':self.testq, 'phase':1, 'fanout':'single', 'bias':'spread'})]
+ ('fixedAddress', {'prefix':self.testq, 'phase':0, 'fanout':'single', 'bias':'spread'}),
+ ('fixedAddress', {'prefix':self.testq, 'phase':1, 'fanout':'single', 'bias':'spread'})]
for q in self.qpidds:
rconf += [
('connector', {'name':q.name, 'port':q.port}),
- ('waypoint', {'address':self.testq, 'out-phase':1, 'in-phase':0, 'connector':q.name})]
+ ('waypoint', {'address':self.testq, 'outPhase':1, 'inPhase':0, 'connector':q.name})]
return self.qdrouterd(name, rconf, wait=False)
routers = [router(i) for i in xrange(len(self.qpidds))]
for r in routers: r.wait_ready()
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b5ca35fc/tests/system_tests_one_router.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_one_router.py b/tests/system_tests_one_router.py
index 26a4926..ee11f46 100644
--- a/tests/system_tests_one_router.py
+++ b/tests/system_tests_one_router.py
@@ -36,19 +36,19 @@ class RouterTest(TestCase):
name = "test-router"
config = Qdrouterd.Config([
('router', {'mode': 'standalone', 'id': 'QDR'}),
-
+
# Setting the stripAnnotations to 'no' so that the existing tests will work.
# Setting stripAnnotations to no will not strip the annotations and any tests that were already in this file
# that were expecting the annotations to not be stripped will continue working.
('listener', {'port': cls.tester.get_port(), 'maxFrameSize': '2048', 'stripAnnotations': 'no'}),
-
+
# The following listeners were exclusively added to test the stripAnnotations attribute in qdrouterd.conf file
# Different listeners will be used to test all allowed values of stripAnnotations ('no', 'both', 'out', 'in')
('listener', {'port': cls.tester.get_port(), 'maxFrameSize': '2048', 'stripAnnotations': 'no'}),
('listener', {'port': cls.tester.get_port(), 'maxFrameSize': '2048', 'stripAnnotations': 'both'}),
('listener', {'port': cls.tester.get_port(), 'maxFrameSize': '2048', 'stripAnnotations': 'out'}),
('listener', {'port': cls.tester.get_port(), 'maxFrameSize': '2048', 'stripAnnotations': 'in'}),
-
+
('address', {'prefix': 'closest', 'distribution': 'closest'}),
('address', {'prefix': 'spread', 'distribution': 'balanced'}),
('address', {'prefix': 'multicast', 'distribution': 'multicast'}),
@@ -458,7 +458,7 @@ class RouterTest(TestCase):
M1.stop()
M2.stop()
-
+
# Tests stripping of ingress and egress annotations.
# There is a property in qdrouter.json called stripAnnotations with possible values of ["in", "out", "both", "no"]
# The default for stripAnnotations is "both" (which means strip annotations on both ingress and egress)
@@ -467,232 +467,232 @@ class RouterTest(TestCase):
# Skipping this test temporarily
def notest_08a_test_strip_message_annotations_no_custom_not_implemented(self):
addr = self.router.addresses[1]+"/strip_message_annotations_no_custom/1"
-
+
M1 = self.messenger()
M2 = self.messenger()
-
+
M1.start()
M2.start()
M2.subscribe(addr)
-
+
ingress_message = Message()
ingress_message.address = addr
ingress_message.body = {'message': 'Hello World!'}
ingress_message_annotations = {}
ingress_message_annotations['custom-annotation'] = '1/Custom_Annotation'
-
-
+
+
ingress_message.annotations = ingress_message_annotations
-
+
M1.put(ingress_message)
M1.send()
-
+
# Receive the message
M2.recv(1)
egress_message = Message()
M2.get(egress_message)
-
+
#Make sure 'Hello World!' is in the message body dict
self.assertEqual('Hello World!', egress_message.body['message'])
-
-
+
+
egress_message_annotations = egress_message.annotations
-
+
self.assertEqual(egress_message_annotations.__class__, dict)
self.assertEqual(egress_message_annotations['custom-annotation'], '1/Custom_Annotation')
self.assertEqual(egress_message_annotations['x-opt-qd.ingress'], '0/QDR')
self.assertEqual(egress_message_annotations['x-opt-qd.trace'], ['0/QDR'])
-
+
M1.stop()
M2.stop()
-
+
#stripAnnotations property is set to "no"
def test_08a_test_strip_message_annotations_no(self):
addr = self.router.addresses[1]+"/strip_message_annotations_no/1"
-
+
M1 = self.messenger()
M2 = self.messenger()
-
+
M1.start()
M2.start()
M2.subscribe(addr)
-
+
ingress_message = Message()
ingress_message.address = addr
ingress_message.body = {'message': 'Hello World!'}
- ingress_message_annotations = {}
-
+ ingress_message_annotations = {}
+
ingress_message.annotations = ingress_message_annotations
-
+
M1.put(ingress_message)
M1.send()
-
+
# Receive the message
M2.recv(1)
egress_message = Message()
M2.get(egress_message)
-
+
#Make sure 'Hello World!' is in the message body dict
self.assertEqual('Hello World!', egress_message.body['message'])
-
-
+
+
egress_message_annotations = egress_message.annotations
-
+
self.assertEqual(egress_message_annotations.__class__, dict)
self.assertEqual(egress_message_annotations['x-opt-qd.ingress'], '0/QDR')
self.assertEqual(egress_message_annotations['x-opt-qd.trace'], ['0/QDR'])
-
+
M1.stop()
M2.stop()
-
+
#stripAnnotations property is set to "no"
def test_08a_test_strip_message_annotations_no_add_trace(self):
addr = self.router.addresses[1]+"/strip_message_annotations_no_add_trace/1"
-
+
M1 = self.messenger()
M2 = self.messenger()
-
+
M1.start()
M2.start()
M2.subscribe(addr)
-
+
ingress_message = Message()
ingress_message.address = addr
ingress_message.body = {'message': 'Hello World!'}
-
+
##
## Pre-existing ingress and trace
##
ingress_message_annotations = {'x-opt-qd.ingress': 'ingress-router', 'x-opt-qd.trace': ['0/QDR.1']}
ingress_message.annotations = ingress_message_annotations
-
+
ingress_message.annotations = ingress_message_annotations
-
+
M1.put(ingress_message)
M1.send()
-
+
# Receive the message
M2.recv(1)
egress_message = Message()
M2.get(egress_message)
-
+
#Make sure 'Hello World!' is in the message body dict
self.assertEqual('Hello World!', egress_message.body['message'])
-
-
+
+
egress_message_annotations = egress_message.annotations
-
+
self.assertEqual(egress_message_annotations.__class__, dict)
self.assertEqual(egress_message_annotations['x-opt-qd.ingress'], 'ingress-router')
self.assertEqual(egress_message_annotations['x-opt-qd.trace'], ['0/QDR.1', '0/QDR'])
-
+
M1.stop()
M2.stop()
-
+
#Dont send any pre-existing ingress or trace annotations. Make sure that there are no outgoing message annotations
#stripAnnotations property is set to "both"
def test_08a_test_strip_message_annotations_both(self):
addr = self.router.addresses[2]+"/strip_message_annotations_both/1"
-
+
M1 = self.messenger()
M2 = self.messenger()
-
+
M1.start()
M2.start()
M2.subscribe(addr)
-
+
ingress_message = Message()
ingress_message.address = addr
ingress_message.body = {'message': 'Hello World!'}
-
+
#Put and send the message
M1.put(ingress_message)
M1.send()
-
+
# Receive the message
M2.recv(1)
egress_message = Message()
M2.get(egress_message)
-
+
self.assertEqual(egress_message.annotations, None)
-
+
M1.stop()
M2.stop()
-
+
#Dont send any pre-existing ingress or trace annotations. Make sure that there are no outgoing message annotations
#stripAnnotations property is set to "out"
def test_08a_test_strip_message_annotations_out(self):
addr = self.router.addresses[3]+"/strip_message_annotations_out/1"
-
+
M1 = self.messenger()
M2 = self.messenger()
-
+
M1.start()
M2.start()
M2.subscribe(addr)
-
+
ingress_message = Message()
ingress_message.address = addr
ingress_message.body = {'message': 'Hello World!'}
-
+
#Put and send the message
M1.put(ingress_message)
M1.send()
-
+
# Receive the message
M2.recv(1)
egress_message = Message()
M2.get(egress_message)
-
+
self.assertEqual(egress_message.annotations, None)
-
+
M1.stop()
M2.stop()
-
+
#Send in pre-existing trace and ingress and annotations and make sure that they are not in the outgoing annotations.
#stripAnnotations property is set to "in"
def test_08a_test_strip_message_annotations_in(self):
addr = self.router.addresses[4]+"/strip_message_annotations_in/1"
-
+
M1 = self.messenger()
M2 = self.messenger()
-
+
M1.start()
M2.start()
M2.subscribe(addr)
-
+
ingress_message = Message()
ingress_message.address = addr
ingress_message.body = {'message': 'Hello World!'}
-
+
##
## Pre-existing ingress and trace
##
ingress_message_annotations = {'x-opt-qd.ingress': 'ingress-router', 'x-opt-qd.trace': ['0/QDR.1']}
ingress_message.annotations = ingress_message_annotations
-
+
#Put and send the message
M1.put(ingress_message)
M1.send()
-
+
# Receive the message
M2.recv(1)
egress_message = Message()
M2.get(egress_message)
-
+
#Make sure 'Hello World!' is in the message body dict
self.assertEqual('Hello World!', egress_message.body['message'])
-
+
egress_message_annotations = egress_message.annotations
-
+
self.assertEqual(egress_message_annotations.__class__, dict)
self.assertEqual(egress_message_annotations['x-opt-qd.ingress'], '0/QDR')
self.assertEqual(egress_message_annotations['x-opt-qd.trace'], ['0/QDR'])
-
+
M1.stop()
M2.stop()
-
+
def test_09_management(self):
addr = "amqp:/$management"
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b5ca35fc/tests/system_tests_qdmanage.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_qdmanage.py b/tests/system_tests_qdmanage.py
index b8837b3..2c3d4f7 100644
--- a/tests/system_tests_qdmanage.py
+++ b/tests/system_tests_qdmanage.py
@@ -39,14 +39,14 @@ class QdmanageTest(TestCase):
cls.inter_router_port = cls.tester.get_port()
config_1 = Qdrouterd.Config([
('router', {'mode': 'interior', 'id': 'R1'}),
- ('ssl-profile', {'name': 'server-ssl',
- 'cert-db': cls.ssl_file('ca-certificate.pem'),
- 'cert-file': cls.ssl_file('server-certificate.pem'),
- 'key-file': cls.ssl_file('server-private-key.pem'),
+ ('sslProfile', {'name': 'server-ssl',
+ 'certDb': cls.ssl_file('ca-certificate.pem'),
+ 'certFile': cls.ssl_file('server-certificate.pem'),
+ 'keyFile': cls.ssl_file('server-private-key.pem'),
'password': 'server-password'}),
('listener', {'port': cls.tester.get_port()}),
('connector', {'role': 'inter-router', 'port': cls.inter_router_port}),
- ('listener', {'port': cls.tester.get_port(), 'ssl-profile': 'server-ssl'})
+ ('listener', {'port': cls.tester.get_port(), 'sslProfile': 'server-ssl'})
])
config_2 = Qdrouterd.Config([
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b5ca35fc/tests/system_tests_qdstat.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_qdstat.py b/tests/system_tests_qdstat.py
index 057aeb0..b6edfd4 100644
--- a/tests/system_tests_qdstat.py
+++ b/tests/system_tests_qdstat.py
@@ -99,15 +99,15 @@ try:
'saslConfigPath': os.getcwd(),
'workerThreads': 1,
'saslConfigName': 'tests-mech-EXTERNAL'}),
- ('ssl-profile', {'name': 'server-ssl',
- 'cert-db': cls.ssl_file('ca-certificate.pem'),
- 'cert-file': cls.ssl_file('server-certificate.pem'),
- 'key-file': cls.ssl_file('server-private-key.pem'),
+ ('sslProfile', {'name': 'server-ssl',
+ 'certDb': cls.ssl_file('ca-certificate.pem'),
+ 'certFile': cls.ssl_file('server-certificate.pem'),
+ 'keyFile': cls.ssl_file('server-private-key.pem'),
'password': 'server-password'}),
('listener', {'port': cls.tester.get_port()}),
- ('listener', {'port': cls.tester.get_port(), 'ssl-profile': 'server-ssl', 'authenticatePeer': 'no', 'requireSsl': 'yes'}),
- ('listener', {'port': cls.tester.get_port(), 'ssl-profile': 'server-ssl', 'authenticatePeer': 'no', 'requireSsl': 'no'}),
- ('listener', {'port': cls.tester.get_port(), 'ssl-profile': 'server-ssl', 'authenticatePeer': 'yes', 'requireSsl': 'yes',
+ ('listener', {'port': cls.tester.get_port(), 'sslProfile': 'server-ssl', 'authenticatePeer': 'no', 'requireSsl': 'yes'}),
+ ('listener', {'port': cls.tester.get_port(), 'sslProfile': 'server-ssl', 'authenticatePeer': 'no', 'requireSsl': 'no'}),
+ ('listener', {'port': cls.tester.get_port(), 'sslProfile': 'server-ssl', 'authenticatePeer': 'yes', 'requireSsl': 'yes',
'saslMechanisms': 'EXTERNAL'})
])
cls.router = cls.tester.qdrouterd('test-router', config)
@@ -246,15 +246,15 @@ try:
'saslConfigPath': os.getcwd(),
'workerThreads': 1,
'saslConfigName': 'tests-mech-NOEXTERNAL'}),
- ('ssl-profile', {'name': 'server-ssl',
- 'cert-db': cls.ssl_file('ca-certificate.pem'),
- 'cert-file': cls.ssl_file('server-certificate.pem'),
- 'key-file': cls.ssl_file('server-private-key.pem'),
+ ('sslProfile', {'name': 'server-ssl',
+ 'certDb': cls.ssl_file('ca-certificate.pem'),
+ 'certFile': cls.ssl_file('server-certificate.pem'),
+ 'keyFile': cls.ssl_file('server-private-key.pem'),
'password': 'server-password'}),
('listener', {'port': cls.tester.get_port()}),
- ('listener', {'port': cls.tester.get_port(), 'ssl-profile': 'server-ssl', 'authenticatePeer': 'no', 'requireSsl': 'yes'}),
- ('listener', {'port': cls.tester.get_port(), 'ssl-profile': 'server-ssl', 'authenticatePeer': 'no', 'requireSsl': 'no'}),
- ('listener', {'port': cls.tester.get_port(), 'ssl-profile': 'server-ssl', 'authenticatePeer': 'yes', 'requireSsl': 'yes',
+ ('listener', {'port': cls.tester.get_port(), 'sslProfile': 'server-ssl', 'authenticatePeer': 'no', 'requireSsl': 'yes'}),
+ ('listener', {'port': cls.tester.get_port(), 'sslProfile': 'server-ssl', 'authenticatePeer': 'no', 'requireSsl': 'no'}),
+ ('listener', {'port': cls.tester.get_port(), 'sslProfile': 'server-ssl', 'authenticatePeer': 'yes', 'requireSsl': 'yes',
'saslMechanisms': 'EXTERNAL'})
])
cls.router = cls.tester.qdrouterd('test-router', config)
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b5ca35fc/tests/system_tests_sasl_plain.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_sasl_plain.py b/tests/system_tests_sasl_plain.py
index bfde8cc..d28d0f1 100644
--- a/tests/system_tests_sasl_plain.py
+++ b/tests/system_tests_sasl_plain.py
@@ -160,9 +160,9 @@ class RouterTestPlainSaslOverSsl(RouterTestPlainSaslCommon):
('listener', {'host': '0.0.0.0', 'role': 'normal', 'port': cls.tester.get_port(),
'authenticatePeer': 'no'}),
('sslProfile', {'name': 'server-ssl-profile',
- 'cert-db': cls.ssl_file('ca-certificate.pem'),
- 'cert-file': cls.ssl_file('server-certificate.pem'),
- 'key-file': cls.ssl_file('server-private-key.pem'),
+ 'certDb': cls.ssl_file('ca-certificate.pem'),
+ 'certFile': cls.ssl_file('server-certificate.pem'),
+ 'keyFile': cls.ssl_file('server-private-key.pem'),
'password': 'server-password'}),
('router', {'workerThreads': 1,
'id': 'QDR.X',
@@ -175,7 +175,7 @@ class RouterTestPlainSaslOverSsl(RouterTestPlainSaslCommon):
# This router will act like a client. First an SSL connection will be established and then
# we will have SASL plain authentication over SSL.
('connector', {'host': '0.0.0.0', 'role': 'inter-router', 'port': x_listener_port,
- 'ssl-profile': 'client-ssl-profile',
+ 'sslProfile': 'client-ssl-profile',
'verifyHostName': 'no',
# Provide a sasl user name and password to connect to QDR.X
'saslMechanisms': 'PLAIN',
@@ -186,9 +186,9 @@ class RouterTestPlainSaslOverSsl(RouterTestPlainSaslCommon):
'id': 'QDR.Y'}),
('listener', {'host': '0.0.0.0', 'role': 'normal', 'port': y_listener_port}),
('sslProfile', {'name': 'client-ssl-profile',
- 'cert-db': cls.ssl_file('ca-certificate.pem'),
- 'cert-file': cls.ssl_file('client-certificate.pem'),
- 'key-file': cls.ssl_file('client-private-key.pem'),
+ 'certDb': cls.ssl_file('ca-certificate.pem'),
+ 'certFile': cls.ssl_file('client-certificate.pem'),
+ 'keyFile': cls.ssl_file('client-private-key.pem'),
'password': 'client-password'}),
])
@@ -250,9 +250,9 @@ class RouterTestVerifyHostNameYes(RouterTestPlainSaslCommon):
('listener', {'addr': '0.0.0.0', 'role': 'normal', 'port': cls.tester.get_port(),
'authenticatePeer': 'no'}),
('sslProfile', {'name': 'server-ssl-profile',
- 'cert-db': cls.ssl_file('ca-certificate.pem'),
- 'cert-file': cls.ssl_file('server-certificate.pem'),
- 'key-file': cls.ssl_file('server-private-key.pem'),
+ 'certDb': cls.ssl_file('ca-certificate.pem'),
+ 'certFile': cls.ssl_file('server-certificate.pem'),
+ 'keyFile': cls.ssl_file('server-private-key.pem'),
'password': 'server-password'}),
('router', {'workerThreads': 1,
'routerId': 'QDR.X',
@@ -263,7 +263,7 @@ class RouterTestVerifyHostNameYes(RouterTestPlainSaslCommon):
super(RouterTestVerifyHostNameYes, cls).router('Y', [
('connector', {'addr': '127.0.0.1', 'role': 'inter-router', 'port': x_listener_port,
- 'ssl-profile': 'client-ssl-profile',
+ 'sslProfile': 'client-ssl-profile',
'verifyHostName': 'yes',
'saslMechanisms': 'PLAIN',
'saslUsername': 'test@domain.com', 'saslPassword': 'password'}),
@@ -272,9 +272,9 @@ class RouterTestVerifyHostNameYes(RouterTestPlainSaslCommon):
'routerId': 'QDR.Y'}),
('listener', {'addr': '0.0.0.0', 'role': 'normal', 'port': y_listener_port}),
('sslProfile', {'name': 'client-ssl-profile',
- 'cert-db': cls.ssl_file('ca-certificate.pem'),
- 'cert-file': cls.ssl_file('client-certificate.pem'),
- 'key-file': cls.ssl_file('client-private-key.pem'),
+ 'certDb': cls.ssl_file('ca-certificate.pem'),
+ 'certFile': cls.ssl_file('client-certificate.pem'),
+ 'keyFile': cls.ssl_file('client-private-key.pem'),
'password': 'client-password'}),
])
@@ -335,9 +335,9 @@ class RouterTestVerifyHostNameNo(RouterTestPlainSaslCommon):
('listener', {'addr': '0.0.0.0', 'role': 'normal', 'port': cls.tester.get_port(),
'authenticatePeer': 'no'}),
('sslProfile', {'name': 'server-ssl-profile',
- 'cert-db': cls.ssl_file('ca-certificate.pem'),
- 'cert-file': cls.ssl_file('server-certificate.pem'),
- 'key-file': cls.ssl_file('server-private-key.pem'),
+ 'certDb': cls.ssl_file('ca-certificate.pem'),
+ 'certFile': cls.ssl_file('server-certificate.pem'),
+ 'keyFile': cls.ssl_file('server-private-key.pem'),
'password': 'server-password'}),
('router', {'workerThreads': 1,
'routerId': 'QDR.X',
@@ -350,7 +350,7 @@ class RouterTestVerifyHostNameNo(RouterTestPlainSaslCommon):
# This router will act like a client. First an SSL connection will be established and then
# we will have SASL plain authentication over SSL.
('connector', {'addr': '127.0.0.1', 'role': 'inter-router', 'port': x_listener_port,
- 'ssl-profile': 'client-ssl-profile',
+ 'sslProfile': 'client-ssl-profile',
# Provide a sasl user name and password to connect to QDR.X
'saslMechanisms': 'PLAIN',
'verifyHostName': 'no',
@@ -360,9 +360,9 @@ class RouterTestVerifyHostNameNo(RouterTestPlainSaslCommon):
'routerId': 'QDR.Y'}),
('listener', {'addr': '0.0.0.0', 'role': 'normal', 'port': y_listener_port}),
('sslProfile', {'name': 'client-ssl-profile',
- 'cert-db': cls.ssl_file('ca-certificate.pem'),
- 'cert-file': cls.ssl_file('client-certificate.pem'),
- 'key-file': cls.ssl_file('client-private-key.pem'),
+ 'certDb': cls.ssl_file('ca-certificate.pem'),
+ 'certFile': cls.ssl_file('client-certificate.pem'),
+ 'keyFile': cls.ssl_file('client-private-key.pem'),
'password': 'client-password'}),
])
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b5ca35fc/tests/system_tests_two_routers.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_two_routers.py b/tests/system_tests_two_routers.py
index 6d268f2..4e81500 100644
--- a/tests/system_tests_two_routers.py
+++ b/tests/system_tests_two_routers.py
@@ -1108,16 +1108,16 @@ try:
@staticmethod
def ssl_config(client_server, connection):
- connection[1]['ssl-profile'] = 'ssl-profile-name'
+ connection[1]['sslProfile'] = 'test-ssl'
def ssl_file(name):
return os.path.join(DIR, 'ssl_certs', name)
return [
- ('ssl-profile', {
- 'name': 'ssl-profile-name',
- 'cert-db': ssl_file('ca-certificate.pem'),
- 'cert-file': ssl_file(client_server+'-certificate.pem'),
- 'key-file': ssl_file(client_server+'-private-key.pem'),
+ ('sslProfile', {
+ 'name': 'test-ssl',
+ 'certDb': ssl_file('ca-certificate.pem'),
+ 'certFile': ssl_file(client_server+'-certificate.pem'),
+ 'keyFile': ssl_file(client_server+'-private-key.pem'),
'password': client_server+'-password'})]
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b5ca35fc/tests/system_tests_user_id.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_user_id.py b/tests/system_tests_user_id.py
index 0537543..8b70470 100644
--- a/tests/system_tests_user_id.py
+++ b/tests/system_tests_user_id.py
@@ -43,97 +43,97 @@ class QdSSLUseridTest(TestCase):
# sha1
('sslProfile', {'name': 'server-ssl1',
- 'cert-db': cls.ssl_file('ca-certificate.pem'),
- 'cert-file': cls.ssl_file('server-certificate.pem'),
- 'key-file': cls.ssl_file('server-private-key.pem'),
+ 'certDb': cls.ssl_file('ca-certificate.pem'),
+ 'certFile': cls.ssl_file('server-certificate.pem'),
+ 'keyFile': cls.ssl_file('server-private-key.pem'),
'uidFormat': '1',
'password': 'server-password'}),
# sha256
('sslProfile', {'name': 'server-ssl2',
- 'cert-db': cls.ssl_file('ca-certificate.pem'),
- 'cert-file': cls.ssl_file('server-certificate.pem'),
- 'key-file': cls.ssl_file('server-private-key.pem'),
+ 'certDb': cls.ssl_file('ca-certificate.pem'),
+ 'certFile': cls.ssl_file('server-certificate.pem'),
+ 'keyFile': cls.ssl_file('server-private-key.pem'),
'uidFormat': '2',
'password': 'server-password'}),
# sha512
('sslProfile', {'name': 'server-ssl3',
- 'cert-db': cls.ssl_file('ca-certificate.pem'),
- 'cert-file': cls.ssl_file('server-certificate.pem'),
- 'key-file': cls.ssl_file('server-private-key.pem'),
+ 'certDb': cls.ssl_file('ca-certificate.pem'),
+ 'certFile': cls.ssl_file('server-certificate.pem'),
+ 'keyFile': cls.ssl_file('server-private-key.pem'),
'uidFormat': '5',
'password': 'server-password'}),
# sha256 combination
('sslProfile', {'name': 'server-ssl4',
- 'cert-db': cls.ssl_file('ca-certificate.pem'),
- 'cert-file': cls.ssl_file('server-certificate.pem'),
- 'key-file': cls.ssl_file('server-private-key.pem'),
+ 'certDb': cls.ssl_file('ca-certificate.pem'),
+ 'certFile': cls.ssl_file('server-certificate.pem'),
+ 'keyFile': cls.ssl_file('server-private-key.pem'),
'uidFormat': '2noucs',
'password': 'server-password'}),
# sha1 combination
('sslProfile', {'name': 'server-ssl5',
- 'cert-db': cls.ssl_file('ca-certificate.pem'),
- 'cert-file': cls.ssl_file('server-certificate.pem'),
- 'key-file': cls.ssl_file('server-private-key.pem'),
+ 'certDb': cls.ssl_file('ca-certificate.pem'),
+ 'certFile': cls.ssl_file('server-certificate.pem'),
+ 'keyFile': cls.ssl_file('server-private-key.pem'),
'uidFormat': '1cs',
'password': 'server-password'}),
# sha512 combination
('sslProfile', {'name': 'server-ssl6',
- 'cert-db': cls.ssl_file('ca-certificate.pem'),
- 'cert-file': cls.ssl_file('server-certificate.pem'),
- 'key-file': cls.ssl_file('server-private-key.pem'),
+ 'certDb': cls.ssl_file('ca-certificate.pem'),
+ 'certFile': cls.ssl_file('server-certificate.pem'),
+ 'keyFile': cls.ssl_file('server-private-key.pem'),
'uidFormat': 'cs5',
'password': 'server-password'}),
# no fingerprint field
('sslProfile', {'name': 'server-ssl7',
- 'cert-db': cls.ssl_file('ca-certificate.pem'),
- 'cert-file': cls.ssl_file('server-certificate.pem'),
- 'key-file': cls.ssl_file('server-private-key.pem'),
+ 'certDb': cls.ssl_file('ca-certificate.pem'),
+ 'certFile': cls.ssl_file('server-certificate.pem'),
+ 'keyFile': cls.ssl_file('server-private-key.pem'),
'uidFormat': 'nsuco',
'password': 'server-password'}),
# no fingerprint field variation
('sslProfile', {'name': 'server-ssl8',
- 'cert-db': cls.ssl_file('ca-certificate.pem'),
- 'cert-file': cls.ssl_file('server-certificate.pem'),
- 'key-file': cls.ssl_file('server-private-key.pem'),
+ 'certDb': cls.ssl_file('ca-certificate.pem'),
+ 'certFile': cls.ssl_file('server-certificate.pem'),
+ 'keyFile': cls.ssl_file('server-private-key.pem'),
'uidFormat': 'scounl',
'password': 'server-password'}),
#no uidFormat
('sslProfile', {'name': 'server-ssl9',
- 'cert-db': cls.ssl_file('ca-certificate.pem'),
- 'cert-file': cls.ssl_file('server-certificate.pem'),
- 'key-file': cls.ssl_file('server-private-key.pem'),
+ 'certDb': cls.ssl_file('ca-certificate.pem'),
+ 'certFile': cls.ssl_file('server-certificate.pem'),
+ 'keyFile': cls.ssl_file('server-private-key.pem'),
'password': 'server-password'}),
# one component of uidFormat is invalid (x), the unrecognized component will be ignored,
# this will be treated like 'uidFormat': '1'
('sslProfile', {'name': 'server-ssl10',
- 'cert-db': cls.ssl_file('ca-certificate.pem'),
- 'cert-file': cls.ssl_file('server-certificate.pem'),
- 'key-file': cls.ssl_file('server-private-key.pem'),
+ 'certDb': cls.ssl_file('ca-certificate.pem'),
+ 'certFile': cls.ssl_file('server-certificate.pem'),
+ 'keyFile': cls.ssl_file('server-private-key.pem'),
'uidFormat': '1x',
'displayNameFile': ssl_profile2_json,
'password': 'server-password'}),
# All components in the uidFormat are unrecognized, pn_get_transport_user will be returned
('sslProfile', {'name': 'server-ssl11',
- 'cert-db': cls.ssl_file('ca-certificate.pem'),
- 'cert-file': cls.ssl_file('server-certificate.pem'),
- 'key-file': cls.ssl_file('server-private-key.pem'),
+ 'certDb': cls.ssl_file('ca-certificate.pem'),
+ 'certFile': cls.ssl_file('server-certificate.pem'),
+ 'keyFile': cls.ssl_file('server-private-key.pem'),
'uidFormat': 'abxd',
'password': 'server-password'}),
('sslProfile', {'name': 'server-ssl12',
- 'cert-db': cls.ssl_file('ca-certificate.pem'),
- 'cert-file': cls.ssl_file('server-certificate.pem'),
- 'key-file': cls.ssl_file('server-private-key.pem'),
+ 'certDb': cls.ssl_file('ca-certificate.pem'),
+ 'certFile': cls.ssl_file('server-certificate.pem'),
+ 'keyFile': cls.ssl_file('server-private-key.pem'),
'uidFormat': '1',
'displayNameFile': ssl_profile1_json,
'password': 'server-password'}),
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org