Revision 763ad5be test/py/ganeti.cmdlib_unittest.py
b/test/py/ganeti.cmdlib_unittest.py | ||
---|---|---|
36 | 36 |
from ganeti.cmdlib import cluster |
37 | 37 |
from ganeti.cmdlib import group |
38 | 38 |
from ganeti.cmdlib import instance |
39 |
from ganeti.cmdlib import instance_storage |
|
40 |
from ganeti.cmdlib import instance_utils |
|
39 | 41 |
from ganeti.cmdlib import common |
40 | 42 |
from ganeti.cmdlib import query |
41 | 43 |
from ganeti import opcodes |
... | ... | |
888 | 890 |
self.recorder = _CallRecorder(return_value=[]) |
889 | 891 |
|
890 | 892 |
def testSameGroup(self): |
891 |
ret = instance._ComputeIPolicyNodeViolation(NotImplemented, |
|
892 |
NotImplemented, |
|
893 |
"foo", "foo", NotImplemented, |
|
894 |
_compute_fn=self.recorder) |
|
893 |
ret = instance_utils._ComputeIPolicyNodeViolation( |
|
894 |
NotImplemented, |
|
895 |
NotImplemented, |
|
896 |
"foo", "foo", NotImplemented, |
|
897 |
_compute_fn=self.recorder) |
|
895 | 898 |
self.assertFalse(self.recorder.called) |
896 | 899 |
self.assertEqual(ret, []) |
897 | 900 |
|
898 | 901 |
def testDifferentGroup(self): |
899 |
ret = instance._ComputeIPolicyNodeViolation(NotImplemented, |
|
900 |
NotImplemented, |
|
901 |
"foo", "bar", NotImplemented, |
|
902 |
_compute_fn=self.recorder) |
|
902 |
ret = instance_utils._ComputeIPolicyNodeViolation( |
|
903 |
NotImplemented, |
|
904 |
NotImplemented, |
|
905 |
"foo", "bar", NotImplemented, |
|
906 |
_compute_fn=self.recorder) |
|
903 | 907 |
self.assertTrue(self.recorder.called) |
904 | 908 |
self.assertEqual(ret, []) |
905 | 909 |
|
... | ... | |
1605 | 1609 |
def testLessThanOneMebibyte(self): |
1606 | 1610 |
for i in [1, 2, 7, 512, 1000, 1023]: |
1607 | 1611 |
lu = _FakeLU() |
1608 |
result = instance._DiskSizeInBytesToMebibytes(lu, i) |
|
1612 |
result = instance_storage._DiskSizeInBytesToMebibytes(lu, i)
|
|
1609 | 1613 |
self.assertEqual(result, 1) |
1610 | 1614 |
self.assertEqual(len(lu.warning_log), 1) |
1611 | 1615 |
self.assertEqual(len(lu.warning_log[0]), 2) |
... | ... | |
1615 | 1619 |
def testEven(self): |
1616 | 1620 |
for i in [1, 2, 7, 512, 1000, 1023]: |
1617 | 1621 |
lu = _FakeLU() |
1618 |
result = instance._DiskSizeInBytesToMebibytes(lu, i * 1024 * 1024) |
|
1622 |
result = instance_storage._DiskSizeInBytesToMebibytes(lu, |
|
1623 |
i * 1024 * 1024) |
|
1619 | 1624 |
self.assertEqual(result, i) |
1620 | 1625 |
self.assertFalse(lu.warning_log) |
1621 | 1626 |
|
... | ... | |
1624 | 1629 |
for j in [1, 2, 486, 326, 986, 1023]: |
1625 | 1630 |
lu = _FakeLU() |
1626 | 1631 |
size = (1024 * 1024 * i) + j |
1627 |
result = instance._DiskSizeInBytesToMebibytes(lu, size) |
|
1632 |
result = instance_storage._DiskSizeInBytesToMebibytes(lu, size)
|
|
1628 | 1633 |
self.assertEqual(result, i + 1, msg="Amount was not rounded up") |
1629 | 1634 |
self.assertEqual(len(lu.warning_log), 1) |
1630 | 1635 |
self.assertEqual(len(lu.warning_log[0]), 2) |
Also available in: Unified diff