openstack
/
manila
Code Issues Proposed changes

Add utils methods to write files 

Add utils methods for writing local and remote files.

Change-Id: I8f74909e9e4842668f41fc74452fbcb8e3350b59
This commit is contained in:
Ben Swartzlander 2017-10-10 17:23:31 -04:00
parent ebac41d631
commit 103a8233b1
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/manila/rootwrap.d/share.filters
View File

@ -179,3 +179,6 @@ lvconvert: CommandFilter, lvconvert, root
# manila/data/utils.py: 'sha256sum', '%s'
sha256sum: CommandFilter, sha256sum, root
# manila/utils.py: 'tee', '%s'
tee: CommandFilter, tee, root

26
manila/utils.py
View File

@ -682,3 +682,29 @@ def if_notifications_enabled(function):
return function(*args, **kwargs)
return DO_NOTHING
return wrapped
def write_local_file(filename, contents, as_root=False):
tmp_filename = "%s.tmp" % filename
if as_root:
execute('tee', tmp_filename, run_as_root=True, process_input=contents)
execute('mv', '-f', tmp_filename, filename, run_as_root=True)
else:
with open(tmp_filename, 'w') as f:
f.write(contents)
os.rename(tmp_filename, filename)
def write_remote_file(ssh, filename, contents, as_root=False):
tmp_filename = "%s.tmp" % filename
if as_root:
cmd = 'sudo tee "%s" > /dev/null' % tmp_filename
cmd2 = 'sudo mv -f "%s" "%s"' % (tmp_filename, filename)
else:
cmd = 'cat > "%s"' % tmp_filename
cmd2 = 'mv -f "%s" "%s"' % (tmp_filename, filename)
stdin, __, __ = ssh.exec_command(cmd)
stdin.write(contents)
stdin.close()
stdin.channel.shutdown_write()
ssh.exec_command(cmd2)