qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tr...@apache.org
Subject svn commit: r1565393 - in /qpid/dispatch/trunk: tests/ tests/config-2/ tools/
Date Thu, 06 Feb 2014 18:54:39 GMT
Author: tross
Date: Thu Feb  6 18:54:38 2014
New Revision: 1565393

URL: http://svn.apache.org/r1565393
Log:
DISPATCH-24 - Added tests with SSL interconnect
Applied a patch submitted by Irina Boverman

Added:
    qpid/dispatch/trunk/tests/config-2/A-ssl.conf.in
    qpid/dispatch/trunk/tests/config-2/B-ssl.conf.in
    qpid/dispatch/trunk/tests/config-2/ca-certificate.pem
    qpid/dispatch/trunk/tests/config-2/client-certificate.pem
    qpid/dispatch/trunk/tests/config-2/client-private-key.pem
    qpid/dispatch/trunk/tests/config-2/client-request.pem
    qpid/dispatch/trunk/tests/config-2/gencerts.sh   (with props)
    qpid/dispatch/trunk/tests/config-2/server-certificate.pem
    qpid/dispatch/trunk/tests/config-2/server-private-key.pem
    qpid/dispatch/trunk/tests/config-2/server-request.pem
Modified:
    qpid/dispatch/trunk/tests/CMakeLists.txt
    qpid/dispatch/trunk/tests/system_tests_two_routers.py
    qpid/dispatch/trunk/tools/qdtest.in

Modified: qpid/dispatch/trunk/tests/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/CMakeLists.txt?rev=1565393&r1=1565392&r2=1565393&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/CMakeLists.txt (original)
+++ qpid/dispatch/trunk/tests/CMakeLists.txt Thu Feb  6 18:54:38 2014
@@ -55,5 +55,8 @@ add_test(router_tests          python ${
 
 set(SYSTEM_TEST_FILES system_tests_one_router.py system_tests_two_routers.py)
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-2/A-ssl.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/config-2/A-ssl.conf)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-2/B-ssl.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/config-2/B-ssl.conf)
+
 install(FILES ${SYSTEM_TEST_FILES} DESTINATION ${QPID_DISPATCH_HOME}/tests)
 install(DIRECTORY config-1 config-2 DESTINATION ${QPID_DISPATCH_HOME}/tests)

Added: qpid/dispatch/trunk/tests/config-2/A-ssl.conf.in
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-2/A-ssl.conf.in?rev=1565393&view=auto
==============================================================================
--- qpid/dispatch/trunk/tests/config-2/A-ssl.conf.in (added)
+++ qpid/dispatch/trunk/tests/config-2/A-ssl.conf.in Thu Feb  6 18:54:38 2014
@@ -0,0 +1,100 @@
+##
+## 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
+##
+
+
+##
+## Container section - Configures the general operation of the AMQP container.
+##
+container {
+    ##
+    ## worker-threads - The number of threads that will be created to
+    ## process message traffic and other application work (timers, non-amqp
+    ## file descriptors, etc.)
+    ##
+    ## The number of threads should be related to the number of available
+    ## processor cores.  To fully utilize a quad-core system, set the
+    ## number of threads to 4.
+    ##
+    worker-threads: 4
+
+    ##
+    ## container-name - The name of the AMQP container.  If not specified,
+    ## the container name will be set to a value of the container's
+    ## choosing.  The automatically assigned container name is not
+    ## guaranteed to be persistent across restarts of the container.
+    ##
+    container-name: Qpid.Dispatch.Router.A
+}
+
+##
+## SSL Profile section - Zero or more SSL profiles may be defined here and
+## then referenced later in listeners (for incoming connections) or
+## connectors (for outgoing connectors).
+##
+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
+    password: server-password
+}
+
+##
+## Listeners and Connectors
+##
+listener {
+    addr: 0.0.0.0
+    port: 20100
+    sasl-mechanisms: ANONYMOUS
+}
+
+listener {
+    role: inter-router
+    addr: 0.0.0.0
+    port: 20102
+    sasl-mechanisms: ANONYMOUS
+    ssl-profile: ssl-profile-name
+}
+
+router {
+    mode: interior
+    router-id: QDR.A
+}
+
+fixed-address {
+    prefix: /closest/
+    fanout: single
+    bias: closest
+}
+
+fixed-address {
+    prefix: /spread/
+    fanout: single
+    bias: spread
+}
+
+fixed-address {
+    prefix: /multicast/
+    fanout: multiple
+}
+
+fixed-address {
+    prefix: /
+    fanout: multiple
+}

Added: qpid/dispatch/trunk/tests/config-2/B-ssl.conf.in
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-2/B-ssl.conf.in?rev=1565393&view=auto
==============================================================================
--- qpid/dispatch/trunk/tests/config-2/B-ssl.conf.in (added)
+++ qpid/dispatch/trunk/tests/config-2/B-ssl.conf.in Thu Feb  6 18:54:38 2014
@@ -0,0 +1,96 @@
+##
+## 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
+##
+
+
+##
+## Container section - Configures the general operation of the AMQP container.
+##
+container {
+    ##
+    ## worker-threads - The number of threads that will be created to
+    ## process message traffic and other application work (timers, non-amqp
+    ## file descriptors, etc.)
+    ##
+    ## The number of threads should be related to the number of available
+    ## processor cores.  To fully utilize a quad-core system, set the
+    ## number of threads to 4.
+    ##
+    worker-threads: 4
+
+    ##
+    ## container-name - The name of the AMQP container.  If not specified,
+    ## the container name will be set to a value of the container's
+    ## choosing.  The automatically assigned container name is not
+    ## guaranteed to be persistent across restarts of the container.
+    ##
+    container-name: Qpid.Dispatch.Router.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
+    password: client-password
+}
+
+##
+## Listeners and Connectors
+##
+listener {
+    addr: 0.0.0.0
+    port: 20101
+    sasl-mechanisms: ANONYMOUS
+}
+
+connector {
+    label: Router Uplink
+    role: inter-router
+    addr: 0.0.0.0
+    port: 20102
+    sasl-mechanisms: ANONYMOUS
+    ssl-profile: ssl-profile-name
+}
+
+router {
+    mode: interior
+    router-id: QDR.B
+}
+
+fixed-address {
+    prefix: /closest/
+    fanout: single
+    bias: closest
+}
+
+fixed-address {
+    prefix: /spread/
+    fanout: single
+    bias: spread
+}
+
+fixed-address {
+    prefix: /multicast/
+    fanout: multiple
+}
+
+fixed-address {
+    prefix: /
+    fanout: multiple
+}

Added: qpid/dispatch/trunk/tests/config-2/ca-certificate.pem
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-2/ca-certificate.pem?rev=1565393&view=auto
==============================================================================
--- qpid/dispatch/trunk/tests/config-2/ca-certificate.pem (added)
+++ qpid/dispatch/trunk/tests/config-2/ca-certificate.pem Thu Feb  6 18:54:38 2014
@@ -0,0 +1,22 @@
+Bag Attributes
+    friendlyName: ca
+    localKeyID: 54 69 6D 65 20 31 33 39 31 36 34 30 31 39 36 34 32 32 
+subject=/CN=Trusted.CA.com/O=Trust Me Inc.
+issuer=/CN=Trusted.CA.com/O=Trust Me Inc.
+-----BEGIN CERTIFICATE-----
+MIICwTCCAn6gAwIBAgIEcFlE4TALBgcqhkjOOAQDBQAwMTEXMBUGA1UEAxMOVHJ1
+c3RlZC5DQS5jb20xFjAUBgNVBAoTDVRydXN0IE1lIEluYy4wIBcNMTQwMjA1MjI0
+MzE2WhgPMjI4NzExMjAyMjQzMTZaMDExFzAVBgNVBAMTDlRydXN0ZWQuQ0EuY29t
+MRYwFAYDVQQKEw1UcnVzdCBNZSBJbmMuMIIBtzCCASwGByqGSM44BAEwggEfAoGB
+AP1/U4EddRIpUt9KnC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6
+MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E
++4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3RSAHHAhUAl2BQjxUjC8yykrmC
+ouuEC/BYHPUCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeO
+utRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/
+C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoDgYQA
+AoGACZqXNA8S0wsc/wAgn8sXSn64+AbInuOQpRD4KEb95d9NmGDA7W90gpsSt+5S
+wuEZ0hH1bQ74NiIaTzOvxhCtEZbJ5XQJ67/piGsrL+yXrOJHu1YOj/EcWlhrdHON
+40dlSrIUKahpmz56uNP9z1EMnVMwUIde+3ugubYYZq+ktDWjITAfMB0GA1UdDgQW
+BBQBftaA8UJSE2wEdfFtBPcjecQmSzALBgcqhkjOOAQDBQADMAAwLQIVAIISP5bt
+SBn1jkj+rIgWWpCC+6i0AhQ1LaL2L3bkY8ju/hhGsavW82uyFQ==
+-----END CERTIFICATE-----

Added: qpid/dispatch/trunk/tests/config-2/client-certificate.pem
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-2/client-certificate.pem?rev=1565393&view=auto
==============================================================================
--- qpid/dispatch/trunk/tests/config-2/client-certificate.pem (added)
+++ qpid/dispatch/trunk/tests/config-2/client-certificate.pem Thu Feb  6 18:54:38 2014
@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIIC1TCCApOgAwIBAgIEGhjylzALBgcqhkjOOAQDBQAwMTEXMBUGA1UEAxMOVHJ1c3RlZC5DQS5j
+b20xFjAUBgNVBAoTDVRydXN0IE1lIEluYy4wIBcNMTQwMjA1MjI0MzE5WhgPMjI4NzExMjAyMjQz
+MTlaMCUxEjAQBgNVBAMTCTEyNy4wLjAuMTEPMA0GA1UEChMGQ2xpZW50MIIBtzCCASwGByqGSM44
+BAEwggEfAoGBAP1/U4EddRIpUt9KnC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6
+MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1
+VBNaFpEy9nXzrith1yrv8iIDGZ3RSAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUCgYEA9+Gghdab
+Pd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim
+4TwWeotUfI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1Ul
+ZAFMO/7PSSoDgYQAAoGAWrMXTV48Yp/NdQmCA6TNZnrxazk+tOrGUuKEg9Tv7qGvFYDJvsM7eWSg
+cCNbJgvFrMpHqiASN3ViwE2Ww5kygV/YKiPkXoGHSp+BCw1UO7Ns6HOyoAFX0UUjX+aSLNgd/iSc
+Kok60KX1mM+aLpme/Oo8IEAMn0jYDJrhRu2mI/ajQjBAMB8GA1UdIwQYMBaAFAF+1oDxQlITbAR1
+8W0E9yN5xCZLMB0GA1UdDgQWBBQXnZv3U2ET/uyCh5Srzyxs9C+d4DALBgcqhkjOOAQDBQADLwAw
+LAIUJ+3pOXuqFMCP3G1TuOTFnmzi4ugCFBXOYmOH+cXHEavhkbet7w0AaMv3
+-----END CERTIFICATE-----

Added: qpid/dispatch/trunk/tests/config-2/client-private-key.pem
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-2/client-private-key.pem?rev=1565393&view=auto
==============================================================================
--- qpid/dispatch/trunk/tests/config-2/client-private-key.pem (added)
+++ qpid/dispatch/trunk/tests/config-2/client-private-key.pem Thu Feb  6 18:54:38 2014
@@ -0,0 +1,15 @@
+Bag Attributes
+    friendlyName: client-certificate
+    localKeyID: 54 69 6D 65 20 31 33 39 31 36 34 30 31 39 38 31 37 34 
+Key Attributes: <No Attributes>
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIBljBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIhn/gf3lROH8CAggA
+MBQGCCqGSIb3DQMHBAjWlPAFAem+SASCAVCFmWnpKseuht5NSVs3rq1LqGjfaT6/
+hw6ctU33ObAXXnDCGJusSKqA884gWfMUAoebuCbQgOHUmDKFl5OaMmdRoVXcxelc
+rRMpCma/mtc+5uJVRrtmqdD9RsZB0qpjcAxq+cO529RPMO3IfW1KRqTS4Y8ADVpd
+bPSIaqTuEbcGgFBA207y6TocqdlY2CrTVPvPe3U6GAA+Mv/PHYT9f73vePMoGQZz
+WNn1HNZSJ7gd5vJW+3tTzJ8HzVsOsIx7Yw1AL6q+9ZD737zOhHgKfISUcu7mIYeZ
+c6G7tvOFmedf1ukzWp6gQARMJSqja+4oHLu4Sp1m3I0kvdOEpW91Or6d/YdPGGhZ
+hSFZj1RrmwfCia/wRTtq2ImQdDZcKINU2H6+1KomLddWfvus/8/nKyGg2n8lgp1U
+oF4FL+5LVckilbdsPR7Sbqb5WPoAom0mYnw=
+-----END ENCRYPTED PRIVATE KEY-----

Added: qpid/dispatch/trunk/tests/config-2/client-request.pem
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-2/client-request.pem?rev=1565393&view=auto
==============================================================================
--- qpid/dispatch/trunk/tests/config-2/client-request.pem (added)
+++ qpid/dispatch/trunk/tests/config-2/client-request.pem Thu Feb  6 18:54:38 2014
@@ -0,0 +1,13 @@
+-----BEGIN NEW CERTIFICATE REQUEST-----
+MIICWTCCAhcCAQAwJTESMBAGA1UEAxMJMTI3LjAuMC4xMQ8wDQYDVQQKEwZDbGllbnQwggG3MIIB
+LAYHKoZIzjgEATCCAR8CgYEA/X9TgR11EilS30qcLuzk5/YRt1I870QAwx4/gLZRJmlFXUAiUftZ
+PY1Y+r/F9bow9subVWzXgTuAHTRv8mZgt2uZUKWkn5/oBHsQIsJPu6nX/rfGG/g7V+fGqKYVDwT7
+g/bTxR7DAjVUE1oWkTL2dfOuK2HXKu/yIgMZndFIAccCFQCXYFCPFSMLzLKSuYKi64QL8Fgc9QKB
+gQD34aCF1ps93su8q1w2uFe5eZSvu/o66oL5V0wLPQeCZ1FZV4661FlP5nEHEIGAtEkWcSPoTCgW
+E7fPCTKMyKbhPBZ6i1R8jSjgo64eK7OmdZFuo38L+iE1YvH7YnoBJDvMpPG+qFGQiaiD3+Fa5Z8G
+kotmXoB7VSVkAUw7/s9JKgOBhAACgYBasxdNXjxin811CYIDpM1mevFrOT606sZS4oSD1O/uoa8V
+gMm+wzt5ZKBwI1smC8WsykeqIBI3dWLATZbDmTKBX9gqI+RegYdKn4ELDVQ7s2zoc7KgAVfRRSNf
+5pIs2B3+JJwqiTrQpfWYz5oumZ786jwgQAyfSNgMmuFG7aYj9qAwMC4GCSqGSIb3DQEJDjEhMB8w
+HQYDVR0OBBYEFBedm/dTYRP+7IKHlKvPLGz0L53gMAsGByqGSM44BAMFAAMvADAsAhQvcZGKN7xX
+Mog6JC4kvrMBAGs6GwIUR498iseqNL5G6zImo/4eDWN22I4=
+-----END NEW CERTIFICATE REQUEST-----

Added: qpid/dispatch/trunk/tests/config-2/gencerts.sh
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-2/gencerts.sh?rev=1565393&view=auto
==============================================================================
--- qpid/dispatch/trunk/tests/config-2/gencerts.sh (added)
+++ qpid/dispatch/trunk/tests/config-2/gencerts.sh Thu Feb  6 18:54:38 2014
@@ -0,0 +1,20 @@
+#!/bin/bash -ex
+
+#export SERVER=mrg14.lab.bos.redhat.com
+#export CLIENT=mrg38.lab.bos.redhat.com
+
+export SERVER=A1.Good.Server.domain.com
+export CLIENT=127.0.0.1
+
+keytool -storetype pkcs12 -keystore ca.pkcs12 -storepass ca-password -alias ca -keypass ca-password
-genkey -dname "O=Trust Me Inc.,CN=Trusted.CA.com" -validity 99999
+openssl pkcs12 -nokeys -passin pass:ca-password -in ca.pkcs12 -passout pass:ca-password -out
ca-certificate.pem
+
+keytool -storetype pkcs12 -keystore server.pkcs12 -storepass server-password -alias server-certificate
-keypass server-password -genkey  -dname "O=Server,CN=$SERVER" -validity 99999
+keytool -storetype pkcs12 -keystore server.pkcs12 -storepass server-password -alias server-certificate
-keypass server-password -certreq -file server-request.pem
+keytool -storetype pkcs12 -keystore ca.pkcs12 -storepass ca-password -alias ca -keypass ca-password
-gencert -rfc -validity 99999 -infile server-request.pem -outfile server-certificate.pem
+openssl pkcs12 -nocerts -passin pass:server-password -in server.pkcs12 -passout pass:server-password
-out server-private-key.pem
+
+keytool -storetype pkcs12 -keystore client.pkcs12 -storepass client-password -alias client-certificate
-keypass client-password -genkey  -dname "O=Client,CN=$CLIENT" -validity 99999
+keytool -storetype pkcs12 -keystore client.pkcs12 -storepass client-password -alias client-certificate
-keypass client-password -certreq -file client-request.pem
+keytool -storetype pkcs12 -keystore ca.pkcs12 -storepass ca-password -alias ca -keypass ca-password
-gencert -rfc -validity 99999 -infile client-request.pem -outfile client-certificate.pem
+openssl pkcs12 -nocerts -passin pass:client-password -in client.pkcs12 -passout pass:client-password
-out client-private-key.pem

Propchange: qpid/dispatch/trunk/tests/config-2/gencerts.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Added: qpid/dispatch/trunk/tests/config-2/server-certificate.pem
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-2/server-certificate.pem?rev=1565393&view=auto
==============================================================================
--- qpid/dispatch/trunk/tests/config-2/server-certificate.pem (added)
+++ qpid/dispatch/trunk/tests/config-2/server-certificate.pem Thu Feb  6 18:54:38 2014
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIIC5jCCAqSgAwIBAgIEZLqYhDALBgcqhkjOOAQDBQAwMTEXMBUGA1UEAxMOVHJ1c3RlZC5DQS5j
+b20xFjAUBgNVBAoTDVRydXN0IE1lIEluYy4wIBcNMTQwMjA1MjI0MzE3WhgPMjI4NzExMjAyMjQz
+MTdaMDUxIjAgBgNVBAMTGUExLkdvb2QuU2VydmVyLmRvbWFpbi5jb20xDzANBgNVBAoTBlNlcnZl
+cjCCAbgwggEsBgcqhkjOOAQBMIIBHwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEm
+aUVdQCJR+1k9jVj6v8X1ujD2y5tVbNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX
+58aophUPBPuD9tPFHsMCNVQTWhaRMvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLr
+hAvwWBz1AoGBAPfhoIXWmz3ey7yrXDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0
+SRZxI+hMKBYTt88JMozIpuE8FnqLVHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJ
+qIPf4VrlnwaSi2ZegHtVJWQBTDv+z0kqA4GFAAKBgQDwwGpW4EkOztnUpJPceKq2z9Lp5xTjqiyC
+I55S6AGN3Yyiuqnb4MHlavMlLSLuVJHcd0rpC9RtCHfs8M7xDSODWbWOb4xg+P16hjd4JV8HwL/I
+yl/+TPuBFiKNbBLmAK/bo/Tav79y+F5Q3HWfwrP5MBu7v+WNPA1jADfYY3M4fKNCMEAwHwYDVR0j
+BBgwFoAUAX7WgPFCUhNsBHXxbQT3I3nEJkswHQYDVR0OBBYEFM02d1Vnbg4yJdMSVtZIt7t5lwlt
+MAsGByqGSM44BAMFAAMvADAsAhQOndw4AYbNYFob+sEz7O7TM+1KLgIUBItBlJF4Xk8w81GHQEwB
+odtGngk=
+-----END CERTIFICATE-----

Added: qpid/dispatch/trunk/tests/config-2/server-private-key.pem
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-2/server-private-key.pem?rev=1565393&view=auto
==============================================================================
--- qpid/dispatch/trunk/tests/config-2/server-private-key.pem (added)
+++ qpid/dispatch/trunk/tests/config-2/server-private-key.pem Thu Feb  6 18:54:38 2014
@@ -0,0 +1,15 @@
+Bag Attributes
+    friendlyName: server-certificate
+    localKeyID: 54 69 6D 65 20 31 33 39 31 36 34 30 31 39 36 38 36 35 
+Key Attributes: <No Attributes>
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIBnjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQI2NNTxNMo7nsCAggA
+MBQGCCqGSIb3DQMHBAjibAYwe79jtgSCAVhQGqHRm78UZTwB4HZiStzJaKt8CXQN
+2IxF3pXsxMw6XYhZnWQ14f/r6lJl0luw3o59H+Oe+6dctAPYF5m2K4uCXlYujQOo
+IZORgwKDnZVkxWA5y97u1pgPt1hLdlvM227kpZFsGJHHVTwC+gLCNWcLBGNUP1/C
+Yh1VJJ5f67hxV/sbdssRnvAl0NWhnNPZd/SlaGqmpCDJzfSbwLJXs8kb1q1u7Agt
+m6LaYhByFXxbVshgy8cHvq6FjRZ1AkFCWcE5UzGY3rNCm3h0Bodtz4EvzPL2P9U8
+IQrEv8xhgOQhIWAmgHevsMmoxn2DhmRxR0W86/2AXy8HMZpyIJPgIiS57iN51eKQ
+OIfKx+izoW012HSbCVMfsmd5Qhn4OVhJFhLGWDyZ65sX+UJcEO1NnzE+kIQgGAjj
+GViyMafAoCZO2RFhA1hfHAIxaNl5PwKFmgPUZPB6gCDX2A==
+-----END ENCRYPTED PRIVATE KEY-----

Added: qpid/dispatch/trunk/tests/config-2/server-request.pem
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-2/server-request.pem?rev=1565393&view=auto
==============================================================================
--- qpid/dispatch/trunk/tests/config-2/server-request.pem (added)
+++ qpid/dispatch/trunk/tests/config-2/server-request.pem Thu Feb  6 18:54:38 2014
@@ -0,0 +1,13 @@
+-----BEGIN NEW CERTIFICATE REQUEST-----
+MIICazCCAigCAQAwNTEiMCAGA1UEAxMZQTEuR29vZC5TZXJ2ZXIuZG9tYWluLmNvbTEPMA0GA1UE
+ChMGU2VydmVyMIIBuDCCASwGByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9KnC7s5Of2EbdSPO9E
+AMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up
+1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3RSAHHAhUAl2BQjxUj
+C8yykrmCouuEC/BYHPUCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZ
+T+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7
+zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoDgYUAAoGBAPDAalbgSQ7O2dSkk9x4qrbP
+0unnFOOqLIIjnlLoAY3djKK6qdvgweVq8yUtIu5Ukdx3SukL1G0Id+zwzvENI4NZtY5vjGD4/XqG
+N3glXwfAv8jKX/5M+4EWIo1sEuYAr9uj9Nq/v3L4XlDcdZ/Cs/kwG7u/5Y08DWMAN9hjczh8oDAw
+LgYJKoZIhvcNAQkOMSEwHzAdBgNVHQ4EFgQUzTZ3VWduDjIl0xJW1ki3u3mXCW0wCwYHKoZIzjgE
+AwUAAzAAMC0CFQCMBzIUfL+ajOH/2kbGTkvzzje7+gIURsTPI+WQfABSvc3y2Nx3a0y1aes=
+-----END NEW CERTIFICATE REQUEST-----

Modified: qpid/dispatch/trunk/tests/system_tests_two_routers.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/system_tests_two_routers.py?rev=1565393&r1=1565392&r2=1565393&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/system_tests_two_routers.py (original)
+++ qpid/dispatch/trunk/tests/system_tests_two_routers.py Thu Feb  6 18:54:38 2014
@@ -46,12 +46,15 @@ def wait_for_addr(messenger, addr, local
                 done = True
         time.sleep(0.2)
 
-
 def startRouter(obj):
     default_home = os.path.normpath('/usr/lib/qpid-dispatch')
     home = os.environ.get('QPID_DISPATCH_HOME', default_home)
-    configA_file = '%s/tests/config-2/A.conf' % home
-    configB_file = '%s/tests/config-2/B.conf' % home
+    if obj.ssl_option == "ssl":
+        configA_file = '%s/tests/config-2/A-ssl.conf' % home
+        configB_file = '%s/tests/config-2/B-ssl.conf' % home 
+    else:
+        configA_file = '%s/tests/config-2/A.conf' % home
+        configB_file = '%s/tests/config-2/B.conf' % home
 
     obj.routerA = subprocess.Popen(['qdrouterd', '-c', configA_file],
                                    stderr=subprocess.PIPE,
@@ -89,6 +92,7 @@ def stopRouter(obj):
 
 
 class RouterTest(unittest.TestCase):
+    ssl_option = None
 
     if (sys.version_info[0] == 2) and (sys.version_info[1] < 7):
         def setUp(self):
@@ -809,6 +813,12 @@ class RouterTest(unittest.TestCase):
         M3.stop()
         M4.stop()
 
-
 if __name__ == '__main__':
-  unittest.main()
+    if len(sys.argv) > 1:
+        if '--ssl' in sys.argv:
+            sys.argv.remove('--ssl')
+            RouterTest.ssl_option = "ssl"
+            print "...Using SSL configuration"
+        else:
+            print "...Using non-SSL configuration"
+    unittest.main()

Modified: qpid/dispatch/trunk/tools/qdtest.in
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tools/qdtest.in?rev=1565393&r1=1565392&r2=1565393&view=diff
==============================================================================
--- qpid/dispatch/trunk/tools/qdtest.in (original)
+++ qpid/dispatch/trunk/tools/qdtest.in Thu Feb  6 18:54:38 2014
@@ -27,6 +27,8 @@ fi
 echo "Running system_tests_one_router.py"
 python $QPID_DISPATCH_HOME/tests/system_tests_one_router.py -v
 
+echo "Running system_tests_two_routers.py with SSL"
+python $QPID_DISPATCH_HOME/tests/system_tests_two_routers.py -v --ssl
+
 echo "Running system_tests_two_routers.py"
 python $QPID_DISPATCH_HOME/tests/system_tests_two_routers.py -v
-



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message