Merge lp://qastaging/~bgh/nova/qmanager-rbp-trunk into lp://qastaging/~hudson-openstack/nova/trunk
Proposed by
Brad Hall
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~bgh/nova/qmanager-rbp-trunk |
| Merge into: | lp://qastaging/~hudson-openstack/nova/trunk |
| Diff against target: |
289 lines (+85/-73) 7 files modified
bin/nova-manage (+1/-1) nova/network/quantum/client.py (+0/-2) nova/network/quantum/manager.py (+41/-22) nova/network/quantum/melange_ipam_lib.py (+25/-26) nova/network/quantum/nova_ipam_lib.py (+3/-2) nova/network/quantum/quantum_connection.py (+10/-14) nova/tests/test_quantum.py (+5/-6) |
| To merge this branch: | bzr merge lp://qastaging/~bgh/nova/qmanager-rbp-trunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Vish Ishaya (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Various fixes for the quantum network manager related to melange/ipam
To post a comment you must log in.
Unmerged revisions
- 1542. By Brad Hall
-
Fix quantum/melange ipam interaction
We now query for the subnets by net_id/vif_id instead of searching through all
the blocks to find the right one. Both of the allocate and deallocate for
instance calls are now using the vif_id -> network_id mapping instead of
searching the quantum networks. get_port_by_attachment was also changed to
take a net_id so that we don't have to search through all of the quantum
networks to find the corresponding port.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This looks like a painless set of fixes for quantum related code.