lp://staging/~jason-koelker/nova/lp819477

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://staging/~hudson-openstack/nova/trunk

Dan Prince (community): Needs Fixing on 2011-09-12

Thierry Carrez (community): Abstain (ffe) on 2011-09-09

Rick Harris (community): Approve on 2011-09-02

Trey Morris (community): Approve on 2011-09-01

Devin Carlen (community): Approve on 2011-09-01

Matt Dietz (community): Approve on 2011-08-29

Diff: 2911 lines (+1321/-496)

21 files modified

bin/nova-manage (+136/-33)
nova/api/ec2/cloud.py (+2/-5)
nova/api/openstack/views/addresses.py (+1/-1)
nova/auth/manager.py (+25/-4)
nova/db/api.py (+59/-13)
nova/db/sqlalchemy/api.py (+145/-68)
nova/db/sqlalchemy/custom_types.py (+46/-0)
nova/db/sqlalchemy/migrate_repo/versions/045_split_networks.py (+128/-0)
nova/db/sqlalchemy/migrate_repo/versions/046_fk_fixed_ips_subnet_id.py (+57/-0)
nova/db/sqlalchemy/migrate_repo/versions/046_sqlite_downgrade.sql (+52/-0)
nova/db/sqlalchemy/migrate_repo/versions/046_sqlite_upgrade.sql (+52/-0)
nova/db/sqlalchemy/models.py (+35/-33)
nova/exception.py (+18/-5)
nova/network/api.py (+8/-4)
nova/network/linux_net.py (+34/-31)
nova/network/manager.py (+344/-186)
nova/tests/__init__.py (+1/-1)
nova/tests/api/openstack/contrib/test_floating_ips.py (+14/-5)
nova/tests/api/openstack/test_servers.py (+1/-1)
nova/tests/test_network.py (+135/-82)
nova/tests/test_nova_manage.py (+28/-24)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #819477: In FlatNetwork mode you can't have multiple networks per bridge

Wishlist

Won't Fix

Link a bug report

Related blueprints

1485. By Jason Kölker on 2011-09-07

merge trunk

1484. By Jason Kölker on 2011-09-07

merge trunk

1483. By Jason Kölker on 2011-09-07

pep8 fix

1482. By Jason Kölker on 2011-09-07

if a vpn_public_port is generated and cpn_public_address is not specified, default to the FLAG value

1481. By Jason Kölker on 2011-09-07

VPN data should only be generated on v4 networks, since none of the VPN/VLAN stuff sets v6 up for it

1480. By Jason Kölker on 2011-09-07

make special case for VpnCommands.change so that it 'works' expectedly

1479. By Jason Kölker on 2011-09-07

remove unused import

1478. By Jason Kölker on 2011-09-07

remove accidently setting the vpn_public address

1477. By Jason Kölker on 2011-09-07

add some debug logging

1476. By Jason Kölker on 2011-09-07

generate project vpn data from the first subnet of the first network (generally it doesn't make sense to have the vlan manager and multiple subnets per network, so this *should* be safe)