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