From 5d71e187dc6eddab19ecdc0feb97e41263e09a84 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Thu, 31 Mar 2011 17:19:59 -0400
Subject: Hopefully absolved us of the suds issue?

---
 nova/virt/vmwareapi/vim.py | 47 ++++++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/nova/virt/vmwareapi/vim.py b/nova/virt/vmwareapi/vim.py
index 1c850595d..159e16a80 100644
--- a/nova/virt/vmwareapi/vim.py
+++ b/nova/virt/vmwareapi/vim.py
@@ -22,13 +22,9 @@ Classes for making VMware VI SOAP calls.
 import httplib
 
 try:
-    suds = True
-    from suds import WebFault
-    from suds.client import Client
-    from suds.plugin import MessagePlugin
-    from suds.sudsobject import Property
+    import suds
 except ImportError:
-    suds = False
+    suds = None
 
 from nova import flags
 from nova.virt.vmwareapi import error_util
@@ -46,24 +42,25 @@ flags.DEFINE_string('vmwareapi_wsdl_loc',
                    'Refer readme-vmware to setup')
 
 
-class VIMMessagePlugin(MessagePlugin):
+if suds:
+    class VIMMessagePlugin(suds.plugin.MessagePlugin):
 
-    def addAttributeForValue(self, node):
-        # suds does not handle AnyType properly.
-        # VI SDK requires type attribute to be set when AnyType is used
-        if node.name == 'value':
-            node.set('xsi:type', 'xsd:string')
+        def addAttributeForValue(self, node):
+            # suds does not handle AnyType properly.
+            # VI SDK requires type attribute to be set when AnyType is used
+            if node.name == 'value':
+                node.set('xsi:type', 'xsd:string')
 
-    def marshalled(self, context):
-        """suds will send the specified soap envelope.
-        Provides the plugin with the opportunity to prune empty
-        nodes and fixup nodes before sending it to the server.
-        """
-        # suds builds the entire request object based on the wsdl schema.
-        # VI SDK throws server errors if optional SOAP nodes are sent without
-        # values, e.g. <test/> as opposed to <test>test</test>
-        context.envelope.prune()
-        context.envelope.walk(self.addAttributeForValue)
+        def marshalled(self, context):
+            """suds will send the specified soap envelope.
+            Provides the plugin with the opportunity to prune empty
+            nodes and fixup nodes before sending it to the server.
+            """
+            # suds builds the entire request object based on the wsdl schema.
+            # VI SDK throws server errors if optional SOAP nodes are sent
+            # without values, e.g. <test/> as opposed to <test>test</test>
+            context.envelope.prune()
+            context.envelope.walk(self.addAttributeForValue)
 
 
 class Vim:
@@ -91,7 +88,7 @@ class Vim:
         #wsdl_url = '%s://%s/sdk/vimService.wsdl' % (self._protocol,
         #        self._host_name)
         url = '%s://%s/sdk' % (self._protocol, self._host_name)
-        self.client = Client(wsdl_url, location=url,
+        self.client = suds.client.Client(wsdl_url, location=url,
                             plugins=[VIMMessagePlugin()])
         self._service_content = \
                 self.RetrieveServiceContent("ServiceInstance")
@@ -134,7 +131,7 @@ class Vim:
                 # check of the SOAP response
                 except error_util.VimFaultException, excep:
                     raise
-                except WebFault, excep:
+                except suds.WebFault, excep:
                     doc = excep.document
                     detail = doc.childAtPath("/Envelope/Body/Fault/detail")
                     fault_list = []
@@ -170,7 +167,7 @@ class Vim:
         """Builds the request managed object."""
         # Request Managed Object Builder
         if type(managed_object) == type(""):
-            mo = Property(managed_object)
+            mo = suds.sudsobject.Property(managed_object)
             mo._type = managed_object
         else:
             mo = managed_object
-- 
cgit