Merge lp:~dan-prince/nova/fix_allocate_fixed_ips into lp:~hudson-openstack/nova/trunk

Proposed by Dan Prince
Status: Merged
Approved by: Dan Prince
Approved revision: 1269
Merged at revision: 1268
Proposed branch: lp:~dan-prince/nova/fix_allocate_fixed_ips
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 0 lines
To merge this branch: bzr merge lp:~dan-prince/nova/fix_allocate_fixed_ips
Reviewer Review Type Date Requested Status
Vish Ishaya (community) Approve
Mohammed Naser (community) Approve
Review via email: mp+67777@code.launchpad.net

Commit message

Don't pop 'vpn' on kwargs inside a loop in RPCAllocateFixedIP._allocate_fixed_ips (fixes KeyError).

Update allocate_fixed_ip methods in network manager to accept correct kwargs. (fixes regression in bzr 1266)

To post a comment you must log in.
Revision history for this message
Mohammed Naser (mnaser) wrote :

Code looks good and works again for me! :)

review: Approve
Revision history for this message
Vish Ishaya (vishvananda) wrote :

lgtm

review: Approve
Revision history for this message
OpenStack Infra (hudson-openstack) wrote :
Download full text (179.0 KiB)

The attempt to merge lp:~dan-prince/nova/fix_allocate_fixed_ips into lp:nova failed. Below is the output from the failed tests.

FloatingIpTest
    test_floating_ip_allocate OK 0.30
    test_floating_ip_associate OK 0.10
    test_floating_ip_disassociate OK 0.10
    test_floating_ip_release OK 0.10
    test_floating_ip_show OK 0.10
    test_floating_ips_list OK 0.10
    test_translate_floating_ip_view OK 0.05
FixedIpTest
    test_add_fixed_ip OK 0.08
    test_add_fixed_ip_no_network OK 0.08
    test_remove_fixed_ip OK 0.07
    test_remove_fixed_ip_no_address OK 0.25
FlavorsExtraSpecsTest
    test_create OK 0.05
    test_create_empty_body OK 0.05
    test_delete OK 0.05
    test_index OK 0.05
    test_index_no_data OK 0.05
    test_show OK 0.04
    test_show_spec_not_found OK 0.05
    test_update_item OK 0.05
    test_update_item_body_uri_mismatch OK 0.05
    test_update_item_empty_body OK 0.05
    test_update_item_too_many_keys OK 0.05
AccountsTest
    test_account_create OK 0.38
    test_account_delete OK 0.17
    test_account_update OK 0.18
    test_get_account OK 0.18
AdminAPITest
    test_admin_disabled OK 0.14
    test_admin_enabled OK 0.42
APITest
    test_exceptions_are_converted_to_faults OK 0.01
    test_malformed_json OK 0.05
    test_malformed_xml OK 0.07
Test
    test_authorize_project OK 0.09
    test_authorize_token OK 0.10
    test_authorize_user OK 0.06
    test_bad_project OK 0.32
    test_bad_token OK 0.06
    test_bad_user_bad_key OK 0.06
    test_bad_user_good_key OK 0.07
    test_no_user OK 0.06
    test_not_existing_project OK 0.10
    test_token_expiry ...

Revision history for this message
Vish Ishaya (vishvananda) wrote :

Looks like we need a new mailmap entry?

Vish

1269. By Dan Prince

Added Mohammed Naser to Authors file.

Preview Diff

Empty