Merge lp:~corey.bryant/ubuntu/trusty/neutron/fix-for-1273877 into lp:ubuntu/trusty/neutron
- Trusty (14.04)
- fix-for-1273877
- Merge into trusty
Status: | Superseded |
---|---|
Proposed branch: | lp:~corey.bryant/ubuntu/trusty/neutron/fix-for-1273877 |
Merge into: | lp:ubuntu/trusty/neutron |
Diff against target: |
4018 lines (+3517/-0) (has conflicts) 99 files modified
debian/NEWS (+8/-0) debian/changelog (+759/-0) debian/compat (+1/-0) debian/control (+676/-0) debian/copyright (+37/-0) debian/cron.d/neutron-dhcp-agent-netns-cleanup (+4/-0) debian/cron.d/neutron-l3-agent-netns-cleanup (+4/-0) debian/cron.d/neutron-lbaas-agent-netns-cleanup (+4/-0) debian/mans/neutron-linuxbridge-agent.8 (+11/-0) debian/mans/neutron-nec-agent.8 (+11/-0) debian/mans/neutron-openvswitch-agent.8 (+11/-0) debian/mans/neutron-rootwrap.8 (+11/-0) debian/mans/neutron-ryu-agent.8 (+11/-0) debian/mans/neutron-server.8 (+11/-0) debian/neutron-common.dirs (+5/-0) debian/neutron-common.install (+14/-0) debian/neutron-common.postinst (+31/-0) debian/neutron-dhcp-agent.install (+4/-0) debian/neutron-dhcp-agent.logrotate (+7/-0) debian/neutron-dhcp-agent.upstart (+22/-0) debian/neutron-l3-agent.install (+4/-0) debian/neutron-l3-agent.logrotate (+7/-0) debian/neutron-l3-agent.upstart (+22/-0) debian/neutron-lbaas-agent.install (+4/-0) debian/neutron-lbaas-agent.logrotate (+7/-0) debian/neutron-lbaas-agent.upstart (+17/-0) debian/neutron-metadata-agent.install (+3/-0) debian/neutron-metadata-agent.logrotate (+7/-0) debian/neutron-metadata-agent.upstart (+19/-0) debian/neutron-plugin-bigswitch.install (+1/-0) debian/neutron-plugin-brocade.install (+1/-0) debian/neutron-plugin-cisco.install (+1/-0) debian/neutron-plugin-hyperv.install (+2/-0) debian/neutron-plugin-linuxbridge-agent.install (+2/-0) debian/neutron-plugin-linuxbridge-agent.logrotate (+7/-0) debian/neutron-plugin-linuxbridge-agent.manpages (+1/-0) debian/neutron-plugin-linuxbridge-agent.upstart (+17/-0) debian/neutron-plugin-linuxbridge.install (+1/-0) debian/neutron-plugin-metaplugin.install (+1/-0) debian/neutron-plugin-metering-agent.install (+2/-0) debian/neutron-plugin-metering-agent.upstart (+19/-0) debian/neutron-plugin-midonet.install (+1/-0) debian/neutron-plugin-ml2.install (+1/-0) debian/neutron-plugin-mlnx-agent.install (+2/-0) debian/neutron-plugin-mlnx-agent.upstart (+19/-0) debian/neutron-plugin-nec-agent.install (+2/-0) debian/neutron-plugin-nec-agent.logrotate (+7/-0) debian/neutron-plugin-nec-agent.manpages (+1/-0) debian/neutron-plugin-nec-agent.upstart (+17/-0) debian/neutron-plugin-nec.install (+1/-0) debian/neutron-plugin-openvswitch-agent.install (+2/-0) debian/neutron-plugin-openvswitch-agent.logrotate (+7/-0) debian/neutron-plugin-openvswitch-agent.manpages (+1/-0) debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.upstart (+13/-0) debian/neutron-plugin-openvswitch-agent.upstart (+17/-0) debian/neutron-plugin-openvswitch.install (+1/-0) debian/neutron-plugin-plumgrid.install (+1/-0) debian/neutron-plugin-ryu-agent.install (+2/-0) debian/neutron-plugin-ryu-agent.logrotate (+7/-0) debian/neutron-plugin-ryu-agent.manpages (+1/-0) debian/neutron-plugin-ryu-agent.upstart (+17/-0) debian/neutron-plugin-ryu.install (+1/-0) debian/neutron-plugin-vmware.install (+3/-0) debian/neutron-plugin-vpn-agent.install (+2/-0) debian/neutron-plugin-vpn-agent.upstart (+19/-0) debian/neutron-server.default (+5/-0) debian/neutron-server.install (+1/-0) debian/neutron-server.logrotate (+7/-0) debian/neutron-server.manpages (+2/-0) debian/neutron-server.upstart (+23/-0) debian/neutron_sudoers (+3/-0) debian/patches/disable-failing-cisco-test.patch (+25/-0) debian/patches/disable-failing-metaplugin-tests.patch (+67/-0) debian/patches/disable-udev-tests.patch (+1008/-0) debian/patches/fix-quantum-configuration.patch (+48/-0) debian/patches/series (+7/-0) debian/patches/skip-ipv6-tests.patch (+22/-0) debian/patches/skip-lb-test.patch (+14/-0) debian/patches/sql-alchemy-0.8.3-compat.patch (+67/-0) debian/pydist-overrides (+3/-0) debian/python-neutron.install (+1/-0) debian/rules (+31/-0) debian/source/format (+1/-0) debian/tests/bigswitch-plugin (+19/-0) debian/tests/brocade-plugin (+19/-0) debian/tests/cisco-plugin (+19/-0) debian/tests/control (+6/-0) debian/tests/hyperv-plugin (+19/-0) debian/tests/linuxbridge-plugin (+19/-0) debian/tests/midonet-plugin (+19/-0) debian/tests/nec-plugin (+19/-0) debian/tests/neutron-daemons (+14/-0) debian/tests/openvswitch-plugin (+19/-0) debian/tests/plumgrid-plugin (+19/-0) debian/tests/python-neutron (+14/-0) debian/tests/ryu-plugin (+19/-0) debian/tests/test_import_neutron.py (+4/-0) debian/tests/vmware-plugin (+19/-0) debian/watch (+3/-0) Conflict adding file debian. Moved existing file to debian.moved. |
To merge this branch: | bzr merge lp:~corey.bryant/ubuntu/trusty/neutron/fix-for-1273877 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chuck Short | Pending | ||
Review via email: mp+207946@code.launchpad.net |
This proposal has been superseded by a proposal from 2014-02-24.
Commit message
Description of the change
This is for neutron packing updates for https:/
* Renamed Nicira NVP plugin to VMware NSX:
- debian/
- debian/
- debian/control:
+ Change neutron-
+ Add neutron-
- 237. By Corey Bryant
-
* Renamed Nicira NVP plugin to VMware NSX (LP: #1273877):
- debian/neutron- plugin- *.install: Update path and file for rename
- debian/tests/* -plugin: Replace nicira-plugin with vmware-plugin
- debian/control:
+ Change neutron-plugin- nicira to transtional package
+ Add neutron-plugin- vmware package which breaks/replaces
neutron-plugin- nicira package.
*
Unmerged revisions
- 237. By Corey Bryant
-
* Renamed Nicira NVP plugin to VMware NSX (LP: #1273877):
- debian/neutron- plugin- *.install: Update path and file for rename
- debian/tests/* -plugin: Replace nicira-plugin with vmware-plugin
- debian/control:
+ Change neutron-plugin- nicira to transtional package
+ Add neutron-plugin- vmware package which breaks/replaces
neutron-plugin- nicira package.
* - 236. By Corey Bryant
-
debian/
patches/ sql-alchemy- 0.8.3-compat. patch: Revert prior drop. - 235. By Chuck Short
-
debian/
patches/ bump-sqlalchemy -version. patch: Dropped no longer needed. - 234. By Chuck Short
-
debian/
patches/ sql-alchemy- 0.8.3-compat. patch: Dropped no longer needed. - 233. By Chuck Short
-
Disable patch
- 232. By Chuck Short
-
debian/
patches/ requirements. patch: Dropped no longer needed. - 231. By Chuck Short
-
debian/rules: Re-enabled tests.
- 230. By Chuck Short
-
releasing package neutron version 1:2014.
1~b2-0ubuntu6 - 229. By Chuck Short
-
releasing package neutron version 1:2014.
1~b2-0ubuntu6 - 228. By Chuck Short
-
Fix up changelog
Preview Diff
1 | === added directory 'debian' | |||
2 | === renamed directory 'debian' => 'debian.moved' | |||
3 | === added file 'debian/NEWS' | |||
4 | --- debian/NEWS 1970-01-01 00:00:00 +0000 | |||
5 | +++ debian/NEWS 2014-02-24 14:59:12 +0000 | |||
6 | @@ -0,0 +1,8 @@ | |||
7 | 1 | neutron (1:2013.2~b2-0ubuntu1) saucy; urgency=low | ||
8 | 2 | |||
9 | 3 | Quantum has been renamed to Neutron during the Havana development cycle. | ||
10 | 4 | |||
11 | 5 | Please review changed configuration in /etc/quantum and apply to new | ||
12 | 6 | configuration files in /etc/neutron. | ||
13 | 7 | |||
14 | 8 | -- James Page <james.page@ubuntu.com> Thu, 18 Jul 2013 10:07:15 +0100 | ||
15 | 0 | 9 | ||
16 | === added file 'debian/changelog' | |||
17 | --- debian/changelog 1970-01-01 00:00:00 +0000 | |||
18 | +++ debian/changelog 2014-02-24 14:59:12 +0000 | |||
19 | @@ -0,0 +1,759 @@ | |||
20 | 1 | neutron (1:2014.1~b2-0ubuntu7) UNRELEASED; urgency=medium | ||
21 | 2 | |||
22 | 3 | [ Chuck Short ] | ||
23 | 4 | * debian/rules: Re-enabled tests. | ||
24 | 5 | * debian/patches/requirements.patch: Dropped no longer needed. | ||
25 | 6 | * debian/patches/sql-alchemy-0.8.3-compat.patch: Dropped no longer needed. | ||
26 | 7 | * debian/patches/bump-sqlalchemy-version.patch: Dropped no longer needed. | ||
27 | 8 | |||
28 | 9 | [ Corey Bryant ] | ||
29 | 10 | * debian/patches/sql-alchemy-0.8.3-compat.patch: Revert prior drop. | ||
30 | 11 | * Renamed Nicira NVP plugin to VMware NSX: | ||
31 | 12 | - debian/neutron-plugin-*.install: Update path and file for rename | ||
32 | 13 | - debian/tests/*-plugin: Replace nicira-plugin with vmware-plugin | ||
33 | 14 | - debian/control: | ||
34 | 15 | + Change neutron-plugin-nicira to transtional package | ||
35 | 16 | + Add neutron-plugin-vmware package which breaks/replaces | ||
36 | 17 | neutron-plugin-nicira package. | ||
37 | 18 | |||
38 | 19 | -- Corey Bryant <corey.bryant@canonical.com> Fri, 21 Feb 2014 15:04:13 -0500 | ||
39 | 20 | |||
40 | 21 | neutron (1:2014.1~b2-0ubuntu6) trusty; urgency=medium | ||
41 | 22 | |||
42 | 23 | * debian/rules: Temporarily disable testsuite due to upstream breakage. | ||
43 | 24 | |||
44 | 25 | -- Chuck Short <zulcss@ubuntu.com> Thu, 06 Feb 2014 08:33:08 -0500 | ||
45 | 26 | |||
46 | 27 | neutron (1:2014.1~b2-0ubuntu5) trusty; urgency=medium | ||
47 | 28 | |||
48 | 29 | * debian/patches/disable-udev-tests.patch: Skip more tests | ||
49 | 30 | because of udev failures. | ||
50 | 31 | * debian/patches/skip-ipv6-tests.patch: Skip tests that fail | ||
51 | 32 | on the buildds due to ipv6. | ||
52 | 33 | |||
53 | 34 | -- Chuck Short <zulcss@ubuntu.com> Mon, 03 Feb 2014 09:02:45 -0500 | ||
54 | 35 | |||
55 | 36 | neutron (1:2014.1~b2-0ubuntu4) trusty; urgency=medium | ||
56 | 37 | |||
57 | 38 | * debian/rules: Really run_tests.sh. | ||
58 | 39 | |||
59 | 40 | -- Chuck Short <zulcss@ubuntu.com> Thu, 30 Jan 2014 11:44:21 -0500 | ||
60 | 41 | |||
61 | 42 | neutron (1:2014.1~b2-0ubuntu3) trusty; urgency=medium | ||
62 | 43 | |||
63 | 44 | * debian/rules: Switch back to run_test.sh since locking | ||
64 | 45 | issues have been fixed. | ||
65 | 46 | |||
66 | 47 | -- Chuck Short <zulcss@ubuntu.com> Thu, 30 Jan 2014 10:49:22 -0500 | ||
67 | 48 | |||
68 | 49 | neutron (1:2014.1~b2-0ubuntu2) trusty; urgency=medium | ||
69 | 50 | |||
70 | 51 | * debian/patches/skip-lb-test.patch: Skipped lb configuration | ||
71 | 52 | test. | ||
72 | 53 | |||
73 | 54 | -- Chuck Short <zulcss@ubuntu.com> Mon, 27 Jan 2014 12:01:50 -0500 | ||
74 | 55 | |||
75 | 56 | neutron (1:2014.1~b2-0ubuntu1) trusty; urgency=low | ||
76 | 57 | |||
77 | 58 | [ James Page ] | ||
78 | 59 | * Switch to using Modular Layer 2 plugin by default: | ||
79 | 60 | - d/control,neutron-plugin-ml2.install: Add ML2 plugin package | ||
80 | 61 | (LP: #1243147). | ||
81 | 62 | - d/p/fix-quantum-configuration,d/control,d/neutron-server.default: | ||
82 | 63 | Switch to using the ML2 plugin by default. | ||
83 | 64 | - d/control,neutron-plugin-openvswitch-agent: | ||
84 | 65 | Use neutron-plugin-ml2 and configuration for openvswitch-agent. | ||
85 | 66 | * d/neutron-plugin-mlnx-agent.upstart: Reference correct configuration | ||
86 | 67 | file (LP: #1257732). | ||
87 | 68 | * Add neutron-ovs-cleanup upstart configuration for OVS plugin | ||
88 | 69 | (LP: #1249708): | ||
89 | 70 | - d/rules: Install new configuration in neutron-plugin-openvswitch-agent | ||
90 | 71 | package, don't restart on install/upgrade (only needed for reboots). | ||
91 | 72 | - d/neutron-plugin-openvswitch-agent.upstart: Ensure startup happens | ||
92 | 73 | after neutron-ovs-cleanup. | ||
93 | 74 | - d/neutron-{l3|dhcp}-agent.upstart: If neutron-ovs-cleanup job is | ||
94 | 75 | installed, wait for it to reach running state prior to starting | ||
95 | 76 | agents. | ||
96 | 77 | * d/control: Add versioned BD/Depends on python-psutil >= 0.6.1. | ||
97 | 78 | * d/p/requirements.patch: Drop upper version boundary for psutil for | ||
98 | 79 | compatibility with Trusty. | ||
99 | 80 | * d/p/requirements.patch: Lift upper boundary for WebOb to < 1.4. | ||
100 | 81 | * d/p/disable-failing-metaplugin-tests.patch: Disable metaplugin tests that | ||
101 | 82 | are currently failing. | ||
102 | 83 | * d/p/disable-ml2-notification-tests.patch: Dropped, tests now pass. | ||
103 | 84 | * d/rules: Fail package build on unit test failures. | ||
104 | 85 | * d/p/disable-failing-cisco-test.patch: Disable failing Cisco mechanism test. | ||
105 | 86 | * d/control,d/p/remove-jsonrpclib.patch: Add BD on python-jsonrpclib and drop | ||
106 | 87 | patch that excludes it from requirements.txt. | ||
107 | 88 | |||
108 | 89 | [ Chuck Short ] | ||
109 | 90 | * New upstream release. | ||
110 | 91 | * debian/rules: Run testr directly | ||
111 | 92 | * debian/patches/sql-alchemy-0.8.3-compat.patch: Fix tests sqlalchemy 0.8.3 | ||
112 | 93 | compat. | ||
113 | 94 | * debian/neturon-nicira.install: Add usr/bin/neutron-check-nsx-config. | ||
114 | 95 | |||
115 | 96 | -- Chuck Short <zulcss@ubuntu.com> Fri, 24 Jan 2014 09:17:12 -0500 | ||
116 | 97 | |||
117 | 98 | neutron (1:2014.1~b1-0ubuntu1) trusty; urgency=low | ||
118 | 99 | |||
119 | 100 | [ Chuck Short ] | ||
120 | 101 | * New upstream release. | ||
121 | 102 | * debian/control: open icehouse release. | ||
122 | 103 | |||
123 | 104 | [ James Page ] | ||
124 | 105 | * debian/patches: Refresh patches against upstream master. | ||
125 | 106 | * debian/control: Drop quantum-* transitional packages, no longer needed. | ||
126 | 107 | |||
127 | 108 | -- Chuck Short <zulcss@ubuntu.com> Thu, 05 Dec 2013 11:40:39 -0500 | ||
128 | 109 | |||
129 | 110 | neutron (1:2013.2-0ubuntu1) saucy; urgency=low | ||
130 | 111 | |||
131 | 112 | * New upstream release (LP: #1236462). | ||
132 | 113 | |||
133 | 114 | -- Chuck Short <zulcss@ubuntu.com> Thu, 17 Oct 2013 10:52:39 -0400 | ||
134 | 115 | |||
135 | 116 | neutron (1:2013.2~rc3-0ubuntu1) saucy; urgency=low | ||
136 | 117 | |||
137 | 118 | * New upstream release candidate (LP: #1240665). | ||
138 | 119 | |||
139 | 120 | -- Chuck Short <zulcss@ubuntu.com> Wed, 16 Oct 2013 15:37:02 -0400 | ||
140 | 121 | |||
141 | 122 | neutron (1:2013.2~rc2-0ubuntu1) saucy; urgency=low | ||
142 | 123 | |||
143 | 124 | * New upstream release candidate (LP: #1239156). | ||
144 | 125 | |||
145 | 126 | -- James Page <james.page@ubuntu.com> Sat, 12 Oct 2013 16:51:28 +0100 | ||
146 | 127 | |||
147 | 128 | neutron (1:2013.2~rc1-0ubuntu2) saucy; urgency=low | ||
148 | 129 | |||
149 | 130 | * d/tests/control,neutron-server: Limit neutron-server tests to core | ||
150 | 131 | neutron daemons to avoid tests failures for plugin agents which don't | ||
151 | 132 | start correctly without additional configuration. | ||
152 | 133 | |||
153 | 134 | -- James Page <james.page@ubuntu.com> Thu, 03 Oct 2013 23:05:05 +0100 | ||
154 | 135 | |||
155 | 136 | neutron (1:2013.2~rc1-0ubuntu1) saucy; urgency=low | ||
156 | 137 | |||
157 | 138 | [ Yolanda Robla ] | ||
158 | 139 | * debian/tests: added testing agents | ||
159 | 140 | |||
160 | 141 | [ Chuck Short ] | ||
161 | 142 | * debian/patches/disable-udev-tests.patch: Refreshed. | ||
162 | 143 | * debian/patches/disable-ml2-notification-tests.patch: Refreshed. | ||
163 | 144 | * debian/control: | ||
164 | 145 | - Dropped python-setuptools-git python-netifaces, and python-nose from | ||
165 | 146 | build dependencies. | ||
166 | 147 | - Dropped python-configobj, python-gflags from binary dependencies. | ||
167 | 148 | - Added build python-requests python-six, and python-jinja2 build | ||
168 | 149 | dependencies. | ||
169 | 150 | - Added versioned dependencies for python-amqplib, | ||
170 | 151 | python-pbr, python-novaclient, python-cliff, | ||
171 | 152 | python-testtools, and python-eventlet. | ||
172 | 153 | - Bumped versioned depends for python-stevedore, pyhton-novaclient, | ||
173 | 154 | python-oslo.config, and testrepository | ||
174 | 155 | |||
175 | 156 | [ James Page ] | ||
176 | 157 | * New upstream release candidate: | ||
177 | 158 | - d/patches: Refreshed. | ||
178 | 159 | * d/rules: unpatch/patch neutron.conf around test execution to ensure that | ||
179 | 160 | as many tests as possible actually pass. | ||
180 | 161 | |||
181 | 162 | -- James Page <james.page@ubuntu.com> Thu, 03 Oct 2013 15:18:04 +0100 | ||
182 | 163 | |||
183 | 164 | neutron (1:2013.2~b3-0ubuntu6) saucy; urgency=low | ||
184 | 165 | |||
185 | 166 | * debian/rules: Dont ftbfs the tests if they fail. | ||
186 | 167 | |||
187 | 168 | -- Chuck Short <zulcss@ubuntu.com> Tue, 10 Sep 2013 20:37:18 -0400 | ||
188 | 169 | |||
189 | 170 | neutron (1:2013.2~b3-0ubuntu5) saucy; urgency=low | ||
190 | 171 | |||
191 | 172 | * debian/tests/neutron-daemons: Fix typo. | ||
192 | 173 | * debian/rules: FTBFS if testsuite fails. | ||
193 | 174 | |||
194 | 175 | -- Chuck Short <zulcss@ubuntu.com> Tue, 10 Sep 2013 17:27:25 -0400 | ||
195 | 176 | |||
196 | 177 | neutron (1:2013.2~b3-0ubuntu4) saucy; urgency=low | ||
197 | 178 | |||
198 | 179 | * debian/patches/remove_jsonrpclib.patch: Remove jsonrpclib | ||
199 | 180 | its not needed other than the arista driver. | ||
200 | 181 | |||
201 | 182 | -- Chuck Short <zulcss@ubuntu.com> Tue, 10 Sep 2013 15:19:22 -0400 | ||
202 | 183 | |||
203 | 184 | neutron (1:2013.2~b3-0ubuntu3) saucy; urgency=low | ||
204 | 185 | |||
205 | 186 | * debian/tests: Fixed autopkg tests. | ||
206 | 187 | |||
207 | 188 | -- Chuck Short <zulcss@ubuntu.com> Tue, 10 Sep 2013 12:10:05 -0400 | ||
208 | 189 | |||
209 | 190 | neutron (1:2013.2~b3-0ubuntu2) saucy; urgency=low | ||
210 | 191 | |||
211 | 192 | * debian/control, debian/neutron-plugin-vpn-agent.install, | ||
212 | 193 | debian/neutron-plugin-vpn-agent.install: Add vpn agent. | ||
213 | 194 | * debian/control, debian/usr/bin/neutron-metering-agent.install, | ||
214 | 195 | debian/usr/bin/neutron-metering-agent.install: Add metering agent. | ||
215 | 196 | |||
216 | 197 | -- Chuck Short <zulcss@ubuntu.com> Mon, 09 Sep 2013 22:35:59 -0400 | ||
217 | 198 | |||
218 | 199 | neutron (1:2013.2~b3-0ubuntu1) saucy; urgency=low | ||
219 | 200 | |||
220 | 201 | [ Chuck Short ] | ||
221 | 202 | * New upstream release. | ||
222 | 203 | * debian/patches/fix-quantum-configuration.patch: Refreshed. | ||
223 | 204 | * debian/patches/neutron-conf.patch: Dropped. | ||
224 | 205 | * debian/patches/ignore-quantum-binaries.patch: Dropped | ||
225 | 206 | * debian/control: Add python-babel as a build depends. | ||
226 | 207 | * debian/neutron-common.install: Add neutron-usage-audit binary. | ||
227 | 208 | * debian/rules: Pass the tests even if it fails, temporary measure | ||
228 | 209 | until we figure out why the tests fail. | ||
229 | 210 | |||
230 | 211 | [ Adam Gandelman ] | ||
231 | 212 | * debian/rules: Limit testr concurrency to 1 CPU. | ||
232 | 213 | * debian/patches: Refresh. | ||
233 | 214 | |||
234 | 215 | [ James Page ] | ||
235 | 216 | * d/*.upstart: Added respawn stanza (LP: #1170393), tidied | ||
236 | 217 | descriptions and rationalized stop on stanzas to be consistent. | ||
237 | 218 | * d/neutron-dhcp-agent.install: Drop neutron-dhcp-agent-dnsmasq-lease- | ||
238 | 219 | update inline with upstream. | ||
239 | 220 | * d/rules: Ignore deprecated quantum binaries when checking for | ||
240 | 221 | missing files. | ||
241 | 222 | * d/control: Update/add versioned depends for upgrades: | ||
242 | 223 | - python-anyjson >= 0.3.3 | ||
243 | 224 | - python-stevedore >= 0.9 | ||
244 | 225 | - python-oslo.config >= 1:1.2.0 | ||
245 | 226 | - python-keystoneclient >= 1:0.2.0 | ||
246 | 227 | * d/*: Wrap and sort. | ||
247 | 228 | |||
248 | 229 | -- Chuck Short <zulcss@ubuntu.com> Mon, 09 Sep 2013 13:12:57 -0400 | ||
249 | 230 | |||
250 | 231 | neutron (1:2013.2~b2-0ubuntu3) saucy; urgency=low | ||
251 | 232 | |||
252 | 233 | * d/p/neutron-conf.patch: Cherry picked commit from upstream VCS which | ||
253 | 234 | fixes a number of 'quantum' references across all configuration files. | ||
254 | 235 | * d/neutron_sudoers: Remove typo to re-enable passwordless sudo for neutron. | ||
255 | 236 | * d/p/fix-quantum-conf.patch: Enable use of neutron-rootwrap by default, | ||
256 | 237 | fixup problem with use of /var/lib/quantum for keystone signing_dir. | ||
257 | 238 | |||
258 | 239 | -- James Page <james.page@ubuntu.com> Wed, 24 Jul 2013 16:09:08 +0100 | ||
259 | 240 | |||
260 | 241 | neutron (1:2013.2~b2-0ubuntu2) saucy; urgency=low | ||
261 | 242 | |||
262 | 243 | * d/neutron-server.upstart: Execute correct server binary, fixup | ||
263 | 244 | use of flags in /etc/default/neutron-server. | ||
264 | 245 | * d/p/bump-sqlalchemy-version.patch: Support SQLAlchemy >= 0.8 until | ||
265 | 246 | upstream catches up. | ||
266 | 247 | * Re-jig test disablement patches: | ||
267 | 248 | - d/p/disable-udev-tests.patch: Disable tests that use udev as it | ||
268 | 249 | is not always available. | ||
269 | 250 | - d/p/disable-ml2-notification-tests.patch: Disable failing ML2 plugin | ||
270 | 251 | tests pending further investigation. | ||
271 | 252 | * d/p/fix-quantum-configuration.patch: Remove rej and orig cruft, re-added | ||
272 | 253 | missing default core_plugin configuration. | ||
273 | 254 | * d/control: Drop pep8 from BD's, no longer required. | ||
274 | 255 | |||
275 | 256 | -- James Page <james.page@ubuntu.com> Wed, 24 Jul 2013 11:41:56 +0100 | ||
276 | 257 | |||
277 | 258 | neutron (1:2013.2~b2-0ubuntu1) saucy; urgency=low | ||
278 | 259 | |||
279 | 260 | [ Chuck Short ] | ||
280 | 261 | * New upstream version. | ||
281 | 262 | * debian/patches/fix-quantum-configuration.patch: Refreshed | ||
282 | 263 | * Renamed quantum -> neutron inline with upstream: | ||
283 | 264 | - debian/neutron*.install: Update paths and files for rename. | ||
284 | 265 | - debian/cron.d: Update for new neutron names. | ||
285 | 266 | - debian/control: | ||
286 | 267 | + Add transtional packages. | ||
287 | 268 | + Add breaks/replaces with previous versions of quantum. | ||
288 | 269 | * debian/patches/fix-ubuntu-tests.patch: Refreshed | ||
289 | 270 | * debian/patches/ignore-quantum-binaries.patch: Don't install quantum | ||
290 | 271 | binaries. | ||
291 | 272 | * Add new mlnx agent package. | ||
292 | 273 | |||
293 | 274 | [ James Page ] | ||
294 | 275 | * d/control: Update VCS fields for new branch locations. | ||
295 | 276 | * d/NEWS: Let users know they need to migrate configuration manually as part | ||
296 | 277 | of the quantum->neutron rename. | ||
297 | 278 | * d/neutron-common.install: Include rootwrap for Xen dom0 installs. | ||
298 | 279 | |||
299 | 280 | [ Adam Gandelman ] | ||
300 | 281 | * debian/control: Set minimum python-kombu version >= 2.5.12. | ||
301 | 282 | |||
302 | 283 | -- Chuck Short <zulcss@ubuntu.com> Fri, 19 Jul 2013 12:11:18 -0400 | ||
303 | 284 | |||
304 | 285 | quantum (1:2013.2~b1-0ubuntu2) saucy; urgency=low | ||
305 | 286 | |||
306 | 287 | [ Adam Gandelman ] | ||
307 | 288 | * debian/control: | ||
308 | 289 | - Add version requirement to python-stevedore (>= 0.8), also add to | ||
309 | 290 | python-quantum depends. | ||
310 | 291 | - Add version requirement to python-fixtures (>= 0.3.12). | ||
311 | 292 | * debian/patches/*: Refreshed. | ||
312 | 293 | |||
313 | 294 | [ Yolanda Robla ] | ||
314 | 295 | * debian/tests: added autopkg tests | ||
315 | 296 | |||
316 | 297 | [Chuck Short] | ||
317 | 298 | * debian/patches/fix-ubuntu-tests.patch: Rediff to skip tests | ||
318 | 299 | that were randomly failing in the PPAS or locally. | ||
319 | 300 | |||
320 | 301 | -- Chuck Short <zulcss@ubuntu.com> Wed, 19 Jun 2013 12:06:15 -0500 | ||
321 | 302 | |||
322 | 303 | quantum (1:2013.2~b1-0ubuntu1) saucy; urgency=low | ||
323 | 304 | |||
324 | 305 | * New upstream release. | ||
325 | 306 | * debian/patches/fix-quantum-configuration.patch: Refreshed | ||
326 | 307 | * debian/control: Add testrepository. | ||
327 | 308 | * debian/control: Add subunit. | ||
328 | 309 | * debian/control: Add python-d21o1 and python-pbr as build-depends. | ||
329 | 310 | * debian/control: Add python-stevedore. | ||
330 | 311 | |||
331 | 312 | -- Chuck Short <zulcss@ubuntu.com> Fri, 31 May 2013 09:37:25 -0500 | ||
332 | 313 | |||
333 | 314 | quantum (1:2013.1-0ubuntu2) raring; urgency=low | ||
334 | 315 | |||
335 | 316 | * Fix invalid multi-line cron jobs (LP: #1170312): | ||
336 | 317 | - d/cron.d/*: Consolidate jobs into a single command line, set syntax | ||
337 | 318 | highlighting to type 'crontab'. | ||
338 | 319 | |||
339 | 320 | -- James Page <james.page@ubuntu.com> Mon, 22 Apr 2013 15:58:12 +0100 | ||
340 | 321 | |||
341 | 322 | quantum (1:2013.1-0ubuntu1) raring; urgency=low | ||
342 | 323 | |||
343 | 324 | * New upstream release. | ||
344 | 325 | |||
345 | 326 | -- Chuck Short <zulcss@ubuntu.com> Thu, 04 Apr 2013 14:03:41 -0500 | ||
346 | 327 | |||
347 | 328 | quantum (1:2013.1~rc2-0ubuntu1) raring; urgency=low | ||
348 | 329 | |||
349 | 330 | * New upstream release. | ||
350 | 331 | |||
351 | 332 | -- Chuck Short <zulcss@ubuntu.com> Tue, 26 Mar 2013 08:33:56 -0500 | ||
352 | 333 | |||
353 | 334 | quantum (1:2013.1~rc1-0ubuntu1) raring; urgency=low | ||
354 | 335 | |||
355 | 336 | [ Chuck Short ] | ||
356 | 337 | * debian/patches/fix-quantum-configuration.patch: Refreshed | ||
357 | 338 | * debian/control: Add python-testtools and python-fixtures a build-dep. | ||
358 | 339 | * debian/control: Drop python-gflags no longer needed. | ||
359 | 340 | * debian/control: Drop python-unittest2 no longer needed. | ||
360 | 341 | |||
361 | 342 | [ James Page ] | ||
362 | 343 | * New upstream release candidate. | ||
363 | 344 | * d/watch: Update uversionmangle to deal with upstream versioning | ||
364 | 345 | changes, remove tarballs.openstack.org. | ||
365 | 346 | * d/rules: Disable PEP-8 tests until fixed upstream. | ||
366 | 347 | * d/control,quantum-plugin-midonet.install: Added plugin package for | ||
367 | 348 | Midonet. | ||
368 | 349 | * d/control,quantum-lbaas-*: Added Load Balancing as-a Service agent | ||
369 | 350 | package. | ||
370 | 351 | * d/control: Bumped Standards-Version, no changes. | ||
371 | 352 | * d/p/fix-quantum-configuration.patch: Added midonet sqlite path to | ||
372 | 353 | patch, fixed up linuxbridge path. | ||
373 | 354 | * d/p/fix-ubuntu-tests.patch: Re-added skipTest for linuxbridge tests | ||
374 | 355 | that attempt to setup udev monitors. | ||
375 | 356 | * d/quantum-metadata-agent.*: Refactor metadata-agent into separate | ||
376 | 357 | package and add Depends from quantum-l3-agent and quantum-dhcp-agent. | ||
377 | 358 | * d/quantum-plugin-nicira.install: Add quantum-check-nvp-config binary. | ||
378 | 359 | * d/control: Add iputils-arping to quantum-l3-agent Depends (LP: #1153066). | ||
379 | 360 | * d/control: python-oslo-config -> python-oslo.config. | ||
380 | 361 | * d/control: Bump python-quantumclient >= 1:2.2.0 inline with upstream. | ||
381 | 362 | |||
382 | 363 | -- James Page <james.page@ubuntu.com> Fri, 15 Mar 2013 09:37:28 +0000 | ||
383 | 364 | |||
384 | 365 | quantum (2013.1.g3-0ubuntu1) raring; urgency=low | ||
385 | 366 | |||
386 | 367 | [ Adam Gandelman ] | ||
387 | 368 | * debian/patches/fix-quantum-configuration.patch: Refreshed and update to | ||
388 | 369 | reflect new global root_wrap configuration defined only in | ||
389 | 370 | /etc/quantum/quantum.conf. | ||
390 | 371 | * debian/patches/fix-ubuntu-tests.patch: Refreshed, added skipTests for | ||
391 | 372 | linuxbridge tests that attempt to setup udev monitors. | ||
392 | 373 | * debian/{control, quantum-server.install}: Drop quantum-ns-metadata-proxy, | ||
393 | 374 | quantum-metadata-agent, quantum-debug from quantum-server package and set a | ||
394 | 375 | Break/Replaces on the last quantum-server package that shipped them. | ||
395 | 376 | (LP: #1112203) | ||
396 | 377 | * debian/{control, quantum-plugin-nec.install}: Drop rootwrap filters, | ||
397 | 378 | only install /w the agent. | ||
398 | 379 | * debian/control: Add Breaks/Replaces between quantum-plugin-nec and new | ||
399 | 380 | quantum-plugin-nec-agent. | ||
400 | 381 | |||
401 | 382 | [ Yolanda Robla ] | ||
402 | 383 | * debian/patches: refreshed patches | ||
403 | 384 | |||
404 | 385 | [ James Page ] | ||
405 | 386 | * d/p/fix-quantum-configuration.patch: Add root_wrap helper to AGENT | ||
406 | 387 | section of /etc/quantum/quantum.conf to support new global configuration. | ||
407 | 388 | * d/control,quantum-plugin-{bigswitch,brocade,plumgrid}.install: Add new | ||
408 | 389 | plugin packages for BigSwitch, Brocade, Hyper-V and PLUMgrid. | ||
409 | 390 | * d/p/fix-quantum-configuration.patch: Set sqlite location for new plugins. | ||
410 | 391 | * d/control,quantum-plugin-nec-agent.*: Add new plugin agent package for NEC. | ||
411 | 392 | * d/quantum-common.install: Added new binaries and common rootwrap.d config. | ||
412 | 393 | * d/control: Removed VCS fields, updated maintainer. | ||
413 | 394 | * Wrapped and sorted debian/*. | ||
414 | 395 | * d/control: Add BD on python-oslo-config. | ||
415 | 396 | * d/control: Add BD on python-netifaces to fix RYU unit tests. | ||
416 | 397 | |||
417 | 398 | [ Chuck Short ] | ||
418 | 399 | * New upstream release. | ||
419 | 400 | |||
420 | 401 | -- Chuck Short <zulcss@ubuntu.com> Fri, 22 Feb 2013 09:54:36 -0600 | ||
421 | 402 | |||
422 | 403 | quantum (2013.1~g2-0ubuntu1) raring; urgency=low | ||
423 | 404 | |||
424 | 405 | [ Chuck Short ] | ||
425 | 406 | * New upstream version. | ||
426 | 407 | * debian/patches/fix-quantum-configuration.patch: Refreshed. | ||
427 | 408 | |||
428 | 409 | [ Yolanda Robla ] | ||
429 | 410 | * debian/quantum-l3-agent.quantum-metadata-agent.upstart: Add | ||
430 | 411 | upstart configuration for Metadata Agent. | ||
431 | 412 | * debian/quantum-l3-agent.install: Added quantum-ns-metadata-proxy, | ||
432 | 413 | quantum-metadata-agent and metadata_agent.ini. | ||
433 | 414 | * debian/patches/fix-quantum-configuration.patch: Update rootwrap | ||
434 | 415 | configuration in metadata_agent.ini file. | ||
435 | 416 | * debian/changelog: Updated package version | ||
436 | 417 | * d/p/fix-quantum-configuration.patch: refresh patches | ||
437 | 418 | * debian/patches/fix-ubuntu-tests.patch: Refreshed. | ||
438 | 419 | * debian/control: added python-novaclient dependency | ||
439 | 420 | |||
440 | 421 | [ James Page ] | ||
441 | 422 | * d/*.install: Install entry points from bin directory instead | ||
442 | 423 | of easy-install ones generated during the package build process | ||
443 | 424 | (LP: #1085038). | ||
444 | 425 | * d/control: Drop BD on python-dev-all; its not required. | ||
445 | 426 | * d/rules: Install multiple upstart configurations for quantum-l3-agent. | ||
446 | 427 | * d/control: Tidy package descriptions. | ||
447 | 428 | * d/*.postrm: Drop as debhelper will generate update-rc.d calls in | ||
448 | 429 | maintainer scripts if required. | ||
449 | 430 | * d/quantum-common.postinst: Tweak permissions setting so that /etc/quantum | ||
450 | 431 | is not owned/writable by the quantum user, ensure that /etc/quantum/rootwrap* | ||
451 | 432 | is owned by root:root. | ||
452 | 433 | * d/*agent*.postinst: Dropped as permissions now correctly set in | ||
453 | 434 | quantum-common. | ||
454 | 435 | * d/patches/fix-quantum-configuration.patch: Re-add dropped fixes rootwrap and | ||
455 | 436 | sqlite defaults for all plugins. | ||
456 | 437 | * d/control: Added new BD on alembic (>= 0.4.1~), version python-mock >= 1.0b1. | ||
457 | 438 | |||
458 | 439 | [ Maru Newby ] | ||
459 | 440 | * debian/control: Remove unnecessary openvswitch-vswitch dependency | ||
460 | 441 | from quantum-plugin-openvswitch (LP: #1076747). | ||
461 | 442 | |||
462 | 443 | -- Yolanda Robla <yolanda.robla@canonical.com> Tue, 22 Jan 2013 11:40:00 +0100 | ||
463 | 444 | |||
464 | 445 | quantum (2013.1~g1-0ubuntu1) raring; urgency=low | ||
465 | 446 | |||
466 | 447 | [ Adam Gandelman ] | ||
467 | 448 | * debian/patches/*: Refreshed for opening of Grizzly. | ||
468 | 449 | |||
469 | 450 | [ Chuck Short ] | ||
470 | 451 | * New upstream release. | ||
471 | 452 | * debian/rules: FTFBS if there is missing binaries. | ||
472 | 453 | * debian/quantum-server.install: Add quantum-debug. | ||
473 | 454 | |||
474 | 455 | -- Chuck Short <zulcss@ubuntu.com> Fri, 23 Nov 2012 09:43:14 -0600 | ||
475 | 456 | |||
476 | 457 | quantum (2012.2-0ubuntu1) quantal; urgency=low | ||
477 | 458 | |||
478 | 459 | [ Chuck Short ] | ||
479 | 460 | * New upstream release. | ||
480 | 461 | |||
481 | 462 | [ Adam Gandelman ] | ||
482 | 463 | * debian/cron.d/quantum-{l3, dhcp]-agent-netns-cleanup: Schedule hourly | ||
483 | 464 | cleanups of leaked Quantum network namespsaces using the | ||
484 | 465 | quantum-netns-cleanup utility. | ||
485 | 466 | |||
486 | 467 | -- Chuck Short <zulcss@ubuntu.com> Thu, 27 Sep 2012 13:19:33 -0500 | ||
487 | 468 | |||
488 | 469 | quantum (2012.2~rc3-0ubuntu1) quantal; urgency=low | ||
489 | 470 | |||
490 | 471 | * New upstream release. | ||
491 | 472 | |||
492 | 473 | -- Chuck Short <zulcss@ubuntu.com> Wed, 26 Sep 2012 15:14:31 -0500 | ||
493 | 474 | |||
494 | 475 | quantum (2012.2~rc2-0ubuntu1) quantal; urgency=low | ||
495 | 476 | |||
496 | 477 | [ Adam Gandelman ] | ||
497 | 478 | * debian/quantum-server.{default, upstart}: Use default file to specify | ||
498 | 479 | path to plugin config, which is passed to quantum-server as | ||
499 | 480 | '--config-file' during startup. (LP: #1009294) | ||
500 | 481 | * debian/control: | ||
501 | 482 | - Remove quantum-server's dependency on 'quantum-plugin'. | ||
502 | 483 | - Specify >= 1:0.1.0.1-0ubuntu1 requirement for python-quantumclient. | ||
503 | 484 | - Add dnsmasq dependencies to quantum-dhcp-agent Depends. | ||
504 | 485 | |||
505 | 486 | [ Chuck Short ] | ||
506 | 487 | * New upstream version. | ||
507 | 488 | * debian/patches/fix-ubuntu-tests.patch: Refreshed. | ||
508 | 489 | |||
509 | 490 | -- Chuck Short <zulcss@ubuntu.com> Fri, 21 Sep 2012 13:01:18 -0500 | ||
510 | 491 | |||
511 | 492 | quantum (2012.2~rc1-0ubuntu1) quantal; urgency=low | ||
512 | 493 | |||
513 | 494 | [ Adam Gandelman ] | ||
514 | 495 | * debain/*.postrm: Fix argument-less calls to update-rc.d, redirect | ||
515 | 496 | to /dev/null. (LP: #1047560) | ||
516 | 497 | * debian/quantum-server.upstart: Invoke start-stop-daemon properly. | ||
517 | 498 | (LP: #1047404) | ||
518 | 499 | * debain/*.postrm, *.upstart: Ensure files are named for corresponding | ||
519 | 500 | agent package, not plugin package. | ||
520 | 501 | * debian/control: | ||
521 | 502 | - Group agents with plugins. | ||
522 | 503 | - Fix some copy/paste mistakes. | ||
523 | 504 | - Set dependencies between agents and corresponding plugins. | ||
524 | 505 | - Recommend quantum-plugin-openvswitch for quantum-server. | ||
525 | 506 | - Require the same version of quantum-common and python-quantum. | ||
526 | 507 | - Add quantum-netns-cleanup utility to quantum-common. | ||
527 | 508 | * debian/patches/fix-quantum-configuration.patch: Use correct database | ||
528 | 509 | for linuxbridge plugin, use OVS plugin by default, call quantum-rootwrap | ||
529 | 510 | correctly. (LP: #1048668) | ||
530 | 511 | * Fix all use of /usr/sbin, things should go in /usr/bin. | ||
531 | 512 | * Remove dhcp and l3 plugins, they are not actually plugins. | ||
532 | 513 | * Rename packages quantum-plugin-{l3, dhcp}-agent to | ||
533 | 514 | quantum-{l3, dhcp}-agent. | ||
534 | 515 | * debain/quantum-*-agent.upstart: Specify config files as a | ||
535 | 516 | parameter to --config-file, specify log files for all. | ||
536 | 517 | * debian/*.logrotate: Add logrotate configs for server and agents. | ||
537 | 518 | * Install quantum_sudoers with quantum-common, not quantum-server. | ||
538 | 519 | * Install rootwrap filters only with the packages that require them. | ||
539 | 520 | * debian/*-agent.upstart: Specify --config-file=/etc/quantum/quantum.conf | ||
540 | 521 | in addition to plugin-specific config. Specify log files for all agents. | ||
541 | 522 | * Allow group 'adm' read access to /var/log/quantum. | ||
542 | 523 | * debian/quantum-server.postinst: Drop, all has been moved to quantum-common. | ||
543 | 524 | * Add packaging for quantum-plugin-nec. | ||
544 | 525 | |||
545 | 526 | [ Chuck Short ] | ||
546 | 527 | * New usptream release. | ||
547 | 528 | |||
548 | 529 | -- Chuck Short <zulcss@ubuntu.com> Wed, 12 Sep 2012 13:41:20 -0500 | ||
549 | 530 | |||
550 | 531 | quantum (2012.2~rc1~20120907.1154-0ubuntu1) quantal; urgency=low | ||
551 | 532 | |||
552 | 533 | [ Adam Gandelman ] | ||
553 | 534 | * debian/control: Add missing python-keystone dependency. | ||
554 | 535 | * wrap-and-sort. | ||
555 | 536 | |||
556 | 537 | [ Chuck Short ] | ||
557 | 538 | * debian/rules: | ||
558 | 539 | - Run testsuite on build. | ||
559 | 540 | - Use get-orig-source. | ||
560 | 541 | - Add python-amqplib, python-anyjson, python-httplib2, python-iso8601, | ||
561 | 542 | python-kombu, python-lxml, python-netadr, python-pyudev to build depends | ||
562 | 543 | and run time deps. | ||
563 | 544 | - Add python-mock, python-mox, and python-unitest2 to build deps. | ||
564 | 545 | - Add adduser as a dep to quantum-common. | ||
565 | 546 | * debian/control: Bump standards version to 3.9.3 | ||
566 | 547 | * debian/quantum-common.install: Add missing configuration files. | ||
567 | 548 | (LP: #988999) | ||
568 | 549 | * debian/quantum-plugin-linuxbridge.install: Make isntallable. | ||
569 | 550 | * Add manpages: gratitously ripped from debian. | ||
570 | 551 | * Fix up lintian warnings. (LP: #1025203), (LP: #1021921) | ||
571 | 552 | * Add metaplugin plugin. | ||
572 | 553 | * debian/patches/fix-namespace.patch: Dropped it was causing | ||
573 | 554 | python namespace issues. | ||
574 | 555 | (LP: #1045064) | ||
575 | 556 | * debian/*.upstart: | ||
576 | 557 | - Specify configuration file and log directory. | ||
577 | 558 | - Start on the right transition. | ||
578 | 559 | * debian/rules: | ||
579 | 560 | - Allow to disable testsuite. | ||
580 | 561 | - Dont fail if the testsuite fails. | ||
581 | 562 | * debian/patches/fix-quantum-configuration.patch: Fix configuration files. | ||
582 | 563 | * Add packaging for quantum-plugin-l3 and quantum-plugin-l3-agent | ||
583 | 564 | * Add packaging for quantum-plugin-dhcp-agent and quantum-plugin-dchp-agent | ||
584 | 565 | * debian/patches/fix-ubuntu-tests.patch: Fix testsuite failures. | ||
585 | 566 | |||
586 | 567 | [ Soren Hansen ] | ||
587 | 568 | * Update debian/watch to account for symbolically named tarballs and | ||
588 | 569 | use newer URL. | ||
589 | 570 | * Add python-configobj as a build and run time dependency. Recently added | ||
590 | 571 | tests need it, and the Cisco plugin has needed it for a while. | ||
591 | 572 | * Fix Launchpad URLs in debian/watch. | ||
592 | 573 | |||
593 | 574 | -- Chuck Short <zulcss@ubuntu.com> Fri, 07 Sep 2012 18:50:09 -0500 | ||
594 | 575 | |||
595 | 576 | quantum (2012.2~f3-0ubuntu1~cloud0) precise-folsom; urgency=low | ||
596 | 577 | |||
597 | 578 | * New upstream release. | ||
598 | 579 | |||
599 | 580 | -- Chuck Short <zulcss@ubuntu.com> Fri, 17 Aug 2012 10:42:58 -0500 | ||
600 | 581 | |||
601 | 582 | quantum (2012.2~f2-0ubuntu1~cloud0) precise-folsom; urgency=low | ||
602 | 583 | |||
603 | 584 | [ Chuck Short ] | ||
604 | 585 | * New upstream release. | ||
605 | 586 | |||
606 | 587 | [ Adam Gandelman ] | ||
607 | 588 | * debian/control, pydist-overrides: Add python-setuptools-git as a | ||
608 | 589 | Build-Depends, override as necessary. | ||
609 | 590 | |||
610 | 591 | -- Chuck Short <zulcss@ubuntu.com> Fri, 06 Jul 2012 12:41:43 -0400 | ||
611 | 592 | |||
612 | 593 | quantum (2012.2~f1-0ubuntu1~cloud0) precise-folsom; urgency=low | ||
613 | 594 | |||
614 | 595 | [ Chuck Short ] | ||
615 | 596 | * New upstream release. | ||
616 | 597 | * Add missing upsart jobs for agents. | ||
617 | 598 | * Add sudo wrapper for quantum-rootwrap. (LP: #999142) | ||
618 | 599 | |||
619 | 600 | [ Adam Gandelman ] | ||
620 | 601 | * debian/control: Fix spacing issues that cause mk-build-deps to fail. | ||
621 | 602 | * debian/quantum-server.install: Install new plugins config directory | ||
622 | 603 | instead of old .ini. | ||
623 | 604 | |||
624 | 605 | -- Chuck Short <zulcss@ubuntu.com> Fri, 22 Jun 2012 12:49:23 -0400 | ||
625 | 606 | |||
626 | 607 | quantum (2012.1-0ubuntu1) precise; urgency=low | ||
627 | 608 | |||
628 | 609 | [Adam Gandelman] | ||
629 | 610 | * Open precise-folsom-proposed. | ||
630 | 611 | * Merge with current precise-folsom-folsom-proposed. | ||
631 | 612 | |||
632 | 613 | [Chuck Short] | ||
633 | 614 | * New upstream release. | ||
634 | 615 | * Add missing upsart jobs for agents. | ||
635 | 616 | * Add sudo wrapper for quantum-rootwrap. (LP: #999142) | ||
636 | 617 | |||
637 | 618 | -- Chuck Short <zulcss@ubuntu.com> Fri, 01 Jun 2012 10:26:49 -0400 | ||
638 | 619 | |||
639 | 620 | quantum (2012.1-0ubuntu4) precise; urgency=low | ||
640 | 621 | |||
641 | 622 | * debian/control: Add breaks replaces since files have moved around. | ||
642 | 623 | * Fix typo in upstart job. | ||
643 | 624 | |||
644 | 625 | -- Chuck Short <zulcss@ubuntu.com> Mon, 23 Apr 2012 11:23:38 -0400 | ||
645 | 626 | |||
646 | 627 | quantum (2012.1-0ubuntu3) precise; urgency=low | ||
647 | 628 | |||
648 | 629 | * Split out agents into its own packages. (LP: #979192) | ||
649 | 630 | Thanks to Ghe Rivero. | ||
650 | 631 | * Add upstart job. (LP: #979190) | ||
651 | 632 | * Fix installation issues. (LP: #979159) | ||
652 | 633 | |||
653 | 634 | -- Chuck Short <zulcss@ubuntu.com> Thu, 12 Apr 2012 13:39:06 -0400 | ||
654 | 635 | |||
655 | 636 | quantum (2012.1-0ubuntu2) precise; urgency=low | ||
656 | 637 | |||
657 | 638 | * Fix lintian warnings about empty packages. | ||
658 | 639 | |||
659 | 640 | -- Chuck Short <zulcss@ubuntu.com> Fri, 06 Apr 2012 22:14:42 -0400 | ||
660 | 641 | |||
661 | 642 | quantum (2012.1-0ubuntu1) precise; urgency=low | ||
662 | 643 | |||
663 | 644 | * New upstream release. | ||
664 | 645 | |||
665 | 646 | -- Chuck Short <zulcss@ubuntu.com> Thu, 05 Apr 2012 11:07:46 -0400 | ||
666 | 647 | |||
667 | 648 | quantum (2012.1~rc2-0ubuntu1) precise; urgency=low | ||
668 | 649 | |||
669 | 650 | * New upstream release: | ||
670 | 651 | - debian/quantum-plugin-{ryu,openvswitch}.install: | ||
671 | 652 | Install agents. | ||
672 | 653 | |||
673 | 654 | -- Chuck Short <zulcss@ubuntu.com> Tue, 03 Apr 2012 20:29:11 -0400 | ||
674 | 655 | |||
675 | 656 | quantum (2012.1~rc1-0ubuntu5) precise; urgency=low | ||
676 | 657 | |||
677 | 658 | * Add missing files. (LP: #972019, LP: #971981, LP: #960731) | ||
678 | 659 | |||
679 | 660 | -- Chuck Short <zulcss@ubuntu.com> Mon, 02 Apr 2012 20:29:29 -0400 | ||
680 | 661 | |||
681 | 662 | quantum (2012.1~rc1-0ubuntu4) precise; urgency=low | ||
682 | 663 | |||
683 | 664 | * Make quantum installable again (LP: #965551): | ||
684 | 665 | - debian/control: quantum-server depends on quantum-common. | ||
685 | 666 | - debian/control: Add python-quantumclient dependency. | ||
686 | 667 | - debian/upstart: Rename and update upstart job. | ||
687 | 668 | - Fix typos in debian/quantum-common.postinst. | ||
688 | 669 | |||
689 | 670 | -- Chuck Short <zulcss@ubuntu.com> Fri, 30 Mar 2012 14:14:42 -0400 | ||
690 | 671 | |||
691 | 672 | quantum (2012.1~rc1-0ubuntu3) precise; urgency=low | ||
692 | 673 | |||
693 | 674 | * debian/control: Fix spelling typos. (LP: #960713) | ||
694 | 675 | |||
695 | 676 | -- Paolo Rotolo <paolorotolo@ubuntu-it.org> Fri, 23 Mar 2012 21:35:54 +0100 | ||
696 | 677 | |||
697 | 678 | quantum (2012.1~rc1-0ubuntu2) precise; urgency=low | ||
698 | 679 | |||
699 | 680 | * debian/control: Fix spelling typos. | ||
700 | 681 | * debian/upstart: Fix typo in upstart job | ||
701 | 682 | * debian/control: Rename quantum to quantum-server again. | ||
702 | 683 | * debian/control: Fix empty plugins. | ||
703 | 684 | * debian/upstart: use start-stop-daemon in upstart job. | ||
704 | 685 | * debian/patches/fix-namespace.patch: Fix namespace patch | ||
705 | 686 | * debian/control: Update vcs info. (LP: #960690) | ||
706 | 687 | |||
707 | 688 | -- Chuck Short <zulcss@ubuntu.com> Tue, 20 Mar 2012 13:58:24 -0400 | ||
708 | 689 | |||
709 | 690 | quantum (2012.1~rc1~20120316.764-0ubuntu1) precise; urgency=low | ||
710 | 691 | |||
711 | 692 | * New upstream release. | ||
712 | 693 | * debian/watch: Watch correct URL | ||
713 | 694 | |||
714 | 695 | -- Adam Gandelman <adamg@canonical.com> Fri, 16 Mar 2012 12:04:48 -0700 | ||
715 | 696 | |||
716 | 697 | quantum (2012.1~e4-0ubuntu1) precise; urgency=low | ||
717 | 698 | |||
718 | 699 | * New upstream release. | ||
719 | 700 | * debian/rules: Take in account the new build changes. | ||
720 | 701 | * debian/quantum-server.install: Install the right files due to | ||
721 | 702 | build changes. | ||
722 | 703 | * Client no longer is a part of quantum. | ||
723 | 704 | * debian/control: Add python-lxml | ||
724 | 705 | * Add ryu and niciria plugins. | ||
725 | 706 | * debian/rules: Run right tests script. | ||
726 | 707 | |||
727 | 708 | -- Chuck Short <zulcss@ubuntu.com> Mon, 05 Mar 2012 09:47:22 -0500 | ||
728 | 709 | |||
729 | 710 | quantum (2012.1~e2+git20120112-0ubuntu1) precise; urgency=low | ||
730 | 711 | |||
731 | 712 | * New upstream release. | ||
732 | 713 | * debian/rules: | ||
733 | 714 | - Fix git snapshot creation. | ||
734 | 715 | - Fix running test suite during the build. | ||
735 | 716 | * debian/control: Add adduser for quantum-server. | ||
736 | 717 | * debian/quantum-plugin-{cisco,openvswitch}.install: Install | ||
737 | 718 | everything needed for the plugins. | ||
738 | 719 | |||
739 | 720 | -- Chuck Short <zulcss@ubuntu.com> Thu, 12 Jan 2012 04:19:33 -0500 | ||
740 | 721 | |||
741 | 722 | quantum (2012.1~e2-0ubuntu2) precise; urgency=low | ||
742 | 723 | |||
743 | 724 | * debian/control: Build for architecture all. | ||
744 | 725 | |||
745 | 726 | -- Chuck Short <zulcss@ubuntu.com> Mon, 19 Dec 2011 10:28:16 -0500 | ||
746 | 727 | |||
747 | 728 | quantum (2012.1~e2-0ubuntu1) precise; urgency=low | ||
748 | 729 | |||
749 | 730 | * New upstream release. | ||
750 | 731 | * debian/rules: Add alternate get-orig-source. | ||
751 | 732 | * debian/patches/fix-version.patch: Removed no longer needed. | ||
752 | 733 | * Fix lintian warnings. | ||
753 | 734 | |||
754 | 735 | -- Chuck Short <zulcss@ubuntu.com> Fri, 16 Dec 2011 15:26:41 -0500 | ||
755 | 736 | |||
756 | 737 | quantum (2012.1~e2~20111209.f8152-0ubuntu1) precise; urgency=low | ||
757 | 738 | |||
758 | 739 | * New upstream release. | ||
759 | 740 | * debian/rules, debian/README.Source: Add support fo generating | ||
760 | 741 | new tarballs from git since tarball snapshots are not available | ||
761 | 742 | from jenkins yet. | ||
762 | 743 | * debian/rules: Update for new build system. | ||
763 | 744 | * debian/rules: Clean up files when running clean. | ||
764 | 745 | * debian/quantum-server.install, debian/quantum-server.dirs, | ||
765 | 746 | debian/quantum-plugins.*: Update for build system changes. | ||
766 | 747 | * debian/quantum-server.postinst: Fix user creation. | ||
767 | 748 | * debian/rules: Enable testsuite when building. | ||
768 | 749 | * Fix lintian errors (LP: #899352) | ||
769 | 750 | * debian/patches/fix-quantum-version.patch: Fix generating *.pyc | ||
770 | 751 | when trying to build. | ||
771 | 752 | |||
772 | 753 | -- Chuck Short <zulcss@ubuntu.com> Fri, 09 Dec 2011 15:31:35 -0500 | ||
773 | 754 | |||
774 | 755 | quantum (2012.1~e1-0ubuntu1) precise; urgency=low | ||
775 | 756 | |||
776 | 757 | * Initial release. | ||
777 | 758 | |||
778 | 759 | -- Chuck Short <zulcss@ubuntu.com> Fri, 18 Nov 2011 15:29:53 -0500 | ||
779 | 0 | 760 | ||
780 | === added file 'debian/compat' | |||
781 | --- debian/compat 1970-01-01 00:00:00 +0000 | |||
782 | +++ debian/compat 2014-02-24 14:59:12 +0000 | |||
783 | @@ -0,0 +1,1 @@ | |||
784 | 1 | 8 | ||
785 | 0 | 2 | ||
786 | === added file 'debian/control' | |||
787 | --- debian/control 1970-01-01 00:00:00 +0000 | |||
788 | +++ debian/control 2014-02-24 14:59:12 +0000 | |||
789 | @@ -0,0 +1,676 @@ | |||
790 | 1 | Source: neutron | ||
791 | 2 | Section: net | ||
792 | 3 | Priority: optional | ||
793 | 4 | Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> | ||
794 | 5 | XSBC-Original-Maintainer: Chuck Short <zulcss@ubuntu.com> | ||
795 | 6 | Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6) | ||
796 | 7 | Build-Depends-Indep: | ||
797 | 8 | alembic (>= 0.4.1), | ||
798 | 9 | python-amqplib (>= 0.6.1), | ||
799 | 10 | python-anyjson (>= 0.3.3), | ||
800 | 11 | python-babel, | ||
801 | 12 | python-cliff (>= 1.4), | ||
802 | 13 | python-configobj, | ||
803 | 14 | python-coverage, | ||
804 | 15 | python-d2to1, | ||
805 | 16 | python-eventlet (>= 0.13.0), | ||
806 | 17 | python-fixtures (>= 0.3.12), | ||
807 | 18 | python-greenlet (>= 0.3.2), | ||
808 | 19 | python-httplib2, | ||
809 | 20 | python-iso8601, | ||
810 | 21 | python-jinja2, | ||
811 | 22 | python-jsonrpclib, | ||
812 | 23 | python-keystoneclient (>= 1:0.2.0), | ||
813 | 24 | python-kombu (>= 2.5.12), | ||
814 | 25 | python-lxml, | ||
815 | 26 | python-mock (>= 1.0b1), | ||
816 | 27 | python-mox, | ||
817 | 28 | python-netaddr, | ||
818 | 29 | python-neutronclient (>= 1:2.2.3), | ||
819 | 30 | python-novaclient (>= 2.12.0), | ||
820 | 31 | python-oslo.config (>= 1:1.2.0a3), | ||
821 | 32 | python-paste, | ||
822 | 33 | python-pastedeploy, | ||
823 | 34 | python-pbr (>= 0.5.21), | ||
824 | 35 | python-psutil (>= 0.6.1), | ||
825 | 36 | python-pyudev, | ||
826 | 37 | python-requests (>= 1.1), | ||
827 | 38 | python-routes, | ||
828 | 39 | python-setuptools, | ||
829 | 40 | python-simplejson, | ||
830 | 41 | python-six, | ||
831 | 42 | python-sqlalchemy, | ||
832 | 43 | python-stevedore (>= 0.10), | ||
833 | 44 | python-testtools (>= 0.9.32), | ||
834 | 45 | python-webob, | ||
835 | 46 | python-webtest, | ||
836 | 47 | subunit, | ||
837 | 48 | testrepository ( >= 0.0.17) | ||
838 | 49 | XS-Python-Version: >= 2.6 | ||
839 | 50 | Standards-Version: 3.9.4 | ||
840 | 51 | Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/neutron/icehouse/files | ||
841 | 52 | Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/neutron/icehouse | ||
842 | 53 | XS-Testsuite: autopkgtest | ||
843 | 54 | |||
844 | 55 | Package: neutron-server | ||
845 | 56 | Architecture: all | ||
846 | 57 | Depends: | ||
847 | 58 | adduser, | ||
848 | 59 | neutron-common (= ${source:Version}), | ||
849 | 60 | ${misc:Depends}, | ||
850 | 61 | ${python:Depends}, | ||
851 | 62 | ${shlibs:Depends} | ||
852 | 63 | Breaks: quantum-server ( << 1:2013.2~b2-0ubuntu1~ ) | ||
853 | 64 | Replaces: quantum-server ( << 1:2013.2~b2-0ubuntu1~ ) | ||
854 | 65 | Recommends: neutron-plugin-ml2 | ||
855 | 66 | Description: Neutron is a virtual network service for Openstack - server | ||
856 | 67 | Neutron is a virtual network service for Openstack, and a part of | ||
857 | 68 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
858 | 69 | request and configure virtual servers, Neutron provides an API to | ||
859 | 70 | dynamically request and configure virtual networks. These networks | ||
860 | 71 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
861 | 72 | from Nova VMs). The Neutron API supports extensions to provide | ||
862 | 73 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
863 | 74 | etc.) | ||
864 | 75 | . | ||
865 | 76 | This package provides the Neutron server | ||
866 | 77 | |||
867 | 78 | Package: neutron-common | ||
868 | 79 | Architecture: all | ||
869 | 80 | Depends: | ||
870 | 81 | adduser, | ||
871 | 82 | python-neutron (= ${source:Version}), | ||
872 | 83 | ${misc:Depends}, | ||
873 | 84 | ${python:Depends} | ||
874 | 85 | Breaks: quantum-common ( << 1:2013.2~b2-0ubuntu1~ ) | ||
875 | 86 | Replaces: quantum-common ( << 1:2013.2~b2-0ubuntu1~ ) | ||
876 | 87 | Description: Neutron is a virtual network service for Openstack - common | ||
877 | 88 | Neutron is a virtual network service for Openstack, and a part of | ||
878 | 89 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
879 | 90 | request and configure virtual servers, Neutron provides an API to | ||
880 | 91 | dynamically request and configure virtual networks. These networks | ||
881 | 92 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
882 | 93 | from Nova VMs). The Neutron API supports extensions to provide | ||
883 | 94 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
884 | 95 | etc.) | ||
885 | 96 | . | ||
886 | 97 | This package provides the common files. | ||
887 | 98 | |||
888 | 99 | Package: neutron-plugin-cisco | ||
889 | 100 | Architecture: all | ||
890 | 101 | Provides: neutron-plugin | ||
891 | 102 | Depends: | ||
892 | 103 | neutron-common (= ${source:Version}), | ||
893 | 104 | ${misc:Depends}, | ||
894 | 105 | ${python:Depends}, | ||
895 | 106 | ${shlibs:Depends} | ||
896 | 107 | Breaks: quantum-plugin-cisco ( << 1:2013.2~b2-0ubuntu1~ ) | ||
897 | 108 | Replaces: quantum-plugin-cisco ( << 1:2013.2~b2-0ubuntu1~ ) | ||
898 | 109 | Description: Neutron is a virtual network service for Openstack - Cisco plugin | ||
899 | 110 | Neutron is a virtual network service for Openstack, and a part of | ||
900 | 111 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
901 | 112 | request and configure virtual servers, Neutron provides an API to | ||
902 | 113 | dynamically request and configure virtual networks. These networks | ||
903 | 114 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
904 | 115 | from Nova VMs). The Neutron API supports extensions to provide | ||
905 | 116 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
906 | 117 | etc.) | ||
907 | 118 | . | ||
908 | 119 | This package provides the Cisco plugin. | ||
909 | 120 | |||
910 | 121 | Package: neutron-plugin-nec | ||
911 | 122 | Architecture: all | ||
912 | 123 | Provides: neutron-plugin | ||
913 | 124 | Depends: | ||
914 | 125 | neutron-common (= ${source:Version}), | ||
915 | 126 | ${misc:Depends}, | ||
916 | 127 | ${python:Depends}, | ||
917 | 128 | ${shlibs:Depends} | ||
918 | 129 | Breaks: quantum-plugin-nec ( << 1:2013.2~b2-0ubuntu1~ ) | ||
919 | 130 | Replaces: quantum-plugin-nec ( << 1:2013.2~b2-0ubuntu1~ ) | ||
920 | 131 | Description: Neutron is a virtual network service for Openstack - NEC plugin | ||
921 | 132 | Neutron is a virtual network service for Openstack, and a part of | ||
922 | 133 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
923 | 134 | request and configure virtual servers, Neutron provides an API to | ||
924 | 135 | dynamically request and configure virtual networks. These networks | ||
925 | 136 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
926 | 137 | from Nova VMs). The Neutron API supports extensions to provide | ||
927 | 138 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
928 | 139 | etc.) | ||
929 | 140 | . | ||
930 | 141 | This package provides the NEC plugin. | ||
931 | 142 | |||
932 | 143 | Package: neutron-plugin-nec-agent | ||
933 | 144 | Architecture: all | ||
934 | 145 | Depends: | ||
935 | 146 | neutron-common (= ${source:Version}), | ||
936 | 147 | neutron-plugin-nec, | ||
937 | 148 | openvswitch-switch, | ||
938 | 149 | ${misc:Depends}, | ||
939 | 150 | ${python:Depends}, | ||
940 | 151 | ${shlibs:Depends} | ||
941 | 152 | Breaks: quantum-plugin-nec-agent ( << 1:2013.2~b2-0ubuntu1~ ) | ||
942 | 153 | Replaces: quantum-plugin-nec-agent ( << 1:2013.2~b2-0ubuntu1~ ) | ||
943 | 154 | Description: Neutron is a virtual network service for Openstack - NEC plugin agent | ||
944 | 155 | Neutron is a virtual network service for Openstack, and a part of | ||
945 | 156 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
946 | 157 | request and configure virtual servers, Neutron provides an API to | ||
947 | 158 | dynamically request and configure virtual networks. These networks | ||
948 | 159 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
949 | 160 | from Nova VMs). The Neutron API supports extensions to provide | ||
950 | 161 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
951 | 162 | etc.) | ||
952 | 163 | . | ||
953 | 164 | This package provides the NEC plugin agent. | ||
954 | 165 | |||
955 | 166 | Package: neutron-plugin-bigswitch | ||
956 | 167 | Architecture: all | ||
957 | 168 | Provides: neutron-plugin | ||
958 | 169 | Depends: | ||
959 | 170 | neutron-common (= ${source:Version}), | ||
960 | 171 | ${misc:Depends}, | ||
961 | 172 | ${python:Depends}, | ||
962 | 173 | ${shlibs:Depends} | ||
963 | 174 | Breaks: quantum-plugin-bigswitch ( << 1:2013.2~b2-0ubuntu1~ ) | ||
964 | 175 | Replaces: quantum-plugin-bigswitch ( << 1:2013.2~b2-0ubuntu1~ ) | ||
965 | 176 | Description: Neutron is a virtual network service for Openstack - BigSwitch plugin | ||
966 | 177 | Neutron is a virtual network service for Openstack, and a part of | ||
967 | 178 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
968 | 179 | request and configure virtual servers, Neutron provides an API to | ||
969 | 180 | dynamically request and configure virtual networks. These networks | ||
970 | 181 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
971 | 182 | from Nova VMs). The Neutron API supports extensions to provide | ||
972 | 183 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
973 | 184 | etc.) | ||
974 | 185 | . | ||
975 | 186 | This package provides the BigSwitch plugin. | ||
976 | 187 | |||
977 | 188 | Package: neutron-plugin-hyperv | ||
978 | 189 | Architecture: all | ||
979 | 190 | Provides: neutron-plugin | ||
980 | 191 | Depends: | ||
981 | 192 | neutron-common (= ${source:Version}), | ||
982 | 193 | ${misc:Depends}, | ||
983 | 194 | ${python:Depends}, | ||
984 | 195 | ${shlibs:Depends} | ||
985 | 196 | Breaks: quantum-plugin-hyperv ( << 1:2013.2~b2-0ubuntu1~ ) | ||
986 | 197 | Replaces: quantum-plugin-hyperv ( << 1:2013.2~b2-0ubuntu1~ ) | ||
987 | 198 | Description: Neutron is a virtual network service for Openstack - Hyper-V plugin | ||
988 | 199 | Neutron is a virtual network service for Openstack, and a part of | ||
989 | 200 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
990 | 201 | request and configure virtual servers, Neutron provides an API to | ||
991 | 202 | dynamically request and configure virtual networks. These networks | ||
992 | 203 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
993 | 204 | from Nova VMs). The Neutron API supports extensions to provide | ||
994 | 205 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
995 | 206 | etc.) | ||
996 | 207 | . | ||
997 | 208 | This package provides the Hyper-V plugin. | ||
998 | 209 | |||
999 | 210 | Package: neutron-plugin-brocade | ||
1000 | 211 | Architecture: all | ||
1001 | 212 | Provides: neutron-plugin | ||
1002 | 213 | Depends: | ||
1003 | 214 | neutron-common (= ${source:Version}), | ||
1004 | 215 | ${misc:Depends}, | ||
1005 | 216 | ${python:Depends}, | ||
1006 | 217 | ${shlibs:Depends} | ||
1007 | 218 | Breaks: quantum-plugin-brocade ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1008 | 219 | Replaces: quantum-plugin-brocade ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1009 | 220 | Description: Neutron is a virtual network service for Openstack - Brocade plugin | ||
1010 | 221 | Neutron is a virtual network service for Openstack, and a part of | ||
1011 | 222 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
1012 | 223 | request and configure virtual servers, Neutron provides an API to | ||
1013 | 224 | dynamically request and configure virtual networks. These networks | ||
1014 | 225 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
1015 | 226 | from Nova VMs). The Neutron API supports extensions to provide | ||
1016 | 227 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
1017 | 228 | etc.) | ||
1018 | 229 | . | ||
1019 | 230 | This package provides the Brocade plugin. | ||
1020 | 231 | |||
1021 | 232 | Package: neutron-plugin-plumgrid | ||
1022 | 233 | Architecture: all | ||
1023 | 234 | Provides: neutron-plugin | ||
1024 | 235 | Depends: | ||
1025 | 236 | neutron-common (= ${source:Version}), | ||
1026 | 237 | ${misc:Depends}, | ||
1027 | 238 | ${python:Depends}, | ||
1028 | 239 | ${shlibs:Depends} | ||
1029 | 240 | Breaks: quantum-plugin-plumgrid ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1030 | 241 | Replaces: quantum-plugin-plumgrid ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1031 | 242 | Description: Neutron is a virtual network service for Openstack - PLUMgrid plugin | ||
1032 | 243 | Neutron is a virtual network service for Openstack, and a part of | ||
1033 | 244 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
1034 | 245 | request and configure virtual servers, Neutron provides an API to | ||
1035 | 246 | dynamically request and configure virtual networks. These networks | ||
1036 | 247 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
1037 | 248 | from Nova VMs). The Neutron API supports extensions to provide | ||
1038 | 249 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
1039 | 250 | etc.) | ||
1040 | 251 | . | ||
1041 | 252 | This package provides the PLUMgrid plugin. | ||
1042 | 253 | |||
1043 | 254 | Package: neutron-plugin-metaplugin | ||
1044 | 255 | Architecture: all | ||
1045 | 256 | Provides: neutron-plugin | ||
1046 | 257 | Depends: | ||
1047 | 258 | neutron-common (= ${source:Version}), | ||
1048 | 259 | ${misc:Depends}, | ||
1049 | 260 | ${python:Depends}, | ||
1050 | 261 | ${shlibs:Depends} | ||
1051 | 262 | Breaks: quantum-plugin-metaplugin ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1052 | 263 | Replaces: quantum-plugin-metaplugin ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1053 | 264 | Description: Neutron is a virtual network service for Openstack - Metaplugin plugin | ||
1054 | 265 | Neutron is a virtual network service for Openstack, and a part of | ||
1055 | 266 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
1056 | 267 | request and configure virtual servers, Neutron provides an API to | ||
1057 | 268 | dynamically request and configure virtual networks. These networks | ||
1058 | 269 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
1059 | 270 | from Nova VMs). The Neutron API supports extensions to provide | ||
1060 | 271 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
1061 | 272 | etc.) | ||
1062 | 273 | . | ||
1063 | 274 | This package provides the Metaplugin plugin. | ||
1064 | 275 | |||
1065 | 276 | Package: neutron-plugin-vmware | ||
1066 | 277 | Architecture: all | ||
1067 | 278 | Provides: neutron-plugin | ||
1068 | 279 | Depends: | ||
1069 | 280 | neutron-common (= ${source:Version}), | ||
1070 | 281 | ${misc:Depends}, | ||
1071 | 282 | ${python:Depends}, | ||
1072 | 283 | ${shlibs:Depends} | ||
1073 | 284 | Breaks: neutron-plugin-nicira ( << 1:2014.1~b2-0ubuntu7~ ) | ||
1074 | 285 | Replaces: neutron-plugin-nicira ( << 1:2014.1~b2-0ubuntu7~ ) | ||
1075 | 286 | Description: Neutron is a virtual network service for Openstack - VMware plugin | ||
1076 | 287 | Neutron is a virtual network service for Openstack, and a part of | ||
1077 | 288 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
1078 | 289 | request and configure virtual servers, Neutron provides an API to | ||
1079 | 290 | dynamically request and configure virtual networks. These networks | ||
1080 | 291 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
1081 | 292 | from Nova VMs). The Neutron API supports extensions to provide | ||
1082 | 293 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
1083 | 294 | etc.) | ||
1084 | 295 | . | ||
1085 | 296 | This package provides the VMware NSX plugin | ||
1086 | 297 | |||
1087 | 298 | Package: neutron-plugin-nicira | ||
1088 | 299 | Depends: neutron-plugin-vmware, ${misc:Depends} | ||
1089 | 300 | Architecture: all | ||
1090 | 301 | Breaks: quantum-plugin-nicira ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1091 | 302 | Replaces: quantum-plugin-nicira ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1092 | 303 | Section: oldlibs | ||
1093 | 304 | Description: transitional dummy package | ||
1094 | 305 | This is a transitional dummy package. It can safely be removed. | ||
1095 | 306 | |||
1096 | 307 | Package: neutron-l3-agent | ||
1097 | 308 | Architecture: all | ||
1098 | 309 | Depends: | ||
1099 | 310 | iputils-arping, | ||
1100 | 311 | neutron-common (= ${source:Version}), | ||
1101 | 312 | neutron-metadata-agent (= ${source:Version}), | ||
1102 | 313 | ${misc:Depends}, | ||
1103 | 314 | ${python:Depends}, | ||
1104 | 315 | ${shlibs:Depends} | ||
1105 | 316 | Breaks: quantum-l3-agent ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1106 | 317 | Replaces: quantum-l3-agent ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1107 | 318 | Description: Neutron is a virtual network service for Openstack - l3 agent | ||
1108 | 319 | Neutron is a virtual network service for Openstack, and a part of | ||
1109 | 320 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
1110 | 321 | request and configure virtual servers, Neutron provides an API to | ||
1111 | 322 | dynamically request and configure virtual networks. These networks | ||
1112 | 323 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
1113 | 324 | from Nova VMs). The Neutron API supports extensions to provide | ||
1114 | 325 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
1115 | 326 | etc.) | ||
1116 | 327 | . | ||
1117 | 328 | This package provides the layer 3 routing agent. | ||
1118 | 329 | |||
1119 | 330 | Package: neutron-dhcp-agent | ||
1120 | 331 | Architecture: all | ||
1121 | 332 | Depends: | ||
1122 | 333 | dnsmasq-base, | ||
1123 | 334 | dnsmasq-utils, | ||
1124 | 335 | neutron-common (= ${source:Version}), | ||
1125 | 336 | neutron-metadata-agent (= ${source:Version}), | ||
1126 | 337 | ${misc:Depends}, | ||
1127 | 338 | ${python:Depends}, | ||
1128 | 339 | ${shlibs:Depends} | ||
1129 | 340 | Breaks: quantum-dhcp-agent ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1130 | 341 | Replaces: quantum-dhcp-agent ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1131 | 342 | Description: Neutron is a virtual network service for Openstack - DHCP agent | ||
1132 | 343 | Neutron is a virtual network service for Openstack, and a part of | ||
1133 | 344 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
1134 | 345 | request and configure virtual servers, Neutron provides an API to | ||
1135 | 346 | dynamically request and configure virtual networks. These networks | ||
1136 | 347 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
1137 | 348 | from Nova VMs). The Neutron API supports extensions to provide | ||
1138 | 349 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
1139 | 350 | etc.) | ||
1140 | 351 | . | ||
1141 | 352 | This package provides the DHCP agent. | ||
1142 | 353 | |||
1143 | 354 | Package: neutron-metadata-agent | ||
1144 | 355 | Architecture: all | ||
1145 | 356 | Depends: | ||
1146 | 357 | neutron-common (= ${source:Version}), | ||
1147 | 358 | ${misc:Depends}, | ||
1148 | 359 | ${python:Depends}, | ||
1149 | 360 | ${shlibs:Depends} | ||
1150 | 361 | Breaks: quantum-metadata-agent ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1151 | 362 | Replaces: quantum-metadata-agent ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1152 | 363 | Description: Neutron is a virtual network service for Openstack - metadata agent | ||
1153 | 364 | Neutron is a virtual network service for Openstack, and a part of | ||
1154 | 365 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
1155 | 366 | request and configure virtual servers, Neutron provides an API to | ||
1156 | 367 | dynamically request and configure virtual networks. These networks | ||
1157 | 368 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
1158 | 369 | from Nova VMs). The Neutron API supports extensions to provide | ||
1159 | 370 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
1160 | 371 | etc.) | ||
1161 | 372 | . | ||
1162 | 373 | This package provides the metadata proxy agent. | ||
1163 | 374 | |||
1164 | 375 | Package: neutron-lbaas-agent | ||
1165 | 376 | Architecture: all | ||
1166 | 377 | Depends: | ||
1167 | 378 | haproxy, | ||
1168 | 379 | neutron-common (= ${source:Version}), | ||
1169 | 380 | ${misc:Depends}, | ||
1170 | 381 | ${python:Depends}, | ||
1171 | 382 | ${shlibs:Depends} | ||
1172 | 383 | Breaks: quantum-lbaas-agent ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1173 | 384 | Replaces: quantum-lbass-agent ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1174 | 385 | Description: Neutron is a virtual network service for Openstack - LBaaS agent | ||
1175 | 386 | Neutron is a virtual network service for Openstack, and a part of | ||
1176 | 387 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
1177 | 388 | request and configure virtual servers, Neutron provides an API to | ||
1178 | 389 | dynamically request and configure virtual networks. These networks | ||
1179 | 390 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
1180 | 391 | from Nova VMs). The Neutron API supports extensions to provide | ||
1181 | 392 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
1182 | 393 | etc.) | ||
1183 | 394 | . | ||
1184 | 395 | This package provides the Load Balancing as-a Service (LBaaS) agent. | ||
1185 | 396 | |||
1186 | 397 | Package: python-neutron | ||
1187 | 398 | Architecture: all | ||
1188 | 399 | Section: python | ||
1189 | 400 | Depends: | ||
1190 | 401 | alembic (>= 0.6.0), | ||
1191 | 402 | python-amqplib (>= 0.6.1), | ||
1192 | 403 | python-anyjson (>= 0.3.3), | ||
1193 | 404 | python-babel, | ||
1194 | 405 | python-eventlet (>= 0.13.0), | ||
1195 | 406 | python-greenlet (>= 0.3.12), | ||
1196 | 407 | python-httplib2, | ||
1197 | 408 | python-iso8601, | ||
1198 | 409 | python-jinja2, | ||
1199 | 410 | python-keystoneclient (>= 1:0.3.0), | ||
1200 | 411 | python-kombu (>= 2.5.12), | ||
1201 | 412 | python-netaddr, | ||
1202 | 413 | python-neutronclient (>= 1:2.2.3), | ||
1203 | 414 | python-oslo.config (>= 1:1.2.0a3), | ||
1204 | 415 | python-paste, | ||
1205 | 416 | python-pastedeploy, | ||
1206 | 417 | python-psutil (>= 0.6.1), | ||
1207 | 418 | python-requests (>= 1.1), | ||
1208 | 419 | python-routes, | ||
1209 | 420 | python-six, | ||
1210 | 421 | python-sqlalchemy (>= 0.8.2), | ||
1211 | 422 | python-stevedore (>= 0.10), | ||
1212 | 423 | python-webob, | ||
1213 | 424 | ${misc:Depends}, | ||
1214 | 425 | ${python:Depends} | ||
1215 | 426 | Provides: ${python:Provides} | ||
1216 | 427 | XB-Python-Version: ${python:Versions} | ||
1217 | 428 | Breaks: python-quantum ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1218 | 429 | Replaces: python-quantum ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1219 | 430 | Description: Neutron is a virutal network service for Openstack - Python library | ||
1220 | 431 | Neutron is a virtual network service for Openstack, and a part of | ||
1221 | 432 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
1222 | 433 | request and configure virtual servers, Neutron provides an API to | ||
1223 | 434 | dynamically request and configure virtual networks. These networks | ||
1224 | 435 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
1225 | 436 | from Nova VMs). The Neutron API supports extensions to provide | ||
1226 | 437 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
1227 | 438 | etc.) | ||
1228 | 439 | . | ||
1229 | 440 | This package provides the Python library. | ||
1230 | 441 | |||
1231 | 442 | Package: neutron-plugin-openvswitch | ||
1232 | 443 | Architecture: all | ||
1233 | 444 | Provides: neutron-plugin | ||
1234 | 445 | Depends: | ||
1235 | 446 | neutron-common (= ${source:Version}), | ||
1236 | 447 | ${misc:Depends}, | ||
1237 | 448 | ${python:Depends}, | ||
1238 | 449 | ${shlibs:Depends} | ||
1239 | 450 | Breaks: quantum-plugin-openvswitch ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1240 | 451 | Replaces: quantum-plugin-openvswitch ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1241 | 452 | Description: Neutron is a virtual network service for Openstack - Open vSwitch plugin | ||
1242 | 453 | Neutron is a virtual network service for Openstack, and a part of | ||
1243 | 454 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
1244 | 455 | request and configure virtual servers, Neutron provides an API to | ||
1245 | 456 | dynamically request and configure virtual networks. These networks | ||
1246 | 457 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
1247 | 458 | from Nova VMs). The Neutron API supports extensions to provide | ||
1248 | 459 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
1249 | 460 | etc.) | ||
1250 | 461 | . | ||
1251 | 462 | This package provides the Open vSwitch plugin. | ||
1252 | 463 | |||
1253 | 464 | Package: neutron-plugin-ml2 | ||
1254 | 465 | Architecture: all | ||
1255 | 466 | Provides: neutron-plugin | ||
1256 | 467 | Depends: | ||
1257 | 468 | neutron-common (= ${source:Version}), | ||
1258 | 469 | ${misc:Depends}, | ||
1259 | 470 | ${python:Depends}, | ||
1260 | 471 | ${shlibs:Depends} | ||
1261 | 472 | Description: Neutron is a virtual network service for Openstack - ML2 plugin | ||
1262 | 473 | Neutron is a virtual network service for Openstack, and a part of | ||
1263 | 474 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
1264 | 475 | request and configure virtual servers, Neutron provides an API to | ||
1265 | 476 | dynamically request and configure virtual networks. These networks | ||
1266 | 477 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
1267 | 478 | from Nova VMs). The Neutron API supports extensions to provide | ||
1268 | 479 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
1269 | 480 | etc.) | ||
1270 | 481 | . | ||
1271 | 482 | This package provides the Modular Layer 2 plugin. | ||
1272 | 483 | |||
1273 | 484 | Package: neutron-plugin-openvswitch-agent | ||
1274 | 485 | Architecture: all | ||
1275 | 486 | Depends: | ||
1276 | 487 | neutron-common (= ${source:Version}), | ||
1277 | 488 | neutron-plugin-ml2, | ||
1278 | 489 | openvswitch-switch, | ||
1279 | 490 | ${misc:Depends}, | ||
1280 | 491 | ${python:Depends}, | ||
1281 | 492 | ${shlibs:Depends} | ||
1282 | 493 | Breaks: quantum-plugin-openvswitch-agent ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1283 | 494 | Replaces: quantum-plugin-openvswitch-agent ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1284 | 495 | Description: Neutron is a virtual network service for Openstack - Open vSwitch plugin agent | ||
1285 | 496 | Neutron is a virtual network service for Openstack, and a part of | ||
1286 | 497 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
1287 | 498 | request and configure virtual servers, Neutron provides an API to | ||
1288 | 499 | dynamically request and configure virtual networks. These networks | ||
1289 | 500 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
1290 | 501 | from Nova VMs). The Neutron API supports extensions to provide | ||
1291 | 502 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
1292 | 503 | etc.) | ||
1293 | 504 | . | ||
1294 | 505 | This package provides the Open vSwitch plugin agent. | ||
1295 | 506 | |||
1296 | 507 | Package: neutron-plugin-linuxbridge | ||
1297 | 508 | Architecture: all | ||
1298 | 509 | Provides: neutron-plugin | ||
1299 | 510 | Depends: | ||
1300 | 511 | neutron-common (= ${source:Version}), | ||
1301 | 512 | ${misc:Depends}, | ||
1302 | 513 | ${python:Depends}, | ||
1303 | 514 | ${shlibs:Depends} | ||
1304 | 515 | Breaks: quantum-plugin-linuxbridge ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1305 | 516 | Replaces: quantum-plugin-linuxbridge ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1306 | 517 | Description: Neutron is a virtual network service for Openstack - linuxbridge plugin | ||
1307 | 518 | Neutron is a virtual network service for Openstack, and a part of | ||
1308 | 519 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
1309 | 520 | request and configure virtual servers, Neutron provides an API to | ||
1310 | 521 | dynamically request and configure virtual networks. These networks | ||
1311 | 522 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
1312 | 523 | from Nova VMs). The Neutron API supports extensions to provide | ||
1313 | 524 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
1314 | 525 | etc.) | ||
1315 | 526 | . | ||
1316 | 527 | This package provides the linuxbridge plugin. | ||
1317 | 528 | |||
1318 | 529 | Package: neutron-plugin-linuxbridge-agent | ||
1319 | 530 | Architecture: all | ||
1320 | 531 | Depends: | ||
1321 | 532 | bridge-utils, | ||
1322 | 533 | neutron-common (= ${source:Version}), | ||
1323 | 534 | neutron-plugin-linuxbridge, | ||
1324 | 535 | ${misc:Depends}, | ||
1325 | 536 | ${python:Depends}, | ||
1326 | 537 | ${shlibs:Depends} | ||
1327 | 538 | Breaks: quantum-plugin-linuxbirdge-agent ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1328 | 539 | Replaces: quantum-plugin-linuxbridge-agent ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1329 | 540 | Description: Neutron is a virtual network service for Openstack - linuxbridge plugin agent | ||
1330 | 541 | Neutron is a virtual network service for Openstack, and a part of | ||
1331 | 542 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
1332 | 543 | request and configure virtual servers, Neutron provides an API to | ||
1333 | 544 | dynamically request and configure virtual networks. These networks | ||
1334 | 545 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
1335 | 546 | from Nova VMs). The Neutron API supports extensions to provide | ||
1336 | 547 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
1337 | 548 | etc.) | ||
1338 | 549 | . | ||
1339 | 550 | This package provides the linuxbridge plugin agent. | ||
1340 | 551 | |||
1341 | 552 | Package: neutron-plugin-ryu | ||
1342 | 553 | Architecture: all | ||
1343 | 554 | Provides: neutron-plugin | ||
1344 | 555 | Depends: | ||
1345 | 556 | neutron-common (= ${source:Version}), | ||
1346 | 557 | ${misc:Depends}, | ||
1347 | 558 | ${python:Depends}, | ||
1348 | 559 | ${shlibs:Depends} | ||
1349 | 560 | Breaks: quantum-plugin-ryu ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1350 | 561 | Replaces: quantum-plugin-ryu ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1351 | 562 | Description: Neutron is a virtual network service for Openstack - RYU plugin | ||
1352 | 563 | Neutron is a virtual network service for Openstack, and a part of | ||
1353 | 564 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
1354 | 565 | request and configure virtual servers, Neutron provides an API to | ||
1355 | 566 | dynamically request and configure virtual networks. These networks | ||
1356 | 567 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
1357 | 568 | from Nova VMs). The Neutron API supports extensions to provide | ||
1358 | 569 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
1359 | 570 | etc.) | ||
1360 | 571 | . | ||
1361 | 572 | This package provides the RYU plugin. | ||
1362 | 573 | |||
1363 | 574 | Package: neutron-plugin-ryu-agent | ||
1364 | 575 | Architecture: all | ||
1365 | 576 | Depends: | ||
1366 | 577 | neutron-common (= ${source:Version}), | ||
1367 | 578 | neutron-plugin-ryu, | ||
1368 | 579 | ${misc:Depends}, | ||
1369 | 580 | ${python:Depends}, | ||
1370 | 581 | ${shlibs:Depends} | ||
1371 | 582 | Breaks: quantum-plugin-ryu-agent ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1372 | 583 | Replaces: quantum-plugin-ryu-agent ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1373 | 584 | Description: Neutron is a virtual network service for Openstack - RYU plugin agent | ||
1374 | 585 | Neutron is a virtual network service for Openstack, and a part of | ||
1375 | 586 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
1376 | 587 | request and configure virtual servers, Neutron provides an API to | ||
1377 | 588 | dynamically request and configure virtual networks. These networks | ||
1378 | 589 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
1379 | 590 | from Nova VMs). The Neutron API supports extensions to provide | ||
1380 | 591 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
1381 | 592 | etc.) | ||
1382 | 593 | . | ||
1383 | 594 | This package provides the RYU plugin agent. | ||
1384 | 595 | |||
1385 | 596 | Package: neutron-plugin-midonet | ||
1386 | 597 | Architecture: all | ||
1387 | 598 | Provides: neutron-plugin | ||
1388 | 599 | Depends: | ||
1389 | 600 | neutron-common (= ${source:Version}), | ||
1390 | 601 | ${misc:Depends}, | ||
1391 | 602 | ${python:Depends}, | ||
1392 | 603 | ${shlibs:Depends} | ||
1393 | 604 | Breaks: quantum-plugin-midonet ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1394 | 605 | Replaces: quantum-plugin-midonet ( << 1:2013.2~b2-0ubuntu1~ ) | ||
1395 | 606 | Description: Neutron is a virtual network service for Openstack - Midonet plugin | ||
1396 | 607 | Neutron is a virtual network service for Openstack, and a part of | ||
1397 | 608 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
1398 | 609 | request and configure virtual servers, Neutron provides an API to | ||
1399 | 610 | dynamically request and configure virtual networks. These networks | ||
1400 | 611 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
1401 | 612 | from Nova VMs). The Neutron API supports extensions to provide | ||
1402 | 613 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
1403 | 614 | etc.) | ||
1404 | 615 | . | ||
1405 | 616 | This package provides the Midonet plugin. | ||
1406 | 617 | |||
1407 | 618 | Package: neutron-plugin-mlnx-agent | ||
1408 | 619 | Architecture: all | ||
1409 | 620 | Provides: neutron-plugin | ||
1410 | 621 | Depends: | ||
1411 | 622 | neutron-common (= ${source:Version}), | ||
1412 | 623 | ${misc:Depends}, | ||
1413 | 624 | ${python:Depends}, | ||
1414 | 625 | ${shlibs:Depends} | ||
1415 | 626 | Description: Neutron is a virtual network service for Openstack - mlnx plugin agent | ||
1416 | 627 | Neutron is a virtual network service for Openstack, and a part of | ||
1417 | 628 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
1418 | 629 | request and configure virtual servers, Neutron provides an API to | ||
1419 | 630 | dynamically request and configure virtual networks. These networks | ||
1420 | 631 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
1421 | 632 | from Nova VMs). The Neutron API supports extensions to provide | ||
1422 | 633 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
1423 | 634 | etc.) | ||
1424 | 635 | . | ||
1425 | 636 | This package provides the mlnx plugin agent. | ||
1426 | 637 | |||
1427 | 638 | Package: neutron-plugin-vpn-agent | ||
1428 | 639 | Architecture: all | ||
1429 | 640 | Provides: neutron-plugin | ||
1430 | 641 | Depends: | ||
1431 | 642 | neutron-common (= ${source:Version}), | ||
1432 | 643 | ${misc:Depends}, | ||
1433 | 644 | ${python:Depends}, | ||
1434 | 645 | ${shlibs:Depends} | ||
1435 | 646 | Description: Neutron is a virtual network service for Openstack - vpn plugin | ||
1436 | 647 | Neutron is a virtual network service for Openstack, and a part of | ||
1437 | 648 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
1438 | 649 | request and configure virtual servers, Neutron provides an API to | ||
1439 | 650 | dynamically request and configure virtual networks. These networks | ||
1440 | 651 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
1441 | 652 | from Nova VMs). The Neutron API supports extensions to provide | ||
1442 | 653 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
1443 | 654 | etc.) | ||
1444 | 655 | . | ||
1445 | 656 | This package provides the vpn plugin. | ||
1446 | 657 | |||
1447 | 658 | Package: neutron-plugin-metering-agent | ||
1448 | 659 | Architecture: all | ||
1449 | 660 | Provides: neutron-plugin | ||
1450 | 661 | Depends: | ||
1451 | 662 | neutron-common (= ${source:Version}), | ||
1452 | 663 | ${misc:Depends}, | ||
1453 | 664 | ${python:Depends}, | ||
1454 | 665 | ${shlibs:Depends} | ||
1455 | 666 | Description: Neutron is a virtual network service for Openstack - metering plugin | ||
1456 | 667 | Neutron is a virtual network service for Openstack, and a part of | ||
1457 | 668 | Netstack. Just like OpenStack Nova provides an API to dynamically | ||
1458 | 669 | request and configure virtual servers, Neutron provides an API to | ||
1459 | 670 | dynamically request and configure virtual networks. These networks | ||
1460 | 671 | connect "interfaces" from other OpenStack services (e.g., virtual NICs | ||
1461 | 672 | from Nova VMs). The Neutron API supports extensions to provide | ||
1462 | 673 | advanced network capabilities (e.g., QoS, ACLs, network monitoring, | ||
1463 | 674 | etc.) | ||
1464 | 675 | . | ||
1465 | 676 | This package provides the metering plugin. | ||
1466 | 0 | 677 | ||
1467 | === added file 'debian/copyright' | |||
1468 | --- debian/copyright 1970-01-01 00:00:00 +0000 | |||
1469 | +++ debian/copyright 2014-02-24 14:59:12 +0000 | |||
1470 | @@ -0,0 +1,37 @@ | |||
1471 | 1 | Format: http://dep.debian.net/deps/dep5 | ||
1472 | 2 | Upstream-Name: neutron | ||
1473 | 3 | Source: http://github.com/openstack/neutron | ||
1474 | 4 | |||
1475 | 5 | Files: * | ||
1476 | 6 | Copyright: 2011 OpenStack, LLC. | ||
1477 | 7 | 2011 Cisco Systems | ||
1478 | 8 | 2011 Nicira Networks | ||
1479 | 9 | 2011 Citrix Systems | ||
1480 | 10 | License: Apache-2 | ||
1481 | 11 | Licensed under the Apache License, Version 2.0 (the "License"); | ||
1482 | 12 | you may not use this file except in compliance with the License. | ||
1483 | 13 | You may obtain a copy of the License at | ||
1484 | 14 | . | ||
1485 | 15 | http://www.apache.org/licenses/LICENSE-2.0 | ||
1486 | 16 | . | ||
1487 | 17 | Unless required by applicable law or agreed to in writing, software | ||
1488 | 18 | distributed under the License is distributed on an "AS IS" BASIS, | ||
1489 | 19 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
1490 | 20 | See the License for the specific language governing permissions and | ||
1491 | 21 | limitations under the License. | ||
1492 | 22 | . | ||
1493 | 23 | On Debian-based systems the full text of the Apache version 2.0 license | ||
1494 | 24 | can be found in `/usr/share/common-licenses/Apache-2.0' | ||
1495 | 25 | |||
1496 | 26 | Files: tools/rfc.sh | ||
1497 | 27 | Copyright: Copyright (c) 2010-2011 Gluster, Inc | ||
1498 | 28 | License: GPL-v3 | ||
1499 | 29 | GNU GENERAL PUBLIC LICENSE | ||
1500 | 30 | Version 3, 29 June 2007 | ||
1501 | 31 | . | ||
1502 | 32 | Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> | ||
1503 | 33 | Everyone is permitted to copy and distribute verbatim copies | ||
1504 | 34 | of this license document, but changing it is not allowed. | ||
1505 | 35 | . | ||
1506 | 36 | On Debian-based systems the full text of the Apache version 2.0 license | ||
1507 | 37 | can be found in `/usr/share/common-licenses/GPL-3' | ||
1508 | 0 | 38 | ||
1509 | === added directory 'debian/cron.d' | |||
1510 | === added file 'debian/cron.d/neutron-dhcp-agent-netns-cleanup' | |||
1511 | --- debian/cron.d/neutron-dhcp-agent-netns-cleanup 1970-01-01 00:00:00 +0000 | |||
1512 | +++ debian/cron.d/neutron-dhcp-agent-netns-cleanup 2014-02-24 14:59:12 +0000 | |||
1513 | @@ -0,0 +1,4 @@ | |||
1514 | 1 | # vim: set filetype=crontab: | ||
1515 | 2 | # Periodically cleans Quantum's network namespaces on behalf of the Quantum | ||
1516 | 3 | # DHCP agent. | ||
1517 | 4 | 30 * * * * neutron if [ -x /usr/bin/neutron-netns-cleanup ] ; then /usr/bin/neutron-netns-cleanup --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/dhcp_agent.ini >/dev/null 2>&1; fi | ||
1518 | 0 | 5 | ||
1519 | === added file 'debian/cron.d/neutron-l3-agent-netns-cleanup' | |||
1520 | --- debian/cron.d/neutron-l3-agent-netns-cleanup 1970-01-01 00:00:00 +0000 | |||
1521 | +++ debian/cron.d/neutron-l3-agent-netns-cleanup 2014-02-24 14:59:12 +0000 | |||
1522 | @@ -0,0 +1,4 @@ | |||
1523 | 1 | # vim: set filetype=crontab: | ||
1524 | 2 | # Periodically cleans Quantum's network namespaces on behalf of the Quantum | ||
1525 | 3 | # L3 agent. | ||
1526 | 4 | 0 * * * * neutron if [ -x /usr/bin/neutron-netns-cleanup ] ; then /usr/bin/neutron-netns-cleanup --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/l3_agent.ini >/dev/null 2>&1; fi | ||
1527 | 0 | 5 | ||
1528 | === added file 'debian/cron.d/neutron-lbaas-agent-netns-cleanup' | |||
1529 | --- debian/cron.d/neutron-lbaas-agent-netns-cleanup 1970-01-01 00:00:00 +0000 | |||
1530 | +++ debian/cron.d/neutron-lbaas-agent-netns-cleanup 2014-02-24 14:59:12 +0000 | |||
1531 | @@ -0,0 +1,4 @@ | |||
1532 | 1 | # vim: set filetype=crontab: | ||
1533 | 2 | # Periodically cleans Quantum's network namespaces on behalf of the Quantum | ||
1534 | 3 | # L3 agent. | ||
1535 | 4 | 0 * * * * neutron if [ -x /usr/bin/neutron-netns-cleanup ] ; then /usr/bin/neutron-netns-cleanup --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/lbaas_agent.ini >/dev/null 2>&1; fi | ||
1536 | 0 | 5 | ||
1537 | === added directory 'debian/mans' | |||
1538 | === added file 'debian/mans/neutron-linuxbridge-agent.8' | |||
1539 | --- debian/mans/neutron-linuxbridge-agent.8 1970-01-01 00:00:00 +0000 | |||
1540 | +++ debian/mans/neutron-linuxbridge-agent.8 2014-02-24 14:59:12 +0000 | |||
1541 | @@ -0,0 +1,11 @@ | |||
1542 | 1 | .TH neutron\-linuxbridge\-agent 8 | ||
1543 | 2 | .SH NAME | ||
1544 | 3 | neutron\-linuxbridge\-agent \- OpenStack Virtual network service \- linuxbridge agent | ||
1545 | 4 | |||
1546 | 5 | .SH SYNOPSIS | ||
1547 | 6 | .B neutron\-linuxbridge\-agent | ||
1548 | 7 | |||
1549 | 8 | .SH DESCRIPTION | ||
1550 | 9 | .B neutron\-linuxbridge\-agent | ||
1551 | 10 | |||
1552 | 11 | This man page is a stub. Please contribute. | ||
1553 | 0 | 12 | ||
1554 | === added file 'debian/mans/neutron-nec-agent.8' | |||
1555 | --- debian/mans/neutron-nec-agent.8 1970-01-01 00:00:00 +0000 | |||
1556 | +++ debian/mans/neutron-nec-agent.8 2014-02-24 14:59:12 +0000 | |||
1557 | @@ -0,0 +1,11 @@ | |||
1558 | 1 | .TH neutron\-nec\-agent 8 | ||
1559 | 2 | .SH NAME | ||
1560 | 3 | neutron\-nec\-agent \- OpenStack Virtual network service \- nec agent | ||
1561 | 4 | |||
1562 | 5 | .SH SYNOPSIS | ||
1563 | 6 | .B neutron\-nec\-agent | ||
1564 | 7 | |||
1565 | 8 | .SH DESCRIPTION | ||
1566 | 9 | .B neutron\-nec\-agent | ||
1567 | 10 | |||
1568 | 11 | This man page is a stub. Please contribute. | ||
1569 | 0 | 12 | ||
1570 | === added file 'debian/mans/neutron-openvswitch-agent.8' | |||
1571 | --- debian/mans/neutron-openvswitch-agent.8 1970-01-01 00:00:00 +0000 | |||
1572 | +++ debian/mans/neutron-openvswitch-agent.8 2014-02-24 14:59:12 +0000 | |||
1573 | @@ -0,0 +1,11 @@ | |||
1574 | 1 | .TH neutron\-openvswitch\-agent 8 | ||
1575 | 2 | .SH NAME | ||
1576 | 3 | neutron\-openvswitch\-agent \- OpenStack Virtual network service \- openvswitch agent | ||
1577 | 4 | |||
1578 | 5 | .SH SYNOPSIS | ||
1579 | 6 | .B neutron\-openvswitch\-agent | ||
1580 | 7 | |||
1581 | 8 | .SH DESCRIPTION | ||
1582 | 9 | .B neutron\-openvswitch\-agent | ||
1583 | 10 | |||
1584 | 11 | This man page is a stub. Please contribute. | ||
1585 | 0 | 12 | ||
1586 | === added file 'debian/mans/neutron-rootwrap.8' | |||
1587 | --- debian/mans/neutron-rootwrap.8 1970-01-01 00:00:00 +0000 | |||
1588 | +++ debian/mans/neutron-rootwrap.8 2014-02-24 14:59:12 +0000 | |||
1589 | @@ -0,0 +1,11 @@ | |||
1590 | 1 | .TH neutron-rootwrap 8 | ||
1591 | 2 | .SH NAME | ||
1592 | 3 | neutron-rootwrap \- OpenStack Virtual network service \- sudo helper | ||
1593 | 4 | |||
1594 | 5 | .SH SYNOPSIS | ||
1595 | 6 | .B neutron-rootwrap | ||
1596 | 7 | |||
1597 | 8 | .SH DESCRIPTION | ||
1598 | 9 | .B neutron-rootwrap | ||
1599 | 10 | |||
1600 | 11 | This man page is a stub. Please contribute. | ||
1601 | 0 | 12 | ||
1602 | === added file 'debian/mans/neutron-ryu-agent.8' | |||
1603 | --- debian/mans/neutron-ryu-agent.8 1970-01-01 00:00:00 +0000 | |||
1604 | +++ debian/mans/neutron-ryu-agent.8 2014-02-24 14:59:12 +0000 | |||
1605 | @@ -0,0 +1,11 @@ | |||
1606 | 1 | .TH neutron\-ryu\-agent 8 | ||
1607 | 2 | .SH NAME | ||
1608 | 3 | neutron\-ryu\-agent \- OpenStack Virtual network service \- ryu agent | ||
1609 | 4 | |||
1610 | 5 | .SH SYNOPSIS | ||
1611 | 6 | .B neutron\-ryu\-agent | ||
1612 | 7 | |||
1613 | 8 | .SH DESCRIPTION | ||
1614 | 9 | .B neutron\-ryu\-agent | ||
1615 | 10 | |||
1616 | 11 | This man page is a stub. Please contribute. | ||
1617 | 0 | 12 | ||
1618 | === added file 'debian/mans/neutron-server.8' | |||
1619 | --- debian/mans/neutron-server.8 1970-01-01 00:00:00 +0000 | |||
1620 | +++ debian/mans/neutron-server.8 2014-02-24 14:59:12 +0000 | |||
1621 | @@ -0,0 +1,11 @@ | |||
1622 | 1 | .TH neutron-server 8 | ||
1623 | 2 | .SH NAME | ||
1624 | 3 | neutron-server \- OpenStack Virtual network service \- server | ||
1625 | 4 | |||
1626 | 5 | .SH SYNOPSIS | ||
1627 | 6 | .B neutron-server | ||
1628 | 7 | |||
1629 | 8 | .SH DESCRIPTION | ||
1630 | 9 | .B neutron-server | ||
1631 | 10 | |||
1632 | 11 | This man page is a stub. Please contribute. | ||
1633 | 0 | 12 | ||
1634 | === added file 'debian/neutron-common.dirs' | |||
1635 | --- debian/neutron-common.dirs 1970-01-01 00:00:00 +0000 | |||
1636 | +++ debian/neutron-common.dirs 2014-02-24 14:59:12 +0000 | |||
1637 | @@ -0,0 +1,5 @@ | |||
1638 | 1 | var/log/neutron | ||
1639 | 2 | var/lib/neutron | ||
1640 | 3 | etc/neutron | ||
1641 | 4 | etc/neutron/rootwrap.d | ||
1642 | 5 | etc/neutron/plugins | ||
1643 | 0 | 6 | ||
1644 | === added file 'debian/neutron-common.install' | |||
1645 | --- debian/neutron-common.install 1970-01-01 00:00:00 +0000 | |||
1646 | +++ debian/neutron-common.install 2014-02-24 14:59:12 +0000 | |||
1647 | @@ -0,0 +1,14 @@ | |||
1648 | 1 | debian/neutron_sudoers etc/sudoers.d | ||
1649 | 2 | etc/api-paste.ini etc/neutron | ||
1650 | 3 | etc/neutron.conf etc/neutron | ||
1651 | 4 | etc/neutron/rootwrap.d/debug.filters etc/neutron/rootwrap.d | ||
1652 | 5 | etc/neutron/rootwrap.d/iptables-firewall.filters etc/neutron/rootwrap.d | ||
1653 | 6 | etc/policy.json etc/neutron | ||
1654 | 7 | etc/rootwrap.conf etc/neutron | ||
1655 | 8 | usr/bin/neutron-db-manage usr/bin | ||
1656 | 9 | usr/bin/neutron-debug usr/bin | ||
1657 | 10 | usr/bin/neutron-netns-cleanup usr/bin | ||
1658 | 11 | usr/bin/neutron-ovs-cleanup usr/bin | ||
1659 | 12 | usr/bin/neutron-rootwrap usr/bin | ||
1660 | 13 | usr/bin/neutron-rootwrap-xen-dom0 usr/bin | ||
1661 | 14 | usr/bin/neutron-usage-audit usr/bin | ||
1662 | 0 | 15 | ||
1663 | === added file 'debian/neutron-common.postinst' | |||
1664 | --- debian/neutron-common.postinst 1970-01-01 00:00:00 +0000 | |||
1665 | +++ debian/neutron-common.postinst 2014-02-24 14:59:12 +0000 | |||
1666 | @@ -0,0 +1,31 @@ | |||
1667 | 1 | #!/bin/sh | ||
1668 | 2 | |||
1669 | 3 | set -e | ||
1670 | 4 | |||
1671 | 5 | if [ "$1" = "configure" ] | ||
1672 | 6 | then | ||
1673 | 7 | if ! getent group neutron > /dev/null 2>&1 | ||
1674 | 8 | then | ||
1675 | 9 | addgroup --system neutron >/dev/null | ||
1676 | 10 | fi | ||
1677 | 11 | if ! getent passwd neutron > /dev/null 2>&1 | ||
1678 | 12 | then | ||
1679 | 13 | adduser --system --home /var/lib/neutron --ingroup neutron --no-create-home --shell /bin/false neutron | ||
1680 | 14 | fi | ||
1681 | 15 | chown -R neutron:neutron /var/lib/neutron/ | ||
1682 | 16 | |||
1683 | 17 | chown -R neutron:adm /var/log/neutron/ | ||
1684 | 18 | chmod 0750 /var/log/neutron/ | ||
1685 | 19 | |||
1686 | 20 | chown -R root:neutron /etc/neutron/ | ||
1687 | 21 | chmod 0750 /etc/neutron/ | ||
1688 | 22 | chown root:root /etc/neutron/rootwrap.conf | ||
1689 | 23 | chown -R root:root /etc/neutron/rootwrap.d | ||
1690 | 24 | chmod 0755 /etc/neutron/rootwrap.d | ||
1691 | 25 | |||
1692 | 26 | if [ -f /etc/sudoers.d/neutron_sudoers ] ; then | ||
1693 | 27 | chmod 0440 /etc/sudoers.d/neutron_sudoers | ||
1694 | 28 | fi | ||
1695 | 29 | fi | ||
1696 | 30 | |||
1697 | 31 | #DEBHELPER# | ||
1698 | 0 | 32 | ||
1699 | === added file 'debian/neutron-dhcp-agent.install' | |||
1700 | --- debian/neutron-dhcp-agent.install 1970-01-01 00:00:00 +0000 | |||
1701 | +++ debian/neutron-dhcp-agent.install 2014-02-24 14:59:12 +0000 | |||
1702 | @@ -0,0 +1,4 @@ | |||
1703 | 1 | debian/cron.d/neutron-dhcp-agent-netns-cleanup etc/cron.d | ||
1704 | 2 | etc/dhcp_agent.ini etc/neutron | ||
1705 | 3 | etc/neutron/rootwrap.d/dhcp.filters etc/neutron/rootwrap.d | ||
1706 | 4 | usr/bin/neutron-dhcp-agent usr/bin | ||
1707 | 0 | 5 | ||
1708 | === added file 'debian/neutron-dhcp-agent.logrotate' | |||
1709 | --- debian/neutron-dhcp-agent.logrotate 1970-01-01 00:00:00 +0000 | |||
1710 | +++ debian/neutron-dhcp-agent.logrotate 2014-02-24 14:59:12 +0000 | |||
1711 | @@ -0,0 +1,7 @@ | |||
1712 | 1 | /var/log/neutron/dhcp-agent.log { | ||
1713 | 2 | daily | ||
1714 | 3 | missingok | ||
1715 | 4 | compress | ||
1716 | 5 | delaycompress | ||
1717 | 6 | notifempty | ||
1718 | 7 | } | ||
1719 | 0 | 8 | ||
1720 | === added file 'debian/neutron-dhcp-agent.upstart' | |||
1721 | --- debian/neutron-dhcp-agent.upstart 1970-01-01 00:00:00 +0000 | |||
1722 | +++ debian/neutron-dhcp-agent.upstart 2014-02-24 14:59:12 +0000 | |||
1723 | @@ -0,0 +1,22 @@ | |||
1724 | 1 | # vim:set ft=upstart ts=2 et: | ||
1725 | 2 | description "Neutron DHCP Agent" | ||
1726 | 3 | author "Chuck Short <zulcss@ubuntu.com>" | ||
1727 | 4 | |||
1728 | 5 | start on runlevel [2345] | ||
1729 | 6 | stop on runlevel [!2345] | ||
1730 | 7 | |||
1731 | 8 | respawn | ||
1732 | 9 | |||
1733 | 10 | chdir /var/run | ||
1734 | 11 | |||
1735 | 12 | pre-start script | ||
1736 | 13 | mkdir -p /var/run/neutron | ||
1737 | 14 | chown neutron:root /var/run/neutron | ||
1738 | 15 | # Check to see if openvswitch plugin in use by checking | ||
1739 | 16 | # status of cleanup upstart configuration | ||
1740 | 17 | if status neutron-ovs-cleanup; then | ||
1741 | 18 | start wait-for-state WAIT_FOR=neutron-ovs-cleanup WAIT_STATE=running WAITER=neutron-dhcp-agent | ||
1742 | 19 | fi | ||
1743 | 20 | end script | ||
1744 | 21 | |||
1745 | 22 | exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-dhcp-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/dhcp_agent.ini --log-file=/var/log/neutron/dhcp-agent.log | ||
1746 | 0 | 23 | ||
1747 | === added file 'debian/neutron-l3-agent.install' | |||
1748 | --- debian/neutron-l3-agent.install 1970-01-01 00:00:00 +0000 | |||
1749 | +++ debian/neutron-l3-agent.install 2014-02-24 14:59:12 +0000 | |||
1750 | @@ -0,0 +1,4 @@ | |||
1751 | 1 | debian/cron.d/neutron-l3-agent-netns-cleanup etc/cron.d | ||
1752 | 2 | etc/l3_agent.ini etc/neutron | ||
1753 | 3 | etc/neutron/rootwrap.d/l3.filters etc/neutron/rootwrap.d | ||
1754 | 4 | usr/bin/neutron-l3-agent usr/bin | ||
1755 | 0 | 5 | ||
1756 | === added file 'debian/neutron-l3-agent.logrotate' | |||
1757 | --- debian/neutron-l3-agent.logrotate 1970-01-01 00:00:00 +0000 | |||
1758 | +++ debian/neutron-l3-agent.logrotate 2014-02-24 14:59:12 +0000 | |||
1759 | @@ -0,0 +1,7 @@ | |||
1760 | 1 | /var/log/neutron/l3-agent.log { | ||
1761 | 2 | daily | ||
1762 | 3 | missingok | ||
1763 | 4 | compress | ||
1764 | 5 | delaycompress | ||
1765 | 6 | notifempty | ||
1766 | 7 | } | ||
1767 | 0 | 8 | ||
1768 | === added file 'debian/neutron-l3-agent.upstart' | |||
1769 | --- debian/neutron-l3-agent.upstart 1970-01-01 00:00:00 +0000 | |||
1770 | +++ debian/neutron-l3-agent.upstart 2014-02-24 14:59:12 +0000 | |||
1771 | @@ -0,0 +1,22 @@ | |||
1772 | 1 | # vim:set ft=upstart ts=2 et: | ||
1773 | 2 | description "Neutron L3 Agent" | ||
1774 | 3 | author "Chuck Short <zulcss@ubuntu.com>" | ||
1775 | 4 | |||
1776 | 5 | start on runlevel [2345] | ||
1777 | 6 | stop on runlevel [!2345] | ||
1778 | 7 | |||
1779 | 8 | respawn | ||
1780 | 9 | |||
1781 | 10 | chdir /var/run | ||
1782 | 11 | |||
1783 | 12 | pre-start script | ||
1784 | 13 | mkdir -p /var/run/neutron | ||
1785 | 14 | chown neutron:root /var/run/neutron | ||
1786 | 15 | # Check to see if openvswitch plugin in use by checking | ||
1787 | 16 | # status of cleanup upstart configuration | ||
1788 | 17 | if status neutron-ovs-cleanup; then | ||
1789 | 18 | start wait-for-state WAIT_FOR=neutron-ovs-cleanup WAIT_STATE=running WAITER=neutron-l3-agent | ||
1790 | 19 | fi | ||
1791 | 20 | end script | ||
1792 | 21 | |||
1793 | 22 | exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-l3-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/l3_agent.ini --log-file=/var/log/neutron/l3-agent.log | ||
1794 | 0 | 23 | ||
1795 | === added file 'debian/neutron-lbaas-agent.install' | |||
1796 | --- debian/neutron-lbaas-agent.install 1970-01-01 00:00:00 +0000 | |||
1797 | +++ debian/neutron-lbaas-agent.install 2014-02-24 14:59:12 +0000 | |||
1798 | @@ -0,0 +1,4 @@ | |||
1799 | 1 | debian/cron.d/neutron-lbaas-agent-netns-cleanup etc/cron.d | ||
1800 | 2 | etc/lbaas_agent.ini etc/neutron | ||
1801 | 3 | etc/neutron/rootwrap.d/lbaas-haproxy.filters etc/neutron/rootwrap.d | ||
1802 | 4 | usr/bin/neutron-lbaas-agent usr/bin | ||
1803 | 0 | 5 | ||
1804 | === added file 'debian/neutron-lbaas-agent.logrotate' | |||
1805 | --- debian/neutron-lbaas-agent.logrotate 1970-01-01 00:00:00 +0000 | |||
1806 | +++ debian/neutron-lbaas-agent.logrotate 2014-02-24 14:59:12 +0000 | |||
1807 | @@ -0,0 +1,7 @@ | |||
1808 | 1 | /var/log/neutron/lbaas-agent.log { | ||
1809 | 2 | daily | ||
1810 | 3 | missingok | ||
1811 | 4 | compress | ||
1812 | 5 | delaycompress | ||
1813 | 6 | notifempty | ||
1814 | 7 | } | ||
1815 | 0 | 8 | ||
1816 | === added file 'debian/neutron-lbaas-agent.upstart' | |||
1817 | --- debian/neutron-lbaas-agent.upstart 1970-01-01 00:00:00 +0000 | |||
1818 | +++ debian/neutron-lbaas-agent.upstart 2014-02-24 14:59:12 +0000 | |||
1819 | @@ -0,0 +1,17 @@ | |||
1820 | 1 | # vim:set ft=upstart ts=2 et: | ||
1821 | 2 | description "Neutron LBaaS Agent" | ||
1822 | 3 | author "Chuck Short <zulcss@ubuntu.com>" | ||
1823 | 4 | |||
1824 | 5 | start on runlevel [2345] | ||
1825 | 6 | stop on runlevel [!2345] | ||
1826 | 7 | |||
1827 | 8 | respawn | ||
1828 | 9 | |||
1829 | 10 | chdir /var/run | ||
1830 | 11 | |||
1831 | 12 | pre-start script | ||
1832 | 13 | mkdir -p /var/run/neutron | ||
1833 | 14 | chown neutron:root /var/run/neutron | ||
1834 | 15 | end script | ||
1835 | 16 | |||
1836 | 17 | exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-lbaas-agent -- --config-file=/etc/neutron/lbaas_agent.ini --config-file=/etc/neutron/neutron.conf --log-file=/var/log/neutron/lbaas-agent.log | ||
1837 | 0 | 18 | ||
1838 | === added file 'debian/neutron-metadata-agent.install' | |||
1839 | --- debian/neutron-metadata-agent.install 1970-01-01 00:00:00 +0000 | |||
1840 | +++ debian/neutron-metadata-agent.install 2014-02-24 14:59:12 +0000 | |||
1841 | @@ -0,0 +1,3 @@ | |||
1842 | 1 | etc/metadata_agent.ini etc/neutron | ||
1843 | 2 | usr/bin/neutron-metadata-agent usr/bin | ||
1844 | 3 | usr/bin/neutron-ns-metadata-proxy usr/bin | ||
1845 | 0 | 4 | ||
1846 | === added file 'debian/neutron-metadata-agent.logrotate' | |||
1847 | --- debian/neutron-metadata-agent.logrotate 1970-01-01 00:00:00 +0000 | |||
1848 | +++ debian/neutron-metadata-agent.logrotate 2014-02-24 14:59:12 +0000 | |||
1849 | @@ -0,0 +1,7 @@ | |||
1850 | 1 | /var/log/neutron/metadata-agent.log { | ||
1851 | 2 | daily | ||
1852 | 3 | missingok | ||
1853 | 4 | compress | ||
1854 | 5 | delaycompress | ||
1855 | 6 | notifempty | ||
1856 | 7 | } | ||
1857 | 0 | 8 | ||
1858 | === added file 'debian/neutron-metadata-agent.upstart' | |||
1859 | --- debian/neutron-metadata-agent.upstart 1970-01-01 00:00:00 +0000 | |||
1860 | +++ debian/neutron-metadata-agent.upstart 2014-02-24 14:59:12 +0000 | |||
1861 | @@ -0,0 +1,19 @@ | |||
1862 | 1 | # vim:set ft=upstart ts=2 et: | ||
1863 | 2 | description "Neutron Metadata Plugin Agent" | ||
1864 | 3 | author "Yolanda Robla <yolanda.robla@canonical.com>" | ||
1865 | 4 | |||
1866 | 5 | start on runlevel [2345] | ||
1867 | 6 | stop on runlevel [!2345] | ||
1868 | 7 | |||
1869 | 8 | respawn | ||
1870 | 9 | |||
1871 | 10 | chdir /var/run | ||
1872 | 11 | |||
1873 | 12 | pre-start script | ||
1874 | 13 | mkdir -p /var/run/neutron | ||
1875 | 14 | chown neutron:root /var/run/neutron | ||
1876 | 15 | end script | ||
1877 | 16 | |||
1878 | 17 | exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-metadata-agent -- \ | ||
1879 | 18 | --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/metadata_agent.ini \ | ||
1880 | 19 | --log-file=/var/log/neutron/metadata-agent.log | ||
1881 | 0 | 20 | ||
1882 | === added file 'debian/neutron-plugin-bigswitch.install' | |||
1883 | --- debian/neutron-plugin-bigswitch.install 1970-01-01 00:00:00 +0000 | |||
1884 | +++ debian/neutron-plugin-bigswitch.install 2014-02-24 14:59:12 +0000 | |||
1885 | @@ -0,0 +1,1 @@ | |||
1886 | 1 | etc/neutron/plugins/bigswitch/* etc/neutron/plugins/bigswitch | ||
1887 | 0 | 2 | ||
1888 | === added file 'debian/neutron-plugin-brocade.install' | |||
1889 | --- debian/neutron-plugin-brocade.install 1970-01-01 00:00:00 +0000 | |||
1890 | +++ debian/neutron-plugin-brocade.install 2014-02-24 14:59:12 +0000 | |||
1891 | @@ -0,0 +1,1 @@ | |||
1892 | 1 | etc/neutron/plugins/brocade/* etc/neutron/plugins/brocade | ||
1893 | 0 | 2 | ||
1894 | === added file 'debian/neutron-plugin-cisco.install' | |||
1895 | --- debian/neutron-plugin-cisco.install 1970-01-01 00:00:00 +0000 | |||
1896 | +++ debian/neutron-plugin-cisco.install 2014-02-24 14:59:12 +0000 | |||
1897 | @@ -0,0 +1,1 @@ | |||
1898 | 1 | etc/neutron/plugins/cisco/* etc/neutron/plugins/cisco | ||
1899 | 0 | 2 | ||
1900 | === added file 'debian/neutron-plugin-hyperv.install' | |||
1901 | --- debian/neutron-plugin-hyperv.install 1970-01-01 00:00:00 +0000 | |||
1902 | +++ debian/neutron-plugin-hyperv.install 2014-02-24 14:59:12 +0000 | |||
1903 | @@ -0,0 +1,2 @@ | |||
1904 | 1 | etc/neutron/plugins/hyperv/* etc/neutron/plugins/hyperv | ||
1905 | 2 | usr/bin/neutron-hyperv-agent usr/bin | ||
1906 | 0 | 3 | ||
1907 | === added file 'debian/neutron-plugin-linuxbridge-agent.install' | |||
1908 | --- debian/neutron-plugin-linuxbridge-agent.install 1970-01-01 00:00:00 +0000 | |||
1909 | +++ debian/neutron-plugin-linuxbridge-agent.install 2014-02-24 14:59:12 +0000 | |||
1910 | @@ -0,0 +1,2 @@ | |||
1911 | 1 | etc/neutron/rootwrap.d/linuxbridge-plugin.filters etc/neutron/rootwrap.d | ||
1912 | 2 | usr/bin/neutron-linuxbridge-agent usr/bin | ||
1913 | 0 | 3 | ||
1914 | === added file 'debian/neutron-plugin-linuxbridge-agent.logrotate' | |||
1915 | --- debian/neutron-plugin-linuxbridge-agent.logrotate 1970-01-01 00:00:00 +0000 | |||
1916 | +++ debian/neutron-plugin-linuxbridge-agent.logrotate 2014-02-24 14:59:12 +0000 | |||
1917 | @@ -0,0 +1,7 @@ | |||
1918 | 1 | /var/log/neutron/linuxbridge-agent.log { | ||
1919 | 2 | daily | ||
1920 | 3 | missingok | ||
1921 | 4 | compress | ||
1922 | 5 | delaycompress | ||
1923 | 6 | notifempty | ||
1924 | 7 | } | ||
1925 | 0 | 8 | ||
1926 | === added file 'debian/neutron-plugin-linuxbridge-agent.manpages' | |||
1927 | --- debian/neutron-plugin-linuxbridge-agent.manpages 1970-01-01 00:00:00 +0000 | |||
1928 | +++ debian/neutron-plugin-linuxbridge-agent.manpages 2014-02-24 14:59:12 +0000 | |||
1929 | @@ -0,0 +1,1 @@ | |||
1930 | 1 | debian/mans/neutron-linuxbridge-agent.8 | ||
1931 | 0 | 2 | ||
1932 | === added file 'debian/neutron-plugin-linuxbridge-agent.upstart' | |||
1933 | --- debian/neutron-plugin-linuxbridge-agent.upstart 1970-01-01 00:00:00 +0000 | |||
1934 | +++ debian/neutron-plugin-linuxbridge-agent.upstart 2014-02-24 14:59:12 +0000 | |||
1935 | @@ -0,0 +1,17 @@ | |||
1936 | 1 | # vim:set ft=upstart ts=2 et: | ||
1937 | 2 | description "Neutron API Server" | ||
1938 | 3 | author "Chuck Short <zulcss@ubuntu.com>" | ||
1939 | 4 | |||
1940 | 5 | start on runlevel [2345] | ||
1941 | 6 | stop on runlevel [!2345] | ||
1942 | 7 | |||
1943 | 8 | respawn | ||
1944 | 9 | |||
1945 | 10 | chdir /var/run | ||
1946 | 11 | |||
1947 | 12 | pre-start script | ||
1948 | 13 | mkdir -p /var/run/neutron | ||
1949 | 14 | chown neutron:root /var/run/neutron | ||
1950 | 15 | end script | ||
1951 | 16 | |||
1952 | 17 | exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-linuxbridge-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini --log-file=/var/log/neutron/linuxbridge-agent.log | ||
1953 | 0 | 18 | ||
1954 | === added file 'debian/neutron-plugin-linuxbridge.install' | |||
1955 | --- debian/neutron-plugin-linuxbridge.install 1970-01-01 00:00:00 +0000 | |||
1956 | +++ debian/neutron-plugin-linuxbridge.install 2014-02-24 14:59:12 +0000 | |||
1957 | @@ -0,0 +1,1 @@ | |||
1958 | 1 | etc/neutron/plugins/linuxbridge/* etc/neutron/plugins/linuxbridge | ||
1959 | 0 | 2 | ||
1960 | === added file 'debian/neutron-plugin-metaplugin.install' | |||
1961 | --- debian/neutron-plugin-metaplugin.install 1970-01-01 00:00:00 +0000 | |||
1962 | +++ debian/neutron-plugin-metaplugin.install 2014-02-24 14:59:12 +0000 | |||
1963 | @@ -0,0 +1,1 @@ | |||
1964 | 1 | etc/neutron/plugins/metaplugin/* etc/neutron/plugins/metaplugin | ||
1965 | 0 | 2 | ||
1966 | === added file 'debian/neutron-plugin-metering-agent.install' | |||
1967 | --- debian/neutron-plugin-metering-agent.install 1970-01-01 00:00:00 +0000 | |||
1968 | +++ debian/neutron-plugin-metering-agent.install 2014-02-24 14:59:12 +0000 | |||
1969 | @@ -0,0 +1,2 @@ | |||
1970 | 1 | etc/metering_agent.ini etc/neutron | ||
1971 | 2 | usr/bin/neutron-metering-agent usr/bin | ||
1972 | 0 | 3 | ||
1973 | === added file 'debian/neutron-plugin-metering-agent.upstart' | |||
1974 | --- debian/neutron-plugin-metering-agent.upstart 1970-01-01 00:00:00 +0000 | |||
1975 | +++ debian/neutron-plugin-metering-agent.upstart 2014-02-24 14:59:12 +0000 | |||
1976 | @@ -0,0 +1,19 @@ | |||
1977 | 1 | # vim:set ft=upstart ts=2 et: | ||
1978 | 2 | description "Neutron metering agent" | ||
1979 | 3 | author "Chuck Short <zulcss@ubuntu.com>" | ||
1980 | 4 | |||
1981 | 5 | start on runlevel [2345] | ||
1982 | 6 | stop on runlevel [!2345] | ||
1983 | 7 | |||
1984 | 8 | respawn | ||
1985 | 9 | |||
1986 | 10 | chdir /var/run | ||
1987 | 11 | |||
1988 | 12 | pre-start script | ||
1989 | 13 | mkdir -p /var/run/neutron | ||
1990 | 14 | chown neutron:root /var/run/neutron | ||
1991 | 15 | end script | ||
1992 | 16 | |||
1993 | 17 | exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-metering-agent -- \ | ||
1994 | 18 | --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/metering_agent.ini \ | ||
1995 | 19 | --log-file=/var/log/neutron/metering_agent.log | ||
1996 | 0 | 20 | ||
1997 | === added file 'debian/neutron-plugin-midonet.install' | |||
1998 | --- debian/neutron-plugin-midonet.install 1970-01-01 00:00:00 +0000 | |||
1999 | +++ debian/neutron-plugin-midonet.install 2014-02-24 14:59:12 +0000 | |||
2000 | @@ -0,0 +1,1 @@ | |||
2001 | 1 | etc/neutron/plugins/midonet/* etc/neutron/plugins/midonet | ||
2002 | 0 | 2 | ||
2003 | === added file 'debian/neutron-plugin-ml2.install' | |||
2004 | --- debian/neutron-plugin-ml2.install 1970-01-01 00:00:00 +0000 | |||
2005 | +++ debian/neutron-plugin-ml2.install 2014-02-24 14:59:12 +0000 | |||
2006 | @@ -0,0 +1,1 @@ | |||
2007 | 1 | etc/neutron/plugins/ml2/* etc/neutron/plugins/ml2 | ||
2008 | 0 | 2 | ||
2009 | === added file 'debian/neutron-plugin-mlnx-agent.install' | |||
2010 | --- debian/neutron-plugin-mlnx-agent.install 1970-01-01 00:00:00 +0000 | |||
2011 | +++ debian/neutron-plugin-mlnx-agent.install 2014-02-24 14:59:12 +0000 | |||
2012 | @@ -0,0 +1,2 @@ | |||
2013 | 1 | etc/neutron/plugins/mlnx/* etc/neutron/plugins/mlnx | ||
2014 | 2 | usr/bin/neutron-mlnx-agent usr/bin | ||
2015 | 0 | 3 | ||
2016 | === added file 'debian/neutron-plugin-mlnx-agent.upstart' | |||
2017 | --- debian/neutron-plugin-mlnx-agent.upstart 1970-01-01 00:00:00 +0000 | |||
2018 | +++ debian/neutron-plugin-mlnx-agent.upstart 2014-02-24 14:59:12 +0000 | |||
2019 | @@ -0,0 +1,19 @@ | |||
2020 | 1 | # vim:set ft=upstart ts=2 et: | ||
2021 | 2 | description "Neutron MLNX Plugin Agent" | ||
2022 | 3 | author "Chuck Short <zulcss@ubuntu.com>" | ||
2023 | 4 | |||
2024 | 5 | start on runlevel [2345] | ||
2025 | 6 | stop on runlevel [!2345] | ||
2026 | 7 | |||
2027 | 8 | respawn | ||
2028 | 9 | |||
2029 | 10 | chdir /var/run | ||
2030 | 11 | |||
2031 | 12 | pre-start script | ||
2032 | 13 | mkdir -p /var/run/neutron | ||
2033 | 14 | chown neutron:root /var/run/neutron | ||
2034 | 15 | end script | ||
2035 | 16 | |||
2036 | 17 | exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-mlnx-agent -- \ | ||
2037 | 18 | --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/mlnx/mlnx_conf.ini \ | ||
2038 | 19 | --log-file=/var/log/neutron/mlnx_conf.log | ||
2039 | 0 | 20 | ||
2040 | === added file 'debian/neutron-plugin-nec-agent.install' | |||
2041 | --- debian/neutron-plugin-nec-agent.install 1970-01-01 00:00:00 +0000 | |||
2042 | +++ debian/neutron-plugin-nec-agent.install 2014-02-24 14:59:12 +0000 | |||
2043 | @@ -0,0 +1,2 @@ | |||
2044 | 1 | etc/neutron/rootwrap.d/nec-plugin.filters etc/neutron/rootwrap.d | ||
2045 | 2 | usr/bin/neutron-nec-agent usr/bin | ||
2046 | 0 | 3 | ||
2047 | === added file 'debian/neutron-plugin-nec-agent.logrotate' | |||
2048 | --- debian/neutron-plugin-nec-agent.logrotate 1970-01-01 00:00:00 +0000 | |||
2049 | +++ debian/neutron-plugin-nec-agent.logrotate 2014-02-24 14:59:12 +0000 | |||
2050 | @@ -0,0 +1,7 @@ | |||
2051 | 1 | /var/log/neutron/nec-agent.log { | ||
2052 | 2 | daily | ||
2053 | 3 | missingok | ||
2054 | 4 | compress | ||
2055 | 5 | delaycompress | ||
2056 | 6 | notifempty | ||
2057 | 7 | } | ||
2058 | 0 | 8 | ||
2059 | === added file 'debian/neutron-plugin-nec-agent.manpages' | |||
2060 | --- debian/neutron-plugin-nec-agent.manpages 1970-01-01 00:00:00 +0000 | |||
2061 | +++ debian/neutron-plugin-nec-agent.manpages 2014-02-24 14:59:12 +0000 | |||
2062 | @@ -0,0 +1,1 @@ | |||
2063 | 1 | debian/mans/neutron-nec-agent.8 | ||
2064 | 0 | 2 | ||
2065 | === added file 'debian/neutron-plugin-nec-agent.upstart' | |||
2066 | --- debian/neutron-plugin-nec-agent.upstart 1970-01-01 00:00:00 +0000 | |||
2067 | +++ debian/neutron-plugin-nec-agent.upstart 2014-02-24 14:59:12 +0000 | |||
2068 | @@ -0,0 +1,17 @@ | |||
2069 | 1 | # vim:set ft=upstart ts=2 et: | ||
2070 | 2 | description "Neutron NEC Plugin Agent" | ||
2071 | 3 | author "Chuck Short <zulcss@ubuntu.com>" | ||
2072 | 4 | |||
2073 | 5 | start on runlevel [2345] | ||
2074 | 6 | stop on runlevel [!2345] | ||
2075 | 7 | |||
2076 | 8 | respawn | ||
2077 | 9 | |||
2078 | 10 | chdir /var/run | ||
2079 | 11 | |||
2080 | 12 | pre-start script | ||
2081 | 13 | mkdir -p /var/run/neutron | ||
2082 | 14 | chown neutron:root /var/run/neutron | ||
2083 | 15 | end script | ||
2084 | 16 | |||
2085 | 17 | exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-nec-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/nec/nec.ini --log-file=/var/log/neutron/nec-agent.log | ||
2086 | 0 | 18 | ||
2087 | === added file 'debian/neutron-plugin-nec.install' | |||
2088 | --- debian/neutron-plugin-nec.install 1970-01-01 00:00:00 +0000 | |||
2089 | +++ debian/neutron-plugin-nec.install 2014-02-24 14:59:12 +0000 | |||
2090 | @@ -0,0 +1,1 @@ | |||
2091 | 1 | etc/neutron/plugins/nec/* etc/neutron/plugins/nec | ||
2092 | 0 | 2 | ||
2093 | === added file 'debian/neutron-plugin-openvswitch-agent.install' | |||
2094 | --- debian/neutron-plugin-openvswitch-agent.install 1970-01-01 00:00:00 +0000 | |||
2095 | +++ debian/neutron-plugin-openvswitch-agent.install 2014-02-24 14:59:12 +0000 | |||
2096 | @@ -0,0 +1,2 @@ | |||
2097 | 1 | etc/neutron/rootwrap.d/openvswitch-plugin.filters etc/neutron/rootwrap.d | ||
2098 | 2 | usr/bin/neutron-openvswitch-agent usr/bin | ||
2099 | 0 | 3 | ||
2100 | === added file 'debian/neutron-plugin-openvswitch-agent.logrotate' | |||
2101 | --- debian/neutron-plugin-openvswitch-agent.logrotate 1970-01-01 00:00:00 +0000 | |||
2102 | +++ debian/neutron-plugin-openvswitch-agent.logrotate 2014-02-24 14:59:12 +0000 | |||
2103 | @@ -0,0 +1,7 @@ | |||
2104 | 1 | /var/log/neutron/openvswitch-agent.log { | ||
2105 | 2 | daily | ||
2106 | 3 | missingok | ||
2107 | 4 | compress | ||
2108 | 5 | delaycompress | ||
2109 | 6 | notifempty | ||
2110 | 7 | } | ||
2111 | 0 | 8 | ||
2112 | === added file 'debian/neutron-plugin-openvswitch-agent.manpages' | |||
2113 | --- debian/neutron-plugin-openvswitch-agent.manpages 1970-01-01 00:00:00 +0000 | |||
2114 | +++ debian/neutron-plugin-openvswitch-agent.manpages 2014-02-24 14:59:12 +0000 | |||
2115 | @@ -0,0 +1,1 @@ | |||
2116 | 1 | debian/mans/neutron-openvswitch-agent.8 | ||
2117 | 0 | 2 | ||
2118 | === added file 'debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.upstart' | |||
2119 | --- debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.upstart 1970-01-01 00:00:00 +0000 | |||
2120 | +++ debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.upstart 2014-02-24 14:59:12 +0000 | |||
2121 | @@ -0,0 +1,13 @@ | |||
2122 | 1 | # vim:set ft=upstart ts=2 et: | ||
2123 | 2 | description "Neutron OVS cleanup" | ||
2124 | 3 | author "James Page <james.page@ubuntu.com>" | ||
2125 | 4 | |||
2126 | 5 | start on started openvswitch-switch | ||
2127 | 6 | stop on runlevel [!2345] | ||
2128 | 7 | |||
2129 | 8 | pre-start script | ||
2130 | 9 | [ ! -x /usr/bin/neutron-ovs-cleanup ] && exit 0 | ||
2131 | 10 | start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-ovs-cleanup -- \ | ||
2132 | 11 | --log-file /var/log/neutron/ovs-cleanup.log \ | ||
2133 | 12 | --config-file /etc/neutron/neutron.conf --verbose | ||
2134 | 13 | end script | ||
2135 | 0 | 14 | ||
2136 | === added file 'debian/neutron-plugin-openvswitch-agent.upstart' | |||
2137 | --- debian/neutron-plugin-openvswitch-agent.upstart 1970-01-01 00:00:00 +0000 | |||
2138 | +++ debian/neutron-plugin-openvswitch-agent.upstart 2014-02-24 14:59:12 +0000 | |||
2139 | @@ -0,0 +1,17 @@ | |||
2140 | 1 | # vim:set ft=upstart ts=2 et: | ||
2141 | 2 | description "Neutron OpenvSwitch Plugin Agent" | ||
2142 | 3 | author "Chuck Short <zulcss@ubuntu.com>" | ||
2143 | 4 | |||
2144 | 5 | start on runlevel [2345] and started neutron-ovs-cleanup | ||
2145 | 6 | stop on runlevel [!2345] | ||
2146 | 7 | |||
2147 | 8 | respawn | ||
2148 | 9 | |||
2149 | 10 | chdir /var/run | ||
2150 | 11 | |||
2151 | 12 | pre-start script | ||
2152 | 13 | mkdir -p /var/run/neutron | ||
2153 | 14 | chown neutron:root /var/run/neutron | ||
2154 | 15 | end script | ||
2155 | 16 | |||
2156 | 17 | exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-openvswitch-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini --log-file=/var/log/neutron/openvswitch-agent.log | ||
2157 | 0 | 18 | ||
2158 | === added file 'debian/neutron-plugin-openvswitch.install' | |||
2159 | --- debian/neutron-plugin-openvswitch.install 1970-01-01 00:00:00 +0000 | |||
2160 | +++ debian/neutron-plugin-openvswitch.install 2014-02-24 14:59:12 +0000 | |||
2161 | @@ -0,0 +1,1 @@ | |||
2162 | 1 | etc/neutron/plugins/openvswitch/* etc/neutron/plugins/openvswitch | ||
2163 | 0 | 2 | ||
2164 | === added file 'debian/neutron-plugin-plumgrid.install' | |||
2165 | --- debian/neutron-plugin-plumgrid.install 1970-01-01 00:00:00 +0000 | |||
2166 | +++ debian/neutron-plugin-plumgrid.install 2014-02-24 14:59:12 +0000 | |||
2167 | @@ -0,0 +1,1 @@ | |||
2168 | 1 | etc/neutron/plugins/plumgrid/* etc/neutron/plugins/plumgrid | ||
2169 | 0 | 2 | ||
2170 | === added file 'debian/neutron-plugin-ryu-agent.install' | |||
2171 | --- debian/neutron-plugin-ryu-agent.install 1970-01-01 00:00:00 +0000 | |||
2172 | +++ debian/neutron-plugin-ryu-agent.install 2014-02-24 14:59:12 +0000 | |||
2173 | @@ -0,0 +1,2 @@ | |||
2174 | 1 | etc/neutron/rootwrap.d/ryu-plugin.filters etc/neutron/rootwrap.d | ||
2175 | 2 | usr/bin/neutron-ryu-agent usr/bin | ||
2176 | 0 | 3 | ||
2177 | === added file 'debian/neutron-plugin-ryu-agent.logrotate' | |||
2178 | --- debian/neutron-plugin-ryu-agent.logrotate 1970-01-01 00:00:00 +0000 | |||
2179 | +++ debian/neutron-plugin-ryu-agent.logrotate 2014-02-24 14:59:12 +0000 | |||
2180 | @@ -0,0 +1,7 @@ | |||
2181 | 1 | /var/log/neutron/ryu-agent.log { | ||
2182 | 2 | daily | ||
2183 | 3 | missingok | ||
2184 | 4 | compress | ||
2185 | 5 | delaycompress | ||
2186 | 6 | notifempty | ||
2187 | 7 | } | ||
2188 | 0 | 8 | ||
2189 | === added file 'debian/neutron-plugin-ryu-agent.manpages' | |||
2190 | --- debian/neutron-plugin-ryu-agent.manpages 1970-01-01 00:00:00 +0000 | |||
2191 | +++ debian/neutron-plugin-ryu-agent.manpages 2014-02-24 14:59:12 +0000 | |||
2192 | @@ -0,0 +1,1 @@ | |||
2193 | 1 | debian/mans/neutron-ryu-agent.8 | ||
2194 | 0 | 2 | ||
2195 | === added file 'debian/neutron-plugin-ryu-agent.upstart' | |||
2196 | --- debian/neutron-plugin-ryu-agent.upstart 1970-01-01 00:00:00 +0000 | |||
2197 | +++ debian/neutron-plugin-ryu-agent.upstart 2014-02-24 14:59:12 +0000 | |||
2198 | @@ -0,0 +1,17 @@ | |||
2199 | 1 | # vim:set ft=upstart ts=2 et: | ||
2200 | 2 | description "Neutron RYU Plugin Agent" | ||
2201 | 3 | author "Chuck Short <zulcss@ubuntu.com>" | ||
2202 | 4 | |||
2203 | 5 | start on runlevel [2345] | ||
2204 | 6 | stop on runlevel [!2345] | ||
2205 | 7 | |||
2206 | 8 | respawn | ||
2207 | 9 | |||
2208 | 10 | chdir /var/run | ||
2209 | 11 | |||
2210 | 12 | pre-start script | ||
2211 | 13 | mkdir -p /var/run/neutron | ||
2212 | 14 | chown neutron:root /var/run/neutron | ||
2213 | 15 | end script | ||
2214 | 16 | |||
2215 | 17 | exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-ryu-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ryu/ryu.ini --log-file=/var/log/neutron/ryu-agent.log | ||
2216 | 0 | 18 | ||
2217 | === added file 'debian/neutron-plugin-ryu.install' | |||
2218 | --- debian/neutron-plugin-ryu.install 1970-01-01 00:00:00 +0000 | |||
2219 | +++ debian/neutron-plugin-ryu.install 2014-02-24 14:59:12 +0000 | |||
2220 | @@ -0,0 +1,1 @@ | |||
2221 | 1 | etc/neutron/plugins/ryu/* etc/neutron/plugins/ryu | ||
2222 | 0 | 2 | ||
2223 | === added file 'debian/neutron-plugin-vmware.install' | |||
2224 | --- debian/neutron-plugin-vmware.install 1970-01-01 00:00:00 +0000 | |||
2225 | +++ debian/neutron-plugin-vmware.install 2014-02-24 14:59:12 +0000 | |||
2226 | @@ -0,0 +1,3 @@ | |||
2227 | 1 | etc/neutron/plugins/vmware/* etc/neutron/plugins/vmware | ||
2228 | 2 | usr/bin/neutron-check-nvp-config usr/bin | ||
2229 | 3 | usr/bin/neutron-check-nsx-config usr/bin | ||
2230 | 0 | 4 | ||
2231 | === added file 'debian/neutron-plugin-vpn-agent.install' | |||
2232 | --- debian/neutron-plugin-vpn-agent.install 1970-01-01 00:00:00 +0000 | |||
2233 | +++ debian/neutron-plugin-vpn-agent.install 2014-02-24 14:59:12 +0000 | |||
2234 | @@ -0,0 +1,2 @@ | |||
2235 | 1 | etc/vpn_agent.ini etc/neutron | ||
2236 | 2 | usr/bin/neutron-vpn-agent usr/bin | ||
2237 | 0 | 3 | ||
2238 | === added file 'debian/neutron-plugin-vpn-agent.upstart' | |||
2239 | --- debian/neutron-plugin-vpn-agent.upstart 1970-01-01 00:00:00 +0000 | |||
2240 | +++ debian/neutron-plugin-vpn-agent.upstart 2014-02-24 14:59:12 +0000 | |||
2241 | @@ -0,0 +1,19 @@ | |||
2242 | 1 | # vim:set ft=upstart ts=2 et: | ||
2243 | 2 | description "Neutron vpn Plugin Agent" | ||
2244 | 3 | author "Chuck Short <zulcss@ubuntu.com>" | ||
2245 | 4 | |||
2246 | 5 | start on runlevel [2345] | ||
2247 | 6 | stop on runlevel [!2345] | ||
2248 | 7 | |||
2249 | 8 | respawn | ||
2250 | 9 | |||
2251 | 10 | chdir /var/run | ||
2252 | 11 | |||
2253 | 12 | pre-start script | ||
2254 | 13 | mkdir -p /var/run/neutron | ||
2255 | 14 | chown neutron:root /var/run/neutron | ||
2256 | 15 | end script | ||
2257 | 16 | |||
2258 | 17 | exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-vpn-agent -- \ | ||
2259 | 18 | --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/vpn_agent.ini \ | ||
2260 | 19 | --log-file=/var/log/neutron/vpn_agent.log | ||
2261 | 0 | 20 | ||
2262 | === added file 'debian/neutron-server.default' | |||
2263 | --- debian/neutron-server.default 1970-01-01 00:00:00 +0000 | |||
2264 | +++ debian/neutron-server.default 2014-02-24 14:59:12 +0000 | |||
2265 | @@ -0,0 +1,5 @@ | |||
2266 | 1 | # defaults for neutron-server | ||
2267 | 2 | |||
2268 | 3 | # path to config file corresponding to the core_plugin specified in | ||
2269 | 4 | # neutron.conf | ||
2270 | 5 | NEUTRON_PLUGIN_CONFIG="/etc/neutron/plugins/ml2/ml2_conf.ini" | ||
2271 | 0 | 6 | ||
2272 | === added file 'debian/neutron-server.install' | |||
2273 | --- debian/neutron-server.install 1970-01-01 00:00:00 +0000 | |||
2274 | +++ debian/neutron-server.install 2014-02-24 14:59:12 +0000 | |||
2275 | @@ -0,0 +1,1 @@ | |||
2276 | 1 | usr/bin/neutron-server usr/bin | ||
2277 | 0 | 2 | ||
2278 | === added file 'debian/neutron-server.logrotate' | |||
2279 | --- debian/neutron-server.logrotate 1970-01-01 00:00:00 +0000 | |||
2280 | +++ debian/neutron-server.logrotate 2014-02-24 14:59:12 +0000 | |||
2281 | @@ -0,0 +1,7 @@ | |||
2282 | 1 | /var/log/neutron/server.log { | ||
2283 | 2 | daily | ||
2284 | 3 | missingok | ||
2285 | 4 | compress | ||
2286 | 5 | delaycompress | ||
2287 | 6 | notifempty | ||
2288 | 7 | } | ||
2289 | 0 | 8 | ||
2290 | === added file 'debian/neutron-server.manpages' | |||
2291 | --- debian/neutron-server.manpages 1970-01-01 00:00:00 +0000 | |||
2292 | +++ debian/neutron-server.manpages 2014-02-24 14:59:12 +0000 | |||
2293 | @@ -0,0 +1,2 @@ | |||
2294 | 1 | debian/mans/neutron-server.8 | ||
2295 | 2 | debian/mans/neutron-rootwrap.8 | ||
2296 | 0 | 3 | ||
2297 | === added file 'debian/neutron-server.upstart' | |||
2298 | --- debian/neutron-server.upstart 1970-01-01 00:00:00 +0000 | |||
2299 | +++ debian/neutron-server.upstart 2014-02-24 14:59:12 +0000 | |||
2300 | @@ -0,0 +1,23 @@ | |||
2301 | 1 | # vim:set ft=upstart ts=2 et: | ||
2302 | 2 | description "Neutron API Server" | ||
2303 | 3 | author "Chuck Short <zulcss@ubuntu.com>" | ||
2304 | 4 | |||
2305 | 5 | start on runlevel [2345] | ||
2306 | 6 | stop on runlevel [!2345] | ||
2307 | 7 | |||
2308 | 8 | respawn | ||
2309 | 9 | |||
2310 | 10 | chdir /var/run | ||
2311 | 11 | |||
2312 | 12 | pre-start script | ||
2313 | 13 | mkdir -p /var/run/neutron | ||
2314 | 14 | chown neutron:root /var/run/neutron | ||
2315 | 15 | end script | ||
2316 | 16 | |||
2317 | 17 | script | ||
2318 | 18 | [ -r /etc/default/neutron-server ] && . /etc/default/neutron-server | ||
2319 | 19 | [ -r "$NEUTRON_PLUGIN_CONFIG" ] && CONF_ARG="--config-file $NEUTRON_PLUGIN_CONFIG" | ||
2320 | 20 | exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-server -- \ | ||
2321 | 21 | --config-file /etc/neutron/neutron.conf \ | ||
2322 | 22 | --log-file /var/log/neutron/server.log $CONF_ARG | ||
2323 | 23 | end script | ||
2324 | 0 | 24 | ||
2325 | === added file 'debian/neutron_sudoers' | |||
2326 | --- debian/neutron_sudoers 1970-01-01 00:00:00 +0000 | |||
2327 | +++ debian/neutron_sudoers 2014-02-24 14:59:12 +0000 | |||
2328 | @@ -0,0 +1,3 @@ | |||
2329 | 1 | Defaults:neutron !requiretty | ||
2330 | 2 | |||
2331 | 3 | neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap | ||
2332 | 0 | 4 | ||
2333 | === added directory 'debian/patches' | |||
2334 | === added file 'debian/patches/disable-failing-cisco-test.patch' | |||
2335 | --- debian/patches/disable-failing-cisco-test.patch 1970-01-01 00:00:00 +0000 | |||
2336 | +++ debian/patches/disable-failing-cisco-test.patch 2014-02-24 14:59:12 +0000 | |||
2337 | @@ -0,0 +1,25 @@ | |||
2338 | 1 | Description: Skip failing cisco test | ||
2339 | 2 | ====================================================================== | ||
2340 | 3 | FAIL: neutron.tests.unit.ml2.drivers.test_cisco_mech.TestCiscoBasicGet.test_single_get_admin | ||
2341 | 4 | neutron.tests.unit.ml2.drivers.test_cisco_mech.TestCiscoBasicGet.test_single_get_admin | ||
2342 | 5 | ---------------------------------------------------------------------- | ||
2343 | 6 | _StringException | ||
2344 | 7 | |||
2345 | 8 | ---------------------------------------------------------------------- | ||
2346 | 9 | Author: James Page <james.page@ubuntu.com> | ||
2347 | 10 | Forwarded: not-needed | ||
2348 | 11 | Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/neutron/+bug/1262195 | ||
2349 | 12 | |||
2350 | 13 | --- a/neutron/tests/unit/ml2/drivers/test_cisco_mech.py | ||
2351 | 14 | +++ b/neutron/tests/unit/ml2/drivers/test_cisco_mech.py | ||
2352 | 15 | @@ -147,8 +147,8 @@ class CiscoML2MechanismTestCase(test_db_ | ||
2353 | 16 | |||
2354 | 17 | class TestCiscoBasicGet(CiscoML2MechanismTestCase, | ||
2355 | 18 | test_db_plugin.TestBasicGet): | ||
2356 | 19 | - | ||
2357 | 20 | - pass | ||
2358 | 21 | + def test_single_get_admin(self): | ||
2359 | 22 | + pass | ||
2360 | 23 | |||
2361 | 24 | |||
2362 | 25 | class TestCiscoV2HTTPResponse(CiscoML2MechanismTestCase, | ||
2363 | 0 | 26 | ||
2364 | === added file 'debian/patches/disable-failing-metaplugin-tests.patch' | |||
2365 | --- debian/patches/disable-failing-metaplugin-tests.patch 1970-01-01 00:00:00 +0000 | |||
2366 | +++ debian/patches/disable-failing-metaplugin-tests.patch 2014-02-24 14:59:12 +0000 | |||
2367 | @@ -0,0 +1,67 @@ | |||
2368 | 1 | Description: Disable failing metaplugin tests | ||
2369 | 2 | Some metaplugin tests are currently failing in Ubuntu; patch | ||
2370 | 3 | then out until they get resolved in full. | ||
2371 | 4 | Author: James Page <james.page@ubuntu.com> | ||
2372 | 5 | Forwarded: not-needed | ||
2373 | 6 | Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/neutron/+bug/1262174 | ||
2374 | 7 | |||
2375 | 8 | --- a/neutron/tests/unit/metaplugin/test_basic.py | ||
2376 | 9 | +++ b/neutron/tests/unit/metaplugin/test_basic.py | ||
2377 | 10 | @@ -43,7 +43,14 @@ class TestMetaBasicGet(test_plugin.TestB | ||
2378 | 11 | |||
2379 | 12 | class TestMetaV2HTTPResponse(test_plugin.TestV2HTTPResponse, | ||
2380 | 13 | MetaPluginV2DBTestCase): | ||
2381 | 14 | - pass | ||
2382 | 15 | + def test_list_with_fields_noadmin(self): | ||
2383 | 16 | + pass | ||
2384 | 17 | + | ||
2385 | 18 | + def test_list_with_fields(self): | ||
2386 | 19 | + pass | ||
2387 | 20 | + | ||
2388 | 21 | + def test_list_with_fields_noadmin_and_policy_field(self): | ||
2389 | 22 | + pass | ||
2390 | 23 | |||
2391 | 24 | |||
2392 | 25 | class TestMetaPortsV2(test_plugin.TestPortsV2, | ||
2393 | 26 | @@ -53,7 +60,30 @@ class TestMetaPortsV2(test_plugin.TestPo | ||
2394 | 27 | |||
2395 | 28 | class TestMetaNetworksV2(test_plugin.TestNetworksV2, | ||
2396 | 29 | MetaPluginV2DBTestCase): | ||
2397 | 30 | - pass | ||
2398 | 31 | + | ||
2399 | 32 | + def test_list_networks_without_pk_in_fields_pagination_emulated(self): | ||
2400 | 33 | + pass | ||
2401 | 34 | + | ||
2402 | 35 | + def test_list_shared_networks_with_non_admin_user(self): | ||
2403 | 36 | + pass | ||
2404 | 37 | + | ||
2405 | 38 | + def test_list_networks_with_pagination_emulated(self): | ||
2406 | 39 | + pass | ||
2407 | 40 | + | ||
2408 | 41 | + def test_list_networks_with_sort_emulated(self): | ||
2409 | 42 | + pass | ||
2410 | 43 | + | ||
2411 | 44 | + def test_list_networks_with_pagination_reverse_emulated(self): | ||
2412 | 45 | + pass | ||
2413 | 46 | + | ||
2414 | 47 | + def test_list_networks_with_parameters(self): | ||
2415 | 48 | + pass | ||
2416 | 49 | + | ||
2417 | 50 | + def test_list_networks_with_fields(self): | ||
2418 | 51 | + pass | ||
2419 | 52 | + | ||
2420 | 53 | + def test_list_networks(self): | ||
2421 | 54 | + pass | ||
2422 | 55 | |||
2423 | 56 | |||
2424 | 57 | class TestMetaSubnetsV2(test_plugin.TestSubnetsV2, | ||
2425 | 58 | --- a/neutron/tests/unit/metaplugin/test_metaplugin.py | ||
2426 | 59 | +++ b/neutron/tests/unit/metaplugin/test_metaplugin.py | ||
2427 | 60 | @@ -144,6 +144,7 @@ class MetaNeutronPluginV2Test(base.BaseT | ||
2428 | 61 | return data | ||
2429 | 62 | |||
2430 | 63 | def test_create_delete_network(self): | ||
2431 | 64 | + return | ||
2432 | 65 | network1 = self._fake_network('fake1') | ||
2433 | 66 | ret1 = self.plugin.create_network(self.context, network1) | ||
2434 | 67 | self.assertEqual('fake1', ret1[FLAVOR_NETWORK]) | ||
2435 | 0 | 68 | ||
2436 | === added file 'debian/patches/disable-udev-tests.patch' | |||
2437 | --- debian/patches/disable-udev-tests.patch 1970-01-01 00:00:00 +0000 | |||
2438 | +++ debian/patches/disable-udev-tests.patch 2014-02-24 14:59:12 +0000 | |||
2439 | @@ -0,0 +1,1008 @@ | |||
2440 | 1 | Description: Disable udev tests | ||
2441 | 2 | udev is not always avaliable in Ubuntu buildds; skip tests that | ||
2442 | 3 | want to use this feature. | ||
2443 | 4 | Author: Chuck Short <zulcss@ubuntu.com> | ||
2444 | 5 | Fowarded: not-needed | ||
2445 | 6 | diff -Naurp neutron-2014.1.b2.orig/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py neutron-2014.1.b2/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py | ||
2446 | 7 | --- neutron-2014.1.b2.orig/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py 2014-01-23 10:13:25.000000000 -0500 | ||
2447 | 8 | +++ neutron-2014.1.b2/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py 2014-02-03 08:53:04.409255073 -0500 | ||
2448 | 9 | @@ -46,6 +46,7 @@ class FakeIpDevice(object): | ||
2449 | 10 | class TestLinuxBridge(base.BaseTestCase): | ||
2450 | 11 | |||
2451 | 12 | def setUp(self): | ||
2452 | 13 | + self.skipTest("udev not consistently available in Ubuntu buildds") | ||
2453 | 14 | super(TestLinuxBridge, self).setUp() | ||
2454 | 15 | self.addCleanup(cfg.CONF.reset) | ||
2455 | 16 | interface_mappings = {'physnet1': 'eth1'} | ||
2456 | 17 | @@ -109,6 +110,7 @@ class TestLinuxBridgeAgent(base.BaseTest | ||
2457 | 18 | self.get_mac.return_value = '00:00:00:00:00:01' | ||
2458 | 19 | |||
2459 | 20 | def test_update_devices_failed(self): | ||
2460 | 21 | + self.skipTest("udev not consistently available in Ubuntu buildds") | ||
2461 | 22 | agent = linuxbridge_neutron_agent.LinuxBridgeNeutronAgentRPC({}, | ||
2462 | 23 | 0, | ||
2463 | 24 | None) | ||
2464 | 25 | @@ -130,6 +132,7 @@ class TestLinuxBridgeAgent(base.BaseTest | ||
2465 | 26 | self.assertEqual(3, log.call_count) | ||
2466 | 27 | |||
2467 | 28 | def test_process_network_devices_failed(self): | ||
2468 | 29 | + self.skipTest("udev not consistently available in Ubuntu buildds") | ||
2469 | 30 | device_info = {'current': [1, 2, 3]} | ||
2470 | 31 | agent = linuxbridge_neutron_agent.LinuxBridgeNeutronAgentRPC({}, | ||
2471 | 32 | 0, | ||
2472 | 33 | @@ -158,6 +161,7 @@ class TestLinuxBridgeAgent(base.BaseTest | ||
2473 | 34 | |||
2474 | 35 | class TestLinuxBridgeManager(base.BaseTestCase): | ||
2475 | 36 | def setUp(self): | ||
2476 | 37 | + self.skipTest("udev not consistently available in Ubuntu buildds") | ||
2477 | 38 | super(TestLinuxBridgeManager, self).setUp() | ||
2478 | 39 | self.interface_mappings = {'physnet1': 'eth1'} | ||
2479 | 40 | self.root_helper = cfg.CONF.AGENT.root_helper | ||
2480 | 41 | @@ -667,6 +671,7 @@ class TestLinuxBridgeManager(base.BaseTe | ||
2481 | 42 | |||
2482 | 43 | class TestLinuxBridgeRpcCallbacks(base.BaseTestCase): | ||
2483 | 44 | def setUp(self): | ||
2484 | 45 | + self.skipTest("udev not consistently available in Ubuntu buildds") | ||
2485 | 46 | cfg.CONF.set_override('local_ip', LOCAL_IP, 'VXLAN') | ||
2486 | 47 | self.addCleanup(cfg.CONF.reset) | ||
2487 | 48 | super(TestLinuxBridgeRpcCallbacks, self).setUp() | ||
2488 | 49 | diff -Naurp neutron-2014.1.b2.orig/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py.orig neutron-2014.1.b2/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py.orig | ||
2489 | 50 | --- neutron-2014.1.b2.orig/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py.orig 1969-12-31 19:00:00.000000000 -0500 | ||
2490 | 51 | +++ neutron-2014.1.b2/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py.orig 2014-01-23 10:13:25.000000000 -0500 | ||
2491 | 52 | @@ -0,0 +1,956 @@ | ||
2492 | 53 | +# vim: tabstop=4 shiftwidth=4 softtabstop=4 | ||
2493 | 54 | + | ||
2494 | 55 | +# Copyright (c) 2012 OpenStack Foundation. | ||
2495 | 56 | +# | ||
2496 | 57 | +# Licensed under the Apache License, Version 2.0 (the "License"); you may | ||
2497 | 58 | +# not use this file except in compliance with the License. You may obtain | ||
2498 | 59 | +# a copy of the License at | ||
2499 | 60 | +# | ||
2500 | 61 | +# http://www.apache.org/licenses/LICENSE-2.0 | ||
2501 | 62 | +# | ||
2502 | 63 | +# Unless required by applicable law or agreed to in writing, software | ||
2503 | 64 | +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
2504 | 65 | +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
2505 | 66 | +# License for the specific language governing permissions and limitations | ||
2506 | 67 | +# under the License. | ||
2507 | 68 | + | ||
2508 | 69 | +import contextlib | ||
2509 | 70 | +import os | ||
2510 | 71 | + | ||
2511 | 72 | +import mock | ||
2512 | 73 | +from oslo.config import cfg | ||
2513 | 74 | +import testtools | ||
2514 | 75 | + | ||
2515 | 76 | +from neutron.agent.linux import ip_lib | ||
2516 | 77 | +from neutron.agent.linux import utils | ||
2517 | 78 | +from neutron.common import constants | ||
2518 | 79 | +from neutron.openstack.common.rpc import common as rpc_common | ||
2519 | 80 | +from neutron.plugins.common import constants as p_const | ||
2520 | 81 | +from neutron.plugins.linuxbridge.agent import linuxbridge_neutron_agent | ||
2521 | 82 | +from neutron.plugins.linuxbridge.common import constants as lconst | ||
2522 | 83 | +from neutron.tests import base | ||
2523 | 84 | + | ||
2524 | 85 | +LOCAL_IP = '192.168.0.33' | ||
2525 | 86 | + | ||
2526 | 87 | + | ||
2527 | 88 | +class FakeIpLinkCommand(object): | ||
2528 | 89 | + def set_up(self): | ||
2529 | 90 | + pass | ||
2530 | 91 | + | ||
2531 | 92 | + | ||
2532 | 93 | +class FakeIpDevice(object): | ||
2533 | 94 | + def __init__(self): | ||
2534 | 95 | + self.link = FakeIpLinkCommand() | ||
2535 | 96 | + | ||
2536 | 97 | + | ||
2537 | 98 | +class TestLinuxBridge(base.BaseTestCase): | ||
2538 | 99 | + | ||
2539 | 100 | + def setUp(self): | ||
2540 | 101 | + super(TestLinuxBridge, self).setUp() | ||
2541 | 102 | + self.addCleanup(cfg.CONF.reset) | ||
2542 | 103 | + interface_mappings = {'physnet1': 'eth1'} | ||
2543 | 104 | + root_helper = cfg.CONF.AGENT.root_helper | ||
2544 | 105 | + | ||
2545 | 106 | + self.linux_bridge = linuxbridge_neutron_agent.LinuxBridgeManager( | ||
2546 | 107 | + interface_mappings, root_helper) | ||
2547 | 108 | + | ||
2548 | 109 | + def test_ensure_physical_in_bridge_invalid(self): | ||
2549 | 110 | + result = self.linux_bridge.ensure_physical_in_bridge('network_id', | ||
2550 | 111 | + p_const.TYPE_VLAN, | ||
2551 | 112 | + 'physnetx', | ||
2552 | 113 | + 7) | ||
2553 | 114 | + self.assertFalse(result) | ||
2554 | 115 | + | ||
2555 | 116 | + def test_ensure_physical_in_bridge_flat(self): | ||
2556 | 117 | + with mock.patch.object(self.linux_bridge, | ||
2557 | 118 | + 'ensure_flat_bridge') as flat_bridge_func: | ||
2558 | 119 | + self.linux_bridge.ensure_physical_in_bridge( | ||
2559 | 120 | + 'network_id', p_const.TYPE_FLAT, 'physnet1', None) | ||
2560 | 121 | + self.assertTrue(flat_bridge_func.called) | ||
2561 | 122 | + | ||
2562 | 123 | + def test_ensure_physical_in_bridge_vlan(self): | ||
2563 | 124 | + with mock.patch.object(self.linux_bridge, | ||
2564 | 125 | + 'ensure_vlan_bridge') as vlan_bridge_func: | ||
2565 | 126 | + self.linux_bridge.ensure_physical_in_bridge( | ||
2566 | 127 | + 'network_id', p_const.TYPE_VLAN, 'physnet1', 7) | ||
2567 | 128 | + self.assertTrue(vlan_bridge_func.called) | ||
2568 | 129 | + | ||
2569 | 130 | + def test_ensure_physical_in_bridge_vxlan(self): | ||
2570 | 131 | + self.linux_bridge.vxlan_mode = lconst.VXLAN_UCAST | ||
2571 | 132 | + with mock.patch.object(self.linux_bridge, | ||
2572 | 133 | + 'ensure_vxlan_bridge') as vxlan_bridge_func: | ||
2573 | 134 | + self.linux_bridge.ensure_physical_in_bridge( | ||
2574 | 135 | + 'network_id', 'vxlan', 'physnet1', 7) | ||
2575 | 136 | + self.assertTrue(vxlan_bridge_func.called) | ||
2576 | 137 | + | ||
2577 | 138 | + | ||
2578 | 139 | +class TestLinuxBridgeAgent(base.BaseTestCase): | ||
2579 | 140 | + | ||
2580 | 141 | + LINK_SAMPLE = [ | ||
2581 | 142 | + '1: lo: <LOOPBACK,UP,LOWER_UP> mtu 16436 qdisc noqueue \\' | ||
2582 | 143 | + 'state UNKNOWN \\' | ||
2583 | 144 | + 'link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00', | ||
2584 | 145 | + '2: eth77: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 \\' | ||
2585 | 146 | + 'qdisc mq state UP qlen 1000\ link/ether \\' | ||
2586 | 147 | + 'cc:dd:ee:ff:ab:cd brd ff:ff:ff:ff:ff:ff'] | ||
2587 | 148 | + | ||
2588 | 149 | + def setUp(self): | ||
2589 | 150 | + super(TestLinuxBridgeAgent, self).setUp() | ||
2590 | 151 | + cfg.CONF.set_override('rpc_backend', | ||
2591 | 152 | + 'neutron.openstack.common.rpc.impl_fake') | ||
2592 | 153 | + self.execute_p = mock.patch.object(ip_lib.IPWrapper, '_execute') | ||
2593 | 154 | + self.execute = self.execute_p.start() | ||
2594 | 155 | + self.addCleanup(self.execute_p.stop) | ||
2595 | 156 | + self.execute.return_value = '\n'.join(self.LINK_SAMPLE) | ||
2596 | 157 | + self.get_mac_p = mock.patch('neutron.agent.linux.utils.' | ||
2597 | 158 | + 'get_interface_mac') | ||
2598 | 159 | + self.get_mac = self.get_mac_p.start() | ||
2599 | 160 | + self.addCleanup(self.get_mac_p.stop) | ||
2600 | 161 | + self.get_mac.return_value = '00:00:00:00:00:01' | ||
2601 | 162 | + | ||
2602 | 163 | + def test_update_devices_failed(self): | ||
2603 | 164 | + agent = linuxbridge_neutron_agent.LinuxBridgeNeutronAgentRPC({}, | ||
2604 | 165 | + 0, | ||
2605 | 166 | + None) | ||
2606 | 167 | + raise_exception = [0] | ||
2607 | 168 | + | ||
2608 | 169 | + def info_mock(msg): | ||
2609 | 170 | + if raise_exception[0] < 2: | ||
2610 | 171 | + raise_exception[0] += 1 | ||
2611 | 172 | + else: | ||
2612 | 173 | + raise RuntimeError() | ||
2613 | 174 | + with mock.patch.object(agent.br_mgr, | ||
2614 | 175 | + "update_devices") as update_devices: | ||
2615 | 176 | + update_devices.side_effect = RuntimeError | ||
2616 | 177 | + with mock.patch.object(linuxbridge_neutron_agent.LOG, | ||
2617 | 178 | + 'info') as log: | ||
2618 | 179 | + log.side_effect = info_mock | ||
2619 | 180 | + with testtools.ExpectedException(RuntimeError): | ||
2620 | 181 | + agent.daemon_loop() | ||
2621 | 182 | + self.assertEqual(3, log.call_count) | ||
2622 | 183 | + | ||
2623 | 184 | + def test_process_network_devices_failed(self): | ||
2624 | 185 | + device_info = {'current': [1, 2, 3]} | ||
2625 | 186 | + agent = linuxbridge_neutron_agent.LinuxBridgeNeutronAgentRPC({}, | ||
2626 | 187 | + 0, | ||
2627 | 188 | + None) | ||
2628 | 189 | + raise_exception = [0] | ||
2629 | 190 | + | ||
2630 | 191 | + def info_mock(msg): | ||
2631 | 192 | + if raise_exception[0] < 2: | ||
2632 | 193 | + raise_exception[0] += 1 | ||
2633 | 194 | + else: | ||
2634 | 195 | + raise RuntimeError() | ||
2635 | 196 | + | ||
2636 | 197 | + with mock.patch.object(agent.br_mgr, | ||
2637 | 198 | + "update_devices") as update_devices: | ||
2638 | 199 | + update_devices.side_effect = device_info | ||
2639 | 200 | + with contextlib.nested( | ||
2640 | 201 | + mock.patch.object(linuxbridge_neutron_agent.LOG, 'info'), | ||
2641 | 202 | + mock.patch.object(agent, 'process_network_devices') | ||
2642 | 203 | + ) as (log, process_network_devices): | ||
2643 | 204 | + log.side_effect = info_mock | ||
2644 | 205 | + process_network_devices.side_effect = RuntimeError | ||
2645 | 206 | + with testtools.ExpectedException(RuntimeError): | ||
2646 | 207 | + agent.daemon_loop() | ||
2647 | 208 | + self.assertEqual(3, log.call_count) | ||
2648 | 209 | + | ||
2649 | 210 | + | ||
2650 | 211 | +class TestLinuxBridgeManager(base.BaseTestCase): | ||
2651 | 212 | + def setUp(self): | ||
2652 | 213 | + super(TestLinuxBridgeManager, self).setUp() | ||
2653 | 214 | + self.interface_mappings = {'physnet1': 'eth1'} | ||
2654 | 215 | + self.root_helper = cfg.CONF.AGENT.root_helper | ||
2655 | 216 | + | ||
2656 | 217 | + self.lbm = linuxbridge_neutron_agent.LinuxBridgeManager( | ||
2657 | 218 | + self.interface_mappings, self.root_helper) | ||
2658 | 219 | + | ||
2659 | 220 | + def test_device_exists(self): | ||
2660 | 221 | + with mock.patch.object(utils, 'execute') as execute_fn: | ||
2661 | 222 | + self.assertTrue(self.lbm.device_exists("eth0")) | ||
2662 | 223 | + execute_fn.side_effect = RuntimeError() | ||
2663 | 224 | + self.assertFalse(self.lbm.device_exists("eth0")) | ||
2664 | 225 | + | ||
2665 | 226 | + def test_interface_exists_on_bridge(self): | ||
2666 | 227 | + with mock.patch.object(os, 'listdir') as listdir_fn: | ||
2667 | 228 | + listdir_fn.return_value = ["abc"] | ||
2668 | 229 | + self.assertTrue( | ||
2669 | 230 | + self.lbm.interface_exists_on_bridge("br-int", "abc") | ||
2670 | 231 | + ) | ||
2671 | 232 | + self.assertFalse( | ||
2672 | 233 | + self.lbm.interface_exists_on_bridge("br-int", "abd") | ||
2673 | 234 | + ) | ||
2674 | 235 | + | ||
2675 | 236 | + def test_get_bridge_name(self): | ||
2676 | 237 | + nw_id = "123456789101112" | ||
2677 | 238 | + self.assertEqual(self.lbm.get_bridge_name(nw_id), | ||
2678 | 239 | + "brq" + nw_id[0:11]) | ||
2679 | 240 | + nw_id = "" | ||
2680 | 241 | + self.assertEqual(self.lbm.get_bridge_name(nw_id), | ||
2681 | 242 | + "brq") | ||
2682 | 243 | + | ||
2683 | 244 | + def test_get_subinterface_name(self): | ||
2684 | 245 | + self.assertEqual(self.lbm.get_subinterface_name("eth0", "0"), | ||
2685 | 246 | + "eth0.0") | ||
2686 | 247 | + self.assertEqual(self.lbm.get_subinterface_name("eth0", ""), | ||
2687 | 248 | + "eth0.") | ||
2688 | 249 | + | ||
2689 | 250 | + def test_get_tap_device_name(self): | ||
2690 | 251 | + if_id = "123456789101112" | ||
2691 | 252 | + self.assertEqual(self.lbm.get_tap_device_name(if_id), | ||
2692 | 253 | + "tap" + if_id[0:11]) | ||
2693 | 254 | + if_id = "" | ||
2694 | 255 | + self.assertEqual(self.lbm.get_tap_device_name(if_id), | ||
2695 | 256 | + "tap") | ||
2696 | 257 | + | ||
2697 | 258 | + def test_get_vxlan_device_name(self): | ||
2698 | 259 | + vn_id = constants.MAX_VXLAN_VNI | ||
2699 | 260 | + self.assertEqual(self.lbm.get_vxlan_device_name(vn_id), | ||
2700 | 261 | + "vxlan-" + str(vn_id)) | ||
2701 | 262 | + self.assertIsNone(self.lbm.get_vxlan_device_name(vn_id + 1)) | ||
2702 | 263 | + | ||
2703 | 264 | + def test_get_all_neutron_bridges(self): | ||
2704 | 265 | + br_list = ["br-int", "brq1", "brq2", "br-ex"] | ||
2705 | 266 | + with mock.patch.object(os, 'listdir') as listdir_fn: | ||
2706 | 267 | + listdir_fn.return_value = br_list | ||
2707 | 268 | + self.assertEqual(self.lbm.get_all_neutron_bridges(), | ||
2708 | 269 | + br_list[1:3]) | ||
2709 | 270 | + self.assertTrue(listdir_fn.called) | ||
2710 | 271 | + | ||
2711 | 272 | + def test_get_interfaces_on_bridge(self): | ||
2712 | 273 | + with contextlib.nested( | ||
2713 | 274 | + mock.patch.object(utils, 'execute'), | ||
2714 | 275 | + mock.patch.object(os, 'listdir') | ||
2715 | 276 | + ) as (exec_fn, listdir_fn): | ||
2716 | 277 | + listdir_fn.return_value = ["qbr1"] | ||
2717 | 278 | + self.assertEqual(self.lbm.get_interfaces_on_bridge("br0"), | ||
2718 | 279 | + ["qbr1"]) | ||
2719 | 280 | + | ||
2720 | 281 | + def test_get_tap_devices_count(self): | ||
2721 | 282 | + with mock.patch.object(os, 'listdir') as listdir_fn: | ||
2722 | 283 | + listdir_fn.return_value = ['tap2101', 'eth0.100', 'vxlan-1000'] | ||
2723 | 284 | + self.assertEqual(self.lbm.get_tap_devices_count('br0'), 1) | ||
2724 | 285 | + listdir_fn.side_effect = OSError() | ||
2725 | 286 | + self.assertEqual(self.lbm.get_tap_devices_count('br0'), 0) | ||
2726 | 287 | + | ||
2727 | 288 | + def test_get_interface_by_ip(self): | ||
2728 | 289 | + with contextlib.nested( | ||
2729 | 290 | + mock.patch.object(ip_lib.IPWrapper, 'get_devices'), | ||
2730 | 291 | + mock.patch.object(ip_lib.IpAddrCommand, 'list') | ||
2731 | 292 | + ) as (get_dev_fn, ip_list_fn): | ||
2732 | 293 | + device = mock.Mock() | ||
2733 | 294 | + device.name = 'dev_name' | ||
2734 | 295 | + get_dev_fn.return_value = [device] | ||
2735 | 296 | + ip_list_fn.returnvalue = mock.Mock() | ||
2736 | 297 | + self.assertEqual(self.lbm.get_interface_by_ip(LOCAL_IP), | ||
2737 | 298 | + 'dev_name') | ||
2738 | 299 | + | ||
2739 | 300 | + def test_get_bridge_for_tap_device(self): | ||
2740 | 301 | + with contextlib.nested( | ||
2741 | 302 | + mock.patch.object(self.lbm, "get_all_neutron_bridges"), | ||
2742 | 303 | + mock.patch.object(self.lbm, "get_interfaces_on_bridge") | ||
2743 | 304 | + ) as (get_all_qbr_fn, get_if_fn): | ||
2744 | 305 | + get_all_qbr_fn.return_value = ["br-int", "br-ex"] | ||
2745 | 306 | + get_if_fn.return_value = ["tap1", "tap2", "tap3"] | ||
2746 | 307 | + self.assertEqual(self.lbm.get_bridge_for_tap_device("tap1"), | ||
2747 | 308 | + "br-int") | ||
2748 | 309 | + self.assertIsNone(self.lbm.get_bridge_for_tap_device("tap4")) | ||
2749 | 310 | + | ||
2750 | 311 | + def test_is_device_on_bridge(self): | ||
2751 | 312 | + self.assertTrue(not self.lbm.is_device_on_bridge("")) | ||
2752 | 313 | + with mock.patch.object(os.path, 'exists') as exists_fn: | ||
2753 | 314 | + exists_fn.return_value = True | ||
2754 | 315 | + self.assertTrue(self.lbm.is_device_on_bridge("tap1")) | ||
2755 | 316 | + exists_fn.assert_called_with( | ||
2756 | 317 | + "/sys/devices/virtual/net/tap1/brport" | ||
2757 | 318 | + ) | ||
2758 | 319 | + | ||
2759 | 320 | + def test_get_interface_details(self): | ||
2760 | 321 | + with contextlib.nested( | ||
2761 | 322 | + mock.patch.object(ip_lib.IpAddrCommand, 'list'), | ||
2762 | 323 | + mock.patch.object(ip_lib.IpRouteCommand, 'get_gateway') | ||
2763 | 324 | + ) as (list_fn, getgw_fn): | ||
2764 | 325 | + gwdict = dict(gateway='1.1.1.1') | ||
2765 | 326 | + getgw_fn.return_value = gwdict | ||
2766 | 327 | + ipdict = dict(cidr='1.1.1.1/24', | ||
2767 | 328 | + broadcast='1.1.1.255', | ||
2768 | 329 | + scope='global', | ||
2769 | 330 | + ip_version=4, | ||
2770 | 331 | + dynamic=False) | ||
2771 | 332 | + list_fn.return_value = ipdict | ||
2772 | 333 | + ret = self.lbm.get_interface_details("eth0") | ||
2773 | 334 | + | ||
2774 | 335 | + self.assertTrue(list_fn.called) | ||
2775 | 336 | + self.assertTrue(getgw_fn.called) | ||
2776 | 337 | + self.assertEqual(ret, (ipdict, gwdict)) | ||
2777 | 338 | + | ||
2778 | 339 | + def test_ensure_flat_bridge(self): | ||
2779 | 340 | + with contextlib.nested( | ||
2780 | 341 | + mock.patch.object(ip_lib.IpAddrCommand, 'list'), | ||
2781 | 342 | + mock.patch.object(ip_lib.IpRouteCommand, 'get_gateway') | ||
2782 | 343 | + ) as (list_fn, getgw_fn): | ||
2783 | 344 | + gwdict = dict(gateway='1.1.1.1') | ||
2784 | 345 | + getgw_fn.return_value = gwdict | ||
2785 | 346 | + ipdict = dict(cidr='1.1.1.1/24', | ||
2786 | 347 | + broadcast='1.1.1.255', | ||
2787 | 348 | + scope='global', | ||
2788 | 349 | + ip_version=4, | ||
2789 | 350 | + dynamic=False) | ||
2790 | 351 | + list_fn.return_value = ipdict | ||
2791 | 352 | + with mock.patch.object(self.lbm, 'ensure_bridge') as ens: | ||
2792 | 353 | + self.assertEqual( | ||
2793 | 354 | + self.lbm.ensure_flat_bridge("123", "eth0"), | ||
2794 | 355 | + "eth0" | ||
2795 | 356 | + ) | ||
2796 | 357 | + self.assertTrue(list_fn.called) | ||
2797 | 358 | + self.assertTrue(getgw_fn.called) | ||
2798 | 359 | + ens.assert_called_once_with("brq123", "eth0", | ||
2799 | 360 | + ipdict, gwdict) | ||
2800 | 361 | + | ||
2801 | 362 | + def test_ensure_vlan_bridge(self): | ||
2802 | 363 | + with contextlib.nested( | ||
2803 | 364 | + mock.patch.object(self.lbm, 'ensure_vlan'), | ||
2804 | 365 | + mock.patch.object(self.lbm, 'ensure_bridge'), | ||
2805 | 366 | + mock.patch.object(self.lbm, 'get_interface_details'), | ||
2806 | 367 | + ) as (ens_vl_fn, ens, get_int_det_fn): | ||
2807 | 368 | + ens_vl_fn.return_value = "eth0.1" | ||
2808 | 369 | + get_int_det_fn.return_value = (None, None) | ||
2809 | 370 | + self.assertEqual(self.lbm.ensure_vlan_bridge("123", "eth0", "1"), | ||
2810 | 371 | + "eth0.1") | ||
2811 | 372 | + ens.assert_called_with("brq123", "eth0.1", None, None) | ||
2812 | 373 | + | ||
2813 | 374 | + get_int_det_fn.return_value = ("ips", "gateway") | ||
2814 | 375 | + self.assertEqual(self.lbm.ensure_vlan_bridge("123", "eth0", "1"), | ||
2815 | 376 | + "eth0.1") | ||
2816 | 377 | + ens.assert_called_with("brq123", "eth0.1", "ips", "gateway") | ||
2817 | 378 | + | ||
2818 | 379 | + def test_ensure_local_bridge(self): | ||
2819 | 380 | + with mock.patch.object(self.lbm, 'ensure_bridge') as ens_fn: | ||
2820 | 381 | + self.lbm.ensure_local_bridge("54321") | ||
2821 | 382 | + ens_fn.assert_called_once_with("brq54321") | ||
2822 | 383 | + | ||
2823 | 384 | + def test_ensure_vlan(self): | ||
2824 | 385 | + with mock.patch.object(self.lbm, 'device_exists') as de_fn: | ||
2825 | 386 | + de_fn.return_value = True | ||
2826 | 387 | + self.assertEqual(self.lbm.ensure_vlan("eth0", "1"), "eth0.1") | ||
2827 | 388 | + de_fn.return_value = False | ||
2828 | 389 | + with mock.patch.object(utils, 'execute') as exec_fn: | ||
2829 | 390 | + exec_fn.return_value = False | ||
2830 | 391 | + self.assertEqual(self.lbm.ensure_vlan("eth0", "1"), "eth0.1") | ||
2831 | 392 | + exec_fn.assert_called_twice() | ||
2832 | 393 | + exec_fn.return_value = True | ||
2833 | 394 | + self.assertIsNone(self.lbm.ensure_vlan("eth0", "1")) | ||
2834 | 395 | + exec_fn.assert_called_once() | ||
2835 | 396 | + | ||
2836 | 397 | + def test_ensure_vxlan(self): | ||
2837 | 398 | + seg_id = "12345678" | ||
2838 | 399 | + self.lbm.local_int = 'eth0' | ||
2839 | 400 | + self.lbm.vxlan_mode = lconst.VXLAN_MCAST | ||
2840 | 401 | + with mock.patch.object(self.lbm, 'device_exists') as de_fn: | ||
2841 | 402 | + de_fn.return_value = True | ||
2842 | 403 | + self.assertEqual(self.lbm.ensure_vxlan(seg_id), "vxlan-" + seg_id) | ||
2843 | 404 | + de_fn.return_value = False | ||
2844 | 405 | + with mock.patch.object(self.lbm.ip, | ||
2845 | 406 | + 'add_vxlan') as add_vxlan_fn: | ||
2846 | 407 | + add_vxlan_fn.return_value = FakeIpDevice() | ||
2847 | 408 | + self.assertEqual(self.lbm.ensure_vxlan(seg_id), | ||
2848 | 409 | + "vxlan-" + seg_id) | ||
2849 | 410 | + add_vxlan_fn.assert_called_with("vxlan-" + seg_id, seg_id, | ||
2850 | 411 | + group="224.0.0.1", | ||
2851 | 412 | + dev=self.lbm.local_int) | ||
2852 | 413 | + cfg.CONF.set_override('l2_population', 'True', 'VXLAN') | ||
2853 | 414 | + self.assertEqual(self.lbm.ensure_vxlan(seg_id), | ||
2854 | 415 | + "vxlan-" + seg_id) | ||
2855 | 416 | + add_vxlan_fn.assert_called_with("vxlan-" + seg_id, seg_id, | ||
2856 | 417 | + group="224.0.0.1", | ||
2857 | 418 | + dev=self.lbm.local_int, | ||
2858 | 419 | + proxy=True) | ||
2859 | 420 | + | ||
2860 | 421 | + def test_update_interface_ip_details(self): | ||
2861 | 422 | + gwdict = dict(gateway='1.1.1.1', | ||
2862 | 423 | + metric=50) | ||
2863 | 424 | + ipdict = dict(cidr='1.1.1.1/24', | ||
2864 | 425 | + broadcast='1.1.1.255', | ||
2865 | 426 | + scope='global', | ||
2866 | 427 | + ip_version=4, | ||
2867 | 428 | + dynamic=False) | ||
2868 | 429 | + with contextlib.nested( | ||
2869 | 430 | + mock.patch.object(ip_lib.IpAddrCommand, 'add'), | ||
2870 | 431 | + mock.patch.object(ip_lib.IpAddrCommand, 'delete') | ||
2871 | 432 | + ) as (add_fn, del_fn): | ||
2872 | 433 | + self.lbm.update_interface_ip_details("br0", "eth0", | ||
2873 | 434 | + [ipdict], None) | ||
2874 | 435 | + self.assertTrue(add_fn.called) | ||
2875 | 436 | + self.assertTrue(del_fn.called) | ||
2876 | 437 | + | ||
2877 | 438 | + with contextlib.nested( | ||
2878 | 439 | + mock.patch.object(ip_lib.IpRouteCommand, 'add_gateway'), | ||
2879 | 440 | + mock.patch.object(ip_lib.IpRouteCommand, 'delete_gateway') | ||
2880 | 441 | + ) as (addgw_fn, delgw_fn): | ||
2881 | 442 | + self.lbm.update_interface_ip_details("br0", "eth0", | ||
2882 | 443 | + None, gwdict) | ||
2883 | 444 | + self.assertTrue(addgw_fn.called) | ||
2884 | 445 | + self.assertTrue(delgw_fn.called) | ||
2885 | 446 | + | ||
2886 | 447 | + def test_ensure_bridge(self): | ||
2887 | 448 | + with contextlib.nested( | ||
2888 | 449 | + mock.patch.object(self.lbm, 'device_exists'), | ||
2889 | 450 | + mock.patch.object(utils, 'execute'), | ||
2890 | 451 | + mock.patch.object(self.lbm, 'update_interface_ip_details'), | ||
2891 | 452 | + mock.patch.object(self.lbm, 'interface_exists_on_bridge'), | ||
2892 | 453 | + mock.patch.object(self.lbm, 'is_device_on_bridge'), | ||
2893 | 454 | + mock.patch.object(self.lbm, 'get_bridge_for_tap_device'), | ||
2894 | 455 | + ) as (de_fn, exec_fn, upd_fn, ie_fn, if_br_fn, get_if_br_fn): | ||
2895 | 456 | + de_fn.return_value = False | ||
2896 | 457 | + exec_fn.return_value = False | ||
2897 | 458 | + self.assertEqual(self.lbm.ensure_bridge("br0", None), "br0") | ||
2898 | 459 | + ie_fn.return_Value = False | ||
2899 | 460 | + self.lbm.ensure_bridge("br0", "eth0") | ||
2900 | 461 | + upd_fn.assert_called_with("br0", "eth0", None, None) | ||
2901 | 462 | + ie_fn.assert_called_with("br0", "eth0") | ||
2902 | 463 | + | ||
2903 | 464 | + self.lbm.ensure_bridge("br0", "eth0", "ips", "gateway") | ||
2904 | 465 | + upd_fn.assert_called_with("br0", "eth0", "ips", "gateway") | ||
2905 | 466 | + ie_fn.assert_called_with("br0", "eth0") | ||
2906 | 467 | + | ||
2907 | 468 | + exec_fn.side_effect = Exception() | ||
2908 | 469 | + de_fn.return_value = True | ||
2909 | 470 | + self.lbm.ensure_bridge("br0", "eth0") | ||
2910 | 471 | + ie_fn.assert_called_with("br0", "eth0") | ||
2911 | 472 | + | ||
2912 | 473 | + exec_fn.reset_mock() | ||
2913 | 474 | + exec_fn.side_effect = None | ||
2914 | 475 | + de_fn.return_value = True | ||
2915 | 476 | + ie_fn.return_value = False | ||
2916 | 477 | + get_if_br_fn.return_value = "br1" | ||
2917 | 478 | + self.lbm.ensure_bridge("br0", "eth0") | ||
2918 | 479 | + expected = [ | ||
2919 | 480 | + mock.call(['brctl', 'delif', 'br1', 'eth0'], | ||
2920 | 481 | + root_helper=self.root_helper), | ||
2921 | 482 | + mock.call(['brctl', 'addif', 'br0', 'eth0'], | ||
2922 | 483 | + root_helper=self.root_helper), | ||
2923 | 484 | + ] | ||
2924 | 485 | + exec_fn.assert_has_calls(expected) | ||
2925 | 486 | + | ||
2926 | 487 | + def test_ensure_physical_in_bridge(self): | ||
2927 | 488 | + self.assertFalse( | ||
2928 | 489 | + self.lbm.ensure_physical_in_bridge("123", p_const.TYPE_VLAN, | ||
2929 | 490 | + "phys", "1") | ||
2930 | 491 | + ) | ||
2931 | 492 | + with mock.patch.object(self.lbm, "ensure_flat_bridge") as flbr_fn: | ||
2932 | 493 | + self.assertTrue( | ||
2933 | 494 | + self.lbm.ensure_physical_in_bridge("123", p_const.TYPE_FLAT, | ||
2934 | 495 | + "physnet1", None) | ||
2935 | 496 | + ) | ||
2936 | 497 | + self.assertTrue(flbr_fn.called) | ||
2937 | 498 | + with mock.patch.object(self.lbm, "ensure_vlan_bridge") as vlbr_fn: | ||
2938 | 499 | + self.assertTrue( | ||
2939 | 500 | + self.lbm.ensure_physical_in_bridge("123", p_const.TYPE_VLAN, | ||
2940 | 501 | + "physnet1", "1") | ||
2941 | 502 | + ) | ||
2942 | 503 | + self.assertTrue(vlbr_fn.called) | ||
2943 | 504 | + | ||
2944 | 505 | + with mock.patch.object(self.lbm, "ensure_vxlan_bridge") as vlbr_fn: | ||
2945 | 506 | + self.lbm.vxlan_mode = lconst.VXLAN_MCAST | ||
2946 | 507 | + self.assertTrue( | ||
2947 | 508 | + self.lbm.ensure_physical_in_bridge("123", p_const.TYPE_VXLAN, | ||
2948 | 509 | + "physnet1", "1") | ||
2949 | 510 | + ) | ||
2950 | 511 | + self.assertTrue(vlbr_fn.called) | ||
2951 | 512 | + | ||
2952 | 513 | + def test_add_tap_interface(self): | ||
2953 | 514 | + with mock.patch.object(self.lbm, "device_exists") as de_fn: | ||
2954 | 515 | + de_fn.return_value = False | ||
2955 | 516 | + self.assertFalse( | ||
2956 | 517 | + self.lbm.add_tap_interface("123", p_const.TYPE_VLAN, | ||
2957 | 518 | + "physnet1", "1", "tap1") | ||
2958 | 519 | + ) | ||
2959 | 520 | + | ||
2960 | 521 | + de_fn.return_value = True | ||
2961 | 522 | + with contextlib.nested( | ||
2962 | 523 | + mock.patch.object(self.lbm, "ensure_local_bridge"), | ||
2963 | 524 | + mock.patch.object(utils, "execute"), | ||
2964 | 525 | + mock.patch.object(self.lbm, "get_bridge_for_tap_device") | ||
2965 | 526 | + ) as (en_fn, exec_fn, get_br): | ||
2966 | 527 | + exec_fn.return_value = False | ||
2967 | 528 | + get_br.return_value = True | ||
2968 | 529 | + self.assertTrue(self.lbm.add_tap_interface("123", | ||
2969 | 530 | + p_const.TYPE_LOCAL, | ||
2970 | 531 | + "physnet1", None, | ||
2971 | 532 | + "tap1")) | ||
2972 | 533 | + en_fn.assert_called_with("123") | ||
2973 | 534 | + | ||
2974 | 535 | + get_br.return_value = False | ||
2975 | 536 | + exec_fn.return_value = True | ||
2976 | 537 | + self.assertFalse(self.lbm.add_tap_interface("123", | ||
2977 | 538 | + p_const.TYPE_LOCAL, | ||
2978 | 539 | + "physnet1", None, | ||
2979 | 540 | + "tap1")) | ||
2980 | 541 | + | ||
2981 | 542 | + with mock.patch.object(self.lbm, | ||
2982 | 543 | + "ensure_physical_in_bridge") as ens_fn: | ||
2983 | 544 | + ens_fn.return_value = False | ||
2984 | 545 | + self.assertFalse(self.lbm.add_tap_interface("123", | ||
2985 | 546 | + p_const.TYPE_VLAN, | ||
2986 | 547 | + "physnet1", "1", | ||
2987 | 548 | + "tap1")) | ||
2988 | 549 | + | ||
2989 | 550 | + def test_add_interface(self): | ||
2990 | 551 | + with mock.patch.object(self.lbm, "add_tap_interface") as add_tap: | ||
2991 | 552 | + self.lbm.add_interface("123", p_const.TYPE_VLAN, "physnet-1", | ||
2992 | 553 | + "1", "234") | ||
2993 | 554 | + add_tap.assert_called_with("123", p_const.TYPE_VLAN, "physnet-1", | ||
2994 | 555 | + "1", "tap234") | ||
2995 | 556 | + | ||
2996 | 557 | + def test_delete_vlan_bridge(self): | ||
2997 | 558 | + with contextlib.nested( | ||
2998 | 559 | + mock.patch.object(self.lbm, "device_exists"), | ||
2999 | 560 | + mock.patch.object(self.lbm, "get_interfaces_on_bridge"), | ||
3000 | 561 | + mock.patch.object(self.lbm, "remove_interface"), | ||
3001 | 562 | + mock.patch.object(self.lbm, "get_interface_details"), | ||
3002 | 563 | + mock.patch.object(self.lbm, "update_interface_ip_details"), | ||
3003 | 564 | + mock.patch.object(self.lbm, "delete_vlan"), | ||
3004 | 565 | + mock.patch.object(self.lbm, "delete_vxlan"), | ||
3005 | 566 | + mock.patch.object(utils, "execute") | ||
3006 | 567 | + ) as (de_fn, getif_fn, remif_fn, if_det_fn, | ||
3007 | 568 | + updif_fn, del_vlan, del_vxlan, exec_fn): | ||
3008 | 569 | + de_fn.return_value = False | ||
3009 | 570 | + self.lbm.delete_vlan_bridge("br0") | ||
3010 | 571 | + self.assertFalse(getif_fn.called) | ||
3011 | 572 | + | ||
3012 | 573 | + de_fn.return_value = True | ||
3013 | 574 | + getif_fn.return_value = ["eth0", "eth1.1", "eth1", "vxlan-1002"] | ||
3014 | 575 | + if_det_fn.return_value = ("ips", "gateway") | ||
3015 | 576 | + exec_fn.return_value = False | ||
3016 | 577 | + self.lbm.delete_vlan_bridge("br0") | ||
3017 | 578 | + updif_fn.assert_called_with("eth1", "br0", "ips", "gateway") | ||
3018 | 579 | + del_vlan.assert_called_with("eth1.1") | ||
3019 | 580 | + del_vxlan.assert_called_with("vxlan-1002") | ||
3020 | 581 | + | ||
3021 | 582 | + def test_delete_vxlan_bridge_no_int_mappings(self): | ||
3022 | 583 | + interface_mappings = {} | ||
3023 | 584 | + lbm = linuxbridge_neutron_agent.LinuxBridgeManager( | ||
3024 | 585 | + interface_mappings, self.root_helper) | ||
3025 | 586 | + | ||
3026 | 587 | + with contextlib.nested( | ||
3027 | 588 | + mock.patch.object(lbm, "device_exists"), | ||
3028 | 589 | + mock.patch.object(lbm, "get_interfaces_on_bridge"), | ||
3029 | 590 | + mock.patch.object(lbm, "remove_interface"), | ||
3030 | 591 | + mock.patch.object(lbm, "delete_vxlan"), | ||
3031 | 592 | + mock.patch.object(utils, "execute") | ||
3032 | 593 | + ) as (de_fn, getif_fn, remif_fn, del_vxlan, exec_fn): | ||
3033 | 594 | + de_fn.return_value = False | ||
3034 | 595 | + lbm.delete_vlan_bridge("br0") | ||
3035 | 596 | + self.assertFalse(getif_fn.called) | ||
3036 | 597 | + | ||
3037 | 598 | + de_fn.return_value = True | ||
3038 | 599 | + getif_fn.return_value = ["vxlan-1002"] | ||
3039 | 600 | + exec_fn.return_value = False | ||
3040 | 601 | + lbm.delete_vlan_bridge("br0") | ||
3041 | 602 | + del_vxlan.assert_called_with("vxlan-1002") | ||
3042 | 603 | + | ||
3043 | 604 | + def test_remove_empty_bridges(self): | ||
3044 | 605 | + self.lbm.network_map = {'net1': mock.Mock(), 'net2': mock.Mock()} | ||
3045 | 606 | + | ||
3046 | 607 | + def tap_count_side_effect(*args): | ||
3047 | 608 | + return 0 if args[0] == 'brqnet1' else 1 | ||
3048 | 609 | + | ||
3049 | 610 | + with contextlib.nested( | ||
3050 | 611 | + mock.patch.object(self.lbm, "delete_vlan_bridge"), | ||
3051 | 612 | + mock.patch.object(self.lbm, "get_tap_devices_count", | ||
3052 | 613 | + side_effect=tap_count_side_effect), | ||
3053 | 614 | + ) as (del_br_fn, count_tap_fn): | ||
3054 | 615 | + self.lbm.remove_empty_bridges() | ||
3055 | 616 | + del_br_fn.assert_called_once_with('brqnet1') | ||
3056 | 617 | + | ||
3057 | 618 | + def test_remove_interface(self): | ||
3058 | 619 | + with contextlib.nested( | ||
3059 | 620 | + mock.patch.object(self.lbm, "device_exists"), | ||
3060 | 621 | + mock.patch.object(self.lbm, "is_device_on_bridge"), | ||
3061 | 622 | + mock.patch.object(utils, "execute") | ||
3062 | 623 | + ) as (de_fn, isdev_fn, exec_fn): | ||
3063 | 624 | + de_fn.return_value = False | ||
3064 | 625 | + self.assertFalse(self.lbm.remove_interface("br0", "eth0")) | ||
3065 | 626 | + self.assertFalse(isdev_fn.called) | ||
3066 | 627 | + | ||
3067 | 628 | + de_fn.return_value = True | ||
3068 | 629 | + isdev_fn.return_value = False | ||
3069 | 630 | + self.assertTrue(self.lbm.remove_interface("br0", "eth0")) | ||
3070 | 631 | + | ||
3071 | 632 | + isdev_fn.return_value = True | ||
3072 | 633 | + exec_fn.return_value = True | ||
3073 | 634 | + self.assertFalse(self.lbm.remove_interface("br0", "eth0")) | ||
3074 | 635 | + | ||
3075 | 636 | + exec_fn.return_value = False | ||
3076 | 637 | + self.assertTrue(self.lbm.remove_interface("br0", "eth0")) | ||
3077 | 638 | + | ||
3078 | 639 | + def test_delete_vlan(self): | ||
3079 | 640 | + with contextlib.nested( | ||
3080 | 641 | + mock.patch.object(self.lbm, "device_exists"), | ||
3081 | 642 | + mock.patch.object(utils, "execute") | ||
3082 | 643 | + ) as (de_fn, exec_fn): | ||
3083 | 644 | + de_fn.return_value = False | ||
3084 | 645 | + self.lbm.delete_vlan("eth1.1") | ||
3085 | 646 | + self.assertFalse(exec_fn.called) | ||
3086 | 647 | + | ||
3087 | 648 | + de_fn.return_value = True | ||
3088 | 649 | + exec_fn.return_value = False | ||
3089 | 650 | + self.lbm.delete_vlan("eth1.1") | ||
3090 | 651 | + self.assertTrue(exec_fn.called) | ||
3091 | 652 | + | ||
3092 | 653 | + def test_update_devices(self): | ||
3093 | 654 | + with mock.patch.object(self.lbm, "udev_get_tap_devices") as gt_fn: | ||
3094 | 655 | + gt_fn.return_value = set(["dev1"]) | ||
3095 | 656 | + self.assertIsNone(self.lbm.update_devices(set(["dev1"]))) | ||
3096 | 657 | + | ||
3097 | 658 | + gt_fn.return_value = set(["dev1", "dev2"]) | ||
3098 | 659 | + self.assertEqual(self.lbm.update_devices(set(["dev2", "dev3"])), | ||
3099 | 660 | + {"current": set(["dev1", "dev2"]), | ||
3100 | 661 | + "added": set(["dev1"]), | ||
3101 | 662 | + "removed": set(["dev3"]) | ||
3102 | 663 | + }) | ||
3103 | 664 | + | ||
3104 | 665 | + def _check_vxlan_support(self, kernel_version, vxlan_proxy_supported, | ||
3105 | 666 | + fdb_append_supported, l2_population, | ||
3106 | 667 | + expected_mode): | ||
3107 | 668 | + def iproute_supported_side_effect(*args): | ||
3108 | 669 | + if args[1] == 'proxy': | ||
3109 | 670 | + return vxlan_proxy_supported | ||
3110 | 671 | + elif args[1] == 'append': | ||
3111 | 672 | + return fdb_append_supported | ||
3112 | 673 | + | ||
3113 | 674 | + with contextlib.nested( | ||
3114 | 675 | + mock.patch("platform.release", return_value=kernel_version), | ||
3115 | 676 | + mock.patch.object(ip_lib, 'iproute_arg_supported', | ||
3116 | 677 | + side_effect=iproute_supported_side_effect), | ||
3117 | 678 | + ) as (kver_fn, ip_arg_fn): | ||
3118 | 679 | + self.lbm.check_vxlan_support() | ||
3119 | 680 | + self.assertEqual(self.lbm.vxlan_mode, expected_mode) | ||
3120 | 681 | + | ||
3121 | 682 | + def test_vxlan_mode_ucast(self): | ||
3122 | 683 | + self._check_vxlan_support(kernel_version='3.12', | ||
3123 | 684 | + vxlan_proxy_supported=True, | ||
3124 | 685 | + fdb_append_supported=True, | ||
3125 | 686 | + l2_population=True, | ||
3126 | 687 | + expected_mode=lconst.VXLAN_MCAST) | ||
3127 | 688 | + | ||
3128 | 689 | + def test_vxlan_mode_mcast(self): | ||
3129 | 690 | + self._check_vxlan_support(kernel_version='3.12', | ||
3130 | 691 | + vxlan_proxy_supported=True, | ||
3131 | 692 | + fdb_append_supported=False, | ||
3132 | 693 | + l2_population=True, | ||
3133 | 694 | + expected_mode=lconst.VXLAN_MCAST) | ||
3134 | 695 | + self._check_vxlan_support(kernel_version='3.10', | ||
3135 | 696 | + vxlan_proxy_supported=True, | ||
3136 | 697 | + fdb_append_supported=True, | ||
3137 | 698 | + l2_population=True, | ||
3138 | 699 | + expected_mode=lconst.VXLAN_MCAST) | ||
3139 | 700 | + | ||
3140 | 701 | + def test_vxlan_mode_unsupported(self): | ||
3141 | 702 | + self._check_vxlan_support(kernel_version='3.7', | ||
3142 | 703 | + vxlan_proxy_supported=True, | ||
3143 | 704 | + fdb_append_supported=True, | ||
3144 | 705 | + l2_population=False, | ||
3145 | 706 | + expected_mode=lconst.VXLAN_NONE) | ||
3146 | 707 | + self._check_vxlan_support(kernel_version='3.10', | ||
3147 | 708 | + vxlan_proxy_supported=False, | ||
3148 | 709 | + fdb_append_supported=False, | ||
3149 | 710 | + l2_population=False, | ||
3150 | 711 | + expected_mode=lconst.VXLAN_NONE) | ||
3151 | 712 | + cfg.CONF.set_override('vxlan_group', '', 'VXLAN') | ||
3152 | 713 | + self._check_vxlan_support(kernel_version='3.12', | ||
3153 | 714 | + vxlan_proxy_supported=True, | ||
3154 | 715 | + fdb_append_supported=True, | ||
3155 | 716 | + l2_population=True, | ||
3156 | 717 | + expected_mode=lconst.VXLAN_NONE) | ||
3157 | 718 | + | ||
3158 | 719 | + | ||
3159 | 720 | +class TestLinuxBridgeRpcCallbacks(base.BaseTestCase): | ||
3160 | 721 | + def setUp(self): | ||
3161 | 722 | + cfg.CONF.set_override('local_ip', LOCAL_IP, 'VXLAN') | ||
3162 | 723 | + self.addCleanup(cfg.CONF.reset) | ||
3163 | 724 | + super(TestLinuxBridgeRpcCallbacks, self).setUp() | ||
3164 | 725 | + | ||
3165 | 726 | + self.u_execute_p = mock.patch('neutron.agent.linux.utils.execute') | ||
3166 | 727 | + self.u_execute = self.u_execute_p.start() | ||
3167 | 728 | + self.addCleanup(self.u_execute_p.stop) | ||
3168 | 729 | + | ||
3169 | 730 | + class FakeLBAgent(object): | ||
3170 | 731 | + def __init__(self): | ||
3171 | 732 | + self.agent_id = 1 | ||
3172 | 733 | + self.br_mgr = (linuxbridge_neutron_agent. | ||
3173 | 734 | + LinuxBridgeManager({'physnet1': 'eth1'}, | ||
3174 | 735 | + cfg.CONF.AGENT.root_helper)) | ||
3175 | 736 | + | ||
3176 | 737 | + self.br_mgr.vxlan_mode = lconst.VXLAN_UCAST | ||
3177 | 738 | + segment = mock.Mock() | ||
3178 | 739 | + segment.network_type = 'vxlan' | ||
3179 | 740 | + segment.segmentation_id = 1 | ||
3180 | 741 | + self.br_mgr.network_map['net_id'] = segment | ||
3181 | 742 | + | ||
3182 | 743 | + self.lb_rpc = linuxbridge_neutron_agent.LinuxBridgeRpcCallbacks( | ||
3183 | 744 | + object(), | ||
3184 | 745 | + FakeLBAgent() | ||
3185 | 746 | + ) | ||
3186 | 747 | + | ||
3187 | 748 | + self.root_helper = cfg.CONF.AGENT.root_helper | ||
3188 | 749 | + | ||
3189 | 750 | + def test_network_delete(self): | ||
3190 | 751 | + with contextlib.nested( | ||
3191 | 752 | + mock.patch.object(self.lb_rpc.agent.br_mgr, "get_bridge_name"), | ||
3192 | 753 | + mock.patch.object(self.lb_rpc.agent.br_mgr, "delete_vlan_bridge") | ||
3193 | 754 | + ) as (get_br_fn, del_fn): | ||
3194 | 755 | + get_br_fn.return_value = "br0" | ||
3195 | 756 | + self.lb_rpc.network_delete("anycontext", network_id="123") | ||
3196 | 757 | + get_br_fn.assert_called_with("123") | ||
3197 | 758 | + del_fn.assert_called_with("br0") | ||
3198 | 759 | + | ||
3199 | 760 | + def test_port_update(self): | ||
3200 | 761 | + with contextlib.nested( | ||
3201 | 762 | + mock.patch.object(self.lb_rpc.agent.br_mgr, | ||
3202 | 763 | + "get_tap_device_name"), | ||
3203 | 764 | + mock.patch.object(self.lb_rpc.agent.br_mgr, | ||
3204 | 765 | + "udev_get_tap_devices"), | ||
3205 | 766 | + mock.patch.object(self.lb_rpc.agent.br_mgr, | ||
3206 | 767 | + "get_bridge_name"), | ||
3207 | 768 | + mock.patch.object(self.lb_rpc.agent.br_mgr, | ||
3208 | 769 | + "remove_interface"), | ||
3209 | 770 | + mock.patch.object(self.lb_rpc.agent.br_mgr, "add_interface"), | ||
3210 | 771 | + mock.patch.object(self.lb_rpc.agent, | ||
3211 | 772 | + "plugin_rpc", create=True), | ||
3212 | 773 | + mock.patch.object(self.lb_rpc.sg_agent, | ||
3213 | 774 | + "refresh_firewall", create=True) | ||
3214 | 775 | + ) as (get_tap_fn, udev_fn, getbr_fn, remif_fn, | ||
3215 | 776 | + addif_fn, rpc_obj, reffw_fn): | ||
3216 | 777 | + get_tap_fn.return_value = "tap123" | ||
3217 | 778 | + udev_fn.return_value = ["tap123", "tap124"] | ||
3218 | 779 | + port = {"admin_state_up": True, | ||
3219 | 780 | + "id": "1234-5678", | ||
3220 | 781 | + "network_id": "123-123"} | ||
3221 | 782 | + self.lb_rpc.port_update("unused_context", port=port, | ||
3222 | 783 | + vlan_id="1", physical_network="physnet1") | ||
3223 | 784 | + self.assertFalse(reffw_fn.called) | ||
3224 | 785 | + addif_fn.assert_called_with(port["network_id"], p_const.TYPE_VLAN, | ||
3225 | 786 | + "physnet1", "1", port["id"]) | ||
3226 | 787 | + | ||
3227 | 788 | + self.lb_rpc.port_update("unused_context", port=port, | ||
3228 | 789 | + network_type=p_const.TYPE_VLAN, | ||
3229 | 790 | + segmentation_id="2", | ||
3230 | 791 | + physical_network="physnet1") | ||
3231 | 792 | + self.assertFalse(reffw_fn.called) | ||
3232 | 793 | + addif_fn.assert_called_with(port["network_id"], p_const.TYPE_VLAN, | ||
3233 | 794 | + "physnet1", "2", port["id"]) | ||
3234 | 795 | + | ||
3235 | 796 | + self.lb_rpc.port_update("unused_context", port=port, | ||
3236 | 797 | + vlan_id=lconst.FLAT_VLAN_ID, | ||
3237 | 798 | + physical_network="physnet1") | ||
3238 | 799 | + self.assertFalse(reffw_fn.called) | ||
3239 | 800 | + addif_fn.assert_called_with(port["network_id"], p_const.TYPE_FLAT, | ||
3240 | 801 | + "physnet1", None, port["id"]) | ||
3241 | 802 | + | ||
3242 | 803 | + self.lb_rpc.port_update("unused_context", port=port, | ||
3243 | 804 | + network_type=p_const.TYPE_FLAT, | ||
3244 | 805 | + segmentation_id=None, | ||
3245 | 806 | + physical_network="physnet1") | ||
3246 | 807 | + self.assertFalse(reffw_fn.called) | ||
3247 | 808 | + addif_fn.assert_called_with(port["network_id"], p_const.TYPE_FLAT, | ||
3248 | 809 | + "physnet1", None, port["id"]) | ||
3249 | 810 | + | ||
3250 | 811 | + self.lb_rpc.port_update("unused_context", port=port, | ||
3251 | 812 | + vlan_id=lconst.LOCAL_VLAN_ID, | ||
3252 | 813 | + physical_network=None) | ||
3253 | 814 | + self.assertFalse(reffw_fn.called) | ||
3254 | 815 | + addif_fn.assert_called_with(port["network_id"], p_const.TYPE_LOCAL, | ||
3255 | 816 | + None, None, port["id"]) | ||
3256 | 817 | + | ||
3257 | 818 | + self.lb_rpc.port_update("unused_context", port=port, | ||
3258 | 819 | + network_type=p_const.TYPE_LOCAL, | ||
3259 | 820 | + segmentation_id=None, | ||
3260 | 821 | + physical_network=None) | ||
3261 | 822 | + self.assertFalse(reffw_fn.called) | ||
3262 | 823 | + addif_fn.assert_called_with(port["network_id"], p_const.TYPE_LOCAL, | ||
3263 | 824 | + None, None, port["id"]) | ||
3264 | 825 | + | ||
3265 | 826 | + addif_fn.return_value = True | ||
3266 | 827 | + self.lb_rpc.port_update("unused_context", port=port, | ||
3267 | 828 | + network_type=p_const.TYPE_LOCAL, | ||
3268 | 829 | + segmentation_id=None, | ||
3269 | 830 | + physical_network=None) | ||
3270 | 831 | + rpc_obj.update_device_up.assert_called_with( | ||
3271 | 832 | + self.lb_rpc.context, | ||
3272 | 833 | + "tap123", | ||
3273 | 834 | + self.lb_rpc.agent.agent_id, | ||
3274 | 835 | + cfg.CONF.host | ||
3275 | 836 | + ) | ||
3276 | 837 | + | ||
3277 | 838 | + addif_fn.return_value = False | ||
3278 | 839 | + self.lb_rpc.port_update("unused_context", port=port, | ||
3279 | 840 | + network_type=p_const.TYPE_LOCAL, | ||
3280 | 841 | + segmentation_id=None, | ||
3281 | 842 | + physical_network=None) | ||
3282 | 843 | + rpc_obj.update_device_down.assert_called_with( | ||
3283 | 844 | + self.lb_rpc.context, | ||
3284 | 845 | + "tap123", | ||
3285 | 846 | + self.lb_rpc.agent.agent_id, | ||
3286 | 847 | + cfg.CONF.host | ||
3287 | 848 | + ) | ||
3288 | 849 | + | ||
3289 | 850 | + port["admin_state_up"] = False | ||
3290 | 851 | + port["security_groups"] = True | ||
3291 | 852 | + getbr_fn.return_value = "br0" | ||
3292 | 853 | + self.lb_rpc.port_update("unused_context", port=port, | ||
3293 | 854 | + vlan_id="1", physical_network="physnet1") | ||
3294 | 855 | + self.assertTrue(reffw_fn.called) | ||
3295 | 856 | + remif_fn.assert_called_with("br0", "tap123") | ||
3296 | 857 | + rpc_obj.update_device_down.assert_called_with( | ||
3297 | 858 | + self.lb_rpc.context, | ||
3298 | 859 | + "tap123", | ||
3299 | 860 | + self.lb_rpc.agent.agent_id, | ||
3300 | 861 | + cfg.CONF.host | ||
3301 | 862 | + ) | ||
3302 | 863 | + | ||
3303 | 864 | + def test_port_update_plugin_rpc_failed(self): | ||
3304 | 865 | + with contextlib.nested( | ||
3305 | 866 | + mock.patch.object(self.lb_rpc.agent.br_mgr, | ||
3306 | 867 | + "get_tap_device_name"), | ||
3307 | 868 | + mock.patch.object(self.lb_rpc.agent.br_mgr, | ||
3308 | 869 | + "udev_get_tap_devices"), | ||
3309 | 870 | + mock.patch.object(self.lb_rpc.agent.br_mgr, | ||
3310 | 871 | + "get_bridge_name"), | ||
3311 | 872 | + mock.patch.object(self.lb_rpc.agent.br_mgr, | ||
3312 | 873 | + "remove_interface"), | ||
3313 | 874 | + mock.patch.object(self.lb_rpc.agent.br_mgr, "add_interface"), | ||
3314 | 875 | + mock.patch.object(self.lb_rpc.sg_agent, | ||
3315 | 876 | + "refresh_firewall", create=True), | ||
3316 | 877 | + mock.patch.object(self.lb_rpc.agent, | ||
3317 | 878 | + "plugin_rpc", create=True), | ||
3318 | 879 | + mock.patch.object(linuxbridge_neutron_agent.LOG, 'error'), | ||
3319 | 880 | + ) as (get_tap_fn, udev_fn, _, _, _, _, plugin_rpc, log): | ||
3320 | 881 | + get_tap_fn.return_value = "tap123" | ||
3321 | 882 | + udev_fn.return_value = ["tap123", "tap124"] | ||
3322 | 883 | + port = {"admin_state_up": True, | ||
3323 | 884 | + "id": "1234-5678", | ||
3324 | 885 | + "network_id": "123-123"} | ||
3325 | 886 | + plugin_rpc.update_device_up.side_effect = rpc_common.Timeout | ||
3326 | 887 | + self.lb_rpc.port_update(mock.Mock(), port=port) | ||
3327 | 888 | + self.assertTrue(plugin_rpc.update_device_up.called) | ||
3328 | 889 | + self.assertEqual(log.call_count, 1) | ||
3329 | 890 | + | ||
3330 | 891 | + log.reset_mock() | ||
3331 | 892 | + port["admin_state_up"] = False | ||
3332 | 893 | + plugin_rpc.update_device_down.side_effect = rpc_common.Timeout | ||
3333 | 894 | + self.lb_rpc.port_update(mock.Mock(), port=port) | ||
3334 | 895 | + self.assertTrue(plugin_rpc.update_device_down.called) | ||
3335 | 896 | + self.assertEqual(log.call_count, 1) | ||
3336 | 897 | + | ||
3337 | 898 | + def test_fdb_add(self): | ||
3338 | 899 | + fdb_entries = {'net_id': | ||
3339 | 900 | + {'ports': | ||
3340 | 901 | + {'agent_ip': [constants.FLOODING_ENTRY, | ||
3341 | 902 | + ['port_mac', 'port_ip']]}, | ||
3342 | 903 | + 'network_type': 'vxlan', | ||
3343 | 904 | + 'segment_id': 1}} | ||
3344 | 905 | + | ||
3345 | 906 | + with mock.patch.object(utils, 'execute', | ||
3346 | 907 | + return_value='') as execute_fn: | ||
3347 | 908 | + self.lb_rpc.fdb_add(None, fdb_entries) | ||
3348 | 909 | + | ||
3349 | 910 | + expected = [ | ||
3350 | 911 | + mock.call(['bridge', 'fdb', 'show', 'dev', 'vxlan-1'], | ||
3351 | 912 | + root_helper=self.root_helper), | ||
3352 | 913 | + mock.call(['bridge', 'fdb', 'add', | ||
3353 | 914 | + constants.FLOODING_ENTRY[0], | ||
3354 | 915 | + 'dev', 'vxlan-1', 'dst', 'agent_ip'], | ||
3355 | 916 | + root_helper=self.root_helper, | ||
3356 | 917 | + check_exit_code=False), | ||
3357 | 918 | + mock.call(['ip', 'neigh', 'add', 'port_ip', 'lladdr', | ||
3358 | 919 | + 'port_mac', 'dev', 'vxlan-1', 'nud', 'permanent'], | ||
3359 | 920 | + root_helper=self.root_helper, | ||
3360 | 921 | + check_exit_code=False), | ||
3361 | 922 | + mock.call(['bridge', 'fdb', 'add', 'port_mac', 'dev', | ||
3362 | 923 | + 'vxlan-1', 'dst', 'agent_ip'], | ||
3363 | 924 | + root_helper=self.root_helper, | ||
3364 | 925 | + check_exit_code=False), | ||
3365 | 926 | + ] | ||
3366 | 927 | + execute_fn.assert_has_calls(expected) | ||
3367 | 928 | + | ||
3368 | 929 | + def test_fdb_ignore(self): | ||
3369 | 930 | + fdb_entries = {'net_id': | ||
3370 | 931 | + {'ports': | ||
3371 | 932 | + {LOCAL_IP: [constants.FLOODING_ENTRY, | ||
3372 | 933 | + ['port_mac', 'port_ip']]}, | ||
3373 | 934 | + 'network_type': 'vxlan', | ||
3374 | 935 | + 'segment_id': 1}} | ||
3375 | 936 | + | ||
3376 | 937 | + with mock.patch.object(utils, 'execute', | ||
3377 | 938 | + return_value='') as execute_fn: | ||
3378 | 939 | + self.lb_rpc.fdb_add(None, fdb_entries) | ||
3379 | 940 | + self.lb_rpc.fdb_remove(None, fdb_entries) | ||
3380 | 941 | + | ||
3381 | 942 | + self.assertFalse(execute_fn.called) | ||
3382 | 943 | + | ||
3383 | 944 | + fdb_entries = {'other_net_id': | ||
3384 | 945 | + {'ports': | ||
3385 | 946 | + {'192.168.0.67': [constants.FLOODING_ENTRY, | ||
3386 | 947 | + ['port_mac', 'port_ip']]}, | ||
3387 | 948 | + 'network_type': 'vxlan', | ||
3388 | 949 | + 'segment_id': 1}} | ||
3389 | 950 | + | ||
3390 | 951 | + with mock.patch.object(utils, 'execute', | ||
3391 | 952 | + return_value='') as execute_fn: | ||
3392 | 953 | + self.lb_rpc.fdb_add(None, fdb_entries) | ||
3393 | 954 | + self.lb_rpc.fdb_remove(None, fdb_entries) | ||
3394 | 955 | + | ||
3395 | 956 | + self.assertFalse(execute_fn.called) | ||
3396 | 957 | + | ||
3397 | 958 | + def test_fdb_remove(self): | ||
3398 | 959 | + fdb_entries = {'net_id': | ||
3399 | 960 | + {'ports': | ||
3400 | 961 | + {'agent_ip': [constants.FLOODING_ENTRY, | ||
3401 | 962 | + ['port_mac', 'port_ip']]}, | ||
3402 | 963 | + 'network_type': 'vxlan', | ||
3403 | 964 | + 'segment_id': 1}} | ||
3404 | 965 | + | ||
3405 | 966 | + with mock.patch.object(utils, 'execute', | ||
3406 | 967 | + return_value='') as execute_fn: | ||
3407 | 968 | + self.lb_rpc.fdb_remove(None, fdb_entries) | ||
3408 | 969 | + | ||
3409 | 970 | + expected = [ | ||
3410 | 971 | + mock.call(['bridge', 'fdb', 'del', | ||
3411 | 972 | + constants.FLOODING_ENTRY[0], | ||
3412 | 973 | + 'dev', 'vxlan-1', 'dst', 'agent_ip'], | ||
3413 | 974 | + root_helper=self.root_helper, | ||
3414 | 975 | + check_exit_code=False), | ||
3415 | 976 | + mock.call(['ip', 'neigh', 'del', 'port_ip', 'lladdr', | ||
3416 | 977 | + 'port_mac', 'dev', 'vxlan-1'], | ||
3417 | 978 | + root_helper=self.root_helper, | ||
3418 | 979 | + check_exit_code=False), | ||
3419 | 980 | + mock.call(['bridge', 'fdb', 'del', 'port_mac', | ||
3420 | 981 | + 'dev', 'vxlan-1', 'dst', 'agent_ip'], | ||
3421 | 982 | + root_helper=self.root_helper, | ||
3422 | 983 | + check_exit_code=False), | ||
3423 | 984 | + ] | ||
3424 | 985 | + execute_fn.assert_has_calls(expected) | ||
3425 | 986 | + | ||
3426 | 987 | + def test_fdb_update_chg_ip(self): | ||
3427 | 988 | + fdb_entries = {'chg_ip': | ||
3428 | 989 | + {'net_id': | ||
3429 | 990 | + {'agent_ip': | ||
3430 | 991 | + {'before': [['port_mac', 'port_ip_1']], | ||
3431 | 992 | + 'after': [['port_mac', 'port_ip_2']]}}}} | ||
3432 | 993 | + | ||
3433 | 994 | + with mock.patch.object(utils, 'execute', | ||
3434 | 995 | + return_value='') as execute_fn: | ||
3435 | 996 | + self.lb_rpc.fdb_update(None, fdb_entries) | ||
3436 | 997 | + | ||
3437 | 998 | + expected = [ | ||
3438 | 999 | + mock.call(['ip', 'neigh', 'add', 'port_ip_2', 'lladdr', | ||
3439 | 1000 | + 'port_mac', 'dev', 'vxlan-1', 'nud', 'permanent'], | ||
3440 | 1001 | + root_helper=self.root_helper, | ||
3441 | 1002 | + check_exit_code=False), | ||
3442 | 1003 | + mock.call(['ip', 'neigh', 'del', 'port_ip_1', 'lladdr', | ||
3443 | 1004 | + 'port_mac', 'dev', 'vxlan-1'], | ||
3444 | 1005 | + root_helper=self.root_helper, | ||
3445 | 1006 | + check_exit_code=False) | ||
3446 | 1007 | + ] | ||
3447 | 1008 | + execute_fn.assert_has_calls(expected) | ||
3448 | 0 | 1009 | ||
3449 | === added file 'debian/patches/fix-quantum-configuration.patch' | |||
3450 | --- debian/patches/fix-quantum-configuration.patch 1970-01-01 00:00:00 +0000 | |||
3451 | +++ debian/patches/fix-quantum-configuration.patch 2014-02-24 14:59:12 +0000 | |||
3452 | @@ -0,0 +1,48 @@ | |||
3453 | 1 | Description: Fixes to neutron configuration for distribution. | ||
3454 | 2 | Patch various bits of config to be more suitable for packaging. | ||
3455 | 3 | Author: James Page <james.page@ubuntu.com> | ||
3456 | 4 | Forwarded: not-needed | ||
3457 | 5 | |||
3458 | 6 | diff --git a/etc/neutron.conf b/etc/neutron.conf | ||
3459 | 7 | index 1e2226f..a5fe086 100644 | ||
3460 | 8 | --- a/etc/neutron.conf | ||
3461 | 9 | +++ b/etc/neutron.conf | ||
3462 | 10 | @@ -7,7 +7,7 @@ | ||
3463 | 11 | |||
3464 | 12 | # Where to store Neutron state files. This directory must be writable by the | ||
3465 | 13 | # user executing the agent. | ||
3466 | 14 | -# state_path = /var/lib/neutron | ||
3467 | 15 | +state_path = /var/lib/neutron | ||
3468 | 16 | |||
3469 | 17 | # Where to store lock files | ||
3470 | 18 | lock_path = $state_path/lock | ||
3471 | 19 | @@ -50,7 +50,7 @@ lock_path = $state_path/lock | ||
3472 | 20 | # previous versions, the class name of a plugin can be specified instead of its | ||
3473 | 21 | # entrypoint name. | ||
3474 | 22 | # | ||
3475 | 23 | -# core_plugin = | ||
3476 | 24 | +core_plugin = neutron.plugins.ml2.plugin.Ml2Plugin | ||
3477 | 25 | # Example: core_plugin = ml2 | ||
3478 | 26 | |||
3479 | 27 | # (ListOpt) List of service plugin entrypoints to be loaded from the | ||
3480 | 28 | @@ -320,7 +320,7 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier | ||
3481 | 29 | # Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real | ||
3482 | 30 | # root filter facility. | ||
3483 | 31 | # Change to "sudo" to skip the filtering and just run the comand directly | ||
3484 | 32 | -# root_helper = sudo | ||
3485 | 33 | +root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf | ||
3486 | 34 | |||
3487 | 35 | # =========== items for agent management extension ============= | ||
3488 | 36 | # seconds between nodes reporting state to server; should be less than | ||
3489 | 37 | @@ -344,7 +344,7 @@ signing_dir = $state_path/keystone-signing | ||
3490 | 38 | # connection = mysql://root:pass@127.0.0.1:3306/neutron | ||
3491 | 39 | # Replace 127.0.0.1 above with the IP address of the database used by the | ||
3492 | 40 | # main neutron server. (Leave it as is if the database runs on this host.) | ||
3493 | 41 | -# connection = sqlite:// | ||
3494 | 42 | +connection = sqlite:////var/lib/neutron/neutron.sqlite | ||
3495 | 43 | |||
3496 | 44 | # The SQLAlchemy connection string used to connect to the slave database | ||
3497 | 45 | # slave_connection = | ||
3498 | 46 | -- | ||
3499 | 47 | 1.8.5.2 | ||
3500 | 48 | |||
3501 | 0 | 49 | ||
3502 | === added file 'debian/patches/series' | |||
3503 | --- debian/patches/series 1970-01-01 00:00:00 +0000 | |||
3504 | +++ debian/patches/series 2014-02-24 14:59:12 +0000 | |||
3505 | @@ -0,0 +1,7 @@ | |||
3506 | 1 | fix-quantum-configuration.patch | ||
3507 | 2 | disable-udev-tests.patch | ||
3508 | 3 | disable-failing-metaplugin-tests.patch | ||
3509 | 4 | #disable-failing-cisco-test.patch | ||
3510 | 5 | sql-alchemy-0.8.3-compat.patch | ||
3511 | 6 | skip-lb-test.patch | ||
3512 | 7 | skip-ipv6-tests.patch | ||
3513 | 0 | 8 | ||
3514 | === added file 'debian/patches/skip-ipv6-tests.patch' | |||
3515 | --- debian/patches/skip-ipv6-tests.patch 1970-01-01 00:00:00 +0000 | |||
3516 | +++ debian/patches/skip-ipv6-tests.patch 2014-02-24 14:59:12 +0000 | |||
3517 | @@ -0,0 +1,22 @@ | |||
3518 | 1 | Description: Skip ipv6 tests because they fail on the ppa buildds. | ||
3519 | 2 | Author: Chuck Short <zulcss@ubuntu.com> | ||
3520 | 3 | Forwarded: Not Needed | ||
3521 | 4 | diff -Naurp neutron-2014.1.b2.orig/neutron/tests/unit/test_wsgi.py neutron-2014.1.b2/neutron/tests/unit/test_wsgi.py | ||
3522 | 5 | --- neutron-2014.1.b2.orig/neutron/tests/unit/test_wsgi.py 2014-01-23 10:13:25.000000000 -0500 | ||
3523 | 6 | +++ neutron-2014.1.b2/neutron/tests/unit/test_wsgi.py 2014-02-03 08:58:27.817255230 -0500 | ||
3524 | 7 | @@ -64,6 +64,7 @@ class TestWSGIServer(base.BaseTestCase): | ||
3525 | 8 | launcher.wait.assert_called_once_with() | ||
3526 | 9 | |||
3527 | 10 | def test_start_random_port_with_ipv6(self): | ||
3528 | 11 | + self.skipTest('Skipped by Ubuntu') | ||
3529 | 12 | server = wsgi.Server("test_random_port") | ||
3530 | 13 | server.start(None, 0, host="::1") | ||
3531 | 14 | self.assertEqual("::1", server.host) | ||
3532 | 15 | @@ -1109,6 +1110,7 @@ class TestWSGIServerWithSSL(base.BaseTes | ||
3533 | 16 | server.stop() | ||
3534 | 17 | |||
3535 | 18 | def test_app_using_ipv6_and_ssl(self): | ||
3536 | 19 | + self.skipTest('Skipped by Ubuntu') | ||
3537 | 20 | CONF.set_default('use_ssl', True) | ||
3538 | 21 | CONF.set_default("ssl_cert_file", | ||
3539 | 22 | os.path.join(TEST_VAR_DIR, 'certificate.crt')) | ||
3540 | 0 | 23 | ||
3541 | === added file 'debian/patches/skip-lb-test.patch' | |||
3542 | --- debian/patches/skip-lb-test.patch 1970-01-01 00:00:00 +0000 | |||
3543 | +++ debian/patches/skip-lb-test.patch 2014-02-24 14:59:12 +0000 | |||
3544 | @@ -0,0 +1,14 @@ | |||
3545 | 1 | Description: Temporarily Skip LB test | ||
3546 | 2 | Author: Chuck Short <zulcss@ubuntu.com> | ||
3547 | 3 | Forwarded: Not Needed | ||
3548 | 4 | diff -Naurp neutron-2014.1.b2.orig/neutron/tests/unit/test_provider_configuration.py neutron-2014.1.b2/neutron/tests/unit/test_provider_configuration.py | ||
3549 | 5 | --- neutron-2014.1.b2.orig/neutron/tests/unit/test_provider_configuration.py 2014-01-23 10:13:25.000000000 -0500 | ||
3550 | 6 | +++ neutron-2014.1.b2/neutron/tests/unit/test_provider_configuration.py 2014-01-27 11:39:28.611298704 -0500 | ||
3551 | 7 | @@ -79,6 +79,7 @@ class ParseServiceProviderConfigurationT | ||
3552 | 8 | 'default': True}]) | ||
3553 | 9 | |||
3554 | 10 | def test_parse_service_provider_opt_not_allowed_raises(self): | ||
3555 | 11 | + self.skipTest('Skipped by Ubuntu') | ||
3556 | 12 | cfg.CONF.set_override('service_provider', | ||
3557 | 13 | [constants.LOADBALANCER + | ||
3558 | 14 | ':lbaas:driver_path', | ||
3559 | 0 | 15 | ||
3560 | === added file 'debian/patches/sql-alchemy-0.8.3-compat.patch' | |||
3561 | --- debian/patches/sql-alchemy-0.8.3-compat.patch 1970-01-01 00:00:00 +0000 | |||
3562 | +++ debian/patches/sql-alchemy-0.8.3-compat.patch 2014-02-24 14:59:12 +0000 | |||
3563 | @@ -0,0 +1,67 @@ | |||
3564 | 1 | Description: Fix sqlalchemy 0.8.3 compat | ||
3565 | 2 | Author: Chuck Short <zulcss@ubuntu.com> | ||
3566 | 3 | Forwarded: No | ||
3567 | 4 | diff --git a/neutron/openstack/common/db/sqlalchemy/session.py b/neutron/openstack/common/db/sqlalchemy/session.py | ||
3568 | 5 | index 3279343..113424c 100644 | ||
3569 | 6 | --- a/neutron/openstack/common/db/sqlalchemy/session.py | ||
3570 | 7 | +++ b/neutron/openstack/common/db/sqlalchemy/session.py | ||
3571 | 8 | @@ -441,6 +441,11 @@ def get_session(autocommit=True, expire_on_commit=False, | ||
3572 | 9 | # 1 column - (IntegrityError) column c1 is not unique | ||
3573 | 10 | # N columns - (IntegrityError) column c1, c2, ..., N are not unique | ||
3574 | 11 | # | ||
3575 | 12 | +# sqlite since 3.7.16: | ||
3576 | 13 | +# 1 column - (IntegrityError) UNIQUE constraint failed: k1 | ||
3577 | 14 | +# | ||
3578 | 15 | +# N columns - (IntegrityError) UNIQUE constraint failed: k1, k2 | ||
3579 | 16 | +# | ||
3580 | 17 | # postgres: | ||
3581 | 18 | # 1 column - (IntegrityError) duplicate key value violates unique | ||
3582 | 19 | # constraint "users_c1_key" | ||
3583 | 20 | @@ -453,9 +458,10 @@ def get_session(autocommit=True, expire_on_commit=False, | ||
3584 | 21 | # N columns - (IntegrityError) (1062, "Duplicate entry 'values joined | ||
3585 | 22 | # with -' for key 'name_of_our_constraint'") | ||
3586 | 23 | _DUP_KEY_RE_DB = { | ||
3587 | 24 | - "sqlite": re.compile(r"^.*columns?([^)]+)(is|are)\s+not\s+unique$"), | ||
3588 | 25 | - "postgresql": re.compile(r"^.*duplicate\s+key.*\"([^\"]+)\"\s*\n.*$"), | ||
3589 | 26 | - "mysql": re.compile(r"^.*\(1062,.*'([^\']+)'\"\)$") | ||
3590 | 27 | + "sqlite": (re.compile(r"^.*columns?([^)]+)(is|are)\s+not\s+unique$"), | ||
3591 | 28 | + re.compile(r"^.*UNIQUE\s+constraint\s+failed:\s+(.+)$")), | ||
3592 | 29 | + "postgresql": (re.compile(r"^.*duplicate\s+key.*\"([^\"]+)\"\s*\n.*$"),), | ||
3593 | 30 | + "mysql": (re.compile(r"^.*\(1062,.*'([^\']+)'\"\)$"),) | ||
3594 | 31 | } | ||
3595 | 32 | |||
3596 | 33 | |||
3597 | 34 | @@ -480,10 +486,14 @@ def _raise_if_duplicate_entry_error(integrity_error, engine_name): | ||
3598 | 35 | if engine_name not in ["mysql", "sqlite", "postgresql"]: | ||
3599 | 36 | return | ||
3600 | 37 | |||
3601 | 38 | - m = _DUP_KEY_RE_DB[engine_name].match(integrity_error.message) | ||
3602 | 39 | - if not m: | ||
3603 | 40 | + for pattern in _DUP_KEY_RE_DB[engine_name]: | ||
3604 | 41 | + match = pattern.match(integrity_error.message) | ||
3605 | 42 | + if match: | ||
3606 | 43 | + break | ||
3607 | 44 | + else: | ||
3608 | 45 | return | ||
3609 | 46 | - columns = m.group(1) | ||
3610 | 47 | + | ||
3611 | 48 | + columns = match.group(1) | ||
3612 | 49 | |||
3613 | 50 | if engine_name == "sqlite": | ||
3614 | 51 | columns = columns.strip().split(", ") | ||
3615 | 52 | diff --git a/run_tests.sh b/run_tests.sh | ||
3616 | 53 | index cc17124..06934e9 100755 | ||
3617 | 54 | --- a/run_tests.sh | ||
3618 | 55 | +++ b/run_tests.sh | ||
3619 | 56 | @@ -162,7 +162,7 @@ function run_pep8 { | ||
3620 | 57 | } | ||
3621 | 58 | |||
3622 | 59 | |||
3623 | 60 | -TESTRTESTS="python setup.py testr" | ||
3624 | 61 | +TESTRTESTS="python -m neutron.openstack.common.lockutils python setup.py testr" | ||
3625 | 62 | |||
3626 | 63 | if [ $never_venv -eq 0 ] | ||
3627 | 64 | then | ||
3628 | 65 | -- | ||
3629 | 66 | 1.8.5.2 | ||
3630 | 67 | |||
3631 | 0 | 68 | ||
3632 | === added file 'debian/pydist-overrides' | |||
3633 | --- debian/pydist-overrides 1970-01-01 00:00:00 +0000 | |||
3634 | +++ debian/pydist-overrides 2014-02-24 14:59:12 +0000 | |||
3635 | @@ -0,0 +1,3 @@ | |||
3636 | 1 | quantum_server quantum-server | ||
3637 | 2 | quantum_common quantum-common | ||
3638 | 3 | setuptools-git | ||
3639 | 0 | 4 | ||
3640 | === added file 'debian/python-neutron.install' | |||
3641 | --- debian/python-neutron.install 1970-01-01 00:00:00 +0000 | |||
3642 | +++ debian/python-neutron.install 2014-02-24 14:59:12 +0000 | |||
3643 | @@ -0,0 +1,1 @@ | |||
3644 | 1 | usr/lib/python*/dist-packages/* | ||
3645 | 0 | 2 | ||
3646 | === added file 'debian/rules' | |||
3647 | --- debian/rules 1970-01-01 00:00:00 +0000 | |||
3648 | +++ debian/rules 2014-02-24 14:59:12 +0000 | |||
3649 | @@ -0,0 +1,31 @@ | |||
3650 | 1 | #!/usr/bin/make -f | ||
3651 | 2 | |||
3652 | 3 | # Uncomment this to turn on verbose mode. | ||
3653 | 4 | #export DH_VERBOSE=1 | ||
3654 | 5 | |||
3655 | 6 | %: | ||
3656 | 7 | dh $@ --with python2 | ||
3657 | 8 | |||
3658 | 9 | override_dh_install: | ||
3659 | 10 | dh_install --fail-missing -X/usr/etc -X/usr/bin/quantum | ||
3660 | 11 | |||
3661 | 12 | override_dh_installinit: | ||
3662 | 13 | dh_installinit | ||
3663 | 14 | dh_installinit -pneutron-plugin-openvswitch-agent --no-start --name=neutron-ovs-cleanup | ||
3664 | 15 | |||
3665 | 16 | override_dh_auto_clean: | ||
3666 | 17 | dh_clean | ||
3667 | 18 | |||
3668 | 19 | get-orig-source: | ||
3669 | 20 | uscan --verbose --force-download --rename --destdir=../build-area | ||
3670 | 21 | |||
3671 | 22 | ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) | ||
3672 | 23 | override_dh_auto_test: | ||
3673 | 24 | # Unpatch quantum configuration to fixup tests which conflict | ||
3674 | 25 | # with a core_plugin being set. | ||
3675 | 26 | patch -p1 -R < debian/patches/fix-quantum-configuration.patch | ||
3676 | 27 | # Set a reasonable level of concurrency | ||
3677 | 28 | ./run_tests.sh -N -P | ||
3678 | 29 | # Patch configuration file after testing | ||
3679 | 30 | patch -p1 < debian/patches/fix-quantum-configuration.patch | ||
3680 | 31 | endif | ||
3681 | 0 | 32 | ||
3682 | === added directory 'debian/source' | |||
3683 | === added file 'debian/source/format' | |||
3684 | --- debian/source/format 1970-01-01 00:00:00 +0000 | |||
3685 | +++ debian/source/format 2014-02-24 14:59:12 +0000 | |||
3686 | @@ -0,0 +1,1 @@ | |||
3687 | 1 | 3.0 (quilt) | ||
3688 | 0 | 2 | ||
3689 | === added directory 'debian/tests' | |||
3690 | === added file 'debian/tests/bigswitch-plugin' | |||
3691 | --- debian/tests/bigswitch-plugin 1970-01-01 00:00:00 +0000 | |||
3692 | +++ debian/tests/bigswitch-plugin 2014-02-24 14:59:12 +0000 | |||
3693 | @@ -0,0 +1,19 @@ | |||
3694 | 1 | #!/bin/bash | ||
3695 | 2 | #------------------------- | ||
3696 | 3 | # Testing bigswitch-plugin | ||
3697 | 4 | #------------------------- | ||
3698 | 5 | set -e | ||
3699 | 6 | apt-get -y install neutron-plugin-bigswitch | ||
3700 | 7 | |||
3701 | 8 | # update plugin path | ||
3702 | 9 | sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/bigswitch\/restproxy\.ini\"/g' /etc/default/neutron-server | ||
3703 | 10 | sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.bigswitch\.plugin\.NeutronRestProxyV2/g' /etc/neutron/neutron.conf | ||
3704 | 11 | service neutron-server restart > /dev/null 2>&1 | ||
3705 | 12 | if pidof -x neutron-server > /dev/null; then | ||
3706 | 13 | apt-get -y remove --purge neutron-plugin-bigswitch | ||
3707 | 14 | echo "OK" | ||
3708 | 15 | else | ||
3709 | 16 | echo "ERROR: BIGSWITCH PLUGIN IS NOT RUNNING" | ||
3710 | 17 | apt-get -y remove --purge neutron-plugin-bigswitch | ||
3711 | 18 | exit 1 | ||
3712 | 19 | fi | ||
3713 | 0 | 20 | ||
3714 | === added file 'debian/tests/brocade-plugin' | |||
3715 | --- debian/tests/brocade-plugin 1970-01-01 00:00:00 +0000 | |||
3716 | +++ debian/tests/brocade-plugin 2014-02-24 14:59:12 +0000 | |||
3717 | @@ -0,0 +1,19 @@ | |||
3718 | 1 | #!/bin/bash | ||
3719 | 2 | #----------------------- | ||
3720 | 3 | # Testing brocade-plugin | ||
3721 | 4 | #----------------------- | ||
3722 | 5 | set -e | ||
3723 | 6 | apt-get -y install neutron-plugin-brocade | ||
3724 | 7 | |||
3725 | 8 | # update plugin path | ||
3726 | 9 | sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/brocade\/brocade\.ini\"/g' /etc/default/neutron-server | ||
3727 | 10 | sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.brocade\.NeutronPlugin\.BrocadePluginV2/g' /etc/neutron/neutron.conf | ||
3728 | 11 | service neutron-server restart > /dev/null 2>&1 | ||
3729 | 12 | if pidof -x neutron-server > /dev/null; then | ||
3730 | 13 | apt-get -y remove --purge neutron-plugin-brocade | ||
3731 | 14 | echo "OK" | ||
3732 | 15 | else | ||
3733 | 16 | echo "ERROR: BROCADE PLUGIN IS NOT RUNNING" | ||
3734 | 17 | apt-get -y remove --purge neutron-plugin-brocade | ||
3735 | 18 | exit 1 | ||
3736 | 19 | fi | ||
3737 | 0 | 20 | ||
3738 | === added file 'debian/tests/cisco-plugin' | |||
3739 | --- debian/tests/cisco-plugin 1970-01-01 00:00:00 +0000 | |||
3740 | +++ debian/tests/cisco-plugin 2014-02-24 14:59:12 +0000 | |||
3741 | @@ -0,0 +1,19 @@ | |||
3742 | 1 | #!/bin/bash | ||
3743 | 2 | #--------------------- | ||
3744 | 3 | # Testing cisco-plugin | ||
3745 | 4 | #--------------------- | ||
3746 | 5 | set -e | ||
3747 | 6 | apt-get -y install neutron-plugin-cisco | ||
3748 | 7 | |||
3749 | 8 | # update plugin path | ||
3750 | 9 | sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/cisco\/cisco_plugins\.ini\"/g' /etc/default/neutron-server | ||
3751 | 10 | sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.cisco\.network_plugin\.PluginV2/g' /etc/neutron/neutron.conf | ||
3752 | 11 | service neutron-server restart > /dev/null 2>&1 | ||
3753 | 12 | if pidof -x neutron-server > /dev/null; then | ||
3754 | 13 | apt-get -y remove --purge neutron-plugin-cisco | ||
3755 | 14 | echo "OK" | ||
3756 | 15 | else | ||
3757 | 16 | echo "ERROR: CISCO PLUGIN IS NOT RUNNING" | ||
3758 | 17 | apt-get -y remove --purge neutron-plugin-cisco | ||
3759 | 18 | exit 1 | ||
3760 | 19 | fi | ||
3761 | 0 | 20 | ||
3762 | === added file 'debian/tests/control' | |||
3763 | --- debian/tests/control 1970-01-01 00:00:00 +0000 | |||
3764 | +++ debian/tests/control 2014-02-24 14:59:12 +0000 | |||
3765 | @@ -0,0 +1,6 @@ | |||
3766 | 1 | Tests: neutron-daemons python-neutron cisco-plugin nec-plugin bigswitch-plugin | ||
3767 | 2 | hyperv-plugin brocade-plugin plumgrid-plugin vmware-plugin openvswitch-plugin | ||
3768 | 3 | linuxbridge-plugin ryu-plugin midonet-plugin | ||
3769 | 4 | Depends: neutron-server, neutron-l3-agent, neutron-dhcp-agent, neutron-metadata-agent, | ||
3770 | 5 | neutron-lbaas-agent, python-neutron, rabbitmq-server | ||
3771 | 6 | Restrictions: needs-root | ||
3772 | 0 | 7 | ||
3773 | === added file 'debian/tests/hyperv-plugin' | |||
3774 | --- debian/tests/hyperv-plugin 1970-01-01 00:00:00 +0000 | |||
3775 | +++ debian/tests/hyperv-plugin 2014-02-24 14:59:12 +0000 | |||
3776 | @@ -0,0 +1,19 @@ | |||
3777 | 1 | #!/bin/bash | ||
3778 | 2 | #---------------------- | ||
3779 | 3 | # Testing hyperv-plugin | ||
3780 | 4 | #---------------------- | ||
3781 | 5 | set -e | ||
3782 | 6 | apt-get -y install neutron-plugin-hyperv | ||
3783 | 7 | |||
3784 | 8 | # update plugin path | ||
3785 | 9 | sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/hyperv\/hyperv_neutron_plugin\.ini\"/g' /etc/default/neutron-server | ||
3786 | 10 | sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.hyperv\.hyperv_neutron_plugin\.HyperVNeutronPlugin/g' /etc/neutron/neutron.conf | ||
3787 | 11 | service neutron-server restart > /dev/null 2>&1 | ||
3788 | 12 | if pidof -x neutron-server > /dev/null; then | ||
3789 | 13 | apt-get -y remove --purge neutron-plugin-hyperv | ||
3790 | 14 | echo "OK" | ||
3791 | 15 | else | ||
3792 | 16 | echo "ERROR: HYPERV PLUGIN IS NOT RUNNING" | ||
3793 | 17 | apt-get -y remove --purge neutron-plugin-hyperv | ||
3794 | 18 | exit 1 | ||
3795 | 19 | fi | ||
3796 | 0 | 20 | ||
3797 | === added file 'debian/tests/linuxbridge-plugin' | |||
3798 | --- debian/tests/linuxbridge-plugin 1970-01-01 00:00:00 +0000 | |||
3799 | +++ debian/tests/linuxbridge-plugin 2014-02-24 14:59:12 +0000 | |||
3800 | @@ -0,0 +1,19 @@ | |||
3801 | 1 | #!/bin/bash | ||
3802 | 2 | #--------------------------- | ||
3803 | 3 | # Testing linuxbridge-plugin | ||
3804 | 4 | #--------------------------- | ||
3805 | 5 | set -e | ||
3806 | 6 | apt-get -y install neutron-plugin-linuxbridge | ||
3807 | 7 | |||
3808 | 8 | # update plugin path | ||
3809 | 9 | sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/linuxbridge\/linuxbridge_conf\.ini\"/g' /etc/default/neutron-server | ||
3810 | 10 | sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.linuxbridge\.lb_neutron_plugin\.LinuxBridgePluginV2/g' /etc/neutron/neutron.conf | ||
3811 | 11 | service neutron-server restart > /dev/null 2>&1 | ||
3812 | 12 | if pidof -x neutron-server > /dev/null; then | ||
3813 | 13 | apt-get -y remove --purge neutron-plugin-linuxbridge | ||
3814 | 14 | echo "OK" | ||
3815 | 15 | else | ||
3816 | 16 | echo "ERROR: LINUXBRIDGE PLUGIN IS NOT RUNNING" | ||
3817 | 17 | apt-get -y remove --purge neutron-plugin-linuxbridge | ||
3818 | 18 | exit 1 | ||
3819 | 19 | fi | ||
3820 | 0 | 20 | ||
3821 | === added file 'debian/tests/midonet-plugin' | |||
3822 | --- debian/tests/midonet-plugin 1970-01-01 00:00:00 +0000 | |||
3823 | +++ debian/tests/midonet-plugin 2014-02-24 14:59:12 +0000 | |||
3824 | @@ -0,0 +1,19 @@ | |||
3825 | 1 | #!/bin/bash | ||
3826 | 2 | #----------------------- | ||
3827 | 3 | # Testing midonet-plugin | ||
3828 | 4 | #----------------------- | ||
3829 | 5 | set -e | ||
3830 | 6 | apt-get -y install neutron-plugin-midonet | ||
3831 | 7 | |||
3832 | 8 | # update plugin path | ||
3833 | 9 | sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/midonet\/midonet\.ini\"/g' /etc/default/neutron-server | ||
3834 | 10 | sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.midonet\.MidonetPluginV2/g' /etc/neutron/neutron.conf | ||
3835 | 11 | service neutron-server restart > /dev/null 2>&1 | ||
3836 | 12 | if pidof -x neutron-server > /dev/null; then | ||
3837 | 13 | apt-get -y remove --purge neutron-plugin-midonet | ||
3838 | 14 | echo "OK" | ||
3839 | 15 | else | ||
3840 | 16 | echo "ERROR: MIDONET PLUGIN IS NOT RUNNING" | ||
3841 | 17 | apt-get -y remove --purge neutron-plugin-midonet | ||
3842 | 18 | exit 1 | ||
3843 | 19 | fi | ||
3844 | 0 | 20 | ||
3845 | === added file 'debian/tests/nec-plugin' | |||
3846 | --- debian/tests/nec-plugin 1970-01-01 00:00:00 +0000 | |||
3847 | +++ debian/tests/nec-plugin 2014-02-24 14:59:12 +0000 | |||
3848 | @@ -0,0 +1,19 @@ | |||
3849 | 1 | #!/bin/bash | ||
3850 | 2 | #------------------- | ||
3851 | 3 | # Testing nec-plugin | ||
3852 | 4 | #------------------- | ||
3853 | 5 | set -e | ||
3854 | 6 | apt-get -y install neutron-plugin-nec | ||
3855 | 7 | |||
3856 | 8 | # update plugin path | ||
3857 | 9 | sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/nec\/nec\.ini\"/g' /etc/default/neutron-server | ||
3858 | 10 | sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.nec\.nec_plugin\.NECPluginV2/g' /etc/neutron/neutron.conf | ||
3859 | 11 | service neutron-server restart > /dev/null 2>&1 | ||
3860 | 12 | if pidof -x neutron-server > /dev/null; then | ||
3861 | 13 | apt-get -y remove --purge neutron-plugin-nec | ||
3862 | 14 | echo "OK" | ||
3863 | 15 | else | ||
3864 | 16 | echo "ERROR: NEC PLUGIN IS NOT RUNNING" | ||
3865 | 17 | apt-get -y remove --purge neutron-plugin-nec | ||
3866 | 18 | exit 1 | ||
3867 | 19 | fi | ||
3868 | 0 | 20 | ||
3869 | === added file 'debian/tests/neutron-daemons' | |||
3870 | --- debian/tests/neutron-daemons 1970-01-01 00:00:00 +0000 | |||
3871 | +++ debian/tests/neutron-daemons 2014-02-24 14:59:12 +0000 | |||
3872 | @@ -0,0 +1,14 @@ | |||
3873 | 1 | #!/bin/bash | ||
3874 | 2 | #----------------------- | ||
3875 | 3 | # Testing neutron-daemon | ||
3876 | 4 | #----------------------- | ||
3877 | 5 | set -e | ||
3878 | 6 | DAEMONS=('neutron-server' 'neutron-l3-agent' 'neutron-dhcp-agent' 'neutron-metadata-agent' 'neutron-lbaas-agent') | ||
3879 | 7 | for daemon in "${DAEMONS[@]}"; do | ||
3880 | 8 | if pidof -x $daemon > /dev/null; then | ||
3881 | 9 | echo "OK" | ||
3882 | 10 | else | ||
3883 | 11 | echo "ERROR: ${daemon} IS NOT RUNNING" | ||
3884 | 12 | exit 1 | ||
3885 | 13 | fi | ||
3886 | 14 | done | ||
3887 | 0 | 15 | ||
3888 | === added file 'debian/tests/openvswitch-plugin' | |||
3889 | --- debian/tests/openvswitch-plugin 1970-01-01 00:00:00 +0000 | |||
3890 | +++ debian/tests/openvswitch-plugin 2014-02-24 14:59:12 +0000 | |||
3891 | @@ -0,0 +1,19 @@ | |||
3892 | 1 | #!/bin/bash | ||
3893 | 2 | #--------------------------- | ||
3894 | 3 | # Testing openvswitch-plugin | ||
3895 | 4 | #--------------------------- | ||
3896 | 5 | set -e | ||
3897 | 6 | apt-get -y install neutron-plugin-openvswitch | ||
3898 | 7 | |||
3899 | 8 | # update plugin path | ||
3900 | 9 | sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/openvswitch\/ovs_neutron_plugin\.ini\"/g' /etc/default/neutron-server | ||
3901 | 10 | sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.openvswitch\.ovs_neutron_plugin\.OVSNeutronPluginV2/g' /etc/neutron/neutron.conf | ||
3902 | 11 | service neutron-server restart > /dev/null 2>&1 | ||
3903 | 12 | if pidof -x neutron-server > /dev/null; then | ||
3904 | 13 | apt-get -y remove --purge neutron-plugin-openvswitch | ||
3905 | 14 | echo "OK" | ||
3906 | 15 | else | ||
3907 | 16 | echo "ERROR: OPENVSWITCH PLUGIN IS NOT RUNNING" | ||
3908 | 17 | apt-get -y remove --purge neutron-plugin-openvswitch | ||
3909 | 18 | exit 1 | ||
3910 | 19 | fi | ||
3911 | 0 | 20 | ||
3912 | === added file 'debian/tests/plumgrid-plugin' | |||
3913 | --- debian/tests/plumgrid-plugin 1970-01-01 00:00:00 +0000 | |||
3914 | +++ debian/tests/plumgrid-plugin 2014-02-24 14:59:12 +0000 | |||
3915 | @@ -0,0 +1,19 @@ | |||
3916 | 1 | #!/bin/bash | ||
3917 | 2 | #------------------------ | ||
3918 | 3 | # Testing plumgrid-plugin | ||
3919 | 4 | #------------------------ | ||
3920 | 5 | set -e | ||
3921 | 6 | apt-get -y install neutron-plugin-plumgrid | ||
3922 | 7 | |||
3923 | 8 | # update plugin path | ||
3924 | 9 | sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/plumgrid\/plumgrid\.ini\"/g' /etc/default/neutron-server | ||
3925 | 10 | sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.plumgrid\.plumgrid_plugin\.plumgrid_plugin\.NeutronPluginPLUMgridV2/g' /etc/neutron/neutron.conf | ||
3926 | 11 | service neutron-server restart > /dev/null 2>&1 | ||
3927 | 12 | if pidof -x neutron-server > /dev/null; then | ||
3928 | 13 | apt-get -y remove --purge neutron-plugin-plumgrid | ||
3929 | 14 | echo "OK" | ||
3930 | 15 | else | ||
3931 | 16 | echo "ERROR: PLUMGRID PLUGIN IS NOT RUNNING" | ||
3932 | 17 | apt-get -y remove --purge neutron-plugin-plumgrid | ||
3933 | 18 | exit 1 | ||
3934 | 19 | fi | ||
3935 | 0 | 20 | ||
3936 | === added file 'debian/tests/python-neutron' | |||
3937 | --- debian/tests/python-neutron 1970-01-01 00:00:00 +0000 | |||
3938 | +++ debian/tests/python-neutron 2014-02-24 14:59:12 +0000 | |||
3939 | @@ -0,0 +1,14 @@ | |||
3940 | 1 | #!/bin/bash | ||
3941 | 2 | #------------------------- | ||
3942 | 3 | # Testing client utilities | ||
3943 | 4 | #------------------------- | ||
3944 | 5 | set -e | ||
3945 | 6 | |||
3946 | 7 | result=$(python `dirname $0`/test_import_neutron.py 2>&1) | ||
3947 | 8 | if [ "$result" ]; then | ||
3948 | 9 | echo "ERROR: PYTHON-NEUTRON MODULE CANNOT BE IMPORTED" | ||
3949 | 10 | exit 1 | ||
3950 | 11 | else | ||
3951 | 12 | echo "OK" | ||
3952 | 13 | exit 0 | ||
3953 | 14 | fi | ||
3954 | 0 | 15 | ||
3955 | === added file 'debian/tests/ryu-plugin' | |||
3956 | --- debian/tests/ryu-plugin 1970-01-01 00:00:00 +0000 | |||
3957 | +++ debian/tests/ryu-plugin 2014-02-24 14:59:12 +0000 | |||
3958 | @@ -0,0 +1,19 @@ | |||
3959 | 1 | #!/bin/bash | ||
3960 | 2 | #------------------- | ||
3961 | 3 | # Testing ryu-plugin | ||
3962 | 4 | #------------------- | ||
3963 | 5 | set -e | ||
3964 | 6 | apt-get -y install neutron-plugin-ryu | ||
3965 | 7 | |||
3966 | 8 | # update plugin path | ||
3967 | 9 | sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/ryu\/ryu\.ini\"/g' /etc/default/neutron-server | ||
3968 | 10 | sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.ryu\.ryu_neutron_plugin\.RyuNeutronPluginV2/g' /etc/neutron/neutron.conf | ||
3969 | 11 | service neutron-server restart > /dev/null 2>&1 | ||
3970 | 12 | if pidof -x neutron-server > /dev/null; then | ||
3971 | 13 | apt-get -y remove --purge neutron-plugin-ryu | ||
3972 | 14 | echo "OK" | ||
3973 | 15 | else | ||
3974 | 16 | echo "ERROR: RYU PLUGIN IS NOT RUNNING" | ||
3975 | 17 | apt-get -y remove --purge neutron-plugin-ryu | ||
3976 | 18 | exit 1 | ||
3977 | 19 | fi | ||
3978 | 0 | 20 | ||
3979 | === added file 'debian/tests/test_import_neutron.py' | |||
3980 | --- debian/tests/test_import_neutron.py 1970-01-01 00:00:00 +0000 | |||
3981 | +++ debian/tests/test_import_neutron.py 2014-02-24 14:59:12 +0000 | |||
3982 | @@ -0,0 +1,4 @@ | |||
3983 | 1 | try: | ||
3984 | 2 | import neutron | ||
3985 | 3 | except ImportError, e: | ||
3986 | 4 | print "ERROR IMPORTING MODULE" | ||
3987 | 0 | 5 | ||
3988 | === added file 'debian/tests/vmware-plugin' | |||
3989 | --- debian/tests/vmware-plugin 1970-01-01 00:00:00 +0000 | |||
3990 | +++ debian/tests/vmware-plugin 2014-02-24 14:59:12 +0000 | |||
3991 | @@ -0,0 +1,19 @@ | |||
3992 | 1 | #!/bin/bash | ||
3993 | 2 | #---------------------- | ||
3994 | 3 | # Testing vmware-plugin | ||
3995 | 4 | #---------------------- | ||
3996 | 5 | set -e | ||
3997 | 6 | apt-get -y install neutron-plugin-vmware | ||
3998 | 7 | |||
3999 | 8 | # update plugin path | ||
4000 | 9 | sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/vmware\/nsx\.ini\"/g' /etc/default/neutron-server | ||
4001 | 10 | sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.nicira\.NeutronPlugin\.NvpPluginV2/g' /etc/neutron/neutron.conf | ||
4002 | 11 | service neutron-server restart > /dev/null 2>&1 | ||
4003 | 12 | if pidof -x neutron-server > /dev/null; then | ||
4004 | 13 | apt-get -y remove --purge neutron-plugin-vmware | ||
4005 | 14 | echo "OK" | ||
4006 | 15 | else | ||
4007 | 16 | echo "ERROR: VMWARE PLUGIN IS NOT RUNNING" | ||
4008 | 17 | apt-get -y remove --purge neutron-plugin-vmware | ||
4009 | 18 | exit 1 | ||
4010 | 19 | fi | ||
4011 | 0 | 20 | ||
4012 | === added file 'debian/watch' | |||
4013 | --- debian/watch 1970-01-01 00:00:00 +0000 | |||
4014 | +++ debian/watch 2014-02-24 14:59:12 +0000 | |||
4015 | @@ -0,0 +1,3 @@ | |||
4016 | 1 | version=3 | ||
4017 | 2 | opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \ | ||
4018 | 3 | https://launchpad.net/neutron/+download https://launchpad.net/neutron/.*/.*/.*/neutron-(.*)\.tar\.gz |