moep
/
cdist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

in theory transfer the object parameters 

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-09-09 15:28:38 +02:00
parent 722339f3e1
commit db2562303a
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bin/cdist
View File

@ -110,7 +110,7 @@ class Cdist:
self.global_explorer_out_dir = os.path.join(self.out_dir, "explorer") self.global_explorer_out_dir = os.path.join(self.out_dir, "explorer")
os.mkdir(self.global_explorer_out_dir) os.mkdir(self.global_explorer_out_dir)
self.object_dir = os.path.join(self.out_dir, "object") self.object_base_dir = os.path.join(self.out_dir, "object")
# Setup binary directory + contents # Setup binary directory + contents
self.bin_dir = os.path.join(self.out_dir, "bin") self.bin_dir = os.path.join(self.out_dir, "bin")
@ -230,7 +230,7 @@ class Cdist:
object_paths = [] object_paths = []
if not starting_point: if not starting_point:
starting_point = self.object_dir starting_point = self.object_base_dir
for content in os.listdir(starting_point): for content in os.listdir(starting_point):
full_path = os.path.join(starting_point, content) full_path = os.path.join(starting_point, content)
@ -252,7 +252,7 @@ class Cdist:
def object_dir(self, cdist_object): def object_dir(self, cdist_object):
"""Returns the full path to the object (including .cdist)""" """Returns the full path to the object (including .cdist)"""
return os.path.join(self.object_dir, cdist_object, DOT_CDIST) return os.path.join(self.object_base_dir, cdist_object, DOT_CDIST)
def remote_object_dir(self, cdist_object): def remote_object_dir(self, cdist_object):
"""Returns the remote full path to the object (including .cdist)""" """Returns the remote full path to the object (including .cdist)"""
@ -260,17 +260,17 @@ class Cdist:
def object_parameter_dir(self, cdist_object): def object_parameter_dir(self, cdist_object):
"""Returns the dir to the object parameter""" """Returns the dir to the object parameter"""
return os.path.join(object_dir(cdist_object), "parameter") return os.path.join(self.object_dir(cdist_object), "parameter")
def remote_object_parameter_dir(self, cdist_object): def remote_object_parameter_dir(self, cdist_object):
"""Returns the remote dir to the object parameter""" """Returns the remote dir to the object parameter"""
return os.path.join(remote_object_dir(cdist_object), "parameter") return os.path.join(self.remote_object_dir(cdist_object), "parameter")
def list_objects(self, starting_point = False): def list_objects(self, starting_point = False):
"""Return list of existing objects""" """Return list of existing objects"""
if not starting_point: if not starting_point:
starting_point = self.object_dir starting_point = self.object_base_dir
object_paths = self.list_object_paths(starting_point) object_paths = self.list_object_paths(starting_point)
objects = [] objects = []
@ -290,9 +290,12 @@ class Cdist:
return os.path.join(REMOTE_TYPE_DIR, type, "explorer") return os.path.join(REMOTE_TYPE_DIR, type, "explorer")
def transfer_object_parameter(self, cdist_object): def transfer_object_parameter(self, cdist_object):
self.transfer_dir(object_dir(cdist_object), ) """Transfer the object parameter to the remote destination"""
self.transfer_dir(self.object_parameter_dir(cdist_object),
self.remote_object_parameter_dir(cdist_object))
def transfer_global_explorers(self): def transfer_global_explorers(self):
"""Transfer the global explorers"""
self.transfer_dir(GLOBAL_EXPLORER_DIR, REMOTE_GLOBAL_EXPLORER_DIR) self.transfer_dir(GLOBAL_EXPLORER_DIR, REMOTE_GLOBAL_EXPLORER_DIR)
def transfer_type_explorers(self, type): def transfer_type_explorers(self, type):
@ -352,8 +355,9 @@ class Cdist:
cmd.append("__explorer=" + REMOTE_GLOBAL_EXPLORER_DIR) cmd.append("__explorer=" + REMOTE_GLOBAL_EXPLORER_DIR)
cmd.append("__type_explorer=" + self.remote_type_explorer_dir(type)) cmd.append("__type_explorer=" + self.remote_type_explorer_dir(type))
# FIXME: need to transfer object before as well! # Need to transfer at least the parameters for objects to be useful
cmd.append("__object=" + self.remote_type_explorer_dir(type)) self.transfer_object_parameter(cdist_object)
cmd.append("__object=" + self.remote_object_dir(cdist_object))
explorers = self.list_type_explorers(type) explorers = self.list_type_explorers(type)
for explorer in explorers: for explorer in explorers: