Revision 22b7f6f8 test/py/ganeti.config_unittest.py
| b/test/py/ganeti.config_unittest.py | ||
|---|---|---|
| 24 | 24 |
|
| 25 | 25 |
import unittest |
| 26 | 26 |
import os |
| 27 |
import time |
|
| 28 | 27 |
import tempfile |
| 29 |
import os.path |
|
| 30 |
import socket |
|
| 31 | 28 |
import operator |
| 32 |
import itertools |
|
| 33 | 29 |
|
| 34 | 30 |
from ganeti import bootstrap |
| 35 | 31 |
from ganeti import config |
| ... | ... | |
| 39 | 35 |
from ganeti import utils |
| 40 | 36 |
from ganeti import netutils |
| 41 | 37 |
from ganeti import compat |
| 42 |
from ganeti import cmdlib
|
|
| 38 |
from ganeti.cmdlib import instance
|
|
| 43 | 39 |
|
| 44 | 40 |
from ganeti.config import TemporaryReservationManager |
| 45 | 41 |
|
| ... | ... | |
| 614 | 610 |
def testNoError(self): |
| 615 | 611 |
disks = self._MakeDisks(["disk/0", "disk/1"]) |
| 616 | 612 |
self.assertEqual(config._CheckInstanceDiskIvNames(disks), []) |
| 617 |
cmdlib._UpdateIvNames(0, disks)
|
|
| 613 |
instance._UpdateIvNames(0, disks)
|
|
| 618 | 614 |
self.assertEqual(config._CheckInstanceDiskIvNames(disks), []) |
| 619 | 615 |
|
| 620 | 616 |
def testWrongNames(self): |
| ... | ... | |
| 625 | 621 |
]) |
| 626 | 622 |
|
| 627 | 623 |
# Fix names |
| 628 |
cmdlib._UpdateIvNames(0, disks)
|
|
| 624 |
instance._UpdateIvNames(0, disks)
|
|
| 629 | 625 |
self.assertEqual(config._CheckInstanceDiskIvNames(disks), []) |
| 630 | 626 |
|
| 631 | 627 |
|
Also available in: Unified diff