move back transfer stuff to exec

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-10-11 15:47:32 +02:00
parent 5393471841
commit d9d9e6bff6
2 changed files with 51 additions and 14 deletions

View file

@ -270,6 +270,33 @@ class ConfigInstall:
cdist_object.ran = True cdist_object.ran = True
def run_type_explorer(self, cdist_object): def run_type_explorer(self, cdist_object):
def run_type_explorer(self, cdist_object, remote_global_explorer_path, remote_type_path, remote_object_path, scp-hints, ssh-hints, object_base_path):
def __init__(self, remote_global_explorer_path, remote_type_path, remote_object_path, exec-hint, object_base_path, global_explorer_out_path):
def __init__(self, remote_global_explorer_path, remote_type_path, remote_object_path, exec-hint):
def run_type_explorer(self, cdist_object)
self.value = .,..
return value
def run_global_explorer(self)
def __init__(self, remote_global_explorer_path, remote_type_path, remote_object_path, exec-hint):
== 1x
run_type_explorer()
self.instance.value[obej
c = ConfigInstall("foo")
c.remote_global_explorer_path = "moo"
def run_type_explorer(self, cdist_object)
"""Run type specific explorers for objects""" """Run type specific explorers for objects"""
cdist_type = cdist_object.type cdist_type = cdist_object.type
@ -301,6 +328,8 @@ class ConfigInstall:
cdist.exec.run_or_fail(remote_cmd, stdout=output_fd, remote_prefix=True) cdist.exec.run_or_fail(remote_cmd, stdout=output_fd, remote_prefix=True)
output_fd.close() output_fd.close()
return outputs
def link_emulator(self): def link_emulator(self):
"""Link emulator to types""" """Link emulator to types"""
src = os.path.abspath(self.exec_path) src = os.path.abspath(self.exec_path)
@ -311,6 +340,8 @@ class ConfigInstall:
# FIXME: handle exception / make it more beautiful / Steven: raise except :-) # FIXME: handle exception / make it more beautiful / Steven: raise except :-)
os.symlink(src, dst) os.symlink(src, dst)
def run_global_explorers(src_path, dst_path, remote_dst_path):
def run_global_explorers(self): def run_global_explorers(self):
"""Run global explorers""" """Run global explorers"""
log.info("Running global explorers") log.info("Running global explorers")
@ -413,17 +444,3 @@ class ConfigInstall:
# but remote_mkdir uses -p to fix this # but remote_mkdir uses -p to fix this
self.remote_mkdir(dst) self.remote_mkdir(dst)
self.transfer_path(src, dst) self.transfer_path(src, dst)
def remote_mkdir(self, directory):
"""Create directory on remote side"""
cdist.exec.run_or_fail(["mkdir", "-p", directory], remote_prefix=True)
def remove_remote_path(self, destination):
"""Ensure path on remote side vanished"""
cdist.exec.run_or_fail(["rm", "-rf", destination], remote_prefix=True)
def transfer_path(self, source, destination):
"""Transfer directory and previously delete the remote destination"""
self.remove_remote_path(destination)
cdist.exec.run_or_fail(os.environ['__remote_copy'].split() +
["-r", source, self.target_host + ":" + destination])

View file

@ -27,6 +27,10 @@ log = logging.getLogger(__name__)
import cdist import cdist
class ExecWrapper(object):
def __init__(self, remote_exec, remote_copy, target_host):
self.remote_exec = remote_exec
def shell_run_or_debug_fail(script, *args, remote_prefix=False, **kargs): def shell_run_or_debug_fail(script, *args, remote_prefix=False, **kargs):
# Manually execute /bin/sh, because sh -e does what we want # Manually execute /bin/sh, because sh -e does what we want
# and sh -c -e does not exit if /bin/false called # and sh -c -e does not exit if /bin/false called
@ -75,3 +79,19 @@ def run_or_fail(*args, remote_prefix=False, **kargs):
raise cdist.Error("Command failed: " + " ".join(*args)) raise cdist.Error("Command failed: " + " ".join(*args))
except OSError as error: except OSError as error:
raise cdist.Error(" ".join(*args) + ": " + error.args[1]) raise cdist.Error(" ".join(*args) + ": " + error.args[1])
def remote_mkdir(self, directory):
"""Create directory on remote side"""
cdist.exec.run_or_fail(["mkdir", "-p", directory], remote_prefix=True)
def remove_remote_path(self, destination):
"""Ensure path on remote side vanished"""
cdist.exec.run_or_fail(["rm", "-rf", destination], remote_prefix=True)
def transfer_path(self, source, destination):
"""Transfer directory and previously delete the remote destination"""
self.remove_remote_path(destination)
cdist.exec.run_or_fail(os.environ['__remote_copy'].split() +
["-r", source, self.target_host + ":" + destination])