lp:~tr3buchet/nova/multi_nic
Created by
Trey Morris
and last modified
wanted to make a note of this somewhere, I've changed the default behavior of the vlan_interface flag. It now defaults to None. If you are using Flat DHCP or VLAN managers, you will either to set the interface to attach your bridges to by setting the flat_interface or vlan_interface respectively. If you are pursuing the multi_nic route, you won't use either flag, but instead when creating networks you will pass the interface to the bin/nova-manage network create command as an argument for each network.
Take special care that you can create multiple networks at a time, if num_networks is not 1, you will end up with multiple networks connected to the single specified bridge, which could be what you are after, but maybe not.
- Get this branch:
- bzr branch lp:~tr3buchet/nova/multi_nic
Only
Trey Morris
can upload to this branch. If you are
Trey Morris
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Dan Prince (community): Approve
- Koji Iida (community): Needs Fixing
- Tushar Patil (community): Needs Fixing
- Sandy Walsh (community): Needs Fixing
- Brian Waldon (community): Approve
-
Diff: 7488 lines (+3114/-2164)58 files modifiedbin/nova-dhcpbridge (+2/-6)
bin/nova-manage (+50/-23)
doc/build/html/.buildinfo (+0/-4)
doc/source/devref/multinic.rst (+39/-0)
nova/api/ec2/cloud.py (+11/-10)
nova/api/openstack/contrib/floating_ips.py (+2/-1)
nova/api/openstack/views/addresses.py (+6/-4)
nova/auth/manager.py (+10/-6)
nova/compute/api.py (+45/-24)
nova/compute/manager.py (+59/-99)
nova/db/api.py (+100/-51)
nova/db/sqlalchemy/api.py (+444/-214)
nova/db/sqlalchemy/migrate_repo/versions/027_add_provider_firewall_rules.py (+1/-1)
nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py (+125/-0)
nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py (+56/-0)
nova/db/sqlalchemy/migrate_repo/versions/031_sqlite_downgrade.sql (+48/-0)
nova/db/sqlalchemy/migrate_repo/versions/031_sqlite_upgrade.sql (+48/-0)
nova/db/sqlalchemy/models.py (+54/-36)
nova/exception.py (+52/-19)
nova/network/api.py (+62/-15)
nova/network/linux_net.py (+6/-6)
nova/network/manager.py (+520/-278)
nova/network/vmwareapi_net.py (+2/-2)
nova/network/xenapi_net.py (+3/-3)
nova/scheduler/host_filter.py (+1/-2)
nova/test.py (+19/-0)
nova/tests/__init__.py (+16/-8)
nova/tests/api/openstack/test_servers.py (+15/-13)
nova/tests/db/fakes.py (+334/-35)
nova/tests/glance/stubs.py (+2/-2)
nova/tests/network/__init__.py (+0/-67)
nova/tests/network/base.py (+0/-155)
nova/tests/scheduler/test_scheduler.py (+0/-1)
nova/tests/test_adminapi.py (+0/-4)
nova/tests/test_cloud.py (+36/-6)
nova/tests/test_compute.py (+5/-5)
nova/tests/test_console.py (+0/-1)
nova/tests/test_direct.py (+22/-21)
nova/tests/test_flat_network.py (+0/-161)
nova/tests/test_iptables_network.py (+164/-0)
nova/tests/test_libvirt.py (+74/-40)
nova/tests/test_network.py (+234/-190)
nova/tests/test_quota.py (+7/-11)
nova/tests/test_vlan_network.py (+0/-242)
nova/tests/test_vmwareapi.py (+276/-251)
nova/tests/test_volume.py (+0/-1)
nova/tests/test_xenapi.py (+98/-32)
nova/utils.py (+0/-8)
nova/virt/driver.py (+1/-1)
nova/virt/fake.py (+1/-1)
nova/virt/hyperv.py (+6/-1)
nova/virt/libvirt/connection.py (+12/-12)
nova/virt/libvirt/firewall.py (+4/-4)
nova/virt/libvirt/netutils.py (+13/-8)
nova/virt/vmwareapi/vm_util.py (+5/-1)
nova/virt/vmwareapi/vmops.py (+10/-4)
nova/virt/xenapi/vmops.py (+8/-68)
nova/virt/xenapi_conn.py (+6/-6)
Branch information
Recent revisions
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~hudson-openstack/nova/trunk