Merge pull request #1689 from mike-tutkowski/use_sf_python_sdk

Switched to the official SolidFire SDK for PythonSolidFire has recently released an official SDK for Python.

I have converted all of the SolidFire integration tests over to making use of this new SDK.

For testing, I re-ran each test and observed success.

https://pypi.python.org/pypi/solidfire-sdk-python/1.1.0.92

* pr/1689:
  Switched to the official SolidFire SDK for Python

Signed-off-by: Rajani Karuturi <rajani.karuturi@accelerite.com>

Author: karuturi

requirements.txt

@@ -19,3 +19,6 @@
 cloudmonkey
 
 # Marvin dependencies are installed via its bundle
+
+# Install the SolidFire SDK for Python
+solidfire-sdk-python

test/integration/plugins/solidfire/TestAddRemoveHosts.py

@@ -21,6 +21,8 @@
 import time
 import XenAPI
 
+from solidfire.factory import ElementFactory
+
 from util import sf_util
 
 # All tests inherit from cloudstackTestCase
@@ -37,8 +39,6 @@
 # utils - utility classes for common cleanup, external library wrappers, etc.
 from marvin.lib.utils import cleanup_resources
 
-from solidfire import solidfire_element_api as sf_api
-
 # Prerequisites:
 #  Only one zone
 #  Only one pod
@@ -59,12 +59,10 @@ class TestData:
     diskSize = "disksize"
     domainId = "domainId"
     hypervisor = "hypervisor"
-    login = "login"
     mvip = "mvip"
     name = "name"
     newHost = "newHost"
     newHostDisplayName = "newHostDisplayName"
-    osType = "ostype"
     password = "password"
     podId = "podid"
     port = "port"
@@ -89,7 +87,7 @@ def __init__(self):
         self.testdata = {
             TestData.solidFire: {
                 TestData.mvip: "192.168.139.112",
-                TestData.login: "admin",
+                TestData.username: "admin",
                 TestData.password: "admin",
                 TestData.port: 443,
                 TestData.url: "https://192.168.139.112:443"
@@ -170,7 +168,6 @@ def __init__(self):
                 "diskname": "testvolume2",
             },
             TestData.newHostDisplayName: "XenServer-6.5-3",
-            TestData.osType: "CentOS 5.6(64-bit) no GUI (XenServer)",
             TestData.zoneId: 1,
             TestData.clusterId: 1,
             TestData.domainId: 1,
@@ -186,7 +183,9 @@ class TestAddRemoveHosts(cloudstackTestCase):
     def setUpClass(cls):
         # Set up API client
         testclient = super(TestAddRemoveHosts, cls).getClsTestClient()
+
         cls.apiClient = testclient.getApiClient()
+        cls.configData = testclient.getParsedTestDataConfig()
         cls.dbConnection = testclient.getDbConnection()
 
         cls.testdata = TestData().testdata
@@ -203,12 +202,14 @@ def setUpClass(cls):
         cls.xen_session.xenapi.login_with_password(xenserver[TestData.username], xenserver[TestData.password])
 
         # Set up SolidFire connection
-        cls.sf_client = sf_api.SolidFireAPI(endpoint_dict=cls.testdata[TestData.solidFire])
+        solidfire = cls.testdata[TestData.solidFire]
+
+        cls.sfe = ElementFactory.create(solidfire[TestData.mvip], solidfire[TestData.username], solidfire[TestData.password])
 
         # Get Resources from Cloud Infrastructure
         cls.zone = get_zone(cls.apiClient, zone_id=cls.testdata[TestData.zoneId])
         cls.cluster = list_clusters(cls.apiClient)[0]
-        cls.template = get_template(cls.apiClient, cls.zone.id, cls.testdata[TestData.osType])
+        cls.template = get_template(cls.apiClient, cls.zone.id, cls.configData["ostype"])
         cls.domain = get_domain(cls.apiClient, cls.testdata[TestData.domainId])
 
         # Create test account
@@ -249,7 +250,7 @@ def tearDownClass(cls):
         try:
             cleanup_resources(cls.apiClient, cls._cleanup)
 
-            sf_util.purge_solidfire_volumes(cls.sf_client)
+            sf_util.purge_solidfire_volumes(cls.sfe)
         except Exception as e:
             logging.debug("Exception in tearDownClass(cls): %s" % e)
 
@@ -423,8 +424,8 @@ def test_add_remove_host_with_solidfire_plugin_4(self):
 
         self._perform_add_remove_host(primary_storage_2.id, sf_iscsi_name)
 
-    def _perform_add_remove_host(self, primary_storage_id, sf_iscsi_name):
-        xen_sr = self.xen_session.xenapi.SR.get_by_name_label(sf_iscsi_name)[0]
+    def _perform_add_remove_host(self, primary_storage_id, sr_name):
+        xen_sr = self.xen_session.xenapi.SR.get_by_name_label(sr_name)[0]
 
         pbds = self.xen_session.xenapi.SR.get_PBDs(xen_sr)
 
@@ -651,10 +652,10 @@ def _get_sf_vag_id(self, cluster_id, primary_storage_id):
         return sf_vag_id
 
     def _get_sf_vag(self, sf_vag_id):
-        return self.sf_client.list_volume_access_groups(sf_vag_id, 1)["volumeAccessGroups"][0]
+        return self.sfe.list_volume_access_groups(sf_vag_id, 1).volume_access_groups[0]
 
     def _get_sf_vag_initiators(self, sf_vag):
-        return sf_vag["initiators"]
+        return sf_vag.initiators
 
     def _verifyVag(self, host_iscsi_iqns, sf_vag_initiators):
         self.assertEqual(