Fixup node disk free/total queries

[ganeti-local] / test / ganeti.backend_unittest.py

diff --git a/test/ganeti.backend_unittest.py b/test/ganeti.backend_unittest.py
index efef4ef..ff9a33c 100755 (executable)
--- a/test/ganeti.backend_unittest.py
+++ b/test/ganeti.backend_unittest.py
@@ -30,6 +30,7 @@ import unittest
 from ganeti import utils
 from ganeti import constants
 from ganeti import backend
+from ganeti import netutils
 
 import testutils
 
@@ -73,7 +74,8 @@ class TestX509Certificates(unittest.TestCase):
 class TestNodeVerify(testutils.GanetiTestCase):
   def testMasterIPLocalhost(self):
     # this a real functional test, but requires localhost to be reachable
-    local_data = (utils.HostInfo().name, constants.IP4_ADDRESS_LOCALHOST)
+    local_data = (netutils.Hostname.GetSysName(),
+                  constants.IP4_ADDRESS_LOCALHOST)
     result = backend.VerifyNode({constants.NV_MASTERIP: local_data}, None)
     self.failUnless(constants.NV_MASTERIP in result,
                     "Master IP data not returned")
@@ -81,15 +83,15 @@ class TestNodeVerify(testutils.GanetiTestCase):
 
   def testMasterIPUnreachable(self):
     # Network 192.0.2.0/24 is reserved for test/documentation as per
-    # RFC 5735
+    # RFC 5737
     bad_data =  ("master.example.com", "192.0.2.1")
     # we just test that whatever TcpPing returns, VerifyNode returns too
-    utils.TcpPing = lambda a, b, source=None: False
+    netutils.TcpPing = lambda a, b, source=None: False
     result = backend.VerifyNode({constants.NV_MASTERIP: bad_data}, None)
     self.failUnless(constants.NV_MASTERIP in result,
                     "Master IP data not returned")
     self.failIf(result[constants.NV_MASTERIP],
-                "Result from utils.TcpPing corrupted")
+                "Result from netutils.TcpPing corrupted")
 
 
 if __name__ == "__main__":