You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2014/01/31 23:12:49 UTC

[2/9] git commit: ex_list_drives -> ex_list_user_drives.

ex_list_drives -> ex_list_user_drives.


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/7e3f74a4
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/7e3f74a4
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/7e3f74a4

Branch: refs/heads/trunk
Commit: 7e3f74a47d571292b0e08ecf575852ff17ae0c98
Parents: 73c62ff
Author: Tomaz Muraus <to...@apache.org>
Authored: Fri Jan 31 22:26:34 2014 +0100
Committer: Tomaz Muraus <to...@apache.org>
Committed: Fri Jan 31 22:26:34 2014 +0100

----------------------------------------------------------------------
 libcloud/compute/drivers/cloudsigma.py        |  6 +++---
 libcloud/test/compute/test_cloudsigma_v2_0.py | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/7e3f74a4/libcloud/compute/drivers/cloudsigma.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/cloudsigma.py b/libcloud/compute/drivers/cloudsigma.py
index 883de6c..6a9d0a0 100644
--- a/libcloud/compute/drivers/cloudsigma.py
+++ b/libcloud/compute/drivers/cloudsigma.py
@@ -1046,8 +1046,8 @@ class CloudSigma_2_0_NodeDriver(CloudSigmaNodeDriver):
         """
         Return a list of available pre-installed library drives.
 
-        Note: If you want to list all the available images and drives, use
-        :meth:`ex_list_drives` method.
+        Note: If you want to list all the available library drives, use 
+        :meth:`ex_list_library_drives` method.
         """
         response = self.connection.request(action='/libdrives/').object
         images = [self._to_image(data=item) for item in response['objects']]
@@ -1315,7 +1315,7 @@ class CloudSigma_2_0_NodeDriver(CloudSigmaNodeDriver):
 
     # Drive extension methods
 
-    def ex_list_drives(self):
+    def ex_list_user_drives(self):
         """
         Return a list of all the available user's drives.
 

http://git-wip-us.apache.org/repos/asf/libcloud/blob/7e3f74a4/libcloud/test/compute/test_cloudsigma_v2_0.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_cloudsigma_v2_0.py b/libcloud/test/compute/test_cloudsigma_v2_0.py
index 349858e..6dd2ffe 100644
--- a/libcloud/test/compute/test_cloudsigma_v2_0.py
+++ b/libcloud/test/compute/test_cloudsigma_v2_0.py
@@ -165,8 +165,8 @@ class CloudSigmaAPI20BaseTestCase(object):
         status = self.driver.ex_close_vnc_tunnel(node=node)
         self.assertTrue(status)
 
-    def test_ex_list_drives(self):
-        drives = self.driver.ex_list_drives()
+    def test_ex_list_user_drives(self):
+        drives = self.driver.ex_list_user_drives()
 
         drive = drives[0]
         self.assertEqual(drive.name, 'test node 2-drive')
@@ -185,14 +185,14 @@ class CloudSigmaAPI20BaseTestCase(object):
         self.assertEqual(drive.media, 'disk')
 
     def test_ex_clone_drive(self):
-        drive = self.driver.ex_list_drives()[0]
+        drive = self.driver.ex_list_user_drives()[0]
         cloned_drive = self.driver.ex_clone_drive(drive=drive,
                                                   name='cloned drive')
 
         self.assertEqual(cloned_drive.name, 'cloned drive')
 
     def test_ex_resize_drive(self):
-        drive = self.driver.ex_list_drives()[0]
+        drive = self.driver.ex_list_user_drives()[0]
 
         size = 1111 * 1024 * 1024
 
@@ -399,7 +399,7 @@ class CloudSigmaAPI20BaseTestCase(object):
         self.assertEqual(len(groups[0]), 11)
 
     def test_wait_for_drive_state_transition_timeout(self):
-        drive = self.driver.ex_list_drives()[0]
+        drive = self.driver.ex_list_user_drives()[0]
         state = 'timeout'
 
         expected_msg = 'Timed out while waiting for drive transition'
@@ -409,7 +409,7 @@ class CloudSigmaAPI20BaseTestCase(object):
                                 timeout=0.5)
 
     def test_wait_for_drive_state_transition_success(self):
-        drive = self.driver.ex_list_drives()[0]
+        drive = self.driver.ex_list_user_drives()[0]
         state = 'unmounted'
 
         drive = self.driver._wait_for_drive_state_transition(drive=drive,