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