Revision df99f3a9
| b/lib/pathutils.py | ||
|---|---|---|
| 88 | 88 |
VNC_PASSWORD_FILE = CONF_DIR + "/vnc-cluster-password" |
| 89 | 89 |
HOOKS_BASE_DIR = CONF_DIR + "/hooks" |
| 90 | 90 |
FILE_STORAGE_PATHS_FILE = CONF_DIR + "/file-storage-paths" |
| 91 |
REMOTE_COMMANDS_DIR = CONF_DIR + "/remote-commands" |
|
| 92 |
|
|
| 93 |
#: Locked in exclusive mode while noded verifies a remote command |
|
| 94 |
REMOTE_COMMANDS_LOCK_FILE = LOCK_DIR + "/ganeti-remote-commands.lock" |
|
| 91 | 95 |
|
| 92 | 96 |
#: Lock file for watcher, locked in shared mode by watcher; lock in exclusive |
| 93 | 97 |
# mode to block watcher (see L{cli._RunWhileClusterStoppedHelper.Call}
|
| b/test/ganeti.bdev_unittest.py | ||
|---|---|---|
| 1 | 1 |
#!/usr/bin/python |
| 2 | 2 |
# |
| 3 | 3 |
|
| 4 |
# Copyright (C) 2006, 2007, 2010 Google Inc. |
|
| 4 |
# Copyright (C) 2006, 2007, 2010, 2012 Google Inc.
|
|
| 5 | 5 |
# |
| 6 | 6 |
# This program is free software; you can redistribute it and/or modify |
| 7 | 7 |
# it under the terms of the GNU General Public License as published by |
| ... | ... | |
| 29 | 29 |
from ganeti import errors |
| 30 | 30 |
from ganeti import constants |
| 31 | 31 |
from ganeti import utils |
| 32 |
from ganeti import pathutils |
|
| 32 | 33 |
|
| 33 | 34 |
import testutils |
| 34 | 35 |
|
| ... | ... | |
| 391 | 392 |
self.assertEqual(vfsp(["/usr/sbin/vim", "/srv/file-storage"]), |
| 392 | 393 |
["/usr/sbin/vim"]) |
| 393 | 394 |
|
| 395 |
self.assertTrue(vfsp([pathutils.REMOTE_COMMANDS_DIR]), |
|
| 396 |
msg=("Remote commands directory should never be valid"
|
|
| 397 |
"for file storage")) |
|
| 398 |
|
|
| 394 | 399 |
|
| 395 | 400 |
class TestComputeWrongFileStoragePaths(testutils.GanetiTestCase): |
| 396 | 401 |
def test(self): |
Also available in: Unified diff