lp:~midokura/nova/network-refactoring-l2

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~hudson-openstack/nova/trunk at revision 1321

Vish Ishaya (community): Approve on 2011-07-26

Devin Carlen (community): Approve on 2011-07-25

Brian Lamar (community): Needs Fixing on 2011-07-25

Jason Kölker (community): Approve on 2011-07-22

Jay Pipes (community): Approve on 2011-07-22

Diff: 1907 lines (+642/-372)

27 files modified

.mailmap (+1/-0)
Authors (+3/-0)
nova/compute/manager.py (+32/-20)
nova/network/api.py (+4/-0)
nova/network/linux_net.py (+1/-0)
nova/network/manager.py (+25/-40)
nova/network/vmwareapi_net.py (+0/-82)
nova/network/xenapi_net.py (+0/-87)
nova/tests/test_compute.py (+6/-8)
nova/tests/test_libvirt.py (+20/-17)
nova/tests/test_network.py (+7/-2)
nova/tests/test_xenapi.py (+1/-1)
nova/virt/driver.py (+10/-6)
nova/virt/fake.py (+5/-5)
nova/virt/hyperv.py (+3/-3)
nova/virt/libvirt.xml.template (+18/-0)
nova/virt/libvirt/connection.py (+30/-45)
nova/virt/libvirt/firewall.py (+6/-5)
nova/virt/libvirt/vif.py (+134/-0)
nova/virt/vif.py (+30/-0)
nova/virt/vmwareapi/vif.py (+95/-0)
nova/virt/vmwareapi/vmops.py (+25/-3)
nova/virt/vmwareapi_conn.py (+10/-6)
nova/virt/xenapi/vif.py (+140/-0)
nova/virt/xenapi/vm_utils.py (+0/-22)
nova/virt/xenapi/vmops.py (+27/-14)
nova/virt/xenapi_conn.py (+9/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1292. By Adam Johnson on 2011-07-26

adding to authors

1291. By Adam Johnson on 2011-07-26

fixing merge conflict

1290. By Ryu Ishimoto on 2011-07-25

Moved the exception handling of unplugging VIF from virt driver to VIF driver. Added better comments. Added OpenStack copyrights to libivrt vifs.py

1289. By Ryu Ishimoto on 2011-07-22

Add i18n for logging, changed create_bridge/vlan to should_create_bridge/vlan, changed unfilter_instance's keyword param to positional, and added Dan's alternate ID to .mailmap

1288. By Ryu Ishimoto on 2011-07-22

Updated the comments for VMWare VIF driver

1287. By Ryu Ishimoto on 2011-07-22

Added network_info to unfilter_instance to avoid exceptions when shutting down instances

1286. By Ryu Ishimoto on 2011-07-22

Removed unused exception object

1285. By Ryu Ishimoto on 2011-07-22

Fixed the missing quotes for 802.1Qbh in libvirt template

1284. By Ryu Ishimoto on 2011-07-22

Merged Dan's branch

1283. By Ryu Ishimoto on 2011-07-22

Merged trunk