Handle in vim.py

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."""