From 23776e5b2bdb73df10be590b589c34788c28023a Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh@jk0.org>
Date: Wed, 30 Mar 2011 12:28:09 -0500
Subject: Avoid hard dependencies

---
 nova/virt/vmwareapi_conn.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/nova/virt/vmwareapi_conn.py b/nova/virt/vmwareapi_conn.py
index 87c3fa299..34d29a4e5 100644
--- a/nova/virt/vmwareapi_conn.py
+++ b/nova/virt/vmwareapi_conn.py
@@ -43,10 +43,12 @@ from nova import flags
 from nova import log as logging
 from nova import utils
 from nova.virt.vmwareapi import error_util
-from nova.virt.vmwareapi import vim
 from nova.virt.vmwareapi import vim_util
 from nova.virt.vmwareapi.vmops import VMWareVMOps
 
+
+vim = None
+
 LOG = logging.getLogger("nova.virt.vmwareapi_conn")
 
 FLAGS = flags.FLAGS
@@ -78,6 +80,13 @@ flags.DEFINE_string('vmwareapi_vlan_interface',
 TIME_BETWEEN_API_CALL_RETRIES = 2.0
 
 
+def get_imported_vim():
+    """Avoid any hard dependencies."""
+    global vim
+    if vim is None:
+        vim = __import__("nova.virt.vmwareapi.vim")
+
+
 class Failure(Exception):
     """Base Exception class for handling task failures."""
 
@@ -109,7 +118,7 @@ class VMWareESXConnection(object):
     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):
@@ -204,6 +213,7 @@ class VMWareAPISession(object):
         self._session_id = None
         self.vim = None
         self._create_session()
+        get_imported_vim()
 
     def _get_vim_object(self):
         """Create the VIM Object instance."""
-- 
cgit 


From be4be55bf03c907f46e76fffe3457743915d734a Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh@jk0.org>
Date: Wed, 30 Mar 2011 13:50:02 -0500
Subject: Handle in vim.py

---
 nova/virt/vmwareapi/vim.py  | 15 +++++++++++----
 nova/virt/vmwareapi_conn.py | 10 ----------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/nova/virt/vmwareapi/vim.py b/nova/virt/vmwareapi/vim.py
index ba14f1512..1c850595d 100644
--- a/nova/virt/vmwareapi/vim.py
+++ b/nova/virt/vmwareapi/vim.py
@@ -21,10 +21,14 @@ Classes for making VMware VI SOAP calls.
 
 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 @@ class Vim:
         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
diff --git a/nova/virt/vmwareapi_conn.py b/nova/virt/vmwareapi_conn.py
index 34d29a4e5..b909e659d 100644
--- a/nova/virt/vmwareapi_conn.py
+++ b/nova/virt/vmwareapi_conn.py
@@ -47,8 +47,6 @@ from nova.virt.vmwareapi import vim_util
 from nova.virt.vmwareapi.vmops import VMWareVMOps
 
 
-vim = None
-
 LOG = logging.getLogger("nova.virt.vmwareapi_conn")
 
 FLAGS = flags.FLAGS
@@ -80,13 +78,6 @@ flags.DEFINE_string('vmwareapi_vlan_interface',
 TIME_BETWEEN_API_CALL_RETRIES = 2.0
 
 
-def get_imported_vim():
-    """Avoid any hard dependencies."""
-    global vim
-    if vim is None:
-        vim = __import__("nova.virt.vmwareapi.vim")
-
-
 class Failure(Exception):
     """Base Exception class for handling task failures."""
 
@@ -213,7 +204,6 @@ class VMWareAPISession(object):
         self._session_id = None
         self.vim = None
         self._create_session()
-        get_imported_vim()
 
     def _get_vim_object(self):
         """Create the VIM Object instance."""
-- 
cgit 


From 2eadc55dbd66af7b5adb3c21fe9cc91cd04b0f8b Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh@jk0.org>
Date: Wed, 30 Mar 2011 13:56:02 -0500
Subject: Whoops

---
 nova/virt/vmwareapi_conn.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nova/virt/vmwareapi_conn.py b/nova/virt/vmwareapi_conn.py
index b909e659d..20c1b2b45 100644
--- a/nova/virt/vmwareapi_conn.py
+++ b/nova/virt/vmwareapi_conn.py
@@ -43,6 +43,7 @@ from nova import flags
 from nova import log as logging
 from nova import utils
 from nova.virt.vmwareapi import error_util
+from nova.virt.vmwareapi import vim
 from nova.virt.vmwareapi import vim_util
 from nova.virt.vmwareapi.vmops import VMWareVMOps
 
-- 
cgit