diff --git a/daemons/ganeti-watcher b/daemons/ganeti-watcher
index c561861435ac6a5d5ca1f07a7fe473b61983106c..6bac441286834de77fa45f9327664e6dda930e7f 100755
--- a/daemons/ganeti-watcher
+++ b/daemons/ganeti-watcher
@@ -85,8 +85,8 @@ def RunWatcherHooks():
"""Run the watcher hooks.
"""
- hooks_dir = os.path.join(constants.HOOKS_BASE_DIR,
- constants.HOOKS_NAME_WATCHER)
+ hooks_dir = utils.PathJoin(constants.HOOKS_BASE_DIR,
+ constants.HOOKS_NAME_WATCHER)
try:
results = utils.RunParts(hooks_dir)
diff --git a/lib/backend.py b/lib/backend.py
index d3307c22082287950f788fb727e95da3e1d2ab57..4732d569fcff180b7c9867c36d8bac5dcafb5361 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -163,7 +163,7 @@ def _CleanDirectory(path, exclude=None):
exclude = [os.path.normpath(i) for i in exclude]
for rel_name in utils.ListVisibleFiles(path):
- full_name = os.path.normpath(os.path.join(path, rel_name))
+ full_name = utils.PathJoin(path, rel_name)
if full_name in exclude:
continue
if os.path.isfile(full_name) and not os.path.islink(full_name):
@@ -907,8 +907,8 @@ def _GetVGInfo(vg_name):
def _GetBlockDevSymlinkPath(instance_name, idx):
- return os.path.join(constants.DISK_LINKS_DIR,
- "%s:%d" % (instance_name, idx))
+ return utils.PathJoin(constants.DISK_LINKS_DIR,
+ "%s:%d" % (instance_name, idx))
def _SymlinkBlockDev(instance_name, device_path, idx):
@@ -1995,7 +1995,7 @@ def ExportSnapshot(disk, dest_node, instance, cluster_name, idx, debug):
export_env['EXPORT_DEVICE'] = real_disk.dev_path
export_env['EXPORT_INDEX'] = str(idx)
- destdir = os.path.join(constants.EXPORT_DIR, instance.name + ".new")
+ destdir = utils.PathJoin(constants.EXPORT_DIR, instance.name + ".new")
destfile = disk.physical_id[1]
# the target command is built out of three individual commands,
@@ -2035,8 +2035,8 @@ def FinalizeExport(instance, snap_disks):
@rtype: None
"""
- destdir = os.path.join(constants.EXPORT_DIR, instance.name + ".new")
- finaldestdir = os.path.join(constants.EXPORT_DIR, instance.name)
+ destdir = utils.PathJoin(constants.EXPORT_DIR, instance.name + ".new")
+ finaldestdir = utils.PathJoin(constants.EXPORT_DIR, instance.name)
config = objects.SerializableConfigParser()
@@ -2079,7 +2079,7 @@ def FinalizeExport(instance, snap_disks):
config.set(constants.INISECT_INS, 'disk_count' , '%d' % disk_total)
- utils.WriteFile(os.path.join(destdir, constants.EXPORT_CONF_FILE),
+ utils.WriteFile(utils.PathJoin(destdir, constants.EXPORT_CONF_FILE),
data=config.Dumps())
shutil.rmtree(finaldestdir, True)
shutil.move(destdir, finaldestdir)
@@ -2096,7 +2096,7 @@ def ExportInfo(dest):
export info
"""
- cff = os.path.join(dest, constants.EXPORT_CONF_FILE)
+ cff = utils.PathJoin(dest, constants.EXPORT_CONF_FILE)
config = objects.SerializableConfigParser()
config.read(cff)
@@ -2179,7 +2179,7 @@ def RemoveExport(export):
@rtype: None
"""
- target = os.path.join(constants.EXPORT_DIR, export)
+ target = utils.PathJoin(constants.EXPORT_DIR, export)
try:
shutil.rmtree(target)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 93ce8d63c6d4b31e0d376576ec4f97dddf0b0ad4..402bfdcd0e1d91f76738a56f03fe4fa387a573e4 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -5866,7 +5866,7 @@ class LUCreateInstance(LogicalUnit):
self.needed_locks[locking.LEVEL_NODE].append(src_node)
if not os.path.isabs(src_path):
self.op.src_path = src_path = \
- os.path.join(constants.EXPORT_DIR, src_path)
+ utils.PathJoin(constants.EXPORT_DIR, src_path)
# On import force_variant must be True, because if we forced it at
# initial install, our only chance when importing it back is that it
@@ -5974,8 +5974,8 @@ class LUCreateInstance(LogicalUnit):
if src_path in exp_list[node].payload:
found = True
self.op.src_node = src_node = node
- self.op.src_path = src_path = os.path.join(constants.EXPORT_DIR,
- src_path)
+ self.op.src_path = src_path = utils.PathJoin(constants.EXPORT_DIR,
+ src_path)
break
if not found:
raise errors.OpPrereqError("No export found for relative path %s" %
@@ -6012,7 +6012,7 @@ class LUCreateInstance(LogicalUnit):
if export_info.has_option(constants.INISECT_INS, option):
# FIXME: are the old os-es, disk sizes, etc. useful?
export_name = export_info.get(constants.INISECT_INS, option)
- image = os.path.join(src_path, export_name)
+ image = utils.PathJoin(src_path, export_name)
disk_images.append(image)
else:
disk_images.append(False)
@@ -6148,9 +6148,8 @@ class LUCreateInstance(LogicalUnit):
string_file_storage_dir = self.op.file_storage_dir
# build the full file storage dir path
- file_storage_dir = os.path.normpath(os.path.join(
- self.cfg.GetFileStorageDir(),
- string_file_storage_dir, instance))
+ file_storage_dir = utils.PathJoin(self.cfg.GetFileStorageDir(),
+ string_file_storage_dir, instance)
disks = _GenerateDiskTemplate(self,
diff --git a/lib/config.py b/lib/config.py
index 47de2b540d6dfd9604fec58237271b662e53943f..d61f8a57df8fbff194ad7e48ddc1845ea3d16325 100644
--- a/lib/config.py
+++ b/lib/config.py
@@ -885,9 +885,9 @@ class ConfigWriter:
# rename the file paths in logical and physical id
file_storage_dir = os.path.dirname(os.path.dirname(disk.logical_id[1]))
disk.physical_id = disk.logical_id = (disk.logical_id[0],
- os.path.join(file_storage_dir,
- inst.name,
- disk.iv_name))
+ utils.PathJoin(file_storage_dir,
+ inst.name,
+ disk.iv_name))
self._config_data.instances[inst.name] = inst
self._WriteConfig()
diff --git a/lib/hypervisor/hv_chroot.py b/lib/hypervisor/hv_chroot.py
index 954c92223a6802694a961e9cfb31ec377cc30eea..d207aa2504cfdf9a443ce360be93504ba49122f2 100644
--- a/lib/hypervisor/hv_chroot.py
+++ b/lib/hypervisor/hv_chroot.py
@@ -110,7 +110,7 @@ class ChrootManager(hv_base.BaseHypervisor):
"""
return [name for name in os.listdir(self._ROOT_DIR)
- if self._IsDirLive(os.path.join(self._ROOT_DIR, name))]
+ if self._IsDirLive(utils.PathJoin(self._ROOT_DIR, name))]
def GetInstanceInfo(self, instance_name):
"""Get instance properties.
@@ -134,7 +134,7 @@ class ChrootManager(hv_base.BaseHypervisor):
"""
data = []
for file_name in os.listdir(self._ROOT_DIR):
- path = os.path.join(self._ROOT_DIR, file_name)
+ path = utils.PathJoin(self._ROOT_DIR, file_name)
if self._IsDirLive(path):
data.append((file_name, 0, 0, 0, 0, 0))
return data
diff --git a/lib/jqueue.py b/lib/jqueue.py
index 7824d3f44f3f39db92c4cba2390082089b8f9b69..1b10b71d29623b404fa7221adf2bc19eea633a6c 100644
--- a/lib/jqueue.py
+++ b/lib/jqueue.py
@@ -882,7 +882,7 @@ class JobQueue(object):
@return: the path to the job file
"""
- return os.path.join(constants.QUEUE_DIR, "job-%s" % job_id)
+ return utils.PathJoin(constants.QUEUE_DIR, "job-%s" % job_id)
@classmethod
def _GetArchivedJobPath(cls, job_id):
@@ -895,7 +895,7 @@ class JobQueue(object):
"""
path = "%s/job-%s" % (cls._GetArchiveDirectory(job_id), job_id)
- return os.path.join(constants.JOB_QUEUE_ARCHIVE_DIR, path)
+ return utils.PathJoin(constants.JOB_QUEUE_ARCHIVE_DIR, path)
@classmethod
def _ExtractJobID(cls, name):
diff --git a/lib/ssh.py b/lib/ssh.py
index fe7f274b53a3b4baf074b0e4937d3f9bcc9dc450..b3116d3a09aded5fda42473ead72a96bc915a091 100644
--- a/lib/ssh.py
+++ b/lib/ssh.py
@@ -52,7 +52,7 @@ def GetUserFiles(user, mkdir=False):
if not user_dir:
raise errors.OpExecError("Cannot resolve home of user %s" % user)
- ssh_dir = os.path.join(user_dir, ".ssh")
+ ssh_dir = utils.PathJoin(user_dir, ".ssh")
if not os.path.lexists(ssh_dir):
if mkdir:
try:
@@ -63,7 +63,7 @@ def GetUserFiles(user, mkdir=False):
elif not os.path.isdir(ssh_dir):
raise errors.OpExecError("path ~%s/.ssh is not a directory" % user)
- return [os.path.join(ssh_dir, base)
+ return [utils.PathJoin(ssh_dir, base)
for base in ["id_dsa", "id_dsa.pub", "authorized_keys"]]
diff --git a/lib/utils.py b/lib/utils.py
index 393f4f4f396058596dcd9a5fff723be03f74e324..dbd1520f970e5ad6b4948b6f3f2c2a4ed069e226 100644
--- a/lib/utils.py
+++ b/lib/utils.py
@@ -310,7 +310,7 @@ def RunParts(dir_name, env=None, reset_env=False):
return rr
for relname in sorted(dir_contents):
- fname = os.path.join(dir_name, relname)
+ fname = PathJoin(dir_name, relname)
if not (os.path.isfile(fname) and os.access(fname, os.X_OK) and
constants.EXT_PLUGIN_MASK.match(relname) is not None):
rr.append((relname, constants.RUNPARTS_SKIP, None))
@@ -1607,7 +1607,7 @@ def DaemonPidFileName(name):
daemon name
"""
- return os.path.join(constants.RUN_GANETI_DIR, "%s.pid" % name)
+ return PathJoin(constants.RUN_GANETI_DIR, "%s.pid" % name)
def EnsureDaemon(name):
@@ -2106,7 +2106,7 @@ def CalculateDirectorySize(path):
for (curpath, _, files) in os.walk(path):
for filename in files:
- st = os.lstat(os.path.join(curpath, filename))
+ st = os.lstat(PathJoin(curpath, filename))
size += st.st_size
return BytesToMebibyte(size)
diff --git a/tools/burnin b/tools/burnin
index a17e852459f482b2f91b5d9905250569c35693c0..d4029780c493115bb2773246eb067c350d17d107 100755
--- a/tools/burnin
+++ b/tools/burnin
@@ -23,7 +23,6 @@
"""
-import os
import sys
import optparse
import time
@@ -658,7 +657,7 @@ class Burner(object):
shutdown=True)
rem_op = opcodes.OpRemoveInstance(instance_name=instance,
ignore_failures=True)
- imp_dir = os.path.join(constants.EXPORT_DIR, full_name)
+ imp_dir = utils.PathJoin(constants.EXPORT_DIR, full_name)
imp_op = opcodes.OpCreateInstance(instance_name=instance,
disks = [ {"size": size}
for size in self.disk_size],
diff --git a/tools/cluster-merge b/tools/cluster-merge
index b31638a97db32d4cdb8e7a2019e45b3ec6923ed3..d82ad95cae79e5e78761b667fb7652a5de115023 100644
--- a/tools/cluster-merge
+++ b/tools/cluster-merge
@@ -125,7 +125,7 @@ class Merger(object):
" key from %s. Fail reason: %s; output: %s" %
(cluster, result.fail_reason, result.output))
- key_path = os.path.join(self.work_dir, cluster)
+ key_path = utils.PathJoin(self.work_dir, cluster)
utils.WriteFile(key_path, mode=0600, data=result.stdout)
result = self._RunCmd(cluster, "gnt-node list -o name --no-header",
@@ -254,8 +254,8 @@ class Merger(object):
(data.cluster, result.fail_reason,
result.output))
- data.config_path = os.path.join(self.work_dir, "%s_config.data" %
- data.cluster)
+ data.config_path = utils.PathJoin(self.work_dir, "%s_config.data" %
+ data.cluster)
utils.WriteFile(data.config_path, data=result.stdout)
# R0201: Method could be a function