OpenStack Compute (nova)

Merge lp:~zulcss/nova/nova-libvirt-non-x86 into lp:~hudson-openstack/nova/trunk

  1. nova-libvirt-non-x86
  2. Merge into trunk
Proposed by Chuck Short
Status: Merged
Approved by: Dan Prince
Approved revision: 1511
Merged at revision: 1555
Proposed branch: lp:~zulcss/nova/nova-libvirt-non-x86
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
nova/virt/libvirt/connection.py (+1/-1)
To merge this branch: bzr merge lp:~zulcss/nova/nova-libvirt-non-x86
Reviewer Review Type Date Requested Status
Dan Prince (community) Approve
Thierry Carrez (community) Needs Fixing
Devin Carlen (community) Approve
Review via email: mp+74634@code.launchpad.net

Description of the change

Some arches dont have dmidecode, check to see if libvirt is capable of running rather getInfo of the arch its running on.

To post a comment you must log in.
Revision history for this message
Devin Carlen (devcamcar) wrote :

simple enough

review: Approve
Revision history for this message
Thierry Carrez (ttx) wrote :

You certainly meant getCapabilities ?

review: Needs Fixing
lp:~zulcss/nova/nova-libvirt-non-x86 updated
1510. By Chuck Short

Fix spelling mistake

1511. By Chuck Short

Merge trunk

Revision history for this message
Chuck Short (zulcss) wrote :

Doh fixed.

Revision history for this message
Dan Prince (dan-prince) wrote :

Avoiding the use of getInfo seems fine. Thierry's concerns were addressed. Approving...

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/virt/libvirt/connection.py'
2--- nova/virt/libvirt/connection.py 2011-09-09 15:59:02 +0000
3+++ nova/virt/libvirt/connection.py 2011-09-10 00:50:29 +0000
4@@ -196,7 +196,7 @@
5
6 def _test_connection(self):
7 try:
8- self._wrapped_conn.getInfo()
9+ self._wrapped_conn.getCapabilities()
10 return True
11 except libvirt.libvirtError as e:
12 if e.get_error_code() == libvirt.VIR_ERR_SYSTEM_ERROR and \