Merge lp:~vishvananda/nova/lp758810 into lp:~hudson-openstack/nova/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
=== modified file 'nova/virt/vmwareapi_conn.py'
--- nova/virt/vmwareapi_conn.py 2011-03-30 18:56:02 +0000
+++ nova/virt/vmwareapi_conn.py 2011-04-12 21:46:28 +0000
@@ -42,6 +42,7 @@
42from nova import flags42from nova import flags
43from nova import log as logging43from nova import log as logging
44from nova import utils44from nova import utils
45from nova.virt import driver
45from nova.virt.vmwareapi import error_util46from nova.virt.vmwareapi import error_util
46from nova.virt.vmwareapi import vim47from nova.virt.vmwareapi import vim
47from nova.virt.vmwareapi import vim_util48from nova.virt.vmwareapi import vim_util
@@ -104,11 +105,12 @@
104 api_retry_count)105 api_retry_count)
105106
106107
107class VMWareESXConnection(object):108class VMWareESXConnection(driver.ComputeDriver):
108 """The ESX host connection object."""109 """The ESX host connection object."""
109110
110 def __init__(self, host_ip, host_username, host_password,111 def __init__(self, host_ip, host_username, host_password,
111 api_retry_count, scheme="https"):112 api_retry_count, scheme="https"):
113 super(VMWareESXConnection, self).__init__()
112 session = VMWareAPISession(host_ip, host_username, host_password,114 session = VMWareAPISession(host_ip, host_username, host_password,
113 api_retry_count, scheme=scheme)115 api_retry_count, scheme=scheme)
114 self._vmops = VMWareVMOps(session)116 self._vmops = VMWareVMOps(session)