Merge lp:~jk0/nova/lp744833 into lp:~hudson-openstack/nova/trunk

[Josh Kearney]

Avoid any hard dependencies in nova.virt.vmwareapi.vim.

[Rick Clark (dendrobates)]

lgtm

review: Approve

[Brian Lamar (blamar)]

I feel like this should be headed off at the vim.py level where suds is actually used. Maybe it's just me, but I'd rather:

try:
    import suds
except ImportError:
    suds = None

and then check in the Vim class that suds is not None?

[Josh Kearney (jk0)]

> I feel like this should be headed off at the vim.py level where suds is
> actually used. Maybe it's just me, but I'd rather:
>
> try:
> import suds
> except ImportError:
> suds = None
>
> and then check in the Vim class that suds is not None?

I actually started off doing it that way, but the problem is that there are a half-dozen or so other imports from suds. All of the import try-excepts felt very dirty.

This way avoids almost all of the refactoring that would otherwise have to be done (which I am a fan of).

[termie (termie)]

I agree with brian on this one, I think this is the wrong place to address the issue

review: Needs Fixing

[lp:~jk0/nova/lp744833]

923. By Josh Kearney on 2011-03-30

Handle in vim.py

924. By Josh Kearney on 2011-03-30

Whoops

[termie (termie)]

while technically this should be importing modules not classes, i'll let that slide so you don't have to go change their entire file.

lgtm

review: Approve

=== modified file 'nova/virt/vmwareapi/vim.py'
--- nova/virt/vmwareapi/vim.py	2011-03-24 16:38:31 +0000
+++ nova/virt/vmwareapi/vim.py	2011-03-30 18:58:35 +0000
@@ -21,10 +21,14 @@
 
 import httplib
 
-from suds import WebFault
-from suds.client import Client
-from suds.plugin import MessagePlugin
-from suds.sudsobject import Property
+try:
+    suds = True
+    from suds import WebFault
+    from suds.client import Client
+    from suds.plugin import MessagePlugin
+    from suds.sudsobject import Property
+except ImportError:
+    suds = False
 
 from nova import flags
 from nova.virt.vmwareapi import error_util
@@ -75,6 +79,9 @@
         protocol: http or https
         host    : ESX IPAddress[:port] or ESX Hostname[:port]
         """
+        if not suds:
+            raise Exception(_("Unable to import suds."))
+
         self._protocol = protocol
         self._host_name = host
         wsdl_url = FLAGS.vmwareapi_wsdl_loc

=== modified file 'nova/virt/vmwareapi_conn.py'
--- nova/virt/vmwareapi_conn.py	2011-03-24 16:38:31 +0000
+++ nova/virt/vmwareapi_conn.py	2011-03-30 18:58:35 +0000
@@ -47,6 +47,7 @@
 from nova.virt.vmwareapi import vim_util
 from nova.virt.vmwareapi.vmops import VMWareVMOps
 
+
 LOG = logging.getLogger("nova.virt.vmwareapi_conn")
 
 FLAGS = flags.FLAGS
@@ -109,7 +110,7 @@
     def __init__(self, host_ip, host_username, host_password,
                  api_retry_count, scheme="https"):
         session = VMWareAPISession(host_ip, host_username, host_password,
-                 api_retry_count, scheme=scheme)
+                                   api_retry_count, scheme=scheme)
         self._vmops = VMWareVMOps(session)
 
     def init_host(self, host):