1
commit 80fcc44b157dcea1584a1e6e6a2c40387f0d533a
3
Author: Jenkins <jenkins@review.openstack.org>
4
Date: Fri Sep 21 16:20:09 2012 +0000
6
Merge "Fix OVS and LB plugins' VLAN allocation table synchronization" into milestone-proposed
8
commit 17ed6727e4b31481d105d3dcb898951d38a529e5
10
Author: Jenkins <jenkins@review.openstack.org>
11
Date: Fri Sep 21 16:13:36 2012 +0000
13
Merge "l3-agent: move check if ext-net bridge exists within daemon loop" into milestone-proposed
15
commit a2fb340097fab44e6b8915102577b769fb5ffac2
16
Author: Bob Kukura <rkukura@redhat.com>
17
Date: Thu Sep 20 16:03:14 2012 -0400
19
Fix OVS and LB plugins' VLAN allocation table synchronization
21
In both the openvswitch and linuxbridge plugins, if previous entries
22
for a physical network have been completely removed from the
23
network_vlan_ranges configuration variable, allocation table records
24
for unallocated VLANs on that physical network are now removed from
25
the DB at startup. The test_ovs_db and test_lb_db unit tests have also
26
been extended to cover this case. Fixes bug 1052289.
28
Test assertions that were added to the test_ovs_db unit test in
29
https://review.openstack.org/#/c/11388 have been added to the
30
test_lb_db unit test. Fixes bug 1045596.
32
Change-Id: I04e924603eaf0df717414c2aaa83fd203b791308
34
quantum/plugins/linuxbridge/db/l2network_db_v2.py | 48 ++++++++++------
35
quantum/plugins/openvswitch/ovs_db_v2.py | 61 ++++++++++++---------
36
quantum/tests/unit/linuxbridge/test_lb_db.py | 41 +++++++++++++-
37
quantum/tests/unit/openvswitch/test_ovs_db.py | 45 ++++++++++++++-
38
4 files changed, 151 insertions(+), 44 deletions(-)
40
commit 1aa2ac5d791cb1d0738f7a61ea6fd50721bec8a8
41
Author: Dan Wendlandt <dan@nicira.com>
42
Date: Thu Sep 20 23:52:52 2012 -0700
44
l3-agent: move check if ext-net bridge exists within daemon loop
48
the l3 agent checked if the external network bridge exists in its
49
constructor, raising an uncaught exception if it did not. this does not
50
make much sense when running the l3-agent as a deamon, especially since
51
it can be the case that the l3-agent starts before open vswitch.
53
Change-Id: Ie1717b2c02c9f0bc0caf34a6fdb0dc3a930123c0
55
quantum/agent/l3_agent.py | 12 +++++++-----
56
quantum/tests/unit/test_l3_agent.py | 6 +++---
57
2 files changed, 10 insertions(+), 8 deletions(-)
59
commit 7253c89e7ee8fde150cf44a981894f8ebae64a58
60
Author: Dan Wendlandt <dan@nicira.com>
61
Date: Fri Sep 21 01:49:04 2012 -0700
63
all rootwrap filter for 'route', used by l3-agent
67
Change-Id: If35f1f48464cd0bb795af4e9e82f5d7a9867b0aa
69
etc/quantum/rootwrap.d/l3.filters | 1 +
70
1 file changed, 1 insertion(+)
72
commit 34396fa19b88b7f6644eca7e18e791b45913a5f4
73
Merge: 53a934a cba462a
74
Author: Jenkins <jenkins@review.openstack.org>
75
Date: Fri Sep 21 09:49:49 2012 +0000
77
Merge "Fix deadlock of Metaplugin" into milestone-proposed
79
commit 53a934ac901080cf9e677bb8d249b0befbfeb6b4
80
Merge: e860c01 0cab87a
81
Author: Jenkins <jenkins@review.openstack.org>
82
Date: Fri Sep 21 09:49:43 2012 +0000
84
Merge "Add catch-call try/catch within rpc_loop in ovs plugin agent" into milestone-proposed
86
commit 0cab87a8935559b20eb42b85695859ad10a1df56
87
Author: Dan Wendlandt <dan@nicira.com>
88
Date: Thu Sep 20 21:49:51 2012 -0700
90
Add catch-call try/catch within rpc_loop in ovs plugin agent
92
related to bug 1050512
94
when running in db-mode, the ovs plugin agent will catch any unexpected
95
exceptions generated during processing. However, in rpc-mode, this
96
does not happen, meaning a small error, even a transient one, causes the
97
agent to exit completely. Thic change adds a try-catch block to the
98
rcp_loop(), causing the agent to log any unexpected exception, wait for
99
the polling period, then retry the loop after resetting all state.
101
Change-Id: I76eae1800831e59c5078c4be8fa5ca22298bfb0a
103
.../plugins/openvswitch/agent/ovs_quantum_agent.py | 44 +++++++++++---------
104
1 file changed, 25 insertions(+), 19 deletions(-)
106
commit cba462a7a6565de343c5e008944db558dd757238
107
Author: Nachi Ueno <nachi@nttmcl.com>
108
Date: Wed Sep 19 03:26:07 2012 +0000
110
Fix deadlock of Metaplugin
113
Fix deadlock on network creation
114
Fix attribute filtering function
116
Change-Id: I6b75ea9c22b7844f84de16416d9610ad8c628800
118
quantum/plugins/metaplugin/meta_db_v2.py | 14 ++---
119
quantum/plugins/metaplugin/meta_quantum_plugin.py | 63 +++++++++++----------
120
2 files changed, 37 insertions(+), 40 deletions(-)
122
commit e860c013f9f1d54ed5ac5f572f27513ab1ad487d
123
Author: Sumit Naiksatam <snaiksat@cisco.com>
124
Date: Wed Sep 19 13:20:12 2012 -0700
126
Fix for flat network creation in Cisco plugin
130
Checks for the validity of the VLAN ID needed to be performed. In cases where
131
segmentation ID is not greater than zero, the Nexus sub-plugin does not
132
need to be invoked for that network.
134
Change-Id: I813d569c0c3d26c08554bf3599633b700a98c739
136
quantum/plugins/cisco/models/virt_phy_sw_v2.py | 47 ++++++++++++++----------
137
1 file changed, 28 insertions(+), 19 deletions(-)
139
commit e192e0c40e4080b70478d3eab2738ad48c741c50
140
Merge: fb95ea5 36798c0
141
Author: Jenkins <jenkins@review.openstack.org>
142
Date: Thu Sep 20 06:42:05 2012 +0000
144
Merge "make rootwrap filters path consistent with other openstack project" into milestone-proposed
146
commit fb95ea5ad62f36d25745c57c345e63be062eede4
147
Merge: 6afc60a 5a55c3f
148
Author: Jenkins <jenkins@review.openstack.org>
149
Date: Thu Sep 20 06:36:05 2012 +0000
151
Merge "remove not need shebang line in quantum debug" into milestone-proposed
153
commit 6afc60a440a39391e2fc805f24c7b88df11f991f
154
Author: Russell Bryant <rbryant@redhat.com>
155
Date: Fri Sep 14 14:00:45 2012 -0400
157
Sync a change to rpc from openstack-common.
159
This commit pulls in the following change from openstack-common:
161
ee44222 Change the qpid_heartbeat default to 60 seconds.
165
Change-Id: I2cb63d091f3d8a9a35d0e35ef18b70409c1f09ae
167
etc/quantum.conf | 2 +-
168
quantum/openstack/common/rpc/impl_qpid.py | 2 +-
169
2 files changed, 2 insertions(+), 2 deletions(-)
171
commit 5a55c3fd0069cea98f31f7cc1cc1dda410873d4d
172
Author: Jiajun Liu <iamljj@gmail.com>
173
Date: Thu Sep 13 12:17:49 2012 +0800
175
remove not need shebang line in quantum debug
179
Change-Id: Ia1d8e665d330698d246bddb57330cb376244a1f9
181
quantum/debug/__init__.py | 1 -
182
quantum/debug/commands.py | 1 -
183
quantum/debug/debug_agent.py | 1 -
184
quantum/debug/shell.py | 1 -
185
4 files changed, 4 deletions(-)
187
commit 36798c04ab4666a7695cee90e8b529695ffb7d0c
188
Author: Jiajun Liu <iamljj@gmail.com>
189
Date: Thu Sep 13 10:09:30 2012 +0800
191
make rootwrap filters path consistent with other openstack project
195
Change-Id: I0c3fc84af8ed9bca2e0bd2f11cbc3b737b6a4001
197
etc/rootwrap.conf | 2 +-
198
1 file changed, 1 insertion(+), 1 deletion(-)
200
commit 9c4bc6acbe1708386d669a10b81df573934450c5
201
Merge: 875f13f 5522083
202
Author: Jenkins <jenkins@review.openstack.org>
203
Date: Wed Sep 19 12:16:21 2012 +0000
205
Merge "fix for nested rootwrap checks with 'ip netns exec'" into milestone-proposed
207
commit 875f13f1b438f8d5d8e9dc32450f44c817991573
208
Merge: 8d0c27b d459b45
209
Author: Jenkins <jenkins@review.openstack.org>
210
Date: Wed Sep 19 11:59:48 2012 +0000
212
Merge "Update l3-agent.ini with missing configuration flags" into milestone-proposed
214
commit 8d0c27bdee2ad2ef3c081bcdc88556a0898f14e2
215
Merge: 7d09964 d5f3407
216
Author: Jenkins <jenkins@review.openstack.org>
217
Date: Wed Sep 19 11:25:33 2012 +0000
219
Merge "add missing files from setup.py" into milestone-proposed
221
commit 7d099640f59b2f7265ecdf4548775c4cda1d29a7
222
Merge: 3c8079b cd06025
223
Author: Jenkins <jenkins@review.openstack.org>
224
Date: Wed Sep 19 10:52:26 2012 +0000
226
Merge "README file changes for Cisco plugin" into milestone-proposed
228
commit 3c8079bbd2e240e8e50093ac77eb64d453e7fe98
229
Merge: 43e1a3b ed33a66
230
Author: Jenkins <jenkins@review.openstack.org>
231
Date: Wed Sep 19 10:16:20 2012 +0000
233
Merge "Fix for failing network operations in Cisco plugin" into milestone-proposed
235
commit 43e1a3b41424d48c01ed05a1189a2ed945bb5ae2
236
Merge: 3c628dd 5024b9d
237
Author: Jenkins <jenkins@review.openstack.org>
238
Date: Wed Sep 19 10:16:14 2012 +0000
240
Merge "Add quantum-nec-agent to bin directory." into milestone-proposed
242
commit 3c628dd29aba14f2a3578bf3317a11847288da56
243
Merge: 3cc43f5 ee4f7f4
244
Author: Jenkins <jenkins@review.openstack.org>
245
Date: Wed Sep 19 09:53:16 2012 +0000
247
Merge "make README point to real v2 API spec" into milestone-proposed
249
commit 3cc43f5980b25d59b2c4d2ecd064359b6f261c18
250
Merge: 3397d6d d8f1575
251
Author: Jenkins <jenkins@review.openstack.org>
252
Date: Wed Sep 19 09:41:38 2012 +0000
254
Merge "ovs-lib: make db_get_map return empty dict on error" into milestone-proposed
256
commit 3397d6d3d521cc4181734ce8a46936a2fa884dfd
257
Merge: 9b81fce eac379d
258
Author: Jenkins <jenkins@review.openstack.org>
259
Date: Wed Sep 19 09:40:15 2012 +0000
261
Merge "modify the wrong phy_brs into phys_brs." into milestone-proposed
263
commit 9b81fce36e85c8c79231ec08bdb2144894e42974
264
Merge: d7d0f93 0369468
265
Author: Jenkins <jenkins@review.openstack.org>
266
Date: Wed Sep 19 09:39:24 2012 +0000
268
Merge "Fix for DB error in the Cisco plugin" into milestone-proposed
270
commit d7d0f93f9050297779f944b853a156c21887abb5
271
Merge: 6bb484d e32cfb0
272
Author: Jenkins <jenkins@review.openstack.org>
273
Date: Wed Sep 19 09:37:35 2012 +0000
275
Merge "NVP plugin missing dhcp rpc callbacks" into milestone-proposed
277
commit 6bb484d6c0cd83f45c0cbaf01bd88a0da1c0c2ee
278
Merge: eb7f6b7 36d702a
279
Author: Jenkins <jenkins@review.openstack.org>
280
Date: Wed Sep 19 09:37:11 2012 +0000
282
Merge "always push down metadata rules for router, not just if gateway exists" into milestone-proposed
284
commit 55220838d0f7d95439a98e8a347bc84c1cc8c4a8
285
Author: Dan Wendlandt <dan@nicira.com>
286
Date: Mon Sep 17 10:35:51 2012 -0700
288
fix for nested rootwrap checks with 'ip netns exec'
292
Change-Id: Ia52060afec1c573c8f11d658af88cea7e000d774
294
quantum/rootwrap/filters.py | 5 ++++-
295
1 file changed, 4 insertions(+), 1 deletion(-)
297
commit cd06025fb23077c66367ca0cb7c172126612c18e
298
Author: Sumit Naiksatam <snaiksat@cisco.com>
299
Date: Mon Sep 17 10:53:01 2012 -0700
301
README file changes for Cisco plugin
305
Moving the contents to wiki.
307
Change-Id: I4aef2d710a7a4c1567d8701954ae04ba33095686
309
quantum/plugins/cisco/README | 803 +-----------------------------------------
310
1 file changed, 5 insertions(+), 798 deletions(-)
312
commit d459b45aeb519df497e80a3e39da13b1adf792ef
313
Author: Gary Kotton <gkotton@redhat.com>
314
Date: Sun Sep 16 09:39:57 2012 +0000
316
Update l3-agent.ini with missing configuration flags
320
Change-Id: I7f977c21dbe6bf6fbb8665648a50cd8954c737be
322
etc/l3_agent.ini | 13 +++++++++++++
323
1 file changed, 13 insertions(+)
325
commit ed33a661dfd066c5400e1d7f7e4c99fa5768f172
326
Author: Sumit Naiksatam <snaiksat@cisco.com>
327
Date: Fri Sep 14 17:50:54 2012 -0700
329
Fix for failing network operations in Cisco plugin
333
This fixes the exceptions occurring in the virtual switch mode of the
334
Cisco plugin for create/delete/update network operations. The exceptions
335
were occurring on account of the recent changes in the OVS module to the
336
get_vlan and get_vlans methods, which were still being invoked here.
337
Test configuration has been changed to increase the code coverage to
338
catch such issues in the future. All changes are limited to the Cisco
339
plugin and related tests.
341
Change-Id: Id18473f7a9a2a22217a59b4f8b1541b4918e07e7
343
etc/quantum/plugins/cisco/cisco_plugins.ini | 1 +
344
etc/quantum/plugins/cisco/l2network_plugin.ini | 4 ++--
345
quantum/plugins/cisco/db/network_db_v2.py | 12 ++++++++++
346
quantum/plugins/cisco/models/virt_phy_sw_v2.py | 20 +++++++++-------
347
quantum/tests/unit/cisco/test_network_plugin.py | 29 +++--------------------
348
5 files changed, 30 insertions(+), 36 deletions(-)
350
commit 5024b9dfdb5c27c27b3e4230e535fb2515d8d987
351
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
352
Date: Thu Sep 13 13:36:09 2012 +0900
354
Add quantum-nec-agent to bin directory.
358
Change-Id: I8b946b08b0dc58881a9f149d17623462e058debc
360
bin/quantum-nec-agent | 24 ++++++++++++++++++++++++
361
1 file changed, 24 insertions(+)
363
commit d5f34076693d8d40c30f3bc711340a278425aae2
364
Author: Jiajun Liu <iamljj@gmail.com>
365
Date: Thu Sep 13 11:43:54 2012 +0800
367
add missing files from setup.py
371
Currently, setup.py will not copy l3_agent.ini and rootwrap filters
372
into directory /etc/quantum. Add copy operation in setup.py for those
373
config files so that those files will be copied into proper directory.
375
Change-Id: I7052d6c07ffd4d03cafa93187d8072053ee0a832
377
setup.py | 12 +++++++++++-
378
1 file changed, 11 insertions(+), 1 deletion(-)
380
commit ee4f7f4ca1be67ca825f1bb349f11dd576ad2639
381
Author: Dan Wendlandt <dan@nicira.com>
382
Date: Mon Sep 17 15:24:38 2012 -0700
384
make README point to real v2 API spec
388
Change-Id: I0ecbcd71b25e6c7f514cc2f7e8cb071b75d53059
391
1 file changed, 1 insertion(+), 1 deletion(-)
393
commit d8f15756be0a0b6292031c0c20f1ec8aa1c20a24
394
Author: Dan Wendlandt <dan@nicira.com>
395
Date: Sun Sep 16 23:48:19 2012 -0700
397
ovs-lib: make db_get_map return empty dict on error
401
this fixes a crash caused when we try to iterate over the return value
404
Change-Id: I56640035c3e166ddcc3d23e76be9118604dbeadc
406
quantum/agent/linux/ovs_lib.py | 1 +
407
1 file changed, 1 insertion(+)
409
commit eac379d8b1f7b2be6da3b07287097514c4127e02
410
Author: gongysh <gongysh@cn.ibm.com>
411
Date: Tue Sep 18 10:36:12 2012 +0800
413
modify the wrong phy_brs into phys_brs.
417
Change-Id: I569e60aa1f8ab8313e5427bd16798cc6b4079a09
419
.../plugins/openvswitch/agent/ovs_quantum_agent.py | 4 ++--
420
1 file changed, 2 insertions(+), 2 deletions(-)
422
commit 03694682b7437f1f71ba0769e1c0962aacbb22e6
423
Author: Sumit Naiksatam <snaiksat@cisco.com>
424
Date: Mon Sep 17 23:16:15 2012 -0700
426
Fix for DB error in the Cisco plugin
430
When the Cisco plugin is configured to support the L3 extension, the L3
431
DB model is not getting loaded correctly. Adding this import fixes that
434
Change-Id: I736bd2e767595088de8ebee929258a88f5cbd238
436
quantum/plugins/cisco/models/virt_phy_sw_v2.py | 1 +
437
1 file changed, 1 insertion(+)
439
commit e32cfb09c7f99dd77c4e52ce818cae616981d3d7
440
Author: Aaron Rosen <arosen@nicira.com>
441
Date: Mon Sep 17 17:44:11 2012 -0400
443
NVP plugin missing dhcp rpc callbacks
447
Change-Id: I6a906bd77cce85c7488d901bb2461fb970d1d5d0
449
.../nicira/nicira_nvp_plugin/QuantumPlugin.py | 36 ++++++++++++++++++++
450
1 file changed, 36 insertions(+)
452
commit 36d702a69754e29042bc9eb914e8daedfd349179
453
Author: Dan Wendlandt <dan@nicira.com>
454
Date: Mon Sep 17 09:29:35 2012 -0700
456
always push down metadata rules for router, not just if gateway exists
460
the l3-agent only pushes down some of the DNAT rules for metadata mapping
461
if there is a gateway set on a router. However, the nova-api server could
462
itself be running in the local router namespace (or on the same box as
463
the quantum-l3-agent in the case were namespaces are disabled. In fact,
464
with namespaces disabled, this is the likely setup for a simple
465
environment). Thus, we should simply always push down the metadata nat
466
rules for a router, router than waiting until a gateway is added.
468
This patch also refactors the actions taken by the l3-agent when a router
469
is added or removed into a separate function for improved readability,
470
as add/removing the nat rules made these code segments even longer.
472
Change-Id: I3c6eb35b51df3babf747dbcff7f943b850e69838
474
quantum/agent/l3_agent.py | 51 ++++++++++++++++++++++++++++++---------------
475
1 file changed, 34 insertions(+), 17 deletions(-)
477
commit eb7f6b7fbe97d4929093894968d39835cfff4254
478
Author: Salvatore Orlando <salv.orlando@gmail.com>
479
Date: Tue Sep 18 18:27:00 2012 -0700
481
Removed eval of unchecked strings.
483
* eval() was previously used to marshall unchecked strings as
484
filter parameters for QuantumDbPluginV2.get_ports() via
485
the --fixed_ips flag.
486
* This change removes the use of eval and cleans up the filtering
487
implementation for get_ports().
488
* The new filtering implementation does not support arbitrary
489
OR'ing or AND'ing. Instead, multiple values for a given filter
490
key are logically OR'ed, and filters across keys are AND'ed.
491
* Example usage - filter for .2 or .3 in the given subnet:
493
quantum port-list -- --fixed_ips ip_address=10.0.0.3 \
494
ip_address=10.0.0.2 subnet_id=nOtaRealId
496
* Addresses bug 1052179
498
Change-Id: I451f33ae53e623f86015b3fc2e6a7ca2f51ee836
500
quantum/api/v2/attributes.py | 33 +++++++++++++++++
501
quantum/api/v2/base.py | 25 +++++++------
502
quantum/db/db_base_plugin_v2.py | 64 +++++++++++++++------------------
503
quantum/tests/unit/test_api_v2.py | 21 +++++++++++
504
quantum/tests/unit/test_attributes.py | 33 +++++++++++++++++
505
quantum/tests/unit/test_db_plugin.py | 13 +++++++
506
6 files changed, 142 insertions(+), 47 deletions(-)
1
508
commit ac4049bb850cd88ffe0ab7ddea4a1c0b32fc120a
2
509
Author: Thierry Carrez <thierry@openstack.org>
3
510
Date: Wed Sep 12 10:23:44 2012 +0200