commit 9854d5b38a059446ffca6dd67ff5f434518d872f
author Matthew Treinish <treinish@linux.vnet.ibm.com> Thu Sep 20 10:22:13 2012 -0400
committer Matthew Treinish <treinish@linux.vnet.ibm.com> Tue Sep 25 15:28:27 2012 -0400
tree 65a991a054d2d40c16463bf555900f3cf84b4c91
parent 494d9388f54ed3dee6d4d0baff427c3ad77cc676

Add XML support to the cinder client

Change-Id: I8720b8ae0f28c1eaaf91ff16feee994ddb5d092c
Signed-off-by: Matthew Treinish <treinish@linux.vnet.ibm.com>

tempest/openstack.py

diff --git a/tempest/openstack.py b/tempest/openstack.py
index ec0c257..89b7718 100644
--- a/tempest/openstack.py
+++ b/tempest/openstack.py
@@ -45,7 +45,8 @@
 from tempest.services.nova.xml.servers_client import ServersClientXML
 from tempest.services.nova.xml.volumes_extensions_client \
 import VolumesExtensionsClientXML
-from tempest.services.volume.json.volumes_client import VolumesClient
+from tempest.services.volume.json.volumes_client import VolumesClientJSON
+from tempest.services.volume.xml.volumes_client import VolumesClientXML
 
 LOG = logging.getLogger(__name__)
 
@@ -89,6 +90,11 @@
     "xml": FloatingIPsClientXML,
 }
 
+VOLUMES_CLIENTS = {
+    "json": VolumesClientJSON,
+    "xml": VolumesClientXML,
+}
+
 
 class Manager(object):
 
@@ -141,13 +147,13 @@
             self.volumes_extensions_client = \
                     VOLUMES_EXTENSIONS_CLIENTS[interface](*client_args)
             self.floating_ips_client = FLOAT_CLIENTS[interface](*client_args)
+            self.volumes_client = VOLUMES_CLIENTS[interface](*client_args)
         except KeyError:
             msg = "Unsupported interface type `%s'" % interface
             raise exceptions.InvalidConfiguration(msg)
         self.security_groups_client = SecurityGroupsClient(*client_args)
         self.console_outputs_client = ConsoleOutputsClient(*client_args)
         self.network_client = NetworkClient(*client_args)
-        self.volumes_client = VolumesClient(*client_args)
 
 
 class AltManager(Manager):