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: | 775 |
| Proposed branch: | lp://qastaging/~midokura/nova/network-service |
| Merge into: | lp://qastaging/~ntt-pf-lab/nova/network-service |
| Diff against target: |
4572 lines (+2361/-1171) (has conflicts) 19 files modified
bin/nova-network-manage (+289/-0) nova/api/ec2/cloud.py (+99/-105) nova/auth/manager.py (+1/-1) nova/compute/api.py (+35/-34) nova/network/flat_vlan/api/openstack/ethernet_cards.py (+67/-0) nova/network/flat_vlan/api/openstack/virtual_nics.py (+0/-68) nova/network/flat_vlan/api/service.py (+282/-27) nova/network/flat_vlan/compute.py (+86/-3) nova/network/flat_vlan/db/api.py (+110/-18) nova/network/flat_vlan/db/migration.py (+36/-0) nova/network/flat_vlan/db/sqlalchemy/migrate_repo/versions/001_diablo.py (+65/-4) nova/network/flat_vlan/db/sqlalchemy/migration.py (+81/-0) nova/network/flat_vlan/db/sqlalchemy/models.py (+294/-32) nova/network/flat_vlan/firewall.py (+581/-0) nova/network/flat_vlan/flags.py (+3/-0) nova/network/flat_vlan/manager.py (+11/-11) nova/network/flat_vlan/network.py (+17/-15) nova/network/service.py (+232/-14) nova/virt/libvirt_conn.py (+72/-839) Contents conflict in bin/nova-net-flat-vlan-manage |
| 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
Moved security group/firewall logic out of compute into the plugin. Still needs a lot more refactoring and testing.
Description of the change
Moved security group/firewall logic out of compute into the plugin. Still needs a lot more refactoring and testing.
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
