Merge lp:~thedac/ubuntu/vivid/neutron-lbaas/2015.1.1 into lp:ubuntu/vivid-updates/neutron-lbaas

Proposed by David Ames on 2015-08-04
Status: Approved
Approved by: Corey Bryant on 2015-08-05
Approved revision: 8
Proposed branch: lp:~thedac/ubuntu/vivid/neutron-lbaas/2015.1.1
Merge into: lp:ubuntu/vivid-updates/neutron-lbaas
Diff against target: 549 lines (+61/-325)
15 files modified
.pc/applied-patches (+0/-1)
.pc/skip-failing-tests.patch/neutron_lbaas/tests/unit/common/tls_utils/test_cert_parser.py (+0/-281)
ChangeLog (+9/-0)
PKG-INFO (+1/-1)
debian/changelog (+7/-0)
neutron_lbaas.egg-info/PKG-INFO (+1/-1)
neutron_lbaas.egg-info/pbr.json (+1/-1)
neutron_lbaas.egg-info/requires.txt (+12/-12)
neutron_lbaas/tests/unit/common/tls_utils/test_cert_parser.py (+0/-1)
neutron_lbaas/tests/unit/drivers/haproxy/test_synchronous_driver.py (+2/-2)
neutron_lbaas/tests/unit/drivers/radware/test_v2_plugin_driver.py (+4/-0)
requirements.txt (+12/-12)
setup.cfg (+1/-1)
setup.py (+0/-1)
test-requirements.txt (+11/-11)
To merge this branch: bzr merge lp:~thedac/ubuntu/vivid/neutron-lbaas/2015.1.1
Reviewer Review Type Date Requested Status
Corey Bryant 2015-08-04 Approve on 2015-08-04
Review via email: mp+266929@code.launchpad.net

Description of the change

Import upstream 2015.1.1

To post a comment you must log in.
review: Approve
Corey Bryant (corey.bryant) wrote :

I've uploaded this to the archive and will let the Package Import Robot commit the branch changes.

Unmerged revisions

8. By David Ames on 2015-08-04

Import upstream version 2015.1.1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file '.pc/applied-patches'
2--- .pc/applied-patches 2015-04-10 09:59:17 +0000
3+++ .pc/applied-patches 1970-01-01 00:00:00 +0000
4@@ -1,1 +0,0 @@
5-skip-failing-tests.patch
6
7=== removed directory '.pc/skip-failing-tests.patch'
8=== removed directory '.pc/skip-failing-tests.patch/neutron_lbaas'
9=== removed directory '.pc/skip-failing-tests.patch/neutron_lbaas/tests'
10=== removed directory '.pc/skip-failing-tests.patch/neutron_lbaas/tests/unit'
11=== removed directory '.pc/skip-failing-tests.patch/neutron_lbaas/tests/unit/common'
12=== removed directory '.pc/skip-failing-tests.patch/neutron_lbaas/tests/unit/common/tls_utils'
13=== removed file '.pc/skip-failing-tests.patch/neutron_lbaas/tests/unit/common/tls_utils/test_cert_parser.py'
14--- .pc/skip-failing-tests.patch/neutron_lbaas/tests/unit/common/tls_utils/test_cert_parser.py 2015-04-10 09:59:17 +0000
15+++ .pc/skip-failing-tests.patch/neutron_lbaas/tests/unit/common/tls_utils/test_cert_parser.py 1970-01-01 00:00:00 +0000
16@@ -1,281 +0,0 @@
17-#
18-# Copyright 2014 OpenStack Foundation. All rights reserved
19-#
20-# Licensed under the Apache License, Version 2.0 (the "License"); you may
21-# not use this file except in compliance with the License. You may obtain
22-# a copy of the License at
23-#
24-# http://www.apache.org/licenses/LICENSE-2.0
25-#
26-# Unless required by applicable law or agreed to in writing, software
27-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
28-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
29-# License for the specific language governing permissions and limitations
30-# under the License.
31-
32-import neutron_lbaas.common.exceptions as exceptions
33-import neutron_lbaas.common.tls_utils.cert_parser as cert_parser
34-from neutron_lbaas.tests import base
35-
36-
37-ALT_EXT_CRT = """-----BEGIN CERTIFICATE-----
38-MIIGxDCCBaygAwIBAgIGAUp0fCElMA0GCSqGSIb3DQEBDQUAMIGLMQswCQYDVQQG
39-EwJVUzEOMAwGA1UECAwFVGV4YXMxFDASBgNVBAcMC1NhbiBBbnRvbmlvMR4wHAYD
40-VQQKDBVPcGVuU3RhY2sgRXhwZXJpbWVudHMxFjAUBgNVBAsMDU5ldXRyb24gTGJh
41-YXMxHjAcBgNVBAMMFXd3dy5DTkZyb21TdWJqZWN0Lm9yZzAeFw0xNDExMjIwMDEx
42-MzlaFw0yMjEyMjEwMDExMzlaMIGLMQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4
43-YXMxFDASBgNVBAcMC1NhbiBBbnRvbmlvMR4wHAYDVQQKDBVPcGVuU3RhY2sgRXhw
44-ZXJpbWVudHMxFjAUBgNVBAsMDU5ldXRyb24gTGJhYXMxHjAcBgNVBAMMFXd3dy5D
45-TkZyb21TdWJqZWN0Lm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
46-ALL1nmbDPUDps84i1sM3rhHrc+Dlu0N/wKQWKZFeiWUtF/pot19V3o0yXDpsg7W5
47-RkLMTFkZEcnQpyGdpAGjTjzmNXMZw99EzxsmrR3l6hUEISifVbvEuftYZT6jPxM5
48-ML6WAjFNaBEZPWtZi8CgX5xdjdrDNndwyHob49n7Nc/h1kVqqBqMILabTqC6yEcx
49-S/B+DugVuuYbEdYYYElQUMfM+mUdULrSqIVl2n5AvvSFjWzWzfgPyp4QKn+f7HVR
50-T62bh/XjQ88n1tMYNAEqixRZTPgqY1LFl9VJVgRp9fdL6ttMurOR3C0STJ5qCdKB
51-L7LrpbY4u8dEragRC6YAyI8CAwEAAaOCAyowggMmMAwGA1UdEwEB/wQCMAAwDgYD
52-VR0PAQH/BAQDAgO4MIIDBAYDVR0RBIIC+zCCAveCGXd3dy5ob3N0RnJvbV9kTlNO
53-YW1lMS5jb22CGXd3dy5ob3N0RnJvbV9kTlNOYW1lMi5jb22CGXd3dy5ob3N0RnJv
54-bV9kTlNOYW1lMy5jb22BEW5vb25lQG5vd2hlcmUub3JnpIGPMIGMMQswCQYDVQQG
55-EwJVUzEOMAwGA1UECAwFVGV4YXMxFDASBgNVBAcMC1NhbiBBbnRvbmlvMR4wHAYD
56-VQQKDBVPcGVuU3RhY2sgRXhwZXJpbWVudHMxFjAUBgNVBAsMDU5ldXRyb24gTGJh
57-YXMxHzAdBgNVBAMMFnd3dy5jbkZyb21BbHROYW1lMS5vcmekgY8wgYwxCzAJBgNV
58-BAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEUMBIGA1UEBwwLU2FuIEFudG9uaW8xHjAc
59-BgNVBAoMFU9wZW5TdGFjayBFeHBlcmltZW50czEWMBQGA1UECwwNTmV1dHJvbiBM
60-YmFhczEfMB0GA1UEAwwWd3d3LmNuRnJvbUFsdE5hbWUyLm9yZ6SBjzCBjDELMAkG
61-A1UEBhMCVVMxDjAMBgNVBAgMBVRleGFzMRQwEgYDVQQHDAtTYW4gQW50b25pbzEe
62-MBwGA1UECgwVT3BlblN0YWNrIEV4cGVyaW1lbnRzMRYwFAYDVQQLDA1OZXV0cm9u
63-IExiYWFzMR8wHQYDVQQDDBZ3d3cuY25Gcm9tQWx0TmFtZTMub3JnpIGPMIGMMQsw
64-CQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxFDASBgNVBAcMC1NhbiBBbnRvbmlv
65-MR4wHAYDVQQKDBVPcGVuU3RhY2sgRXhwZXJpbWVudHMxFjAUBgNVBAsMDU5ldXRy
66-b24gTGJhYXMxHzAdBgNVBAMMFnd3dy5jbkZyb21BbHROYW1lNC5vcmeHBAoBAgOH
67-EAEjRWeJq83v97PVkeaixICGFmh0dHA6Ly93d3cuZXhhbXBsZS5jb22CGXd3dy5o
68-b3N0RnJvbV9kTlNOYW1lNC5jb20wDQYJKoZIhvcNAQENBQADggEBAICUCDMhDf0f
69-cvX5mVnq4Q3+SM/nl03Gse6J0JdpFivS4hl+uZs0TAFYpfEPpAa7KKxD229kbCiQ
70-kyxf8fzADSl77RQbL6Lxa8K/c66mVNiuVvTHV4r/nDNcRYN9fGArw/Ho7VX+HVQ6
71-UW1t/uvXeyg695t7kzZmvg0ChD5kS848d2rXu2MhwHwXA8rbuK6gxVY97fbzBNlj
72-aiPJUAb8lqZMShd+3yVCgMmV0J20u2b5pSdO+LHQ7NfVqURk2pcHD8slfHzXT58q
73-YB90v0pSVP6mzHGyLxETZZz0nhaH9EjOyFkQI84ORT8Kmd5Y04gSI0LTKKF1eMNE
74-TyNC+MtsRdA=
75------END CERTIFICATE-----
76-"""
77-
78-SOME_OTHER_RSA_KEY = """
79------BEGIN RSA PRIVATE KEY-----
80-MIICWwIBAAKBgQDDnJL9dAdDpjoq4tksTJmdM0AjIHa7Y2yc8XwU7YkgrOR0m4Po
81-r7El0NwWf5i/LFudX1cOkfwemMIPwQ+67k0BVu/W3SR+g9ZzVKZtTBJnDoqMZ4RJ
82-jBk4gfwhnQYKPIQvdilDZReH3hFcBvPUkYWSHMn17FBTGmNzp2AnMdLpQQIDAQAB
83-AoGAIlew7tKaG+RpPfJJ0p84MQM4dXJTph6UiRFUiZASjSwNh/Ntu0JtRYhfu4t3
84-U8kD5KNCc4ppyy1ilMV+b4E6/3ydz6syMeJ7G24/PMU8d44zDgZXdM1pf5Nlosh1
85-BVv1Fvb0PBW2xs9VRlO6W62IWVtsZCGXYNayrXDiRZ50IGkCQQDkmOVEqffz3GeD
86-A+XWp9YrXeMqOmtPcrOuvMIO9DwrlXb8eNwvG5GxbuHGuZfOp01tiPyQrkxM0JzU
87-y8iD1pjrAkEA2w9topUzYS/NZt45OD9t5ZBVMfP15AwWRVv7V5uTksTqfZ9tFfh6
88-pN4oWe6xK/kgKAdE9hkjubGKQBjJSC27gwJAGZlRm1XZUXKuGMrX8yjKYALcjH8M
89-Q1JZ8shqhtgs4MiVEYLLTW8t6ou7NtDTwi2UCx8bAWyzWKrH1UCYzMK8TwJAMngU
90-fz+2ra5wuUF7l1ztudUN+8tEHH04aFRvzNhYIJljmPuxCz3LK87PJyEaCpKD+RTr
91-q3NRSsf/nRLY1NtMdwJAVKOdUCwZKGpGyOUZPRbZZAPlojIff2CxJ6E2Pr0RbShD
92-31icKmhIY+e2rP6v5W7hzTGge5PA0hRfCiwyd+zLoQ==
93------END RSA PRIVATE KEY-----
94-"""
95-
96-ALT_EXT_CRT_KEY = """
97------BEGIN RSA PRIVATE KEY-----
98-MIIEowIBAAKCAQEAsvWeZsM9QOmzziLWwzeuEetz4OW7Q3/ApBYpkV6JZS0X+mi3
99-X1XejTJcOmyDtblGQsxMWRkRydCnIZ2kAaNOPOY1cxnD30TPGyatHeXqFQQhKJ9V
100-u8S5+1hlPqM/EzkwvpYCMU1oERk9a1mLwKBfnF2N2sM2d3DIehvj2fs1z+HWRWqo
101-GowgtptOoLrIRzFL8H4O6BW65hsR1hhgSVBQx8z6ZR1QutKohWXafkC+9IWNbNbN
102-+A/KnhAqf5/sdVFPrZuH9eNDzyfW0xg0ASqLFFlM+CpjUsWX1UlWBGn190vq20y6
103-s5HcLRJMnmoJ0oEvsuultji7x0StqBELpgDIjwIDAQABAoIBAC3DX6FZtfU+jgtd
104-n1vGhk3wzu4o8S0+ow2S2UhiS3JDCMmxM4s+ky26Phl2nGvBGDWGttNl9MWOBN80
105-x7bfgudR20M2yH70wp1n04c8vxJmvu/7ZtogYYrjvOg6qKuKyWtDQwZGjCErOiiU
106-eodku25qAhd6Khh7D9kh/q9EbSteYFXsqJiNrY4ul1+cROMZpHx63xY6AzPmkvSU
107-garkgY4rw9E71t7it2laWkRKVsd+kEjayritdEEliNMVFFtrGEgplYkmLxGf0HLi
108-ROFVMCLRW/P12JpXllFPrBb8rlPL4w1c/s+yStohT0K+o4FLXhsf/inxmfc9XnZX
109-dJm0k/ECgYEA47FpV1caMk+TNPfu318VCGRmjwpXdmkNaUiX2Uvs3xIKQ6KJmpo3
110-sj0YjQEmQVz8s6geStvU1LdPxgsWZfbDt31M6SNwylh82ABQF1bZyrcMRxM8bHhe
111-bhDITM1dAn6aROkS1cBpfR9NJOFD850lmJvBGR9ORVBGyucTKH5uXxkCgYEAyTU0
112-zQKW2aU3J7mTCC9cp+eSD3fubJpa3ML5XfQ8YNID4PsxWglNKPcOTC4yaSfxVmyk
113-S0WIQUazCstszQsvwy9YyHtpkMq+0lyCPvrYnmRV0zx5zT155V2zcEh/oj64eoee
114-W5kvJSs/x6vT+lEN0TDEJ2gKEaJuBt6JG6P04ecCgYBSNw1CbEEZSYJt7dhi74I4
115-tYgSvjk2mFgvW/b4j2HIaksqgNYO7QCPa2AiCfg2Qc09UcceYKJI7Kfxaq97wc6J
116-wsSyqglgBvONSw+gXcvmVpIoV9nJkO0H8SdiFAUxkWVC3KXgaMmuVE8WsgBHRsb8
117-g8EFwTgR7xqgyS8xv/U6gQKBgQCdUr/dSJgAx6EPq5degAHXu0ZGWAUR38MJ+F2Y
118-6/5FyhCEWoRlHP66+CmywTBjbnrSk5IG1PBL8ebOmu6QiJ2o5R1rbKvHLe/0dabV
119-bbfwaQ1+ZDvskZP9Fr3WHqnFh3shO2dDwcvOKTnuetj9UWEXXyUQltXAohubvWbB
120-OPqhowKBgB3t2oUSFJI8fSNQnQNkcespJTddr0oLEwgsIl4Q7rdFHLr+/c46svjJ
121-kPMtpfxDQvkgK2aWpS4OP0E2vSU/IfMEDmlypfKe2SaTtFehZSUwR4R1/ZhSL3iS
122-iMwJYgm98P27s4TEMdhlPNVJrj1FrD+4VrgpOsoM20EkZnTvel9s
123------END RSA PRIVATE KEY-----
124-"""
125-
126-ENCRYPTED_PKCS8_CRT_KEY_PASSPHRASE = "test_passphrase"
127-
128-ENCRYPTED_PKCS8_CRT_KEY = """-----BEGIN ENCRYPTED PRIVATE KEY-----
129-MIIE6TAbBgkqhkiG9w0BBQMwDgQIT04zko6pmJICAggABIIEyL/79sqzTQ7BsEjY
130-ao2Uhh3//mpNJfCDhjSZOmWL7s4+161cEqpxrfxo4bHH8fkZ60VZUQP8CjwwQUhP
131-4iwpv2bYbQwzlttZwTC6s28wh7FRtgVoVPTwvXJa6fl2zAjLtsjwLZ/556ez9xIJ
132-67hxkIK2EzGQaeEKI1+vVF5EKsgKiPEmgspOBxRPoVWTx49NooiakGnwaBoDyTob
133-8FMr8mF1EheNQ4kl1bPrl+csD7PPnfbWUdNVvMljEhS3cYamQDPEWyAzvaIr0rHh
134-/6h80L/G2+0fensrTspWJcjX+XDBwQPk+YMic0TJ3KvkC7p2iNJhjNrjhQ+APZWq
135-xYrjfcmdK0RaaoqN+1zeE1P2kWIJx9CQZVMeGhVzzcmPwJPDnJFpkU+8cgTWnUr/
136-Fh8YtDoDzLiAUcmV1Kk7LYtYPHuU8epuz5PYm49TbWzdS7PX5wqFAFmrVt5jysm4
137-D/Ox0r4KV1t7D/1gc1WRIu8oUXkIglCHWNpTyMK0kFPctAf/ua+DUFRE4eSx3rsX
138-ZKIymdF9v/WF1Ud0tsNeudQbVeXWS6UCR8m/rqe81W4npQm/uqUNla+6yaYUmHlk
139-tvw/m6pt+jKhn0XIRkMwHrTpIaMVvInMg0xpkRuc7Xj5A7vNnkypZRNZJHgy7WWC
140-6GpOCWJOltYaNy7tmAkSUHJ6kNjXK5a4fi30HknEaqKjFTQNGvcybulJ3MXUzds0
141-MJoTpvQfLzYQbMYZ/XRGND4lgeEbs29nWLPae8D5XlDeZQMin8EukPko8u8+YGbU
142-eWGOvDc+4/xrWrsq1i6R0uWq+Cyoql8oh0PNBlM04S7GAbu1pOD/tPcq/GNYcv/Q
143-vJcIz9KA3BNepq7tC8D88ggEvFjTsHKeW/OnuCxKducSna4Mq+GebU52tKjkLjFC
144-eLG4Vx0BY5xPH3gd7iyuAf7S+08BbinNZWjHLpdmR3vKK5YbLPiGSfcYQdClr6BK
145-9vNWH4TXmZMV+rWtfSeM/cbhCHwxT5Jx6N0OFAxOblQClWnUD79nGkEgn/GoY/Aj
146-FPNj8u2U/mJHgFHH3ClidYL9jJUvhGpTixB8nGgMjJ0wvFcp+5OysG3TsjqYkwR6
147-RRNBmM+iLEUFTrMZYb+edHvGJsMEMZ0qvjmZDsfDz6ax5M9zH/ORFcGplgIec8kj
148-I106+dqAVVrv1CrBf2N/pxV0OXVhgl6ECe/Ee1xYC2e2CiEgUnQtedu8ekgPgp73
149-tHcAiWMamLPTwXuL7jFtvWaQfkYBmrBdEx54+eZOfH/NgV3o8gbaWNHSxbfbwlXN
150-MvyJidZGkXU0DJtUUnO5i2S7ftKCdOzrrSA8HDTvxFUhxretYpF3NzPYpYkM7WJX
151-GM7bTMn37AWYqLZmdYYdjh1ZOH/wsM/3uxGBpyEyy4Urrr1ux7X1P0cL0O2P/72h
152-GRd499JLrRMrmmtQ4KrN7GCHdctvujhDP8zvmnaEyGVzg88XmDg50ZF3+8DmOOgX
153-EMZEYHO2Wi2uyFotFtZCuqoOJmGPPeGV8QrsRs82hnL1bcd6REUTWk0KsTt13lvF
154-WwMJugHFk5NQuse3P4Hh9smQrRrv1dvnpt7s4yKStKolXUaFWcXJvXVaDfR5266Y
155-p7cuYY1cAyI7gFfl5A==
156------END ENCRYPTED PRIVATE KEY-----
157-"""
158-
159-UNENCRYPTED_PKCS8_CRT_KEY = """-----BEGIN PRIVATE KEY-----
160-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCy9Z5mwz1A6bPO
161-ItbDN64R63Pg5btDf8CkFimRXollLRf6aLdfVd6NMlw6bIO1uUZCzExZGRHJ0Kch
162-naQBo0485jVzGcPfRM8bJq0d5eoVBCEon1W7xLn7WGU+oz8TOTC+lgIxTWgRGT1r
163-WYvAoF+cXY3awzZ3cMh6G+PZ+zXP4dZFaqgajCC2m06gushHMUvwfg7oFbrmGxHW
164-GGBJUFDHzPplHVC60qiFZdp+QL70hY1s1s34D8qeECp/n+x1UU+tm4f140PPJ9bT
165-GDQBKosUWUz4KmNSxZfVSVYEafX3S+rbTLqzkdwtEkyeagnSgS+y66W2OLvHRK2o
166-EQumAMiPAgMBAAECggEALcNfoVm19T6OC12fW8aGTfDO7ijxLT6jDZLZSGJLckMI
167-ybEziz6TLbo+GXaca8EYNYa202X0xY4E3zTHtt+C51HbQzbIfvTCnWfThzy/Ema+
168-7/tm2iBhiuO86Dqoq4rJa0NDBkaMISs6KJR6h2S7bmoCF3oqGHsP2SH+r0RtK15g
169-VeyomI2tji6XX5xE4xmkfHrfFjoDM+aS9JSBquSBjivD0TvW3uK3aVpaREpWx36Q
170-SNrKuK10QSWI0xUUW2sYSCmViSYvEZ/QcuJE4VUwItFb8/XYmleWUU+sFvyuU8vj
171-DVz+z7JK2iFPQr6jgUteGx/+KfGZ9z1edld0mbST8QKBgQDjsWlXVxoyT5M09+7f
172-XxUIZGaPCld2aQ1pSJfZS+zfEgpDoomamjeyPRiNASZBXPyzqB5K29TUt0/GCxZl
173-9sO3fUzpI3DKWHzYAFAXVtnKtwxHEzxseF5uEMhMzV0CfppE6RLVwGl9H00k4UPz
174-nSWYm8EZH05FUEbK5xMofm5fGQKBgQDJNTTNApbZpTcnuZMIL1yn55IPd+5smlrc
175-wvld9Dxg0gPg+zFaCU0o9w5MLjJpJ/FWbKRLRYhBRrMKy2zNCy/DL1jIe2mQyr7S
176-XII++tieZFXTPHnNPXnlXbNwSH+iPrh6h55bmS8lKz/Hq9P6UQ3RMMQnaAoRom4G
177-3okbo/Th5wKBgFI3DUJsQRlJgm3t2GLvgji1iBK+OTaYWC9b9viPYchqSyqA1g7t
178-AI9rYCIJ+DZBzT1Rxx5gokjsp/Fqr3vBzonCxLKqCWAG841LD6Bdy+ZWkihX2cmQ
179-7QfxJ2IUBTGRZULcpeBoya5UTxayAEdGxvyDwQXBOBHvGqDJLzG/9TqBAoGBAJ1S
180-v91ImADHoQ+rl16AAde7RkZYBRHfwwn4XZjr/kXKEIRahGUc/rr4KbLBMGNuetKT
181-kgbU8Evx5s6a7pCInajlHWtsq8ct7/R1ptVtt/BpDX5kO+yRk/0WvdYeqcWHeyE7
182-Z0PBy84pOe562P1RYRdfJRCW1cCiG5u9ZsE4+qGjAoGAHe3ahRIUkjx9I1CdA2Rx
183-6yklN12vSgsTCCwiXhDut0Ucuv79zjqy+MmQ8y2l/ENC+SArZpalLg4/QTa9JT8h
184-8wQOaXKl8p7ZJpO0V6FlJTBHhHX9mFIveJKIzAliCb3w/buzhMQx2GU81UmuPUWs
185-P7hWuCk6ygzbQSRmdO96X2w=
186------END PRIVATE KEY-----
187-"""
188-
189-EXPECTED_IMD_SUBJS = ["IMD3", "IMD2", "IMD1"]
190-
191-X509_IMDS = """Junk
192------BEGIN CERTIFICATE-----
193-MIIBhDCCAS6gAwIBAgIGAUo7hO/eMA0GCSqGSIb3DQEBCwUAMA8xDTALBgNVBAMT
194-BElNRDIwHhcNMTQxMjExMjI0MjU1WhcNMjUxMTIzMjI0MjU1WjAPMQ0wCwYDVQQD
195-EwRJTUQzMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKHIPXo2pfD5dpnpVDVz4n43
196-zn3VYsjz/mgOZU0WIWjPA97mvulb7mwb4/LB4ijOMzHj9XfwP75GiOFxYFs8O80C
197-AwEAAaNwMG4wDwYDVR0TAQH/BAUwAwEB/zA8BgNVHSMENTAzgBS6rfnABCO3oHEz
198-NUUtov2hfXzfVaETpBEwDzENMAsGA1UEAxMESU1EMYIGAUo7hO/DMB0GA1UdDgQW
199-BBRiLW10LVJiFO/JOLsQFev0ToAcpzANBgkqhkiG9w0BAQsFAANBABtdF+89WuDi
200-TC0FqCocb7PWdTucaItD9Zn55G8KMd93eXrOE/FQDf1ScC+7j0jIHXjhnyu6k3NV
201-8el/x5gUHlc=
202------END CERTIFICATE-----
203-Junk should be ignored by x509 splitter
204------BEGIN CERTIFICATE-----
205-MIIBhDCCAS6gAwIBAgIGAUo7hO/DMA0GCSqGSIb3DQEBCwUAMA8xDTALBgNVBAMT
206-BElNRDEwHhcNMTQxMjExMjI0MjU1WhcNMjUxMTIzMjI0MjU1WjAPMQ0wCwYDVQQD
207-EwRJTUQyMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJYHqnsisVKTlwVaCSa2wdrv
208-CeJJzqpEVV0RVgAAF6FXjX2Tioii+HkXMR9zFgpE1w4yD7iu9JDb8yTdNh+NxysC
209-AwEAAaNwMG4wDwYDVR0TAQH/BAUwAwEB/zA8BgNVHSMENTAzgBQt3KvN8ncGj4/s
210-if1+wdvIMCoiE6ETpBEwDzENMAsGA1UEAxMEcm9vdIIGAUo7hO+mMB0GA1UdDgQW
211-BBS6rfnABCO3oHEzNUUtov2hfXzfVTANBgkqhkiG9w0BAQsFAANBAIlJODvtmpok
212-eoRPOb81MFwPTTGaIqafebVWfBlR0lmW8IwLhsOUdsQqSzoeypS3SJUBpYT1Uu2v
213-zEDOmgdMsBY=
214------END CERTIFICATE-----
215-Junk should be thrown out like junk
216------BEGIN CERTIFICATE-----
217-MIIBfzCCASmgAwIBAgIGAUo7hO+mMA0GCSqGSIb3DQEBCwUAMA8xDTALBgNVBAMT
218-BHJvb3QwHhcNMTQxMjExMjI0MjU1WhcNMjUxMTIzMjI0MjU1WjAPMQ0wCwYDVQQD
219-EwRJTUQxMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAI+tSJxr60ogwXFmgqbLMW7K
220-3fkQnh9sZBi7Qo6AzUnfe/AhXoisib651fOxKXCbp57IgzLTv7O9ygq3I+5fQqsC
221-AwEAAaNrMGkwDwYDVR0TAQH/BAUwAwEB/zA3BgNVHSMEMDAugBR73ZKSpjbsz9tZ
222-URkvFwpIO7gB4KETpBEwDzENMAsGA1UEAxMEcm9vdIIBATAdBgNVHQ4EFgQULdyr
223-zfJ3Bo+P7In9fsHbyDAqIhMwDQYJKoZIhvcNAQELBQADQQBenkZ2k7RgZqgj+dxA
224-D7BF8MN1oUAOpyYqAjkGddSEuMyNmwtHKZI1dyQ0gBIQdiU9yAG2oTbUIK4msbBV
225-uJIQ
226------END CERTIFICATE-----"""
227-
228-
229-class TestTLSParseUtils(base.BaseTestCase):
230- def test_alt_subject_name_parses(self):
231- hosts = cert_parser.get_host_names(ALT_EXT_CRT)
232- self.assertEqual(hosts['cn'], 'www.CNFromSubject.org')
233- self.assertEqual(hosts['dns_names'][0], 'www.hostFrom_dNSName1.com')
234- self.assertEqual(hosts['dns_names'][1], 'www.hostFrom_dNSName2.com')
235- self.assertEqual(hosts['dns_names'][2], 'www.hostFrom_dNSName3.com')
236- self.assertEqual(hosts['dns_names'][3], 'www.hostFrom_dNSName4.com')
237-
238- def test_x509_parses(self):
239- self.assertRaises(exceptions.UnreadableCert,
240- cert_parser.validate_cert, "BAD CERT")
241- self.assertTrue(cert_parser.validate_cert(ALT_EXT_CRT))
242- self.assertTrue(cert_parser.validate_cert(ALT_EXT_CRT,
243- private_key=UNENCRYPTED_PKCS8_CRT_KEY))
244-
245- def test_x509_parses_intermediates(self):
246- # Should not throw error when parsing with intermediates
247- cert_parser.validate_cert(ALT_EXT_CRT,
248- UNENCRYPTED_PKCS8_CRT_KEY,
249- intermediates=X509_IMDS)
250-
251- def test_read_private_key(self):
252- self.assertRaises(exceptions.NeedsPassphrase,
253- cert_parser._read_privatekey,
254- ENCRYPTED_PKCS8_CRT_KEY)
255- epkey = cert_parser._read_privatekey(
256- ENCRYPTED_PKCS8_CRT_KEY,
257- passphrase=ENCRYPTED_PKCS8_CRT_KEY_PASSPHRASE)
258- self.assertTrue(epkey.check())
259-
260- def test_read_private_key_unicode(self):
261- self.assertRaises(exceptions.NeedsPassphrase,
262- cert_parser._read_privatekey,
263- ENCRYPTED_PKCS8_CRT_KEY)
264- epkey = cert_parser._read_privatekey(
265- ENCRYPTED_PKCS8_CRT_KEY,
266- passphrase=u'{0}'.format(ENCRYPTED_PKCS8_CRT_KEY_PASSPHRASE))
267- self.assertTrue(epkey.check())
268-
269- def test_dump_private_key(self):
270- self.assertRaises(exceptions.NeedsPassphrase,
271- cert_parser.dump_private_key,
272- ENCRYPTED_PKCS8_CRT_KEY)
273- self.assertEqual(UNENCRYPTED_PKCS8_CRT_KEY,
274- cert_parser.dump_private_key(
275- ENCRYPTED_PKCS8_CRT_KEY,
276- ENCRYPTED_PKCS8_CRT_KEY_PASSPHRASE
277- ))
278- self.assertIsNot(ENCRYPTED_PKCS8_CRT_KEY,
279- cert_parser.dump_private_key(
280- ENCRYPTED_PKCS8_CRT_KEY,
281- ENCRYPTED_PKCS8_CRT_KEY_PASSPHRASE
282- ))
283-
284- def test_validate_cert_and_key_match(self):
285- self.assertTrue(cert_parser.validate_cert(ALT_EXT_CRT,
286- private_key=ALT_EXT_CRT_KEY))
287- self.assertRaises(exceptions.MisMatchedKey,
288- cert_parser.validate_cert,
289- ALT_EXT_CRT, private_key=SOME_OTHER_RSA_KEY)
290-
291- def test_split_x509s(self):
292- imds = []
293- for x509Pem in cert_parser._split_x509s(X509_IMDS):
294- imds.append(cert_parser._get_x509_from_pem_bytes(x509Pem))
295-
296- for i in xrange(0, len(imds)):
297- self.assertEqual(EXPECTED_IMD_SUBJS[i], imds[i].get_subject().CN)
298
299=== modified file 'ChangeLog'
300--- ChangeLog 2015-04-30 17:35:09 +0000
301+++ ChangeLog 2015-08-04 17:29:23 +0000
302@@ -1,6 +1,15 @@
303 CHANGES
304 =======
305
306+2015.1.1
307+--------
308+
309+* Updated from global requirements
310+* Fix test failures caused by mock update
311+* Updated from global requirements
312+* Updated from global requirements
313+* Bump pre-release to 2015.1.1
314+
315 2015.1.0
316 --------
317
318
319=== modified file 'PKG-INFO'
320--- PKG-INFO 2015-04-30 17:35:09 +0000
321+++ PKG-INFO 2015-08-04 17:29:23 +0000
322@@ -1,6 +1,6 @@
323 Metadata-Version: 1.1
324 Name: neutron-lbaas
325-Version: 2015.1.0
326+Version: 2015.1.1
327 Summary: OpenStack Networking Load Balancing as a Service
328 Home-page: http://www.openstack.org/
329 Author: OpenStack
330
331=== modified file 'debian/changelog'
332--- debian/changelog 2015-04-30 17:35:09 +0000
333+++ debian/changelog 2015-08-04 17:29:23 +0000
334@@ -1,3 +1,10 @@
335+neutron-lbaas (1:2015.1.1-0ubuntu1) UNRELEASED; urgency=medium
336+
337+ * Resynchronize with stable/kilo (fb3f629) (LP: #1481008):
338+ - [fb3f629] Fix test failures caused by mock update
339+
340+ -- David Ames <david.ames@canonical.com> Tue, 04 Aug 2015 10:16:10 -0700
341+
342 neutron-lbaas (1:2015.1.0-0ubuntu1) vivid; urgency=medium
343
344 * New upstream release for OpenStack Kilo. (LP: #1449744)
345
346=== modified file 'neutron_lbaas.egg-info/PKG-INFO'
347--- neutron_lbaas.egg-info/PKG-INFO 2015-04-30 17:35:09 +0000
348+++ neutron_lbaas.egg-info/PKG-INFO 2015-08-04 17:29:23 +0000
349@@ -1,6 +1,6 @@
350 Metadata-Version: 1.1
351 Name: neutron-lbaas
352-Version: 2015.1.0
353+Version: 2015.1.1
354 Summary: OpenStack Networking Load Balancing as a Service
355 Home-page: http://www.openstack.org/
356 Author: OpenStack
357
358=== modified file 'neutron_lbaas.egg-info/pbr.json'
359--- neutron_lbaas.egg-info/pbr.json 2015-04-30 17:35:09 +0000
360+++ neutron_lbaas.egg-info/pbr.json 2015-08-04 17:29:23 +0000
361@@ -1,1 +1,1 @@
362-{"is_release": true, "git_version": "4543ea9"}
363\ No newline at end of file
364+{"is_release": true, "git_version": "68f27be"}
365\ No newline at end of file
366
367=== modified file 'neutron_lbaas.egg-info/requires.txt'
368--- neutron_lbaas.egg-info/requires.txt 2015-04-30 17:35:09 +0000
369+++ neutron_lbaas.egg-info/requires.txt 2015-08-04 17:29:23 +0000
370@@ -1,17 +1,17 @@
371-pbr>=0.6,!=0.7,<1.0
372-eventlet>=0.16.1,!=0.17.0
373-requests>=2.2.0,!=2.4.0
374+pbr!=0.7,<1.0,>=0.6
375+eventlet!=0.17.0,>=0.16.1
376+requests!=2.4.0,>=2.2.0
377 netaddr>=0.7.12
378-SQLAlchemy>=0.9.7,<=0.9.99
379+SQLAlchemy<=0.9.99,>=0.9.7
380 alembic>=0.7.2
381 six>=1.9.0
382-oslo.config>=1.9.3,<1.10.0 # Apache-2.0
383-oslo.db>=1.7.0,<1.8.0 # Apache-2.0
384-oslo.log>=1.0.0,<1.1.0 # Apache-2.0
385-oslo.messaging>=1.8.0,<1.9.0 # Apache-2.0
386-oslo.serialization>=1.4.0,<1.5.0 # Apache-2.0
387-oslo.utils>=1.4.0,<1.5.0 # Apache-2.0
388-python-barbicanclient>=3.0.1,<3.1.0
389+oslo.config<1.10.0,>=1.9.3 # Apache-2.0
390+oslo.db<1.8.0,>=1.7.0 # Apache-2.0
391+oslo.log<1.1.0,>=1.0.0 # Apache-2.0
392+oslo.messaging<1.9.0,>=1.8.0 # Apache-2.0
393+oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
394+oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
395+python-barbicanclient<3.1.0,>=3.0.1
396 pyasn1
397-pyasn1_modules
398+pyasn1-modules
399 pyOpenSSL>=0.11
400
401=== modified file 'neutron_lbaas/tests/unit/common/tls_utils/test_cert_parser.py'
402--- neutron_lbaas/tests/unit/common/tls_utils/test_cert_parser.py 2015-04-10 09:59:17 +0000
403+++ neutron_lbaas/tests/unit/common/tls_utils/test_cert_parser.py 2015-08-04 17:29:23 +0000
404@@ -251,7 +251,6 @@
405 self.assertTrue(epkey.check())
406
407 def test_dump_private_key(self):
408- self.skipTest('Skipped by Ubuntu')
409 self.assertRaises(exceptions.NeedsPassphrase,
410 cert_parser.dump_private_key,
411 ENCRYPTED_PKCS8_CRT_KEY)
412
413=== modified file 'neutron_lbaas/tests/unit/drivers/haproxy/test_synchronous_driver.py'
414--- neutron_lbaas/tests/unit/drivers/haproxy/test_synchronous_driver.py 2015-03-30 11:19:14 +0000
415+++ neutron_lbaas/tests/unit/drivers/haproxy/test_synchronous_driver.py 2015-08-04 17:29:23 +0000
416@@ -455,8 +455,8 @@
417 device_exists.return_value = True
418 self.driver._cleanup_namespace(self._sample_in_loadbalancer().id)
419 device_exists.assert_called_once_with(device.name)
420- vif_driver.unplug.assert_any_calls(
421- [mock.call(device.name, ns_name.return_value)])
422+ vif_driver.unplug.assert_any_call(
423+ device.name, namespace=ns_name.return_value)
424 self.assertEqual(1, vif_driver.unplug.call_count)
425
426 def test_kill_processes(self):
427
428=== modified file 'neutron_lbaas/tests/unit/drivers/radware/test_v2_plugin_driver.py'
429--- neutron_lbaas/tests/unit/drivers/radware/test_v2_plugin_driver.py 2015-04-10 09:59:17 +0000
430+++ neutron_lbaas/tests/unit/drivers/radware/test_v2_plugin_driver.py 2015-08-04 17:29:23 +0000
431@@ -165,6 +165,8 @@
432 None, None, False)
433
434 def test_flip_servers(self):
435+ self.skipTest('Test incorrectly using assert method that does not '
436+ 'exist.')
437 server = self.driver.rest_client.server
438 sec_server = self.driver.rest_client.secondary_server
439 self.driver.rest_client._recover = self.orig_recover
440@@ -254,6 +256,8 @@
441 self.assertTrue(False)
442
443 def test_wf_created_on_first_member_creation(self):
444+ self.skipTest('Test incorrectly using assert method that does not '
445+ 'exist.')
446 with self.subnet(cidr='10.0.0.0/24') as vip_sub:
447 with self.loadbalancer(subnet=vip_sub) as lb:
448 with self.listener(
449
450=== modified file 'requirements.txt'
451--- requirements.txt 2015-04-30 17:35:09 +0000
452+++ requirements.txt 2015-08-04 17:29:23 +0000
453@@ -1,23 +1,23 @@
454 # The order of packages is significant, because pip processes them in the order
455 # of appearance. Changing the order has an impact on the overall integration
456 # process, which may cause wedges in the gate later.
457-pbr>=0.6,!=0.7,<1.0
458+pbr!=0.7,<1.0,>=0.6
459
460-eventlet>=0.16.1,!=0.17.0
461-requests>=2.2.0,!=2.4.0
462+eventlet!=0.17.0,>=0.16.1
463+requests!=2.4.0,>=2.2.0
464 netaddr>=0.7.12
465-SQLAlchemy>=0.9.7,<=0.9.99
466+SQLAlchemy<=0.9.99,>=0.9.7
467 alembic>=0.7.2
468 six>=1.9.0
469-oslo.config>=1.9.3,<1.10.0 # Apache-2.0
470-oslo.db>=1.7.0,<1.8.0 # Apache-2.0
471-oslo.log>=1.0.0,<1.1.0 # Apache-2.0
472-oslo.messaging>=1.8.0,<1.9.0 # Apache-2.0
473-oslo.serialization>=1.4.0,<1.5.0 # Apache-2.0
474-oslo.utils>=1.4.0,<1.5.0 # Apache-2.0
475-python-barbicanclient>=3.0.1,<3.1.0
476+oslo.config<1.10.0,>=1.9.3 # Apache-2.0
477+oslo.db<1.8.0,>=1.7.0 # Apache-2.0
478+oslo.log<1.1.0,>=1.0.0 # Apache-2.0
479+oslo.messaging<1.9.0,>=1.8.0 # Apache-2.0
480+oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
481+oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
482+python-barbicanclient<3.1.0,>=3.0.1
483 pyasn1
484-pyasn1_modules
485+pyasn1-modules
486 pyOpenSSL>=0.11
487
488 # This project does depend on neutron as a library, but the
489
490=== modified file 'setup.cfg'
491--- setup.cfg 2015-04-30 17:35:09 +0000
492+++ setup.cfg 2015-08-04 17:29:23 +0000
493@@ -1,6 +1,6 @@
494 [metadata]
495 name = neutron-lbaas
496-version = 2015.1
497+version = 2015.1.1
498 summary = OpenStack Networking Load Balancing as a Service
499 description-file =
500 README.rst
501
502=== modified file 'setup.py'
503--- setup.py 2015-01-14 11:31:23 +0000
504+++ setup.py 2015-08-04 17:29:23 +0000
505@@ -1,4 +1,3 @@
506-#!/usr/bin/env python
507 # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
508 #
509 # Licensed under the Apache License, Version 2.0 (the "License");
510
511=== modified file 'test-requirements.txt'
512--- test-requirements.txt 2015-04-10 09:59:17 +0000
513+++ test-requirements.txt 2015-08-04 17:29:23 +0000
514@@ -1,24 +1,24 @@
515 # The order of packages is significant, because pip processes them in the order
516 # of appearance. Changing the order has an impact on the overall integration
517 # process, which may cause wedges in the gate later.
518-hacking>=0.10.0,<0.11
519+hacking<0.11,>=0.10.0
520
521-cliff>=1.10.0,<1.11.0 # Apache-2.0
522+cliff<1.11.0,>=1.10.0 # Apache-2.0
523 coverage>=3.6
524 discover
525-fixtures>=0.3.14
526-mock>=1.0
527+fixtures<1.3.0,>=0.3.14
528+mock<1.1.0,>=1.0
529 python-subunit>=0.0.18
530-requests-mock>=0.6.0 # Apache-2.0
531-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
532-oslosphinx>=2.5.0,<2.6.0 # Apache-2.0
533-oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0
534-tempest-lib>=0.4.0
535+requests-mock>=0.6.0 # Apache-2.0
536+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
537+oslosphinx<2.6.0,>=2.5.0 # Apache-2.0
538+oslo.concurrency<1.9.0,>=1.8.0 # Apache-2.0
539+tempest-lib<0.5.0,>=0.4.0
540 testrepository>=0.0.18
541-testtools>=0.9.36,!=1.2.0
542+testtools!=1.2.0,>=0.9.36
543 testscenarios>=0.4
544 WebOb>=1.2.3
545 WebTest>=2.0
546-oslotest>=1.5.1,<1.6.0 # Apache-2.0
547+oslotest<1.6.0,>=1.5.1 # Apache-2.0
548 psycopg2
549 MySQL-python

Subscribers

People subscribed via source and target branches

to all changes: