Revision 6839584c
| 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 |
|
| ... | ... | |
| 470 | 472 |
elif template_name in (constants.DT_FILE, constants.DT_SHARED_FILE): |
| 471 | 473 |
logical_id_fn = \ |
| 472 | 474 |
lambda _, disk_index, disk: (file_driver, |
| 473 |
"%s/disk%d" % (file_storage_dir,
|
|
| 474 |
disk_index))
|
|
| 475 |
"%s/%s" % (file_storage_dir,
|
|
| 476 |
names[idx]))
|
|
| 475 | 477 |
elif template_name == constants.DT_BLOCK: |
| 476 | 478 |
logical_id_fn = \ |
| 477 | 479 |
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 |
| ... | ... | |
| 1282 | 1283 |
req_file_storage=self._AllowFileStorage, |
| 1283 | 1284 |
req_shr_file_storage=self._AllowFileStorage) |
| 1284 | 1285 |
|
| 1285 |
self.assertEqual(map(operator.attrgetter("logical_id"), result), [
|
|
| 1286 |
(constants.FD_BLKTAP, "/tmp/disk2"), |
|
| 1287 |
(constants.FD_BLKTAP, "/tmp/disk3"), |
|
| 1288 |
(constants.FD_BLKTAP, "/tmp/disk4"), |
|
| 1289 |
]) |
|
| 1286 |
for (idx, disk) in enumerate(result): |
|
| 1287 |
(file_driver, file_storage_dir) = disk.logical_id |
|
| 1288 |
dir_fmt = r"^/tmp/.*\.%s\.disk%d$" % (disk_template, idx + 2) |
|
| 1289 |
self.assertEqual(file_driver, constants.FD_BLKTAP) |
|
| 1290 |
# FIXME: use assertIsNotNone when py 2.7 is minimum supported version |
|
| 1291 |
self.assertNotEqual(re.match(dir_fmt, file_storage_dir), None) |
|
| 1290 | 1292 |
|
| 1291 | 1293 |
def testBlock(self): |
| 1292 | 1294 |
disk_info = [{
|
Also available in: Unified diff