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: 772
Proposed branch: lp://qastaging/~midokura/nova/network-service
Merge into: lp://qastaging/~ntt-pf-lab/nova/network-service
Diff against target: 2121 lines (+996/-643)
19 files modified
bin/nova-manage (+1/-58)
bin/nova-net-flat-vlan-manage (+68/-43)
nova/network/flat_vlan/__init__.py (+3/-3)
nova/network/flat_vlan/api/__init__.py (+0/-293)
nova/network/flat_vlan/api/openstack/fixed_ips.py (+49/-0)
nova/network/flat_vlan/api/openstack/floating_ips.py (+107/-0)
nova/network/flat_vlan/api/openstack/networks.py (+26/-16)
nova/network/flat_vlan/api/openstack/ports.py (+0/-35)
nova/network/flat_vlan/api/service.py (+312/-0)
nova/network/flat_vlan/client/__init__.py (+4/-0)
nova/network/flat_vlan/client/fixed_ip.py (+47/-0)
nova/network/flat_vlan/client/floating_ip.py (+67/-0)
nova/network/flat_vlan/client/network.py (+6/-4)
nova/network/flat_vlan/compute.py (+134/-141)
nova/network/flat_vlan/driver/linux/network.py (+112/-11)
nova/network/flat_vlan/network.py (+1/-1)
nova/network/service.py (+16/-0)
nova/virt/libvirt.xml.template (+6/-5)
nova/virt/libvirt_conn.py (+37/-33)
To merge this branch: bzr merge lp://qastaging/~midokura/nova/network-service
Reviewer Review Type Date Requested Status
NTT PF Lab. Pending
Review via email: mp+57276@code.qastaging.launchpad.net

Description of the change

Added fixed and floating point client libs, and libvirt now uses ethernet device instead of bridge.

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
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: