OpenStack Compute (nova)

Merge lp:~vishvananda/nova/lp758810 into lp:~hudson-openstack/nova/trunk

  1. lp758810
  2. Merge into trunk
Proposed by Vish Ishaya
Status: Merged
Approved by: Devin Carlen
Approved revision: 982
Merged at revision: 983
Proposed branch: lp:~vishvananda/nova/lp758810
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 25 lines (+3/-1)
1 file modified
nova/virt/vmwareapi_conn.py (+3/-1)
To merge this branch: bzr merge lp:~vishvananda/nova/lp758810
Reviewer Review Type Date Requested Status
Devin Carlen (community) Approve
Jay Pipes (community) Approve
termie (community) Approve
Review via email: mp+57401@code.launchpad.net

Description of the change

Fixes VMware Connection to inherit from ComputeDriver

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

lgtm

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

coolio.

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

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/virt/vmwareapi_conn.py'
2--- nova/virt/vmwareapi_conn.py 2011-03-30 18:56:02 +0000
3+++ nova/virt/vmwareapi_conn.py 2011-04-12 21:46:28 +0000
4@@ -42,6 +42,7 @@
5 from nova import flags
6 from nova import log as logging
7 from nova import utils
8+from nova.virt import driver
9 from nova.virt.vmwareapi import error_util
10 from nova.virt.vmwareapi import vim
11 from nova.virt.vmwareapi import vim_util
12@@ -104,11 +105,12 @@
13 api_retry_count)
14
15
16-class VMWareESXConnection(object):
17+class VMWareESXConnection(driver.ComputeDriver):
18 """The ESX host connection object."""
19
20 def __init__(self, host_ip, host_username, host_password,
21 api_retry_count, scheme="https"):
22+ super(VMWareESXConnection, self).__init__()
23 session = VMWareAPISession(host_ip, host_username, host_password,
24 api_retry_count, scheme=scheme)
25 self._vmops = VMWareVMOps(session)