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: | 768 |
| Proposed branch: | lp://qastaging/~midokura/nova/network-service |
| Merge into: | lp://qastaging/~ntt-pf-lab/nova/network-service |
| Diff against target: |
7670 lines (+1105/-5848) 92 files modified
bin/nova-dhcpbridge-flat-dhcp (+0/-70) bin/nova-dhcpbridge-flat-vlan (+71/-0) bin/nova-dhcpbridge-vlan (+0/-69) bin/nova-net-serv (+50/-0) bin/nova-net-vlan (+0/-50) nova/network/flat/__init__.py (+0/-39) nova/network/flat/api/__init__.py (+0/-44) nova/network/flat/api/openstack/__init__.py (+0/-45) nova/network/flat/api/openstack/networks.py (+0/-78) nova/network/flat/api/openstack/ports.py (+0/-35) nova/network/flat/api/openstack/virtual_nics.py (+0/-68) nova/network/flat/common.py (+0/-36) nova/network/flat/compute.py (+0/-157) nova/network/flat/db/__init__.py (+0/-21) nova/network/flat/db/api.py (+0/-143) nova/network/flat/db/manager.py (+0/-121) nova/network/flat/db/sqlalchemy/__init__.py (+0/-16) nova/network/flat/db/sqlalchemy/api.py (+0/-94) nova/network/flat/db/sqlalchemy/migrate_repo/README (+0/-4) nova/network/flat/db/sqlalchemy/migrate_repo/__init__.py (+0/-16) nova/network/flat/db/sqlalchemy/migrate_repo/manage.py (+0/-4) nova/network/flat/db/sqlalchemy/migrate_repo/migrate.cfg (+0/-20) nova/network/flat/db/sqlalchemy/migrate_repo/versions/001_diablo.py (+0/-107) nova/network/flat/db/sqlalchemy/migrate_repo/versions/__init__.py (+0/-16) nova/network/flat/db/sqlalchemy/migration.py (+0/-65) nova/network/flat/db/sqlalchemy/models.py (+0/-314) nova/network/flat/db/sqlalchemy/session.py (+0/-62) nova/network/flat/network.py (+0/-61) nova/network/flat_dhcp/__init__.py (+0/-40) nova/network/flat_dhcp/api/__init__.py (+0/-44) nova/network/flat_dhcp/api/openstack/__init__.py (+0/-44) nova/network/flat_dhcp/api/openstack/networks.py (+0/-80) nova/network/flat_dhcp/api/openstack/ports.py (+0/-35) nova/network/flat_dhcp/api/openstack/virtual_nics.py (+0/-68) nova/network/flat_dhcp/common.py (+0/-39) nova/network/flat_dhcp/compute.py (+0/-186) nova/network/flat_dhcp/db/__init__.py (+0/-20) nova/network/flat_dhcp/db/api.py (+0/-219) nova/network/flat_dhcp/db/manager.py (+0/-129) nova/network/flat_dhcp/db/sqlalchemy/__init__.py (+0/-16) nova/network/flat_dhcp/db/sqlalchemy/api.py (+0/-62) nova/network/flat_dhcp/db/sqlalchemy/migrate_repo/README (+0/-4) nova/network/flat_dhcp/db/sqlalchemy/migrate_repo/__init__.py (+0/-16) nova/network/flat_dhcp/db/sqlalchemy/migrate_repo/manage.py (+0/-4) nova/network/flat_dhcp/db/sqlalchemy/migrate_repo/migrate.cfg (+0/-20) nova/network/flat_dhcp/db/sqlalchemy/migrate_repo/versions/001_diablo.py (+0/-137) nova/network/flat_dhcp/db/sqlalchemy/migrate_repo/versions/__init__.py (+0/-16) nova/network/flat_dhcp/db/sqlalchemy/models.py (+0/-354) nova/network/flat_dhcp/db/sqlalchemy/session.py (+0/-63) nova/network/flat_dhcp/dhcp.py (+0/-80) nova/network/flat_dhcp/network.py (+0/-255) nova/network/flat_vlan/compute.py (+4/-3) nova/network/flat_vlan/db/api.py (+7/-1) nova/network/flat_vlan/db/sqlalchemy/api.py (+1/-3) nova/network/flat_vlan/db/sqlalchemy/models.py (+15/-1) nova/network/flat_vlan/driver/__init__.py (+16/-0) nova/network/flat_vlan/driver/linux/__init__.py (+16/-0) nova/network/flat_vlan/driver/linux/dhcp.py (+151/-0) nova/network/flat_vlan/driver/linux/filter.py (+391/-0) nova/network/flat_vlan/driver/linux/network.py (+149/-0) nova/network/flat_vlan/driver/linux/ra.py (+107/-0) nova/network/flat_vlan/flags.py (+95/-17) nova/network/flat_vlan/manager.py (+1/-1) nova/network/flat_vlan/network.py (+23/-22) nova/network/linux_dhcp.py (+0/-157) nova/network/linux_net.py (+1/-7) nova/network/linux_ra.py (+0/-106) nova/network/manager.py (+6/-2) nova/network/service.py (+1/-2) nova/network/vlan/__init__.py (+0/-39) nova/network/vlan/api/__init__.py (+0/-57) nova/network/vlan/api/openstack/__init__.py (+0/-45) nova/network/vlan/api/openstack/networks.py (+0/-80) nova/network/vlan/api/openstack/ports.py (+0/-35) nova/network/vlan/api/openstack/virtual_nics.py (+0/-68) nova/network/vlan/common.py (+0/-39) nova/network/vlan/compute.py (+0/-188) nova/network/vlan/db/__init__.py (+0/-20) nova/network/vlan/db/api.py (+0/-254) nova/network/vlan/db/manager.py (+0/-150) nova/network/vlan/db/sqlalchemy/__init__.py (+0/-16) nova/network/vlan/db/sqlalchemy/api.py (+0/-63) nova/network/vlan/db/sqlalchemy/migrate_repo/README (+0/-4) nova/network/vlan/db/sqlalchemy/migrate_repo/__init__.py (+0/-16) nova/network/vlan/db/sqlalchemy/migrate_repo/manage.py (+0/-4) nova/network/vlan/db/sqlalchemy/migrate_repo/migrate.cfg (+0/-20) nova/network/vlan/db/sqlalchemy/migrate_repo/versions/001_diablo.py (+0/-148) nova/network/vlan/db/sqlalchemy/migrate_repo/versions/__init__.py (+0/-16) nova/network/vlan/db/sqlalchemy/models.py (+0/-172) nova/network/vlan/db/sqlalchemy/session.py (+0/-63) nova/network/vlan/dhcp.py (+0/-80) nova/network/vlan/network.py (+0/-263) |
| 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
Finished up the merging of three plugins(vlan, dhcp, flat) into one flat_vlan.
Description of the change
Finished up the merging of three plugins(vlan, dhcp, flat) into one flat_vlan.
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
