OpenStack Compute (nova)

Merge lp://staging/~berendt/nova/lp735298 into lp://staging/~hudson-openstack/nova/trunk

  1. lp735298
  2. Merge into trunk
Proposed by Christian Berendt
Status: Merged
Approved by: Rick Harris
Approved revision: 804
Merged at revision: 813
Proposed branch: lp://staging/~berendt/nova/lp735298
Merge into: lp://staging/~hudson-openstack/nova/trunk
Diff against target: 37 lines (+7/-6)
1 file modified
nova/virt/libvirt_conn.py (+7/-6)
To merge this branch: bzr merge lp://staging/~berendt/nova/lp735298
Reviewer Review Type Date Requested Status
Rick Harris (community) Approve
Jay Pipes (community) Approve
Devin Carlen (community) Approve
Kei Masumoto (community) Approve
Review via email: mp+53594@code.staging.launchpad.net

Commit message

fixes bug 735298: start of nova-compute not possible because of wrong xml paths to the //host/cpu section in "virsh capabilities", used in nova/virt/libvirt_conn.py

Description of the change

fixes bug 735298: start of nova-compute not possible because of wrong xml paths to the //host/cpu section in "virsh capabilities", used in nova/virt/libvirt_conn.py

To post a comment you must log in.
Revision history for this message
Kei Masumoto (masumotok) wrote :

I think this change is good. thank you!

review: Approve
Revision history for this message
Christian Berendt (berendt) wrote :

tested with bzr rev 802 using libvirt 0.8.8 on a system with 1 installed cpu package (4 cores). for the output of "virsh compabilities" of a system with 2 installed cpu packages (2 cores each one) please check bug 735298. i didn't test the patch on this system, but it should work there, too, because the object //host/cpu is unique in the output.

Revision history for this message
Devin Carlen (devcamcar) wrote :

lgtm

review: Approve
Revision history for this message
Jay Pipes (jaypipes) wrote :

lgtm.

review: Approve
Revision history for this message
Rick Harris (rconradharris) wrote :

lgtm

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

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

AccountsTest
    test_account_create OK
    test_account_delete OK
    test_account_update OK
    test_get_account OK
AdminAPITest
    test_admin_disabled OK
    test_admin_enabled OK
APITest
    test_exceptions_are_converted_to_faults OK
Test
    test_authorize_token OK
    test_authorize_user OK
    test_bad_token OK
    test_bad_user_bad_key OK
    test_bad_user_good_key OK
    test_no_user OK
    test_token_expiry OK
TestFunctional
    test_token_doesnotexist OK
    test_token_expiry OK
TestLimiter
    test_authorize_token OK
LimiterTest
    test_limiter_custom_max_limit OK
    test_limiter_limit_and_offset OK
    test_limiter_limit_medium OK
    test_limiter_limit_over_max OK
    test_limiter_limit_zero OK
    test_limiter_negative_limit OK
    test_limiter_negative_offset OK
    test_limiter_nothing OK
    test_limiter_offset_bad OK
    test_limiter_offset_blank OK
    test_limiter_offset_medium OK
    test_limiter_offset_over_max OK
    test_limiter_offset_zero OK
TestFaults
    test_fault_parts OK
    test_raise OK
    test_retry_header OK
FlavorsTest
    test_get_flavor_by_id OK
    test_get_flavor_list OK
GlanceImageServiceTest
    test_create OK
    test_create_and_show_non_existing_image OK
    test_delete OK
    test_update OK
ImageControllerWithGlanceServiceTest
    test_get_image_details OK
    test_get_image_index OK
LocalImageServiceTest
    test_create OK
    test_create_and_show_non_existing_image OK
    test_delete ...

Revision history for this message
Christian Berendt (berendt) wrote :

fixed pep8 issue, it should be possible to merge now without problems. sorry for the fleabite.

Revision history for this message
Rick Harris (rconradharris) wrote :

Thanks Christian. Re-approving.

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.