Renamining space reporting for file storage

Before being integrated, the function for space reporting
for file storage is renamed to a more expressive name.

Signed-off-by: Helga Velroyen <helgav@google.com>
Reviewed-by: Thomas Thrainer <thomasth@google.com>

diff --git a/lib/storage/filestorage.py b/lib/storage/filestorage.py
index 3e64018..9237300 100644 (file)
--- a/lib/storage/filestorage.py
+++ b/lib/storage/filestorage.py
@@ -28,7 +28,7 @@ import os
 from ganeti import errors
 
 
-def GetSpaceInfo(path):
+def GetFileStorageSpaceInfo(path):
   """Retrieves the free and total space of the device where the file is
      located.
 

diff --git a/test/py/ganeti.storage.filestorage_unittest.py b/test/py/ganeti.storage.filestorage_unittest.py
index 53e1398..f229b56 100755 (executable)
--- a/test/py/ganeti.storage.filestorage_unittest.py
+++ b/test/py/ganeti.storage.filestorage_unittest.py
@@ -33,17 +33,17 @@ import testutils
 class TestFileStorageSpaceInfo(unittest.TestCase):
 
   def testSpaceInfoPathInvalid(self):
-    """Tests that an error is raised when the given file is not existing.
+    """Tests that an error is raised when the given path is not existing.
 
     """
-    self.assertRaises(errors.CommandError, filestorage.GetSpaceInfo,
+    self.assertRaises(errors.CommandError, filestorage.GetFileStorageSpaceInfo,
                       "/path/does/not/exist/")
 
   def testSpaceInfoPathValid(self):
-    """Tests that the 'df' command is run if the file is valid.
+    """Smoke test run on a directory that exists for sure.
 
     """
-    info = filestorage.GetSpaceInfo("/")
+    info = filestorage.GetFileStorageSpaceInfo("/")
 
 
 if __name__ == "__main__":