Merge lp://qastaging/~midokura/nova/network-service into lp://qastaging/~ntt-pf-lab/nova/network-service
Proposed by
Ryu Ishimoto
| Status: | Merged |
|---|---|
| Merged at revision: | 769 |
| Proposed branch: | lp://qastaging/~midokura/nova/network-service |
| Merge into: | lp://qastaging/~ntt-pf-lab/nova/network-service |
| Diff against target: |
907 lines (+235/-269) 13 files modified
bin/nova-dhcpbridge-flat-vlan (+1/-1) bin/nova-net-dhcp (+0/-50) bin/nova-net-flat (+0/-50) nova/network/flat_vlan/api/openstack/networks.py (+5/-2) nova/network/flat_vlan/compute.py (+20/-13) nova/network/flat_vlan/db/sqlalchemy/migrate_repo/versions/001_diablo.py (+4/-10) nova/network/flat_vlan/db/sqlalchemy/models.py (+49/-4) nova/network/flat_vlan/dhcp.py (+0/-79) nova/network/flat_vlan/flags.py (+2/-10) nova/network/flat_vlan/manager.py (+40/-25) nova/network/flat_vlan/network.py (+63/-5) nova/network/service.py (+2/-2) nova/virt/libvirt_conn.py (+49/-18) |
| To merge this branch: | bzr merge lp://qastaging/~midokura/nova/network-service |
| Related bugs: | |
| Related blueprints: |
Refactor Networking
(Essential)
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| NTT PF Lab. | Pending | ||
|
Review via email:
|
|||
Commit message
Began the process of moving the Firewall code out of libvirt_conn.py and into the plugin. Also added IPv6 changes made in the NOVA DB to the plugin DB.
Description of the change
Began the process of moving the Firewall code out of libvirt_conn.py and into the plugin. Also added IPv6 changes made in the NOVA DB to the plugin DB.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
