Merge lp://qastaging/~cbehrens/nova/lp855115 into lp://qastaging/~hudson-openstack/nova/trunk

Proposed by Chris Behrens
Status: Merged
Approved by: Vish Ishaya
Approved revision: 1546
Merged at revision: 1612
Proposed branch: lp://qastaging/~cbehrens/nova/lp855115
Merge into: lp://qastaging/~hudson-openstack/nova/trunk
Diff against target: 175 lines (+68/-12)
5 files modified
nova/api/ec2/__init__.py (+4/-0)
nova/api/openstack/contrib/floating_ips.py (+6/-1)
nova/db/sqlalchemy/api.py (+11/-10)
nova/tests/api/openstack/contrib/test_floating_ips.py (+1/-1)
nova/tests/test_network.py (+46/-0)
To merge this branch: bzr merge lp://qastaging/~cbehrens/nova/lp855115
Reviewer Review Type Date Requested Status
Vish Ishaya (community) Approve
Paul Voccio (community) Approve
Kevin L. Mitchell (community) Approve
Review via email: mp+76475@code.qastaging.launchpad.net

Description of the change

Fixes lp:855115 -- issue with disassociating floating ips.

To post a comment you must log in.
Revision history for this message
Kevin L. Mitchell (klmitch) wrote :

Looks OK to me...

review: Approve
Revision history for this message
Paul Voccio (pvo) wrote :

lgtm

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

awesome, lgtm

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

The attempt to merge lp:~cbehrens/nova/lp855115 into lp:nova failed. Below is the output from the failed tests.

CloudTestCase
    test_ajax_console OK 1.75
    test_allocate_address OK 0.26
    test_associate_disassociate_address OK 1.60
    test_authorize_revoke_security_group_ingress_by_id OK 0.33
    test_authorize_security_group_fail_missing_source_group OK 0.25
    test_authorize_security_group_ingress OK 0.26
    test_authorize_security_group_ingress_already_exists OK 0.32
    test_authorize_security_group_ingress_ip_permissions_groups OK 0.32
    test_authorize_security_group_ingress_ip_permissions_ip_rangesOK 0.27
    test_authorize_security_group_ingress_missing_group_name_or_idOK 0.18
    test_authorize_security_group_ingress_missing_protocol_paramsOK 0.39
    test_console_output OK 1.23
    test_create_delete_security_group OK 0.26
    test_create_image OK 4.05
    test_create_snapshot OK 0.44
    test_create_volume_from_snapshot OK 0.46
    test_delete_key_pair OK 0.39
    test_delete_security_group_by_id OK 0.23
    test_delete_security_group_no_params OK 0.20
    test_delete_security_group_with_bad_group_id OK 0.22
    test_delete_security_group_with_bad_name OK 0.22
    test_delete_snapshot OK 0.43
    test_deregister_image OK 0.19
    test_deregister_image_wrong_container_type OK 0.21
    test_describe_addresses OK 0.49
    test_describe_availability_zones OK 0.23
    test_describe_image_attribute OK 0.18
    test_describe_image_attribute_block_device_mapping OK 0.19
    test_describe_image_attribute_root_device_name OK 0.18
    test_describe_image_mapping OK 0.19
    test_describe_images OK 0.19
    test_describe_instance_attribute OK 0.18
    test_describe_instances OK 0.35
    test_describe_instances_bdm OK 1.39
    test_describe_instances_deleted OK 0.22
    test_describe_key_pairs OK 0.57
    test_describe_regions OK 0.19
    test_describe_security_group_ingress_groups OK 0.43
    test_describe_security_groups OK 0.27
    test_describe_security_groups_by_id OK 0.32
    test_describe_snapshots OK 0.23
    test_describe_volumes OK 0.25
  ...

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.