Revision 94e252a3
| b/lib/cmdlib/instance_storage.py | ||
|---|---|---|
| 52 | 52 |
constants.DT_PLAIN: "", |
| 53 | 53 |
constants.DT_RBD: ".rbd", |
| 54 | 54 |
constants.DT_EXT: ".ext", |
| 55 |
constants.DT_FILE: ".file", |
|
| 56 |
constants.DT_SHARED_FILE: ".sharedfile", |
|
| 55 | 57 |
} |
| 56 | 58 |
|
| 57 | 59 |
|
| ... | ... | |
| 464 | 466 |
elif template_name in (constants.DT_FILE, constants.DT_SHARED_FILE): |
| 465 | 467 |
logical_id_fn = \ |
| 466 | 468 |
lambda _, disk_index, disk: (file_driver, |
| 467 |
"%s/disk%d" % (file_storage_dir,
|
|
| 468 |
disk_index))
|
|
| 469 |
"%s/%s" % (file_storage_dir,
|
|
| 470 |
names[idx]))
|
|
| 469 | 471 |
elif template_name == constants.DT_BLOCK: |
| 470 | 472 |
logical_id_fn = \ |
| 471 | 473 |
lambda idx, disk_index, disk: (constants.BLOCKDEV_DRIVER_MANUAL, |
| b/test/py/ganeti.cmdlib_unittest.py | ||
|---|---|---|
| 23 | 23 |
|
| 24 | 24 |
|
| 25 | 25 |
import os |
| 26 |
import re |
|
| 26 | 27 |
import unittest |
| 27 | 28 |
import tempfile |
| 28 | 29 |
import shutil |
| ... | ... | |
| 1325 | 1326 |
disk_template, file_storage_dir="/tmp", |
| 1326 | 1327 |
file_driver=constants.FD_BLKTAP) |
| 1327 | 1328 |
|
| 1328 |
self.assertEqual(map(operator.attrgetter("logical_id"), result), [
|
|
| 1329 |
(constants.FD_BLKTAP, "/tmp/disk2"), |
|
| 1330 |
(constants.FD_BLKTAP, "/tmp/disk3"), |
|
| 1331 |
(constants.FD_BLKTAP, "/tmp/disk4"), |
|
| 1332 |
]) |
|
| 1329 |
for (idx, disk) in enumerate(result): |
|
| 1330 |
(file_driver, file_storage_dir) = disk.logical_id |
|
| 1331 |
dir_fmt = r"^/tmp/.*\.%s\.disk%d$" % (disk_template, idx + 2) |
|
| 1332 |
self.assertEqual(file_driver, constants.FD_BLKTAP) |
|
| 1333 |
# FIXME: use assertIsNotNone when py 2.7 is minimum supported version |
|
| 1334 |
self.assertNotEqual(re.match(dir_fmt, file_storage_dir), None) |
|
| 1333 | 1335 |
|
| 1334 | 1336 |
def testBlock(self): |
| 1335 | 1337 |
disk_info = [{
|
Also available in: Unified diff